日报新增3个字段 决策接口把新增的日报的干污泥量传过去

slibra-admin/src/main/java/com/slibra/web/controller/business/GRPCController.java

@@ -102,6 +102,8 @@ public class GRPCController extends BaseController {
                     decisionReq.setMlvss(daily.getHfxwnndAll());
                     decisionReq.setDoAna(daily.getYycRjyAll());
                     decisionReq.setDoQue(daily.getQycRjyAll());
+                    //2024年5月26日11:59:02 干污泥量数据做了同步
+                    decisionReq.setGwnl(daily.getGWNL());
                     BigDecimal jsBod5 = daily.getJsBod5();
                     decisionReq.setBodIn(jsBod5);
                     BigDecimal tpIn = decisionReq.getTpIn();
@@ -114,8 +116,6 @@ public class GRPCController extends BaseController {
                             decisionReq.setB(jsBod5.divide(tnIn, 4, RoundingMode.HALF_UP));
                         }
                     }
-
-
                 }
             }
         }

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

@@ -450,6 +450,8 @@ public class RyTask
                     decisionReq.setMlvss(daily.getHfxwnndAll());
                     decisionReq.setDoAna(daily.getYycRjyAll());
                     decisionReq.setDoQue(daily.getQycRjyAll());
+                    //2024年5月26日11:59:02 干污泥量数据做了同步
+                    decisionReq.setGwnl(daily.getGWNL());
                     BigDecimal jsBod5 = daily.getJsBod5();
                     decisionReq.setBodIn(jsBod5);
                     BigDecimal tpIn = decisionReq.getTpIn();
@@ -462,8 +464,6 @@ public class RyTask
                             decisionReq.setB(jsBod5.divide(tnIn, 4, RoundingMode.HALF_UP));
                         }
                     }
-
-
                 }
             }
         }

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

@@ -268,4 +268,17 @@ public class TXinyiDaily extends BaseEntity
     @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd")
     private Date createdTime;
 
+    //2024年5月26日11:54:08  新增的字段
+    /** 出泥量(m³) */
+    @Excel(name = "出泥量(m³)")
+    private BigDecimal CHUNILIANG;
+
+    /** 出泥含水率(%) */
+    @Excel(name = "出泥含水率(%)")
+    private BigDecimal CNHSL;
+
+    /** 干污泥量(m³) */
+    @Excel(name = "干污泥量(m³)")
+    private BigDecimal GWNL;
+
 }

slibra-system/src/main/java/com/slibra/business/req/DecisionReq.java

@@ -205,7 +205,7 @@ public class DecisionReq {
     private String qyckxsyAll;
 
     @JSONField(name = "gwnl")
-    private String gwnl;
+    private BigDecimal gwnl;
 
     @JSONField(name = "ecc_zl")
     private String eccZl;

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

@@ -66,10 +66,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="wntjzsAll"    column="WNTJZS_ALL"    />
         <result property="hfxwnndAll"    column="HFXWNND_ALL"    />
         <result property="createdTime"    column="CREATED_TIME"    />
+        <result property="CHUNILIANG"    column="CHUNILIANG"    />
+        <result property="CNHSL"    column="CNHSL"    />
+        <result property="GWNL"    column="GWNL"    />
     </resultMap>
 
     <sql id="selectTXinyiDailyVo">
-        select ID, TEST_DATE, TEST_HOUR, TEST_TIME, SORT, JS_COD, JS_PH, JS_BOD5, JS_SS, JS_NH3, JS_TN, JS_TP, JS_DCGJ, CS_COD, CS_PH, CS_BOD5, CS_SS, CS_NH3, CS_TN, CS_TP, CS_DCGJ, JS_SW, CS_SW, SHC_ONE_PH, SHC_TWO_PH, SHC_HY_ONE_SV, SHC_HY_TWO_SV, SHC_HY_ONE_SVI, SHC_HY_TWO_SVI, SHC_HY_ONE_MLSS, SHC_HY_TWO_MLSS, SHC_HY_ONE_MLVSS, SHC_HY_TWO_MLVSS, SHC_YY_ONE_DO, SHC_YY_TWO_DO, SHC_QY_ONE_DO, SHC_QY_TWO_DO, SHC_HY_ONE_DO, SHC_HY_TWO_DO, JSL, CSL, SDCLCXSL, QSB, F_M, YY_HRT, HY_HRT, QY_HRT, NHL_R, WHL_R, SRT, CNL, TYQ_BOD5_TN, TYH_BOD5_TN, HYC_RJY_ALL, HYC_WNND_ALL, YYC_RJY_ALL, QYC_RJY_ALL, WNCJB_ALL, WNTJZS_ALL, HFXWNND_ALL, CREATED_TIME from t_xinyi_daily
+        select ID, TEST_DATE, TEST_HOUR, TEST_TIME, SORT, JS_COD, JS_PH, JS_BOD5, JS_SS, JS_NH3, JS_TN, JS_TP, JS_DCGJ, CS_COD, CS_PH, CS_BOD5, CS_SS, CS_NH3, CS_TN, CS_TP, CS_DCGJ, JS_SW, CS_SW, SHC_ONE_PH, SHC_TWO_PH, SHC_HY_ONE_SV, SHC_HY_TWO_SV, SHC_HY_ONE_SVI, SHC_HY_TWO_SVI, SHC_HY_ONE_MLSS, SHC_HY_TWO_MLSS, SHC_HY_ONE_MLVSS, SHC_HY_TWO_MLVSS, SHC_YY_ONE_DO, SHC_YY_TWO_DO, SHC_QY_ONE_DO, SHC_QY_TWO_DO, SHC_HY_ONE_DO, SHC_HY_TWO_DO, JSL, CSL, SDCLCXSL, QSB, F_M, YY_HRT, HY_HRT, QY_HRT, NHL_R, WHL_R, SRT, CNL, TYQ_BOD5_TN, TYH_BOD5_TN, HYC_RJY_ALL, HYC_WNND_ALL, YYC_RJY_ALL, QYC_RJY_ALL, WNCJB_ALL, WNTJZS_ALL, HFXWNND_ALL, CREATED_TIME, CHUNILIANG, CNHSL, GWNL from t_xinyi_daily
     </sql>
 
     <select id="selectTXinyiDailyList" parameterType="TXinyiDaily" resultMap="TXinyiDailyResult">
@@ -135,6 +138,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="wntjzsAll != null  and wntjzsAll != ''"> and WNTJZS_ALL = #{wntjzsAll}</if>
             <if test="hfxwnndAll != null  and hfxwnndAll != ''"> and HFXWNND_ALL = #{hfxwnndAll}</if>
             <if test="createdTime != null "> and CREATED_TIME = #{createdTime}</if>
+            <if test="CHUNILIANG != null "> and CHUNILIANG = #{CHUNILIANG}</if>
+            <if test="CNHSL != null "> and CNHSL = #{CNHSL}</if>
+            <if test="GWNL != null "> and GWNL = #{GWNL}</if>
         </where>
         order by id desc
     </select>
@@ -207,7 +213,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="wntjzsAll != null">WNTJZS_ALL,</if>
             <if test="hfxwnndAll != null">HFXWNND_ALL,</if>
             <if test="createdTime != null">CREATED_TIME,</if>
-         </trim>
+            <if test="CHUNILIANG != null">CHUNILIANG,</if>
+            <if test="CNHSL != null">CNHSL,</if>
+            <if test="GWNL != null">GWNL,</if>
+        </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="testDate != null">#{testDate},</if>
             <if test="testHour != null">#{testHour},</if>
@@ -269,7 +278,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="wntjzsAll != null">#{wntjzsAll},</if>
             <if test="hfxwnndAll != null">#{hfxwnndAll},</if>
             <if test="createdTime != null">#{createdTime},</if>
-         </trim>
+            <if test="CHUNILIANG != null">#{CHUNILIANG},</if>
+            <if test="CNHSL != null">#{CNHSL},</if>
+            <if test="GWNL != null">#{GWNL},</if>
+        </trim>
     </insert>
 
     <update id="updateTXinyiDaily" parameterType="TXinyiDaily">
@@ -335,6 +347,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="wntjzsAll != null">WNTJZS_ALL = #{wntjzsAll},</if>
             <if test="hfxwnndAll != null">HFXWNND_ALL = #{hfxwnndAll},</if>
             <if test="createdTime != null">CREATED_TIME = #{createdTime},</if>
+            <if test="CHUNILIANG != null">CHUNILIANG = #{CHUNILIANG},</if>
+            <if test="CNHSL != null">CNHSL = #{CNHSL},</if>
+            <if test="GWNL != null">GWNL = #{GWNL},</if>
         </trim>
         where ID = #{ID}
     </update>
@@ -344,7 +359,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </delete>
 
     <delete id="deleteTXinyiDailyByIDs" parameterType="String">
-        delete from t_xinyi_daily where ID in 
+        delete from t_xinyi_daily where ID in
         <foreach item="ID" collection="array" open="(" separator="," close=")">
             #{ID}
         </foreach>

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

@@ -427,7 +427,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
 
-    <!-- todo 数据加字段  gwnl-->
+    <!-- todo 以后不用sql拼接实验室数据 处理历史数据并新增字段，直接获取 另外把关联查询改成在java代码中处理 -->
     <select id="selectLast10RecordsForDecisionOnlyIndustry" resultType="com.slibra.business.req.DecisionReq">
         SELECT
             a.ID ID,