item：新增直流中心告警列表分页

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

@@ -178,6 +178,39 @@ public class EquipmentAlarmController extends AbstractBaseController {
     }
 
     /**
+     * 直流中心告警列表分页
+     *
+     * @return
+     */
+    @RequestMapping(value = "/zlzx-list", method = RequestMethod.GET)
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(httpMethod = "GET", value = "列表分页查询", produces = "application/json;charset=UTF-8", notes = "列表分页查询")
+    public ResponseModel listPage(@RequestParam(value = "alarmType", required = false) String alarmType,
+                                  @RequestParam(value = "isNeedBiz", required = false) Boolean isNeedBiz,
+                                  CommonPageable commonPageable) {
+        if (commonPageable.getPageNumber() == 0) {
+            commonPageable.setPageNumber(1);
+        }
+        List<CommonRequest> queryRequests = new ArrayList<>();
+        CommonRequest request = new CommonRequest();
+        request.setName("alarmType");
+        request.setValue(StringUtil.isNotEmpty(alarmType) ? StringUtils.trimToNull(alarmType) : null);
+        queryRequests.add(request);
+        if (isNeedBiz != null && isNeedBiz) {
+            ReginParams reginParams = getSelectedOrgInfo();
+            if (!ValidationUtil.isEmpty(reginParams.getPersonIdentity())) {
+                CommonRequest request1 = new CommonRequest();
+                request1.setName("bizOrgCode");
+                request1.setValue(StringUtil.isNotEmpty(reginParams.getPersonIdentity().getBizOrgCode()) ? reginParams.getPersonIdentity().getBizOrgCode() : null);
+                queryRequests.add(request1);
+            }
+        }
+        CommonPageInfoParam param = CommonPageParamUtil.fillCommonPageInfoParam(queryRequests, commonPageable);
+        Page<Map<String, Object>> list = iEquipmentSpecificAlarmService.zlzxListPage(param);
+        return CommonResponseUtil.success(list);
+    }
+
+    /**
      * 稳压泵跑马灯消息已读列表分页查询
      *
      * @return

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

@@ -140,6 +140,8 @@ public interface EquipmentSpecificAlarmMapper extends BaseMapper<EquipmentSpecif
 
     Page<Map<String, Object>> page(Page page, @Param("param") CommonPageInfoParam param);
 
+    Page<Map<String, Object>> zlzxPage(Page page, @Param("param") CommonPageInfoParam param);
+
     Page<Map<String, Object>> pageQuery(Page page, @Param("param") CommonPageInfoParam param);
 
 

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

@@ -31,6 +31,8 @@ public interface IEquipmentSpecificAlarmService extends IService<EquipmentSpecif
 
     Page<Map<String, Object>> listPage(CommonPageInfoParam param);
 
+    Page<Map<String, Object>> zlzxListPage(CommonPageInfoParam param);
+
     Page<Map<String, Object>> pageQuery(CommonPageInfoParam param);
 
     void handleExport(HttpServletResponse response, List<Long> ids, String alarmType);

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

@@ -206,6 +206,27 @@ public class EquipmentSpecificAlarmServiceImpl extends ServiceImpl<EquipmentSpec
     }
 
     @Override
+    public Page<Map<String, Object>> zlzxListPage(CommonPageInfoParam param) {
+        Page result = new Page<>(param.getPageNumber(), param.getPageSize());
+        if (AlarmTypeEnum.GZGJ.getCode().equals(param.getAlarmType())) {
+            param.setAlarmType("");
+            param.setIsFireAlarm("false");
+        }
+        Page<Map<String, Object>> resultPage = this.baseMapper.zlzxPage(result, param);
+        if (resultPage.getTotal() > 0) {
+            for (Map<String, Object> x : resultPage.getRecords()) {
+                if (ObjectUtils.isEmpty(x.get("handleType"))) {
+                    x.put("handleType", null);
+                } else {
+                    String handleType = ConfirmAlamEnum.getTypeByCode(String.valueOf(x.get("handleType")));
+                    x.put("handleType", StringUtil.isNotEmpty(handleType) ? handleType : signalClassifyService.getTypeNameByCode(String.valueOf(x.get("handleType"))).getTypeName());
+                }
+            }
+        }
+        return resultPage;
+    }
+
+    @Override
     public Page<Map<String, Object>> pageQuery(CommonPageInfoParam param) {
         Page result = new Page<>(param.getPageNumber(), param.getPageSize());
         return this.baseMapper.pageQuery(result, param);

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

@@ -263,6 +263,40 @@
         ORDER BY wlesal.create_date DESC
         
     </select>
+    <select id="zlzxPage" resultType="java.util.HashMap">
+        SELECT
+	        wlesal.id,
+	        wlesal.equipment_specific_id AS equipmentSpecificId,
+	        concat(wlesal.equipment_specific_name,wlesal.equipment_specific_index_name) as alamContent,
+	        if(wlesal.confirm_type is null,'未处理','已处理') handleStatus,
+	        IF (
+	        wlesal.clean_time IS NOT NULL,
+	        '已消除',
+	        '未消除'
+	        ) cleanStatus,
+	        confirm_type as handleType,
+	        wlesal.type AS typeCode,
+	        (select type_name from wl_signal_classify sc where sc.type_code = wlesal.type limit 1) as type,
+            date_format(
+            wlesal.create_date,
+            '%Y-%m-%d %H:%i:%s'
+            ) createDate,
+	        wlesal.equipment_specific_name as equipmentSpecificName,
+	        wles.position,
+            wles.biz_org_code AS bizOrgCode,
+            wles.biz_org_name AS bizOrgName
+        FROM wl_equipment_specific_alarm_log wlesal
+        LEFT JOIN wl_equipment_specific wles ON wlesal.equipment_specific_id = wles.id
+        <where>
+            <if test="param.alarmType == 'BREAKDOWN'">AND wlesal.type = #{param.alarmType}</if>
+            <if test="param.alarmType == 'FIREALARM'">AND wlesal.type = #{param.alarmType}</if>
+            <if test="param.isFireAlarm == 'false'">AND wlesal.type != 'FIREALARM'</if>
+            <if test="param.bizOrgCode != null and param.bizOrgCode != ''">AND
+                wles.biz_org_code like concat (#{param.bizOrgCode},'%')
+            </if>
+        </where>
+        ORDER BY wlesal.create_date DESC
+    </select>
     <select id="pageQuery" resultType="java.util.HashMap">
         SELECT
             `wlesal`.`equipment_specific_alarm_id` AS `id`,