1.真实投药量改成从t_tb_xie表获取 2.获取最新一条配置信息时，额外返回远程就地状态

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

@@ -6,6 +6,7 @@ import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.math.BigDecimal;
 import java.util.Date;
 
 /**
@@ -56,6 +57,18 @@ public class TTbXie
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date updateTime;
 
+    //2024年10月08日11:20:21  新增字段
+
+    //1池（北池）加药泵流量反馈
+    private BigDecimal oneJYL;
+    //2池（南池）加药泵流量反馈
+    private BigDecimal twoJYL;
+    //1池（北池）远程就地状态 1远程  0就地
+    private Integer oneRemoteStatus;
+    //2池（南池）远程就地状态 1远程  0就地
+    private Integer twoRemoteStatus;
+
+
     /** 备注 */
     private String remark;
 

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

@@ -211,6 +211,13 @@ public class TXlhtMedicineParam
     /** 备注 */
     private String remark;
 
+    //2024年10月08日11:37:38  新增的返回字段
+
+    //1池（北池）远程就地状态 1远程  0就地
+    private Integer oneRemoteStatus;
+    //2池（南池）远程就地状态 1远程  0就地
+    private Integer twoRemoteStatus;
+
     //请求参数
 
     /**  开始时间 */

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

@@ -3,9 +3,11 @@ package com.xlht.xlhtproject.service.impl;
 
 import com.xlht.xlhtproject.domain.SmartAdd;
 import com.xlht.xlhtproject.domain.TTbDu;
+import com.xlht.xlhtproject.domain.TTbXie;
 import com.xlht.xlhtproject.domain.TXlhtMedicineParam;
 import com.xlht.xlhtproject.mapper.TShuju1Mapper;
 import com.xlht.xlhtproject.mapper.TTbDuMapper;
+import com.xlht.xlhtproject.mapper.TTbXieMapper;
 import com.xlht.xlhtproject.mapper.TXlhtMedicineParamMapper;
 import com.xlht.xlhtproject.service.ITXlhtMedicineParamService;
 import com.xlht.xlhtproject.utils.CalculateUtils;
@@ -43,6 +45,9 @@ public class TXlhtMedicineParamServiceImpl implements ITXlhtMedicineParamService
     @Autowired
     private TTbDuMapper tTbDuMapper;
 
+    @Autowired
+    private TTbXieMapper tTbXieMapper;
+
 
     /**
      * 查询智能投药参数设置
@@ -285,10 +290,17 @@ public class TXlhtMedicineParamServiceImpl implements ITXlhtMedicineParamService
             }
             latestRecord.setMedicineAmountTwo(val2);
             //获取2个池子的瞬时投药流量
-            TTbDu tTbDu = tTbDuMapper.selectTTbDuByID(LONG_1);
+            /*TTbDu tTbDu = tTbDuMapper.selectTTbDuByID(LONG_1);
             if(!Objects.isNull(tTbDu)){
                 latestRecord.setTytjTransientLLOne(tTbDu.getC1TjLl());
                 latestRecord.setTytjTransientLLTwo(tTbDu.getC2TjLl());
+            }*/
+            TTbXie tTbXie = this.tTbXieMapper.selectTTbXieByID(LONG_1);
+            if(!Objects.isNull(tTbXie)){
+                latestRecord.setTytjTransientLLOne(tTbXie.getOneJYL());
+                latestRecord.setTytjTransientLLTwo(tTbXie.getTwoJYL());
+                latestRecord.setOneRemoteStatus(tTbXie.getOneRemoteStatus());
+                latestRecord.setTwoRemoteStatus(tTbXie.getTwoRemoteStatus());
             }
 
         }

src/main/resources/mapper/TTbXieMapper.xml

@@ -11,10 +11,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="jqrId"    column="jqr_ID"    />
         <result property="jqrLcId"    column="jqr_lc_ID"    />
         <result property="jqrLcBj"    column="jqr_lc_bj"    />
+        <result property="oneJYL"    column="jyj_zt_jyb_llfk_1"    />
+        <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"    />
     </resultMap>
 
     <sql id="selectTTbXieVo">
-        select ID, jqr_zhuantai, jqr_baojing, jqr_ID, jqr_lc_ID, jqr_lc_bj 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 from T_tb_xie
     </sql>
 
     <select id="selectTTbXieList" parameterType="TTbXie" resultMap="TTbXieResult">