fix: BUG#21597 消防系统弹窗无法按换流站、系统类型、系统状态筛选

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

@@ -67,16 +67,29 @@ public class SystemStatisticController extends AbstractBaseController {
     }
 
     @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
+    @RequestMapping(value = "/system-types", method = RequestMethod.GET)
+    @ApiOperation(httpMethod = "GET", value = "获取系统类型列表", notes = "获取系统类型列表")
+    public ResponseModel getSystemTypes(@RequestParam(required = false) String bizOrgCode) {
+        List<Map<String, Object>> list = fireFightingSystemMapper.getSystemTypes(bizOrgCode);
+        return CommonResponseUtil.success(list);
+    }
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
     @RequestMapping(value = "/page", method = RequestMethod.GET)
-    @ApiOperation(httpMethod = "GET", value = "获取水池信息", notes = "获取水池信息")
-    public ResponseModel getSystemPage(CommonPageable commonPageable, @RequestParam(required = false) String bizOrgCode,
-                                      @RequestParam(required = false) String systemType, @RequestParam(required = false) String systemState,
-                                      @RequestParam(required = false) String stateOrder, @RequestParam(required = false) String alarmEquips) {
-        if (commonPageable.getPageNumber() == 0) {
-            commonPageable.setPageNumber(1);
+    @ApiOperation(httpMethod = "GET", value = "获取系统信息", notes = "获取系统信息")
+    public ResponseModel getSystemPage(CommonPageable commonPageable,
+                                       @RequestParam(required = false) String bizOrgCode,
+                                       @RequestParam(required = false) String systemType,
+                                       @RequestParam(required = false) String systemState,
+                                       @RequestParam(required = false) String sorter
+    ) {
+        String sortField = "", sortOrder = "";
+        if (org.springframework.util.StringUtils.hasText(sorter)) {
+            sortField = sorter.split("@")[0];
+            sortOrder = sorter.split("@")[1];
         }
         Page page = new Page<>(commonPageable.getPageNumber(), commonPageable.getPageSize());
-        Page<Map<String, Object>> page1 = fireFightingSystemMapper.getSystemInfoPage(page, bizOrgCode, systemType, systemState, stateOrder, alarmEquips);
+        Page<Map<String, Object>> page1 = fireFightingSystemMapper.getSystemInfoPage(page, bizOrgCode, systemType, systemState, sortField, sortOrder);
         return CommonResponseUtil.success(page1);
     }
 

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

@@ -756,11 +756,13 @@ public interface FireFightingSystemMapper extends BaseMapper<FireFightingSystemE
 
     List<Map<String, Object>> getAbnormalSystemInfo(@Param("bizOrgCode") String bizOrgCode);
 
-    Page<Map<String, Object>> getSystemInfoPage(Page page, @Param("bizOrgCode") String bizOrgCode,
+    Page<Map<String, Object>> getSystemInfoPage(Page page,
+                                                @Param("bizOrgCode") String bizOrgCode,
                                                 @Param("systemType") String systemType,
                                                 @Param("systemState") String systemState,
-                                                @Param("stateOrder") String stateOrder,
-                                                @Param("alarmEquips") String alarmEquips);
+                                                @Param("sortField") String sortField,
+                                                @Param("sortOrder") String sortOrder
+    );
 
     Map<String, Object> getIotInfo(@Param("bizOrgCode") String bizOrgCode);
 
@@ -768,4 +770,5 @@ public interface FireFightingSystemMapper extends BaseMapper<FireFightingSystemE
 
     List<Map<String, Object>> getSystemAlarmNum(@Param("bizOrgCode") String bizOrgCode);
 
+    List<Map<String, Object>> getSystemTypes(String bizOrgCode);
 }

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

@@ -6962,25 +6962,27 @@
         </if>
         ) d
         <where>
-            <if test="systemState!=null and systemState!='' and systemState =='1'">
-                d.value <![CDATA[>]]> 0
+            <if test="systemState == 'normal'">
+                AND d.value = 0
             </if>
-            <if test="systemState!=null and systemState!='' and systemState =='0'">
-                d.value <![CDATA[<]]> 0
+            <if test="systemState == 'abnormal'">
+                AND d.value <![CDATA[>]]> 0
             </if>
         </where>
-        <if test="stateOrder!=null and stateOrder!='' and stateOrder==1">
-            ORDER BY d.value DESC,
-        </if>
-        <if test="stateOrder!=null and stateOrder!='' and stateOrder==0">
-            ORDER BY d.value ASC,
+        ORDER BY
+            <if test="sortField != null and sortField != ''">
+                <choose>
+                    <when test="sortOrder == 'ascend'">
+                        ${sortField} ASC
+                    </when>
+                    <otherwise>
+                        ${sortField} DESC
+                    </otherwise>
+                </choose>
             </if>
-        <if test="alarmEquips!=null and alarmEquips!='' and alarmEquips==1">
+            <if test="sortField == null or sortField == ''">
                 d.equips DESC
             </if>
-        <if test="alarmEquips!=null and alarmEquips!='' and alarmEquips==0">
-            d.equips ASC
-        </if>
     </select>
 
     <select id="getIotInfo" resultType="Map">
@@ -7038,4 +7040,22 @@
         GROUP BY fs.system_type_code
 
     </select>
+
+    <select id="getSystemTypes" resultType="Map">
+        SELECT
+            t1.system_type_code AS systemTypeCode,
+            t2.name AS name
+        FROM
+            f_fire_fighting_system t1
+                left join wl_equipment_category t2 on t1.system_type = t2.id
+        <where>
+            t1.system_type_code IS NOT NULL
+            AND t2.name IS NOT NULL
+            <if test="bizOrgCode != null and bizOrgCode != ''">
+                AND t1.biz_org_code LIKE CONCAT(#{bizOrgCode},'%')
+            </if>
+        </where>
+        GROUP BY
+            t1.system_type_code
+    </select>
 </mapper>