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

@@ -7,6 +7,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.util.Date;
+import java.util.List;
 
 /**
  * 警情查询DTO
@@ -90,4 +91,6 @@ public class AlertCalledQueryDto {
    @ApiModelProperty(value = "ID")
    private Long sequenceNbr;
 
+   @ExcelIgnore
+   List<String> ids;
 }

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

@@ -19,7 +19,7 @@ public class SpecialEquipmentDto {
 
     @ExcelIgnore
     @ApiModelProperty(value = "主键ID")
-    protected Long sequenceNbr;
+    protected String sequenceNbr;
 
     @ApiModelProperty(value = "电梯应急救援识别码")
     private Integer rescueCode;

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

@@ -72,7 +72,8 @@ public interface AlertCalledMapper extends BaseMapper<AlertCalled> {
             @Param("alertStatus") String alertStatus,
             @Param("sortParam") String sortParam,
             @Param("sortRule") String sortRule,
-            @Param("userIds") Set<String> userIds);
+            @Param("userIds") Set<String> userIds,
+            @Param("ids") List<String> ids);
 
     Map<String, Integer> getTodayEmergencyCount(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/service/IAlertCalledService.java

@@ -52,7 +52,8 @@ public interface IAlertCalledService {
                                                        String alertStage,
                                                        String alertStatus,
                                                        String sortParam,
-                                                       String sortRule);
+                                                       String sortRule,
+                                                       List<String> ids);
 
     /**
      * 更新警情阶段信息

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

@@ -257,6 +257,12 @@
 				#{item}
 			</foreach>
 		</if>
+		<if test="ids != null and ids.size>0">
+			AND a.sequence_nbr in
+			<foreach collection="ids" item="item" index="index" open="(" separator="," close=")">
+				#{item}
+			</foreach>
+		</if>
 		<if test="sortParam != null and sortParam != '' and sortRule != null and sortRule != ''    ">
 			ORDER BY  ${sortParam}  ${sortRule}
 		</if>

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

@@ -475,7 +475,7 @@
             EMERGENCYCALL AS phone,
             tbei.address AS address,
             tbei.use_unit AS unitName,
-            ibjui."USE_UNIT_CREDIT_CODE" AS useCode
+            tbei.use_code AS useCode
         FROM
             idx_biz_jg_maintenance_record_info ibjmri
                 LEFT JOIN tz_base_enterprise_info tbei ON ibjmri."ME_UNIT_CREDIT_CODE" = tbei.use_code

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

@@ -506,7 +506,7 @@ public class AlertCalledController extends BaseController {
 				alertCalledQueryDto.getWorkOrderNumber(),alertCalledQueryDto.getCreator(),alertCalledQueryDto.getEmergency(),alertCalledQueryDto.getEmergencyTimeStart(),
 				alertCalledQueryDto.getEmergencyTimeEnd(),alertCalledQueryDto.getEmergencyCall(),alertCalledQueryDto.getDeviceId(),alertCalledQueryDto.getElevatorAddress(),
 				alertCalledQueryDto.getDistrict(),alertCalledQueryDto.getAlertType(),alertCalledQueryDto.getAlertSource(),alertCalledQueryDto.getAlertStage(),alertCalledQueryDto.getAlertStatus(),
-				sortParam,sortRule);
+				sortParam,sortRule, null);
 		Page<AlertCalledQueryDto> result = new Page<AlertCalledQueryDto>(alertCalledQueryDto.getPageNum(),
 				alertCalledQueryDto.getPageSize());
 		long totle = pageBean.getTotal();
@@ -541,7 +541,7 @@ public class AlertCalledController extends BaseController {
 				alertCalledQueryDto.getWorkOrderNumber(),alertCalledQueryDto.getCreator(),alertCalledQueryDto.getEmergency(),alertCalledQueryDto.getEmergencyTimeStart(),
 				alertCalledQueryDto.getEmergencyTimeEnd(),alertCalledQueryDto.getEmergencyCall(),alertCalledQueryDto.getDeviceId(),alertCalledQueryDto.getElevatorAddress(),
 				alertCalledQueryDto.getDistrict(),alertCalledQueryDto.getAlertType(),alertCalledQueryDto.getAlertSource(),alertCalledQueryDto.getAlertStage(),alertCalledQueryDto.getAlertStatus(),
-				sortParam,sortRule);
+				sortParam,sortRule, alertCalledQueryDto.getIds());
 
 		List<AlertCalledQueryDto> list = pageBean.getRecords();
 		String fileName = "处置记录" + System.currentTimeMillis();

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

@@ -274,7 +274,8 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto,AlertCall
                                                               String alertStage,
                                                               String alertStatus,
                                                               String sortParam,
-                                                              String sortRule
+                                                              String sortRule,
+                                                              List<String> ids
                                                               ) {
         //获取当前登陆人所在单位的下的所有接警人员的userId
         Set<String> userIds = new HashSet<>();
@@ -292,7 +293,7 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto,AlertCall
         Page<List<AlertCalledQueryDto>>list = alertCalledMapper.queryAlertListByQueryDto(page,
                 workOrderNumber,creator,emergency,emergencyTimeStart,
                 emergencyTimeEnd,emergencyCall,deviceId,elevatorAddress,district,alertType,
-                alertSource,alertStage,alertStatus,sortParam,sortRule,userIds);
+                alertSource,alertStage,alertStatus,sortParam,sortRule,userIds,ids);
         Page<AlertCalledQueryDto> page1 = new Page<>();
         List<AlertCalledQueryDto> resultDtoList = JSONArray.parseArray(JSONArray.toJSONString(list.getRecords()),AlertCalledQueryDto.class);
         page1.setCurrent(page.getCurrent());

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

 package com.yeejoin.amos.boot.module.elevator.biz.service.impl;
 
+import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -450,7 +451,7 @@ public class ESElevatorServiceImpl {
 
         if(!ValidationUtil.isEmpty(keyword)) {
             BoolQueryBuilder qb0 = QueryBuilders.boolQuery().
-                    must(QueryBuilders.termQuery("rescueCode", keyword));
+                    must(QueryBuilders.matchQuery("rescueCode.keyword", keyword));
             boolMust.should(qb0);
             BoolQueryBuilder qb1 = QueryBuilders.boolQuery().
                     must(QueryBuilders.matchQuery("address", keyword));
@@ -486,6 +487,7 @@ public class ESElevatorServiceImpl {
         catch (Exception e)
         {
             // TODO: handle exception
+            e.printStackTrace();
         }
         result.setRecords(list);
         result.setTotal(total);