1、96333处置记录-列表

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

@@ -185,8 +185,7 @@
 		a.call_time AS callTime,
 		a.emergency_call AS emergencyCall,
 		a.device_id AS deviceId,
-		e.address AS
-		elevatorAddress,
+		ibjui.ADDRESS AS elevatorAddress,
 		CONCAT(a.city,a.district) AS address,
 		a.alarm_type AS alertType,
 		a.alert_source AS alertSource,
@@ -202,8 +201,8 @@
 		END AS alertStatus
 		FROM
 		tz_alert_called a
-		LEFT JOIN tcb_elevator e ON e.rescue_code =
-		a.device_id
+		LEFT JOIN idx_biz_jg_other_info ibjoi ON ibjoi.CODE96333 = a.device_id
+		LEFT JOIN idx_biz_jg_use_info ibjui ON ibjoi.RECORD = ibjui.RECORD
 		WHERE a.is_delete = 0
 		<if test="workOrderNumber != null and workOrderNumber != ''">
 			AND a.work_order_number like
@@ -233,7 +232,7 @@
 			AND a.device_id like CONCAT(CONCAT('%',#{deviceId}),'%')
 		</if>
 		<if test="elevatorAddress != null and elevatorAddress != ''">
-			AND e.address like
+			AND ibjui.ADDRESS like
 			CONCAT(CONCAT('%',#{elevatorAddress}),'%')
 		</if>
 		<if test="district != null and district != ''">
@@ -501,7 +500,6 @@
 		a.address
 		FROM
 		tz_alert_called a
-		LEFT JOIN tcb_elevator e ON e.sequence_nbr = a.equipment_id
 		WHERE 1=1
 		<if test="callTimeStart != null ">
 			and #{callTimeStart} <![CDATA[ <= ]]>

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

@@ -123,9 +123,9 @@ public class AlertCalledController extends BaseController {
 		if (ValidationUtil.isEmpty(alertCalledObjsDto)) {
 			throw new BadRequest("参数校验失败.");
 		}
-
-		LambdaQueryWrapper<Elevator> queryWrapper = new LambdaQueryWrapper<>();
-		queryWrapper.eq(Elevator::getRescueCode,alertCalledObjsDto.getAlertCalledDto().getDeviceId());
+//切换数据源
+//		LambdaQueryWrapper<Elevator> queryWrapper = new LambdaQueryWrapper<>();
+//		queryWrapper.eq(Elevator::getRescueCode,alertCalledObjsDto.getAlertCalledDto().getDeviceId());
 		Elevator elevator = new Elevator();
 		elevator.setRescueCode(Integer.valueOf(alertCalledObjsDto.getAlertCalledDto().getDeviceId()));
 		Map<String,Object> map =  iElevatorService.selectElevatorList(elevator);

amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-biz/src/main/java/com/yeejoin/amos/boot/module/elevator/biz/service/impl/AlertCalledServiceImpl.java

@@ -132,20 +132,35 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto,AlertCall
             }
             AlertCalledDto alertCalledDto = new AlertCalledDto();
             BeanUtils.copyProperties(alertCalled,alertCalledDto);
-            LambdaQueryWrapper<Elevator> elevatorQueryWrapper = new LambdaQueryWrapper<>();
-            elevatorQueryWrapper.eq(Elevator::getRescueCode, alertCalled.getDeviceId());
-            elevatorQueryWrapper.eq(Elevator::getRegisterCode, alertCalled.getRegistrationCode());
-            Elevator elevator =  iElevatorService.getOne(elevatorQueryWrapper);
-            if(null !=  elevator) {
-                alertCalledDto.setAddress(elevator.getAddress());
-                alertCalledDto.setProvince(elevator.getProvince());
-                alertCalledDto.setCity(elevator.getCity());
-                alertCalledDto.setDistrict(elevator.getDistrict());
-                alertCalledDto.setUseStatus(elevator.getUseStatus());
-                alertCalledDto.setUseSiteCategory(elevator.getUseSiteCategory());
-                alertCalledDto.setUseUnit(elevator.getUseUnit());
-                alertCalledDto.setRegionCode(elevator.getRegionCode());
+            Elevator elevator = new Elevator();
+            elevator.setRescueCode(Integer.valueOf(alertCalled.getDeviceId()));
+            elevator.setRegisterCode(alertCalled.getRegistrationCode());
+            Map<String,Object> map =  iElevatorService.selectElevatorList(elevator);
+            if(!ObjectUtils.isEmpty(map)){
+                alertCalledDto.setAddress(String.valueOf(map.get("address")));
+                alertCalledDto.setProvince(String.valueOf(map.get("province")));
+                alertCalledDto.setCity(String.valueOf(map.get("city")));
+                alertCalledDto.setDistrict(String.valueOf(map.get("district")));
+                alertCalledDto.setUseStatus(Integer.valueOf(String.valueOf(map.get("useStatus"))));
+                alertCalledDto.setUseSiteCategory(String.valueOf(map.get("useSiteCategory")));
+                alertCalledDto.setUseUnit(String.valueOf(map.get("useUnit")));
+                alertCalledDto.setRegionCode(String.valueOf(map.get("regionCode")));
             }
+//              数据源切换
+//            LambdaQueryWrapper<Elevator> elevatorQueryWrapper = new LambdaQueryWrapper<>();
+//            elevatorQueryWrapper.eq(Elevator::getRescueCode, alertCalled.getDeviceId());
+//            elevatorQueryWrapper.eq(Elevator::getRegisterCode, alertCalled.getRegistrationCode());
+//            Elevator elevator =  iElevatorService.getOne(elevatorQueryWrapper);
+//            if(null !=  elevator) {
+//                alertCalledDto.setAddress(elevator.getAddress());
+//                alertCalledDto.setProvince(elevator.getProvince());
+//                alertCalledDto.setCity(elevator.getCity());
+//                alertCalledDto.setDistrict(elevator.getDistrict());
+//                alertCalledDto.setUseStatus(elevator.getUseStatus());
+//                alertCalledDto.setUseSiteCategory(elevator.getUseSiteCategory());
+//                alertCalledDto.setUseUnit(elevator.getUseUnit());
+//                alertCalledDto.setRegionCode(elevator.getRegionCode());
+//            }
             if(!ValidationUtil.isEmpty(alertCalledDto.getUseSiteCategory())) {
                 LambdaQueryWrapper<DataDictionary> wrapper = new LambdaQueryWrapper<>();
                 wrapper.eq(DataDictionary::getCode, alertCalledDto.getUseSiteCategory());