投加记录新增几个字段 方便展示

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

@@ -1073,6 +1073,14 @@ public class RyTask
             //2025年05月08日10:41:51 再额外记录下当时的控制系数和后台反馈设定【创哥的2个值】
             tXinyiMedicineAddRecord.setKzxs(medicineRemote.getKzxs());
             tXinyiMedicineAddRecord.setHtfksd(medicineRemote.getHtfksd());
+            //2025年05月09日18:02:34 额外存储其其他的新增字段
+            tXinyiMedicineAddRecord.setRelativeId(medicineRemote.getRelativeId());
+            tXinyiMedicineAddRecord.setOneKzxs(medicineRemote.getOneKzxs());
+            tXinyiMedicineAddRecord.setTwoKzxs(medicineRemote.getTwoKzxs());
+            tXinyiMedicineAddRecord.setOneHtfksd(medicineRemote.getOneHtfksd());
+            tXinyiMedicineAddRecord.setTwoHtfksd(medicineRemote.getTwoHtfksd());
+            tXinyiMedicineAddRecord.setOneVal(medicineRemote.getOneVal());
+            tXinyiMedicineAddRecord.setTwoVal(medicineRemote.getTwoVal());
             tinyiMedicineAddRecordMapper.insertTXinyiMedicineAddRecord(tXinyiMedicineAddRecord);
         }
         log.info(" 定时计算投药 定时任务处理 结束------");

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

@@ -1,6 +1,7 @@
 package com.slibra.business.res;
 
 
+import com.slibra.common.annotation.Excel;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -25,5 +26,35 @@ public class MedicineRemote {
 
     private Integer addPool;//真实的投药池子（自动的话，2选1）0一池 1二池
 
+    //2025年05月09日17:41:38 额外存储的字段
+
+    /** 采用控制系数ID */
+    @Excel(name = "采用控制系数ID")
+    private Long relativeId;
+
+    /** 1池控制系数 */
+    @Excel(name = "1池控制系数")
+    private BigDecimal oneKzxs;
+
+    /** 2池控制系数 */
+    @Excel(name = "2池控制系数")
+    private BigDecimal twoKzxs;
+
+    /** 1池后反馈设定 */
+    @Excel(name = "1池后反馈设定")
+    private BigDecimal oneHtfksd;
+
+    /** 2池后反馈设定 */
+    @Excel(name = "2池后反馈设定")
+    private BigDecimal twoHtfksd;
+
+    /** 1池碳源投加值 */
+    @Excel(name = "1池碳源投加值")
+    private BigDecimal oneVal;
+
+    /** 2池碳源投加值 */
+    @Excel(name = "2池碳源投加值")
+    private BigDecimal twoVal;
+
 
 }

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

@@ -229,6 +229,8 @@ public class TXinyiMedicineParamServiceImpl implements ITXinyiMedicineParamServi
      * 6.创哥返回的后反馈设定 HTFKSD 自动就取最大值，非自动选哪个池子就返回哪个的
      * @param param
      * @return
+     *
+     * 2025年05月09日17:40:26 逻辑调整，此方法不仅返回上面的相关字段，额外返回一下字段用于存储投加记录汇总（比如一池的控制系数 一池计算的结果等等）
      */
     public MedicineRemote calculateMedicineByLastRecord(TXinyiMedicineParam param) {
         MedicineRemote medicineRemote = new MedicineRemote();
@@ -358,7 +360,11 @@ public class TXinyiMedicineParamServiceImpl implements ITXinyiMedicineParamServi
         }
 
 
-
+        //公共参数处理
+        medicineRemote.setOneKzxs(kzxs1);
+        medicineRemote.setTwoKzxs(kzxs2);
+        medicineRemote.setOneHtfksd(htfksd1);
+        medicineRemote.setTwoHtfksd(htfksd2);
 
 
         //计算
@@ -376,6 +382,9 @@ public class TXinyiMedicineParamServiceImpl implements ITXinyiMedicineParamServi
             BigDecimal oneResult = this.getResultByDiff(hycXsyType, hycXsyOne, htfksd1, qycAdType, qycAdOne, qycYxyType, qycYxyOne, xzxs, jzxs, jsLlType, jsLlOne, slfpxs, kzxs1, jsCodType, jsCodOne, zhxs, tydl, "one", yymd, sxps, tXinyiTytjParams);
             //计算二号池的值
             BigDecimal twoResult = this.getResultByDiff(hycXsyType, hycXsyTwo, htfksd2, qycAdType, qycAdTwo, qycYxyType, qycYxyTwo, xzxs, jzxs, jsLlType, jsLlTwo, slfpxs, kzxs2, jsCodType, jsCodTwo, zhxs, tydl, "two", yymd, sxps, tXinyiTytjParams);
+            //公共参数处理
+            medicineRemote.setOneVal(oneResult);
+            medicineRemote.setTwoVal(twoResult);
             //判断，返回值
             if(0 == type){
                 medicineRemote.setChoosePool(2);
@@ -385,12 +394,16 @@ public class TXinyiMedicineParamServiceImpl implements ITXinyiMedicineParamServi
                         medicineRemote.setCalculateVal(oneResult);
                         medicineRemote.setHtfksd(htfksd1);
                         medicineRemote.setKzxs(kzxs1);
+                        //2025年05月09日17:52:35 额外存储其他值
+                        medicineRemote.setRelativeId(autoFeedback1.getId());
                         return medicineRemote;
                     }else{
                         medicineRemote.setAddPool(1);
                         medicineRemote.setCalculateVal(twoResult);
                         medicineRemote.setHtfksd(htfksd2);
                         medicineRemote.setKzxs(kzxs2);
+                        //2025年05月09日17:52:35 额外存储其他值
+                        medicineRemote.setRelativeId(autoFeedback2.getId());
                         return medicineRemote;
                     }
                 }
@@ -401,6 +414,8 @@ public class TXinyiMedicineParamServiceImpl implements ITXinyiMedicineParamServi
                 medicineRemote.setCalculateVal(oneResult);
                 medicineRemote.setHtfksd(htfksd1);
                 medicineRemote.setKzxs(kzxs1);
+                //2025年05月09日17:52:35 额外存储其他值
+                medicineRemote.setRelativeId(autoFeedback1.getId());
                 return medicineRemote;
             }else if(2 == type){
                 medicineRemote.setChoosePool(1);
@@ -408,6 +423,8 @@ public class TXinyiMedicineParamServiceImpl implements ITXinyiMedicineParamServi
                 medicineRemote.setCalculateVal(twoResult);
                 medicineRemote.setHtfksd(htfksd2);
                 medicineRemote.setKzxs(kzxs2);
+                //2025年05月09日17:52:35 额外存储其他值
+                medicineRemote.setRelativeId(autoFeedback2.getId());
                 return medicineRemote;
             }
             else {