修改bug

amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/enums/EmergencyEquipTypeEnum.java

@@ -17,16 +17,17 @@ import java.util.Map;
 @Getter
 public enum EmergencyEquipTypeEnum {
 
-    MHQ("3104", "fireExtinguisher", "灭火器"),
-    XHS("3105", "fireHydrant", "消火栓"),
-    HXQ("1106", "respirator", "正压式呼吸器"),
-    XFC("3910", "fireShovel", "消防铲"),
-    XFF("3904", "fireAxe", "消防斧"),
-    XFT("3911", "fireBucket", "消防桶");
+    MHQ("3104", "fireExtinguisher", "灭火器", "MHQ"),
+    XHS("3105", "fireHydrant", "消火栓", "XHS"),
+    ZYSKQHXQ("1106", "respirator", "正压式呼吸器", "ZYSKQHXQ"),
+    XFC("3910", "fireShovel", "消防铲", "XFC"),
+    XFF("3904", "fireAxe", "消防斧", "XFF"),
+    XFT("3911", "fireBucket", "消防桶", "XFT");
 
     private String code;
     private String name;
     private String describe;
+    private String key;
 
     public static String getCodeByName(String name) {
         for (EmergencyEquipTypeEnum e : EmergencyEquipTypeEnum.values()) {
@@ -37,6 +38,15 @@ public enum EmergencyEquipTypeEnum {
         return null;
     }
 
+    public static String getCodeByKey(String key) {
+        for (EmergencyEquipTypeEnum e : EmergencyEquipTypeEnum.values()) {
+            if (e.getKey().equals(key)) {
+                return e.code;
+            }
+        }
+        return null;
+    }
+
     public static EmergencyEquipTypeEnum getEnumByName(String name) {
         for (EmergencyEquipTypeEnum e : EmergencyEquipTypeEnum.values()) {
             if (e.getName().equals(name)) {

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

 package com.yeejoin.equipmanage.controller;
 
-import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
-import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
 import com.yeejoin.equipmanage.common.entity.dto.EquipTypeAmountPageDTO;
 import com.yeejoin.equipmanage.common.entity.dto.FireResourceStatsDTO;
 import com.yeejoin.equipmanage.common.entity.vo.EquipTypeImgAmountVO;
-import com.yeejoin.equipmanage.common.enums.EmergencyEquipTypeEnum;
 import com.yeejoin.equipmanage.common.utils.CommonResponseUtil;
 import com.yeejoin.equipmanage.common.utils.DateUtils;
 import com.yeejoin.equipmanage.config.PersonIdentify;
@@ -17,14 +14,11 @@ import com.yeejoin.equipmanage.service.IEmergencyService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
-import liquibase.pro.packaged.B;
-import org.slf4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.MediaType;
 import org.springframework.util.ObjectUtils;
 import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.*;
-import org.typroject.tyboot.core.foundation.context.RequestContext;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
 import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 import org.typroject.tyboot.core.restful.doc.TycloudOperation;
@@ -760,7 +754,7 @@ public class EmergencyController extends AbstractBaseController {
 
 	@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
 	@ApiOperation("设备平台详情设备列表")
-	@GetMapping(value = "/equip/list")
+	@PostMapping(value = "/equip/list")
 	public IPage<EquipTypeImgAmountVO> getMaterialList(@RequestBody EquipTypeAmountPageDTO equipTypeAmountPage)  {
 		if (StringUtils.isEmpty(equipTypeAmountPage.getEquipCodeKey())) {
 			return new Page<>();

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

@@ -17,7 +17,6 @@ import com.yeejoin.equipmanage.utils.FileHelper;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
-import liquibase.pro.packaged.Q;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.MediaType;
@@ -183,7 +182,8 @@ public class SocialPowerController extends AbstractBaseController {
 										  @RequestParam(value = "companyName",required = false) String companyName,
 										  @RequestParam(value = "contactUser",required = false) String contactUser,
 										   @RequestParam(value = "remark",required = false) String remark,
-										   @RequestParam(required = false) String bizOrgCode) {
+										   @RequestParam(value = "bizOrgCode", required = false) String bizOrgCode,
+										   @RequestParam(value = "powerStatus", required = false) String powerStatus) {
 		if (StringUtils.isEmpty(bizOrgCode)) {
 			ReginParams reginParams = getSelectedOrgInfo();
 			bizOrgCode = reginParams.getPersonIdentity().getBizOrgCode();
@@ -193,6 +193,7 @@ public class SocialPowerController extends AbstractBaseController {
 		dto.setCompanyName(companyName);
 		dto.setContactUser(contactUser);
 		dto.setRemark(remark);
+		dto.setPowerStatus(powerStatus);
 		return socialPowerService.listPage(page, dto);
 	}
 

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

@@ -381,7 +381,7 @@ public class EmergencyServiceImpl implements IEmergencyService {
 
     @Override
     public IPage<EquipTypeImgAmountVO> getEmergencyEquipList(EquipTypeAmountPageDTO equipTypeAmountPage) {
-        String equipCodeLike = EmergencyEquipTypeEnum.getCodeByName(equipTypeAmountPage.getEquipCodeKey());
+        String equipCodeLike = EmergencyEquipTypeEnum.getCodeByKey(equipTypeAmountPage.getEquipCodeKey());
         equipTypeAmountPage.setEquipCodeKey(equipCodeLike);
         return emergencyMapper.getEmergencyEquipList(equipTypeAmountPage.getPage(), equipTypeAmountPage);
     }
@@ -676,7 +676,7 @@ public class EmergencyServiceImpl implements IEmergencyService {
 
     @Override
     public List<Map<String, Object>> getEquipStatistic(String bizOrgCode, String equipCodeKey) {
-        String equipCodeLike = EmergencyEquipTypeEnum.getCodeByName(equipCodeKey);
+        String equipCodeLike = EmergencyEquipTypeEnum.getCodeByKey(equipCodeKey);
         return emergencyMapper.getEquipStatistic(bizOrgCode, equipCodeLike);
     }
 }

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

@@ -1491,7 +1491,7 @@
         SELECT
             wes.id,
             count(wes.equipment_code) AS count,
-            LEFT(wed.code, 8) AS code,
+            wed.code AS code,
             wed.equipment_name name
         FROM
             wl_equipment_specific wes

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

@@ -21,6 +21,9 @@
             <if test="dto.remark != null and dto.remark != ''">
                 AND wsp.remark like CONCAT('%', #{dto.remark},'%')
             </if>
+            <if test="dto.powerStatus != null and dto.powerStatus != ''">
+                AND wsp.power_status = #{dto.powerStatus}
+            </if>
         </where>
        ORDER BY
         wsp.create_date DESC