21125 监管业务已纳管设备列表无法查询到一码通修改数据后的设备

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/mapper/JgUseRegistrationMapper.java

@@ -62,6 +62,8 @@ public interface JgUseRegistrationMapper extends BaseMapper<JgUseRegistration> {
 
     Page<JSONObject> queryForEquipUsedByVehiclePage(@Param("page") Page<JSONObject> page, @Param("jsonObject") JSONObject jsonObject);
 
+    Page<JSONObject> queryForEquipUsedByVehiclePageHistory(@Param("page") Page<JSONObject> page, @Param("jsonObject") JSONObject jsonObject);
+
     @MapKey("records")
     List<Map<String, Object>> queryForUnitVesselEquipment(@Param("records") List<String> records);
 

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

@@ -531,6 +531,47 @@
         WHERE
         ri."EQU_DEFINE" = '23T0'
         and ui."DATA_SOURCE" like 'jg%'
+        and ui."DATA_SOURCE" not like 'jg_his%'
+        and ri.whether_vehicle_cylinder = 1
+        -- 保证使用单位选择设备时（record为null） 能选择到本单位的设备 并且 监管单位在查看时（record 不为null）可以匹配到所有的设备
+        <if test="jsonObject.useUnitCreditCode != null and jsonObject.useUnitCreditCode != '' and jsonObject.record == null">
+            and ui."USE_UNIT_CREDIT_CODE" = #{jsonObject.useUnitCreditCode}
+        </if>
+        <if test="jsonObject.record != null and jsonObject.record != ''">
+            and ui."RECORD" = #{jsonObject.record}
+        </if>
+        <if test="jsonObject.record == null">
+            and not exists(SELECT 1 FROM tzs_jg_vehicle_information v, tzs_jg_vehicle_information_eq ve WHERE
+            v.sequence_nbr = ve.vehicle_id AND ve.equ_id = ui."RECORD" and v.status !='使用单位待提交' and v.status
+            !='一级受理已驳回' and v.status !='使用单位已撤回' and v.status !='已作废' )
+        </if>
+        ORDER BY ui.REC_DATE DESC
+    </select>
+    <select id="queryForEquipUsedByVehiclePageHistory" resultType="com.alibaba.fastjson.JSONObject">
+        <include refid="page-list-vessel"/>
+        WHERE
+        ri."EQU_DEFINE" = '23T0'
+        and ui."DATA_SOURCE" like 'jg_his%'
+        and ri.whether_vehicle_cylinder = 1
+        -- 保证使用单位选择设备时（record为null） 能选择到本单位的设备 并且 监管单位在查看时（record 不为null）可以匹配到所有的设备
+        <if test="jsonObject.useUnitCreditCode != null and jsonObject.useUnitCreditCode != '' and jsonObject.record == null">
+            and ui."USE_UNIT_CREDIT_CODE" = #{jsonObject.useUnitCreditCode}
+        </if>
+        <if test="jsonObject.record != null and jsonObject.record != ''">
+            and ui."RECORD" = #{jsonObject.record}
+        </if>
+        <if test="jsonObject.record == null">
+            and not exists(SELECT 1 FROM tzs_jg_vehicle_information v, tzs_jg_vehicle_information_eq ve WHERE
+            v.sequence_nbr = ve.vehicle_id AND ve.equ_id = ui."RECORD" and v.status !='使用单位待提交' and v.status
+            !='一级受理已驳回' and v.status !='使用单位已撤回' and v.status !='已作废' )
+        </if>
+        ORDER BY ui.REC_DATE DESC
+    </select>
+    <select id="queryForEquipUsedByVehiclePage" resultType="com.alibaba.fastjson.JSONObject">
+        <include refid="page-list-vessel"/>
+        WHERE
+        ri."EQU_DEFINE" = '23T0'
+        and ui."DATA_SOURCE" like 'jg%'
         and ri.whether_vehicle_cylinder = 1
         -- 保证使用单位选择设备时（record为null） 能选择到本单位的设备 并且 监管单位在查看时（record 不为null）可以匹配到所有的设备
         <if test="jsonObject.useUnitCreditCode != null and jsonObject.useUnitCreditCode != '' and jsonObject.record == null">
@@ -546,7 +587,6 @@
         </if>
         ORDER BY ui.REC_DATE DESC
     </select>
-
     <select id="queryForUnitVesselEquipment" resultType="java.util.Map">
         <include refid="page-list-vessel"/>
         WHERE ri."EQU_CATEGORY" = '2300' and ui."DATA_SOURCE" like 'jg%' and (ri.whether_vehicle_cylinder is null or ri.whether_vehicle_cylinder != 1)

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/controller/IdxBizJqEquipmentRegisterController.java

@@ -110,7 +110,19 @@ public class IdxBizJqEquipmentRegisterController extends BaseController {
         JSONObject jsonObject = new JSONObject(map);
         return ResponseHelper.buildResponse(idxBizJgRegisterInfoService.queryForEquipmentRegisterPage(jsonObject));
     }
-
+    /**
+     * 查询设备注册列表
+     *
+     * @param map
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/pageHistory")
+    @ApiOperation(httpMethod = "GET", value = "设备注册信息分页查询", notes = "设备注册信息分页查询")
+    public ResponseModel<Page<JSONObject>> queryForPageHistory(@RequestParam Map<String, Object> map) {
+        JSONObject jsonObject = new JSONObject(map);
+        return ResponseHelper.buildResponse(idxBizJgRegisterInfoService.queryForEquipmentRegisterPageHistory(jsonObject));
+    }
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @GetMapping(value = "/category/list")
     @ApiOperation(httpMethod = "GET", value = "查询不同单位类型可新增的设备种类列表", notes = "查询不同单位类型可新增的设备种类列表")
@@ -143,7 +155,13 @@ public class IdxBizJqEquipmentRegisterController extends BaseController {
         JSONObject jsonObject = new JSONObject(queryMap);
         return ResponseHelper.buildResponse(idxBizJgRegisterInfoService.queryEquipCanUsedByVesselPage(jsonObject));
     }
-
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/equipCanUsedByVessel/pageHistory")
+    @ApiOperation(httpMethod = "GET", value = "查询车用气瓶可进行选择的设备列表", notes = "查询车用气瓶可进行选择的设备列表")
+    public ResponseModel<Page<JSONObject>> queryEquipCanUsedByVesselPageHistory(@RequestParam Map<String, Object> queryMap) {
+        JSONObject jsonObject = new JSONObject(queryMap);
+        return ResponseHelper.buildResponse(idxBizJgRegisterInfoService.queryEquipCanUsedByVesselPageHistory(jsonObject));
+    }
     /**
      * 压力容器设备批量导入
      */

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

@@ -25,6 +25,8 @@ public interface IIdxBizJgRegisterInfoService {
 
     Page<JSONObject> queryForEquipmentRegisterPage(JSONObject jsonObject);
 
+    Page<JSONObject> queryForEquipmentRegisterPageHistory(JSONObject jsonObject);
+
     Map<String, Object> getDetailByRecord(String record);
 
     Map<String, Object> getDetailFieldCamelCaseByRecord(String record);
@@ -35,6 +37,8 @@ public interface IIdxBizJgRegisterInfoService {
 
     Page<JSONObject> queryEquipCanUsedByVesselPage(JSONObject jsonObject);
 
+    Page<JSONObject> queryEquipCanUsedByVesselPageHistory(JSONObject jsonObject);
+
     Object importPressureVesselData(Map<String, Object> paramMap, MultipartFile multipartFile);
 
     Object importPressureData(MultipartFile multipartFile) throws Exception;

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

@@ -1316,6 +1316,350 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
         // 20240314 提出的监管业务不要让企业用户选到之前一码通认领或补录的设备，让从监管业务中去新增
         BoolQueryBuilder dBuilder = QueryBuilders.boolQuery();
         dBuilder.must(QueryBuilders.prefixQuery("DATA_SOURCE", "jg"));
+        dBuilder.mustNot(QueryBuilders.prefixQuery("DATA_SOURCE","jg_his"));
+        boolMust.must(dBuilder);
+
+        String queryType = map.getString("QUERY_TYPE");
+        if (!ObjectUtils.isEmpty(queryType)) {
+            // 查询 安装告知【可告知设备列表】【USE_UNIT_CREDIT_CODE=== null ||  ""】
+            if (ValidationUtil.equals(queryType, "AZ")) {
+                BoolQueryBuilder nullOrEmptyQuery = QueryBuilders.boolQuery()
+                        .mustNot(QueryBuilders.wildcardQuery("USE_UNIT_CREDIT_CODE", "*"));
+                boolMust.must(nullOrEmptyQuery);
+                this.setRepeatUsedCheckFilterParam(boolMust, companyCode, "installNotice");
+            } else if (ValidationUtil.equals(queryType, "WB")) {
+                // 查询 维保备案【可绑定设备列表】【(EQU_STATE=== null ||  ""）】
+                BoolQueryBuilder wbBuilder = QueryBuilders.boolQuery();
+                wbBuilder.mustNot(QueryBuilders.existsQuery("EQU_STATE"));
+                boolMust.must(wbBuilder);
+            } else if (ValidationUtil.equals(queryType, "SY")) {
+                // 查询 使用登记【可选设备列表】【(EQU_STATUS=== null || "" ) && (USE_ORG_CODE（使用登记证编号） ==="" || null)】
+                BoolQueryBuilder syBuilder = QueryBuilders.boolQuery();
+                syBuilder.mustNot(QueryBuilders.existsQuery("EQU_STATE"));
+                syBuilder.mustNot(QueryBuilders.wildcardQuery("USE_ORG_CODE", "*"));
+                boolMust.must(syBuilder);
+                this.setRepeatUsedCheckFilterParam(boolMust, companyCode, "useRegister");
+            } else if(ValidationUtil.equals(queryType, "FINISH_SY")){
+                // 注意：上面条件是过滤出【未做过】某个业务的设备，下面部分是过滤出【做过】某个业务的设备
+                // 查询 已经做过【使用登记】 的设备 【(EQU_STATUS != 空 ) && (USE_ORG_CODE（使用登记证编号） != 空)】
+                BoolQueryBuilder syBuilder = QueryBuilders.boolQuery();
+                syBuilder.must(QueryBuilders.existsQuery("EQU_STATE"))
+                        .must(QueryBuilders.wildcardQuery("USE_ORG_CODE", "*"));
+                boolMust.must(syBuilder);
+            } else if(ValidationUtil.equals(queryType, "GZ_GZ") || ValidationUtil.equals(queryType, "GZ_WX") || ValidationUtil.equals(queryType, "GZ_YZ")){
+                BoolQueryBuilder syBuilder = QueryBuilders.boolQuery();
+                syBuilder.must(QueryBuilders.existsQuery("EQU_STATE"));
+                syBuilder.must(QueryBuilders.wildcardQuery("USE_ORG_CODE", "*"));
+                boolMust.must(syBuilder);
+            }
+        }
+
+        // 通用匹配规则，其他条件构建
+        if (!ObjectUtils.isEmpty(map.getString(SEQUENCE_NBR))) {
+            BoolQueryBuilder seqBuilder = QueryBuilders.boolQuery();
+            String param = map.getString(SEQUENCE_NBR);
+            List<String> strings = Arrays.asList(param.split(","));
+            seqBuilder.must(QueryBuilders.termsQuery("SEQUENCE_NBR.keyword", strings));
+            boolMust.must(seqBuilder);
+        }
+
+        if (!ObjectUtils.isEmpty(map.getString(IS_INTO_MANAGEMENT))) {
+            BoolQueryBuilder pBuilder = QueryBuilders.boolQuery();
+            String param = QueryParser.escape(map.getString(IS_INTO_MANAGEMENT));
+            pBuilder.must(QueryBuilders.matchQuery(IS_INTO_MANAGEMENT, param));
+            boolMust.must(pBuilder);
+        }
+        if (!ObjectUtils.isEmpty(map.getString(EQU_CATEGORY))) {
+            BoolQueryBuilder pBuilder = QueryBuilders.boolQuery();
+            String param = QueryParser.escape(map.getString(EQU_CATEGORY));
+            pBuilder.must(QueryBuilders.matchPhraseQuery(EQU_CATEGORY, "*" + param + "*"));
+            boolMust.must(pBuilder);
+
+        }
+        if (!ObjectUtils.isEmpty(map.getString("USE_PLACE"))) {
+            BoolQueryBuilder pBuilder = QueryBuilders.boolQuery();
+            String param = QueryParser.escape(map.getString("USE_PLACE"));
+            pBuilder.must(QueryBuilders.matchPhraseQuery("USE_PLACE", "*" + param + "*"));
+            boolMust.must(pBuilder);
+        }
+        // 设备状态
+        if (!ObjectUtils.isEmpty(map.getString("EQU_STATE"))) {
+            BoolQueryBuilder esBuilder = QueryBuilders.boolQuery();
+            String param = QueryParser.escape(map.getLong("EQU_STATE").toString());
+            esBuilder.must(QueryBuilders.matchQuery("EQU_STATE", param));
+            boolMust.must(esBuilder);
+        }
+
+        // 使用单位 //安装改造维修单位
+        if (!ObjectUtils.isEmpty(map.getString("USE_UNIT_CREDIT_CODE")) && !ObjectUtils.isEmpty(map.getString("USC_UNIT_CREDIT_CODE"))) {
+            BoolQueryBuilder ubuilder = QueryBuilders.boolQuery();
+            String useCode = QueryParser.escape(map.getString("USE_UNIT_CREDIT_CODE"));
+            useCode = useCode.contains("_") ? useCode.split("_")[0] : useCode;
+            ubuilder.should(QueryBuilders.matchQuery("USE_UNIT_CREDIT_CODE", useCode));
+
+            String uscCode = QueryParser.escape(map.getString("USC_UNIT_CREDIT_CODE")).toLowerCase();
+            ubuilder.should(QueryBuilders.wildcardQuery("USC_UNIT_CREDIT_CODE", "*" + uscCode + "*"));
+            ubuilder.minimumShouldMatch(1);
+            boolMust.must(ubuilder);
+        } else {
+            if (!ObjectUtils.isEmpty(map.getString("USE_UNIT_CREDIT_CODE")) || !ObjectUtils.isEmpty(map.getString("useUnitCreditCode"))) {
+                BoolQueryBuilder uuccBuilder = QueryBuilders.boolQuery();
+                String uucc = !ValidationUtil.isEmpty(map.getString("USE_UNIT_CREDIT_CODE")) ? map.getString("USE_UNIT_CREDIT_CODE") : map.getString("useUnitCreditCode");
+                String param = QueryParser.escape(uucc);
+                param = param.contains("_") ? param.split("_")[0] : param;
+                uuccBuilder.must(QueryBuilders.matchQuery("USE_UNIT_CREDIT_CODE", param));
+                boolMust.must(uuccBuilder);
+            }
+            if (!ObjectUtils.isEmpty(map.getString("USC_UNIT_CREDIT_CODE"))) {
+                BoolQueryBuilder uuccBuilder = QueryBuilders.boolQuery();
+                String uscCode = QueryParser.escape(map.getString("USC_UNIT_CREDIT_CODE")).toLowerCase();
+                uuccBuilder.must(QueryBuilders.wildcardQuery("USC_UNIT_CREDIT_CODE", "*" + uscCode + "*"));
+                boolMust.must(uuccBuilder);
+            }
+        }
+
+        // 监管码
+        if (!ObjectUtils.isEmpty(map.getString("SUPERVISORY_CODE"))) {
+            BoolQueryBuilder scBuilder = QueryBuilders.boolQuery();
+            String param = map.getString("SUPERVISORY_CODE");
+            List<String> strings = Arrays.asList(param.split(","));
+            scBuilder.must(QueryBuilders.termsQuery("SUPERVISORY_CODE", strings));
+            boolMust.must(scBuilder);
+        }
+        // 设备种类编码
+        if (!ObjectUtils.isEmpty(map.getString("EQU_LIST_CODE"))) {
+            BoolQueryBuilder elcBuilder = QueryBuilders.boolQuery();
+            String test = QueryParser.escape(map.getString("EQU_LIST_CODE"));
+            elcBuilder.must(QueryBuilders.matchPhraseQuery("EQU_LIST_CODE", test));
+            boolMust.must(elcBuilder);
+        }
+        // 设备类别编码
+        if (!ObjectUtils.isEmpty(map.getString("EQU_DEFINE_CODE"))) {
+            BoolQueryBuilder elcBuilder = QueryBuilders.boolQuery();
+            String test = QueryParser.escape(map.getString("EQU_DEFINE_CODE"));
+            elcBuilder.must(QueryBuilders.matchPhraseQuery("EQU_DEFINE_CODE", test));
+            boolMust.must(elcBuilder);
+        }
+        // 设备种类名称
+        if (!ObjectUtils.isEmpty(map.getString(EQU_LIST))) {
+            BoolQueryBuilder elBuilder = QueryBuilders.boolQuery();
+            String test = QueryParser.escape(map.getString(EQU_LIST));
+            elBuilder.must(QueryBuilders.matchPhraseQuery(EQU_LIST, "*" + test + "*"));
+            boolMust.must(elBuilder);
+        }
+
+        // 设备类别
+        if (!ObjectUtils.isEmpty(map.getString("EQU_CATEGORY_CODE"))) {
+            BoolQueryBuilder pBuilder = QueryBuilders.boolQuery();
+            String test = QueryParser.escape(map.getString("EQU_CATEGORY_CODE"));
+            pBuilder.must(QueryBuilders.termQuery("EQU_CATEGORY_CODE", test));
+            boolMust.must(pBuilder);
+        }
+        // 是否车用气瓶
+        if (!ObjectUtils.isEmpty(map.getString(WHETHER_VEHICLE_CYLINDER))) {
+            BoolQueryBuilder pBuilder = QueryBuilders.boolQuery();
+            String test = QueryParser.escape(map.getString(WHETHER_VEHICLE_CYLINDER));
+            pBuilder.must(QueryBuilders.termQuery(WHETHER_VEHICLE_CYLINDER, test));
+            boolMust.must(pBuilder);
+        }
+        // 是否撬装式压力容器
+        if (!ObjectUtils.isEmpty(map.getString(WHETHER_SKID_MOUNTED_PRESSURE_VESSEL)) && !"0".equals(map.getString(WHETHER_SKID_MOUNTED_PRESSURE_VESSEL))) {
+            BoolQueryBuilder pBuilder = QueryBuilders.boolQuery();
+            String test = QueryParser.escape(map.getString(WHETHER_SKID_MOUNTED_PRESSURE_VESSEL));
+            pBuilder.must(QueryBuilders.termQuery(WHETHER_SKID_MOUNTED_PRESSURE_VESSEL, test));
+            boolMust.must(pBuilder);
+        }
+        // 设备代码模糊查询
+        if (!ObjectUtils.isEmpty(map.getString(EQU_CODE))) {
+            BoolQueryBuilder pBuilder = QueryBuilders.boolQuery();
+            String test = QueryParser.escape(map.getString(EQU_CODE));
+            pBuilder.must(QueryBuilders.wildcardQuery(EQU_CODE, "*" + test.toLowerCase() + "*"));
+            boolMust.must(pBuilder);
+        }
+        // 单位内部编号模糊查询
+        if (!ObjectUtils.isEmpty(map.getString("USE_INNER_CODE"))) {
+            BoolQueryBuilder pBuilder = QueryBuilders.boolQuery();
+            String test = QueryParser.escape(map.getString("USE_INNER_CODE"));
+            pBuilder.must(QueryBuilders.wildcardQuery("USE_INNER_CODE", "*" + test.toLowerCase() + "*"));
+            boolMust.must(pBuilder);
+        }
+        // 出厂编号/产品编码模糊查询
+        if (!ObjectUtils.isEmpty(map.getString(FACTORY_NUM))) {
+            BoolQueryBuilder pBuilder = QueryBuilders.boolQuery();
+            String test = QueryParser.escape(map.getString(FACTORY_NUM));
+            pBuilder.must(QueryBuilders.wildcardQuery(FACTORY_NUM, "*" + test.toLowerCase() + "*"));
+            boolMust.must(pBuilder);
+        }
+        // 制造单位（生产单位）名称模糊查询
+        if (!ObjectUtils.isEmpty(map.getString("PRODUCE_UNIT_NAME"))) {
+            BoolQueryBuilder pBuilder = QueryBuilders.boolQuery();
+            String test = QueryParser.escape(map.getString("PRODUCE_UNIT_NAME"));
+            pBuilder.must(QueryBuilders.wildcardQuery("PRODUCE_UNIT_NAME", "*" + test.toLowerCase() + "*"));
+            boolMust.must(pBuilder);
+        }
+        builder.query(boolMust);
+        builder.sort("REC_DATE", SortOrder.DESC);
+        builder.from((pageNumber - 1) * size);
+        builder.size(size);
+        request.source(builder);
+        List<JSONObject> list = new LinkedList<>();
+        long totle = 0;
+        if (log.isDebugEnabled()) {
+            log.debug("查询es 的查询条件: {}", request);
+        }
+        try {
+            SearchResponse response = restHighLevelClient.search(request, RequestOptions.DEFAULT);
+            for (SearchHit hit : response.getHits().getHits()) {
+                System.out.println(hit);
+                JSONObject jsonObject = (JSONObject) JSONObject.toJSON(hit);
+                JSONObject dto2 = jsonObject.getJSONObject("sourceAsMap");
+                if (!ValidationUtil.isEmpty(dto2.get(CONSTRUCTIONTYPE))) {
+                    // 转化施工类型
+                    String constructionType = dto2.get(CONSTRUCTIONTYPE).toString();
+                    if (!ValidationUtil.isEmpty(constructionType)) {
+                        List<String> constructionTypeList = Arrays.asList(constructionType.split(","));
+                        List<String> statusList = new ArrayList<>();
+                        for (String cType : constructionTypeList) {
+                            Integer integer = Integer.valueOf(cType);
+                            String status = ConstructionEnum.getName.get(integer);
+                            statusList.add(status);
+                        }
+                        dto2.put(CONSTRUCTIONTYPE, Joiner.on(",").join(statusList));
+                    }
+                }
+                if (!ValidationUtil.isEmpty(dto2.get(EQUSTATE))) {
+                    Integer integer = Integer.valueOf(dto2.get(EQUSTATE).toString());
+                    String status = EquimentEnum.getName.get(integer);
+                    dto2.put(EQUSTATE, status);
+                }
+                if (!ValidationUtil.isEmpty(dto2.get(DATA_SOURCE))) {
+                    String s = dto2.get(DATA_SOURCE).toString();
+                    dto2.put(DATA_SOURCE, s);
+                    dto2.put(DATA_SOURCE_NAME, Arrays.stream(EquipSourceEnum.values())
+                            .filter(e -> s.startsWith(e.getCode()))
+                            .map(EquipSourceEnum::getName)
+                            .findFirst()
+                            .orElse(EquipSourceEnum.jg.getName()));
+                }
+                dto2.put("record", dto2.get(SEQUENCE_NBR));
+                list.add(dto2);
+            }
+            // 获取所有设备的Id
+            List<String> equIds = null;
+            if (!ValidationUtil.isEmpty(list)) {
+                equIds = list.stream().map(item -> item.get(SEQUENCE_NBR).toString()).collect(Collectors.toList());
+            }
+            if (!ValidationUtil.isEmpty(equIds)) {
+                // 查询设备地址
+                List<IdxBizJgUseInfo> useInfoListByEquIds = idxBizJgUseInfoService.getUseInfoListByEquIds(equIds);
+                Map<String, String> equAddressMap = new HashMap<>();
+                if (!ValidationUtil.isEmpty(useInfoListByEquIds)) {
+                    equAddressMap = useInfoListByEquIds.stream().collect(Collectors.toMap(IdxBizJgUseInfo::getRecord,
+                                    useInfo -> {
+                                        String fulladdress = "";
+                                        if (!ValidationUtil.isEmpty(useInfo.getProvinceName())) {
+                                            fulladdress += useInfo.getProvinceName();
+                                        }
+                                        if (!ValidationUtil.isEmpty(useInfo.getCityName())) {
+                                            fulladdress += useInfo.getCityName();
+                                        }
+                                        if (!ValidationUtil.isEmpty(useInfo.getCountyName())) {
+                                            fulladdress += useInfo.getCountyName();
+                                        }
+                                        if (!ValidationUtil.isEmpty(useInfo.getStreetName())) {
+                                            fulladdress += useInfo.getStreetName();
+                                        }
+                                        if (!ValidationUtil.isEmpty(useInfo.getAddress())) {
+                                            fulladdress += useInfo.getAddress();
+                                        }
+                                        return fulladdress;
+                                    }
+                            )
+                    );
+                }
+                // 更新设备使用情况和设备地址
+                for (JSONObject item : list) {
+                    String fullAddress = equAddressMap.get(item.getString(SEQUENCE_NBR));
+                    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)));
+                }
+            }
+            totle = response.getInternalResponse().hits().getTotalHits().value;
+            result.setRecords(list);
+            result.setTotal(totle);
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+        return result;
+    }
+
+    /**
+     * 设备注册信息分页查询
+     *
+     * @param map
+     * @return
+     */
+    public Page<JSONObject> queryForEquipmentRegisterPageHistory(JSONObject map) {
+
+        if (map.containsKey("flag") && !map.containsKey("USE_UNIT_CREDIT_CODE")) {
+            return new Page<>();
+        }
+
+
+        Integer pageNumber = ObjectUtils.isEmpty(map.getInteger("number")) ? 1 : map.getInteger("number");
+        Integer size = ObjectUtils.isEmpty(map.getInteger("size")) ? 20 : map.getInteger("size");
+        Page<JSONObject> result = new Page<>(pageNumber, size);
+        SearchRequest request = new SearchRequest();
+        request.indices("idx_biz_view_jg_all");
+        SearchSourceBuilder builder = new SearchSourceBuilder();
+        builder.trackTotalHits(true);
+        BoolQueryBuilder boolMust = QueryBuilders.boolQuery();
+
+        // 获取当前登录人单位类型
+        JSONObject company = getCompanyType();
+        if (ValidationUtil.isEmpty(company)) {
+            result.setRecords(new ArrayList<>());
+            result.setTotal(0);
+            return result;
+        }
+        String companyCode = company.getString("companyCode").contains("_") ?
+                company.getString("companyCode").split("_")[1] : company.getString("companyCode");
+        String type = company.getString("companyType");
+
+
+        // 根据当前登录人查询
+        if (!ValidationUtil.isEmpty(map.get(EQUSTATE))) {
+            map.put(EQUSTATE, EquimentEnum.getCode.get(map.get(EQUSTATE).toString()).toString());
+        }
+
+        // 根据当前登录用户类型及管辖机构筛选条件添加对应参数
+        if (ObjectUtils.isEmpty(map.getString(SEQUENCE_NBR)) && ObjectUtils.isEmpty(map.getString("useUnitCreditCode"))) {
+            if (!ValidationUtil.isEmpty(type) && type.contains("使用单位")) {
+                if (ValidationUtil.isEmpty(map.getString("USE_UNIT_CREDIT_CODE"))) {
+                    map.put("USE_UNIT_CREDIT_CODE", companyCode);
+                }
+            }
+            if (!ValidationUtil.isEmpty(type) && type.contains("安装改造维修单位")) {
+                map.put("USC_UNIT_CREDIT_CODE", companyCode);
+            }
+            if (!ValidationUtil.isEmpty(type) && type.contains("个人主体")) {
+                map.put("USE_UNIT_CREDIT_CODE", companyCode);
+            }
+        }
+
+        // 默认条件【STATUS==="" || null】
+        BoolQueryBuilder meBuilder = QueryBuilders.boolQuery();
+        meBuilder.should(QueryBuilders.matchQuery("STATUS", "已认领"));
+        meBuilder.should(QueryBuilders.boolQuery().mustNot(QueryBuilders.existsQuery("STATUS")));
+        meBuilder.should(QueryBuilders.boolQuery().must(QueryBuilders.matchPhraseQuery("STATUS", "")));
+        meBuilder.minimumShouldMatch(1);
+        boolMust.must(meBuilder);
+
+        // DATA_SOURCE 为“jg”开头的数据（从监管新加或复制的设备）
+        // 20240314 提出的监管业务不要让企业用户选到之前一码通认领或补录的设备，让从监管业务中去新增
+        BoolQueryBuilder dBuilder = QueryBuilders.boolQuery();
+        dBuilder.must(QueryBuilders.prefixQuery("DATA_SOURCE", "jg_his"));
         boolMust.must(dBuilder);
 
         String queryType = map.getString("QUERY_TYPE");
@@ -2051,6 +2395,24 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
         });
         return result;
     }
+    @Override
+    public Page<JSONObject> queryEquipCanUsedByVesselPageHistory(JSONObject jsonObject) {
+        ReginParams reginParams = JSON.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
+        String useUnitCreditCode = reginParams.getCompany().getCompanyCode();
+        // 使用单位为个人时候 特殊处理
+        if (useUnitCreditCode.split("_").length > 1) {
+            useUnitCreditCode = useUnitCreditCode.split("_")[1];
+        }
+        jsonObject.put("useUnitCreditCode", useUnitCreditCode);
+        Page<JSONObject> page = new Page<>(jsonObject.getLong("number"), jsonObject.getLong("size"));
+        List<DictionarieValueModel> fillingMedium = Systemctl.dictionarieClient.dictValues("FILLING_MEDIUM").getResult();
+        Map<String, Object> fillingMediumMap = fillingMedium.stream().collect(Collectors.toMap(DictionarieValueModel::getDictDataKey, DictionarieValueModel::getDictDataValue));
+        Page<JSONObject> result = jgUseRegistrationMapper.queryForEquipUsedByVehiclePageHistory(page, jsonObject);
+        result.getRecords().forEach(i -> {
+            i.put("chargingMedium", fillingMediumMap.get(i.get("chargingMedium")));
+        });
+        return result;
+    }
 
     @Override
     public String importPressureVesselData(Map<String, Object> paramMap, MultipartFile multipartFile) {

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

@@ -153,6 +153,9 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
     @Autowired
     JgUseRegistrationManageServiceImpl useRegistrationManageService;
 
+    @Autowired
+    private TzBaseEnterpriseInfoMapper tzBaseEnterpriseInfoMapper;
+
     /**
      * 根据sequenceNbr查询：1、查询单位变更信息，2、查询使用登记证列表
      *
@@ -1057,7 +1060,12 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
                         registrationManage.setReceiveOrgName(registration.getReceiveOrgName());
                         registrationManage.setReceiveCompanyCode(registration.getReceiveOrgCode());
                         registrationManage.setAuditPassDate(registration.getAuditPassDate());
-//                            registrationManage.setUseUnitAddress();  todo 设备使用地址需要更新
+                        if (!ObjectUtils.isEmpty(registration.getNewUseUnitCreditCode())) {
+                            TzBaseEnterpriseInfo useCodeResult = tzBaseEnterpriseInfoMapper.selectOne(new QueryWrapper<TzBaseEnterpriseInfo>().eq("use_unit_code", registration.getNewUseUnitCreditCode()));
+                            if (useCodeResult != null) {
+                                registrationManage.setUseUnitAddress(useCodeResult.getAddress());
+                            }
+                        }
                     }
                     useRegistrationManageService.updateBatchById(list);
                 } else {