修改告警列表筛选

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/EmergencyController.java

@@ -724,7 +724,8 @@ public class EmergencyController extends AbstractBaseController {
 								   @RequestParam(required = false) String systemCode,
 								   @RequestParam(required = false) String createDate,
 								   @RequestParam(required = false) String startDate,
-								   @RequestParam(required = false) String endDate
+								   @RequestParam(required = false) String endDate,
+								   @RequestParam(required = false) String sorter
 								   ) {
 		Page<Map<String, Object>> page = new Page<>(pageNumber, pageSize);
 		if (StringUtils.isEmpty(bizOrgCode)) {
@@ -737,7 +738,13 @@ public class EmergencyController extends AbstractBaseController {
 				}
 			}
 		}
-		return CommonResponseUtil.success(iEmergencyService.alarmList(page, bizOrgCode, systemCode, types, emergencyLevels, name, cleanStatus, handleStatus, createDate, startDate, endDate));
+		String sortField = "", sortOrder = "";
+		if (org.springframework.util.StringUtils.hasText(sorter)) {
+			sortField = sorter.split("@")[0];
+			sortOrder = sorter.split("@")[1];
+		}
+		return CommonResponseUtil.success(iEmergencyService.alarmList(page, bizOrgCode, systemCode, types, emergencyLevels,
+				name, cleanStatus, handleStatus, createDate, startDate, endDate, sortField, sortOrder));
 	}
 
 	@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/mapper/EmergencyMapper.java

@@ -115,7 +115,7 @@ public interface EmergencyMapper extends BaseMapper{
      * @param name 设备名称
      * @return
      */
-    Page<Map<String, Object>> alarmList(@Param("page") Page<Map<String, Object>> page, @Param("bizOrgCode") String bizOrgCode, @Param("systemCode") String systemCode, @Param("types") List<String> types, @Param("emergencyLevels") List<String> emergencyLevels, @Param("name") String name, @Param("cleanStatus") Integer cleanStatus, @Param("handleStatus") Integer handleStatus , @Param("createDate") String createDate , @Param("startDate") String startDate , @Param("endDate") String endDate);
+    Page<Map<String, Object>> alarmList(@Param("page") Page<Map<String, Object>> page, @Param("bizOrgCode") String bizOrgCode, @Param("systemCode") String systemCode, @Param("types") List<String> types, @Param("emergencyLevels") List<String> emergencyLevels, @Param("name") String name, @Param("cleanStatus") Integer cleanStatus, @Param("handleStatus") Integer handleStatus , @Param("createDate") String createDate, @Param("startDate") String startDate , @Param("endDate") String endDate, @Param("sortField") String sortField , @Param("sortOrder") String sortOrder);
 
     List<Map<String, Object>> alarmListNoPage( @Param("bizOrgCode") String bizOrgCode, @Param("systemCode") String systemCode, @Param("types") List<String> types, @Param("emergencyLevels") List<String> emergencyLevels, @Param("name") String name, @Param("cleanStatus") Integer cleanStatus, @Param("handleStatus") Integer handleStatus , @Param("createDate") String createDate , @Param("startDate") String startDate , @Param("endDate") String endDate);
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/IEmergencyService.java

@@ -71,7 +71,9 @@ public interface IEmergencyService {
 
     List<Map<String, Object>> getPressurePumpDiagnosticAnalysis(String bizOrgCode);
 
-    Page<Map<String, Object>> alarmList(Page<Map<String, Object>> page,String bizOrgCode, String systemCode, List<String> types, List<String> emergencyLevels, String name, Integer cleanStatus, Integer handleStatus,String createDate,String startDate,String endDate);
+    Page<Map<String, Object>> alarmList(Page<Map<String, Object>> page,String bizOrgCode, String systemCode, List<String> types,
+                                        List<String> emergencyLevels, String name, Integer cleanStatus, Integer handleStatus,
+                                        String createDate,String startDate,String endDate,String sortField,String sortOrder);
 
     Map<String, List<PressurePumpCountVo>> getPressurePumpDay();
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/EmergencyServiceImpl.java

@@ -650,8 +650,8 @@ public class EmergencyServiceImpl implements IEmergencyService {
 
 
     @Override
-    public Page<Map<String, Object>> alarmList(Page<Map<String, Object>> page, String bizOrgCode, String systemCode, List<String> types, List<String> emergencyLevels, String name, Integer cleanStatus, Integer handleStatus,String createDate,String startDate,String endDate) {
-        return emergencyMapper.alarmList(page, bizOrgCode, systemCode, types, emergencyLevels, name, cleanStatus, handleStatus, createDate, startDate, endDate);
+    public Page<Map<String, Object>> alarmList(Page<Map<String, Object>> page, String bizOrgCode, String systemCode, List<String> types, List<String> emergencyLevels, String name, Integer cleanStatus, Integer handleStatus,String createDate,String startDate,String endDate,String sortField,String sortOrder) {
+        return emergencyMapper.alarmList(page, bizOrgCode, systemCode, types, emergencyLevels, name, cleanStatus, handleStatus, createDate, startDate, endDate, sortField, sortOrder);
     }
 
     //稳压泵定时向缓存中存昨日启动次数任务

amos-boot-system-equip/src/main/resources/mapper/EmergencyMapper.xml

@@ -1580,7 +1580,29 @@
             </if>
         </where>
         ORDER BY
+        <if test="sortField != null and sortField != '' and sortField == 'createDate'">
+            <choose>
+                <when test="sortOrder == 'ascend'">
+                    wlesal.create_date ASC
+                </when>
+                <otherwise>
                     wlesal.create_date DESC
+                </otherwise>
+            </choose>
+        </if>
+        <if test="sortField != null and sortField != '' and sortField == 'cleanStatus'">
+            <choose>
+                <when test="sortOrder == 'ascend'">
+                    wlesal.clean_time ASC
+                </when>
+                <otherwise>
+                    wlesal.clean_time DESC
+                </otherwise>
+            </choose>
+        </if>
+        <if test="sortField == null or sortField == ''">
+            wlesal.create_date DESC
+        </if>
     </select>
 
     <select id="alarmListNoPage" resultType="java.util.Map">