1.定时投加新记录3个值 2.投加记录新增组态反馈值

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

@@ -145,6 +145,9 @@ public class RyTask
     @Autowired
     private TXinyiMedicineAddRecordMapper tinyiMedicineAddRecordMapper;
 
+    @Autowired
+    private TXinyiTytjParamsMapper tXinyiTytjParamsMapper;
+
     /** 使用的是哪个环境 */
     @Value("${spring.profiles.active}")
     private String environment;
@@ -1047,6 +1050,26 @@ public class RyTask
             List<TXinyiIndustry> tXinyiIndustries = this.xinyiIndustryMapper.selectTXinyiIndustryList(TXinyiIndustry.builder().testHour(tXinyiMedicineAddRecord.getAddHour()).build());
             if(!CollectionUtils.isEmpty(tXinyiIndustries))
                 tXinyiMedicineAddRecord.setRealVal(tXinyiIndustries.get(0).getSJTYJLY());
+            //2025年05月07日17:12:55 新增新的逻辑处理 额外计算质控值下限值和质控值上限值
+            List<TXinyiTytjParams> tXinyiTytjParamsList = this.tXinyiTytjParamsMapper.selectTXinyiTytjParamsList(null);
+            if(!CollectionUtils.isEmpty(tXinyiTytjParamsList)){
+                TXinyiTytjParams tXinyiTytjParams = tXinyiTytjParamsList.get(0);
+                BigDecimal xsySub = tXinyiTytjParams.getXsySub();
+                BigDecimal xsyAdd = tXinyiTytjParams.getXsyAdd();
+                //兜底处理
+                if(Objects.isNull(xsySub))
+                    xsySub = BigDecimal.ZERO;
+                if(Objects.isNull(xsyAdd))
+                    xsyAdd = BigDecimal.ZERO;
+                //计算 处理结果
+                BigDecimal kzxs = medicineRemote.getKzxs();
+                if(Objects.isNull(kzxs))
+                    kzxs = BigDecimal.ZERO;
+                tXinyiMedicineAddRecord.setZkzDown(kzxs.subtract(xsySub));
+                tXinyiMedicineAddRecord.setZkzUp(kzxs.add(xsyAdd));
+            }
+            //2025年05月07日17:22:13 额外在记录组态是否允许投放 todo 对接组态以后，用真实值
+            tXinyiMedicineAddRecord.setCanAdd(Math.random() < 0.5);
             tinyiMedicineAddRecordMapper.insertTXinyiMedicineAddRecord(tXinyiMedicineAddRecord);
         }
         log.info(" 定时计算投药 定时任务处理 结束------");

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

@@ -47,6 +47,10 @@ public class TXinyiMedicineAddRecord extends BaseEntity
     @Excel(name = "质控值下限")
     private BigDecimal zkzUp;
 
+    /** 组态是否允许投放 */
+    @Excel(name = "组态是否允许投放")
+    private Boolean canAdd;
+
     /** 删除标志（0代表存在 2代表删除） */
     private Long delFlag;
 
@@ -54,6 +58,14 @@ public class TXinyiMedicineAddRecord extends BaseEntity
     @Excel(name = "乐观锁")
     private Long revision;
 
+    public Boolean getCanAdd() {
+        return canAdd;
+    }
+
+    public void setCanAdd(Boolean canAdd) {
+        this.canAdd = canAdd;
+    }
+
     public BigDecimal getZkzDown() {
         return zkzDown;
     }

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

@@ -13,6 +13,7 @@ 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="canAdd"    column="can_add"    />
         <result property="delFlag"    column="del_flag"    />
         <result property="revision"    column="revision"    />
         <result property="createBy"    column="create_by"    />
@@ -23,7 +24,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, 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, 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">
@@ -37,6 +38,7 @@ 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="canAdd != null "> and can_add = #{canAdd}</if>
             <if test="revision != null "> and revision = #{revision}</if>
         </where>
         and del_flag = 0 order by id desc
@@ -57,6 +59,7 @@ 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="canAdd != null">can_add,</if>
             <if test="delFlag != null">del_flag,</if>
             <if test="revision != null">revision,</if>
             <if test="createBy != null">create_by,</if>
@@ -73,6 +76,7 @@ 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="canAdd != null">#{canAdd},</if>
             <if test="delFlag != null">#{delFlag},</if>
             <if test="revision != null">#{revision},</if>
             <if test="createBy != null">#{createBy},</if>
@@ -93,6 +97,7 @@ 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="canAdd != null">can_add = #{canAdd},</if>
             <if test="delFlag != null">del_flag = #{delFlag},</if>
             <if test="revision != null">revision = #{revision},</if>
             <if test="createBy != null">create_by = #{createBy},</if>