96333警情填报地址获取数据源切换

amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-api/src/main/java/com/yeejoin/amos/boot/module/elevator/api/dto/ElevatorMessageDto.java

+package com.yeejoin.amos.boot.module.elevator.api.dto;
+
+import lombok.Data;
+
+@Data
+public class ElevatorMessageDto {
+
+    private String sequenceNbr;
+    private String address;
+    private Integer rescueCode;
+    private String registerCode;
+    private String useUnit;
+    private String useStatus;
+    private String useSiteCategory;
+    private String province;
+    private String city;
+    private String district;
+    private String regionCode;
+
+
+
+}

amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-api/src/main/java/com/yeejoin/amos/boot/module/elevator/api/mapper/ElevatorMapper.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.module.elevator.api.dto.ElevatorDto;
 import com.yeejoin.amos.boot.module.elevator.api.dto.ElevatorDtoNew;
+import com.yeejoin.amos.boot.module.elevator.api.dto.ElevatorMessageDto;
 import com.yeejoin.amos.boot.module.elevator.api.dto.ElevatorWlInfoDto;
 import com.yeejoin.amos.boot.module.elevator.api.entity.Elevator;
 import org.apache.ibatis.annotations.Param;
@@ -38,6 +39,8 @@ public interface ElevatorMapper extends BaseMapper<Elevator> {
     @Select("select * from tcb_elevator where address like concat('%',#{address},'%')")
     List<ElevatorDto> getAddressList(String address);
 
+    List<ElevatorMessageDto> getAddressListNew(@Param("address") String address);
+
 
     Page<Map<String, Object>> selectElevators(@Param("page") Page<Map<String, Object>> page, @Param("dto") ElevatorDto dto);
 

amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-api/src/main/resources/mapper/ElevatorMapper.xml

@@ -360,6 +360,10 @@
         <if test="elevator.originalId!=null and elevator.originalId!='' ">
             AND jui.RECORD = #{elevator.originalId}
         </if>
+        <if test="elevator.address!=null and elevator.address!='' ">
+            AND jui.ADDRESS = #{elevator.address}
+        </if>
+        limit 1
     </select>
     <select id="selectRegisterFiles" resultType="java.util.Map">
         select USE_REGISTRATION_CERTIFICATE, USE_SIGN, PRODUCT_PHOTO
@@ -493,4 +497,23 @@ limit 10
         WHERE
             RECORD = #{sequenceNbr}
     </select>
+    <select id="getAddressListNew" resultType="com.yeejoin.amos.boot.module.elevator.api.dto.ElevatorMessageDto">
+        SELECT jui.RECORD                                                                                          AS sequenceNbr,
+               ifnull(joi.CODE96333, 0)                                                                         AS rescueCode,
+               ifnull(joi.SUPERVISORY_CODE, '')                                                                  AS registerCode,
+               ifnull(jui.USE_UNIT_NAME, '')                                                                     AS useUnit,
+               ifnull(jui.EQU_STATE, '')                                                                           AS useStatus,
+               ifnull((SELECT NAME FROM cb_data_dictionary WHERE code = jui.USE_PLACE and type = 'ADDRESS'),
+                      '')                                                                                        AS useSiteCategory,
+               ifnull(jui.ADDRESS, '')                                                                           AS address,
+               ifnull(jui.PROVINCE_NAME, '')                                                                     AS province,
+               ifnull(jui.CITY_NAME, '')                                                                         AS city,
+               ifnull(jui.COUNTY_NAME, '')                                                                       AS district,
+               concat(jui.PROVINCE, '#', jui.CITY, '#', jui.COUNTY)                                                AS regionCode
+        FROM idx_biz_jg_use_info jui
+                 LEFT JOIN idx_biz_jg_other_info joi ON jui.RECORD = joi.RECORD
+                 LEFT JOIN idx_biz_jg_register_info jri ON jri.RECORD = jui.RECORD
+        WHERE jri.EQU_LIST = '3000'
+          and jui.ADDRESS like concat('%', #{address}, '%') and joi.CODE96333 is not null
+    </select>
 </mapper>

amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-biz/src/main/java/com/yeejoin/amos/boot/module/elevator/biz/controller/ElevatorController.java

@@ -584,19 +584,20 @@ public class ElevatorController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/getAddressList",method = RequestMethod.POST)
     @ApiOperation(httpMethod = "POST", value = "获取电梯的安装地址", notes = "获取电梯的安装地址")
-    public ResponseModel<List<ElevatorDto>> getAddressList(@RequestBody ElevatorListDto elevatorListDto){
-        List<ElevatorDto> elevatorList = elevatorMapper.getAddressList(elevatorListDto.getElevatorAddress());
-        for(ElevatorDto elevatorDto : elevatorList){
-            if(!ValidationUtil.isEmpty(elevatorDto.getUseSiteCategory())) {
-                LambdaQueryWrapper<DataDictionary> wrapper = new LambdaQueryWrapper<>();
-                wrapper.eq(DataDictionary::getCode, elevatorDto.getUseSiteCategory());
-                DataDictionary dataDictionary = iDataDictionaryService.getOne(wrapper);
-                if (!ValidationUtil.isEmpty(dataDictionary)) {
-                    elevatorDto.setUseSiteCategory(dataDictionary.getName());
-                }
-            }
-        }
-        return ResponseHelper.buildResponse(elevatorList);
+    public ResponseModel<List<ElevatorMessageDto>> getAddressList(@RequestBody ElevatorListDto elevatorListDto){
+//        List<ElevatorDto> elevatorList = elevatorMapper.getAddressList(elevatorListDto.getElevatorAddress());
+//        for(ElevatorDto elevatorDto : elevatorList){
+//            if(!ValidationUtil.isEmpty(elevatorDto.getUseSiteCategory())) {
+//                LambdaQueryWrapper<DataDictionary> wrapper = new LambdaQueryWrapper<>();
+//                wrapper.eq(DataDictionary::getCode, elevatorDto.getUseSiteCategory());
+//                DataDictionary dataDictionary = iDataDictionaryService.getOne(wrapper);
+//                if (!ValidationUtil.isEmpty(dataDictionary)) {
+//                    elevatorDto.setUseSiteCategory(dataDictionary.getName());
+//                }
+//            }
+//        }
+        List<ElevatorMessageDto> addressListNew = elevatorMapper.getAddressListNew(elevatorListDto.getElevatorAddress());
+        return ResponseHelper.buildResponse(addressListNew);
     }
 
 }