Merge branch 'develop_dl_plan6' of http://39.98.45.134:8090/moa/amos-boot-biz into develop_dl_plan6

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

@@ -23,7 +23,6 @@ import org.typroject.tyboot.core.foundation.enumeration.UserType;
 import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
-import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
 import java.text.ParseException;

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

@@ -608,7 +608,7 @@ public interface FireFightingSystemMapper extends BaseMapper<FireFightingSystemE
 
     BigDecimal getWaterPoolLevelByEquipSpeId(@Param("equipSpeId") String equipSpeId);
 
-    List<Map<String, String>> getEquipExpiryStatistics(@Param("bizOrgCode") String bizOrgCode, @Param("expiryDayNum") Integer expiryDayNum);
+    List<Map<String, Object>> getEquipExpiryStatistics(@Param("bizOrgCode") String bizOrgCode, @Param("expiryDayNum") Integer expiryDayNum);
 
     Page<Map<String, String>> getEquipExpiryListByPage(@Param("page") Page page, @Param("bizOrgCode") String bizOrgCode, @Param("expiryDayNum") Integer expiryDayNum);
 

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

@@ -12,11 +12,7 @@ import com.yeejoin.amos.feign.morphic.model.ResourceDTO;
 import com.yeejoin.equipmanage.common.datasync.entity.FireFightingSystem;
 import com.yeejoin.equipmanage.common.entity.FireFightingSystemEntity;
 import com.yeejoin.equipmanage.common.entity.dto.EquipTypeAmountPageDTO;
-import com.yeejoin.equipmanage.common.entity.vo.EquipCountBySystemVO;
-import com.yeejoin.equipmanage.common.entity.vo.EquipTypeImgAmountVO;
-import com.yeejoin.equipmanage.common.entity.vo.EquiplistSpecificBySystemVO;
-import com.yeejoin.equipmanage.common.entity.vo.EquipmentAlarmBySystemIdOrSourceIdVO;
-import com.yeejoin.equipmanage.common.entity.vo.PointTreeVo;
+import com.yeejoin.equipmanage.common.entity.vo.*;
 import com.yeejoin.equipmanage.common.vo.*;
 
 public interface IFireFightingSystemService extends IService<FireFightingSystemEntity> {
@@ -288,7 +284,7 @@ public interface IFireFightingSystemService extends IService<FireFightingSystemE
 
     Page<Map<String, Object>> getSystemInfo(Page page, String companyCode, String systemCode);
 
-    List<Map<String, String>> getEquipExpiryStatistics(String bizOrgCode, Integer expiryDayNum);
+    List<Map<String, Object>> getEquipExpiryStatistics(String bizOrgCode, Integer expiryDayNum);
 
     Page<Map<String, String>> getEquipExpiryListByPage(String bizOrgCode, Integer expiryDayNum, Page page);
 

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

@@ -2001,8 +2001,12 @@ public class FireFightingSystemServiceImpl extends ServiceImpl<FireFightingSyste
     }
 
     @Override
-    public List<Map<String, String>> getEquipExpiryStatistics(String bizOrgCode, Integer expiryDayNum) {
-        return fireFightingSystemMapper.getEquipExpiryStatistics(bizOrgCode, expiryDayNum);
+    public List<Map<String, Object>> getEquipExpiryStatistics(String bizOrgCode, Integer expiryDayNum) {
+        List<Map<String, Object>> equipExpiryStatistics = fireFightingSystemMapper.getEquipExpiryStatistics(bizOrgCode, expiryDayNum);
+        equipExpiryStatistics.stream().forEach(item -> {
+            item.put("value", Integer.parseInt(item.get("value").toString()));
+        });
+        return equipExpiryStatistics;
     }
 
     @Override