From 4cbe3c689ec7d367aca02bea0480e3c23c1140a6 Mon Sep 17 00:00:00 2001 From: "1378012178@qq.com" <1378012178@qq.com> Date: Fri, 25 Jul 2025 15:11:44 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E6=8C=87=E4=BB=A4=E5=90=8C?= =?UTF-8?q?=E6=AD=A5=EF=BC=88=E4=B8=B4=E6=97=B6=E7=89=88=E6=9C=AC=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/nu/dto/BodyTagMQDto.java | 41 +++++++ .../main/java/com/nu/dto/CategoryMQDto.java | 45 ++++++++ .../java/com/nu/dto/DirectiveAsyncMQDto.java | 3 + .../main/java/com/nu/dto/DirectiveMQDto.java | 13 +++ .../java/com/nu/dto/DirectiveTypeMQDto.java | 61 +++++++++++ .../main/java/com/nu/dto/EmotionTagMQDto.java | 41 +++++++ .../java/com/nu/dto/InstructionTagMQDto.java | 29 +++++ .../service/IDirectiveBodyTagService.java | 7 +- .../impl/DirectiveBodyTagServiceImpl.java | 9 +- .../service/IDirectiveEmotionTagService.java | 7 +- .../impl/DirectiveEmotionTagServiceImpl.java | 3 +- .../IConfigServiceCategoryService.java | 2 +- .../ConfigServiceCategoryServiceImpl.java | 3 +- .../ConfigServiceDirectiveController.java | 41 +++---- .../entity/ConfigServiceDirective.java | 4 + .../IConfigServiceDirectiveService.java | 3 + .../ConfigServiceDirectiveServiceImpl.java | 101 +++++++++++++++--- 17 files changed, 364 insertions(+), 49 deletions(-) create mode 100644 nursing-unit-common/src/main/java/com/nu/dto/BodyTagMQDto.java create mode 100644 nursing-unit-common/src/main/java/com/nu/dto/CategoryMQDto.java create mode 100644 nursing-unit-common/src/main/java/com/nu/dto/DirectiveTypeMQDto.java create mode 100644 nursing-unit-common/src/main/java/com/nu/dto/EmotionTagMQDto.java create mode 100644 nursing-unit-common/src/main/java/com/nu/dto/InstructionTagMQDto.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 new file mode 100644 index 0000000..4357d6b --- /dev/null +++ b/nursing-unit-common/src/main/java/com/nu/dto/BodyTagMQDto.java @@ -0,0 +1,41 @@ +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; + /** + * 是否启用 0启用 1未启用 + */ + private String izEnabled; + /** + * 是否删除 0未删除 1删除 + */ + private String delFlag; +} diff --git a/nursing-unit-common/src/main/java/com/nu/dto/CategoryMQDto.java b/nursing-unit-common/src/main/java/com/nu/dto/CategoryMQDto.java new file mode 100644 index 0000000..fcccb71 --- /dev/null +++ b/nursing-unit-common/src/main/java/com/nu/dto/CategoryMQDto.java @@ -0,0 +1,45 @@ +package com.nu.dto; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Description: 服务类别 + * @Author: 张明远 + * @Date: 2025-07-25 + * @Version: V1.0 + */ +@Data +public class CategoryMQDto implements Serializable { + private static final long serialVersionUID = 1L; + + /** + * id + */ + private String id; + /** + * 分类标签id + */ + private String instructionId; + /** + * 服务类别名称 + */ + private String categoryName; + /** + * 排序 + */ + private Integer sort; + /** + * 状态 0已授权 1未授权 + */ + private String status; + /** + * 是否启用 0启用 1未启用 + */ + 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 05fecbd..9b1b5ab 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 @@ -3,6 +3,7 @@ package com.nu.dto; import lombok.Data; import java.io.Serializable; +import java.util.List; /** * @Description: 服务指令审核 @@ -134,4 +135,6 @@ public class DirectiveAsyncMQDto implements Serializable { private String bodyTagsObj; //情绪标签json字符串（有id、label） private String emotionTagsObj; + + } 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 5d036fc..5116c58 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 @@ -15,4 +15,17 @@ public class DirectiveMQDto { private String asyncId; //同步子表code private String code; + + //指令集合 + private List directiveList; + //分类标签字典项 + private List instructionList; + //服务类别字典项 + private List categoryList; + //服务类型字典项 + private List typeList; + //体型标签字典项 + private List bodyTagList; + //情绪标签字典项 + private List emotionTagList; } diff --git a/nursing-unit-common/src/main/java/com/nu/dto/DirectiveTypeMQDto.java b/nursing-unit-common/src/main/java/com/nu/dto/DirectiveTypeMQDto.java new file mode 100644 index 0000000..e48c231 --- /dev/null +++ b/nursing-unit-common/src/main/java/com/nu/dto/DirectiveTypeMQDto.java @@ -0,0 +1,61 @@ +package com.nu.dto; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableLogic; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; +import org.jeecg.common.aspect.annotation.Dict; +import org.jeecgframework.poi.excel.annotation.Excel; +import org.springframework.format.annotation.DateTimeFormat; + +import java.io.Serializable; + +/** + * @Description: 服务类型 + * @Author: 张明远 + * @Date: 2025-07-25 + * @Version: V1.0 + */ +@Data +public class DirectiveTypeMQDto implements Serializable { + private static final long serialVersionUID = 1L; + + /** + * id + */ + private String id; + /** + * 分类标签id + */ + private String instructionId; + /** + * 服务类别id + */ + private String categoryId; + /** + * 服务类型名称 + */ + private String typeName; + /** + * 排序 + */ + private Integer sort; + /** + * 状态 0已授权 1未授权 + */ + private String status; + /** + * 是否启用 0启用 1未启用 + */ + private String izEnabled; + /** + * 是否删除 0未删除 1删除 + */ + private String delFlag; +} 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 new file mode 100644 index 0000000..025e67c --- /dev/null +++ b/nursing-unit-common/src/main/java/com/nu/dto/EmotionTagMQDto.java @@ -0,0 +1,41 @@ +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; + /** + * 是否启用 0启用 1未启用 + */ + private String izEnabled; + /** + * 是否删除 0未删除 1删除 + */ + private String delFlag; +} diff --git a/nursing-unit-common/src/main/java/com/nu/dto/InstructionTagMQDto.java b/nursing-unit-common/src/main/java/com/nu/dto/InstructionTagMQDto.java new file mode 100644 index 0000000..ee8f4dc --- /dev/null +++ b/nursing-unit-common/src/main/java/com/nu/dto/InstructionTagMQDto.java @@ -0,0 +1,29 @@ +package com.nu.dto; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Description: 服务指令-分类标签 + * @Author: zmy + * @Date: 2025-07-25 + * @Version: V1.0 + */ +@Data +public class InstructionTagMQDto implements Serializable { + private static final long serialVersionUID = 1L; + + /**id*/ + private String id; + /**分类标签名称*/ + private String instructionName; + /**排序*/ + private Integer sort; + /**状态 0已授权 1未授权*/ + private String status; + /**是否启用 0启用 1未启用*/ + private String izEnabled; + /**是否删除 0未删除 1删除*/ + private String delFlag; +} 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 index 289839d..8165831 100644 --- 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 @@ -9,13 +9,14 @@ import java.util.List; /** * @Description: 体型标签 * @Author: 张明远 - * @Date: 2025-03-17 + * @Date: 2025-03-17 * @Version: V1.0 */ public interface IDirectiveBodyTagService extends IService { /** * 查询数据是否已被使用 + * * @param ids * @return */ @@ -23,11 +24,11 @@ public interface IDirectiveBodyTagService extends IService { public void removeAllByDirectiveId(String directiveId); - public List selectAllRelation(String dataSourceCode, List ids,List excludeIds); + 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/directivetag/body/service/impl/DirectiveBodyTagServiceImpl.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivetag/body/service/impl/DirectiveBodyTagServiceImpl.java index 14e1dab..572a9b4 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivetag/body/service/impl/DirectiveBodyTagServiceImpl.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivetag/body/service/impl/DirectiveBodyTagServiceImpl.java @@ -50,8 +50,8 @@ public class DirectiveBodyTagServiceImpl extends ServiceImpl selectAllRelation(String dataSourceCode, List ids,List excludeIds) { - return tagRelationMapper.selectAllRelation(ids,excludeIds); + public List selectAllRelation(String dataSourceCode, List ids, List excludeIds) { + return tagRelationMapper.selectAllRelation(ids, excludeIds); } @Override @@ -62,9 +62,8 @@ public class DirectiveBodyTagServiceImpl extends ServiceImpl selectAll(String dataSourceCode, List ids,List excludeIds) { - return baseMapper.selectAll(ids,excludeIds); + public List selectAll(List ids, List excludeIds) { + return baseMapper.selectAll(ids, excludeIds); } @Override 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 index e36a643..51ab292 100644 --- 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 @@ -9,13 +9,14 @@ import java.util.List; /** * @Description: 情绪标签 * @Author: 张明远 - * @Date: 2025-03-17 + * @Date: 2025-03-17 * @Version: V1.0 */ public interface IDirectiveEmotionTagService extends IService { /** * 查询数据是否已被使用 + * * @param ids * @return */ @@ -23,11 +24,11 @@ public interface IDirectiveEmotionTagService extends IService selectAllRelation(String dataSourceCode, List ids,List excludeIds); + 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/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 index 1e84298..bc5430f 100644 --- 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 @@ -62,8 +62,7 @@ public class DirectiveEmotionTagServiceImpl extends ServiceImpl selectAll(String dataSourceCode, List ids, List excludeIds) { + public List selectAll(List ids, List excludeIds) { return baseMapper.selectAll(ids, excludeIds); } diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicecategory/service/IConfigServiceCategoryService.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicecategory/service/IConfigServiceCategoryService.java index dca38dd..f2a3e07 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicecategory/service/IConfigServiceCategoryService.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicecategory/service/IConfigServiceCategoryService.java @@ -23,7 +23,7 @@ public interface IConfigServiceCategoryService extends IService selectAll(String dataSourceCode, List ids, List excludeSubIds); + List selectAll(List ids, List excludeSubIds); void insertAll(List categoryList); } diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicecategory/service/impl/ConfigServiceCategoryServiceImpl.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicecategory/service/impl/ConfigServiceCategoryServiceImpl.java index 0370866..b831b58 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicecategory/service/impl/ConfigServiceCategoryServiceImpl.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicecategory/service/impl/ConfigServiceCategoryServiceImpl.java @@ -65,8 +65,7 @@ public class ConfigServiceCategoryServiceImpl extends ServiceImpl selectAll(String dataSourceCode, List ids, List excludeSubIds) { + public List selectAll(List ids, List excludeSubIds) { return baseMapper.selectAll(ids, excludeSubIds); } 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 a134ed0..fc2b8e3 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 @@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.beust.jcommander.internal.Maps; import com.nu.dto.DirectiveAsyncMQDto; +import com.nu.modules.directivetag.body.service.IDirectiveBodyTagService; import com.nu.modules.servicedirective.entity.ConfigServiceDirective; import com.nu.modules.servicedirective.service.IConfigServiceDirectiveService; import com.nu.utils.RabbitMQUtil; @@ -65,10 +66,7 @@ public class ConfigServiceDirectiveController extends JeecgController> queryPageList(ConfigServiceDirective configServiceDirective, - @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, - @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, - HttpServletRequest req) { + public Result> queryPageList(ConfigServiceDirective configServiceDirective, @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("categoryId", QueryRuleEnum.LIKE_WITH_OR); @@ -127,10 +125,7 @@ public class ConfigServiceDirectiveController extends JeecgController> queryPageListByDS(@RequestParam(name = "dataSourceCode") String dataSourceCode, ConfigServiceDirective configServiceDirective, - @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, - @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, - HttpServletRequest req) { + public Result> queryPageListByDS(@RequestParam(name = "dataSourceCode") String dataSourceCode, ConfigServiceDirective configServiceDirective, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) { if (StringUtils.isBlank(dataSourceCode)) { return Result.ok(new Page()); } @@ -167,13 +162,13 @@ public class ConfigServiceDirectiveController extends JeecgController page = new Page(pageNo, pageSize); IPage list = configServiceDirectiveService.page(page, queryWrapper); @@ -377,9 +372,7 @@ public class ConfigServiceDirectiveController extends JeecgController orgList = sysBaseAPI.queryOpeDept(); - List codes = orgList.stream() - .map(o -> o.getString("code")) - .collect(Collectors.toList()); + List codes = orgList.stream().map(o -> o.getString("code")).collect(Collectors.toList()); //启动线程，循环 codes， 5 分钟通知一个平台 new Thread(() -> { @@ -397,4 +390,16 @@ public class ConfigServiceDirectiveController extends JeecgController syncDirective(@RequestParam(name = "dataSourceCode") String dataSourceCode, @RequestParam(name = "syncIds") String syncIds, @RequestParam(name = "syncOrgCodes") String syncOrgCodes) { + //服务指令 + configServiceDirectiveService.syncDirective(syncIds, syncOrgCodes); + //发送消息 + 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 65a66e6..d0fc5eb 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 @@ -204,4 +204,8 @@ public class ConfigServiceDirective implements Serializable { private String instructionTagName; @TableField(exist = false) private String excludeIds;//需要排除的ids + @TableField(exist = false) + private String syncIds;//需要同步的的指令id，逗号拼接 + @TableField(exist = false) + private String syncOrgCodes;//需要同步的指令的机构编码，逗号拼接 } 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 98d60d9..4273b69 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 @@ -60,4 +60,7 @@ public interface IConfigServiceDirectiveService extends IService pageList(ConfigServiceDirective configServiceDirective, IPage list_) { @@ -297,44 +303,44 @@ public class ConfigServiceDirectiveServiceImpl extends ServiceImpl instruUW = new UpdateWrapper<>(); - instruUW.eq("id",dto.getInstructionTagId()); - instruUW.eq("status","1"); + instruUW.eq("id", dto.getInstructionTagId()); + instruUW.eq("status", "1"); InstructionTag instructionTag = new InstructionTag(); instructionTag.setStatus("0"); - instructionTagService.update(instructionTag,instruUW); + instructionTagService.update(instructionTag, instruUW); //服务类别 UpdateWrapper categoryUW = new UpdateWrapper<>(); - categoryUW.eq("id",dto.getCategoryId()); - categoryUW.eq("status","1"); + categoryUW.eq("id", dto.getCategoryId()); + categoryUW.eq("status", "1"); ConfigServiceCategory category = new ConfigServiceCategory(); category.setStatus("0"); - categoryService.update(category,categoryUW); + categoryService.update(category, categoryUW); //服务类型 UpdateWrapper typeUW = new UpdateWrapper<>(); - typeUW.eq("id",dto.getTypeId()); - typeUW.eq("status","1"); + typeUW.eq("id", dto.getTypeId()); + typeUW.eq("status", "1"); ConfigServiceType type = new ConfigServiceType(); type.setStatus("0"); - typeService.update(type,typeUW); + typeService.update(type, typeUW); //体型标签 List bodyTags = Arrays.asList(dto.getBodyTags().split(",")); bodyTags.stream().forEach(b -> { UpdateWrapper bodyTagUW = new UpdateWrapper<>(); - bodyTagUW.eq("id",b); - bodyTagUW.eq("status","1"); + bodyTagUW.eq("id", b); + bodyTagUW.eq("status", "1"); DirectiveBodyTag bodyTag = new DirectiveBodyTag(); bodyTag.setStatus("0"); - bodyTagService.update(bodyTag,bodyTagUW); + bodyTagService.update(bodyTag, bodyTagUW); }); //情绪标签 List emotionTags = Arrays.asList(dto.getEmotionTags().split(",")); emotionTags.stream().forEach(b -> { UpdateWrapper emotionTagUW = new UpdateWrapper<>(); - emotionTagUW.eq("id",b); - emotionTagUW.eq("status","1"); + emotionTagUW.eq("id", b); + emotionTagUW.eq("status", "1"); DirectiveEmotionTag emotionTag = new DirectiveEmotionTag(); emotionTag.setStatus("0"); - emotionTagService.update(emotionTag,emotionTagUW); + emotionTagService.update(emotionTag, emotionTagUW); }); } @@ -394,4 +400,69 @@ public class ConfigServiceDirectiveServiceImpl extends ServiceImpl directives; + List directiveIds = Arrays.asList(syncIds.split(",")); + { + List param = Lists.newArrayList(); + Arrays.stream(syncIds.split(",")).forEach(id -> { + ConfigServiceDirective configServiceDirective = new ConfigServiceDirective(); + configServiceDirective.setId(id); + param.add(configServiceDirective); + }); + directives = baseMapper.pageList(null, param); + if (directives != null && !directives.isEmpty()) { + directives.stream().forEach(record -> { + 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(","))); + }); + } + directiveMQDto.setDirectiveList(BeanUtil.copyToList(directives, DirectiveAsyncMQDto.class)); + } + //分类标签 + { + List instructionTagIds = directives.stream().map(ConfigServiceDirective::getInstructionTagId).filter(instructionTagId -> instructionTagId != null && !instructionTagId.isEmpty()).distinct().collect(Collectors.toList()); + QueryWrapper qw = new QueryWrapper<>(); + qw.in("id", instructionTagIds); + List list = instructionTagService.list(qw); + directiveMQDto.setInstructionList(BeanUtil.copyToList(list, InstructionTagMQDto.class)); + } + //服务类别 + { + List categoryIds = directives.stream().map(ConfigServiceDirective::getCategoryId).filter(categoryId -> categoryId != null && !categoryId.isEmpty()).distinct().collect(Collectors.toList()); + QueryWrapper qw = new QueryWrapper<>(); + qw.in("id", categoryIds); + List list = categoryService.list(qw); + directiveMQDto.setCategoryList(BeanUtil.copyToList(list, CategoryMQDto.class)); + } + //服务类型 + { + List typeIds = directives.stream().map(ConfigServiceDirective::getTypeId).filter(typeId -> typeId != null && !typeId.isEmpty()).distinct().collect(Collectors.toList()); + QueryWrapper qw = new QueryWrapper<>(); + qw.in("id", typeIds); + List list = typeService.list(qw); + directiveMQDto.setTypeList(BeanUtil.copyToList(list, DirectiveTypeMQDto.class)); + } + //体型标签 + { + directiveMQDto.setBodyTagList(BeanUtil.copyToList(bodyTagService.selectAll(directiveIds, null), BodyTagMQDto.class)); + } + //情绪标签 + { + directiveMQDto.setEmotionTagList(BeanUtil.copyToList(emotionTagService.selectAll(directiveIds, null), EmotionTagMQDto.class)); + } + //给对应业务平台发送消息 + Arrays.stream(syncOrgCodes.split(",")).forEach(orgCode -> { +// rabbitMQUtil.sendToExchange("hldy.directive", orgCode + ".directive.syncDirective", directiveMQDto); + }); + } }