bugfix(jg):大屏设备只统计已纳管

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/java/com/yeejoin/amos/boot/module/statistcs/biz/service/impl/CylinderDPStatisticsServiceImpl.java

@@ -8,7 +8,6 @@ import com.yeejoin.amos.boot.module.common.api.dto.DPFilterParamDto;
 import com.yeejoin.amos.boot.module.statistics.api.mapper.AQZSDPStatisticsMapper;
 import com.yeejoin.amos.boot.module.statistics.api.mapper.CylinderStatisticsMapper;
 import com.yeejoin.amos.boot.module.ymt.api.entity.TzBaseEnterpriseInfo;
-import com.yeejoin.amos.boot.module.ymt.api.enums.EquimentEnum;
 import com.yeejoin.amos.boot.module.ymt.api.mapper.TzBaseEnterpriseInfoMapper;
 import com.yeejoin.amos.boot.module.ymt.flc.api.mapper.CylinderAreaDataMapper;
 import com.yeejoin.amos.boot.module.ymt.flc.api.mapper.CylinderInfoMapper;
@@ -88,7 +87,7 @@ public class CylinderDPStatisticsServiceImpl {
         searchSourceBuilder.query(
                 QueryBuilders.boolQuery()
                         .must(QueryBuilders.termQuery("EQU_CATEGORY_CODE", "2300"))
-                        .must(QueryBuilders.termQuery("EQU_STATE", EquimentEnum.ZAIYONG.getCode()))
+                        .must(QueryBuilders.termQuery("IS_INTO_MANAGEMENT", Boolean.TRUE))
                         // 按照管辖机构区域信息模糊查询
                         .must(QueryBuilders.wildcardQuery("ORG_BRANCH_CODE.keyword", QueryParser.escape(orgCode) + "*"))
         );
@@ -223,7 +222,7 @@ public class CylinderDPStatisticsServiceImpl {
         // 按照管辖机构区域信息模糊查询
         boolMust.must(QueryBuilders.wildcardQuery("ORG_BRANCH_CODE.keyword", QueryParser.escape(orgCode) + "*"));
         // 且在用状态设备
-        boolMust.must(QueryBuilders.termQuery("EQU_STATE", EquimentEnum.ZAIYONG.getCode()));
+        boolMust.must(QueryBuilders.termQuery("IS_INTO_MANAGEMENT", Boolean.TRUE));
         request.query(boolMust);
         try {
             CountResponse response = restHighLevelClient.count(request, RequestOptions.DEFAULT);
@@ -243,7 +242,7 @@ public class CylinderDPStatisticsServiceImpl {
         boolMust.must(QueryBuilders.termQuery("WHETHER_VEHICLE_CYLINDER.keyword", "1"));
         boolMust.must(QueryBuilders.wildcardQuery("ORG_BRANCH_CODE.keyword", QueryParser.escape(orgCode) + "*"));
         // 且在用状态设备
-        boolMust.must(QueryBuilders.termQuery("EQU_STATE", EquimentEnum.ZAIYONG.getCode()));
+        boolMust.must(QueryBuilders.termQuery("IS_INTO_MANAGEMENT", Boolean.TRUE));
         request.query(boolMust);
         try {
             CountResponse response = restHighLevelClient.count(request, RequestOptions.DEFAULT);
@@ -303,7 +302,7 @@ public class CylinderDPStatisticsServiceImpl {
         // 按照管辖机构区域信息模糊查询
         boolMust.must(QueryBuilders.wildcardQuery("ORG_BRANCH_CODE.keyword", QueryParser.escape(orgCode) + "*"));
         // 且在用状态设备
-        boolMust.must(QueryBuilders.termQuery("EQU_STATE", EquimentEnum.ZAIYONG.getCode()));
+        boolMust.must(QueryBuilders.termQuery("IS_INTO_MANAGEMENT", Boolean.TRUE));
         // 且下次检验日期大于等于当天
         long currentDayTime = DateUtil.parse(DateUtil.today(), "yyy-MM-dd").getTime();
         // 且查询 下次检验日期 <= 当前天+30天 极为临期
@@ -336,7 +335,7 @@ public class CylinderDPStatisticsServiceImpl {
         // 按照管辖机构区域信息模糊查询
         boolMust.must(QueryBuilders.wildcardQuery("ORG_BRANCH_CODE.keyword", QueryParser.escape(orgCode) + "*"));
         // 在用状态设备
-        boolMust.must(QueryBuilders.termQuery("EQU_STATE", EquimentEnum.ZAIYONG.getCode()));
+        boolMust.must(QueryBuilders.termQuery("IS_INTO_MANAGEMENT", Boolean.TRUE));
         // 查询下次检验日期小于当前天的设备，即为超期检验超期设备
         long currentDayTime = DateUtil.parse(DateUtil.now(), "yyy-MM-dd").getTime();
         boolMust.must(QueryBuilders.rangeQuery("NEXT_INSPECT_DATE").lt(currentDayTime));

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/java/com/yeejoin/amos/boot/module/statistcs/biz/service/impl/JGDPStatisticsServiceImpl.java

@@ -462,7 +462,7 @@ public class JGDPStatisticsServiceImpl {
         // 按照管辖机构区域信息模糊查询
         boolMust.must(QueryBuilders.wildcardQuery("ORG_BRANCH_CODE.keyword", QueryParser.escape(orgCode) + "*"));
         // 且在用状态设备
-        boolMust.must(QueryBuilders.termQuery("EQU_STATE", EquimentEnum.ZAIYONG.getCode()));
+        boolMust.must(QueryBuilders.termQuery("IS_INTO_MANAGEMENT", Boolean.TRUE));
         // 且下次检验日期大于等于当天
         long currentDayTime = DateUtil.parse(DateUtil.today(), "yyy-MM-dd").getTime();
         // 且查询 下次检验日期 <= 当前天+30天 极为临期
@@ -499,7 +499,7 @@ public class JGDPStatisticsServiceImpl {
         // 按照管辖机构区域信息模糊查询
         boolMust.must(QueryBuilders.wildcardQuery("ORG_BRANCH_CODE.keyword", QueryParser.escape(orgCode) + "*"));
         // 在用状态设备
-        boolMust.must(QueryBuilders.termQuery("EQU_STATE", EquimentEnum.ZAIYONG.getCode()));
+        boolMust.must(QueryBuilders.termQuery("IS_INTO_MANAGEMENT", Boolean.TRUE));
         // 查询下次检验日期小于当前天的设备，即为超期检验超期设备
         long currentDayTime = DateUtil.parse(DateUtil.now(), "yyy-MM-dd").getTime();
         boolMust.must(QueryBuilders.rangeQuery("NEXT_INSPECT_DATE").lt(currentDayTime));

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/java/com/yeejoin/amos/boot/module/statistcs/biz/service/impl/JYJCDPStatisticsServiceImpl.java

@@ -416,7 +416,7 @@ public class JYJCDPStatisticsServiceImpl {
         // 按照管辖机构区域信息模糊查询
         boolMust.must(QueryBuilders.wildcardQuery("ORG_BRANCH_CODE.keyword", QueryParser.escape(orgCode) + "*"));
         // 且在用状态设备
-        boolMust.must(QueryBuilders.termQuery("EQU_STATE", EquimentEnum.ZAIYONG.getCode()));
+        boolMust.must(QueryBuilders.termQuery("IS_INTO_MANAGEMENT", Boolean.TRUE));
         // 且下次检验日期大于等于当天
         long currentDayTime = DateUtil.parse(DateUtil.today(), "yyy-MM-dd").getTime();
         // 且查询 下次检验日期 <= 当前天+30天 极为临期
@@ -443,7 +443,7 @@ public class JYJCDPStatisticsServiceImpl {
         // 按照管辖机构区域信息模糊查询
         boolMust.must(QueryBuilders.wildcardQuery("ORG_BRANCH_CODE.keyword", QueryParser.escape(orgCode) + "*"));
         // 在用状态设备
-        boolMust.must(QueryBuilders.termQuery("EQU_STATE", EquimentEnum.ZAIYONG.getCode()));
+        boolMust.must(QueryBuilders.termQuery("IS_INTO_MANAGEMENT", Boolean.TRUE));
         // 查询下次检验日期小于当前天的设备，即为超期检验超期设备
         long currentDayTime = DateUtil.parse(DateUtil.now(), "yyy-MM-dd").getTime();
         boolMust.must(QueryBuilders.rangeQuery("NEXT_INSPECT_DATE").lt(currentDayTime));
@@ -514,7 +514,7 @@ public class JYJCDPStatisticsServiceImpl {
         // 按照管辖机构区域信息模糊查询
         boolMust.must(QueryBuilders.wildcardQuery("ORG_BRANCH_CODE.keyword", QueryParser.escape(orgCode) + "*"));
         // 且在用状态设备
-        boolMust.must(QueryBuilders.termQuery("EQU_STATE", EquimentEnum.ZAIYONG.getCode()));
+        boolMust.must(QueryBuilders.termQuery("IS_INTO_MANAGEMENT", Boolean.TRUE));
         // 且下次检验日期大于等于当天 且查询 下次检验日期 <= 当前天+30天 即为临期
         long currentDayTime = DateUtil.parse(DateUtil.today(), "yyy-MM-dd").getTime();
         long currentDayAfter30DayTime = DateUtil.offsetDay(DateUtil.parse(DateUtil.today(), "yyy-MM-dd"), 30).getTime();
@@ -553,7 +553,7 @@ public class JYJCDPStatisticsServiceImpl {
         // 按照管辖机构区域信息模糊查询
         boolMust.must(QueryBuilders.wildcardQuery("ORG_BRANCH_CODE.keyword", QueryParser.escape(orgCode) + "*"));
         // 在用状态设备
-        boolMust.must(QueryBuilders.termQuery("EQU_STATE", EquimentEnum.ZAIYONG.getCode()));
+        boolMust.must(QueryBuilders.termQuery("IS_INTO_MANAGEMENT", Boolean.TRUE));
         // 查询下次检验日期小于当前天的设备，即为超期检验超期设备
         long currentDayTime = DateUtil.parse(DateUtil.now(), "yyy-MM-dd").getTime();
         boolMust.must(QueryBuilders.rangeQuery("NEXT_INSPECT_DATE").lt(currentDayTime));

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/java/com/yeejoin/amos/boot/module/statistcs/biz/service/impl/StCommonServiceImpl.java

@@ -206,7 +206,7 @@ public class StCommonServiceImpl {
         // 设备类别精确查询气瓶
         boolMust.must(QueryBuilders.termQuery("EQU_CATEGORY_CODE", EQU_CATEGORY_CYLINDER));
         // 且在用状态设备
-        boolMust.must(QueryBuilders.termQuery("EQU_STATE", EquimentEnum.ZAIYONG.getCode()));
+        boolMust.must(QueryBuilders.termQuery("IS_INTO_MANAGEMENT", Boolean.TRUE));
         request.query(boolMust);
         try {
             CountResponse response = restHighLevelClient.count(request, RequestOptions.DEFAULT);
@@ -225,7 +225,7 @@ public class StCommonServiceImpl {
         // 按照管辖机构区域信息模糊查询
         boolMust.must(QueryBuilders.wildcardQuery("ORG_BRANCH_CODE.keyword", QueryParser.escape(orgCode) + "*"));
         // 且在用状态设备
-        boolMust.must(QueryBuilders.termQuery("EQU_STATE", EquimentEnum.ZAIYONG.getCode()));
+        boolMust.must(QueryBuilders.termQuery("IS_INTO_MANAGEMENT", Boolean.TRUE));
         // 且8大类，目的去掉脏数据
         boolMust.must(QueryBuilders.termsQuery("EQU_LIST_CODE",StCommonServiceImpl.getEquipmentCategory().stream().map(EquipmentCategoryDto::getCode).collect(Collectors.toList())));
         SearchSourceBuilder builder = new SearchSourceBuilder();

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/java/com/yeejoin/amos/boot/module/statistcs/biz/service/impl/YJDPStatisticsServiceImpl.java

@@ -438,7 +438,7 @@ public class YJDPStatisticsServiceImpl {
         // 按照管辖机构区域信息模糊查询
         boolMust.must(QueryBuilders.wildcardQuery("ORG_BRANCH_CODE.keyword", QueryParser.escape(orgCode) + "*"));
         // 且在用状态设备
-        boolMust.must(QueryBuilders.termQuery("EQU_STATE", EquimentEnum.ZAIYONG.getCode()));
+        boolMust.must(QueryBuilders.termQuery("IS_INTO_MANAGEMENT", Boolean.TRUE));
         // 且设备品种3级,按照真实的过滤，防止有脏数据
         boolMust.must(QueryBuilders.termsQuery("EQU_DEFINE_CODE.keyword", ELEVATOR_EQU_DEFINE_CODES.split(",")));
         SearchSourceBuilder builder = new SearchSourceBuilder();

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/java/com/yeejoin/amos/boot/module/statistcs/biz/service/impl/ZLDPStatisticsServiceImpl.java

@@ -482,7 +482,7 @@ public class ZLDPStatisticsServiceImpl {
         // 且8大类，目的去掉脏数据
         boolMust.must(QueryBuilders.termsQuery("EQU_LIST_CODE",StCommonServiceImpl.getEquipmentCategory().stream().map(EquipmentCategoryDto::getCode).collect(Collectors.toList())));
         // 且在用状态设备
-        boolMust.must(QueryBuilders.termQuery("EQU_STATE", EquimentEnum.ZAIYONG.getCode()));
+        boolMust.must(QueryBuilders.termQuery("IS_INTO_MANAGEMENT", Boolean.TRUE));
         // 有监管码
         boolMust.must(QueryBuilders.existsQuery("SUPERVISORY_CODE"));
         boolMust.mustNot(QueryBuilders.termQuery("SUPERVISORY_CODE","null"));