Explorar o código

计算碳源投加的时候 每小时投药额外记录创哥的2个值

王苗苗 hai 2 días
pai
achega
d546fcf1b0

+ 3 - 0
slibra-quartz/src/main/java/com/slibra/quartz/task/RyTask.java

@@ -1070,6 +1070,9 @@ public class RyTask
             }
             //2025年05月07日17:22:13 额外在记录组态是否允许投放 todo 对接组态以后,用真实值
             tXinyiMedicineAddRecord.setCanAdd(Math.random() < 0.5);
+            //2025年05月08日10:41:51 再额外记录下当时的控制系数和后台反馈设定【创哥的2个值】
+            tXinyiMedicineAddRecord.setKzxs(medicineRemote.getKzxs());
+            tXinyiMedicineAddRecord.setHtfksd(medicineRemote.getHtfksd());
             tinyiMedicineAddRecordMapper.insertTXinyiMedicineAddRecord(tXinyiMedicineAddRecord);
         }
         log.info(" 定时计算投药 定时任务处理 结束------");

+ 24 - 0
slibra-system/src/main/java/com/slibra/business/domain/TXinyiMedicineAddRecord.java

@@ -47,6 +47,14 @@ public class TXinyiMedicineAddRecord extends BaseEntity
     @Excel(name = "质控值下限")
     private BigDecimal zkzUp;
 
+    /** 控制系数 */
+    @Excel(name = "控制系数")
+    private BigDecimal kzxs;
+
+    /** 后台反馈设定 */
+    @Excel(name = "后台反馈设定")
+    private BigDecimal htfksd;
+
     /** 组态是否允许投放 */
     @Excel(name = "组态是否允许投放")
     private Boolean canAdd;
@@ -58,6 +66,22 @@ public class TXinyiMedicineAddRecord extends BaseEntity
     @Excel(name = "乐观锁")
     private Long revision;
 
+    public BigDecimal getKzxs() {
+        return kzxs;
+    }
+
+    public void setKzxs(BigDecimal kzxs) {
+        this.kzxs = kzxs;
+    }
+
+    public BigDecimal getHtfksd() {
+        return htfksd;
+    }
+
+    public void setHtfksd(BigDecimal htfksd) {
+        this.htfksd = htfksd;
+    }
+
     public Boolean getCanAdd() {
         return canAdd;
     }

+ 11 - 1
slibra-system/src/main/resources/mapper/business/TXinyiMedicineAddRecordMapper.xml

@@ -13,6 +13,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="realVal"    column="real_val"    />
         <result property="zkzDown"    column="zkz_down"    />
         <result property="zkzUp"    column="zkz_up"    />
+        <result property="kzxs"    column="kzxs"    />
+        <result property="htfksd"    column="htfksd"    />
         <result property="canAdd"    column="can_add"    />
         <result property="delFlag"    column="del_flag"    />
         <result property="revision"    column="revision"    />
@@ -24,7 +26,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectTXinyiMedicineAddRecordVo">
-        select id, add_hour, choose_pool, add_pool, calculate_val, real_val, zkz_down, zkz_up, can_add, del_flag, revision, create_by, create_time, update_by, update_time, remark from t_xinyi_medicine_add_record
+        select id, add_hour, choose_pool, add_pool, calculate_val, real_val, zkz_down, zkz_up, kzxs, htfksd, can_add, del_flag, revision, create_by, create_time, update_by, update_time, remark from t_xinyi_medicine_add_record
     </sql>
 
     <select id="selectTXinyiMedicineAddRecordList" parameterType="TXinyiMedicineAddRecord" resultMap="TXinyiMedicineAddRecordResult">
@@ -38,6 +40,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="realVal != null "> and real_val = #{realVal}</if>
             <if test="zkzDown != null "> and zkz_down = #{zkzDown}</if>
             <if test="zkzUp != null "> and zkz_up = #{zkzUp}</if>
+            <if test="kzxs != null "> and kzxs = #{kzxs}</if>
+            <if test="htfksd != null "> and htfksd = #{htfksd}</if>
             <if test="canAdd != null "> and can_add = #{canAdd}</if>
             <if test="revision != null "> and revision = #{revision}</if>
         </where>
@@ -59,6 +63,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="realVal != null">real_val,</if>
             <if test="zkzDown != null">zkz_down,</if>
             <if test="zkzUp != null">zkz_up,</if>
+            <if test="kzxs != null">kzxs,</if>
+            <if test="htfksd != null">htfksd,</if>
             <if test="canAdd != null">can_add,</if>
             <if test="delFlag != null">del_flag,</if>
             <if test="revision != null">revision,</if>
@@ -76,6 +82,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="realVal != null">#{realVal},</if>
             <if test="zkzDown != null">#{zkzDown},</if>
             <if test="zkzUp != null">#{zkzUp},</if>
+            <if test="kzxs != null">#{kzxs},</if>
+            <if test="htfksd != null">#{htfksd},</if>
             <if test="canAdd != null">#{canAdd},</if>
             <if test="delFlag != null">#{delFlag},</if>
             <if test="revision != null">#{revision},</if>
@@ -97,6 +105,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="realVal != null">real_val = #{realVal},</if>
             <if test="zkzDown != null">zkz_down = #{zkzDown},</if>
             <if test="zkzUp != null">zkz_up = #{zkzUp},</if>
+            <if test="kzxs != null">kzxs = #{kzxs},</if>
+            <if test="htfksd != null">htfksd = #{htfksd},</if>
             <if test="canAdd != null">can_add = #{canAdd},</if>
             <if test="delFlag != null">del_flag = #{delFlag},</if>
             <if test="revision != null">revision = #{revision},</if>