Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/mapper/FireStationMapper.java

@@ -52,4 +52,6 @@ public interface FireStationMapper extends BaseMapper<FireStation> {
 	 *
 	 * **/
 	Integer getStationListCount(@Param("par")RequestData par);
+
+	FireStationDto getFireStationDetails(Long id);
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/resources/mapper/FireStationMapper.xml

@@ -32,5 +32,19 @@
     </select>
 
 
+    <select id="getFireStationDetails" resultType="com.yeejoin.amos.boot.module.common.api.dto.FireStationDto">
+        SELECT
+        a.*,
+        (SELECT
+            count(i.instance_id)
+         from
+             cb_dynamic_form_instance i
+         where
+            i.field_value = #{id}) As userNum
+        FROM cb_fire_station a
+        where
+            a.sequence_nbr = #{id}
+    </select>
+
 
 </mapper>

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/dto/AlertCalledQueryDto.java

@@ -32,15 +32,15 @@ public class AlertCalledQueryDto {
 
    @ExcelProperty(value = "求援时间", index = 3)
    @ApiModelProperty(value = "求援时间")
-   private Date emergencyTime;
+   private Date callTime;
 
    @ExcelIgnore
    @ApiModelProperty(value = "求援时间开始")
-   private Date emergencyTimeStart;
+   private String emergencyTimeStart;
 
    @ExcelIgnore
    @ApiModelProperty(value = "求援时间结束")
-   private Date emergencyTimeEnd;
+   private String emergencyTimeEnd;
 
    @ExcelProperty(value = "求援电话", index = 4)
    @ApiModelProperty(value = "求援电话")
@@ -56,7 +56,7 @@ public class AlertCalledQueryDto {
 
    @ExcelProperty(value = "所属区域", index = 7)
    @ApiModelProperty(value = "所属区域")
-   private String address;
+   private String district;
 
    @ExcelProperty(value = "警情类型", index = 8)
    @ApiModelProperty(value = "警情类型")

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

@@ -54,20 +54,24 @@ public interface AlertCalledMapper extends BaseMapper<AlertCalled> {
      * @param workOrderNumber
      * @return
      */
-    Page<List<AlertCalledQueryDto>> queryAlertListByQueryDto(IPage<AlertCalledQueryDto> page,
-                                                            String workOrderNumber,
-                                                             String creator,
-                                                             String emergency,
-                                                             String emergencyTimeStart,
-                                                             String emergencyTimeEnd,
-                                                             String emergencyCall,
-                                                             String deviceId,
-                                                             String elevatorAddress,
-                                                             String alertType,
-                                                             String alertSource,
-                                                             String alertStage,
-                                                             String alertStatus,
-                                                             String address);
+    Page<List<AlertCalledQueryDto>> queryAlertListByQueryDto(
+            IPage<AlertCalledQueryDto> page,
+            @Param("workOrderNumber") String workOrderNumber,
+            @Param("creator")  String creator,
+            @Param("emergency") String emergency,
+            @Param("emergencyTimeStart") String emergencyTimeStart,
+            @Param("emergencyTimeEnd") String emergencyTimeEnd,
+            @Param("emergencyCall") String emergencyCall,
+            @Param("deviceId") String deviceId,
+            @Param("elevatorAddress") String elevatorAddress,
+            @Param("district") String district,
+            @Param("alertType") String alertType,
+            @Param("alertSource") String alertSource,
+            @Param("alertStage") String alertStage,
+            @Param("alertStatus") String alertStatus,
+            @Param("sortParam") String sortParam,
+            @Param("sortRule") String sortRule);
+
     Map<String, Integer> getTodayEmergencyCount(String regionCode);
     
 	Map<String, Integer> getImportantEventCount(String regionCode);

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/service/IAlertCalledService.java

@@ -47,18 +47,21 @@ public interface IAlertCalledService {
      * @return
      */
     Page<AlertCalledQueryDto> queryAlertListByQueryDto(IPage<AlertCalledQueryDto> page,
-                                                             @Condition(Operator.like) String workOrderNumber,
-                                                             @Condition(Operator.like) String creator,
-                                                             @Condition(Operator.like) String emergency,
-                                                             @Condition(Operator.lt) String emergencyTimeStart,
-                                                             @Condition(Operator.gt) String emergencyTimeEnd,
-                                                             @Condition(Operator.like) String emergencyCall,
-                                                             @Condition(Operator.like) String deviceId,
-                                                             @Condition(Operator.like) String elevatorAddress,
-                                                             @Condition(Operator.eq) String alertType,
-                                                             @Condition(Operator.eq) String alertSource,
-                                                             @Condition(Operator.eq) String alertStage,
-                                                             @Condition(Operator.eq) String alertStatus);
+                                                       String workOrderNumber,
+                                                       String creator,
+                                                       String emergency,
+                                                       String emergencyTimeStart,
+                                                       String emergencyTimeEnd,
+                                                       String emergencyCall,
+                                                       String deviceId,
+                                                       String elevatorAddress,
+                                                       String district,
+                                                       String alertType,
+                                                       String alertSource,
+                                                       String alertStage,
+                                                       String alertStatus,
+                                                       String sortParam,
+                                                       String sortRule);
 
     /**
      * 更新警情阶段信息

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

@@ -180,10 +180,9 @@
 		SELECT
 		a.sequence_nbr AS sequenceNbr,
 		a.work_order_number AS workOrderNumber,
-		a.rec_user_name AS
-		creator,
+		a.rec_user_name AS creator,
 		a.emergency_person AS emergency,
-		a.call_time AS emergencyTime,
+		a.call_time AS callTime,
 		a.emergency_call AS emergencyCall,
 		a.device_id AS deviceId,
 		e.address AS
@@ -205,7 +204,7 @@
 		tz_alert_called a
 		LEFT JOIN tcb_elevator e ON e.rescue_code =
 		a.device_id
-		WHERE 1=1
+		WHERE a.is_delete = 0
 		<if test="workOrderNumber != null and workOrderNumber != ''">
 			AND a.work_order_number like
 			CONCAT(CONCAT('%',#{workOrderNumber}),'%')
@@ -226,10 +225,6 @@
 			and a.call_time <![CDATA[ <= ]]>
 			#{emergencyTimeEnd}
 		</if>
-		<if test="workOrderNumber != null and workOrderNumber != ''">
-			and a.work_order_number like
-			CONCAT(CONCAT('%',#{workOrderNumber}),'%')
-		</if>
 		<if test="emergencyCall != null and emergencyCall != ''">
 			AND a.emergency_call like
 			CONCAT(CONCAT('%',#{emergencyCall}),'%')
@@ -241,8 +236,9 @@
 			AND e.address like
 			CONCAT(CONCAT('%',#{elevatorAddress}),'%')
 		</if>
-		<if test="address != null and address != ''">
-			AND a.region_code like CONCAT(CONCAT('%',#{address}),'%')
+		<if test="district != null and district != ''">
+			AND a.district like
+			CONCAT(CONCAT('%',#{district}),'%')
 		</if>
 		<if test="alertType != null and alertType != ''">
 			AND a.alarm_type_code = #{alertType}
@@ -256,6 +252,9 @@
 		<if test="alertStatus != null and alertStatus != ''">
 			AND a.alert_status = #{alertStatus}
 		</if>
+		<if test="sortParam != null and sortParam != '' and sortRule != null and sortRule != ''    ">
+			ORDER BY  ${sortParam}  ${sortRule}
+		</if>
 
 	</select>
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/FireStationServiceImpl.java

@@ -91,7 +91,7 @@ public class FireStationServiceImpl extends BaseService<FireStationDto, FireStat
 
     @Override
     public FireStationDto selectBySequenceNbr(Long id) {
-        return this.queryBySeq(id);
+        return fireStationMapper.getFireStationDetails(id);
     }
 
 

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

@@ -465,22 +465,30 @@ public class AlertCalledController extends BaseController {
 	@ApiOperation(value = "查询警情事件记录", notes = "查询警情事件记录")
 	@GetMapping("/selectRecord")
 	public ResponseModel<Page<AlertCalledQueryDto>> queryAlertCalledByPager(AlertCalledQueryDto alertCalledQueryDto,
-			@RequestParam(value = "pageNum") int pageNum, @RequestParam(value = "pageSize") int pageSize) {
+			@RequestParam(value = "pageNum") int pageNum, @RequestParam(value = "pageSize") int pageSize, String sort ) {
 		Page<AlertCalledQueryDto> page = new Page<AlertCalledQueryDto>();
 		page.setCurrent(pageNum);
 		page.setSize(pageSize);
-
+		String sortParam = "";
+		String sortRule = "";
+		if(sort!=null) {  // 排序失效
+			String[] date=  sort.split(",");
+			if(date[1].equals("ascend")) {
+				sortParam = RedisKey.humpToLine(date[0]);
+				sortRule = "asc";
+			}else {
+				sortParam =RedisKey.humpToLine(date[0]);
+				sortRule = "desc";
+			}
+		}else {
+			sortParam = "call_time";
+			sortRule = "desc";
+		}
 		Page<AlertCalledQueryDto> pageBean = iAlertCalledService.queryAlertListByQueryDto(page,
-				alertCalledQueryDto.getWorkOrderNumber(), alertCalledQueryDto.getCreator(),
-				alertCalledQueryDto.getEmergency(),
-				alertCalledQueryDto.getEmergencyTimeStart() == null ? null
-						: DateUtils.date2LongStr(alertCalledQueryDto.getEmergencyTimeStart()),
-				alertCalledQueryDto.getEmergencyTimeEnd() == null ? null
-						: DateUtils.date2LongStr(alertCalledQueryDto.getEmergencyTimeEnd()),
-				alertCalledQueryDto.getEmergencyCall(), alertCalledQueryDto.getDeviceId(),
-				alertCalledQueryDto.getElevatorAddress(), alertCalledQueryDto.getAlertType(),
-				alertCalledQueryDto.getAlertSource(), alertCalledQueryDto.getAlertStage(),
-				alertCalledQueryDto.getAlertStatus());
+				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);
 		Page<AlertCalledQueryDto> result = new Page<AlertCalledQueryDto>(alertCalledQueryDto.getPageNum(),
 				alertCalledQueryDto.getPageSize());
 		long totle = pageBean.getTotal();
@@ -492,24 +500,34 @@ public class AlertCalledController extends BaseController {
 	@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
 	@ApiOperation(value = "导出警情事件记录", notes = "导出警情事件记录")
 	@GetMapping("/exportSelectRecord")
-	public void exportAlertCalled(AlertCalledQueryDto alertCalledQueryDto, HttpServletResponse response) {
+	public void exportAlertCalled(AlertCalledQueryDto alertCalledQueryDto, HttpServletResponse response, String sort ) {
 		Page<AlertCalledQueryDto> page = new Page<AlertCalledQueryDto>();
-
+		String sortParam = "";
+		String sortRule = "";
+		if(sort!=null) {  // 排序失效
+			String[] date=  sort.split(",");
+			if(date[1].equals("ascend")) {
+				sortParam = RedisKey.humpToLine(date[0]);
+				sortRule = "asc";
+			}else {
+				sortParam =RedisKey.humpToLine(date[0]);
+				sortRule = "desc";
+			}
+		}else {
+			sortParam = "call_time";
+			sortRule = "desc";
+		}
+		page.setCurrent(0);
+		page.setSize(Long.MAX_VALUE);
 		Page<AlertCalledQueryDto> pageBean = iAlertCalledService.queryAlertListByQueryDto(page,
-				alertCalledQueryDto.getWorkOrderNumber(), alertCalledQueryDto.getCreator(),
-				alertCalledQueryDto.getEmergency(),
-				alertCalledQueryDto.getEmergencyTimeStart() == null ? null
-						: DateUtils.date2LongStr(alertCalledQueryDto.getEmergencyTimeStart()),
-				alertCalledQueryDto.getEmergencyTimeEnd() == null ? null
-						: DateUtils.date2LongStr(alertCalledQueryDto.getEmergencyTimeEnd()),
-				alertCalledQueryDto.getEmergencyCall(), alertCalledQueryDto.getDeviceId(),
-				alertCalledQueryDto.getElevatorAddress(), alertCalledQueryDto.getAlertType(),
-				alertCalledQueryDto.getAlertSource(), alertCalledQueryDto.getAlertStage(),
-				alertCalledQueryDto.getAlertStatus());
-		List<AlertCalledQueryDto> list = pageBean.getRecords();
+				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);
 
-		String fileName = "警情事件记录" + System.currentTimeMillis();
-		ExcelUtil.createTemplate(response, fileName, "警情事件记录", list, AlertCalledQueryDto.class, null, false);
+		List<AlertCalledQueryDto> list = pageBean.getRecords();
+		String fileName = "处置记录" + System.currentTimeMillis();
+		ExcelUtil.createTemplate(response, fileName, "处置记录", list, AlertCalledQueryDto.class, null, false);
 	}
 
 	@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)

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

@@ -202,24 +202,26 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto,AlertCall
 
     @Override
     public Page<AlertCalledQueryDto> queryAlertListByQueryDto(IPage<AlertCalledQueryDto> page,
-                                                              @Condition(Operator.like) String workOrderNumber,
-                                                              @Condition(Operator.like) String creator,
-                                                              @Condition(Operator.like) String emergency,
-                                                              @Condition(Operator.gt) String emergencyTimeStart,
-                                                              @Condition(Operator.lt) String emergencyTimeEnd,
-                                                              @Condition(Operator.like) String emergencyCall,
-                                                              @Condition(Operator.like) String deviceId,
-                                                              @Condition(Operator.like) String elevatorAddress,
-                                                              @Condition(Operator.eq) String alertType,
-                                                              @Condition(Operator.eq) String alertSource,
-                                                              @Condition(Operator.eq) String alertStage,
-                                                              @Condition(Operator.eq) String alertStatus
+                                                              String workOrderNumber,
+                                                              String creator,
+                                                              String emergency,
+                                                              String emergencyTimeStart,
+                                                              String emergencyTimeEnd,
+                                                              String emergencyCall,
+                                                              String deviceId,
+                                                              String elevatorAddress,
+                                                              String district,
+                                                              String alertType,
+                                                              String alertSource,
+                                                              String alertStage,
+                                                              String alertStatus,
+                                                              String sortParam,
+                                                              String sortRule
                                                               ) {
-
-        Page<List<AlertCalledQueryDto>>list = alertCalledMapper.queryAlertListByQueryDto(
-                page,workOrderNumber,creator,emergency,emergencyTimeStart,
-                emergencyTimeEnd,emergencyCall,deviceId,elevatorAddress,alertType,
-                alertSource,alertStage,alertStatus,null);
+        Page<List<AlertCalledQueryDto>>list = alertCalledMapper.queryAlertListByQueryDto(page,
+                workOrderNumber,creator,emergency,emergencyTimeStart,
+                emergencyTimeEnd,emergencyCall,deviceId,elevatorAddress,district,alertType,
+                alertSource,alertStage,alertStatus,sortParam,sortRule);
         Page<AlertCalledQueryDto> page1 = new Page<>();
         List<AlertCalledQueryDto> resultDtoList = JSONArray.parseArray(JSONArray.toJSONString(list.getRecords()),AlertCalledQueryDto.class);
         page1.setCurrent(page.getCurrent());

amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/utils/BeanDtoVoUtils.java

@@ -201,6 +201,7 @@ public class BeanDtoVoUtils {
             MaintenanceUnitDto target = new MaintenanceUnitDto();
             // 把原对象数据拷贝到新对象
             BeanUtils.copyProperties(source, target);
+            target.setDistrict(target.getCity() + target.getDistrict());
             // 返回新对象
             // 根据数据字典设置值
             if (!isBatch) {

amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/utils/HttpUtils.java

@@ -387,10 +387,12 @@ public class HttpUtils {
         try {
             response = httpClient.execute(httpGet);
             Header[] heads = response.getHeaders("Content-disposition");
-            HeaderElement[] elements = heads[0].getElements();
-            for (HeaderElement el : elements) {
-                NameValuePair pair  = el.getParameterByName("filename");
-                result.put("filename",pair.getValue());
+            if(heads != null && heads[0] != null) {
+                HeaderElement[] elements = heads[0].getElements();
+                for (HeaderElement el : elements) {
+                    NameValuePair pair  = el.getParameterByName("filename");
+                    result.put("filename",pair.getValue());
+                }
             }
             HttpEntity entity = response.getEntity();
             inputStream = entity.getContent();