代码优化

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

@@ -1866,7 +1866,7 @@ public class HandleDataController extends BaseController
                 chartBasic.setVal(DecimalUtils.getAbsAndScale(new BigDecimal(val), INT_2));
                 chartsDataList.add(chartBasic);
             }
-            ryTask.handleXinYiWarningsYC(cszzBzz, split, cszzGkz, BusinessEnum.WarningCategoryEnum.QYCXSY_1.getCode(), hour, normConfig, tXinyiRobot.getNo3Hlj2Jqr(), tXinyiIndustry, chartsDataList, date);
+//            ryTask.handleXinYiWarningsYC(cszzBzz, split, cszzGkz, BusinessEnum.WarningCategoryEnum.QYCXSY_1.getCode(), hour, normConfig, tXinyiRobot.getNo3Hlj2Jqr(), tXinyiIndustry, chartsDataList, date);
         }else if(BusinessEnum.BigModelForecastEnum.QYXSY2.getCode().equals(task)){
             //同时调用跃渊的预测接口 保存记录值
             /*try {
@@ -1901,7 +1901,7 @@ public class HandleDataController extends BaseController
                 chartBasic.setVal(DecimalUtils.getAbsAndScale(new BigDecimal(val), INT_2));
                 chartsDataList.add(chartBasic);
             }
-            ryTask.handleXinYiWarningsYC(cszzBzz, split, cszzGkz, BusinessEnum.WarningCategoryEnum.QYCXSY_2.getCode(), hour, normConfig, tXinyiRobot.getNo3Hlj2Jqr(), tXinyiIndustry, chartsDataList, date);
+//            ryTask.handleXinYiWarningsYC(cszzBzz, split, cszzGkz, BusinessEnum.WarningCategoryEnum.QYCXSY_2.getCode(), hour, normConfig, tXinyiRobot.getNo3Hlj2Jqr(), tXinyiIndustry, chartsDataList, date);
         }else if(BusinessEnum.BigModelForecastEnum.QYNH31.getCode().equals(task)){
             //同时调用跃渊的预测接口 保存记录值
             /*try {
@@ -1936,7 +1936,7 @@ public class HandleDataController extends BaseController
                 chartBasic.setVal(DecimalUtils.getAbsAndScale(new BigDecimal(val), INT_2));
                 chartsDataList.add(chartBasic);
             }
-            ryTask.handleXinYiWarningsYC(csadBzz, split, csadGkz, BusinessEnum.WarningCategoryEnum.QYAD_1.getCode(), hour, normConfig, tXinyiRobot.getNo3Hlj2Jqr(), tXinyiIndustry, chartsDataList, date);
+//            ryTask.handleXinYiWarningsYC(csadBzz, split, csadGkz, BusinessEnum.WarningCategoryEnum.QYAD_1.getCode(), hour, normConfig, tXinyiRobot.getNo3Hlj2Jqr(), tXinyiIndustry, chartsDataList, date);
         }else if(BusinessEnum.BigModelForecastEnum.QYNH32.getCode().equals(task)){
             //同时调用跃渊的预测接口 保存记录值
             /*try {
@@ -1971,7 +1971,7 @@ public class HandleDataController extends BaseController
                 chartBasic.setVal(DecimalUtils.getAbsAndScale(new BigDecimal(val), INT_2));
                 chartsDataList.add(chartBasic);
             }
-            ryTask.handleXinYiWarningsYC(csadBzz, split, csadGkz, BusinessEnum.WarningCategoryEnum.QYAD_2.getCode(), hour, normConfig, tXinyiRobot.getNo3Hlj2Jqr(), tXinyiIndustry, chartsDataList, date);
+//            ryTask.handleXinYiWarningsYC(csadBzz, split, csadGkz, BusinessEnum.WarningCategoryEnum.QYAD_2.getCode(), hour, normConfig, tXinyiRobot.getNo3Hlj2Jqr(), tXinyiIndustry, chartsDataList, date);
         }else {
             log.error("暂未支持的类型{}", task);
         }

slibra-quartz/src/main/java/com/slibra/quartz/task/RyTask.java

@@ -855,6 +855,11 @@ public class RyTask
             canAdd = true;
         }
         if(!Objects.isNull(val) && canAdd){
+            //2024年09月20日10:12:43 做个兜底处理，防止计算的结果是负数
+            if(val.compareTo(BigDecimal.ZERO) < 0){
+                log.info("计算得到的碳源投加量是负数，按0处理");
+                val = BigDecimal.ZERO;
+            }
             //todo 调用组态接口，实施碳源投加
             log.info("开始调用组态接口，实施碳源投加^^^^^^");
 
@@ -929,8 +934,11 @@ public class RyTask
             //计算二号池的值
             BigDecimal twoResult = this.getResultByDiff(hycXsyType, hycXsyTwo, htfksd, qycAdType, qycAdTwo, qycYxyType, qycYxyTwo, xzxs, jzxs, jsLlType, jsLlTwo, slfpxs, kzxs, jsCodType, jsCodTwo, zhxs, tydl, "two", yymd, sxps);
             //判断，返回值
-            if(0 == type)
-                return oneResult.compareTo(twoResult) > 0 ? oneResult : twoResult;
+            if(0 == type){
+                if(!Objects.isNull(oneResult) && !Objects.isNull(twoResult)){
+                    return oneResult.compareTo(twoResult) > 0 ? oneResult : twoResult;
+                }
+            }
             else if(1 == type) {
                 return oneResult;
             }else if(2 == type)
@@ -1582,7 +1590,7 @@ public class RyTask
                 chartBasic.setVal(DecimalUtils.getAbsAndScale(new BigDecimal(val), INT_2));
                 chartsDataList.add(chartBasic);
             }
-            handleXinYiWarningsYC(cszzBzz, split, cszzGkz, BusinessEnum.WarningCategoryEnum.QYCXSY_1.getCode(), hour, normConfig, tXinyiRobot.getNo3Hlj2Jqr(), tXinyiIndustry, chartsDataList, date);
+//            handleXinYiWarningsYC(cszzBzz, split, cszzGkz, BusinessEnum.WarningCategoryEnum.QYCXSY_1.getCode(), hour, normConfig, tXinyiRobot.getNo3Hlj2Jqr(), tXinyiIndustry, chartsDataList, date);
         }else if(BusinessEnum.BigModelForecastEnum.QYXSY2.getCode().equals(task)){
             //同时调用跃渊的预测接口 保存记录值
             /*try {
@@ -1617,7 +1625,7 @@ public class RyTask
                 chartBasic.setVal(DecimalUtils.getAbsAndScale(new BigDecimal(val), INT_2));
                 chartsDataList.add(chartBasic);
             }
-            handleXinYiWarningsYC(cszzBzz, split, cszzGkz, BusinessEnum.WarningCategoryEnum.QYCXSY_2.getCode(), hour, normConfig, tXinyiRobot.getNo3Hlj2Jqr(), tXinyiIndustry, chartsDataList, date);
+//            handleXinYiWarningsYC(cszzBzz, split, cszzGkz, BusinessEnum.WarningCategoryEnum.QYCXSY_2.getCode(), hour, normConfig, tXinyiRobot.getNo3Hlj2Jqr(), tXinyiIndustry, chartsDataList, date);
         }else if(BusinessEnum.BigModelForecastEnum.QYNH31.getCode().equals(task)){
             //同时调用跃渊的预测接口 保存记录值
             /*try {
@@ -1652,7 +1660,7 @@ public class RyTask
                 chartBasic.setVal(DecimalUtils.getAbsAndScale(new BigDecimal(val), INT_2));
                 chartsDataList.add(chartBasic);
             }
-            handleXinYiWarningsYC(csadBzz, split, csadGkz, BusinessEnum.WarningCategoryEnum.QYAD_1.getCode(), hour, normConfig, tXinyiRobot.getNo3Hlj2Jqr(), tXinyiIndustry, chartsDataList, date);
+//            handleXinYiWarningsYC(csadBzz, split, csadGkz, BusinessEnum.WarningCategoryEnum.QYAD_1.getCode(), hour, normConfig, tXinyiRobot.getNo3Hlj2Jqr(), tXinyiIndustry, chartsDataList, date);
         }else if(BusinessEnum.BigModelForecastEnum.QYNH32.getCode().equals(task)){
             //同时调用跃渊的预测接口 保存记录值
             /*try {
@@ -1687,7 +1695,7 @@ public class RyTask
                 chartBasic.setVal(DecimalUtils.getAbsAndScale(new BigDecimal(val), INT_2));
                 chartsDataList.add(chartBasic);
             }
-            handleXinYiWarningsYC(csadBzz, split, csadGkz, BusinessEnum.WarningCategoryEnum.QYAD_2.getCode(), hour, normConfig, tXinyiRobot.getNo3Hlj2Jqr(), tXinyiIndustry, chartsDataList, date);
+//            handleXinYiWarningsYC(csadBzz, split, csadGkz, BusinessEnum.WarningCategoryEnum.QYAD_2.getCode(), hour, normConfig, tXinyiRobot.getNo3Hlj2Jqr(), tXinyiIndustry, chartsDataList, date);
         }else {
             log.error("暂未支持的类型{}", task);
         }

slibra-system/src/main/java/com/slibra/business/res/SmartAdd.java

@@ -30,6 +30,8 @@ public class SmartAdd {
     private BigDecimal qyXsyHYTwo;//缺氧硝酸盐-化验-二池
     private BigDecimal qyAdHYTwo;//缺氧氨氮-化验-二池
 
+    private BigDecimal tytjzl;//2024年09月20日10:27:33 新增的字段，碳源投加总量
+
 
 //    private BigDecimal tdbJS;//碳氮比-计算
 

slibra-system/src/main/java/com/slibra/business/service/impl/FrontServiceImpl.java

@@ -403,6 +403,7 @@ public class FrontServiceImpl implements IFrontService {
             build.setJslYB(tXinyiIndustry.getJsSlq());
             build.setJsCodYB(tXinyiIndustry.getJsCod());
             build.setJsTnYB(tXinyiIndustry.getJsTn());
+            build.setTytjzl(tXinyiIndustry.getSJTYJLY());
         }
         //获取最新的化验室数据
         TXinyiRobot tXinyiRobot = this.xinyiRobotMapper.selectNewest();

slibra-system/src/main/java/com/slibra/business/service/impl/TXinyiMedicineParamServiceImpl.java

@@ -194,7 +194,13 @@ public class TXinyiMedicineParamServiceImpl implements ITXinyiMedicineParamServi
         if(!Objects.isNull(total) && !Objects.isNull(yymd) && yymd.compareTo(BigDecimal.ZERO) > 0){
             latestRecord.setTytjTransientLL(DecimalUtils.getNLengthHalfUp(total.divide(yymd, NUMBER_SCALE_10, RoundingMode.HALF_UP).divide(BigDecimal_1000, NUMBER_SCALE_10, RoundingMode.HALF_UP), INT_3));
         }*/
-        latestRecord.setMedicineAmount(this.calculateMedicineByLastRecord(latestRecord));
+        //2024年09月20日10:12:43 做个兜底处理，防止计算的结果是负数
+        BigDecimal val = this.calculateMedicineByLastRecord(latestRecord);
+        if(!Objects.isNull(val) && val.compareTo(BigDecimal.ZERO) < 0){
+            log.info("计算得到的碳源投加量是负数，按0处理");
+            val = BigDecimal.ZERO;
+        }
+        latestRecord.setMedicineAmount(val);
     }
 
 
@@ -255,8 +261,11 @@ public class TXinyiMedicineParamServiceImpl implements ITXinyiMedicineParamServi
             //计算二号池的值
             BigDecimal twoResult = this.getResultByDiff(hycXsyType, hycXsyTwo, htfksd, qycAdType, qycAdTwo, qycYxyType, qycYxyTwo, xzxs, jzxs, jsLlType, jsLlTwo, slfpxs, kzxs, jsCodType, jsCodTwo, zhxs, tydl, "two", yymd, sxps);
             //判断，返回值
-            if(0 == type)
-                return oneResult.compareTo(twoResult) > 0 ? oneResult : twoResult;
+            if(0 == type){
+                if(!Objects.isNull(oneResult) && !Objects.isNull(twoResult)){
+                    return oneResult.compareTo(twoResult) > 0 ? oneResult : twoResult;
+                }
+            }
             else if(1 == type) {
                 return oneResult;
             }else if(2 == type)

slibra-system/src/main/resources/mapper/business/TXinyiChatRecordMapper.xml

@@ -169,6 +169,6 @@
     <!-- 下面是手动新增的sql -->
     <select id="getLeastShortReport" resultMap="TXinyiChatRecordResult">
         <include refid="selectTXinyiChatRecordVo"/>
-        where module = 4 and del_flag = 0 limit 1
+        where module = 4 and del_flag = 0 order by id desc limit 1
     </select>
 </mapper>