From be7f0052b7da1ae4685c96b7323622eaf7fd8397 Mon Sep 17 00:00:00 2001 From: "1378012178@qq.com" <1378012178@qq.com> Date: Tue, 23 Dec 2025 10:59:19 +0800 Subject: [PATCH] =?UTF-8?q?1=EF=BC=89=E5=8E=BB=E9=99=A4=E6=A0=87=E5=87=86?= =?UTF-8?q?=E6=8C=87=E4=BB=A4=E5=BA=93=E3=80=81=E5=B7=AE=E5=BC=82=E6=AF=94?= =?UTF-8?q?=E5=AF=B9=E3=80=81=E5=B7=AE=E5=BC=82=E6=8C=87=E4=BB=A4=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=20=092=EF=BC=89=E5=8E=BB=E9=99=A4=E6=89=80=E6=9C=89?= =?UTF-8?q?=E6=A0=87=E5=87=86=E6=8C=87=E4=BB=A4=E5=BA=93=E6=A6=82=E5=BF=B5?= =?UTF-8?q?=E5=85=88=E5=85=B3=E6=93=8D=E4=BD=9C=E5=8F=8A=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E9=80=BB=E8=BE=91=20=093=EF=BC=89=E4=BB=BB=E4=B8=80=E6=9C=BA?= =?UTF-8?q?=E6=9E=84=E5=9D=87=E5=8F=AF=E5=88=9B=E5=BB=BA=E4=BB=BB=E6=84=8F?= =?UTF-8?q?=E5=88=86=E7=B1=BB=E6=A0=87=E7=AD=BE=E3=80=81=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?=E7=B1=BB=E5=88=AB=E3=80=81=E6=9C=8D=E5=8A=A1=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E3=80=81=E6=9C=8D=E5=8A=A1=E6=8C=87=E4=BB=A4=E4=BB=A5=E5=8F=8A?= =?UTF-8?q?=E7=BC=96=E8=BE=91=E4=BB=BB=E6=84=8F=E5=AD=97=E6=AE=B5=20=094?= =?UTF-8?q?=EF=BC=89=E6=96=B0=E5=A2=9E=E9=95=9C=E5=83=8F=E7=A0=81=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E5=8A=9F=E8=83=BD=EF=BC=9A=E6=9C=AA=E7=94=9F=E6=88=90?= =?UTF-8?q?=E9=95=9C=E5=83=8F=E7=A0=81=E6=9C=BA=E6=9E=84=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E7=94=9F=E6=88=90=E9=95=9C=E5=83=8F=E7=A0=81=EF=BC=8C=E5=8F=AF?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=E9=95=9C=E5=83=8F=E7=A0=81=EF=BC=8C=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=E5=90=8E=E6=97=A7=E7=9A=84=E9=95=9C=E5=83=8F=E7=A0=81?= =?UTF-8?q?=E5=B0=86=E5=A4=B1=E6=95=88=EF=BC=9B=E5=8F=AF=E9=80=9A=E8=BF=87?= =?UTF-8?q?=E5=A4=8D=E5=88=B6=E6=8C=89=E9=92=AE=E5=BF=AB=E9=80=9F=E5=A4=8D?= =?UTF-8?q?=E5=88=B6=E9=95=9C=E5=83=8F=E7=A0=81=20=095=EF=BC=89=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E6=9C=8D=E5=8A=A1=E6=8C=87=E4=BB=A4=E5=BA=93=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=EF=BC=9A=E9=9C=80=E8=A6=81=E5=85=88=E8=BE=93=E5=85=A5?= =?UTF-8?q?=E5=91=A8=E6=AD=A3=E7=A1=AE=E7=9A=84=E9=95=9C=E5=83=8F=E7=A0=81?= =?UTF-8?q?=E5=90=8E=EF=BC=8C=E5=8F=AF=E6=9F=A5=E7=9C=8B=E5=AF=B9=E5=BA=94?= =?UTF-8?q?=E6=9C=BA=E6=9E=84=E6=89=80=E6=9C=89=E6=9C=8D=E5=8A=A1=E6=8C=87?= =?UTF-8?q?=E4=BB=A4=EF=BC=8C=E5=B9=B6=E5=8F=AF=E2=80=9C=E9=95=9C=E5=83=8F?= =?UTF-8?q?=E2=80=9D=E5=88=B0=E6=9C=AC=E6=9C=BA=E6=9E=84=E4=B8=AD=EF=BC=8C?= =?UTF-8?q?=E5=A6=82=E6=9E=9C=E5=88=86=E7=B1=BB=E6=A0=87=E7=AD=BE=E3=80=81?= =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E7=B1=BB=E5=88=AB=E3=80=81=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E3=80=81=E6=9C=8D=E5=8A=A1=E5=90=8D=E7=A7=B0?= =?UTF-8?q?=E6=B1=89=E5=AD=97=E5=AE=8C=E5=85=A8=E4=B8=80=E8=87=B4=EF=BC=8C?= =?UTF-8?q?=E5=88=99=E8=AE=A4=E5=AE=9A=E4=B8=BA=E5=90=8C=E4=B8=80=E6=9C=8D?= =?UTF-8?q?=E5=8A=A1=E6=8C=87=E4=BB=A4=EF=BC=8C=E4=B8=8D=E4=BC=9A=E9=87=8D?= =?UTF-8?q?=E5=A4=8D=E9=95=9C=E5=83=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/nu/dto/DirectiveOpeLogInfoMQDto.java | 67 ++++++++ .../com/nu/dto/DirectiveOpeLogMainMQDto.java | 41 +++++ .../ConfigServiceDirectiveController.java | 153 +++++++++++++++++- .../mapper/ConfigServiceDirectiveMapper.java | 2 + .../xml/ConfigServiceDirectiveMapper.xml | 18 +++ .../IConfigServiceDirectiveService.java | 2 + .../ConfigServiceDirectiveServiceImpl.java | 5 + 7 files changed, 287 insertions(+), 1 deletion(-) create mode 100644 nursing-unit-common/src/main/java/com/nu/dto/DirectiveOpeLogInfoMQDto.java create mode 100644 nursing-unit-common/src/main/java/com/nu/dto/DirectiveOpeLogMainMQDto.java diff --git a/nursing-unit-common/src/main/java/com/nu/dto/DirectiveOpeLogInfoMQDto.java b/nursing-unit-common/src/main/java/com/nu/dto/DirectiveOpeLogInfoMQDto.java new file mode 100644 index 00000000..4c27f51d --- /dev/null +++ b/nursing-unit-common/src/main/java/com/nu/dto/DirectiveOpeLogInfoMQDto.java @@ -0,0 +1,67 @@ +package com.nu.dto; + +import lombok.Data; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; + +/** + * @Description: 服务指令操作日志详情表 + * @Author: jeecg-boot + * @Date: 2025-12-22 + * @Version: V1.0 + */ +@Data +public class DirectiveOpeLogInfoMQDto implements Serializable { + private static final long serialVersionUID = 1L; + + /**id*/ + private String id; + /**nu_config_directive_ope_log_main.id*/ + private String pkId; + /**分类标签*/ + private String instructionTagId; + /**分类标签名称*/ + private String instructionTagName; + /**服务类别id*/ + private String categoryId; + /**服务类别名称*/ + private String categoryName; + /**服务类型id*/ + private String typeId; + /**服务类型名称*/ + private String typeName; + /**服务指令id*/ + private String directiveId; + /**服务指令名称*/ + private String directiveName; + /**收费价格*/ + private BigDecimal tollPrice; + /**提成价格*/ + private BigDecimal comPrice; + /**周期类型 1日常护理 2周期护理 3即时护理*/ + private String cycleType; + /**服务说明*/ + private String serviceContent; + /**服务时长（分钟）*/ + private String serviceDuration; + /**所属部门*/ + private String sysOrgCode; + /**语音文件*/ + private String mp3File; + /**视频文件*/ + private String mp4File; + /**服务指令图片大图*/ + private String previewFile; + /**服务指令图片小图*/ + private String previewFileSmall; + /**即时指令图片*/ + private String immediateFile; + /**即时指令焦点图片*/ + private String immediateFileFocus; + /**创建日期*/ + private Date createTime; + /**数据类型 1修改前 2修改后*/ + private String dataType; +} diff --git a/nursing-unit-common/src/main/java/com/nu/dto/DirectiveOpeLogMainMQDto.java b/nursing-unit-common/src/main/java/com/nu/dto/DirectiveOpeLogMainMQDto.java new file mode 100644 index 00000000..a76357e8 --- /dev/null +++ b/nursing-unit-common/src/main/java/com/nu/dto/DirectiveOpeLogMainMQDto.java @@ -0,0 +1,41 @@ +package com.nu.dto; + +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; +import java.util.List; + +/** + * @Description: 服务指令操作日志主表 + * @Author: jeecg-boot + * @Date: 2025-12-22 + * @Version: V1.0 + */ +@Data +public class DirectiveOpeLogMainMQDto implements Serializable { + private static final long serialVersionUID = 1L; + + /**id*/ + private String id; + /**机构编码*/ + private String orgCode; + /**操作类型 1新增 2修改*/ + private String opeType; + /**操作人*/ + private String createBy; + /**操作日期*/ + private Date createTime; + /**分类标签名称*/ + private String instructionTagName; + /**服务类别名称*/ + private String categoryName; + /**服务类型名称*/ + private String typeName; + /**服务指令名称*/ + private String directiveName; + /**周期类型名称*/ + private String cycleTypeName; + + private List opeInfoList; +} diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicedirective/controller/ConfigServiceDirectiveController.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicedirective/controller/ConfigServiceDirectiveController.java index 84c9d940..e6da28b7 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicedirective/controller/ConfigServiceDirectiveController.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicedirective/controller/ConfigServiceDirectiveController.java @@ -8,6 +8,8 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.nu.dto.DirectiveAsyncMQDto; +import com.nu.dto.DirectiveOpeLogInfoMQDto; +import com.nu.dto.DirectiveOpeLogMainMQDto; import com.nu.modules.config.canadddirective.entity.CanAddDirective; import com.nu.modules.config.canadddirective.service.ICanAddDirectiveService; import com.nu.modules.config.servicedirective.entity.ConfigServiceDirective; @@ -19,12 +21,14 @@ import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.apache.commons.compress.utils.Lists; import org.apache.commons.lang.StringUtils; +import org.apache.shiro.SecurityUtils; import org.jeecg.common.api.vo.Result; import org.jeecg.common.aspect.annotation.AutoLog; import org.jeecg.common.system.api.ISysBaseAPI; import org.jeecg.common.system.base.controller.JeecgController; import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.common.system.query.QueryRuleEnum; +import org.jeecg.common.system.vo.LoginUser; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; @@ -283,13 +287,58 @@ public class ConfigServiceDirectiveController extends JeecgController infoList = Lists.newArrayList(); + DirectiveOpeLogInfoMQDto info = new DirectiveOpeLogInfoMQDto(); + info.setPkId(opeId);//主表id + info.setInstructionTagId(configServiceDirective.getInstructionTagId());//分类标签ID + info.setInstructionTagName(configServiceDirective.getInstructionName());//分类标签名称 + info.setCategoryId(configServiceDirective.getCategoryId());//服务类别id + info.setCategoryName(configServiceDirective.getCategoryName());//服务类别名称 + info.setTypeId(configServiceDirective.getTypeId());//服务类型ID + info.setTypeName(configServiceDirective.getTypeName());//服务类型名称 + info.setDirectiveId(configServiceDirective.getId());//服务指令ID + info.setDirectiveName(configServiceDirective.getDirectiveName());//服务指令名称 + info.setTollPrice(configServiceDirective.getTollPrice());//收费价格 + info.setComPrice(configServiceDirective.getComPrice());//提成价格 + info.setCycleType(configServiceDirective.getCycleType());//周期类型 + info.setServiceContent(configServiceDirective.getServiceContent());//服务说明 + info.setServiceDuration(configServiceDirective.getServiceDuration());//服务时长 + info.setSysOrgCode(configServiceDirective.getSysOrgCode());//所属部门 + info.setMp3File(configServiceDirective.getMp3File());//语音文件 + info.setMp4File(configServiceDirective.getMp4File());//视频文件 + info.setPreviewFile(configServiceDirective.getPreviewFile());//服务指令图片大图 + info.setPreviewFileSmall(configServiceDirective.getPreviewFileSmall());//服务指令图片小图 + info.setImmediateFile(configServiceDirective.getImmediateFile());//即时指令图片 + info.setImmediateFileFocus(configServiceDirective.getImmediateFileFocus());//即时指令焦点图片 + info.setCreateTime(new Date());//创建日期 + infoList.add(info); + mainMQDto.setOpeInfoList(infoList); + rabbitMQUtil.sendToExchange("hldy.directive", "hldy.directive.ope", mainMQDto); + } + return Result.OK("添加成功！"); } @@ -350,6 +399,8 @@ public class ConfigServiceDirectiveController extends JeecgController edit(@RequestBody ConfigServiceDirective configServiceDirective) { + ConfigServiceDirective his = configServiceDirectiveService.queryTranslate(configServiceDirective.getId()); + //处理媒体资源（放在保存方法之前） // configServiceDirectiveService.handleMediaFile(configServiceDirective); configServiceDirectiveService.updateById(configServiceDirective); @@ -372,6 +423,106 @@ public class ConfigServiceDirectiveController extends JeecgController infoList = Lists.newArrayList(); + //修改前 + { + DirectiveOpeLogInfoMQDto info = new DirectiveOpeLogInfoMQDto(); + info.setPkId(opeId);//主表id + info.setInstructionTagId(his.getInstructionTagId());//分类标签ID + info.setInstructionTagName(his.getInstructionName());//分类标签名称 + info.setCategoryId(his.getCategoryId());//服务类别id + info.setCategoryName(his.getCategoryName());//服务类别名称 + info.setTypeId(his.getTypeId());//服务类型ID + info.setTypeName(his.getTypeName());//服务类型名称 + info.setDirectiveId(his.getId());//服务指令ID + info.setDirectiveName(his.getDirectiveName());//服务指令名称 + info.setTollPrice(his.getTollPrice());//收费价格 + info.setComPrice(his.getComPrice());//提成价格 + info.setCycleType(his.getCycleType());//周期类型 + info.setServiceContent(his.getServiceContent());//服务说明 + info.setServiceDuration(his.getServiceDuration());//服务时长 + info.setSysOrgCode(his.getSysOrgCode());//所属部门 + info.setMp3File(his.getMp3File());//语音文件 + info.setMp4File(his.getMp4File());//视频文件 + info.setPreviewFile(his.getPreviewFile());//服务指令图片大图 + info.setPreviewFileSmall(his.getPreviewFileSmall());//服务指令图片小图 + info.setImmediateFile(his.getImmediateFile());//即时指令图片 + info.setImmediateFileFocus(his.getImmediateFileFocus());//即时指令焦点图片 + info.setCreateTime(new Date());//创建日期 + info.setDataType("1"); + infoList.add(info); + } + //修改后 + { + DirectiveOpeLogInfoMQDto info = new DirectiveOpeLogInfoMQDto(); + info.setPkId(opeId);//主表id + info.setInstructionTagId(configServiceDirective.getInstructionTagId());//分类标签ID + info.setInstructionTagName(configServiceDirective.getInstructionName());//分类标签名称 + info.setCategoryId(configServiceDirective.getCategoryId());//服务类别id + info.setCategoryName(configServiceDirective.getCategoryName());//服务类别名称 + info.setTypeId(configServiceDirective.getTypeId());//服务类型ID + info.setTypeName(configServiceDirective.getTypeName());//服务类型名称 + info.setDirectiveId(configServiceDirective.getId());//服务指令ID + info.setDirectiveName(configServiceDirective.getDirectiveName());//服务指令名称 + info.setTollPrice(configServiceDirective.getTollPrice());//收费价格 + info.setComPrice(configServiceDirective.getComPrice());//提成价格 + info.setCycleType(configServiceDirective.getCycleType());//周期类型 + info.setServiceContent(configServiceDirective.getServiceContent());//服务说明 + info.setServiceDuration(configServiceDirective.getServiceDuration());//服务时长 + info.setSysOrgCode(his.getSysOrgCode());//所属部门 + info.setMp3File(configServiceDirective.getMp3File());//语音文件 + info.setMp4File(configServiceDirective.getMp4File());//视频文件 + info.setPreviewFile(configServiceDirective.getPreviewFile());//服务指令图片大图 + info.setPreviewFileSmall(configServiceDirective.getPreviewFileSmall());//服务指令图片小图 + info.setImmediateFile(configServiceDirective.getImmediateFile());//即时指令图片 + info.setImmediateFileFocus(configServiceDirective.getImmediateFileFocus());//即时指令焦点图片 + info.setCreateTime(new Date());//创建日期 + info.setDataType("2"); + infoList.add(info); + } + mainMQDto.setOpeInfoList(infoList); + + boolean hasChanges = !Objects.equals(his.getInstructionTagId(), configServiceDirective.getInstructionTagId()) + || !Objects.equals(his.getInstructionName(), configServiceDirective.getInstructionName()) + || !Objects.equals(his.getCategoryId(), configServiceDirective.getCategoryId()) + || !Objects.equals(his.getCategoryName(), configServiceDirective.getCategoryName()) + || !Objects.equals(his.getTypeId(), configServiceDirective.getTypeId()) + || !Objects.equals(his.getTypeName(), configServiceDirective.getTypeName()) + || !Objects.equals(his.getDirectiveName(), configServiceDirective.getDirectiveName()) + || !Objects.equals(his.getTollPrice(), configServiceDirective.getTollPrice()) + || !Objects.equals(his.getComPrice(), configServiceDirective.getComPrice()) + || !Objects.equals(his.getCycleType(), configServiceDirective.getCycleType()) + || !Objects.equals(his.getServiceContent(), configServiceDirective.getServiceContent()) + || !Objects.equals(his.getServiceDuration(), configServiceDirective.getServiceDuration()) + || !Objects.equals(his.getMp3File(), configServiceDirective.getMp3File()) + || !Objects.equals(his.getMp4File(), configServiceDirective.getMp4File()) + || !Objects.equals(his.getPreviewFile(), configServiceDirective.getPreviewFile()) + || !Objects.equals(his.getPreviewFileSmall(), configServiceDirective.getPreviewFileSmall()) + || !Objects.equals(his.getImmediateFile(), configServiceDirective.getImmediateFile()) + || !Objects.equals(his.getImmediateFileFocus(), configServiceDirective.getImmediateFileFocus()); + + if (hasChanges) { + rabbitMQUtil.sendToExchange("hldy.directive", "hldy.directive.ope", mainMQDto); + } + } + return Result.OK("编辑成功!"); } diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicedirective/mapper/ConfigServiceDirectiveMapper.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicedirective/mapper/ConfigServiceDirectiveMapper.java index e00db127..2569e554 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicedirective/mapper/ConfigServiceDirectiveMapper.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicedirective/mapper/ConfigServiceDirectiveMapper.java @@ -80,4 +80,6 @@ public interface ConfigServiceDirectiveMapper extends BaseMapper queryAndTranslate(@Param("existIds") String[] existIds); + + ConfigServiceDirective queryTranslate(@Param("id") String id); } diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicedirective/mapper/xml/ConfigServiceDirectiveMapper.xml b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicedirective/mapper/xml/ConfigServiceDirectiveMapper.xml index 7e558f5b..1b3c42eb 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicedirective/mapper/xml/ConfigServiceDirectiveMapper.xml +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicedirective/mapper/xml/ConfigServiceDirectiveMapper.xml @@ -268,4 +268,22 @@ order by m.create_time desc + + diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicedirective/service/IConfigServiceDirectiveService.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicedirective/service/IConfigServiceDirectiveService.java index cfe65857..54fd7cd9 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicedirective/service/IConfigServiceDirectiveService.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicedirective/service/IConfigServiceDirectiveService.java @@ -76,4 +76,6 @@ public interface IConfigServiceDirectiveService extends IService