Merge branch 'dev' of http://192.168.1.220:10080/Amoy2/wlyy2.0 into dev

# Conflicts:
#	common/common-entity/src/main/java/com/yihu/jw/entity/IntegerIdentityEntity.java

business/base-service/src/main/java/com/yihu/jw/doctor/dao/BaseDoctorMessageDao.java

@@ -0,0 +1,25 @@
package com.yihu.jw.doctor.dao;
import com.yihu.jw.entity.base.doctor.BaseDoctorDO;
import com.yihu.jw.entity.base.doctor.BaseDoctorMessageDO;
import org.springframework.data.domain.Pageable;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
import org.springframework.transaction.annotation.Transactional;
import java.util.List;
/**
 *
 *
 * </pre>
 * @since 1.
 */
@Transactional
public interface BaseDoctorMessageDao extends PagingAndSortingRepository<BaseDoctorMessageDO, String>, JpaSpecificationExecutor<BaseDoctorMessageDO>  {
    @Query("from BaseDoctorMessageDO d where  d.del ='1' and d.doctor=?1 ")
    List<BaseDoctorMessageDO> findByDoctorAndDel(String doctor,Pageable pageRequest);
}

business/base-service/src/main/java/com/yihu/jw/hospital/doctor/dao/service/BaseDoctorBGService.java

@@ -6,12 +6,10 @@ import com.yihu.jw.entity.base.doctor.BaseDoctorBackgroundDO;
import com.yihu.jw.entity.base.doctor.BaseDoctorDO;
import com.yihu.jw.entity.base.doctor.BaseDoctorMessageDO;
import com.yihu.jw.hospital.doctor.dao.BaseDoctorBackgroundDao;
import com.yihu.jw.utils.hibernate.HibenateUtils;
import com.yihu.mysql.query.BaseJpaService;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.PageRequest;
import org.springframework.data.domain.Pageable;
import org.springframework.data.domain.Sort;
import org.springframework.stereotype.Service;
import javax.transaction.Transactional;
@@ -27,6 +25,8 @@ public class BaseDoctorBGService extends BaseJpaService<BaseDoctorBackgroundDO,
    private BaseDoctorDao baseDoctorDao;
    @Autowired
    private BaseDoctorMessageDao doctorMessageDao;
    @Autowired
    private HibenateUtils hibenateUtils;
    //查询背景
    public List<BaseDoctorBackgroundDO> getBackground(Integer page,Integer pageSize){
        return baseDoctorBackgroundDao.getBackroundAll(page,pageSize);
@@ -84,10 +84,19 @@ public class BaseDoctorBGService extends BaseJpaService<BaseDoctorBackgroundDO,
     * @param size
     * @return
     */
    public List<BaseDoctorMessageDO> selectByDoctor(String doctor,Integer page,Integer size){
        Sort sort = new Sort(Sort.Direction.DESC, "isSort");
        Pageable pageRequest = new PageRequest(page-1,size,sort);
        return doctorMessageDao.findByDoctorAndDel(doctor,pageRequest);
    public List<Map<String,Object>> selectByDoctor(String doctor, Integer contentType, String content, Integer page, Integer size){
        String sql = "select id as \"id\", doctor as \"doctor\",doctor_name as \"doctorName\",content_type as \"contentType\"," +
                "content as \"content\" , content_desc as \"contentDesc\",is_sort as \"isSort\",del as \"del\" " +
                " from base_doctor_message whre del=1 and doctor='"+doctor+"' ";
        if (contentType!=null){
            sql +=" and content_type= "+contentType;
        }
        if (StringUtils.isNotBlank(content)){
            sql +=" and content_type like '%"+contentType+"%'v";
        }
        List<Map<String,Object>> mapList = hibenateUtils.createSQLQuery(sql,page,size);
        return mapList;
    }
@@ -96,9 +105,10 @@ public class BaseDoctorBGService extends BaseJpaService<BaseDoctorBackgroundDO,
     * @param doctorMessageDO
     * @return
     */
    @Transactional
    public BaseDoctorMessageDO saveDoctorMessage(BaseDoctorMessageDO doctorMessageDO){
        if (!StringUtils.isNotBlank(doctorMessageDO.getId())){
            String sql = "select max(dm.is_sort) as total from base_doctor_message dm ";
            String sql = "select max(dm.is_sort) as total from base_doctor_message dm where dm.del=1 ";
            List<Map<String,Object>> maps = jdbcTemplate.queryForList(sql);
            Integer isSort=0;
            if (maps!=null&&maps.size()!=0){
@@ -108,6 +118,7 @@ public class BaseDoctorBGService extends BaseJpaService<BaseDoctorBackgroundDO,
            }
            doctorMessageDO.setIsSort(isSort);
        }
        doctorMessageDO.setDel(1);
        doctorMessageDO.setCreateTime(new Date());
        doctorMessageDO.setUpdateTime(new Date());
        return  doctorMessageDao.save(doctorMessageDO);
@@ -119,9 +130,10 @@ public class BaseDoctorBGService extends BaseJpaService<BaseDoctorBackgroundDO,
     * @param id
     * @return
     */
    @Transactional
    public BaseDoctorMessageDO setMessageHead(String id){
        BaseDoctorMessageDO doctorMessageDO = doctorMessageDao.findOne(id);
        String sql = "select max(dm.is_sort) as total from base_doctor_message dm ";
        String sql = "select max(dm.is_sort) as total from base_doctor_message dm where dm.del=1  ";
        List<Map<String,Object>> maps = jdbcTemplate.queryForList(sql);
        Integer isSort=0;
        if (maps!=null&&maps.size()!=0){
@@ -136,4 +148,14 @@ public class BaseDoctorBGService extends BaseJpaService<BaseDoctorBackgroundDO,
    }
    @Transactional
    public BaseDoctorMessageDO delDoctorMessage(String id){
        BaseDoctorMessageDO doctorMessageDO = doctorMessageDao.findOne(id);
        doctorMessageDO.setDel(0);
        doctorMessageDO.setCreateTime(new Date());
        doctorMessageDO.setUpdateTime(new Date());
        return doctorMessageDao.save(doctorMessageDO);
    }
}

common/common-entity/src/main/java/com/yihu/jw/entity/base/doctor/BaseDoctorMessageDO.java

@@ -0,0 +1,89 @@
package com.yihu.jw.entity.base.doctor;
import com.yihu.jw.entity.UuidIdentityEntityWithOperator;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
/**
* 医生快捷回复信息实体
*
* @author Administrator on
*
*/
@Entity
@Table(name = "base_doctor_message")
public class BaseDoctorMessageDO extends UuidIdentityEntityWithOperator {
    private String doctor;
    private String doctorName;
    private Integer contentType;
    private String content;
    private String contentDesc;
    private Integer isSort;
    private Integer del;
    @Column(name = "doctor")
    public String getDoctor() {
        return doctor;
    }
    public void setDoctor(String doctor) {
        this.doctor = doctor;
    }
    @Column(name = "doctor_name")
    public String getDoctorName() {
        return doctorName;
    }
    public void setDoctorName(String doctorName) {
        this.doctorName = doctorName;
    }
    @Column(name = "content_type")
    public Integer getContentType() {
        return contentType;
    }
    public void setContentType(Integer contentType) {
        this.contentType = contentType;
    }
    @Column(name = "content")
    public String getContent() {
        return content;
    }
    public void setContent(String content) {
        this.content = content;
    }
    @Column(name = "content_desc")
    public String getContentDesc() {
        return contentDesc;
    }
    public void setContentDesc(String contentDesc) {
        this.contentDesc = contentDesc;
    }
    @Column(name = "is_sort")
    public Integer getIsSort() {
        return isSort;
    }
    public void setIsSort(Integer isSort) {
        this.isSort = isSort;
    }
    @Column(name = "del")
    public Integer getDel() {
        return del;
    }
    public void setDel(Integer del) {
        this.del = del;
    }
}

common/common-request-mapping/src/main/java/com/yihu/jw/rm/hospital/BaseHospitalRequestMapping.java

@@ -1200,8 +1200,14 @@ public class BaseHospitalRequestMapping {
        public static final String createDoctorBG  = "/createDoctorBG";
        public static final String removeDoctorBG  = "/removeDoctorBG";
        public static final String updateDoctorBG  = "/updateDoctorBG";
        public static final String selectDoctorMessage  = "/selectDoctorMessage";
        public static final String saveDoctorMessage  = "/saveDoctorMessage";
        public static final String setMessageHead="/setMessageHead";
        public static final String delDoctorMessage = "/delDoctorMessage";
    }
    /**
     * 留言展示
     */

svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/endpoint/hospital/BaseDoctorBGController.java

@@ -1,8 +1,8 @@
package com.yihu.jw.hospital.endpoint.hospital;
import com.alibaba.fastjson.JSONObject;
import com.yihu.jw.entity.base.doctor.BaseDoctorBackgroundDO;
import com.yihu.jw.entity.base.doctor.BaseDoctorDO;
import com.yihu.jw.entity.base.doctor.BaseDoctorMessageDO;
import com.yihu.jw.hospital.doctor.dao.service.BaseDoctorBGService;
import com.yihu.jw.restmodel.web.Envelop;
import com.yihu.jw.restmodel.web.endpoint.EnvelopRestEndpoint;
@@ -11,12 +11,10 @@ import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;
import java.util.List;
import java.util.Map;
@RestController
@RequestMapping(value = BaseHospitalRequestMapping.BaseBackground.backgroundManage)
@@ -88,4 +86,44 @@ public class BaseDoctorBGController extends EnvelopRestEndpoint {
            return failed("操作失败");
        }
    }
    @ApiOperation("查询某个医生快捷回复列表")
    @GetMapping(value= BaseHospitalRequestMapping.BaseBackground.selectDoctorMessage)
    public Envelop selectDoctorMessage(@ApiParam(name = "doctor", value = "doctor", required = true)
                            @RequestParam(value = "doctor", required = true)String doctor,
                            @ApiParam(name = "contentType", value = "contentType", required = false)
                            @RequestParam(value = "contentType", required = false)Integer contentType,
                            @ApiParam(name = "content", value = "content", required = false)
                            @RequestParam(value = "content", required = false)String content,
                            @ApiParam(name = "page", value = "page", required = false)
                                @RequestParam(value = "page", required = false)Integer page,
                            @ApiParam(name = "size", value = "size", required = false)
                                @RequestParam(value = "size", required = false)Integer size){
        List<Map<String,Object>> mapList = baseDoctorBGService.selectByDoctor(doctor,contentType,content,page,size);
        return success(mapList);
    }
    @ApiOperation("保存医生快捷回复")
    @PostMapping(value= BaseHospitalRequestMapping.BaseBackground.saveDoctorMessage)
    public Envelop saveDoctorMessage(@ApiParam(name = "json", value = "json", required = true)
                                       @RequestParam(value = "json", required = true)String json) throws Exception{
        BaseDoctorMessageDO doctorMessageDO = objectMapper.readValue(json,BaseDoctorMessageDO.class);
        return success(baseDoctorBGService.saveDoctorMessage(doctorMessageDO));
    }
    @ApiOperation("设置医生快捷回复置顶")
    @PostMapping(value= BaseHospitalRequestMapping.BaseBackground.setMessageHead)
    public Envelop setMessageHead(@ApiParam(name = "id", value = "id", required = true)
                                     @RequestParam(value = "id", required = true)String id) throws Exception{
        return success(baseDoctorBGService.setMessageHead(id));
    }
    @ApiOperation("删除医生快捷回复")
    @PostMapping(value= BaseHospitalRequestMapping.BaseBackground.delDoctorMessage)
    public Envelop delDoctorMessage(@ApiParam(name = "id", value = "id", required = true)
                                  @RequestParam(value = "id", required = true)String id) throws Exception{
        return success(baseDoctorBGService.delDoctorMessage(id));
    }
}