feat(重要提醒)：业务新增提醒开发联调

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/reminder/core/event/adapter/EditEventAdapter.java

 package com.yeejoin.amos.boot.module.jg.biz.reminder.core.event.adapter;
 
 import com.yeejoin.amos.boot.module.jg.biz.edit.event.BaseBizDataChangeEvent;
-import com.yeejoin.amos.boot.module.jg.biz.event.publisher.EventPublisher;
 import com.yeejoin.amos.boot.module.jg.biz.reminder.core.event.EquipCreateOrEditEvent;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.scheduling.annotation.Async;
+import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.event.TransactionPhase;
 import org.springframework.transaction.event.TransactionalEventListener;
 
 @Component
@@ -14,13 +16,18 @@ import org.springframework.transaction.event.TransactionalEventListener;
 @Slf4j
 public class EditEventAdapter {
 
-    private final EventPublisher publisher;
+    private final ApplicationEventPublisher publisher;
+
+    @TransactionalEventListener(phase = TransactionPhase.AFTER_COMMIT)
+    @Transactional(propagation = Propagation.REQUIRES_NEW)
+    public void handleEventAsync(BaseBizDataChangeEvent event) {
+        log.info("receive editEvent handleEventAAsync eventA={}", event);
+        try {
+            publisher.publishEvent(convertToEvent(event));
+        } catch (Exception e) {
+            log.error(e.getMessage(), e);
+        }
 
-    @TransactionalEventListener
-    @Async
-    public void handleEventAAsync(BaseBizDataChangeEvent eventA) {
-        log.info("receive editEvent handleEventAAsync eventA={}", eventA);
-        publisher.publish(convertToEvent(eventA));
     }
 
     private EquipCreateOrEditEvent convertToEvent(BaseBizDataChangeEvent eventA) {

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/CommonServiceImpl.java

@@ -44,6 +44,7 @@ import com.yeejoin.amos.boot.module.jg.api.service.IJgInstallationNoticeService;
 import com.yeejoin.amos.boot.module.jg.api.service.IJgMaintainNoticeService;
 import com.yeejoin.amos.boot.module.jg.api.service.IJgTransferNoticeService;
 import com.yeejoin.amos.boot.module.jg.api.vo.SortVo;
+import com.yeejoin.amos.boot.module.jg.biz.edit.typeHandler.CbDataDictTypeHandler;
 import com.yeejoin.amos.boot.module.jg.biz.feign.PrivilegeFeginService;
 import com.yeejoin.amos.boot.module.jg.biz.feign.TaskV2FeignService;
 import com.yeejoin.amos.boot.module.jg.biz.feign.TzsServiceFeignClient;
@@ -281,6 +282,11 @@ public class CommonServiceImpl implements ICommonService {
     @Value("${qrcode.prefix:https://sxtzsb.sxsei.com:19435/tzs}")
     private String qrcodePrefix;
 
+    @Autowired
+    private CbDataDictTypeHandler dataDictTypeHandler;
+
+    public static final String DATA_QUALITY_SCORE = "DATA_QUALITY_SCORE";
+
     public static byte[] file2byte(File file) {
         try {
             FileInputStream in = new FileInputStream(file);
@@ -3085,4 +3091,15 @@ public class CommonServiceImpl implements ICommonService {
         }
     }
 
+    /**
+     * 数据质量等级枚举转名称描述
+     * @param dataQualityScore 等级枚举
+     * @param isIntoManagement 是否纳管
+     * @return 名称描述
+     */
+    public String castDataQualityScore2Name(String dataQualityScore, Boolean isIntoManagement){
+        String name = dataDictTypeHandler.handle(DATA_QUALITY_SCORE, dataQualityScore);
+        return name == null ?  (isIntoManagement == null || !isIntoManagement) ? "II" : "III" : name;
+    }
+
 }
\ No newline at end of file

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/IdxBizJgProjectContraptionServiceImpl.java

@@ -85,6 +85,8 @@ public class IdxBizJgProjectContraptionServiceImpl extends BaseService<IdxBizJgP
     public static final String EQU_DEFINE = "equDefine";
     public static final String PROJECT_CONTRAPTION_NO = "projectContraptionNo";
     public static final String ORG_BRANCH_CODE = "orgBranchCode";
+
+    public static final String DATA_QUALITY_SCORE = "dataQualityScore";
     // 设备基本信息表单id
     private static final String EQUIP_INFO_FORM_ID = "equipInfo";
     public static final String USE_UNIT_CREDIT_CODE = "useUnitCreditCode";
@@ -95,8 +97,6 @@ public class IdxBizJgProjectContraptionServiceImpl extends BaseService<IdxBizJgP
     @Resource
     private IdxBizJgRegisterInfoServiceImpl registerInfoService;
     @Autowired
-    private CommonServiceImpl commonServiceImpl;
-    @Autowired
     private IdxBizJgInspectionDetectionInfoServiceImpl detectionInfoService;
     @Autowired
     private TzBaseEnterpriseInfoMapper tzBaseEnterpriseInfoMapper;
@@ -238,6 +238,8 @@ public class IdxBizJgProjectContraptionServiceImpl extends BaseService<IdxBizJgP
         String equCategory = params.get(EQU_CATEGORY);
         // 设备类品种code
         String equDefine = params.get(EQU_DEFINE);
+
+        String dataQualityScore = params.get(DATA_QUALITY_SCORE);
         // 证详情-查询标识
         String useRegDetail = params.get("useRegDetail");
         // 登录人公司类型：企业，监管
@@ -320,6 +322,7 @@ public class IdxBizJgProjectContraptionServiceImpl extends BaseService<IdxBizJgP
                 .eq(!ValidationUtil.isEmpty(city), IdxBizJgProjectContraption::getCity, city)
                 .eq(!ValidationUtil.isEmpty(county), IdxBizJgProjectContraption::getCounty, county)
                 .eq(!ValidationUtil.isEmpty(street), IdxBizJgProjectContraption::getStreet, street)
+                .eq(!ValidationUtil.isEmpty(dataQualityScore), IdxBizJgProjectContraption::getDataQualityScore, dataQualityScore)
                 .eq(!ValidationUtil.isEmpty(useUnitCreditCode), IdxBizJgProjectContraption::getUseUnitCreditCode, useUnitCreditCode)
                 .like(!ValidationUtil.isEmpty(useUnitName), IdxBizJgProjectContraption::getUseUnitName, useUnitName)
                 .like(!ValidationUtil.isEmpty(projectContraption), IdxBizJgProjectContraption::getProjectContraption, projectContraption)
@@ -348,6 +351,7 @@ public class IdxBizJgProjectContraptionServiceImpl extends BaseService<IdxBizJgP
                 BigDecimal strippedValue = roundedValue.stripTrailingZeros();
                 record.setPipelineLength(Double.valueOf(strippedValue.toPlainString()));
                 record.setDataSourceName(EquipSourceEnum.getDataSourceName(record.getDataSource()));
+                record.setDataQualityScore(commonService.castDataQualityScore2Name(record.getDataQualityScore(), record.getIsIntoManagement()));
                 record.setFullAddress(
                         Stream.of(record.getProvinceName(), record.getCityName(), record.getCountyName(), record.getStreetName(), record.getAddress())
                                 .map(value -> value == null ? "" : value)
@@ -366,6 +370,7 @@ public class IdxBizJgProjectContraptionServiceImpl extends BaseService<IdxBizJgP
         return pageList;
     }
 
+
     private SFunction<IdxBizJgProjectContraption, ?> resolveField(String field) {
         switch (field) {
             default:
@@ -491,7 +496,7 @@ public class IdxBizJgProjectContraptionServiceImpl extends BaseService<IdxBizJgP
         var baseMapper = this.getBaseMapper();
         Map<String, Object> projectContraptionMap = Optional.ofNullable(baseMapper.getDetail(sequenceNbr))
                 .map(map -> {
-                    commonServiceImpl.convertStringToJsonobject(map, jsonFields);
+                    commonService.convertStringToJsonobject(map, jsonFields);
                     map.put("unitType", company.getCompanyType());
                     map.put("pipelineList", baseMapper.selectEquipList((String) map.get("SEQUENCE_NBR")));
                     return map;

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/IdxBizJgRegisterInfoServiceImpl.java

@@ -30,7 +30,10 @@ import com.yeejoin.amos.boot.module.jg.api.enums.*;
 import com.yeejoin.amos.boot.module.jg.api.mapper.*;
 import com.yeejoin.amos.boot.module.jg.biz.config.PressureVesselListener;
 import com.yeejoin.amos.boot.module.jg.biz.context.EquipUsedCheckStrategyContext;
+import com.yeejoin.amos.boot.module.jg.biz.edit.typeHandler.CbDataDictTypeHandler;
+import com.yeejoin.amos.boot.module.jg.biz.event.publisher.EventPublisher;
 import com.yeejoin.amos.boot.module.jg.biz.feign.TzsServiceFeignClient;
+import com.yeejoin.amos.boot.module.jg.biz.reminder.core.event.EquipCreateOrEditEvent;
 import com.yeejoin.amos.boot.module.jg.biz.service.*;
 import com.yeejoin.amos.boot.module.jg.biz.utils.CodeUtil;
 import com.yeejoin.amos.boot.module.jg.biz.utils.JsonUtils;
@@ -49,6 +52,7 @@ import io.seata.spring.annotation.GlobalTransactional;
 import lombok.extern.slf4j.Slf4j;
 import net.javacrumbs.shedlock.spring.annotation.SchedulerLock;
 import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.compress.utils.Sets;
 import org.apache.lucene.queryparser.classic.QueryParser;
 import org.elasticsearch.action.search.SearchRequest;
 import org.elasticsearch.action.search.SearchResponse;
@@ -189,7 +193,8 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
     private final List<String> resultError = new ArrayList<>();
     List<String> useInnerCodeList = new ArrayList<>();// 单位内部编号集合
     List<String> equCodeList = new ArrayList<>();// 设备代码集合
-    List<String> factoryNumList = new ArrayList<>();// 出厂编码集合
+    List<String> factoryNumList = new ArrayList<>();
+    // 出厂编码集合
     @Autowired
     RestHighLevelClient restHighLevelClient;
     @Autowired
@@ -222,6 +227,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
     IIdxBizJgTechParamsRidesService iIdxBizJgTechParamsRidesService;
     @Autowired
     IIdxBizJgTechParamsBoilerService iIdxBizJgTechParamsBoilerService;
+
     @Autowired
     IIdxBizJgTechParamsVesselService iIdxBizJgTechParamsVesselService;
     @Autowired
@@ -303,6 +309,11 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
     @Autowired
     private CommonServiceImpl commonServiceImpl;
 
+    @Autowired
+    private EventPublisher eventPublisher;
+
+    public static final String DATA_QUALITY_SCORE = "DATA_QUALITY_SCORE";
+
     private final ExecutorService executorService = Executors.newFixedThreadPool(Runtime.getRuntime().availableProcessors());
 
     public IdxBizJgRegisterInfo getOneData(String record) {
@@ -409,12 +420,21 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
         String equListCode = (String) equipmentInfoForm.get(EQU_LIST);
         //管道添加设备
         if (PipelineEnum.PRESSURE_PIPELINE.getCode().equals(equListCode)) {
-            return this.pipelineEquipCreateOrUpdate(paramMap);
+            ResponseModel responseModel = this.pipelineEquipCreateOrUpdate(paramMap);
+            Long projectContraptionId = (Long)responseModel.getResult();
+            eventPublisher.publish(new EquipCreateOrEditEvent(this, BusinessTypeEnum.JG_NEW_PROJECT.name(), Sets.newHashSet(projectContraptionId.toString()), EquipCreateOrEditEvent.EquipType.project));
+            return responseModel;
         }
         if(dataSource.contains("black")){
-            return this.blackEquipCreateOrUpdate(paramMap);
+            ResponseModel responseModel = this.blackEquipCreateOrUpdate(paramMap);
+            String record = (String)responseModel.getResult();
+            eventPublisher.publish(new EquipCreateOrEditEvent(this, BusinessTypeEnum.JG_NEW_EQUIP.name(), Sets.newHashSet(record), EquipCreateOrEditEvent.EquipType.equip));
+            return responseModel;
         } else {
-            return this.otherEquipCreateOrUpdate(paramMap);
+            ResponseModel responseModel = this.otherEquipCreateOrUpdate(paramMap);
+            String record = (String)responseModel.getResult();
+            eventPublisher.publish(new EquipCreateOrEditEvent(this, BusinessTypeEnum.JG_NEW_EQUIP.name(), Sets.newHashSet(record), EquipCreateOrEditEvent.EquipType.equip));
+            return responseModel;
         }
     }
 
@@ -2532,6 +2552,13 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
             boolMust.must(seqBuilder);
         }
 
+        if (!ObjectUtils.isEmpty(map.getString(DATA_QUALITY_SCORE))) {
+            BoolQueryBuilder pBuilder = QueryBuilders.boolQuery();
+            String param = QueryParser.escape(map.getString(DATA_QUALITY_SCORE));
+            pBuilder.must(QueryBuilders.termQuery(DATA_QUALITY_SCORE, param));
+            boolMust.must(pBuilder);
+        }
+
         if (!ObjectUtils.isEmpty(map.getString(IS_INTO_MANAGEMENT))) {
             BoolQueryBuilder pBuilder = QueryBuilders.boolQuery();
             String param = QueryParser.escape(map.getString(IS_INTO_MANAGEMENT));
@@ -2805,6 +2832,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
                     item.put("ADDRESS", !ValidationUtil.isEmpty(fullAddress) ? fullAddress : "");
                     item.put("CAN_EDIT", this.checkEquipIsCanEdit(item.getString(SEQUENCE_NBR)));
                     item.put("CAN_DELETE", this.checkEquipIsCanDelete(item.getString(SEQUENCE_NBR)));
+                    item.put("DATA_QUALITY_SCORE", commonServiceImpl.castDataQualityScore2Name(item.getString(DATA_QUALITY_SCORE), item.getBoolean(IS_INTO_MANAGEMENT)));
                 }
             }
             totle = response.getInternalResponse().hits().getTotalHits().value;
@@ -2816,6 +2844,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
         return result;
     }
 
+
     private String getCompanyLevel(JSONObject company) {
         if (BaseController.COMPANY_TYPE_COMPANY.equals(company.getString("level"))) {
             return BaseController.COMPANY_TYPE_COMPANY;

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/JgUseRegistrationServiceImpl.java

@@ -16,6 +16,7 @@ import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.google.common.collect.Sets;
 import com.yeejoin.amos.boot.biz.common.annotation.ResultFieldMapping;
 import com.yeejoin.amos.boot.biz.common.bo.CompanyBo;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
@@ -49,6 +50,7 @@ import com.yeejoin.amos.boot.module.jg.biz.event.CancellationEvent;
 import com.yeejoin.amos.boot.module.jg.biz.event.publisher.EventPublisher;
 import com.yeejoin.amos.boot.module.jg.biz.feign.TzsServiceFeignClient;
 import com.yeejoin.amos.boot.module.jg.biz.feign.WorkFlowFeignService;
+import com.yeejoin.amos.boot.module.jg.biz.reminder.core.event.EquipCreateOrEditEvent;
 import com.yeejoin.amos.boot.module.jg.biz.service.ICommonService;
 import com.yeejoin.amos.boot.module.jg.biz.service.ICompensateFlowDataOfRedis;
 import com.yeejoin.amos.boot.module.jg.biz.service.IIdxBizJgInspectionDetectionInfoService;
@@ -1205,6 +1207,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
                     jgProjectContraption.setSupervisoryCode(superviseCode);
                 }
             }
+            List<String> records = new ArrayList<>();
             if (!CollectionUtils.isEmpty(equipmentLists)) {
                 // 装置更新管道的技术参数、设计信息、安装信息
                 if(jgProjectContraption != null){
@@ -1214,6 +1217,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
                     Map<String, Object> equipment = equipmentLists.get(i);
                     // 设备ID
                     String equId = (String) equipment.get("record");
+                    records.add(equId);
                     mapData.put("equipId", equId);
                     mapData.put("isFirstEquip", i == 0);
                     // 注册信息
@@ -1269,12 +1273,26 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
             // 更新历史表：下次检验日期、检验机构名称、检验结论在压力管道、气瓶时更新子表单的数据
             jgRegistrationHistory.setChangeData(JSON.toJSONString(mapData));
             jgRegistrationHistoryService.updateById(jgRegistrationHistory);
+            this.publish2CalGrade(jgUseRegistration, records);
         }
         this.getBaseMapper().updateById(jgUseRegistration);
         commonServiceImpl.saveExecuteFlowData2Redis(jgUseRegistration.getInstanceId(), this.buildInstanceRuntimeData(jgUseRegistration));
     }
 
     /**
+     * 计算登记
+     * @param jgUseRegistration 使用登记
+     * @param records 管道或者普通气瓶
+     */
+    private void publish2CalGrade(JgUseRegistration jgUseRegistration, List<String> records) {
+        if(!StringUtils.isEmpty(jgUseRegistration.getProjectContraptionId())){ // 装置
+            eventPublisher.publish(new EquipCreateOrEditEvent(this, BusinessTypeEnum.JG_USAGE_REGISTRATION.name(), Sets.newHashSet(jgUseRegistration.getProjectContraptionId()), EquipCreateOrEditEvent.EquipType.project));
+        } else { // 气瓶
+            eventPublisher.publish(new EquipCreateOrEditEvent(this, BusinessTypeEnum.JG_USAGE_REGISTRATION.name(), Sets.newHashSet(records), EquipCreateOrEditEvent.EquipType.equip));
+        }
+    }
+
+    /**
      * 管道的技术参数及检验信息更新
      * @return 更新的管道信息
      */
@@ -1672,6 +1690,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
             changeRecordEq.setEquId(registerInfo.getRecord());//设备主键
             changeRecordEq.setProductCode(idxBizJgFactoryInfo.getFactoryNum());
             certificateChangeRecordEqService.save(changeRecordEq);
+            eventPublisher.publish(new EquipCreateOrEditEvent(this, BusinessTypeEnum.JG_USAGE_REGISTRATION.name(), Sets.newHashSet(registerInfo.getRecord()), EquipCreateOrEditEvent.EquipType.equip));
         }
         this.getBaseMapper().updateById(jgUseRegistration);
         commonServiceImpl.saveExecuteFlowData2Redis(jgUseRegistration.getInstanceId(), this.buildInstanceRuntimeData(jgUseRegistration));

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/JgVehicleInformationServiceImpl.java

@@ -12,6 +12,7 @@ import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.google.common.collect.Sets;
 import com.yeejoin.amos.boot.biz.common.annotation.ResultFieldMapping;
 import com.yeejoin.amos.boot.biz.common.bo.CompanyBo;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
@@ -40,6 +41,7 @@ import com.yeejoin.amos.boot.module.jg.biz.event.CancellationEvent;
 import com.yeejoin.amos.boot.module.jg.biz.event.publisher.EventPublisher;
 import com.yeejoin.amos.boot.module.jg.biz.feign.TzsServiceFeignClient;
 import com.yeejoin.amos.boot.module.jg.biz.feign.WorkFlowFeignService;
+import com.yeejoin.amos.boot.module.jg.biz.reminder.core.event.EquipCreateOrEditEvent;
 import com.yeejoin.amos.boot.module.jg.biz.service.ICmWorkflowService;
 import com.yeejoin.amos.boot.module.jg.biz.service.ICompensateFlowDataOfRedis;
 import com.yeejoin.amos.boot.module.jg.biz.utils.FileExporter;
@@ -978,6 +980,8 @@ public class JgVehicleInformationServiceImpl extends BaseService<JgVehicleInform
                                     .build())
                             .collect(Collectors.toList())
             );
+            // 车用气瓶评分
+            eventPublisher.publish(new EquipCreateOrEditEvent(this, BusinessTypeEnum.JG_USAGE_REGISTRATION.name(), Sets.newHashSet(equipIdList), EquipCreateOrEditEvent.EquipType.equip));
         }
         this.getBaseMapper().updateById(jgVehicleInformation);
         commonService.saveExecuteFlowData2Redis(jgVehicleInformation.getInstanceId(), this.buildInstanceRuntimeData(jgVehicleInformation));

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/entity/IdxBizJgProjectContraption.java

@@ -304,6 +304,6 @@ public class IdxBizJgProjectContraption extends BaseEntity {
      * 数据质量等级
      */
     @TableField("data_quality_score")
-    private Integer dataQualityScore;
+    private String dataQualityScore;
 
 }