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

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

@@ -22,31 +22,36 @@ public class SystemMessageService extends BaseJpaService<SystemMessageDO,SystemM
    private SystemMessageDao systemMessageDao;
    /**
     * 保存/更新线上就诊消息
     * @param jsonData
     * 更新线上就诊消息
     * @param id
     * @param read
     * @return
     * @throws Exception
     */
    public SystemMessageDO saveMessage(String jsonData) throws Exception{
        SystemMessageDO systemMessageDO = EntityUtils.jsonToEntity(jsonData, SystemMessageDO.class);
        if (null == systemMessageDO.getId()) {
            // 新增
            systemMessageDO.setId(UUID.randomUUID().toString().replace("-", ""));
            systemMessageDO.setRead("0");
            systemMessageDO.setDel("1");
            systemMessageDO.setCreateTime(new Date());
            systemMessageDO = systemMessageDao.save(systemMessageDO);
            return systemMessageDO;
        } else {
            SystemMessageDO oldSystemMessageDo = systemMessageDao.findOne(systemMessageDO.getId());
            oldSystemMessageDo.setRead("1");
            oldSystemMessageDo.setReadTime(new Date());
            oldSystemMessageDo = systemMessageDao.save(oldSystemMessageDo);
            return  oldSystemMessageDo;
    public SystemMessageDO updateMessage(String id,String read) throws Exception{
        SystemMessageDO systemMessageDO = systemMessageDao.findOne(id);
        if (null == systemMessageDO){
            return null;
        }
        systemMessageDO.setRead(read);
        systemMessageDO.setReadTime(new Date());
        systemMessageDO = systemMessageDao.save(systemMessageDO);
        return systemMessageDO;
    }
    /**
     * 保存线上就诊消息（外部调用）
     * @param systemMessageDO
     * @throws Exception
     */
    public void saveMessage(SystemMessageDO systemMessageDO) throws Exception{
        systemMessageDO.setRead("0");
        systemMessageDO.setDel("1");
        systemMessageDO.setCreateTime(new Date());
        systemMessageDao.save(systemMessageDO);
    }
    /**
     * 根据id查询消息详情

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

@@ -31,19 +31,21 @@ public class SystemMessageController extends EnvelopRestEndpoint {
    @Autowired
    private SystemMessageService systemMessageService;
    @PostMapping(value="/saveMessage")
    @ApiOperation("保存/更新线上就诊消息")
    public Envelop saveMessage(
            @ApiParam(name = "jsonData", value = "Json数据", required = true)
            @RequestParam String jsonData){
    @PostMapping(value="/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.saveMessage(jsonData);
            SystemMessageDO systemMessageDO = systemMessageService.updateMessage(id,read);
            if (null == systemMessageDO){
                return failed("操作失败");
                return failed("更新失败,就诊消息不存在");
            }
            return success("操作成功");
            return success("更新成功");
        }catch (Exception e){
            return failed("操作失败,"+e.getMessage());
            return failed("更新失败,"+e.getMessage());
        }
    }