生化报警的列表新增字段 带单位的值

slibra-admin/src/main/java/com/slibra/web/controller/business/FrontController.java

@@ -8,9 +8,12 @@ import com.slibra.business.mapper.*;
 import com.slibra.business.req.ChatReq;
 import com.slibra.business.req.WorkOrderReq;
 import com.slibra.business.service.IFrontService;
+import com.slibra.common.DecimalUtils;
+import com.slibra.common.constant.MyConstants;
 import com.slibra.common.core.controller.BaseController;
 import com.slibra.common.core.domain.AjaxResult;
 import com.slibra.common.core.page.TableDataInfo;
+import com.slibra.common.enums.BusinessEnum;
 import com.slibra.common.exception.ServiceException;
 import com.slibra.common.utils.DateUtils;
 import com.slibra.common.utils.SecurityUtils;
@@ -21,6 +24,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.*;
 
+import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;
 import java.util.Objects;
@@ -213,10 +217,47 @@ public class FrontController extends BaseController {
                     endDate = DateUtils.getNowDate();
                 }
                 tXinyiWarningRecord.setCounts(Math.min(DateUtils.differentHoursByMillisecond(tXinyiWarningRecord.getTime(), endDate) + 1, MAX_COUNT));
+
+                //2024年7月11日13:36:41 新增处理，返回带单位的报警值（目前只处理生化报警的）
+                if(1 == tXinyiWarningRecord.getType())
+                    tXinyiWarningRecord.setWarningValStr(this.getWarningValStr(tXinyiWarningRecord.getWarningVal(), tXinyiWarningRecord.getCategory()));
             }
         }
     }
 
+    private String getWarningValStr(BigDecimal warningVal, String category) {
+        BigDecimal absAndScale = DecimalUtils.getAbsAndScale(warningVal, MyConstants.INT_2);
+        if(BusinessEnum.WarningCategoryEnum.NHLB.getCode().equals(category))
+            return absAndScale + BusinessEnum.BigModelUnitEnum.PERCENT.getCode();
+        if(BusinessEnum.WarningCategoryEnum.WNND_MLSS_1.getCode().equals(category))
+            return absAndScale + BusinessEnum.BigModelUnitEnum.MG_L.getCode();
+        if(BusinessEnum.WarningCategoryEnum.WNND_MLSS_2.getCode().equals(category))
+            return absAndScale + BusinessEnum.BigModelUnitEnum.MG_L.getCode();
+        if(BusinessEnum.WarningCategoryEnum.WNFH.getCode().equals(category))
+            return absAndScale + BusinessEnum.BigModelUnitEnum.KGBOD_KGMLSS_D.getCode();
+        if(BusinessEnum.WarningCategoryEnum.HFXWNNDZB.getCode().equals(category))
+            return absAndScale + BusinessEnum.BigModelUnitEnum.NULL.getCode();
+        if(BusinessEnum.WarningCategoryEnum.TDB.getCode().equals(category))
+            return absAndScale + BusinessEnum.BigModelUnitEnum.NULL.getCode();
+        if(BusinessEnum.WarningCategoryEnum.TLB.getCode().equals(category))
+            return absAndScale + BusinessEnum.BigModelUnitEnum.NULL.getCode();
+        if(BusinessEnum.WarningCategoryEnum.BODCODB.getCode().equals(category))
+            return absAndScale + BusinessEnum.BigModelUnitEnum.NULL.getCode();
+        if(BusinessEnum.WarningCategoryEnum.HYQDO_ONE.getCode().equals(category))
+            return absAndScale + BusinessEnum.BigModelUnitEnum.MG_L.getCode();
+        if(BusinessEnum.WarningCategoryEnum.HYQDO_TWO.getCode().equals(category))
+            return absAndScale + BusinessEnum.BigModelUnitEnum.MG_L.getCode();
+        if(BusinessEnum.WarningCategoryEnum.QSB.getCode().equals(category))
+            return absAndScale + BusinessEnum.BigModelUnitEnum.M3_M3.getCode();
+        if(BusinessEnum.WarningCategoryEnum.ECC_BMFH.getCode().equals(category))
+            return absAndScale + BusinessEnum.BigModelUnitEnum.M3_M2_H.getCode();
+        if(BusinessEnum.WarningCategoryEnum.ECC_GTFH.getCode().equals(category))
+            return absAndScale + BusinessEnum.BigModelUnitEnum.KG_M2_D.getCode();
+        if(BusinessEnum.WarningCategoryEnum.FCXSL.getCode().equals(category))
+            return absAndScale + BusinessEnum.BigModelUnitEnum.PERCENT.getCode();
+        return absAndScale + BusinessEnum.BigModelUnitEnum.NULL.getCode();
+    }
+
     /**
      * 获取 后台配置的智能助手列表
      * @return

slibra-system/src/main/java/com/slibra/business/domain/TXinyiWarningRecord.java

@@ -109,6 +109,9 @@ public class TXinyiWarningRecord extends BaseEntity
     //2024年5月26日18:17:45  额外返回给前端的字段
     private int counts;//报警次数。
 
+    //2024年7月11日13:37:40 额外返回给前端的字段
+    private String warningValStr;
+
     //请求参数
     private Integer warningStatus;//告警状态 0告警中  1历史告警