fix(jg):添加设备来源筛选

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgUseRegistrationMapper.xml

@@ -596,7 +596,7 @@
     </select>
 
     <select id="getListPageCount" resultType="long">
-        SELECT <![CDATA[/*+ set(query_dop 16)*/]]> COUNT(*)
+        SELECT <![CDATA[/*+ set(query_dop 16)*/]]> COUNT(DISTINCT ur.sequence_nbr)
         FROM tzs_jg_use_registration ur
         <if test="dto.equList != null or dto.equCategory != null or dto.equDefine != null or
            dto.equCode != null or dto.code96333 != null or dto.supervisoryCode != null">

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/IdxBizJgProjectContraptionServiceImplService.java

@@ -95,6 +95,7 @@ public class IdxBizJgProjectContraptionServiceImplService extends BaseEntityServ
     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_SOURCE = "dataSource";
 
     public static final String DATA_QUALITY_SCORE = "dataQualityScore";
     public static final String DATA_QUALITY = "dataQuality";
@@ -270,6 +271,7 @@ public class IdxBizJgProjectContraptionServiceImplService extends BaseEntityServ
         String projectContraptionNo = params.get(PROJECT_CONTRAPTION_NO);
         //属地监管部门code
         String orgBranchCode = params.get(ORG_BRANCH_CODE);
+        String dataSource = params.get(DATA_SOURCE);
         // 设备类别code
         String equCategory = params.get(EQU_CATEGORY);
         // 设备类品种code
@@ -367,6 +369,17 @@ public class IdxBizJgProjectContraptionServiceImplService extends BaseEntityServ
                 .eq(!ValidationUtil.isEmpty(orgBranchCode) && BaseController.COMPANY_TYPE_COMPANY.equals(companyLevel), IdxBizJgProjectContraption::getOrgCode, orgBranchCode)            // 企业 等于匹配
                 .likeRight(!ValidationUtil.isEmpty(orgBranchCode) && BaseController.COMPANY_TYPE_SUPERVISION.equals(companyLevel), IdxBizJgProjectContraption::getOrgCode, orgBranchCode) // 监管 右模糊匹配
                 .like(!ValidationUtil.isEmpty(projectContraptionNo), IdxBizJgProjectContraption::getProjectContraptionNo, projectContraptionNo)
+                .and(!ValidationUtil.isEmpty(dataSource), w -> {
+                    if ("jg".equals(dataSource)) {
+                        w.likeRight(IdxBizJgProjectContraption::getDataSource, "jg").notLike(IdxBizJgProjectContraption::getDataSource, "jg_his");
+                    } else if ("jg_his".equals(dataSource)) {
+                        w.likeRight(IdxBizJgProjectContraption::getDataSource, "jg_his").notLike(IdxBizJgProjectContraption::getDataSource, "jg_his_black");
+                    } else if ("jg_his_black".equals(dataSource)) {
+                        w.eq(IdxBizJgProjectContraption::getDataSource, "jg_his_black").or().likeRight(IdxBizJgProjectContraption::getDataSource, "jg_his_black_");
+                    } else {
+                        w.eq(IdxBizJgProjectContraption::getDataSource, dataSource);
+                    }
+                })
                 .isNull(!ValidationUtil.isEmpty(regCodeIsNull) && Boolean.TRUE.equals(Boolean.valueOf(regCodeIsNull)), IdxBizJgProjectContraption::getUseRegistrationCode)
                 .isNotNull(!ValidationUtil.isEmpty(regCodeIsNull) && Boolean.FALSE.equals(Boolean.valueOf(regCodeIsNull)), IdxBizJgProjectContraption::getUseRegistrationCode)
                 .isNull(IdxBizJgProjectContraption::getProjectContraptionParentId)

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

@@ -2602,7 +2602,10 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
                 // 只查历史，前缀为 jg_his
                 dBuilder.must(QueryBuilders.prefixQuery("DATA_SOURCE", "jg_his"));
                 dBuilder.mustNot(QueryBuilders.prefixQuery("DATA_SOURCE", "jg_his_black"));// 排除黑设备
-            } else {
+            } else if("jg_his_black".equals(dataSource)) {
+                // 只查黑设备，前缀为 jg_his_black
+                dBuilder.must(QueryBuilders.prefixQuery("DATA_SOURCE", "jg_his_black"));
+            }else {
                 // 只查新增，前缀为 jg 且前缀不为 jg_his
                 dBuilder.must(QueryBuilders.prefixQuery("DATA_SOURCE", "jg"))
                         .mustNot(QueryBuilders.prefixQuery("DATA_SOURCE", "jg_his"));