修改鄱阳湖现场余量显示问题

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

@@ -30,6 +30,7 @@ import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
+import java.math.BigDecimal;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.*;
@@ -89,7 +90,14 @@ public class SupervisionConfigureController extends AbstractBaseController {
                 } else {
                     m.put("levelStatus", "--");
                 }
-                m.put("levelAbs", transResult.get("abs"));
+                m.put("abs", transResult.get("abs"));
+                if (!String.valueOf(transResult.get("abs")).equals("--") && !ObjectUtils.isEmpty(m.get("volume"))) {
+                    BigDecimal divide = new BigDecimal(100);
+                    BigDecimal bigDecimal = new BigDecimal(String.valueOf(m.get("volume"))).multiply(new BigDecimal(String.valueOf(transResult.get("abs")))).divide(divide, 0, BigDecimal.ROUND_HALF_UP);
+                    m.put("levelAbs", bigDecimal + "m³ " + " (" + transResult.get("abs") + "%)");
+                } else {
+                    m.put("levelAbs", transResult.get("abs"));
+                }
             }
         }
         return CommonResponseUtil.success(page1);

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

@@ -25,6 +25,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.ObjectUtils;
 
+import java.math.BigDecimal;
 import java.text.DecimalFormat;
 import java.text.ParseException;
 import java.util.*;
@@ -96,7 +97,13 @@ public class EmergencyServiceImpl implements IEmergencyService {
                 } else {
                     m.put("statusDesc", "--");
                 }
-                m.put("sxyl", transResult.get("abs"));
+                if (!String.valueOf(transResult.get("abs")).equals("--") && !ObjectUtils.isEmpty(m.get("volume"))) {
+                    BigDecimal divide = new BigDecimal(100);
+                    BigDecimal bigDecimal = new BigDecimal(String.valueOf(m.get("volume"))).multiply(new BigDecimal(String.valueOf(transResult.get("abs")))).divide(divide, 0, BigDecimal.ROUND_HALF_UP);
+                    m.put("sxyl", bigDecimal + "m³ " + " (" + transResult.get("abs") + "%)");
+                } else {
+                    m.put("sxyl", transResult.get("abs"));
+                }
             }
         }
         return Optional.ofNullable(list).orElse(Lists.newArrayList());
@@ -131,7 +138,13 @@ public class EmergencyServiceImpl implements IEmergencyService {
                 } else {
                     m.put("status", "--");
                 }
-                m.put("abs", transResult.get("abs"));
+                if (!String.valueOf(transResult.get("abs")).equals("--") && !ObjectUtils.isEmpty(m.get("volume"))) {
+                    BigDecimal divide = new BigDecimal(100);
+                    BigDecimal bigDecimal = new BigDecimal(String.valueOf(m.get("volume"))).multiply(new BigDecimal(String.valueOf(transResult.get("abs")))).divide(divide, 0, BigDecimal.ROUND_HALF_UP);
+                    m.put("abs", bigDecimal + "m³ " + " (" + transResult.get("abs") + "%)");
+                } else {
+                    m.put("abs", transResult.get("abs"));
+                }
             }
         }
         return page1;

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

@@ -45,7 +45,8 @@
         a.sxrj,
         a.`unit`,
         a.minLevel,
-        a.maxLevel
+        a.maxLevel,
+        a.volume
         FROM
         wl_equipment_specific wes
         LEFT JOIN (
@@ -58,7 +59,8 @@
         CASE
         WHEN ( SELECT IFNULL( wfie.field_value, 0 ) FROM wl_form_instance_equip wfie WHERE wfie.instance_id = wlesi.equipment_specific_id AND field_name = 'volume' ) <![CDATA[<>]]> 0 THEN
         CONCAT(( SELECT field_value FROM wl_form_instance_equip wfie WHERE wfie.instance_id = wlesi.equipment_specific_id AND field_name = 'volume' ),'m³') ELSE '--m³'
-        END AS sxrj
+        END AS sxrj,
+        (SELECT IFNULL( wfie.field_value, 0 ) FROM wl_form_instance_equip wfie WHERE wfie.instance_id = wlesi.equipment_specific_id AND field_name = 'volume') AS volume
         FROM
         wl_equipment_specific_index wlesi
         WHERE