fix(openapi)：榆林接口对接

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/feign/TzsJgServiceFeignClient.java

@@ -15,7 +15,7 @@ import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
-@FeignClient(name = "TZS-JG", path = "/jg",url = "172.16.3.70:11007", configuration = {FeignConfiguration.class})
+@FeignClient(name = "TZS-JG", path = "/jg", configuration = {FeignConfiguration.class})
 public interface TzsJgServiceFeignClient {
 
     /**

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

@@ -2194,25 +2194,34 @@
     </select>
     <select id="getVehicleCylinderInfo" resultType="java.util.Map">
         SELECT
-            tjvi.use_registration_code as registerNo,
+            jri.RECORD as id,
+            jfi.FACTORY_NUM as productNo,
+            jri.USE_ORG_CODE as registerNo,
             tjvi.reg_date as registerDate,
-            tjvi.reg_date as registerDate,
-            tjvi.use_unit_address as address,
             tjvi.use_unit_address as address,
-            '23T0' as type,
+            (SELECT name FROM tz_equipment_category WHERE code = jri."EQU_CATEGORY") as type,
             tjvi.volume as volume,
             tjvi.filling_medium as medium,
-            tjvi.filling_medium as medium,
             tjvi.car_number as carNo,
             tjvi.vehicle_attribute as carType,
             tjvi.audit_pass_date as certificateDate,
-            tjvi.vehicle_attribute as state,
-            tjvi.next_inspection_date as nextDate,
+            jui.EQU_STATE as state,
+            jfi.PRODUCE_DATE as productDate,
+            to_char((select INSPECT_DATE from idx_biz_jg_inspection_detection_info where "RECORD" = jri.RECORD ORDER BY INSPECT_DATE limit 1), 'YYYY-MM-DD') checkDate,
+            to_char((select NEXT_INSPECT_DATE from idx_biz_jg_inspection_detection_info where "RECORD" = jri.RECORD ORDER BY INSPECT_DATE limit 1), 'YYYY-MM-DD') nextDate,
             tjvi.use_unit_name as ownCompany,
-            tjvi.rec_date as updateDate
-        FROM tzs_jg_vehicle_information tjvi
+            tjvi.rec_date as updateDate,
+            jui.USE_DATE as useDate,
+            pv."NOMINAL_WORKING_PRESSURE" pressure,
+            jfi."PRODUCE_UNIT_NAME" factoryName
+        FROM idx_biz_jg_register_info jri
+        LEFT JOIN idx_biz_jg_other_info joi ON jri.RECORD = joi.RECORD
+        LEFT JOIN idx_biz_jg_use_info jui ON jri.RECORD = jui.RECORD
+        LEFT JOIN idx_biz_jg_factory_info jfi ON jri.RECORD = jfi.RECORD
+        LEFT JOIN idx_biz_jg_tech_params_vessel pv ON pv."RECORD" = jui."RECORD"
+        LEFT JOIN tzs_jg_vehicle_information_eq re ON re.equ_id = jri.RECORD
+        LEFT JOIN tzs_jg_vehicle_information tjvi ON tjvi.sequence_nbr = re.vehicle_id
         WHERE tjvi."USE_UNIT_CREDIT_CODE" = #{useCode}
           AND tjvi.is_delete = '0'
     </select>
-
 </mapper>

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

@@ -770,7 +770,7 @@
     </select>
     <select id="getCylinderInfoList" resultType="java.util.Map">
         <include refid="list-cylinder"/>
-        WHERE ri."EQU_CATEGORY" = '2300' and ui."DATA_SOURCE" like 'jg%' and (ri.whether_vehicle_cylinder is null or ri.whether_vehicle_cylinder != 1)
+        WHERE ri."EQU_CATEGORY" = '2300' and ui."DATA_SOURCE" like 'jg%'
         and ui.record in
         <foreach collection="records" item="record" open="(" close=")" separator=",">
             #{record}
@@ -784,8 +784,8 @@
             (select name from cb_data_dictionary where code = pv."CHARGING_MEDIUM" and type = 'FILLING_MEDIUM') mediumName,
             fi.PRODUCE_UNIT_NAME as makeUnit,
             fi.PRODUCE_DATE as makeDate,
-            (select INSPECT_ORG_NAME from idx_biz_jg_inspection_detection_info where "RECORD" = ri.RECORD ORDER BY INSPECT_DATE limit 1), 'YYYY-MM-DD' as lastCheckCompany,
-            (select INSPECT_CONCLUSION from idx_biz_jg_inspection_detection_info where "RECORD" = ri.RECORD ORDER BY INSPECT_DATE limit 1), 'YYYY-MM-DD' as checkResult,
+            (select INSPECT_ORG_NAME from idx_biz_jg_inspection_detection_info where "RECORD" = ri.RECORD ORDER BY INSPECT_DATE limit 1) as lastCheckCompany,
+            (select INSPECT_CONCLUSION from idx_biz_jg_inspection_detection_info where "RECORD" = ri.RECORD ORDER BY INSPECT_DATE limit 1) as checkResult,
             to_char((select NEXT_INSPECT_DATE from idx_biz_jg_inspection_detection_info where "RECORD" = ri.RECORD ORDER BY INSPECT_DATE limit 1), 'YYYY-MM-DD') nextCheckDate,
             (select name from tz_equipment_category tec3 where tec3.code = ri."EQU_DEFINE") AS cylinderClass,
             pv."CHARGING_MEDIUM" chargingMedium,

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

@@ -3232,7 +3232,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
         BoolQueryBuilder boolMust = QueryBuilders.boolQuery();
 
         //榆林市审批局
-        String orgCode = this.getAndSetOrgCode("610581");
+        String orgCode = this.getAndSetOrgCode("610800");
         boolMust.must(QueryBuilders.wildcardQuery("ORG_BRANCH_CODE.keyword", QueryParser.escape(orgCode) + "*"));
 
         //默认查询电梯
@@ -3282,7 +3282,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
 
     @Override
     public List<Map<String, Object>> getCylinderStationInfo() {
-        return commonMapper.getCylinderStationInfo(this.getAndSetOrgCode("610581"));
+        return commonMapper.getCylinderStationInfo(this.getAndSetOrgCode("610800"));
     }
 
     @Override
@@ -3300,7 +3300,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
         BoolQueryBuilder boolMust = QueryBuilders.boolQuery();
 
         //榆林市审批局
-        String orgCode = this.getAndSetOrgCode("610581");
+        String orgCode = this.getAndSetOrgCode("610800");
         boolMust.must(QueryBuilders.wildcardQuery("ORG_BRANCH_CODE.keyword", QueryParser.escape(orgCode) + "*"));
 
         //默认查询电梯