diff --git a/parent/base.common/src/main/java/com/lyms/base/common/dao/content/ContentDoctorMessageMapper.xml b/parent/base.common/src/main/java/com/lyms/base/common/dao/content/ContentDoctorMessageMapper.xml index 450d67e..b5749fc 100644 --- a/parent/base.common/src/main/java/com/lyms/base/common/dao/content/ContentDoctorMessageMapper.xml +++ b/parent/base.common/src/main/java/com/lyms/base/common/dao/content/ContentDoctorMessageMapper.xml @@ -28,7 +28,7 @@ ID AS id, DOCTOR_ID AS doctorId, TEMPLET_MSG_ID AS templetMsgId, CONTENT AS content, RICH_TEXT AS richText, RICH_TITLE AS richTitle, IS_RICH AS isRich, KEY_CODE AS keyCode, CREATE_TIME AS createTime, CREATE_ID AS createId, CREATE_NAME AS createName, MODIFY_ID AS modifyId, MODIFY_NAME AS modifyName, MODIFY_TIME AS modifyTime, IFDEL AS ifdel, ENABLE AS enable \ No newline at end of file diff --git a/parent/base.common/src/main/java/com/lyms/base/common/vo/content/InContentMessageTemplateDTO.java b/parent/base.common/src/main/java/com/lyms/base/common/vo/content/InContentMessageTemplateDTO.java index 16c5c59..9e3b4fe 100644 --- a/parent/base.common/src/main/java/com/lyms/base/common/vo/content/InContentMessageTemplateDTO.java +++ b/parent/base.common/src/main/java/com/lyms/base/common/vo/content/InContentMessageTemplateDTO.java @@ -14,6 +14,10 @@ public class InContentMessageTemplateDTO { */ private String templateVersionId; /** + * 医院ID + */ + private String hId; + /** * 信息内容 */ private String content; @@ -46,6 +50,14 @@ public class InContentMessageTemplateDTO { this.id = id; } + public String gethId() { + return hId; + } + + public void sethId(String hId) { + this.hId = hId; + } + public int getIsRich() { return isRich; } diff --git a/parent/center.manager/src/main/java/com/lyms/cm/controller/content/ContentDoctorMessageController.java b/parent/center.manager/src/main/java/com/lyms/cm/controller/content/ContentDoctorMessageController.java index 488e69e..ac7ce91 100644 --- a/parent/center.manager/src/main/java/com/lyms/cm/controller/content/ContentDoctorMessageController.java +++ b/parent/center.manager/src/main/java/com/lyms/cm/controller/content/ContentDoctorMessageController.java @@ -10,6 +10,7 @@ import com.lyms.base.common.service.organ.OrganizationsService; import com.lyms.base.common.vo.content.ContentMessageTemplateDTO; import com.lyms.base.common.vo.content.InContentMessageTemplateDTO; import com.lyms.base.common.vo.content.MsgTempSerachDTO; +import com.lyms.constants.OperationName; import com.lyms.util.CollectionUtils; import com.lyms.util.StrUtils; import com.lyms.web.bean.AjaxResult; @@ -46,6 +47,16 @@ public class ContentDoctorMessageController extends BaseController { @Autowired private OrganizationsService organService; + @RequestMapping(value = "/{id}/delete", method = {RequestMethod.GET, RequestMethod.POST}) + @ResponseBody + public AjaxResult delete(@PathVariable String id, AjaxResult ajaxResult) { + ContentDoctorMessage message = contentDoctorMessageService.selectById(id); + message.setIfdel(1); + message.setModifyTime(new Date()); + boolean tag = contentDoctorMessageService.updateById(message); + return handleAjaxResult(ajaxResult, tag, OperationName.DELETE); + } + /** * 新增消息模板信息 *

@@ -57,20 +68,30 @@ public class ContentDoctorMessageController extends BaseController { @ResponseBody public AjaxResult update(@ModelAttribute InContentMessageTemplateDTO contentMessage, AjaxResult ajaxResult) { ContentDoctorMessage messTemp = new ContentDoctorMessage(); - if(StrUtils.isNotEmpty(contentMessage.getId())&&!contentMessage.getId().equals("0")){//更新 + if (StrUtils.isNotEmpty(contentMessage.getId()) && !contentMessage.getId().equals("0")) {//更新 messTemp = contentDoctorMessageService.selectById(contentMessage.getId()); - if(messTemp!=null){ + if (messTemp != null) { messTemp.setModifyTime(new Date()); } Map map = new HashMap<>(); - map.put("HOSPITAL_MESSAGE_ID",messTemp.getId()); + map.put("HOSPITAL_MESSAGE_ID", messTemp.getId()); //先删除标签关系 contentHospitalMessageTagsService.deleteByMap(map); + } else { + messTemp.setId(StrUtils.uuid()); + messTemp.setEnable(1); + messTemp.setIfdel(0); + messTemp.setDoctorId(contentMessage.gethId()); + messTemp.setCreateTime(new Date()); + messTemp.setKeyCode(messTemp.getId()); + contentDoctorMessageService.insert(messTemp); } + messTemp.setTempletMsgId("-1"); messTemp.setContent(contentMessage.getContent()); messTemp.setRichTitle(contentMessage.getRichTitle()); messTemp.setRichText(contentMessage.getRichText()); messTemp.setIsRich(contentMessage.getIsRich()); + List tempTags = new ArrayList<>(); for (String tags : contentMessage.getContentTagIds()) { ContentHospitalMessageTags ctmt = new ContentHospitalMessageTags(); @@ -82,23 +103,26 @@ public class ContentDoctorMessageController extends BaseController { boolean tags = contentHospitalMessageTagsService.insertBatch(tempTags); boolean tag = contentDoctorMessageService.insertOrUpdate(messTemp); - return handleAjaxResult(ajaxResult, tag&&tags, "修改成功"); + return handleAjaxResult(ajaxResult, tag && tags, "修改成功"); } /** * 跳转到编辑页面 - *@param dmId 医院消息ID + * + * @param dmId 医院消息ID * @return */ @RequestMapping(value = {"/{dmId}/toEdit"}, method = RequestMethod.GET) - public String toEdit(@PathVariable String dmId, Model model) { + public String toEdit(@PathVariable String dmId, String hId, Model model) { model.addAttribute("dmId", dmId); + model.addAttribute("hId", hId); if (StrUtils.isNotEmpty(dmId)) {//查询 ContentDoctorMessage tempInfo = contentDoctorMessageService.selectById(dmId); - String hName = organService.getNameById(tempInfo.getDoctorId()); + if (tempInfo != null) { + model.addAttribute("tempInfo", tempInfo); + } + String hName = organService.getNameById(hId); model.addAttribute("hName", hName); - model.addAttribute("tempInfo", tempInfo); - Map colMap = new HashMap<>(); colMap.put("HOSPITAL_MESSAGE_ID", dmId); List tagList = contentHospitalMessageTagsService.selectByMap(colMap); @@ -130,12 +154,14 @@ public class ContentDoctorMessageController extends BaseController { contentHospitalMessageVersionService.deleteById(chmv.getId()); Wrapper cdmWrapper = new EntityWrapper<>(); cdmWrapper.where("DOCTOR_ID = {0}", hosptId); - cdmWrapper.isNotNull("TEMPLET_MSG_ID"); + cdmWrapper.and("TEMPLET_MSG_ID !={0}", "-1"); List messageList = contentDoctorMessageService.selectList(cdmWrapper); for (ContentDoctorMessage ml : messageList) { ml.setIfdel(1); } - contentDoctorMessageService.updateBatchById(messageList); + if (org.apache.commons.collections.CollectionUtils.isNotEmpty(messageList)) { + contentDoctorMessageService.updateBatchById(messageList); + } } } @@ -168,7 +194,7 @@ public class ContentDoctorMessageController extends BaseController { cdm.setEnable(1); cdm.setCreateTime(new Date()); doctorMessages.add(cdm); - if(StrUtils.isNotEmpty(mt.getContentTagIds())){ + if (StrUtils.isNotEmpty(mt.getContentTagIds())) { ContentHospitalMessageTags messageTags = new ContentHospitalMessageTags(); messageTags.setId(StrUtils.uuid()); messageTags.setTagsIds(mt.getContentTagIds()); @@ -177,12 +203,12 @@ public class ContentDoctorMessageController extends BaseController { } } - if(CollectionUtils.isNotEmpty(doctorMessages)){ + if (CollectionUtils.isNotEmpty(doctorMessages)) { //批量添加消息 boolean saveResult = contentDoctorMessageService.insertBatch(doctorMessages); } - if(CollectionUtils.isNotEmpty(hdoctorMessages)){ + if (CollectionUtils.isNotEmpty(hdoctorMessages)) { //批量添加消息标签 boolean saveTagResult = contentHospitalMessageTagsService.insertBatch(hdoctorMessages); } diff --git a/parent/center.manager/src/main/java/com/lyms/cm/controller/content/ContentMessageTemplateController.java b/parent/center.manager/src/main/java/com/lyms/cm/controller/content/ContentMessageTemplateController.java index 5d10b46..44c722a 100644 --- a/parent/center.manager/src/main/java/com/lyms/cm/controller/content/ContentMessageTemplateController.java +++ b/parent/center.manager/src/main/java/com/lyms/cm/controller/content/ContentMessageTemplateController.java @@ -3,8 +3,12 @@ package com.lyms.cm.controller.content; import com.baomidou.mybatisplus.mapper.EntityWrapper; import com.baomidou.mybatisplus.mapper.Wrapper; import com.baomidou.mybatisplus.plugins.Page; +import com.lyms.base.common.entity.content.ContentDoctorMessage; +import com.lyms.base.common.entity.content.ContentHospitalMessageTags; import com.lyms.base.common.entity.content.ContentMessageTemplate; import com.lyms.base.common.entity.content.ContentTemplateMessageTags; +import com.lyms.base.common.service.content.ContentDoctorMessageService; +import com.lyms.base.common.service.content.ContentHospitalMessageTagsService; import com.lyms.base.common.service.content.ContentMessageTemplateService; import com.lyms.base.common.service.content.ContentTemplateMessageTagsService; import com.lyms.base.common.service.content.impl.ContentTagsServiceImpl; @@ -15,6 +19,7 @@ import com.lyms.constants.OperationName; import com.lyms.util.StrUtils; import com.lyms.web.bean.AjaxResult; import com.lyms.web.controller.BaseController; +import org.apache.commons.collections.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; @@ -39,6 +44,10 @@ public class ContentMessageTemplateController extends BaseController { //模板信息标签 @Autowired private ContentTemplateMessageTagsService messageTagsService; + @Autowired + private ContentDoctorMessageService contentDoctorMessageService; + @Autowired + private ContentHospitalMessageTagsService contentHospitalMessageTagsService; /** * 跳转到列表页面 @@ -62,6 +71,18 @@ public class ContentMessageTemplateController extends BaseController { temp.setIfdel(1); temp.setModifyTime(new Date()); } + + Wrapper messageWrapper = new EntityWrapper<>(); + messageWrapper.in("TEMPLET_MSG_ID",ids); + List contentDoctorMessages = contentDoctorMessageService.selectList(messageWrapper); + for (ContentDoctorMessage message : contentDoctorMessages){ + message.setIfdel(1); + message.setModifyTime(new Date()); + } + if(CollectionUtils.isNotEmpty(contentDoctorMessages)){ + contentDoctorMessageService.updateBatchById(contentDoctorMessages); + } + boolean tag = messageTemplateService.updateBatchById(template); return handleAjaxResult(ajaxResult, tag, OperationName.DELETE); } @@ -111,7 +132,7 @@ public class ContentMessageTemplateController extends BaseController { } page.setRecords(cmtdList); return toGridData(page); - }else{ + } else { return toGridData(getPage()); } } @@ -128,20 +149,45 @@ public class ContentMessageTemplateController extends BaseController { public AjaxResult create(@ModelAttribute InContentMessageTemplateDTO contentMessage, AjaxResult ajaxResult) { ContentMessageTemplate messTemp = new ContentMessageTemplate(); String operationName = "操作"; - if(StrUtils.isNotEmpty(contentMessage.getId())&&!contentMessage.getId().equals("0")){//更新 + if (StrUtils.isNotEmpty(contentMessage.getId()) && !contentMessage.getId().equals("0")) {//更新 messTemp = messageTemplateService.selectById(contentMessage.getId()); - if(messTemp!=null){ + if (messTemp != null) { messTemp.setModifyTime(new Date()); } operationName = "修改"; + Wrapper wrapper = new EntityWrapper<>(); + wrapper.where("TEMPLET_MSG_ID={0}", contentMessage.getId()); + List contentDoctorMessages = contentDoctorMessageService.selectList(wrapper); + if (CollectionUtils.isNotEmpty(contentDoctorMessages)) {//同步更新医院的短消息 + for (ContentDoctorMessage message : contentDoctorMessages) { + message.setContent(contentMessage.getContent()); + message.setRichTitle(contentMessage.getRichTitle()); + message.setRichText(contentMessage.getRichText()); + message.setIsRich(contentMessage.getIsRich()); + Map map = new HashMap<>(); + map.put("HOSPITAL_MESSAGE_ID", message.getId()); + //先删除标签关系 + contentHospitalMessageTagsService.deleteByMap(map); + List tempTags = new ArrayList<>(); + for (String tags : contentMessage.getContentTagIds()) { + ContentHospitalMessageTags ctmt = new ContentHospitalMessageTags(); + ctmt.setId(StrUtils.uuid()); + ctmt.setHospitalMessageId(message.getId()); + ctmt.setTagsIds(tags); + tempTags.add(ctmt); + } + contentHospitalMessageTagsService.insertBatch(tempTags); + } + contentDoctorMessageService.updateBatchById(contentDoctorMessages); + } Map map = new HashMap<>(); - map.put("MESSAGE_TEMPLATE",messTemp.getId()); + map.put("MESSAGE_TEMPLATE", messTemp.getId()); //先删除标签关系 messageTagsService.deleteByMap(map); - }else{ + } else { messTemp.setId(StrUtils.uuid()); - messTemp.setEnable(0); + messTemp.setEnable(1); messTemp.setIfdel(0); messTemp.setCreateTime(new Date()); messTemp.setKeyCode(messTemp.getId()); @@ -163,7 +209,7 @@ public class ContentMessageTemplateController extends BaseController { } boolean tags = messageTagsService.insertBatch(tempTags); boolean tag = messageTemplateService.insertOrUpdate(messTemp); - return handleAjaxResult(ajaxResult, tag&&tags, operationName); + return handleAjaxResult(ajaxResult, tag && tags, operationName); } } diff --git a/parent/center.manager/src/main/webapp/WEB-INF/views/content/org_msg_edit.html b/parent/center.manager/src/main/webapp/WEB-INF/views/content/org_msg_edit.html index 19a3e57..8ac122f 100644 --- a/parent/center.manager/src/main/webapp/WEB-INF/views/content/org_msg_edit.html +++ b/parent/center.manager/src/main/webapp/WEB-INF/views/content/org_msg_edit.html @@ -12,6 +12,7 @@

+
diff --git a/parent/center.manager/src/main/webapp/WEB-INF/views/content/org_operate.html b/parent/center.manager/src/main/webapp/WEB-INF/views/content/org_operate.html index 58462d7..3afeaab 100644 --- a/parent/center.manager/src/main/webapp/WEB-INF/views/content/org_operate.html +++ b/parent/center.manager/src/main/webapp/WEB-INF/views/content/org_operate.html @@ -6,14 +6,14 @@
@@ -101,6 +101,9 @@