refeat(jyjc): 报检规则4.0开发

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/java/com/yeejoin/amos/boot/module/jyjc/api/model/InspectionEquipInfoModel.java

@@ -41,8 +41,11 @@ public class InspectionEquipInfoModel implements Serializable {
     @ApiModelProperty(value = "主题，无需上送，由topic解析出来")
     private String componentKey;
 
-    @ApiModelProperty(value = "申请报检单位信用代码")
-    private String unitCode;
+    @ApiModelProperty(value = "登录人token")
+    private String token;
+
+    @ApiModelProperty(value = "登录人userId")
+    private String userId;
 
     @ApiModelProperty(value = "设备分类，大型游乐设施使用")
     private String equipTag1;

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/resources/mapper/JyjcOpeningApplicationMapper.xml

@@ -137,7 +137,7 @@
         FROM "tz_jyjc_opening_application"
         where
             status = '已完成'
-            and agencyClassify in
+            and agency_classify in
             <foreach collection="agencyClassifies" separator="," open="(" close=")" item="agencyClassify">
                 #{agencyClassify}
             </foreach>

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/action/RuleActionHandler.java

@@ -141,7 +141,7 @@ public class RuleActionHandler {
         // 本次报检已经不予受理的单位code
         List<String> noAcceptUnitCodes = getNoAcceptHistoryUnit(inspectionEquipInfo);
         // 不予受理的单位去掉，目的下次不能在进行选择
-        matchEnterpriseInfos.removeIf(e -> !noAcceptUnitCodes.contains(e.getUseCode()));
+        matchEnterpriseInfos.removeIf(e -> noAcceptUnitCodes.contains(e.getUseCode()));
     }
 
 
@@ -162,11 +162,18 @@ public class RuleActionHandler {
                     .eq(TzBaseUnitLicence::getLicenceType, LicenceTypeEnum.JY_JC.getCode())
                     .in(TzBaseUnitLicence::getItemCode, Arrays.asList(itemCode.split(",")))
                     .ge(TzBaseUnitLicence::getExpiryDate, LocalDate.now())
+                    .eq(TzBaseUnitLicence::getIsDelete, false)
+                    .isNotNull(TzBaseUnitLicence::getEnterpriseCertSeq)
                     .eq(TzBaseUnitLicence::getLicenceState, LicenceStateEnum.enabled.getValue()));
         }
         if (!tzBaseUnitLicences.isEmpty()) {
             // 匹配单位类型的证书
-            List<String> certSeqs = baseEnterpriseCertService.list(new LambdaQueryWrapper<BaseEnterpriseCert>().in(com.yeejoin.amos.boot.biz.common.entity.BaseEntity::getSequenceNbr, tzBaseUnitLicences.stream().map(TzBaseUnitLicence::getEnterpriseCertSeq).collect(Collectors.toList())).eq(BaseEnterpriseCert::getUnitType, orgType).select(com.yeejoin.amos.boot.biz.common.entity.BaseEntity::getSequenceNbr)).stream().map(e -> String.valueOf(e.getSequenceNbr())).collect(Collectors.toList());
+            List<String> certSeqs = baseEnterpriseCertService.list(new LambdaQueryWrapper<BaseEnterpriseCert>()
+                            .in(com.yeejoin.amos.boot.biz.common.entity.BaseEntity::getSequenceNbr, tzBaseUnitLicences.stream().map(TzBaseUnitLicence::getEnterpriseCertSeq).collect(Collectors.toList()))
+                            .eq(BaseEnterpriseCert::getUnitType, OpenBizTypeEnumV2.getOneByCode(orgType).getUnitType())
+                            .eq(com.yeejoin.amos.boot.biz.common.entity.BaseEntity::getIsDelete, false)
+                            .select(com.yeejoin.amos.boot.biz.common.entity.BaseEntity::getSequenceNbr))
+                    .stream().map(e -> String.valueOf(e.getSequenceNbr())).collect(Collectors.toList());
             // 返回符合核准项目且开通的项目且开通的单位类型能匹配上的资质
             tzBaseUnitLicences = tzBaseUnitLicences.stream().filter(l -> certSeqs.contains(l.getEnterpriseCertSeq())).collect(Collectors.toList());
         }

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/event/rule/service/EnableRuleDataPreparationService.java

 package com.yeejoin.amos.boot.module.jyjc.biz.event.rule.service;
 
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
+import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
+import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
 import com.yeejoin.amos.boot.biz.common.utils.SnowflakeIdUtil;
 import com.yeejoin.amos.boot.module.jyjc.api.entity.JyjcInspectionApplicationNoAcceptLog;
 import com.yeejoin.amos.boot.module.jyjc.api.enums.JYJCTypeEnum;
@@ -64,10 +68,18 @@ public class EnableRuleDataPreparationService {
 
     private final TzBaseEnterpriseInfoMapper baseEnterpriseInfoMapper;
 
+    private final RedisUtils redisUtils;
+
     @Value("${rule.data.preparation.thread.number:2}")
     private int threadNumber;
 
     /**
+     * 默认的企业标签：管控等级
+     */
+    @Value("${enterprise.regulatoryLabels.default.value:三级管控}")
+    private String defaultRegulatoryLabels;
+
+    /**
      * 压力类设备种类
      */
     private static final List<String> PRESSURE_EQU_LIST = Arrays.asList("8000", "1000", "2000");
@@ -75,7 +87,7 @@ public class EnableRuleDataPreparationService {
     /**
      * 需要技术参数匹配报检的设备类别-目的提高执行速度
      */
-    private static final List<String> NEED_TECH_PARAM_EQU_CATEGORY = Arrays.asList("1100", "2100");
+    private static final List<String> NEED_TECH_PARAM_EQU_CATEGORY = Collections.singletonList("1100");
 
 
     public void onApplicationEvent(InspectionOrgRefreshEvent event) {
@@ -139,9 +151,10 @@ public class EnableRuleDataPreparationService {
             inspectionEquipInfo.setIsBallValve(!"0".equals(registrationInfo.getWhetherSphericalTank()));
         }
         if (PRESSURE_EQU_LIST.contains(equipInfoModel.getEquList())) {
-            String useCode = equipInfoModel.getUnitCode();
+            ReginParams reginParams = JSON.parseObject(redisUtils.get(RedisKey.buildReginKey(equipInfoModel.getUserId(), equipInfoModel.getToken())).toString(), ReginParams.class);
+            String useCode = reginParams.getCompany().getCompanyCode();
             TzBaseEnterpriseInfo enterpriseInfo = baseEnterpriseInfoMapper.selectOne(new LambdaQueryWrapper<TzBaseEnterpriseInfo>().eq(TzBaseEnterpriseInfo::getUseCode, useCode).select(BaseEntity::getSequenceNbr, TzBaseEnterpriseInfo::getRegulatoryLabels));
-            inspectionEquipInfo.setManageLevel(enterpriseInfo.getRegulatoryLabels());
+            inspectionEquipInfo.setManageLevel(StringUtils.isNotBlank(enterpriseInfo.getRegulatoryLabels()) ? enterpriseInfo.getRegulatoryLabels() : defaultRegulatoryLabels);
         }
         inspectionEquipInfo.setAreaCode(ruleCommonService.getArea(equipInfoModel.getCity(), equipInfoModel.getCounty()));
         inspectionEquipInfo.setDistrictOrCountyCode(equipInfoModel.getCounty());

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

@@ -33,10 +33,7 @@ import com.yeejoin.amos.boot.module.jyjc.api.common.BizCommonConstant;
 import com.yeejoin.amos.boot.module.jyjc.api.dto.InspectionCompanyPublicityDto;
 import com.yeejoin.amos.boot.module.jyjc.api.entity.JyjcInspectionHistory;
 import com.yeejoin.amos.boot.module.jyjc.api.entity.JyjcOpeningApplication;
-import com.yeejoin.amos.boot.module.jyjc.api.enums.BizTypeEnum;
-import com.yeejoin.amos.boot.module.jyjc.api.enums.BusinessTypeEnum;
-import com.yeejoin.amos.boot.module.jyjc.api.enums.OpenBizTypeEnum;
-import com.yeejoin.amos.boot.module.jyjc.api.enums.OpenBizTypeEnumV2;
+import com.yeejoin.amos.boot.module.jyjc.api.enums.*;
 import com.yeejoin.amos.boot.module.jyjc.api.mapper.JyjcOpeningApplicationMapper;
 import com.yeejoin.amos.boot.module.jyjc.api.model.*;
 import com.yeejoin.amos.boot.module.jyjc.api.service.IJyjcOpeningApplicationService;
@@ -933,6 +930,7 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp
                         licence.setAgencyTypeName(commonService.getDictName(Arrays.asList("1233-1", "1233-2"), licence.getAgencyType()));
                         licence.setUnitCode(jyjcOpeningApplication.getUnitCode());
                         licence.setUnitName(jyjcOpeningApplication.getUnitCodeName());
+                        licence.setLicenceType( LicenceTypeEnum.JY_JC.getCode());
                         licence.setEnterpriseCertSeq(cert.getSequenceNbr().toString());
                         licences.add(licence);
                     });