From d6ba60f6502db1ef3e6c7bf2648bbea7db5337d3 Mon Sep 17 00:00:00 2001 From: "1378012178@qq.com" <1378012178@qq.com> Date: Mon, 28 Apr 2025 16:08:15 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=9C=8D=E5=8A=A1=E6=8C=87?= =?UTF-8?q?=E4=BB=A4-=E5=8E=BB=E9=99=A4=E6=8C=87=E4=BB=A4=E6=A0=87?= =?UTF-8?q?=E7=AD=BE=EF=BC=8C=E6=96=B0=E5=A2=9E=E4=BD=93=E5=9E=8B=E6=A0=87?= =?UTF-8?q?=E7=AD=BE=E3=80=81=E6=83=85=E7=BB=AA=E6=A0=87=E7=AD=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xml/NuConfigServiceDirectiveMapper.xml | 4 +- .../mapper/xml/DirectivePackageMapper.xml | 71 ++++--- .../DirectiveBodyTagController.java} | 73 ++++--- .../body/entity/DirectiveBodyTag.java | 74 +++++++ .../entity/DirectiveBodyTagRelation.java} | 10 +- .../body/mapper/DirectiveBodyTagMapper.java | 14 ++ .../DirectiveBodyTagRelationMapper.java | 18 ++ .../mapper/xml/DirectiveBodyTagMapper.xml} | 2 +- .../xml/DirectiveBodyTagRelationMapper.xml} | 8 +- .../service/IDirectiveBodyTagService.java | 29 +++ .../impl/DirectiveBodyTagServiceImpl.java} | 25 ++- .../DirectiveEmotionTagController.java | 168 ++++++++++++++++ .../entity/DirectiveEmotionTag.java} | 10 +- .../entity/DirectiveEmotionTagRelation.java | 28 +++ .../mapper/DirectiveEmotionTagMapper.java | 14 ++ .../DirectiveEmotionTagRelationMapper.java | 18 ++ .../mapper/xml/DirectiveEmotionTagMapper.xml | 5 + .../xml/DirectiveEmotionTagRelationMapper.xml | 16 ++ .../service/IDirectiveEmotionTagService.java | 29 +++ .../impl/DirectiveEmotionTagServiceImpl.java | 63 ++++++ .../mapper/DirectiveTagMapper.java | 14 -- .../mapper/DirectiveTagRelationMapper.java | 18 -- .../service/IDirectiveTagService.java | 29 --- .../ConfigServiceDirectiveController.java | 36 +++- .../entity/ConfigServiceDirective.java | 28 ++- .../mapper/ConfigServiceDirectiveMapper.java | 27 ++- .../xml/ConfigServiceDirectiveMapper.xml | 68 +++++-- .../IConfigServiceDirectiveService.java | 24 ++- .../ConfigServiceDirectiveServiceImpl.java | 190 +++++++++--------- .../mapper/xml/ServiceTagMapper.xml | 73 ++++--- .../service/impl/ServiceTagServiceImpl.java | 15 +- .../listener/DirectiveMQListener.java | 9 +- 32 files changed, 885 insertions(+), 325 deletions(-) rename nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivetag/{controller/DirectiveTagController.java => body/controller/DirectiveBodyTagController.java} (57%) create mode 100644 nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivetag/body/entity/DirectiveBodyTag.java rename nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivetag/{entity/DirectiveTagRelation.java => body/entity/DirectiveBodyTagRelation.java} (61%) create mode 100644 nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivetag/body/mapper/DirectiveBodyTagMapper.java create mode 100644 nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivetag/body/mapper/DirectiveBodyTagRelationMapper.java rename nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivetag/{mapper/xml/DirectiveTagMapper.xml => body/mapper/xml/DirectiveBodyTagMapper.xml} (65%) rename nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivetag/{mapper/xml/DirectiveTagRelationMapper.xml => body/mapper/xml/DirectiveBodyTagRelationMapper.xml} (67%) create mode 100644 nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivetag/body/service/IDirectiveBodyTagService.java rename nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivetag/{service/impl/DirectiveTagServiceImpl.java => body/service/impl/DirectiveBodyTagServiceImpl.java} (56%) create mode 100644 nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivetag/emotion/controller/DirectiveEmotionTagController.java rename nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivetag/{entity/DirectiveTag.java => emotion/entity/DirectiveEmotionTag.java} (90%) create mode 100644 nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivetag/emotion/entity/DirectiveEmotionTagRelation.java create mode 100644 nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivetag/emotion/mapper/DirectiveEmotionTagMapper.java create mode 100644 nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivetag/emotion/mapper/DirectiveEmotionTagRelationMapper.java create mode 100644 nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivetag/emotion/mapper/xml/DirectiveEmotionTagMapper.xml create mode 100644 nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivetag/emotion/mapper/xml/DirectiveEmotionTagRelationMapper.xml create mode 100644 nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivetag/emotion/service/IDirectiveEmotionTagService.java create mode 100644 nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivetag/emotion/service/impl/DirectiveEmotionTagServiceImpl.java delete mode 100644 nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivetag/mapper/DirectiveTagMapper.java delete mode 100644 nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivetag/mapper/DirectiveTagRelationMapper.java delete mode 100644 nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivetag/service/IDirectiveTagService.java diff --git a/nursing-unit-api/src/main/java/com/nu/modules/nuApiServiceCategory/mapper/xml/NuConfigServiceDirectiveMapper.xml b/nursing-unit-api/src/main/java/com/nu/modules/nuApiServiceCategory/mapper/xml/NuConfigServiceDirectiveMapper.xml index a387eb7..7251ee3 100644 --- a/nursing-unit-api/src/main/java/com/nu/modules/nuApiServiceCategory/mapper/xml/NuConfigServiceDirectiveMapper.xml +++ b/nursing-unit-api/src/main/java/com/nu/modules/nuApiServiceCategory/mapper/xml/NuConfigServiceDirectiveMapper.xml @@ -30,8 +30,8 @@ cdt.tag_name FROM nu_config_service_directive csd LEFT JOIN ( - select GROUP_CONCAT(c.tag_name) tag_name,b.directive_id from nu_directive_tag b - LEFT JOIN nu_config_directive_tag c on b.tag_id = c.id + select GROUP_CONCAT(c.tag_name) tag_name,b.directive_id from nu_directive_body_tag b + LEFT JOIN nu_config_body_tag c on b.tag_id = c.id GROUP BY b.directive_id ) cdt on csd.id = cdt.directive_id LEFT JOIN nu_config_service_type cst ON csd.type_id = cst.id diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivepackage/mapper/xml/DirectivePackageMapper.xml b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivepackage/mapper/xml/DirectivePackageMapper.xml index 6811e2e..954054c 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivepackage/mapper/xml/DirectivePackageMapper.xml +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivepackage/mapper/xml/DirectivePackageMapper.xml @@ -42,18 +42,31 @@ - - + + - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + @@ -95,16 +108,26 @@ csd.mp4_file, csd.preview_file, csd.immediate_file, - cdt.id AS tag_id, - cdt.tag_name, - cdt.sort AS tag_sort, - cdt.iz_enabled AS tag_iz_enabled, - cdt.del_flag AS tag_del_flag, - cdt.create_by AS tag_create_by, - cdt.create_time AS tag_create_time, - cdt.update_by AS tag_update_by, - cdt.update_time AS tag_update_time, - cdt.sys_org_code AS tag_sys_org_code, + 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 FROM @@ -117,8 +140,10 @@ ) dp LEFT JOIN nu_package_directive pd ON dp.id = pd.package_id LEFT JOIN nu_config_service_directive csd ON pd.directive_id = csd.id - LEFT JOIN nu_directive_tag dt ON csd.id = dt.directive_id - LEFT JOIN nu_config_directive_tag cdt ON dt.tag_id = cdt.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 order by dp.create_time desc diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivetag/controller/DirectiveTagController.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivetag/body/controller/DirectiveBodyTagController.java similarity index 57% rename from nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivetag/controller/DirectiveTagController.java rename to nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivetag/body/controller/DirectiveBodyTagController.java index 93950ed..f37a275 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivetag/controller/DirectiveTagController.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivetag/body/controller/DirectiveBodyTagController.java @@ -1,11 +1,10 @@ -package com.nu.modules.directivetag.controller; +package com.nu.modules.directivetag.body.controller; 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.directivetag.entity.DirectiveTag; -import com.nu.modules.directivetag.service.IDirectiveTagService; -import com.rabbitmq.client.impl.AMQImpl; +import com.nu.modules.directivetag.body.entity.DirectiveBodyTag; +import com.nu.modules.directivetag.body.service.IDirectiveBodyTagService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; @@ -14,14 +13,10 @@ import org.jeecg.common.aspect.annotation.AutoLog; 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.amqp.rabbit.annotation.RabbitListener; -import org.springframework.amqp.support.AmqpHeaders; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.messaging.handler.annotation.Header; import org.springframework.web.bind.annotation.*; import org.springframework.web.servlet.ModelAndView; -import javax.servlet.DispatcherType; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.util.Arrays; @@ -29,18 +24,18 @@ import java.util.HashMap; import java.util.Map; /** - * @Description: 指令标签 + * @Description: 体型标签 * @Author: 张明远 * @Date: 2025-03-17 * @Version: V1.0 */ -@Api(tags="指令标签") +@Api(tags="体型标签") @RestController -@RequestMapping("/directiveTag/directiveTag") +@RequestMapping("/directiveTag/bodyTag") @Slf4j -public class DirectiveTagController extends JeecgController { +public class DirectiveBodyTagController extends JeecgController { @Autowired - private IDirectiveTagService directiveTagService; + private IDirectiveBodyTagService directiveTagService; /** * 分页列表查询 @@ -51,20 +46,20 @@ public class DirectiveTagController extends JeecgController> queryPageList(DirectiveTag directiveTag, - @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, - @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, - HttpServletRequest req) { + 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); + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(directiveTag, req.getParameterMap(),customeRuleMap); + Page page = new Page(pageNo, pageSize); + IPage pageList = directiveTagService.page(page, queryWrapper); return Result.OK(pageList); } @@ -74,10 +69,10 @@ public class DirectiveTagController extends JeecgController add(@RequestBody DirectiveTag directiveTag) { + public Result add(@RequestBody DirectiveBodyTag directiveTag) { directiveTagService.save(directiveTag); return Result.OK("添加成功！"); } @@ -88,10 +83,10 @@ public class DirectiveTagController extends JeecgController edit(@RequestBody DirectiveTag directiveTag) { + public Result edit(@RequestBody DirectiveBodyTag directiveTag) { directiveTagService.updateById(directiveTag); return Result.OK("编辑成功!"); } @@ -102,8 +97,8 @@ public class DirectiveTagController extends JeecgController delete(@RequestParam(name="id",required=true) String id) { if(directiveTagService.isUsed(id)){ @@ -119,8 +114,8 @@ public class DirectiveTagController extends JeecgController deleteBatch(@RequestParam(name="ids",required=true) String ids) { if(directiveTagService.isUsed(ids)){ @@ -136,11 +131,11 @@ public class DirectiveTagController extends JeecgController queryById(@RequestParam(name="id",required=true) String id) { - DirectiveTag directiveTag = directiveTagService.getById(id); + public Result queryById(@RequestParam(name="id",required=true) String id) { + DirectiveBodyTag directiveTag = directiveTagService.getById(id); if(directiveTag==null) { return Result.error("未找到对应数据"); } @@ -154,8 +149,8 @@ public class DirectiveTagController extends JeecgController importExcel(HttpServletRequest request, HttpServletResponse response) { - return super.importExcel(request, response, DirectiveTag.class); + return super.importExcel(request, response, DirectiveBodyTag.class); } } diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivetag/body/entity/DirectiveBodyTag.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivetag/body/entity/DirectiveBodyTag.java new file mode 100644 index 0000000..071a746 --- /dev/null +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivetag/body/entity/DirectiveBodyTag.java @@ -0,0 +1,74 @@ +package com.nu.modules.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 = "是否启用", 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/directivetag/entity/DirectiveTagRelation.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivetag/body/entity/DirectiveBodyTagRelation.java similarity index 61% rename from nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivetag/entity/DirectiveTagRelation.java rename to nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivetag/body/entity/DirectiveBodyTagRelation.java index 19248b9..86a916c 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivetag/entity/DirectiveTagRelation.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivetag/body/entity/DirectiveBodyTagRelation.java @@ -1,4 +1,4 @@ -package com.nu.modules.directivetag.entity; +package com.nu.modules.directivetag.body.entity; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; @@ -9,17 +9,17 @@ import lombok.experimental.Accessors; import java.io.Serializable; /** - * @Description: 服务指令-指令标签中间表 + * @Description: 服务指令-体型标签中间表 * @Author: 张明远 * @Date: 2025-4-23 09:26:04 * @Version: V1.0 */ @Data -@TableName("nu_directive_tag") +@TableName("nu_directive_body_tag") @Accessors(chain = true) @EqualsAndHashCode(callSuper = false) -@ApiModel(value="nu_directive_tag对象", description="服务指令-指令标签中间表") -public class DirectiveTagRelation implements Serializable { +@ApiModel(value="nu_directive_body_tag对象", description="服务指令-体型标签中间表") +public class DirectiveBodyTagRelation implements Serializable { private static final long serialVersionUID = 1L; private String directiveId; diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivetag/body/mapper/DirectiveBodyTagMapper.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivetag/body/mapper/DirectiveBodyTagMapper.java new file mode 100644 index 0000000..8e4d9f9 --- /dev/null +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivetag/body/mapper/DirectiveBodyTagMapper.java @@ -0,0 +1,14 @@ +package com.nu.modules.directivetag.body.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.nu.modules.directivetag.body.entity.DirectiveBodyTag; + +/** + * @Description: 体型标签 + * @Author: 张明远 + * @Date: 2025-03-17 + * @Version: V1.0 + */ +public interface DirectiveBodyTagMapper extends BaseMapper { + +} diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivetag/body/mapper/DirectiveBodyTagRelationMapper.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivetag/body/mapper/DirectiveBodyTagRelationMapper.java new file mode 100644 index 0000000..b54cdd0 --- /dev/null +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivetag/body/mapper/DirectiveBodyTagRelationMapper.java @@ -0,0 +1,18 @@ +package com.nu.modules.directivetag.body.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.nu.modules.directivetag.body.entity.DirectiveBodyTagRelation; + +import java.util.List; + +/** + * @Description: 体型标签 + * @Author: 张明远 + * @Date: 2025-03-17 + * @Version: V1.0 + */ +public interface DirectiveBodyTagRelationMapper extends BaseMapper { + void removeAllRelation(); + + List selectAllRelation(List ids); +} diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivetag/mapper/xml/DirectiveTagMapper.xml b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivetag/body/mapper/xml/DirectiveBodyTagMapper.xml similarity index 65% rename from nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivetag/mapper/xml/DirectiveTagMapper.xml rename to nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivetag/body/mapper/xml/DirectiveBodyTagMapper.xml index 684ac3f..bcb67b4 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivetag/mapper/xml/DirectiveTagMapper.xml +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivetag/body/mapper/xml/DirectiveBodyTagMapper.xml @@ -1,5 +1,5 @@ - + diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivetag/mapper/xml/DirectiveTagRelationMapper.xml b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivetag/body/mapper/xml/DirectiveBodyTagRelationMapper.xml similarity index 67% rename from nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivetag/mapper/xml/DirectiveTagRelationMapper.xml rename to nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivetag/body/mapper/xml/DirectiveBodyTagRelationMapper.xml index 630ebaf..b1fa9fb 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivetag/mapper/xml/DirectiveTagRelationMapper.xml +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivetag/body/mapper/xml/DirectiveBodyTagRelationMapper.xml @@ -1,11 +1,11 @@ - + - delete from nu_directive_tag + delete from nu_directive_body_tag - + select * from nu_directive_body_tag directive_id in diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivetag/body/service/IDirectiveBodyTagService.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivetag/body/service/IDirectiveBodyTagService.java new file mode 100644 index 0000000..07730d0 --- /dev/null +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivetag/body/service/IDirectiveBodyTagService.java @@ -0,0 +1,29 @@ +package com.nu.modules.directivetag.body.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.nu.modules.directivetag.body.entity.DirectiveBodyTag; +import com.nu.modules.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); + + void insertAllRelation(List relations); +} diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivetag/service/impl/DirectiveTagServiceImpl.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivetag/body/service/impl/DirectiveBodyTagServiceImpl.java similarity index 56% rename from nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivetag/service/impl/DirectiveTagServiceImpl.java rename to nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivetag/body/service/impl/DirectiveBodyTagServiceImpl.java index 5418ccf..ba090f0 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivetag/service/impl/DirectiveTagServiceImpl.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivetag/body/service/impl/DirectiveBodyTagServiceImpl.java @@ -1,13 +1,12 @@ -package com.nu.modules.directivetag.service.impl; +package com.nu.modules.directivetag.body.service.impl; import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.google.common.collect.Lists; -import com.nu.modules.directivetag.entity.DirectiveTag; -import com.nu.modules.directivetag.entity.DirectiveTagRelation; -import com.nu.modules.directivetag.mapper.DirectiveTagMapper; -import com.nu.modules.directivetag.mapper.DirectiveTagRelationMapper; -import com.nu.modules.directivetag.service.IDirectiveTagService; +import com.nu.modules.directivetag.body.entity.DirectiveBodyTag; +import com.nu.modules.directivetag.body.entity.DirectiveBodyTagRelation; +import com.nu.modules.directivetag.body.mapper.DirectiveBodyTagMapper; +import com.nu.modules.directivetag.body.mapper.DirectiveBodyTagRelationMapper; +import com.nu.modules.directivetag.body.service.IDirectiveBodyTagService; import com.nu.modules.servicedirective.mapper.ConfigServiceDirectiveMapper; import org.apache.commons.lang.StringUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -17,18 +16,18 @@ import java.util.Arrays; import java.util.List; /** - * @Description: 指令标签 + * @Description: 体型标签 * @Author: 张明远 * @Date: 2025-03-17 * @Version: V1.0 */ @Service -public class DirectiveTagServiceImpl extends ServiceImpl implements IDirectiveTagService { +public class DirectiveBodyTagServiceImpl extends ServiceImpl implements IDirectiveBodyTagService { @Autowired private ConfigServiceDirectiveMapper serviceDirectiveMapper; @Autowired - private DirectiveTagRelationMapper tagRelationMapper; + private DirectiveBodyTagRelationMapper tagRelationMapper; @Override public boolean isUsed(String ids) { @@ -37,7 +36,7 @@ public class DirectiveTagServiceImpl extends ServiceImpl 0) { result = true; } @@ -51,12 +50,12 @@ public class DirectiveTagServiceImpl extends ServiceImpl selectAllRelation(String dataSourceCode, List ids) { + public List selectAllRelation(String dataSourceCode, List ids) { return tagRelationMapper.selectAllRelation(ids); } @Override - public void insertAllRelation(List idRelations) { + public void insertAllRelation(List idRelations) { idRelations.forEach(ir -> { tagRelationMapper.insert(ir); }); diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivetag/emotion/controller/DirectiveEmotionTagController.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivetag/emotion/controller/DirectiveEmotionTagController.java new file mode 100644 index 0000000..19cc285 --- /dev/null +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivetag/emotion/controller/DirectiveEmotionTagController.java @@ -0,0 +1,168 @@ +package com.nu.modules.directivetag.emotion.controller; + +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.directivetag.emotion.entity.DirectiveEmotionTag; +import com.nu.modules.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.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("/directiveTag/emotionTag") +@Slf4j +public class DirectiveEmotionTagController extends JeecgController { + @Autowired + private IDirectiveEmotionTagService directiveTagService; + + /** + * 分页列表查询 + * + * @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) { + 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/directivetag/entity/DirectiveTag.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivetag/emotion/entity/DirectiveEmotionTag.java similarity index 90% rename from nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivetag/entity/DirectiveTag.java rename to nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivetag/emotion/entity/DirectiveEmotionTag.java index 0a14365..bd6cdbc 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivetag/entity/DirectiveTag.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivetag/emotion/entity/DirectiveEmotionTag.java @@ -1,4 +1,4 @@ -package com.nu.modules.directivetag.entity; +package com.nu.modules.directivetag.emotion.entity; import java.io.Serializable; @@ -17,17 +17,17 @@ import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; /** - * @Description: 指令标签 + * @Description: 情绪标签 * @Author: 张明远 * @Date: 2025-03-17 * @Version: V1.0 */ @Data -@TableName("nu_config_directive_tag") +@TableName("nu_config_emotion_tag") @Accessors(chain = true) @EqualsAndHashCode(callSuper = false) -@ApiModel(value="nu_config_directive_tag对象", description="指令标签") -public class DirectiveTag implements Serializable { +@ApiModel(value="nu_config_emotion_tag对象", description="情绪标签") +public class DirectiveEmotionTag implements Serializable { private static final long serialVersionUID = 1L; /**id*/ diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivetag/emotion/entity/DirectiveEmotionTagRelation.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivetag/emotion/entity/DirectiveEmotionTagRelation.java new file mode 100644 index 0000000..a90627f --- /dev/null +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivetag/emotion/entity/DirectiveEmotionTagRelation.java @@ -0,0 +1,28 @@ +package com.nu.modules.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/directivetag/emotion/mapper/DirectiveEmotionTagMapper.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivetag/emotion/mapper/DirectiveEmotionTagMapper.java new file mode 100644 index 0000000..f2ed172 --- /dev/null +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivetag/emotion/mapper/DirectiveEmotionTagMapper.java @@ -0,0 +1,14 @@ +package com.nu.modules.directivetag.emotion.mapper; + +import com.nu.modules.directivetag.emotion.entity.DirectiveEmotionTag; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 情绪标签 + * @Author: 张明远 + * @Date: 2025-03-17 + * @Version: V1.0 + */ +public interface DirectiveEmotionTagMapper extends BaseMapper { + +} diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivetag/emotion/mapper/DirectiveEmotionTagRelationMapper.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivetag/emotion/mapper/DirectiveEmotionTagRelationMapper.java new file mode 100644 index 0000000..cbf2277 --- /dev/null +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivetag/emotion/mapper/DirectiveEmotionTagRelationMapper.java @@ -0,0 +1,18 @@ +package com.nu.modules.directivetag.emotion.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.nu.modules.directivetag.emotion.entity.DirectiveEmotionTagRelation; + +import java.util.List; + +/** + * @Description: 情绪标签 + * @Author: 张明远 + * @Date: 2025-03-17 + * @Version: V1.0 + */ +public interface DirectiveEmotionTagRelationMapper extends BaseMapper { + void removeAllRelation(); + + List selectAllRelation(List ids); +} diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivetag/emotion/mapper/xml/DirectiveEmotionTagMapper.xml b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivetag/emotion/mapper/xml/DirectiveEmotionTagMapper.xml new file mode 100644 index 0000000..97fa69b --- /dev/null +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivetag/emotion/mapper/xml/DirectiveEmotionTagMapper.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivetag/emotion/mapper/xml/DirectiveEmotionTagRelationMapper.xml b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivetag/emotion/mapper/xml/DirectiveEmotionTagRelationMapper.xml new file mode 100644 index 0000000..8d4eb48 --- /dev/null +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivetag/emotion/mapper/xml/DirectiveEmotionTagRelationMapper.xml @@ -0,0 +1,16 @@ + + + + + delete from nu_directive_emotion_tag + + + diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivetag/emotion/service/IDirectiveEmotionTagService.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivetag/emotion/service/IDirectiveEmotionTagService.java new file mode 100644 index 0000000..9e5e1da --- /dev/null +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivetag/emotion/service/IDirectiveEmotionTagService.java @@ -0,0 +1,29 @@ +package com.nu.modules.directivetag.emotion.service; + +import com.nu.modules.directivetag.emotion.entity.DirectiveEmotionTag; +import com.baomidou.mybatisplus.extension.service.IService; +import com.nu.modules.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); + + void insertAllRelation(List relations); +} diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivetag/emotion/service/impl/DirectiveEmotionTagServiceImpl.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivetag/emotion/service/impl/DirectiveEmotionTagServiceImpl.java new file mode 100644 index 0000000..a28fd90 --- /dev/null +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivetag/emotion/service/impl/DirectiveEmotionTagServiceImpl.java @@ -0,0 +1,63 @@ +package com.nu.modules.directivetag.emotion.service.impl; + +import com.baomidou.dynamic.datasource.annotation.DS; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.nu.modules.directivetag.emotion.entity.DirectiveEmotionTag; +import com.nu.modules.directivetag.emotion.entity.DirectiveEmotionTagRelation; +import com.nu.modules.directivetag.emotion.mapper.DirectiveEmotionTagMapper; +import com.nu.modules.directivetag.emotion.mapper.DirectiveEmotionTagRelationMapper; +import com.nu.modules.directivetag.emotion.service.IDirectiveEmotionTagService; +import com.nu.modules.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.removeAllRelation(); + } + + @Override + @DS("#dataSourceCode") + public List selectAllRelation(String dataSourceCode, List ids) { + return tagRelationMapper.selectAllRelation(ids); + } + + @Override + public void insertAllRelation(List idRelations) { + idRelations.forEach(ir -> { + tagRelationMapper.insert(ir); + }); + } +} diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivetag/mapper/DirectiveTagMapper.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivetag/mapper/DirectiveTagMapper.java deleted file mode 100644 index b7096a9..0000000 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivetag/mapper/DirectiveTagMapper.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.nu.modules.directivetag.mapper; - -import com.nu.modules.directivetag.entity.DirectiveTag; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -/** - * @Description: 指令标签 - * @Author: 张明远 - * @Date: 2025-03-17 - * @Version: V1.0 - */ -public interface DirectiveTagMapper extends BaseMapper { - -} diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivetag/mapper/DirectiveTagRelationMapper.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivetag/mapper/DirectiveTagRelationMapper.java deleted file mode 100644 index 44eabd5..0000000 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivetag/mapper/DirectiveTagRelationMapper.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.nu.modules.directivetag.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.nu.modules.directivetag.entity.DirectiveTagRelation; - -import java.util.List; - -/** - * @Description: 指令标签 - * @Author: 张明远 - * @Date: 2025-03-17 - * @Version: V1.0 - */ -public interface DirectiveTagRelationMapper extends BaseMapper { - void removeAllRelation(); - - List selectAllRelation(List ids); -} diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivetag/service/IDirectiveTagService.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivetag/service/IDirectiveTagService.java deleted file mode 100644 index abab7e2..0000000 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivetag/service/IDirectiveTagService.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.nu.modules.directivetag.service; - -import com.nu.modules.directivetag.entity.DirectiveTag; -import com.baomidou.mybatisplus.extension.service.IService; -import com.nu.modules.directivetag.entity.DirectiveTagRelation; - -import java.util.List; - -/** - * @Description: 指令标签 - * @Author: 张明远 - * @Date: 2025-03-17 - * @Version: V1.0 - */ -public interface IDirectiveTagService extends IService { - - /** - * 查询数据是否已被使用 - * @param ids - * @return - */ - boolean isUsed(String id); - - public void removeAllRelation(); - - public List selectAllRelation(String dataSourceCode, List ids); - - void insertAllRelation(List relations); -} diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicedirective/controller/ConfigServiceDirectiveController.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicedirective/controller/ConfigServiceDirectiveController.java index eb15633..a1b95e6 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicedirective/controller/ConfigServiceDirectiveController.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicedirective/controller/ConfigServiceDirectiveController.java @@ -71,9 +71,15 @@ public class ConfigServiceDirectiveController extends JeecgController directiveIds = null; - if (StringUtils.isNotBlank(configServiceDirective.getTags())) { - directiveIds = configServiceDirectiveService.queryDirectiveIdByTagIds(configServiceDirective.getTags()); - if(directiveIds != null && !directiveIds.isEmpty()){ + 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())); + } + } + if (StringUtils.isNotBlank(configServiceDirective.getEmotionTags())) { + directiveIds = configServiceDirectiveService.queryDirectiveIdByEmotionTagIds(configServiceDirective.getEmotionTags()); + if (directiveIds != null && !directiveIds.isEmpty()) { queryWrapper.in("id", directiveIds.stream().map(ConfigServiceDirective::getId).collect(Collectors.toList())); } } @@ -96,10 +102,16 @@ public class ConfigServiceDirectiveController extends JeecgController add(@RequestBody ConfigServiceDirective configServiceDirective) { configServiceDirectiveService.save(configServiceDirective); - if (StringUtils.isNotBlank(configServiceDirective.getTags())) { - configServiceDirectiveService.saveTags(configServiceDirective); + if (StringUtils.isNotBlank(configServiceDirective.getBodyTags())) { + configServiceDirectiveService.saveBodyTags(configServiceDirective); } else { - configServiceDirectiveService.removeTags(configServiceDirective); + configServiceDirectiveService.removeBodyTags(configServiceDirective); + } + + if (StringUtils.isNotBlank(configServiceDirective.getEmotionTags())) { + configServiceDirectiveService.saveEmotionTags(configServiceDirective); + }else{ + configServiceDirectiveService.removeEmotionTags(configServiceDirective); } return Result.OK("添加成功！"); } @@ -116,10 +128,16 @@ public class ConfigServiceDirectiveController extends JeecgController edit(@RequestBody ConfigServiceDirective configServiceDirective) { configServiceDirectiveService.updateById(configServiceDirective); - if (StringUtils.isNotBlank(configServiceDirective.getTags())) { - configServiceDirectiveService.saveTags(configServiceDirective); + if (StringUtils.isNotBlank(configServiceDirective.getBodyTags())) { + configServiceDirectiveService.saveBodyTags(configServiceDirective); } else { - configServiceDirectiveService.removeTags(configServiceDirective); + configServiceDirectiveService.removeBodyTags(configServiceDirective); + } + + if (StringUtils.isNotBlank(configServiceDirective.getEmotionTags())) { + configServiceDirectiveService.saveEmotionTags(configServiceDirective); + } else { + configServiceDirectiveService.removeEmotionTags(configServiceDirective); } return Result.OK("编辑成功!"); } diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicedirective/entity/ConfigServiceDirective.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicedirective/entity/ConfigServiceDirective.java index 32e3a58..b05c5e4 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicedirective/entity/ConfigServiceDirective.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicedirective/entity/ConfigServiceDirective.java @@ -2,7 +2,8 @@ package com.nu.modules.servicedirective.entity; import com.baomidou.mybatisplus.annotation.*; import com.fasterxml.jackson.annotation.JsonFormat; -import com.nu.modules.directivetag.entity.DirectiveTag; +import com.nu.modules.directivetag.body.entity.DirectiveBodyTag; +import com.nu.modules.directivetag.emotion.entity.DirectiveEmotionTag; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -143,20 +144,31 @@ public class ConfigServiceDirective implements Serializable { //合并单元格用：分类标签合并的行数 @TableField(exist = false) private Integer instructionRowSpan; + //体型标签id,id,id @TableField(exist = false) - //指令标签id,id,id - private String tags; + private String bodyTags; + //情绪标签id,id,id + @TableField(exist = false) + private String emotionTags; @TableField(exist = false) //服务类别名称 private String categoryName; //服务类型名称 @TableField(exist = false) private String typeName; - //服务类型名称 - @TableField(exist = false) - private String tagsName; - //服务指令标签 + + //体型标签 @TableField(exist = false) - List tagList; + List bodyTagList; + //体型标签字符串 + @TableField(exist = false) + private String bodyTagsName; + + //情绪标签 + @TableField(exist = false) + List emotionTagList; + //情绪标签字符串 + @TableField(exist = false) + private String emotionTagsName; } diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicedirective/mapper/ConfigServiceDirectiveMapper.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicedirective/mapper/ConfigServiceDirectiveMapper.java index d1a8dfc..8152a39 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicedirective/mapper/ConfigServiceDirectiveMapper.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicedirective/mapper/ConfigServiceDirectiveMapper.java @@ -30,22 +30,37 @@ public interface ConfigServiceDirectiveMapper extends BaseMapper queryDirectiveIdByTagIds(@Param("tagIds") String tagIds); + List queryDirectiveIdByBodyTagIds(@Param("tagIds") String tagIds); /** - * 查询指令标签是否被使用 + * 根据情绪标签查询对应的服务指令id * @return */ - int queryCountByTagIds(@Param("tagIds") List tagIds); + List queryDirectiveIdByEmotionTagIds(@Param("tagIds") String tagIds); + /** + * 查询体型标签是否被使用 + * @return + */ + int queryCountByBodyTagIds(@Param("tagIds") List tagIds); + + /** + * 查询情绪标签是否被使用 + * @return + */ + int queryCountByEmotionTagIds(@Param("tagIds") List tagIds); int removeAll(); } diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicedirective/mapper/xml/ConfigServiceDirectiveMapper.xml b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicedirective/mapper/xml/ConfigServiceDirectiveMapper.xml index 4264925..9e57fb4 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicedirective/mapper/xml/ConfigServiceDirectiveMapper.xml +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicedirective/mapper/xml/ConfigServiceDirectiveMapper.xml @@ -31,9 +31,14 @@ - - - + + + + + + + + @@ -65,11 +70,15 @@ c.mp4_file, c.preview_file, c.immediate_file, - tag.id as tagId, - tag.tag_name as tagName + bodytag.id as bodyTagId, + bodytag.tag_name as bodyTagName, + emotag.id as emotionTagId, + emotag.tag_name as emotionTagName FROM nu_config_service_directive c - LEFT JOIN nu_directive_tag d ON c.id = d.directive_id - LEFT JOIN nu_config_directive_tag tag ON d.tag_id = tag.id + LEFT JOIN nu_directive_body_tag dbt ON c.id = dbt.directive_id + LEFT JOIN nu_config_body_tag bodytag ON dbt.tag_id = bodytag.id + LEFT JOIN nu_directive_emotion_tag det ON c.id = det.directive_id + LEFT JOIN nu_config_emotion_tag emotag ON det.tag_id = emotag.id c.id IN @@ -79,29 +88,56 @@ ORDER BY c.category_id ASC, c.type_id ASC, c.instruction_tag_id ASC,c.create_time desc - + SELECT distinct directive_id as id FROM nu_directive_body_tag WHERE tag_id IN #{tagId} - + SELECT distinct directive_id as id FROM nu_directive_emotion_tag WHERE tag_id IN + + #{tagId} + + + + - + + + delete - from nu_directive_tag + from nu_directive_body_tag where directive_id = #{directive.id} - - insert into nu_directive_tag (directive_id,tag_id) values - + + 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}) diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicedirective/service/IConfigServiceDirectiveService.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicedirective/service/IConfigServiceDirectiveService.java index 209b4fe..a9ad2c9 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicedirective/service/IConfigServiceDirectiveService.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicedirective/service/IConfigServiceDirectiveService.java @@ -19,18 +19,32 @@ public interface IConfigServiceDirectiveService extends IService pageList(ConfigServiceDirective configServiceDirective,IPage list); /** - * 存储指令标签数据 + * 存储体型标签数据 * @param configServiceDirective */ - void saveTags(ConfigServiceDirective configServiceDirective); + void saveBodyTags(ConfigServiceDirective configServiceDirective); /** - * 移除改服务指令下指令标签 + * 存储情绪标签数据 * @param configServiceDirective */ - void removeTags(ConfigServiceDirective configServiceDirective); + void saveEmotionTags(ConfigServiceDirective configServiceDirective); - List queryDirectiveIdByTagIds(String tags); + /** + * 移除改服务指令下体型标签 + * @param configServiceDirective + */ + void removeBodyTags(ConfigServiceDirective configServiceDirective); + + /** + * 移除改服务指令下情绪标签 + * @param configServiceDirective + */ + void removeEmotionTags(ConfigServiceDirective configServiceDirective); + + List queryDirectiveIdByBodyTagIds(String tags); + + List queryDirectiveIdByEmotionTagIds(String tags); void removeAll(); diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicedirective/service/impl/ConfigServiceDirectiveServiceImpl.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicedirective/service/impl/ConfigServiceDirectiveServiceImpl.java index a2f10c7..d01c902 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicedirective/service/impl/ConfigServiceDirectiveServiceImpl.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicedirective/service/impl/ConfigServiceDirectiveServiceImpl.java @@ -1,12 +1,11 @@ package com.nu.modules.servicedirective.service.impl; -import cn.hutool.core.bean.BeanUtil; import com.baomidou.dynamic.datasource.annotation.DS; -import com.baomidou.dynamic.datasource.toolkit.DynamicDataSourceContextHolder; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.nu.modules.directivetag.entity.DirectiveTag; +import com.nu.modules.directivetag.body.entity.DirectiveBodyTag; +import com.nu.modules.directivetag.emotion.entity.DirectiveEmotionTag; import com.nu.modules.servicedirective.entity.ConfigServiceDirective; import com.nu.modules.servicedirective.mapper.ConfigServiceDirectiveMapper; import com.nu.modules.servicedirective.service.IConfigServiceDirectiveService; @@ -34,8 +33,11 @@ public class ConfigServiceDirectiveServiceImpl extends ServiceImpl { - List tagList = record.getTagList(); - record.setTags(tagList.stream().map(DirectiveTag::getId).collect(Collectors.joining(","))); + List bodyTagList = record.getBodyTagList(); + record.setBodyTags(bodyTagList.stream().map(DirectiveBodyTag::getId).collect(Collectors.joining(","))); + + List emotionTagList = record.getEmotionTagList(); + record.setEmotionTags(emotionTagList.stream().map(DirectiveEmotionTag::getId).collect(Collectors.joining(","))); }); } //处理单元格合并所需数据 @@ -52,101 +54,55 @@ public class ConfigServiceDirectiveServiceImpl extends ServiceImpl records) { if (records == null || records.isEmpty()) return; - int outerStart = 0; // 一级分组起始索引 - String currentCategoryId = records.get(0).getCategoryId(); + int outerStart = 0; // 新一级分组（原三级）起始索引 + String currentInstructionId = records.get(0).getInstructionTagId(); - // 一级循环：遍历所有记录处理categoryId分组 + // 新一级循环：遍历所有记录处理instructionTagId分组 for (int i = 1; i < records.size(); i++) { - // 当遇到不同的categoryId时处理当前分组 - if (!records.get(i).getCategoryId().equals(currentCategoryId)) { - processAllGroups(records, outerStart, i - 1); // 处理完整个一级分组 - outerStart = i; // 重置一级起始位置 - currentCategoryId = records.get(i).getCategoryId(); + if (!records.get(i).getInstructionTagId().equals(currentInstructionId)) { + processAllGroups(records, outerStart, i - 1); // 处理完整个新一级分组 + outerStart = i; + currentInstructionId = records.get(i).getInstructionTagId(); } } processAllGroups(records, outerStart, records.size() - 1); // 处理最后一组 } - - /** - * 处理完整个一级分组（包含二级和三级分组） - * - * @param records 记录列表 - * @param start 当前分组的起始索引 - * @param end 当前分组的结束索引 - */ private void processAllGroups(List records, int start, int end) { - processOuterGroup(records, start, end); // 处理一级categoryRowSpan + processOuterGroup(records, start, end); // 处理新一级instructionRowSpan - int innerStart = start; // 二级分组起始索引 + int middleStart = start; // 新二级分组起始索引 + String currentCategoryId = records.get(middleStart).getCategoryId(); + + // 新二级循环：处理当前新一级分组内的categoryId分组 + for (int j = middleStart + 1; j <= end; j++) { + if (!records.get(j).getCategoryId().equals(currentCategoryId)) { + processMiddleGroup(records, middleStart, j - 1); // 处理完整个新二级分组 + middleStart = j; + currentCategoryId = records.get(j).getCategoryId(); + } + } + processMiddleGroup(records, middleStart, end); // 处理最后一组新二级数据 + } + + private void processMiddleGroup(List records, int start, int end) { + processTypeRowSpan(records, start, end); // 设置新二级categoryRowSpan + + int innerStart = start; // 新三级分组起始索引 String currentTypeId = records.get(innerStart).getTypeId(); - // 二级循环：处理当前一级分组内的typeId分组 - for (int j = innerStart + 1; j <= end; j++) { - if (!records.get(j).getTypeId().equals(currentTypeId)) { - processMiddleGroup(records, innerStart, j - 1); // 处理完整个二级分组 - innerStart = j; - currentTypeId = records.get(j).getTypeId(); + // 新三级循环：处理当前新二级分组内的typeId分组 + for (int k = innerStart + 1; k <= end; k++) { + if (!records.get(k).getTypeId().equals(currentTypeId)) { + processInnerGroup(records, innerStart, k - 1); // 处理完整个新三级分组 + innerStart = k; + currentTypeId = records.get(k).getTypeId(); } } - processMiddleGroup(records, innerStart, end); // 处理最后一组二级数据 + processInnerGroup(records, innerStart, end); // 处理最后一组新三级数据 } - /** - * 处理二级typeId分组（包含三级instructionTagId分组） - * - * @param records 记录列表 - * @param start 当前分组的起始索引 - * @param end 当前分组的结束索引 - */ - private void processMiddleGroup(List records, int start, int end) { - processTypeRowSpan(records, start, end); // 设置二级typeRowSpan - - int instructionStart = start; // 三级分组起始索引 - String currentInstructionId = records.get(instructionStart).getInstructionTagId(); - - // 三级循环：处理当前二级分组内的instructionTagId分组 - for (int k = instructionStart + 1; k <= end; k++) { - if (!records.get(k).getInstructionTagId().equals(currentInstructionId)) { - processInnerGroup(records, instructionStart, k - 1); // 处理完整个三级分组 - instructionStart = k; - currentInstructionId = records.get(k).getInstructionTagId(); - } - } - processInnerGroup(records, instructionStart, end); // 处理最后一组三级数据 - } - - /** - * 处理三级instructionTagId分组 - * - * @param records 记录列表 - * @param start 当前分组的起始索引 - * @param end 当前分组的结束索引 - */ private void processInnerGroup(List records, int start, int end) { - int count = end - start + 1; - if (count > 1) { - records.get(start).setInstructionRowSpan(count); - // 将后续记录的instructionRowSpan置0 - for (int i = start + 1; i <= end; i++) { - records.get(i).setInstructionRowSpan(0); - } - } - } - - // 处理一级categoryRowSpan（与之前保持一致） - private void processOuterGroup(List records, int start, int end) { - int count = end - start + 1; - if (count > 1) { - records.get(start).setCategoryRowSpan(count); - for (int i = start + 1; i <= end; i++) { - records.get(i).setCategoryRowSpan(0); - } - } - } - - // 处理二级typeRowSpan（与之前保持一致） - private void processTypeRowSpan(List records, int start, int end) { int count = end - start + 1; if (count > 1) { records.get(start).setTypeRowSpan(count); @@ -156,30 +112,78 @@ public class ConfigServiceDirectiveServiceImpl extends ServiceImpl records, int start, int end) { + int count = end - start + 1; + if (count > 1) { + records.get(start).setInstructionRowSpan(count); + for (int i = start + 1; i <= end; i++) { + records.get(i).setInstructionRowSpan(0); + } + } + } + + // 处理新二级categoryRowSpan + private void processTypeRowSpan(List records, int start, int end) { + int count = end - start + 1; + if (count > 1) { + records.get(start).setCategoryRowSpan(count); + for (int i = start + 1; i <= end; i++) { + records.get(i).setCategoryRowSpan(0); + } + } + } + /** - * 存储指令标签数据 + * 存储体型标签数据 * * @param configServiceDirective */ @Override - public void saveTags(ConfigServiceDirective configServiceDirective) { - baseMapper.deleteTags(configServiceDirective); - baseMapper.saveTags(configServiceDirective); + public void saveBodyTags(ConfigServiceDirective configServiceDirective) { + baseMapper.deleteBodyTags(configServiceDirective); + baseMapper.saveBodyTags(configServiceDirective); } /** - * 移除改服务指令下指令标签 + * 存储情绪标签数据 * * @param configServiceDirective */ @Override - public void removeTags(ConfigServiceDirective configServiceDirective) { - baseMapper.deleteTags(configServiceDirective); + public void saveEmotionTags(ConfigServiceDirective configServiceDirective) { + baseMapper.deleteEmotionTags(configServiceDirective); + baseMapper.saveEmotionTags(configServiceDirective); + } + + /** + * 移除改服务指令下体型标签 + * + * @param configServiceDirective + */ + @Override + public void removeBodyTags(ConfigServiceDirective configServiceDirective) { + baseMapper.deleteBodyTags(configServiceDirective); + } + + /** + * 移除改服务指令下情绪标签 + * + * @param configServiceDirective + */ + @Override + public void removeEmotionTags(ConfigServiceDirective configServiceDirective) { + baseMapper.deleteEmotionTags(configServiceDirective); } @Override - public List queryDirectiveIdByTagIds(String tags) { - return baseMapper.queryDirectiveIdByTagIds(tags); + public List queryDirectiveIdByBodyTagIds(String tags) { + return baseMapper.queryDirectiveIdByBodyTagIds(tags); + } + + @Override + public List queryDirectiveIdByEmotionTagIds(String tags) { + return baseMapper.queryDirectiveIdByEmotionTagIds(tags); } @Override diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicetag/mapper/xml/ServiceTagMapper.xml b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicetag/mapper/xml/ServiceTagMapper.xml index 00c1001..a4f0975 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicetag/mapper/xml/ServiceTagMapper.xml +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicetag/mapper/xml/ServiceTagMapper.xml @@ -42,18 +42,31 @@ - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + @@ -95,16 +108,26 @@ csd.mp4_file, csd.preview_file, csd.immediate_file, - cdt.id AS tag_id, - cdt.tag_name as cdt_tag_name, - cdt.sort AS tag_sort, - cdt.iz_enabled AS tag_iz_enabled, - cdt.del_flag AS tag_del_flag, - cdt.create_by AS tag_create_by, - cdt.create_time AS tag_create_time, - cdt.update_by AS tag_update_by, - cdt.update_time AS tag_update_time, - cdt.sys_org_code AS tag_sys_org_code, + 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 FROM @@ -118,8 +141,10 @@ ) dp LEFT JOIN nu_servtag_directive sd ON dp.id = sd.tag_id LEFT JOIN nu_config_service_directive csd ON sd.directive_id = csd.id - LEFT JOIN nu_directive_tag dt ON csd.id = dt.directive_id - LEFT JOIN nu_config_directive_tag cdt ON dt.tag_id = cdt.id + LEFT JOIN nu_directive_body_tag dbt ON csd.id = dbt.directive_id + LEFT JOIN nu_config_body_tag cdbt ON dbt.tag_id = cdbt.id + LEFT JOIN nu_directive_emotion_tag det ON csd.id = det.directive_id + LEFT JOIN nu_config_emotion_tag cdet ON det.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 order by dp.create_time desc diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicetag/service/impl/ServiceTagServiceImpl.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicetag/service/impl/ServiceTagServiceImpl.java index 0bbf1bd..0c8f56e 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicetag/service/impl/ServiceTagServiceImpl.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicetag/service/impl/ServiceTagServiceImpl.java @@ -1,18 +1,17 @@ package com.nu.modules.servicetag.service.impl; -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.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.google.common.collect.Lists; -import com.nu.modules.directivetag.entity.DirectiveTag; +import com.nu.modules.directivetag.body.entity.DirectiveBodyTag; +import com.nu.modules.directivetag.emotion.entity.DirectiveEmotionTag; import com.nu.modules.servicedirective.entity.ConfigServiceDirective; import com.nu.modules.servicetag.entity.ServiceTag; import com.nu.modules.servicetag.mapper.ServiceTagMapper; import com.nu.modules.servicetag.service.IServiceTagService; import org.springframework.stereotype.Service; -import java.util.Collections; import java.util.List; import java.util.stream.Collectors; @@ -40,9 +39,13 @@ public class ServiceTagServiceImpl extends ServiceImpl sd = l.getDirectives(); for (int i = 0; i < sd.size(); i++) { - List tagList = sd.get(i).getTagList(); - List tags = tagList.stream().map(t -> t.getTagName()).collect(Collectors.toList()); - sd.get(i).setTagsName(String.join(",",tags)); + List bodyTagList = sd.get(i).getBodyTagList(); + List bodyTags = bodyTagList.stream().map(t -> t.getTagName()).collect(Collectors.toList()); + sd.get(i).setBodyTagsName(String.join(",",bodyTags)); + + List emoTagList = sd.get(i).getEmotionTagList(); + List emoTags = emoTagList.stream().map(t -> t.getTagName()).collect(Collectors.toList()); + sd.get(i).setEmotionTagsName(String.join(",",emoTags)); } } }); diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/mq/directive/listener/DirectiveMQListener.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/mq/directive/listener/DirectiveMQListener.java index 779bcd3..5730a36 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/mq/directive/listener/DirectiveMQListener.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/mq/directive/listener/DirectiveMQListener.java @@ -5,13 +5,12 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.nu.dto.DirectiveMQDto; import com.nu.dto.StatusMQDto; import com.nu.enums.MQStatus; -import com.nu.modules.directivetag.entity.DirectiveTagRelation; -import com.nu.modules.directivetag.service.IDirectiveTagService; +import com.nu.modules.directivetag.emotion.entity.DirectiveEmotionTagRelation; +import com.nu.modules.directivetag.emotion.service.IDirectiveEmotionTagService; import com.nu.modules.servicedirective.entity.ConfigServiceDirective; import com.nu.modules.servicedirective.service.IConfigServiceDirectiveService; import com.nu.utils.RabbitMQUtil; import lombok.extern.slf4j.Slf4j; -import org.springframework.amqp.rabbit.annotation.RabbitListener; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; @@ -26,7 +25,7 @@ public class DirectiveMQListener { @Autowired private IConfigServiceDirectiveService directiveService; @Autowired - private IDirectiveTagService tagService; + private IDirectiveEmotionTagService tagService; @Autowired private RabbitMQUtil rabbitMQUtil; @@ -79,7 +78,7 @@ public class DirectiveMQListener { } //查询指令标签关系 并将指令标签关系表数据增加进自己的库表中 if (dto.getIdList() != null && !dto.getIdList().isEmpty()) { - List relations = tagService.selectAllRelation("nuro", dto.getIdList()); + List relations = tagService.selectAllRelation("nuro", dto.getIdList()); if (relations != null && !relations.isEmpty()) { tagService.insertAllRelation(relations); }