diff --git a/adc-da-convert/src/main/java/com/adc/da/convert/mq/SendConvertMQService.java b/adc-da-convert/src/main/java/com/adc/da/convert/mq/SendConvertMQService.java index dd32104f..0aa837a6 100644 --- a/adc-da-convert/src/main/java/com/adc/da/convert/mq/SendConvertMQService.java +++ b/adc-da-convert/src/main/java/com/adc/da/convert/mq/SendConvertMQService.java @@ -20,6 +20,7 @@ import com.adc.da.util.http.ResponseMessage; import com.adc.da.util.http.Result; import com.adc.da.util.utils.StringUtils; import com.adc.da.util.utils.UUID; +import com.alibaba.fastjson.JSONObject; import com.rabbitmq.client.Channel; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -40,7 +41,7 @@ import java.util.Map; @Component public class SendConvertMQService { - // 文档转换远程服务IP地址s + // 文档转换远程服务IP地址 @Value("${convert.host}") private String convertHost; @@ -74,9 +75,11 @@ public class SendConvertMQService { value = @Queue(value = "createConvertStandMQ_SQ_GSAR_RELEASE", durable = "true"), exchange = @Exchange(value = "convert-exchange_SQ_GSAR_RELEASE", ignoreDeclarationExceptions = "true"), key = "convert-key_SQ_GSAR_RELEASE")) - public void createMQ(Map convertInfo, Message message, Channel channel) throws Exception{ + public void createMQ(Message message, Channel channel) throws Exception{ try{ try{ + String messagePayload = (String) message.getPayload(); + Map convertInfo = JSONObject.parseObject(messagePayload, Map.class); Thread.sleep(5000); insertConvertMsg(convertInfo); }catch(InterruptedException e){ diff --git a/adc-da-slrs/src/main/java/com/adc/da/mq/CreateMQService.java b/adc-da-slrs/src/main/java/com/adc/da/mq/CreateMQService.java index 5e6c6f22..ac3db538 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/mq/CreateMQService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/mq/CreateMQService.java @@ -3,6 +3,7 @@ package com.adc.da.mq; import com.adc.da.slrs.otConvertMq.dao.OtConvertMqDao; import com.adc.da.slrs.otConvertMq.entity.OtConvertMq; import com.adc.da.util.UUIDUtils; +import com.alibaba.fastjson.JSONObject; import org.apache.commons.lang3.StringUtils; import org.springframework.amqp.core.AmqpTemplate; import org.springframework.beans.factory.annotation.Autowired; @@ -69,9 +70,9 @@ public class CreateMQService { convertInfo.put("standFilePdfId", convert.getPdfId()); convertInfo.put("againNum",convert.getAgainNum()); } - + String body = JSONObject.toJSONString(convertInfo); //发送消息队列 - this.rabbitTemplate.convertAndSend("convert-exchange_SQ_GSAR_RELEASE", "convert-key_SQ_GSAR_RELEASE", convertInfo); + this.rabbitTemplate.convertAndSend("convert-exchange_SQ_GSAR_RELEASE", "convert-key_SQ_GSAR_RELEASE", body); } } diff --git a/adc-da-slrs/src/main/java/com/adc/da/scheduledState/server/UpdateStateStandSyncFz.java b/adc-da-slrs/src/main/java/com/adc/da/scheduledState/server/UpdateStateStandSyncFz.java index 74d8cf18..4ab1d670 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/scheduledState/server/UpdateStateStandSyncFz.java +++ b/adc-da-slrs/src/main/java/com/adc/da/scheduledState/server/UpdateStateStandSyncFz.java @@ -123,19 +123,24 @@ public class UpdateStateStandSyncFz implements Runnable { int queryGbCount = queryGBList.size(); //被代替标准号中所有有效标准的状态都是现行有效状态 - List yxList = queryGBList.stream().filter(info1 -> - "vsaga7nwub".equals(info1.getTextStatus())).collect(Collectors.toList()); - - //被代替标准号中所有有效标准的状态都是被代替状态 - List bdtStateList = queryGBList.stream().filter(info1 -> - "qke0ckro2p".equals(info1.getTextStatus())).collect(Collectors.toList()); - - //被代替标准号中所有有效标准的状态都是废止状态 List fzList = queryGBList.stream().filter(info1 -> - "chblaarg77".equals(info1.getTextStatus())).collect(Collectors.toList()); + "vsaga7nwub".equals(info1.getTextStatus()) || "qke0ckro2p".equals(info1.getTextStatus()) + || "chblaarg77".equals(info1.getTextStatus())).collect(Collectors.toList()); + + List fzList2 = queryGBList.stream().filter(info1 -> + !"vsaga7nwub".equals(info1.getTextStatus()) && !"qke0ckro2p".equals(info1.getTextStatus()) + && !"chblaarg77".equals(info1.getTextStatus())).collect(Collectors.toList()); + +// //被代替标准号中所有有效标准的状态都是被代替状态 +// List bdtStateList = queryGBList.stream().filter(info1 -> +// "qke0ckro2p".equals(info1.getTextStatus())).collect(Collectors.toList()); +// +// //被代替标准号中所有有效标准的状态都是废止状态 +// List fzList = queryGBList.stream().filter(info1 -> +// "chblaarg77".equals(info1.getTextStatus())).collect(Collectors.toList()); // 满足其上存入更新废止逻辑 如果只有一个被代替标准 优先更新废止状态 - if(yxList.size() == queryGbCount || bdtStateList.size() == queryGbCount || fzList.size() == queryGbCount){ + if(!fzList.isEmpty() && fzList2.isEmpty()){ invalidStandToGBList.add(info); }else { // 被代替标准号中的有效标准的标准状态中有一个是发布、即将实施、现行有效、被代替状态的 diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/esRevisePlan/EsRevisePlanMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/esRevisePlan/EsRevisePlanMapper.xml index 65f300b3..c7c95620 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/esRevisePlan/EsRevisePlanMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/esRevisePlan/EsRevisePlanMapper.xml @@ -24,7 +24,7 @@ qblb, (select sar_bussioness_stand.STAND_NAME from sar_bussioness_stand where sar_bussioness_stand.ID = rqb_json )as rqbName, (select sar_bussioness_stand.STAND_CODE from sar_bussioness_stand where sar_bussioness_stand.ID = rqb_json )as rqbCode, - (select group_concat(ts_institution.name) from ts_institution where find_in_set(ts_institution.id,unit)) as unitName, + (select group_concat(ts_institution.name order by ts_institution.name) from ts_institution where find_in_set(ts_institution.id,unit) ORDER BY find_in_set(ts_institution.id,unit)) as unitName, (SELECT GROUP_CONCAT(UNAME) from ts_user WHERE find_in_set(USID,drafter) ) as drafterName, (SELECT GROUP_CONCAT(sar_menu_standard.MENU_NAME) from sar_menu_standard WHERE find_in_set(sar_menu_standard.ID,es_revise_plan.ts_json) ) as tsJsonName, (SELECT GROUP_CONCAT(UNAME) from ts_user WHERE find_in_set(USID,res_person) ) as res_personName, @@ -147,7 +147,7 @@ es_revise_plan.LXD, sar_bussioness_stand.STAND_CODE as rqbName, sar_bussioness_stand.STAND_SORT as standType, - (select group_concat(ts_institution.name) from ts_institution where find_in_set(ts_institution.id,unit)) as unitName, + (select group_concat(ts_institution.name order by ts_institution.name) from ts_institution where find_in_set(ts_institution.id,unit) ORDER BY find_in_set(ts_institution.id,unit)) as unitName, (SELECT GROUP_CONCAT(UNAME) from ts_user WHERE find_in_set(USID,drafter) ) as drafterName, (SELECT GROUP_CONCAT(ts_dictype.DIC_TYPE_NAME) from ts_dictype WHERE find_in_set(ts_dictype.DIC_TYPE_CODE,area) ) as areaName, (SELECT GROUP_CONCAT(ts_dictype.DIC_TYPE_NAME) from ts_dictype WHERE find_in_set(ts_dictype.DIC_TYPE_CODE,use_level) ) as useLevelName, @@ -217,7 +217,7 @@ sar_bussioness_stand.STAND_CODE as rqbName, sar_bussioness_stand.STAND_SORT as standType, sar_bussioness_stand.stand_number as standNum, - (select group_concat(ts_institution.name) from ts_institution where find_in_set(ts_institution.id,unit)) as unitName, + (select group_concat(ts_institution.name order by ts_institution.name) from ts_institution where find_in_set(ts_institution.id,unit) ORDER BY find_in_set(ts_institution.id,unit)) as unitName, (SELECT GROUP_CONCAT(UNAME) from ts_user WHERE find_in_set(USID,drafter) ) as drafterName, (SELECT GROUP_CONCAT(ts_dictype.DIC_TYPE_NAME) from ts_dictype WHERE find_in_set(ts_dictype.DIC_TYPE_CODE,area) ) as areaName, (SELECT GROUP_CONCAT(ts_dictype.DIC_TYPE_NAME) from ts_dictype WHERE find_in_set(ts_dictype.DIC_TYPE_CODE,use_level) ) as useLevelName, @@ -289,7 +289,7 @@ es_revise_plan.LXD, sar_bussioness_stand.STAND_CODE as rqbName, sar_bussioness_stand.STAND_SORT as standType, - (select group_concat(ts_institution.name) from ts_institution where find_in_set(ts_institution.id,unit)) as unitName, + (select group_concat(ts_institution.name order by ts_institution.name) from ts_institution where find_in_set(ts_institution.id,unit) ORDER BY find_in_set(ts_institution.id,unit)) as unitName, (SELECT GROUP_CONCAT(UNAME) from ts_user WHERE find_in_set(USID,drafter) ) as drafterName, (SELECT GROUP_CONCAT(ts_dictype.DIC_TYPE_NAME) from ts_dictype WHERE find_in_set(ts_dictype.DIC_TYPE_CODE,area) ) as areaName, (SELECT GROUP_CONCAT(sar_menu_standard.MENU_NAME) from sar_menu_standard WHERE find_in_set(sar_menu_standard.ID,es_revise_plan.ts_json) ) as tsJsonName, @@ -532,7 +532,7 @@ es_revise_plan.LXD, sar_bussioness_stand.STAND_CODE as rqbName, sar_bussioness_stand.STAND_SORT as standType, - (select group_concat(ts_institution.name) from ts_institution where find_in_set(ts_institution.id,unit)) as unitName, + (select group_concat(ts_institution.name order by ts_institution.name) from ts_institution where find_in_set(ts_institution.id,unit) ORDER BY find_in_set(ts_institution.id,unit)) as unitName, (SELECT GROUP_CONCAT(UNAME) from ts_user WHERE find_in_set(USID,drafter) ) as drafterName, (SELECT GROUP_CONCAT(ts_dictype.DIC_TYPE_NAME) from ts_dictype WHERE find_in_set(ts_dictype.DIC_TYPE_CODE,area) ) as areaName, (SELECT GROUP_CONCAT(ts_dictype.DIC_TYPE_NAME) from ts_dictype WHERE find_in_set(ts_dictype.DIC_TYPE_CODE,use_level) ) as useLevelName,