From d002314fca9ca28527ac1d200ea08f330198786e Mon Sep 17 00:00:00 2001 From: "1378012178@qq.com" <1378012178@qq.com> Date: Wed, 6 May 2026 15:29:17 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=9C=8D=E5=8A=A1=E6=8C=87?= =?UTF-8?q?=E4=BB=A4=E5=A4=9A=E4=BD=99=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/nu/dto/BodyTagMQDto.java | 41 - .../java/com/nu/dto/DirectiveAsyncMQDto.java | 31 - .../main/java/com/nu/dto/DirectiveMQDto.java | 4 - .../main/java/com/nu/dto/EmotionTagMQDto.java | 41 - .../java/com/nu/entity/DirectiveEntity.java | 33 - .../impl/DirectiveAppraisalServiceImpl.java | 157 +--- .../entity/BizConfigInstructionTag.java | 9 - .../entity/BizConfigServiceDirective.java | 26 - .../xml/BizConfigServiceDirectiveMapper.xml | 3 - .../care/job/DirectiveGenerateOrderJob.java | 1 + .../directivemedia/entity/DirectiveMedia.java | 1 - .../mapper/xml/DirectivePackageMapper.xml | 58 -- .../DirectiveBodyTagController.java | 176 ---- .../body/entity/DirectiveBodyTag.java | 79 -- .../body/entity/DirectiveBodyTagRelation.java | 28 - .../body/mapper/DirectiveBodyTagMapper.java | 19 - .../DirectiveBodyTagRelationMapper.java | 21 - .../mapper/xml/DirectiveBodyTagMapper.xml | 20 - .../xml/DirectiveBodyTagRelationMapper.xml | 27 - .../service/IDirectiveBodyTagService.java | 35 - .../impl/DirectiveBodyTagServiceImpl.java | 81 -- .../DirectiveEmotionTagController.java | 176 ---- .../emotion/entity/DirectiveEmotionTag.java | 79 -- .../entity/DirectiveEmotionTagRelation.java | 28 - .../mapper/DirectiveEmotionTagMapper.java | 19 - .../DirectiveEmotionTagRelationMapper.java | 22 - .../mapper/xml/DirectiveEmotionTagMapper.xml | 19 - .../xml/DirectiveEmotionTagRelationMapper.xml | 27 - .../service/IDirectiveEmotionTagService.java | 35 - .../impl/DirectiveEmotionTagServiceImpl.java | 81 -- .../instructiontag/entity/InstructionTag.java | 8 - .../entity/ConfigServiceCategory.java | 5 - .../ConfigServiceDirectiveController.java | 172 ---- .../entity/ConfigServiceDirective.java | 133 +-- .../servicedirective/entity/TreeNode.java | 4 - .../mapper/ConfigServiceDirectiveMapper.java | 49 +- .../xml/ConfigServiceDirectiveMapper.xml | 104 +-- .../IConfigServiceDirectiveService.java | 40 - .../ConfigServiceDirectiveServiceImpl.java | 360 +------- .../mapper/xml/ServiceTagMapper.xml | 59 -- .../service/impl/ServiceTagServiceImpl.java | 21 - .../servicetype/entity/ConfigServiceType.java | 5 - .../listener/DirectiveMQListener.java | 826 +----------------- 43 files changed, 60 insertions(+), 3103 deletions(-) delete mode 100644 nursing-unit-common/src/main/java/com/nu/dto/BodyTagMQDto.java delete mode 100644 nursing-unit-common/src/main/java/com/nu/dto/EmotionTagMQDto.java delete mode 100644 nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/directivetag/body/controller/DirectiveBodyTagController.java delete mode 100644 nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/directivetag/body/entity/DirectiveBodyTag.java delete mode 100644 nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/directivetag/body/entity/DirectiveBodyTagRelation.java delete mode 100644 nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/directivetag/body/mapper/DirectiveBodyTagMapper.java delete mode 100644 nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/directivetag/body/mapper/DirectiveBodyTagRelationMapper.java delete mode 100644 nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/directivetag/body/mapper/xml/DirectiveBodyTagMapper.xml delete mode 100644 nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/directivetag/body/mapper/xml/DirectiveBodyTagRelationMapper.xml delete mode 100644 nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/directivetag/body/service/IDirectiveBodyTagService.java delete mode 100644 nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/directivetag/body/service/impl/DirectiveBodyTagServiceImpl.java delete mode 100644 nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/directivetag/emotion/controller/DirectiveEmotionTagController.java delete mode 100644 nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/directivetag/emotion/entity/DirectiveEmotionTag.java delete mode 100644 nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/directivetag/emotion/entity/DirectiveEmotionTagRelation.java delete mode 100644 nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/directivetag/emotion/mapper/DirectiveEmotionTagMapper.java delete mode 100644 nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/directivetag/emotion/mapper/DirectiveEmotionTagRelationMapper.java delete mode 100644 nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/directivetag/emotion/mapper/xml/DirectiveEmotionTagMapper.xml delete mode 100644 nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/directivetag/emotion/mapper/xml/DirectiveEmotionTagRelationMapper.xml delete mode 100644 nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/directivetag/emotion/service/IDirectiveEmotionTagService.java delete mode 100644 nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/directivetag/emotion/service/impl/DirectiveEmotionTagServiceImpl.java diff --git a/nursing-unit-common/src/main/java/com/nu/dto/BodyTagMQDto.java b/nursing-unit-common/src/main/java/com/nu/dto/BodyTagMQDto.java deleted file mode 100644 index c1e3e4de..00000000 --- a/nursing-unit-common/src/main/java/com/nu/dto/BodyTagMQDto.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.nu.dto; - -import lombok.Data; - -import java.io.Serializable; - -/** - * @Description: 体型标签 - * @Author: 张明远 - * @Date: 2025-07-25 - * @Version: V1.0 - */ -@Data -public class BodyTagMQDto implements Serializable { - private static final long serialVersionUID = 1L; - - /** - * id - */ - private String id; - /** - * 标签名称 - */ - private String tagName; - /** - * 排序 - */ - private Integer sort; - /** - * 状态 0已授权 1未授权 - */ - private String status; - /** - * 是否启用 Y启用 N未启用 - */ - private String izEnabled; - /** - * 是否删除 0未删除 1删除 - */ - private String delFlag; -} diff --git a/nursing-unit-common/src/main/java/com/nu/dto/DirectiveAsyncMQDto.java b/nursing-unit-common/src/main/java/com/nu/dto/DirectiveAsyncMQDto.java index 0c3e3288..e2e19d7d 100644 --- a/nursing-unit-common/src/main/java/com/nu/dto/DirectiveAsyncMQDto.java +++ b/nursing-unit-common/src/main/java/com/nu/dto/DirectiveAsyncMQDto.java @@ -1,9 +1,6 @@ package com.nu.dto; -import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import org.jeecg.common.aspect.annotation.Dict; -import org.jeecgframework.poi.excel.annotation.Excel; import java.io.Serializable; @@ -43,18 +40,6 @@ public class DirectiveAsyncMQDto implements Serializable { * 提成价格 */ private java.math.BigDecimal comPrice; - /** - * 是否参与医保报销 0不报销 1报销 - */ - private String izReimbursement; - /** - * 是否参与机构优惠 0不参与 1参与 - */ - private String izPreferential; - /** - * 收费频次 1按次收费 2按天收费 - */ - private String chargingFrequency; /** * 指令类型 1日常护理 2周期护理 3即时护理 */ @@ -63,10 +48,6 @@ public class DirectiveAsyncMQDto implements Serializable { * 服务属性 ds定时 js计时 */ private String serviceAttribute; - /** - * 排序 - */ - private Integer sort; /** * 服务描述 */ @@ -75,10 +56,6 @@ public class DirectiveAsyncMQDto implements Serializable { * 服务时长（分钟） */ private String serviceDuration; - /** - * 超时时长（分钟） - */ - private String timeoutDuration; /** * 指令状态 */ @@ -168,14 +145,6 @@ public class DirectiveAsyncMQDto implements Serializable { private String typeName; //指令类型中文名称 private String cycleTypeName; - //体型标签id,id,id - private String bodyTags; - //情绪标签id,id,id - private String emotionTags; - //体型标签json字符串（有id、label） - private String bodyTagsObj; - //情绪标签json字符串（有id、label） - private String emotionTagsObj; //资源请求接口域名+项目上下文路径 private String api; } diff --git a/nursing-unit-common/src/main/java/com/nu/dto/DirectiveMQDto.java b/nursing-unit-common/src/main/java/com/nu/dto/DirectiveMQDto.java index 81f8e618..757208c9 100644 --- a/nursing-unit-common/src/main/java/com/nu/dto/DirectiveMQDto.java +++ b/nursing-unit-common/src/main/java/com/nu/dto/DirectiveMQDto.java @@ -28,10 +28,6 @@ public class DirectiveMQDto { private List categoryList; //服务类型字典项 private List typeList; - //体型标签字典项 - private List bodyTagList; - //情绪标签字典项 - private List emotionTagList; //是否同步指令资源 private boolean izSyncMedia; } diff --git a/nursing-unit-common/src/main/java/com/nu/dto/EmotionTagMQDto.java b/nursing-unit-common/src/main/java/com/nu/dto/EmotionTagMQDto.java deleted file mode 100644 index 04219cf8..00000000 --- a/nursing-unit-common/src/main/java/com/nu/dto/EmotionTagMQDto.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.nu.dto; - -import lombok.Data; - -import java.io.Serializable; - -/** - * @Description: 情绪标签 - * @Author: 张明远 - * @Date: 2025-07-25 - * @Version: V1.0 - */ -@Data -public class EmotionTagMQDto implements Serializable { - private static final long serialVersionUID = 1L; - - /** - * id - */ - private String id; - /** - * 标签名称 - */ - private String tagName; - /** - * 排序 - */ - private Integer sort; - /** - * 状态 0已授权 1未授权 - */ - private String status; - /** - * 是否启用 Y启用 N未启用 - */ - private String izEnabled; - /** - * 是否删除 0未删除 1删除 - */ - private String delFlag; -} diff --git a/nursing-unit-common/src/main/java/com/nu/entity/DirectiveEntity.java b/nursing-unit-common/src/main/java/com/nu/entity/DirectiveEntity.java index 718818a5..70b69eff 100644 --- a/nursing-unit-common/src/main/java/com/nu/entity/DirectiveEntity.java +++ b/nursing-unit-common/src/main/java/com/nu/entity/DirectiveEntity.java @@ -44,26 +44,10 @@ public class DirectiveEntity implements Serializable { * 提成价格 */ private java.math.BigDecimal comPrice; - /** - * 是否参与医保报销 0不报销 1报销 - */ - private String izReimbursement; - /** - * 是否参与机构优惠 0不参与 1参与 - */ - private String izPreferential; - /** - * 收费频次 1按次收费 2按天收费 - */ - private String chargingFrequency; /** * 服务属性 ds定时 js计时 */ private String serviceAttribute; - /** - * 排序 - */ - private Integer sort; /** * 服务描述 */ @@ -72,11 +56,6 @@ public class DirectiveEntity implements Serializable { * 服务时长（分钟） */ private String serviceDuration; - /** - * 超时时长（分钟） - */ - private String timeoutDuration; - /** * 指令状态 */ @@ -167,10 +146,6 @@ public class DirectiveEntity implements Serializable { * 即时指令图标md5 */ private String immediateFileFocusMd5; - /** - * 是否下载tplink视频 Y下载 N不下载 - */ - private String izDownTplink; //即时指令图标是否变更 private boolean immediateFileChanged; @@ -184,10 +159,6 @@ public class DirectiveEntity implements Serializable { private Integer typeRowSpan; //合并单元格用：分类标签合并的行数 private Integer instructionRowSpan; - //体型标签id,id,id - private String bodyTags; - //情绪标签id,id,id - private String emotionTags; //分类标签中文名称 private String instructionName; @@ -197,10 +168,6 @@ public class DirectiveEntity implements Serializable { private String typeName; //媒体资源存储路径名 private String mediaFileSavePath; - //体型标签json字符串（前台封装好的 有id、label） - private String bodyTagsObj; - //情绪标签json字符串（前台封装好的 有id、label） - private String emotionTagsObj; //护理分类名称 private String instructionTagName; private String syncIds; diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/appraisal/service/impl/DirectiveAppraisalServiceImpl.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/appraisal/service/impl/DirectiveAppraisalServiceImpl.java index 68e228d5..b445c942 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/appraisal/service/impl/DirectiveAppraisalServiceImpl.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/appraisal/service/impl/DirectiveAppraisalServiceImpl.java @@ -2,23 +2,14 @@ package com.nu.modules.biz.appraisal.service.impl; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.nu.entity.EmployeesSalaryInfoEntity; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.nu.modules.IEmployeesSalaryApi; import com.nu.modules.biz.appraisal.entity.DirectiveAppraisal; import com.nu.modules.biz.appraisal.mapper.DirectiveAppraisalMapper; import com.nu.modules.biz.appraisal.service.IDirectiveAppraisalService; -import org.apache.commons.compress.utils.Lists; -import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; - -import java.math.BigDecimal; -import java.math.RoundingMode; -import java.util.Arrays; -import java.util.List; - /** * @Description: 护理单元-服务指令-工单 * @Author: jeecg-boot @@ -45,150 +36,4 @@ public class DirectiveAppraisalServiceImpl extends ServiceImpl optIds = Arrays.asList(directiveAppraisal.getOptIds().split(",")); -// //员工姓名 -// List optNames = Arrays.asList(directiveAppraisal.getOptNames().split(",")); -// -// if ("2".equals(directiveAppraisal.getStatus())) { -// // 考核通过 - 一个人执行的直接就是之前算好的提成 多人的话平均 例如：3人执行 提成是1元的话 每人3毛3分 -// tiCheng = directiveAppraisal.getYsComPrice(); -// -// // 总共几个人执行的 -// int renShu = optIds.size(); -// -// if (renShu > 0) { -// // 计算每人提成，精确到2位小数，向下取整 比如 1元 3人分 1÷3约等于0.33333 保留2位 第三位是向下取整 结果0.33 -// // 验证：4.01提成 3人分 4.01÷3约等于1.336666 保留2位1.33 第三位6向下取整0 结果 1.33 总共给3人3.99 < 4.01 差2分 -// meiRenTiCheng = tiCheng.divide(new BigDecimal(renShu), 2, RoundingMode.DOWN); -// } -// -// } -// if ("3".equals(directiveAppraisal.getStatus())) { -// //考核不通过 - 员工提成：0 长者收费：0 -// tiCheng = new BigDecimal(0); -// meiRenTiCheng = new BigDecimal(0); -// } -// -// //首次考核就是向员工薪资明显表插入数据 因为有撤回功能 所以可能出现二次及以上考核 此时就是更新了 所以需要先用id查询 有则更新否则新增 -// //如果是多人执行 需要给多人插入数据 - 新增时把员工id/姓名拆分成对应的人（orderNo单号是一样的 一个单号对应一个具体的指令） 修改时根据单号一样的一条/多条数据的值（钱、状态） -// List handleData = Lists.newArrayList(); -// for (int i = 0; i < optIds.size(); i++) { -// EmployeesSalaryInfoEntity empSalary = new EmployeesSalaryInfoEntity(); -// //员工信息 -// empSalary.setEmployeeId(optIds.get(i)); -// empSalary.setEmployeeName(optNames.get(i)); -// //员工提成 -// empSalary.setRealComPrice(meiRenTiCheng); -// //工单单号 - 用于关联原始工单 -// empSalary.setOrderNo(directiveAppraisal.getOrderNo()); -// //工单类型 - 1护理、2医疗、3库房、4行政 -// empSalary.setOrderType(directiveAppraisal.getOrderType()); -// //护理单元ID - 关联nu_base_info表 -// empSalary.setNuId(directiveAppraisal.getNuId()); -// //护理单元名称 -// empSalary.setNuName(directiveAppraisal.getNuName()); -// //长者ID - 关联nu_biz_elder_info表 -// empSalary.setElderId(directiveAppraisal.getElderId()); -// //长者名称 -// empSalary.setElderName(directiveAppraisal.getElderName()); -// //分类标签ID - 关联nu_config_service_instruction_tag表 -// empSalary.setInstructionTagId(directiveAppraisal.getInstructionTagId()); -// //分类标签名称 -// empSalary.setInstructionTagName(directiveAppraisal.getInstructionTagName()); -// //服务类别ID - 关联nu_config_service_category表 -// empSalary.setCategoryId(directiveAppraisal.getCategoryId()); -// //服务类别名称 -// empSalary.setCategoryName(directiveAppraisal.getCategoryName()); -// //服务类型ID - 关联nu_config_service_type表 -// empSalary.setTypeId(directiveAppraisal.getTypeId()); -// //服务属性 - ds定时/js计时 -// empSalary.setServiceAttribute(directiveAppraisal.getServiceAttribute()); -// //服务类型名称 -// empSalary.setTypeName(directiveAppraisal.getTypeName()); -// //服务指令ID - 关联nu_config_service_directive表 -// empSalary.setDirectiveId(directiveAppraisal.getDirectiveId()); -// //服务指令名称 -// empSalary.setDirectiveName(directiveAppraisal.getDirectiveName()); -// //周期类型ID -// empSalary.setCycleTypeId(directiveAppraisal.getCycleTypeId()); -// //周期类型 -// empSalary.setCycleType(directiveAppraisal.getCycleType()); -// //周期值 -// empSalary.setCycleValue(directiveAppraisal.getCycleValue()); -// //服务时长（分钟） -// empSalary.setServiceDuration(directiveAppraisal.getServiceDuration()); -// //服务说明 -// empSalary.setServiceContent(directiveAppraisal.getServiceContent()); -// //基础价格 -// empSalary.setTollPrice(directiveAppraisal.getTollPrice()); -// //提成价格 -// empSalary.setComPrice(directiveAppraisal.getComPrice()); -// //标签总价格 -// empSalary.setTagTotalPrice(directiveAppraisal.getTagTotalPrice()); -// //应收提成价格 -// empSalary.setYsComPrice(directiveAppraisal.getYsComPrice()); -// //服务指令包ID -// empSalary.setPackageId(directiveAppraisal.getPackageId()); -// //服务指令包名称 -// empSalary.setPackageName(directiveAppraisal.getPackageName()); -// //是否为服务指令包 - Y是/N否 -// empSalary.setIzPackage(directiveAppraisal.getIzPackage()); -// //计划开始时间 -// empSalary.setStartTime(directiveAppraisal.getStartTime()); -// //计划结束时间 -// empSalary.setEndTime(directiveAppraisal.getEndTime()); -// //实际开始时间 -// empSalary.setBeginTime(directiveAppraisal.getBeginTime()); -// //实际结束时间 -// empSalary.setFinishTime(directiveAppraisal.getFinishTime()); -// //是否开始 - Y是/N否 -// empSalary.setIzStart(directiveAppraisal.getIzStart()); -// //是否完成 - Y是/N否 -// empSalary.setIzFinish(directiveAppraisal.getIzFinish()); -// //创建人 -// empSalary.setCreateBy(directiveAppraisal.getCreateBy()); -// //创建日期 -// empSalary.setCreateTime(directiveAppraisal.getCreateTime()); -// //更新人 -// empSalary.setUpdateBy(directiveAppraisal.getUpdateBy()); -// //更新日期 -// empSalary.setUpdateTime(directiveAppraisal.getUpdateTime()); -// //tplink下载地址 -// empSalary.setTplinkPath(directiveAppraisal.getTplinkPath()); -// //手动拍照路径 -// empSalary.setManuallyPicPath(directiveAppraisal.getManuallyPicPath()); -// //手动录制视频路径 -// empSalary.setManuallyMp4Path(directiveAppraisal.getManuallyMp4Path()); -// //执行类型 - 1单人/2协助/3转单 -// empSalary.setOptType(directiveAppraisal.getOptType()); -// //执行状态 - 1正常/2未执行/3超时 -// empSalary.setOptStatus(directiveAppraisal.getOptStatus()); -// //实际执行人ID（多个，逗号分隔） -// empSalary.setOptIds(directiveAppraisal.getOptIds()); -// //实际执行人名称（多个，逗号分隔） -// empSalary.setOptNames(directiveAppraisal.getOptNames()); -// //审核状态 - 0待审核/1通过/2未通过 -// empSalary.setStatus(directiveAppraisal.getStatus()); -// //驳回原因 -// empSalary.setContent(directiveAppraisal.getContent()); -// //撤回人 -// empSalary.setRevocation(directiveAppraisal.getRevocation()); -// //撤回时间 -// empSalary.setRevocationTime(directiveAppraisal.getRevocationTime()); -// -// handleData.add(empSalary); -// } -// //存储数据 -// //考核信息 -// directiveAppraisal.setRealComPrice(tiCheng); -// //薪资 -// employeesSalaryApi.auditFinish(handleData); -// baseMapper.updateById(directiveAppraisal); -// } } diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/common/entity/BizConfigInstructionTag.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/common/entity/BizConfigInstructionTag.java index a01e2dce..875866ec 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/common/entity/BizConfigInstructionTag.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/common/entity/BizConfigInstructionTag.java @@ -40,15 +40,6 @@ public class BizConfigInstructionTag implements Serializable { @Excel(name = "分类标签类型", width = 15) @ApiModelProperty(value = "分类标签类型") private String instructionType; - /**排序*/ - @Excel(name = "排序", width = 15) - @ApiModelProperty(value = "排序") - private Integer sort; - /**状态 0已授权 1未授权*/ - @Excel(name = "状态 0已授权 1未授权", width = 15) - @ApiModelProperty(value = "状态 0已授权 1未授权") - @Dict(dicCode = "status") - private String status; /**是否启用 Y启用 N未启用*/ @Excel(name = "是否启用", width = 15) @ApiModelProperty(value = "是否启用") diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/common/entity/BizConfigServiceDirective.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/common/entity/BizConfigServiceDirective.java index 70a4cdf9..6932330c 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/common/entity/BizConfigServiceDirective.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/common/entity/BizConfigServiceDirective.java @@ -64,22 +64,6 @@ public class BizConfigServiceDirective implements Serializable { @Excel(name = "提成价格", width = 15) @ApiModelProperty(value = "提成价格") private BigDecimal comPrice; - /**是否参与医保报销 0不报销 1报销*/ - @Excel(name = "是否参与医保报销 0不报销 1报销", width = 15) - @ApiModelProperty(value = "是否参与医保报销 0不报销 1报销") - private String izReimbursement; - /**是否参与机构优惠 0不参与 1参与*/ - @Excel(name = "是否参与机构优惠 0不参与 1参与", width = 15) - @ApiModelProperty(value = "是否参与机构优惠 0不参与 1参与") - private String izPreferential; - /**收费频次 1按次收费 2按天收费*/ - @Excel(name = "收费频次 1按次收费 2按天收费", width = 15) - @ApiModelProperty(value = "收费频次 1按次收费 2按天收费") - private String chargingFrequency; - /**排序*/ - @Excel(name = "排序", width = 15) - @ApiModelProperty(value = "排序") - private Integer sort; /**服务说明*/ @Excel(name = "服务说明", width = 15) @ApiModelProperty(value = "服务说明") @@ -88,10 +72,6 @@ public class BizConfigServiceDirective implements Serializable { @Excel(name = "服务时长（分钟）", width = 15) @ApiModelProperty(value = "服务时长（分钟）") private String serviceDuration; - /**超时时长（分钟）*/ - @Excel(name = "超时时长（分钟）", width = 15) - @ApiModelProperty(value = "超时时长（分钟）") - private String timeoutDuration; /**是否启用 Y启用 N未启用*/ @Excel(name = "是否启用 Y启用 N未启用", width = 15) @ApiModelProperty(value = "是否启用 Y启用 N未启用") @@ -148,10 +128,4 @@ public class BizConfigServiceDirective implements Serializable { */ @ApiModelProperty(value = "服务指令图片小图") private String previewFileSmall; - //体型标签 - @TableField(exist = false) - private String bodyTagName; - //情绪标签 - @TableField(exist = false) - private String emotionTagName; } diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/common/mapper/xml/BizConfigServiceDirectiveMapper.xml b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/common/mapper/xml/BizConfigServiceDirectiveMapper.xml index bd634305..a362fee7 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/common/mapper/xml/BizConfigServiceDirectiveMapper.xml +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/common/mapper/xml/BizConfigServiceDirectiveMapper.xml @@ -13,9 +13,6 @@ cst.type_name as typeName, csd.toll_price, csd.com_price, - csd.iz_reimbursement, - csd.iz_preferential, - csd.charging_frequency, csd.service_content, csd.service_duration, csd.iz_enabled, diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/plan/care/job/DirectiveGenerateOrderJob.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/plan/care/job/DirectiveGenerateOrderJob.java index e90be130..00e9e58f 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/plan/care/job/DirectiveGenerateOrderJob.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/plan/care/job/DirectiveGenerateOrderJob.java @@ -40,6 +40,7 @@ public class DirectiveGenerateOrderJob implements Job { //2026-03-24 10:10:00 -> 2026-03-24 10:15:00 //2026-03-24 23:58:20 -> 2026-03-25 00:00:00 //2026-03-24 23:59:59 -> 2026-03-25 00:00:00 + //测试 Date targetTime = getNextFiveMinuteTime(); DirectivePlanDateEntity queryParam = new DirectivePlanDateEntity(); diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/directivemedia/entity/DirectiveMedia.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/directivemedia/entity/DirectiveMedia.java index 7791012d..acba9ab4 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/directivemedia/entity/DirectiveMedia.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/directivemedia/entity/DirectiveMedia.java @@ -50,7 +50,6 @@ public class DirectiveMedia implements Serializable { @ApiModelProperty(value = "分类标签id") //数据源从配置文件读取 - 实验基地机构编码 @Dict(dicCode = "id", dictTable = "nu_config_service_instruction_tag", dicText = "instruction_name", ds = "${nu.org.master.code}") - private java.lang.String instructionTagId; /** * 服务类别id diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/directivepackage/mapper/xml/DirectivePackageMapper.xml b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/directivepackage/mapper/xml/DirectivePackageMapper.xml index ad93cb51..10f79a9e 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/directivepackage/mapper/xml/DirectivePackageMapper.xml +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/directivepackage/mapper/xml/DirectivePackageMapper.xml @@ -29,12 +29,8 @@ - - - - @@ -48,33 +44,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -108,9 +77,6 @@ csd.instruction_tag_id, csd.toll_price, csd.com_price, - csd.iz_reimbursement, - csd.iz_preferential, - csd.charging_frequency, csd.service_content, csd.service_duration, csd.timeout_duration as directive_timeout_duration, @@ -126,26 +92,6 @@ csd.preview_file, csd.immediate_file, csd.immediate_file_focus, - cdbt.id AS bodytag_id, - cdbt.tag_name AS bodytag_name, - cdbt.sort AS bodytag_sort, - cdbt.iz_enabled AS bodytag_iz_enabled, - cdbt.del_flag AS bodytag_del_flag, - cdbt.create_by AS bodytag_create_by, - cdbt.create_time AS bodytag_create_time, - cdbt.update_by AS bodytag_update_by, - cdbt.update_time AS bodytag_update_time, - cdbt.sys_org_code AS bodytag_sys_org_code, - cdet.id AS emotag_id, - cdet.tag_name AS emotag_name, - cdet.sort AS emotag_sort, - cdet.iz_enabled AS emotag_iz_enabled, - cdet.del_flag AS emotag_del_flag, - cdet.create_by AS emotag_create_by, - cdet.create_time AS emotag_create_time, - cdet.update_by AS emotag_update_by, - cdet.update_time AS emotag_update_time, - cdet.sys_org_code AS emotag_sys_org_code, csc.category_name AS csc_category_name, cst.type_name AS cst_type_name, insTag.instruction_name AS instruction_name @@ -166,10 +112,6 @@ ) dp LEFT JOIN nu_config_directive_package_item pd ON dp.id = pd.package_id LEFT JOIN nu_config_service_directive csd ON pd.directive_id = csd.id - LEFT JOIN nu_directive_body_tag bdt ON csd.id = bdt.directive_id - LEFT JOIN nu_config_body_tag cdbt ON bdt.tag_id = cdbt.id - LEFT JOIN nu_directive_emotion_tag edt ON csd.id = edt.directive_id - LEFT JOIN nu_config_emotion_tag cdet ON edt.tag_id = cdet.id LEFT JOIN nu_config_service_category csc ON csd.category_id = csc.id LEFT JOIN nu_config_service_type cst ON csd.type_id = cst.id left join nu_config_service_instruction_tag insTag on csd.instruction_tag_id = insTag.id diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/directivetag/body/controller/DirectiveBodyTagController.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/directivetag/body/controller/DirectiveBodyTagController.java deleted file mode 100644 index ef609472..00000000 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/directivetag/body/controller/DirectiveBodyTagController.java +++ /dev/null @@ -1,176 +0,0 @@ -package com.nu.modules.config.directivetag.body.controller; - -import cn.hutool.core.util.IdUtil; -import com.alibaba.fastjson.JSONObject; -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.modules.config.directivetag.body.entity.DirectiveBodyTag; -import com.nu.modules.config.directivetag.body.service.IDirectiveBodyTagService; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import lombok.extern.slf4j.Slf4j; -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.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; -import org.springframework.web.servlet.ModelAndView; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import java.util.Arrays; -import java.util.HashMap; -import java.util.Map; - -/** - * @Description: 体型标签 - * @Author: 张明远 - * @Date: 2025-03-17 - * @Version: V1.0 - */ -@Api(tags = "体型标签") -@RestController -@RequestMapping("/services/directiveTag/bodyTag") -@Slf4j -public class DirectiveBodyTagController extends JeecgController { - @Autowired - private IDirectiveBodyTagService directiveTagService; - @Autowired - private ISysBaseAPI sysBaseAPI; - - /** - * 分页列表查询 - * - * @param directiveTag - * @param pageNo - * @param pageSize - * @param req - * @return - */ - //@AutoLog(value = "体型标签-分页列表查询") - @ApiOperation(value = "体型标签-分页列表查询", notes = "体型标签-分页列表查询") - @GetMapping(value = "/list") - public Result> queryPageList(DirectiveBodyTag directiveTag, - @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, - @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, - HttpServletRequest req) { - // 自定义查询规则 - Map customeRuleMap = new HashMap<>(); - // 自定义多选的查询规则为：LIKE_WITH_OR - customeRuleMap.put("izEnabled", QueryRuleEnum.LIKE_WITH_OR); - QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(directiveTag, req.getParameterMap(), customeRuleMap); - Page page = new Page(pageNo, pageSize); - IPage pageList = directiveTagService.page(page, queryWrapper); - return Result.OK(pageList); - } - - /** - * 添加 - * - * @param directiveTag - * @return - */ - @AutoLog(value = "体型标签-添加") - @ApiOperation(value = "体型标签-添加", notes = "体型标签-添加") - @PostMapping(value = "/add") - public Result add(@RequestBody DirectiveBodyTag directiveTag) { - JSONObject deptInfo = sysBaseAPI.getDeptInfo(); - directiveTag.setId(deptInfo.getString("code") + IdUtil.simpleUUID()); - directiveTag.setSysOrgCode(deptInfo.getString("code")); - directiveTagService.save(directiveTag); - return Result.OK("添加成功！"); - } - - /** - * 编辑 - * - * @param directiveTag - * @return - */ - @AutoLog(value = "体型标签-编辑") - @ApiOperation(value = "体型标签-编辑", notes = "体型标签-编辑") - @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST}) - public Result edit(@RequestBody DirectiveBodyTag directiveTag) { - directiveTagService.updateById(directiveTag); - return Result.OK("编辑成功!"); - } - - /** - * 通过id删除 - * - * @param id - * @return - */ - @AutoLog(value = "体型标签-通过id删除") - @ApiOperation(value = "体型标签-通过id删除", notes = "体型标签-通过id删除") - @DeleteMapping(value = "/delete") - public Result delete(@RequestParam(name = "id", required = true) String id) { - if (directiveTagService.isUsed(id)) { - return Result.error("已被使用，无法删除!"); - } - directiveTagService.removeById(id); - return Result.OK("删除成功!"); - } - - /** - * 批量删除 - * - * @param ids - * @return - */ - @AutoLog(value = "体型标签-批量删除") - @ApiOperation(value = "体型标签-批量删除", notes = "体型标签-批量删除") - @DeleteMapping(value = "/deleteBatch") - public Result deleteBatch(@RequestParam(name = "ids", required = true) String ids) { - if (directiveTagService.isUsed(ids)) { - return Result.error("已被使用，无法删除!"); - } - this.directiveTagService.removeByIds(Arrays.asList(ids.split(","))); - return Result.OK("批量删除成功!"); - } - - /** - * 通过id查询 - * - * @param id - * @return - */ - //@AutoLog(value = "体型标签-通过id查询") - @ApiOperation(value = "体型标签-通过id查询", notes = "体型标签-通过id查询") - @GetMapping(value = "/queryById") - public Result queryById(@RequestParam(name = "id", required = true) String id) { - DirectiveBodyTag directiveTag = directiveTagService.getById(id); - if (directiveTag == null) { - return Result.error("未找到对应数据"); - } - return Result.OK(directiveTag); - } - - /** - * 导出excel - * - * @param request - * @param directiveTag - */ - @RequestMapping(value = "/exportXls") - public ModelAndView exportXls(HttpServletRequest request, DirectiveBodyTag directiveTag) { - return super.exportXls(request, directiveTag, DirectiveBodyTag.class, "体型标签"); - } - - /** - * 通过excel导入数据 - * - * @param request - * @param response - * @return - */ - @RequestMapping(value = "/importExcel", method = RequestMethod.POST) - public Result importExcel(HttpServletRequest request, HttpServletResponse response) { - return super.importExcel(request, response, DirectiveBodyTag.class); - } - -} diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/directivetag/body/entity/DirectiveBodyTag.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/directivetag/body/entity/DirectiveBodyTag.java deleted file mode 100644 index f7be3d61..00000000 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/directivetag/body/entity/DirectiveBodyTag.java +++ /dev/null @@ -1,79 +0,0 @@ -package com.nu.modules.config.directivetag.body.entity; - -import java.io.Serializable; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.annotation.TableLogic; -import lombok.Data; -import com.fasterxml.jackson.annotation.JsonFormat; -import org.springframework.format.annotation.DateTimeFormat; -import org.jeecgframework.poi.excel.annotation.Excel; -import org.jeecg.common.aspect.annotation.Dict; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -/** - * @Description: 体型标签 - * @Author: 张明远 - * @Date: 2025-03-17 - * @Version: V1.0 - */ -@Data -@TableName("nu_config_body_tag") -@Accessors(chain = true) -@EqualsAndHashCode(callSuper = false) -@ApiModel(value="nu_config_body_tag对象", description="体型标签") -public class DirectiveBodyTag implements Serializable { - private static final long serialVersionUID = 1L; - - /**id*/ - @TableId(type = IdType.ASSIGN_ID) - @ApiModelProperty(value = "id") - private String id; - /**标签名称*/ - @Excel(name = "标签名称", width = 15) - @ApiModelProperty(value = "标签名称") - private String tagName; - /**排序*/ - @Excel(name = "排序", width = 15) - @ApiModelProperty(value = "排序") - private Integer sort; - /**状态 0已授权 1未授权*/ - @Excel(name = "状态 0已授权 1未授权", width = 15) - @ApiModelProperty(value = "状态 0已授权 1未授权") - @Dict(dicCode = "status") - private java.lang.String status; - /**是否启用 Y启用 N未启用*/ - @Excel(name = "是否启用", width = 15, dicCode = "iz_enabled") - @Dict(dicCode = "iz_enabled") - @ApiModelProperty(value = "是否启用") - private String izEnabled; - /**是否删除 0未删除 1删除*/ - @Excel(name = "是否删除", width = 15) - @ApiModelProperty(value = "是否删除") - @TableLogic - private String delFlag; - /**创建人*/ - @ApiModelProperty(value = "创建人") - private String createBy; - /**创建日期*/ - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") - @ApiModelProperty(value = "创建日期") - private java.util.Date createTime; - /**更新人*/ - @ApiModelProperty(value = "更新人") - private String updateBy; - /**更新日期*/ - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") - @ApiModelProperty(value = "更新日期") - private java.util.Date updateTime; - /**所属部门*/ - @ApiModelProperty(value = "所属部门") - private String sysOrgCode; -} diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/directivetag/body/entity/DirectiveBodyTagRelation.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/directivetag/body/entity/DirectiveBodyTagRelation.java deleted file mode 100644 index d550235e..00000000 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/directivetag/body/entity/DirectiveBodyTagRelation.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.nu.modules.config.directivetag.body.entity; - -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -import java.io.Serializable; - -/** - * @Description: 服务指令-体型标签中间表 - * @Author: 张明远 - * @Date: 2025-4-23 09:26:04 - * @Version: V1.0 - */ -@Data -@TableName("nu_directive_body_tag") -@Accessors(chain = true) -@EqualsAndHashCode(callSuper = false) -@ApiModel(value="nu_directive_body_tag对象", description="服务指令-体型标签中间表") -public class DirectiveBodyTagRelation implements Serializable { - private static final long serialVersionUID = 1L; - - private String directiveId; - private String tagId; - -} diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/directivetag/body/mapper/DirectiveBodyTagMapper.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/directivetag/body/mapper/DirectiveBodyTagMapper.java deleted file mode 100644 index 4fc60572..00000000 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/directivetag/body/mapper/DirectiveBodyTagMapper.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.nu.modules.config.directivetag.body.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.nu.modules.config.directivetag.body.entity.DirectiveBodyTag; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * @Description: 体型标签 - * @Author: 张明远 - * @Date: 2025-03-17 - * @Version: V1.0 - */ -public interface DirectiveBodyTagMapper extends BaseMapper { - - List selectAll(@Param("ids") List ids,@Param("excludeIds") List excludeIds); - -} diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/directivetag/body/mapper/DirectiveBodyTagRelationMapper.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/directivetag/body/mapper/DirectiveBodyTagRelationMapper.java deleted file mode 100644 index d10a4519..00000000 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/directivetag/body/mapper/DirectiveBodyTagRelationMapper.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.nu.modules.config.directivetag.body.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.nu.modules.config.directivetag.body.entity.DirectiveBodyTagRelation; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * @Description: 体型标签 - * @Author: 张明远 - * @Date: 2025-03-17 - * @Version: V1.0 - */ -public interface DirectiveBodyTagRelationMapper extends BaseMapper { - void removeAll(); - - void removeAllRelation(); - - List selectAllRelation(@Param("ids") List ids,@Param("excludeIds") List excludeIds); -} diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/directivetag/body/mapper/xml/DirectiveBodyTagMapper.xml b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/directivetag/body/mapper/xml/DirectiveBodyTagMapper.xml deleted file mode 100644 index 0fbed5fe..00000000 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/directivetag/body/mapper/xml/DirectiveBodyTagMapper.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/directivetag/body/mapper/xml/DirectiveBodyTagRelationMapper.xml b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/directivetag/body/mapper/xml/DirectiveBodyTagRelationMapper.xml deleted file mode 100644 index 00a4b50b..00000000 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/directivetag/body/mapper/xml/DirectiveBodyTagRelationMapper.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - delete from nu_config_body_tag - - - - delete from nu_directive_body_tag - - - - diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/directivetag/body/service/IDirectiveBodyTagService.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/directivetag/body/service/IDirectiveBodyTagService.java deleted file mode 100644 index 0fdad735..00000000 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/directivetag/body/service/IDirectiveBodyTagService.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.nu.modules.config.directivetag.body.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.nu.modules.config.directivetag.body.entity.DirectiveBodyTag; -import com.nu.modules.config.directivetag.body.entity.DirectiveBodyTagRelation; - -import java.util.List; - -/** - * @Description: 体型标签 - * @Author: 张明远 - * @Date: 2025-03-17 - * @Version: V1.0 - */ -public interface IDirectiveBodyTagService extends IService { - - /** - * 查询数据是否已被使用 - * @param ids - * @return - */ - boolean isUsed(String id); - - public void removeAllRelation(); - - public List selectAllRelation(String dataSourceCode, List ids,List excludeIds); - - void insertAllRelation(List relations); - - List selectAll(String dataSourceCode, List ids,List excludeIds); - - List selectAll(List ids, List excludeIds); - - void insertAll(List bodyAll); -} diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/directivetag/body/service/impl/DirectiveBodyTagServiceImpl.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/directivetag/body/service/impl/DirectiveBodyTagServiceImpl.java deleted file mode 100644 index 41a2a392..00000000 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/directivetag/body/service/impl/DirectiveBodyTagServiceImpl.java +++ /dev/null @@ -1,81 +0,0 @@ -package com.nu.modules.config.directivetag.body.service.impl; - -import com.baomidou.dynamic.datasource.annotation.DS; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.nu.modules.config.directivetag.body.entity.DirectiveBodyTag; -import com.nu.modules.config.directivetag.body.entity.DirectiveBodyTagRelation; -import com.nu.modules.config.directivetag.body.mapper.DirectiveBodyTagMapper; -import com.nu.modules.config.directivetag.body.mapper.DirectiveBodyTagRelationMapper; -import com.nu.modules.config.directivetag.body.service.IDirectiveBodyTagService; -import com.nu.modules.config.servicedirective.mapper.ConfigServiceDirectiveMapper; -import org.apache.commons.lang.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.Arrays; -import java.util.List; - -/** - * @Description: 体型标签 - * @Author: 张明远 - * @Date: 2025-03-17 - * @Version: V1.0 - */ -@Service -public class DirectiveBodyTagServiceImpl extends ServiceImpl implements IDirectiveBodyTagService { - - @Autowired - private ConfigServiceDirectiveMapper serviceDirectiveMapper; - @Autowired - private DirectiveBodyTagRelationMapper tagRelationMapper; - - @Override - public boolean isUsed(String ids) { - if (StringUtils.isBlank(ids)) { - return false; - } - boolean result = false; - //是否已被服务指令使用 - int i = serviceDirectiveMapper.queryCountByBodyTagIds(Arrays.asList(ids.split(","))); - if (i > 0) { - result = true; - } - return result; - } - - @Override - public void removeAllRelation() { - tagRelationMapper.removeAll(); - tagRelationMapper.removeAllRelation(); - } - - @Override - @DS("#dataSourceCode") - public List selectAllRelation(String dataSourceCode, List ids,List excludeIds) { - return tagRelationMapper.selectAllRelation(ids,excludeIds); - } - - @Override - public void insertAllRelation(List idRelations) { - idRelations.forEach(ir -> { - tagRelationMapper.insert(ir); - }); - } - - @Override - @DS("#dataSourceCode") - public List selectAll(String dataSourceCode, List ids,List excludeIds) { - return baseMapper.selectAll(ids,excludeIds); - } - - @Override - public List selectAll(List ids, List excludeIds) { - return baseMapper.selectAll(ids, excludeIds); - } - @Override - public void insertAll(List bodyAll) { - bodyAll.forEach(b -> { - baseMapper.insert(b); - }); - } -} diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/directivetag/emotion/controller/DirectiveEmotionTagController.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/directivetag/emotion/controller/DirectiveEmotionTagController.java deleted file mode 100644 index 18e246c1..00000000 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/directivetag/emotion/controller/DirectiveEmotionTagController.java +++ /dev/null @@ -1,176 +0,0 @@ -package com.nu.modules.config.directivetag.emotion.controller; - -import cn.hutool.core.util.IdUtil; -import com.alibaba.fastjson.JSONObject; -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.modules.config.directivetag.emotion.entity.DirectiveEmotionTag; -import com.nu.modules.config.directivetag.emotion.service.IDirectiveEmotionTagService; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import lombok.extern.slf4j.Slf4j; -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.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; -import org.springframework.web.servlet.ModelAndView; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import java.util.Arrays; -import java.util.HashMap; -import java.util.Map; - -/** - * @Description: 情绪标签 - * @Author: 张明远 - * @Date: 2025-03-17 - * @Version: V1.0 - */ -@Api(tags = "情绪标签") -@RestController -@RequestMapping("/services/directiveTag/emotionTag") -@Slf4j -public class DirectiveEmotionTagController extends JeecgController { - @Autowired - private IDirectiveEmotionTagService directiveTagService; - @Autowired - private ISysBaseAPI sysBaseAPI; - - /** - * 分页列表查询 - * - * @param directiveTag - * @param pageNo - * @param pageSize - * @param req - * @return - */ - //@AutoLog(value = "情绪标签-分页列表查询") - @ApiOperation(value = "情绪标签-分页列表查询", notes = "情绪标签-分页列表查询") - @GetMapping(value = "/list") - public Result> queryPageList(DirectiveEmotionTag directiveTag, - @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, - @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, - HttpServletRequest req) { - // 自定义查询规则 - Map customeRuleMap = new HashMap<>(); - // 自定义多选的查询规则为：LIKE_WITH_OR - customeRuleMap.put("izEnabled", QueryRuleEnum.LIKE_WITH_OR); - QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(directiveTag, req.getParameterMap(), customeRuleMap); - Page page = new Page(pageNo, pageSize); - IPage pageList = directiveTagService.page(page, queryWrapper); - return Result.OK(pageList); - } - - /** - * 添加 - * - * @param directiveTag - * @return - */ - @AutoLog(value = "情绪标签-添加") - @ApiOperation(value = "情绪标签-添加", notes = "情绪标签-添加") - @PostMapping(value = "/add") - public Result add(@RequestBody DirectiveEmotionTag directiveTag) { - JSONObject deptInfo = sysBaseAPI.getDeptInfo(); - directiveTag.setId(deptInfo.getString("code") + IdUtil.simpleUUID()); - directiveTag.setSysOrgCode(deptInfo.getString("code")); - directiveTagService.save(directiveTag); - return Result.OK("添加成功！"); - } - - /** - * 编辑 - * - * @param directiveTag - * @return - */ - @AutoLog(value = "情绪标签-编辑") - @ApiOperation(value = "情绪标签-编辑", notes = "情绪标签-编辑") - @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST}) - public Result edit(@RequestBody DirectiveEmotionTag directiveTag) { - directiveTagService.updateById(directiveTag); - return Result.OK("编辑成功!"); - } - - /** - * 通过id删除 - * - * @param id - * @return - */ - @AutoLog(value = "情绪标签-通过id删除") - @ApiOperation(value = "情绪标签-通过id删除", notes = "情绪标签-通过id删除") - @DeleteMapping(value = "/delete") - public Result delete(@RequestParam(name = "id", required = true) String id) { - if (directiveTagService.isUsed(id)) { - return Result.error("已被使用，无法删除!"); - } - directiveTagService.removeById(id); - return Result.OK("删除成功!"); - } - - /** - * 批量删除 - * - * @param ids - * @return - */ - @AutoLog(value = "情绪标签-批量删除") - @ApiOperation(value = "情绪标签-批量删除", notes = "情绪标签-批量删除") - @DeleteMapping(value = "/deleteBatch") - public Result deleteBatch(@RequestParam(name = "ids", required = true) String ids) { - if (directiveTagService.isUsed(ids)) { - return Result.error("已被使用，无法删除!"); - } - this.directiveTagService.removeByIds(Arrays.asList(ids.split(","))); - return Result.OK("批量删除成功!"); - } - - /** - * 通过id查询 - * - * @param id - * @return - */ - //@AutoLog(value = "情绪标签-通过id查询") - @ApiOperation(value = "情绪标签-通过id查询", notes = "情绪标签-通过id查询") - @GetMapping(value = "/queryById") - public Result queryById(@RequestParam(name = "id", required = true) String id) { - DirectiveEmotionTag directiveTag = directiveTagService.getById(id); - if (directiveTag == null) { - return Result.error("未找到对应数据"); - } - return Result.OK(directiveTag); - } - - /** - * 导出excel - * - * @param request - * @param directiveTag - */ - @RequestMapping(value = "/exportXls") - public ModelAndView exportXls(HttpServletRequest request, DirectiveEmotionTag directiveTag) { - return super.exportXls(request, directiveTag, DirectiveEmotionTag.class, "情绪标签"); - } - - /** - * 通过excel导入数据 - * - * @param request - * @param response - * @return - */ - @RequestMapping(value = "/importExcel", method = RequestMethod.POST) - public Result importExcel(HttpServletRequest request, HttpServletResponse response) { - return super.importExcel(request, response, DirectiveEmotionTag.class); - } - -} diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/directivetag/emotion/entity/DirectiveEmotionTag.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/directivetag/emotion/entity/DirectiveEmotionTag.java deleted file mode 100644 index df1e452e..00000000 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/directivetag/emotion/entity/DirectiveEmotionTag.java +++ /dev/null @@ -1,79 +0,0 @@ -package com.nu.modules.config.directivetag.emotion.entity; - -import java.io.Serializable; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.annotation.TableLogic; -import lombok.Data; -import com.fasterxml.jackson.annotation.JsonFormat; -import org.springframework.format.annotation.DateTimeFormat; -import org.jeecgframework.poi.excel.annotation.Excel; -import org.jeecg.common.aspect.annotation.Dict; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -/** - * @Description: 情绪标签 - * @Author: 张明远 - * @Date: 2025-03-17 - * @Version: V1.0 - */ -@Data -@TableName("nu_config_emotion_tag") -@Accessors(chain = true) -@EqualsAndHashCode(callSuper = false) -@ApiModel(value="nu_config_emotion_tag对象", description="情绪标签") -public class DirectiveEmotionTag implements Serializable { - private static final long serialVersionUID = 1L; - - /**id*/ - @TableId(type = IdType.ASSIGN_ID) - @ApiModelProperty(value = "id") - private java.lang.String id; - /**标签名称*/ - @Excel(name = "标签名称", width = 15) - @ApiModelProperty(value = "标签名称") - private java.lang.String tagName; - /**排序*/ - @Excel(name = "排序", width = 15) - @ApiModelProperty(value = "排序") - private java.lang.Integer sort; - /**状态 0已授权 1未授权*/ - @Excel(name = "状态 0已授权 1未授权", width = 15) - @ApiModelProperty(value = "状态 0已授权 1未授权") - @Dict(dicCode = "status") - private java.lang.String status; - /**是否启用 Y启用 N未启用*/ - @Excel(name = "是否启用", width = 15, dicCode = "iz_enabled") - @Dict(dicCode = "iz_enabled") - @ApiModelProperty(value = "是否启用") - private java.lang.String izEnabled; - /**是否删除 0未删除 1删除*/ - @Excel(name = "是否删除", width = 15) - @ApiModelProperty(value = "是否删除") - @TableLogic - private java.lang.String delFlag; - /**创建人*/ - @ApiModelProperty(value = "创建人") - private java.lang.String createBy; - /**创建日期*/ - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") - @ApiModelProperty(value = "创建日期") - private java.util.Date createTime; - /**更新人*/ - @ApiModelProperty(value = "更新人") - private java.lang.String updateBy; - /**更新日期*/ - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") - @ApiModelProperty(value = "更新日期") - private java.util.Date updateTime; - /**所属部门*/ - @ApiModelProperty(value = "所属部门") - private java.lang.String sysOrgCode; -} diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/directivetag/emotion/entity/DirectiveEmotionTagRelation.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/directivetag/emotion/entity/DirectiveEmotionTagRelation.java deleted file mode 100644 index be2a84da..00000000 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/directivetag/emotion/entity/DirectiveEmotionTagRelation.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.nu.modules.config.directivetag.emotion.entity; - -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -import java.io.Serializable; - -/** - * @Description: 服务指令-情绪标签中间表 - * @Author: 张明远 - * @Date: 2025-4-23 09:26:04 - * @Version: V1.0 - */ -@Data -@TableName("nu_directive_emotion_tag") -@Accessors(chain = true) -@EqualsAndHashCode(callSuper = false) -@ApiModel(value="nu_directive_emotion_tag对象", description="服务指令-情绪标签中间表") -public class DirectiveEmotionTagRelation implements Serializable { - private static final long serialVersionUID = 1L; - - private String directiveId; - private String tagId; - -} diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/directivetag/emotion/mapper/DirectiveEmotionTagMapper.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/directivetag/emotion/mapper/DirectiveEmotionTagMapper.java deleted file mode 100644 index f31823ed..00000000 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/directivetag/emotion/mapper/DirectiveEmotionTagMapper.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.nu.modules.config.directivetag.emotion.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.nu.modules.config.directivetag.emotion.entity.DirectiveEmotionTag; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * @Description: 情绪标签 - * @Author: 张明远 - * @Date: 2025-03-17 - * @Version: V1.0 - */ -public interface DirectiveEmotionTagMapper extends BaseMapper { - - List selectAll(@Param("ids") List ids, @Param("excludeIds") List excludeIds); - -} diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/directivetag/emotion/mapper/DirectiveEmotionTagRelationMapper.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/directivetag/emotion/mapper/DirectiveEmotionTagRelationMapper.java deleted file mode 100644 index 9503e436..00000000 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/directivetag/emotion/mapper/DirectiveEmotionTagRelationMapper.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.nu.modules.config.directivetag.emotion.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.nu.modules.config.directivetag.emotion.entity.DirectiveEmotionTagRelation; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * @Description: 情绪标签 - * @Author: 张明远 - * @Date: 2025-03-17 - * @Version: V1.0 - */ -public interface DirectiveEmotionTagRelationMapper extends BaseMapper { - - void removeAll(); - - void removeAllRelation(); - - List selectAllRelation(@Param("ids") List ids, @Param("excludeIds") List excludeIds); -} diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/directivetag/emotion/mapper/xml/DirectiveEmotionTagMapper.xml b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/directivetag/emotion/mapper/xml/DirectiveEmotionTagMapper.xml deleted file mode 100644 index e9f28759..00000000 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/directivetag/emotion/mapper/xml/DirectiveEmotionTagMapper.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/directivetag/emotion/mapper/xml/DirectiveEmotionTagRelationMapper.xml b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/directivetag/emotion/mapper/xml/DirectiveEmotionTagRelationMapper.xml deleted file mode 100644 index 82b27483..00000000 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/directivetag/emotion/mapper/xml/DirectiveEmotionTagRelationMapper.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - delete - from nu_config_emotion_tag - - - delete - from nu_directive_emotion_tag - - - diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/directivetag/emotion/service/IDirectiveEmotionTagService.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/directivetag/emotion/service/IDirectiveEmotionTagService.java deleted file mode 100644 index 1f15ccd4..00000000 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/directivetag/emotion/service/IDirectiveEmotionTagService.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.nu.modules.config.directivetag.emotion.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.nu.modules.config.directivetag.emotion.entity.DirectiveEmotionTag; -import com.nu.modules.config.directivetag.emotion.entity.DirectiveEmotionTagRelation; - -import java.util.List; - -/** - * @Description: 情绪标签 - * @Author: 张明远 - * @Date: 2025-03-17 - * @Version: V1.0 - */ -public interface IDirectiveEmotionTagService extends IService { - - /** - * 查询数据是否已被使用 - * @param ids - * @return - */ - boolean isUsed(String id); - - public void removeAllRelation(); - - public List selectAllRelation(String dataSourceCode, List ids,List excludeIds); - - void insertAllRelation(List relations); - - List selectAll(String dataSourceCode, List ids,List excludeIds); - - List selectAll(List ids, List excludeIds); - - void insertAll(List emoRelations); -} diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/directivetag/emotion/service/impl/DirectiveEmotionTagServiceImpl.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/directivetag/emotion/service/impl/DirectiveEmotionTagServiceImpl.java deleted file mode 100644 index d059e5a2..00000000 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/directivetag/emotion/service/impl/DirectiveEmotionTagServiceImpl.java +++ /dev/null @@ -1,81 +0,0 @@ -package com.nu.modules.config.directivetag.emotion.service.impl; - -import com.baomidou.dynamic.datasource.annotation.DS; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.nu.modules.config.directivetag.emotion.entity.DirectiveEmotionTag; -import com.nu.modules.config.directivetag.emotion.entity.DirectiveEmotionTagRelation; -import com.nu.modules.config.directivetag.emotion.mapper.DirectiveEmotionTagMapper; -import com.nu.modules.config.directivetag.emotion.mapper.DirectiveEmotionTagRelationMapper; -import com.nu.modules.config.directivetag.emotion.service.IDirectiveEmotionTagService; -import com.nu.modules.config.servicedirective.mapper.ConfigServiceDirectiveMapper; -import org.apache.commons.lang.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.Arrays; -import java.util.List; - -/** - * @Description: 情绪标签 - * @Author: 张明远 - * @Date: 2025-03-17 - * @Version: V1.0 - */ -@Service -public class DirectiveEmotionTagServiceImpl extends ServiceImpl implements IDirectiveEmotionTagService { - - @Autowired - private ConfigServiceDirectiveMapper serviceDirectiveMapper; - @Autowired - private DirectiveEmotionTagRelationMapper tagRelationMapper; - - @Override - public boolean isUsed(String ids) { - if (StringUtils.isBlank(ids)) { - return false; - } - boolean result = false; - //是否已被服务指令使用 - int i = serviceDirectiveMapper.queryCountByEmotionTagIds(Arrays.asList(ids.split(","))); - if (i > 0) { - result = true; - } - return result; - } - - @Override - public void removeAllRelation() { - tagRelationMapper.removeAll(); - tagRelationMapper.removeAllRelation(); - } - - @Override - @DS("#dataSourceCode") - public List selectAllRelation(String dataSourceCode, List ids, List excludeIds) { - return tagRelationMapper.selectAllRelation(ids, excludeIds); - } - - @Override - public void insertAllRelation(List idRelations) { - idRelations.forEach(ir -> { - tagRelationMapper.insert(ir); - }); - } - - @Override - @DS("#dataSourceCode") - public List selectAll(String dataSourceCode, List ids, List excludeIds) { - return baseMapper.selectAll(ids, excludeIds); - } - - @Override - public List selectAll(List ids, List excludeIds) { - return baseMapper.selectAll(ids, excludeIds); - } - @Override - public void insertAll(List emoRelations) { - emoRelations.forEach(e -> { - baseMapper.insert(e); - }); - } -} diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/instructiontag/entity/InstructionTag.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/instructiontag/entity/InstructionTag.java index 560d318e..23e3038e 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/instructiontag/entity/InstructionTag.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/instructiontag/entity/InstructionTag.java @@ -42,14 +42,6 @@ public class InstructionTag implements Serializable { @ApiModelProperty(value = "分类标签类型") @Dict(dicCode = "service_instruction_tag") private java.lang.String instructionType; - /**排序*/ - @Excel(name = "排序", width = 15) - @ApiModelProperty(value = "排序") - private java.lang.Integer sort; - /**状态 0已授权 1未授权*/ - @Excel(name = "状态 0已授权 1未授权", width = 15) - @ApiModelProperty(value = "状态 0已授权 1未授权") - @Dict(dicCode = "status") private java.lang.String status; /**是否启用 Y启用 N未启用*/ @Excel(name = "是否启用", width = 15) diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicecategory/entity/ConfigServiceCategory.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicecategory/entity/ConfigServiceCategory.java index 5758d88f..ff9e1d98 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicecategory/entity/ConfigServiceCategory.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicecategory/entity/ConfigServiceCategory.java @@ -47,11 +47,6 @@ public class ConfigServiceCategory implements Serializable { @Excel(name = "排序", width = 15) @ApiModelProperty(value = "排序") private java.lang.Integer sort; - /**状态 0已授权 1未授权*/ - @Excel(name = "状态 0已授权 1未授权", width = 15) - @ApiModelProperty(value = "状态 0已授权 1未授权") - @Dict(dicCode = "status") - private java.lang.String status; /**是否启用 Y启用 N未启用*/ @Excel(name = "是否启用", width = 15) @ApiModelProperty(value = "是否启用") 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 069ccf9d..f4ff1f54 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 @@ -57,8 +57,6 @@ public class ConfigServiceDirectiveController extends JeecgController> getTree(@RequestBody ConfigServiceDirective dto) { @@ -87,9 +85,6 @@ public class ConfigServiceDirectiveController extends JeecgController queryWrapper = QueryGenerator.initQueryWrapper(configServiceDirective, req.getParameterMap(), customeRuleMap); queryWrapper.select("id"); @@ -97,31 +92,6 @@ public class ConfigServiceDirectiveController extends JeecgController directiveIds = null; -// if (StringUtils.isNotBlank(configServiceDirective.getBodyTags())) { -// directiveIds = configServiceDirectiveService.queryDirectiveIdByBodyTagIds(configServiceDirective.getBodyTags()); -// if (directiveIds != null && !directiveIds.isEmpty()) { -// queryWrapper.in("id", directiveIds.stream().map(ConfigServiceDirective::getId).collect(Collectors.toList())); -// } else { -// //体重标签下没有数据 -// queryWrapper.eq("id", "null"); -// } -// } -// if (StringUtils.isNotBlank(configServiceDirective.getEmotionTags())) { -// directiveIds = configServiceDirectiveService.queryDirectiveIdByEmotionTagIds(configServiceDirective.getEmotionTags()); -// if (directiveIds != null && !directiveIds.isEmpty() && StringUtils.isNotBlank(configServiceDirective.getEmotionTags())) { -// queryWrapper.in("id", directiveIds.stream().map(ConfigServiceDirective::getId).collect(Collectors.toList())); -// } else { -// //情绪标签下没有数据 -// queryWrapper.eq("id", "null"); -// } -// } - if (configServiceDirective.isIzAbnormal()) { - queryWrapper.eq("toll_price", new BigDecimal("0")); - queryWrapper.eq("com_price", new BigDecimal("0")); - queryWrapper.eq("service_duration", "0"); - } Page page = new Page(pageNo, pageSize); IPage list = configServiceDirectiveService.page(page, queryWrapper); List pageList = service.pageList(configServiceDirective, list); @@ -151,38 +121,11 @@ public class ConfigServiceDirectiveController extends JeecgController queryWrapper = QueryGenerator.initQueryWrapper(configServiceDirective, req.getParameterMap(), customeRuleMap); queryWrapper.select("id"); //如果有服务指令需要提前查询下对应的服务指令id List directiveIds = null; - if (StringUtils.isNotBlank(configServiceDirective.getBodyTags())) { - directiveIds = configServiceDirectiveService.queryDirectiveIdByBodyTagIds(configServiceDirective.getBodyTags()); - if (directiveIds != null && !directiveIds.isEmpty()) { - queryWrapper.in("id", directiveIds.stream().map(ConfigServiceDirective::getId).collect(Collectors.toList())); - } else { - //体重标签下没有数据 - queryWrapper.eq("id", "null"); - } - } - if (StringUtils.isNotBlank(configServiceDirective.getEmotionTags())) { - directiveIds = configServiceDirectiveService.queryDirectiveIdByEmotionTagIds(configServiceDirective.getEmotionTags()); - if (directiveIds != null && !directiveIds.isEmpty() && StringUtils.isNotBlank(configServiceDirective.getEmotionTags())) { - queryWrapper.in("id", directiveIds.stream().map(ConfigServiceDirective::getId).collect(Collectors.toList())); - } else { - //情绪标签下没有数据 - queryWrapper.eq("id", "null"); - } - } - //只查询已授权（status = 0) -// if (StringUtils.isNotBlank(configServiceDirective.getStatus())) { -// queryWrapper.in("status", configServiceDirective.getStatus().split(",")); -// } else { -// queryWrapper.in("status", new String[]{"0", "2"}); -// } if (StringUtils.isNotBlank(configServiceDirective.getExcludeIds())) { queryWrapper.notIn("id", configServiceDirective.getExcludeIds().split(",")); } @@ -237,59 +180,13 @@ public class ConfigServiceDirectiveController extends JeecgController canAddList; -// try { -// canAddList = canAddDirectiveService.list(); -// } finally { -// //恢复数据源 -// DynamicDataSourceContextHolder.clear(); -// } -// boolean needSetId = true; -// for (int i = 0; i < canAddList.size(); i++) { -// CanAddDirective canAddDirective = canAddList.get(i); -// if ( -// canAddDirective.getInstructionTag().equals(configServiceDirective.getInstructionName()) && -// canAddDirective.getCategory().equals(configServiceDirective.getCategoryName()) && -// canAddDirective.getType().equals(configServiceDirective.getTypeName()) && -// canAddDirective.getDirectiveName().equals(configServiceDirective.getDirectiveName()) -// ) { -// needSetId = false; -// configServiceDirective.setId(canAddDirective.getDirectiveId()); -// } -// } - - //存储机构编码 JSONObject deptInfo = sysBaseAPI.getDeptInfo(); // if (needSetId) { configServiceDirective.setId(deptInfo.getString("code") + IdUtil.simpleUUID()); // } configServiceDirective.setSysOrgCode(deptInfo.getString("code")); - //设置为“未授权” - configServiceDirective.setStatus("1"); - //处理媒体资源（放在保存方法之前） -// configServiceDirectiveService.handleMediaFile(configServiceDirective); configServiceDirectiveService.save(configServiceDirective); - if (StringUtils.isNotBlank(configServiceDirective.getBodyTags())) { - configServiceDirectiveService.saveBodyTags(configServiceDirective); - } else { - configServiceDirectiveService.removeBodyTags(configServiceDirective); - } - - if (StringUtils.isNotBlank(configServiceDirective.getEmotionTags())) { - configServiceDirectiveService.saveEmotionTags(configServiceDirective); - } else { - configServiceDirectiveService.removeEmotionTags(configServiceDirective); - } - - //同步给管理平台 - 操作日志 - { - DirectiveAsyncMQDto directiveAsyncMQDto = new DirectiveAsyncMQDto(); - BeanUtils.copyProperties(configServiceDirective, directiveAsyncMQDto); - rabbitMQUtil.sendToExchange("hldy.directive", "hldy.directive.newadd", directiveAsyncMQDto); - } //操作日志 { @@ -322,7 +219,6 @@ public class ConfigServiceDirectiveController extends JeecgController batchAdd(@RequestBody List list) { - //设置 - Set existIds = configServiceDirectiveService.lambdaQuery() - .select(ConfigServiceDirective::getId) - .list() - .stream() - .map(ConfigServiceDirective::getId) - .collect(Collectors.toSet()); - - // 2. 过滤出需要新增的数据 - List addList = list.stream() - .filter(item -> !existIds.contains(item.getDirectiveId())) - .collect(Collectors.toList()); - - addList.stream().forEach(d -> { - d.setId(d.getDirectiveId()); - d.setTollPrice(new BigDecimal("0")); - d.setComPrice(new BigDecimal("0")); - d.setIzEnabled("1"); - d.setServiceDuration("0"); - d.setDelFlag("0"); - d.setSysOrgCode(masterCode); - d.setStatus("0"); - }); - configServiceDirectiveService.saveBatch(list); - - //同步给管理平台 - { - addList.stream().forEach(configServiceDirective -> { - DirectiveAsyncMQDto directiveAsyncMQDto = new DirectiveAsyncMQDto(); - BeanUtils.copyProperties(configServiceDirective, directiveAsyncMQDto); - rabbitMQUtil.sendToExchange("hldy.directive", "hldy.directive.newadd", directiveAsyncMQDto); - }); - } - - return Result.OK("添加成功！"); - } - /** * 编辑 * @@ -401,24 +250,6 @@ public class ConfigServiceDirectiveController extends JeecgController bodyTagList; - //体型标签字符串 - @TableField(exist = false) - private String bodyTagsName; - - //情绪标签 - @TableField(exist = false) - List emotionTagList; - //情绪标签字符串 - @TableField(exist = false) - private String emotionTagsName; //分类标签中文名称 @TableField(exist = false) @@ -302,12 +234,6 @@ public class ConfigServiceDirective implements Serializable { //媒体资源存储路径名 @TableField(exist = false) private String mediaFileSavePath; - //体型标签json字符串（前台封装好的 有id、label） - @TableField(exist = false) - private String bodyTagsObj; - //情绪标签json字符串（前台封装好的 有id、label） - @TableField(exist = false) - private String emotionTagsObj; //护理分类名称 @TableField(exist = false) private String instructionTagName; @@ -320,28 +246,15 @@ public class ConfigServiceDirective implements Serializable { @TableField(exist = false) private String directiveId; @TableField(exist = false) - private boolean izAbnormal;//查询服务时长、基础价格、提成价格 都等于 0的数据 - @TableField(exist = false) private String compareOrgCode;//对比的机构编码 @TableField(exist = false) private boolean ownExist;//本平台是否存在该指令 @TableField(exist = false) private boolean targetExist;//目标平台是否存在该指令 - // @TableField(exist = false) -// private String cycleTypeShow; -// @TableField(exist = false) -// private String cycleTypeValue; @TableField(exist = false) private String syncCode; @TableField(exist = false) private String notId; @TableField(exist = false) private String serviceAttributeName; -// /** -// * 指令类型 1日常护理 2周期护理 3即时护理 -// */ -// @Excel(name = "指令类型", width = 15) -// @ApiModelProperty(value = "指令类型") -// @Dict(dicCode = "period_type") -// private java.lang.String cycleType; } diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicedirective/entity/TreeNode.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicedirective/entity/TreeNode.java index fe37d26a..cc18447f 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicedirective/entity/TreeNode.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicedirective/entity/TreeNode.java @@ -1,7 +1,5 @@ package com.nu.modules.config.servicedirective.entity; -import com.nu.modules.config.directivetag.body.entity.DirectiveBodyTag; -import com.nu.modules.config.directivetag.emotion.entity.DirectiveEmotionTag; import lombok.Data; import java.util.ArrayList; @@ -23,8 +21,6 @@ public class TreeNode { private boolean canAdd; private boolean showContent; private List children = new ArrayList<>(); - private List bodyTagList; - private List emotionTagList; private boolean parentLevelEnabled;//父级及往上是否启用 public TreeNode(String instructionId,String categoryId,String typeId,String key, String title,int level,String cycleTypeName,String izEnabled,Integer sort,boolean canAdd,boolean parentLevelEnabled,String icon) { 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 2864d4dd..371793b1 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 @@ -1,15 +1,13 @@ package com.nu.modules.config.servicedirective.mapper; -import java.util.List; - -import com.nu.modules.config.directivetag.body.entity.DirectiveBodyTag; -import com.nu.modules.config.directivetag.emotion.entity.DirectiveEmotionTag; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.nu.modules.config.instructiontag.entity.InstructionTag; import com.nu.modules.config.servicecategory.entity.ConfigServiceCategory; +import com.nu.modules.config.servicedirective.entity.ConfigServiceDirective; import com.nu.modules.config.servicetype.entity.ConfigServiceType; import org.apache.ibatis.annotations.Param; -import com.nu.modules.config.servicedirective.entity.ConfigServiceDirective; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +import java.util.List; /** * @Description: 服务指令 @@ -21,7 +19,6 @@ public interface ConfigServiceDirectiveMapper extends BaseMapper records ); - // IPage pageList( -// @Param("page") Page page, -// @Param("directive") ConfigServiceDirective directive -// ); - - int deleteBodyTags(@Param("directive") ConfigServiceDirective configServiceDirective); - - int saveBodyTags(@Param("directive") ConfigServiceDirective configServiceDirective); - - int deleteEmotionTags(@Param("directive") ConfigServiceDirective configServiceDirective); - - int saveEmotionTags(@Param("directive") ConfigServiceDirective configServiceDirective); - - /** - * 根据体型标签查询对应的服务指令id - * @return - */ - List queryDirectiveIdByBodyTagIds(@Param("tagIds") String tagIds); - - /** - * 根据情绪标签查询对应的服务指令id - * @return - */ - List queryDirectiveIdByEmotionTagIds(@Param("tagIds") String tagIds); - - /** - * 查询体型标签是否被使用 - * @return - */ - int queryCountByBodyTagIds(@Param("tagIds") List tagIds); - - /** - * 查询情绪标签是否被使用 - * @return - */ - int queryCountByEmotionTagIds(@Param("tagIds") List tagIds); int removeAll(); @@ -73,8 +34,6 @@ public interface ConfigServiceDirectiveMapper extends BaseMapper getUsedInstructionTags(); List getUsedCategories(); List getUsedTypes(); - List getBodyTagsByDirective(@Param("id") String directiveId); - List getEmotionTagsByDirective(@Param("id") String directiveId); List allData(); 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 f99ee83a..bd018479 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 @@ -12,15 +12,9 @@ - - - - - - @@ -40,17 +34,6 @@ - - - - - - - - - - - - - - - - - - - - delete - from nu_directive_body_tag - where directive_id = #{directive.id} - - - - insert into nu_directive_body_tag (directive_id,tag_id) values - - (#{directive.id}, #{tagId}) - - - - - delete - from nu_directive_emotion_tag - where directive_id = #{directive.id} - - - - insert into nu_directive_emotion_tag (directive_id,tag_id) values - - (#{directive.id}, #{tagId}) - - - delete from nu_config_service_directive @@ -194,12 +115,6 @@ - - - @@ -218,10 +133,10 @@ - - - -