Merge branch 'dev' of zengmengkang/wlyy2.0 into dev

business/base-service/src/main/java/com/yihu/jw/hospital/message/dao/SystemMessageDao.java

@@ -21,9 +21,5 @@ public interface SystemMessageDao extends PagingAndSortingRepository<SystemMessa
    @Query("from SystemMessageDO p where p.id = ?1")
    SystemMessageDO queryById(String id);
    @Modifying
    @Transactional
    @Query(value = "update SystemMessageDO p set p.read=?2 where p.id=?1",nativeQuery = true)
    void updateStatus(String id,String read);
}

business/base-service/src/main/java/com/yihu/jw/hospital/message/service/SystemMessageService.java

@@ -5,6 +5,7 @@ import com.yihu.jw.hospital.message.dao.SystemMessageDao;
import com.yihu.mysql.query.BaseJpaService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.Date;
@@ -14,6 +15,7 @@ import java.util.Date;
 * Created at 2019/11/13
 */
@Service
@Transactional
public class SystemMessageService extends BaseJpaService<SystemMessageDO,SystemMessageDao> {
    @Autowired
@@ -27,11 +29,12 @@ public class SystemMessageService extends BaseJpaService<SystemMessageDO,SystemM
     * @throws Exception
     */
    public SystemMessageDO addMessage(SystemMessageDO systemMessageDO) throws Exception{
            systemMessageDO.setRead("0");
            systemMessageDO.setDel("1");
            systemMessageDO.setCreateTime(new Date());
            systemMessageDO = systemMessageDao.save(systemMessageDO);
            return systemMessageDO;
        systemMessageDO.setHandleState("0");
        systemMessageDO.setIsRead("0");
        systemMessageDO.setDel("1");
        systemMessageDO.setCreateTime((new Date()));
        systemMessageDO = systemMessageDao.save(systemMessageDO);
        return systemMessageDO;
    }
@@ -47,11 +50,9 @@ public class SystemMessageService extends BaseJpaService<SystemMessageDO,SystemM
        if (null == systemMessageDO){
            return null;
        }
        systemMessageDO.setRead(read);
        systemMessageDO.setIsRead(read);
        systemMessageDO.setReadTime(new Date());
        systemMessageDao.save(systemMessageDO);
       /* systemMessageDao.updateStatus(id,read);*/
        return systemMessageDO;
    }
@@ -62,7 +63,8 @@ public class SystemMessageService extends BaseJpaService<SystemMessageDO,SystemM
     * @throws Exception
     */
    public void saveMessage(SystemMessageDO systemMessageDO) throws Exception{
        systemMessageDO.setRead("0");
        systemMessageDO.setHandleState("0");
        systemMessageDO.setIsRead("0");
        systemMessageDO.setDel("1");
        systemMessageDO.setCreateTime(new Date());
        systemMessageDao.save(systemMessageDO);

common/common-entity/src/main/java/com/yihu/jw/entity/hospital/message/SystemMessageDO.java

@@ -52,7 +52,11 @@ public class SystemMessageDO extends UuidIdentityEntity {
    /**
     *是否已读
     */
    private String read;
    private String isRead;
    /**
     *业务处理状态
     */
    private String handleState;
    /**
     *是否删除
     */
@@ -132,12 +136,20 @@ public class SystemMessageDO extends UuidIdentityEntity {
        this.data = data;
    }
    @Column(name = "read")
    public String getRead() {
        return read;
    @Column(name = "is_read")
    public String getIsRead() {
        return isRead;
    }
    public void setIsRead(String isRead) {
        this.isRead = isRead;
    }
    @Column(name = "handle_state")
    public String getHandleState() {
        return handleState;
    }
    public void setRead(String read) {
        this.read = read;
    public void setHandleState(String handleState) {
        this.handleState = handleState;
    }
    @Column(name = "del")
@@ -163,4 +175,5 @@ public class SystemMessageDO extends UuidIdentityEntity {
    public void setCreateTime(Date createTime) {
        this.createTime = createTime;
    }
}

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

@@ -586,5 +586,16 @@ public class BaseHospitalRequestMapping {
    }
    /**
     * 线上就诊消息
     */
    public static class SystemMessage extends Basic {
        public static final String PREFIX  = "/message";
        public static final String addMessage  = "/addMessage";
        public static final String updateMessage  = "/updateMessage";
        public static final String searchMessagePageList  = "/searchMessagePageList";
        public static final String queryById  = "/queryById";
    }
}

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

@@ -4,6 +4,7 @@ import com.yihu.jw.entity.hospital.message.SystemMessageDO;
import com.yihu.jw.hospital.message.service.SystemMessageService;
import com.yihu.jw.restmodel.web.Envelop;
import com.yihu.jw.restmodel.web.endpoint.EnvelopRestEndpoint;
import com.yihu.jw.rm.hospital.BaseHospitalRequestMapping;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
@@ -22,7 +23,7 @@ import java.util.List;
 * Created at 2019/11/18
 */
@RestController
@RequestMapping(value ="/message")
@RequestMapping(value = BaseHospitalRequestMapping.SystemMessage.PREFIX)
@Api(value = "线上就诊消息管理器", description = "线上就诊消息管理器", tags = {"互联网医院 - 线上就诊消息管理器接口"})
public class SystemMessageController extends EnvelopRestEndpoint {
@@ -32,44 +33,40 @@ public class SystemMessageController extends EnvelopRestEndpoint {
    private SystemMessageService systemMessageService;
    @PostMapping(value="/addMessage")
    @PostMapping(value= BaseHospitalRequestMapping.SystemMessage.addMessage)
    @ApiOperation("新增线上就诊消息")
    public Envelop addMessage(
            @ApiParam(name = "jsonData", value = "Json数据", required = true)
            @RequestBody SystemMessageDO systemMessageDO){
        try {
            SystemMessageDO messageDO = systemMessageService.addMessage(systemMessageDO);
            if (null == messageDO){
                return failed("新增失败");
            }
            return success("新增成功");
        }catch (Exception e){
            return failed("新增失败,"+e.getMessage());
            @RequestBody SystemMessageDO systemMessageDO)throws Exception{
        SystemMessageDO messageDO = systemMessageService.addMessage(systemMessageDO);
        if (null == messageDO){
            return failed("新增失败");
        }
        return success("新增成功");
    }
    @PostMapping(value="/updateMessage")
    @PostMapping(value= BaseHospitalRequestMapping.SystemMessage.updateMessage)
    @ApiOperation("更新线上就诊消息")
    public Envelop updateMessage(
            @ApiParam(name = "id", value = "id", required = true)
            @RequestParam(value = "id", required = true)String id,
            @ApiParam(name = "read", value = "read", required = true)
            @RequestParam(value = "read", required = true)String read){
        try {
            SystemMessageDO systemMessageDO = systemMessageService.updateMessage(id,read);
            if (null == systemMessageDO){
                return failed("更新失败,就诊消息不存在");
            }
            return success("更新成功");
        }catch (Exception e){
            return failed("更新失败,"+e.getMessage());
            @RequestParam(value = "read", required = true)String read)throws Exception{
        SystemMessageDO systemMessageDO = systemMessageService.updateMessage(id,read);
        if (null == systemMessageDO){
            return failed("更新失败,就诊消息不存在");
        }
        return success("更新成功");
    }
    @GetMapping(value ="/searchMessagePageList")
    @GetMapping(value = BaseHospitalRequestMapping.SystemMessage.searchMessagePageList)
    @ApiOperation(value = "获取线上就诊消息列表")
    public Envelop searchMessagePageList(
            @ApiParam(name = "fields", value = "返回的字段，为空返回全部字段")
@@ -81,37 +78,32 @@ public class SystemMessageController extends EnvelopRestEndpoint {
            @ApiParam(name = "page", value = "第几页，从1开始", required = true, defaultValue = "1")
            @RequestParam(value = "page", required = true,defaultValue = "1")Integer page,
            @ApiParam(name = "pageSize", value = "每页分页大小", required = true, defaultValue = "10")
            @RequestParam(value = "pageSize", required = true,defaultValue = "10")Integer pageSize){
        try {
            if(StringUtils.isBlank(filters)){
                filters="del=1";
            }else{
                filters=filters+";del=1";
            }
            List<SystemMessageDO> list  = systemMessageService.search(fields,filters,sorts,page,pageSize);
            int count = (int) systemMessageService.getCount(filters);
            return success(list, count, page, pageSize, SystemMessageDO.class);
        }catch (Exception e){
            return failed("获取失败,"+e.getMessage());
            @RequestParam(value = "pageSize", required = true,defaultValue = "10")Integer pageSize)throws Exception{
        if(StringUtils.isBlank(filters)){
            filters="del=1";
        }else{
            filters=filters+";del=1";
        }
        List<SystemMessageDO> list  = systemMessageService.search(fields,filters,sorts,page,pageSize);
        int count = (int) systemMessageService.getCount(filters);
        return success(list, count, page, pageSize, SystemMessageDO.class);
    }
    @GetMapping(value ="/queryById")
    @GetMapping(value = BaseHospitalRequestMapping.SystemMessage.queryById)
    @ApiOperation(value = "获取线上就诊消息详情")
    public Envelop queryById(
            @ApiParam(name = "id", value = "id", required = true)
            @RequestParam(value = "id", required = true)String id){
        try {
            SystemMessageDO systemMessageDO = systemMessageService.queryById(id);
            if (null == systemMessageDO){
                return failed("获取失败,线上就诊消息不存在");
            }
            return success("获取成功",200,systemMessageDO);
        }catch (Exception e){
            return failed("获取失败,"+e.getMessage());
            @RequestParam(value = "id", required = true)String id)throws Exception{
        SystemMessageDO systemMessageDO = systemMessageService.queryById(id);
        if (null == systemMessageDO){
            return failed("获取失败,线上就诊消息不存在");
        }
        return success("获取成功",200,systemMessageDO);
    }