投加必要条件:手动控制状态=true and 恒流控制状态=true and 远程就地=true

src/main/java/com/xlht/xlhtproject/domain/TTbXie.java

@@ -63,11 +63,22 @@ public class TTbXie
     private BigDecimal oneJYL;
     //2池（南池）加药泵流量反馈
     private BigDecimal twoJYL;
+
     //1池（北池）远程就地状态 1远程  0就地
     private Integer oneRemoteStatus;
     //2池（南池）远程就地状态 1远程  0就地
     private Integer twoRemoteStatus;
 
+    //1池（北池）恒流控制状态
+    private Integer oneHLStatus;
+    //2池（南池）恒流控制状态
+    private Integer twoHLStatus;
+
+    //1池（北池）手动控制状态
+    private Integer oneHandleStatus;
+    //2池（南池）手动控制状态
+    private Integer twoHandleStatus;
+
 
     /** 备注 */
     private String remark;

src/main/java/com/xlht/xlhtproject/domain/TXlhtMedicineParam.java

@@ -213,10 +213,18 @@ public class TXlhtMedicineParam
 
     //2024年10月08日11:37:38  新增的返回字段
 
-    //1池（北池）远程就地状态 1远程  0就地
+    /*//1池（北池）远程就地状态 1远程  0就地
     private Integer oneRemoteStatus;
     //2池（南池）远程就地状态 1远程  0就地
-    private Integer twoRemoteStatus;
+    private Integer twoRemoteStatus;*/
+
+
+
+    //一池投加运行方式(0组态不允许系统投放  1组态允许系统投放)
+    private Integer addTypeOne;
+
+    //二池投加运行方式(0组态不允许系统投放  1组态允许系统投放)
+    private Integer addTypeTwo;
 
     //请求参数
 

src/main/java/com/xlht/xlhtproject/service/impl/TXlhtMedicineParamServiceImpl.java

@@ -299,8 +299,24 @@ public class TXlhtMedicineParamServiceImpl implements ITXlhtMedicineParamService
             if(!Objects.isNull(tTbXie)){
                 latestRecord.setTytjTransientLLOne(tTbXie.getOneJYL());
                 latestRecord.setTytjTransientLLTwo(tTbXie.getTwoJYL());
-                latestRecord.setOneRemoteStatus(tTbXie.getOneRemoteStatus());
-                latestRecord.setTwoRemoteStatus(tTbXie.getTwoRemoteStatus());
+
+                Integer oneRemoteStatus = tTbXie.getOneRemoteStatus();
+                Integer oneHLStatus = tTbXie.getOneHLStatus();
+                Integer oneHandleStatus = tTbXie.getOneHandleStatus();
+                if(!Objects.isNull(oneRemoteStatus) && oneRemoteStatus == 1 && !Objects.isNull(oneHLStatus) && oneHLStatus == 1 && !Objects.isNull(oneHandleStatus) && oneHandleStatus == 1){
+                    latestRecord.setAddTypeOne(1);
+                }else {
+                    latestRecord.setAddTypeOne(0);
+                }
+
+                Integer twoRemoteStatus = tTbXie.getTwoRemoteStatus();
+                Integer twoHLStatus = tTbXie.getTwoHLStatus();
+                Integer twoHandleStatus = tTbXie.getTwoHandleStatus();
+                if(!Objects.isNull(twoRemoteStatus) && twoRemoteStatus == 1 && !Objects.isNull(twoHLStatus) && twoHLStatus == 1 && !Objects.isNull(twoHandleStatus) && twoHandleStatus == 1){
+                    latestRecord.setAddTypeTwo(1);
+                }else{
+                    latestRecord.setAddTypeTwo(0);
+                }
             }
 
         }

src/main/resources/mapper/TTbXieMapper.xml

@@ -15,10 +15,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="twoJYL"    column="jyj_zt_jyb_llfk_2"    />
         <result property="oneRemoteStatus"    column="jyj_zt_yuangcheng_1"    />
         <result property="twoRemoteStatus"    column="jyj_zt_yuangcheng_2"    />
+        <result property="oneHLStatus"    column="jyj_zt_hengliu_1"    />
+        <result property="twoHLStatus"    column="jyj_zt_hengliu_2"    />
+        <result property="oneHandleStatus"    column="jyj_zt_shoudong_1"    />
+        <result property="twoHandleStatus"    column="jyj_zt_shoudong_2"    />
     </resultMap>
 
     <sql id="selectTTbXieVo">
-        select ID, jqr_zhuantai, jqr_baojing, jqr_ID, jqr_lc_ID, jqr_lc_bj, jyj_zt_jyb_llfk_1, jyj_zt_jyb_llfk_2, jyj_zt_yuangcheng_1, jyj_zt_yuangcheng_2 from T_tb_xie
+        select ID, jqr_zhuantai, jqr_baojing, jqr_ID, jqr_lc_ID, jqr_lc_bj, jyj_zt_jyb_llfk_1, jyj_zt_jyb_llfk_2, jyj_zt_yuangcheng_1,jyj_zt_yuangcheng_2,jyj_zt_hengliu_1,jyj_zt_hengliu_2,jyj_zt_shoudong_1,jyj_zt_shoudong_2  from T_tb_xie
     </sql>
 
     <select id="selectTTbXieList" parameterType="TTbXie" resultMap="TTbXieResult">