和鲍工确认后的调整 1.状态描述 2碳源投加加入到记录表 3开关分开 4进水流量需要除以2 5配置表自增、删除状态默认值等

src/main/java/com/xlht/xlhtproject/controller/FrontController.java

@@ -78,13 +78,14 @@ public class FrontController {
      * @return
      */
     @GetMapping("/bigModel/smartAdd/getSwitchStatus")
-    public R<Integer> getSwitchStatus()
+    public R<TTbDu> getSwitchStatus()
     {
         log.info("进入了 获取碳源投加 是否在本系统中允许投放（用于部分场景：计算异常 或者 想手动中断等） 接口");
-        TTbDu tTbDu = tTbDuMapper.selectTTbDuByID(LONG_1);
+        /*TTbDu tTbDu = tTbDuMapper.selectTTbDuByID(LONG_1);
         if(Objects.isNull(tTbDu))
             throw new RuntimeException("未查询到碳源投放配置开关");
-        return R.ok(tTbDu.getACTIVE());
+        return R.ok(tTbDu.getACTIVE());*/
+        return R.ok(tTbDuMapper.selectTTbDuByID(LONG_1));
     }
 
 
@@ -96,7 +97,7 @@ public class FrontController {
     public R<String> updateSwitchStatus(@RequestBody TTbDu tTbDu)
     {
         log.info("进入了 修改碳源投加 是否在本系统中允许投放（用于部分场景：计算异常 或者 想手动中断等） 接口");
-        if(Objects.isNull(tTbDu.getACTIVE()))
+        if(Objects.isNull(tTbDu.getActiveOne()) && Objects.isNull(tTbDu.getActiveTwo()))
             throw new RuntimeException("请输入要更改的状态");
         tTbDu.setID(LONG_1);
         this.tTbDuMapper.updateTTbDu(tTbDu);

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

@@ -131,6 +131,12 @@ public class TShuju1
     /** 生物池进水正磷-化验时间 */
     private String jqrSwcZhenglinTime;
 
+    /** 1池投加流量 */
+    private Long tj1Ll;
+
+    /** 2池投加流量 */
+    private Long tj2Ll;
+
 
     /** 创建者 */
     private String createBy;

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

@@ -39,8 +39,11 @@ public class TTbDu
     /** 2池投加流量_更新时间 */
     private String c2TjLlTime;
 
-    /** 是否允许投放（0否  1是） */
-    private Integer ACTIVE;
+    /** 一池是否允许投放（0否  1是） */
+    private Long activeOne;
+
+    /** 二池是否允许投放（0否  1是） */
+    private Long activeTwo;
 
     /** 创建者 */
     private String createBy;

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

@@ -26,10 +26,11 @@ public class TTbXie
     private Long ID;
 
     /** 机器人化验状态 */
-    //todo 待确认具体状态
+    //0未化验  1化验中
     private Integer jqrZhuantai;
 
-    /** 机器人化验状态 */
+    /** 机器人报警状态 */
+    //0未报警 1报警中
     private Integer jqrBaojing;
 
     /** 机器人化验ID */

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

@@ -13,10 +13,11 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.math.RoundingMode;
 import java.util.*;
 import java.util.stream.Collectors;
 
-import static com.xlht.xlhtproject.enums.MyConstants.LONG_1;
+import static com.xlht.xlhtproject.enums.MyConstants.*;
 
 @Service
 @Slf4j
@@ -58,7 +59,7 @@ public class FrontServiceImpl implements IFrontService {
         if(BusinessEnum.SmartAddMedicineReqEnum.JSLL.getCode() == type){
             //查询仪表即可
             list = tShuju1List.stream()
-                    .map(o -> new ChartBasic(o.getTIME(), o.getScJsZll()))
+                    .map(o -> new ChartBasic(o.getTIME(), Objects.isNull(o.getScJsZll()) ? null : o.getScJsZll().divide(BigDecimal_2, NUMBER_SCALE_4, RoundingMode.HALF_UP)))
                     .collect(Collectors.toList());
             result.put(BusinessEnum.DataSourceEnum.YB.getCode(), list);
         }else if(BusinessEnum.SmartAddMedicineReqEnum.HY_1_XSY.getCode() == type){

src/main/resources/mapper/TShuju1Mapper.xml

@@ -3,7 +3,7 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.xlht.xlhtproject.mapper.TShuju1Mapper">
-    
+
     <resultMap type="TShuju1" id="TShuju1Result">
         <result property="ID"    column="ID"    />
         <result property="scJsZll"    column="SC_JS_ZLL"    />
@@ -41,17 +41,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="jqr2HyZhenglinTime"    column="JQR_2_HY_ZHENGLIN_TIME"    />
         <result property="jqrSwcZhenglin"    column="JQR_SWC_ZHENGLIN"    />
         <result property="jqrSwcZhenglinTime"    column="JQR_SWC_ZHENGLIN_TIME"    />
+        <result property="tj1Ll"    column="TJ_1_LL"    />
+        <result property="tj2Ll"    column="TJ_2_LL"    />
     </resultMap>
 
     <sql id="selectTShuju1Vo">
-        select ID, SC_JS_ZLL, SC_JS_COD, SC_JS_ZONGDAN, SC_JS_ANDAN, SC_JS_ZONGLIN, SC_CS_COD, SC_CS_ZONGDAN, SC_CS_ANDAN, SC_CS_ZONGLIN, SC_CS_ZLL, JQR_1_QY_ANDAN, JQR_1_QY_ANDAN_TIME, JQR_1_QY_XIAODAN, JQR_1_QY_XIAODAN_TIME, JQR_1_HY_ANDAN, JQR_1_HY_ANDAN_TIME, JQR_1_HY_XIAODAN, JQR_1_HY_XIAODAN_TIME, JQR_2_QY_ANDAN, JQR_2_QY_ANDAN_TIME, JQR_2_QY_XIAODAN, JQR_2_QY_XIAODAN_TIME, JQR_2_HY_ANDAN, JQR_2_HY_ANDAN_TIME, JQR_2_HY_XIAODAN, JQR_2_HY_XIAODAN_TIME, JQR_SWC_COD, JQR_SWC_COD_TIME, TIME, JQR_1_HY_ZHENGLIN, JQR_1_HY_ZHENGLIN_TIME, JQR_2_HY_ZHENGLIN, JQR_2_HY_ZHENGLIN_TIME, JQR_SWC_ZHENGLIN, JQR_SWC_ZHENGLIN_TIME from T_SHUJU_1
+        select ID, SC_JS_ZLL, SC_JS_COD, SC_JS_ZONGDAN, SC_JS_ANDAN, SC_JS_ZONGLIN, SC_CS_COD, SC_CS_ZONGDAN, SC_CS_ANDAN, SC_CS_ZONGLIN, SC_CS_ZLL, JQR_1_QY_ANDAN, JQR_1_QY_ANDAN_TIME, JQR_1_QY_XIAODAN, JQR_1_QY_XIAODAN_TIME, JQR_1_HY_ANDAN, JQR_1_HY_ANDAN_TIME, JQR_1_HY_XIAODAN, JQR_1_HY_XIAODAN_TIME, JQR_2_QY_ANDAN, JQR_2_QY_ANDAN_TIME, JQR_2_QY_XIAODAN, JQR_2_QY_XIAODAN_TIME, JQR_2_HY_ANDAN, JQR_2_HY_ANDAN_TIME, JQR_2_HY_XIAODAN, JQR_2_HY_XIAODAN_TIME, JQR_SWC_COD, JQR_SWC_COD_TIME, TIME, JQR_1_HY_ZHENGLIN, JQR_1_HY_ZHENGLIN_TIME, JQR_2_HY_ZHENGLIN, JQR_2_HY_ZHENGLIN_TIME, JQR_SWC_ZHENGLIN, JQR_SWC_ZHENGLIN_TIME, TJ_1_LL, TJ_2_LL from T_SHUJU_1
     </sql>
 
     <select id="selectTShuju1ByID" parameterType="Long" resultMap="TShuju1Result">
         <include refid="selectTShuju1Vo"/>
-        where ID = #{ID}
+        where ID = #{ID} and del_flag = 0
     </select>
-        
+
     <insert id="insertTShuju1" parameterType="TShuju1">
         insert into T_SHUJU_1
         <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -91,7 +93,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="jqr2HyZhenglinTime != null">JQR_2_HY_ZHENGLIN_TIME,</if>
             <if test="jqrSwcZhenglin != null">JQR_SWC_ZHENGLIN,</if>
             <if test="jqrSwcZhenglinTime != null">JQR_SWC_ZHENGLIN_TIME,</if>
-         </trim>
+            <if test="tj1Ll != null">TJ_1_LL,</if>
+            <if test="tj2Ll != null">TJ_2_LL,</if>
+        </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="ID != null">#{ID},</if>
             <if test="scJsZll != null">#{scJsZll},</if>
@@ -129,7 +133,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="jqr2HyZhenglinTime != null">#{jqr2HyZhenglinTime},</if>
             <if test="jqrSwcZhenglin != null">#{jqrSwcZhenglin},</if>
             <if test="jqrSwcZhenglinTime != null">#{jqrSwcZhenglinTime},</if>
-         </trim>
+            <if test="tj1Ll != null">#{tj1Ll},</if>
+            <if test="tj2Ll != null">#{tj2Ll},</if>
+        </trim>
     </insert>
 
     <update id="updateTShuju1" parameterType="TShuju1">
@@ -170,11 +176,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="jqr2HyZhenglinTime != null">JQR_2_HY_ZHENGLIN_TIME = #{jqr2HyZhenglinTime},</if>
             <if test="jqrSwcZhenglin != null">JQR_SWC_ZHENGLIN = #{jqrSwcZhenglin},</if>
             <if test="jqrSwcZhenglinTime != null">JQR_SWC_ZHENGLIN_TIME = #{jqrSwcZhenglinTime},</if>
+            <if test="tj1Ll != null">TJ_1_LL = #{tj1Ll},</if>
+            <if test="tj2Ll != null">TJ_2_LL = #{tj2Ll},</if>
         </trim>
+        ,revision = revision + 1
         where ID = #{ID}
     </update>
 
-    
+
 
     <delete id="deleteTShuju1ByID" parameterType="Long">
         update T_SHUJU_1 set del_flag = 2,revision = revision + 1 where del_flag = 0 and ID = #{ID}
@@ -191,7 +200,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <!-- 下面是新增的 -->
     <select id="getNewestData" resultType="com.xlht.xlhtproject.domain.SmartAdd">
         SELECT TOP
-            1 SC_JS_ZLL jslYB,
+            1 SC_JS_ZLL/2 jslYB,
                 SC_JS_COD jsCodYB,
                SC_JS_ZONGDAN jsTnYB,
                JQR_SWC_COD jsCodHY,
@@ -249,6 +258,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="jqr2HyZhenglinTime != null  and jqr2HyZhenglinTime != ''"> and JQR_2_HY_ZHENGLIN_TIME = #{jqr2HyZhenglinTime}</if>
             <if test="jqrSwcZhenglin != null "> and JQR_SWC_ZHENGLIN = #{jqrSwcZhenglin}</if>
             <if test="jqrSwcZhenglinTime != null  and jqrSwcZhenglinTime != ''"> and JQR_SWC_ZHENGLIN_TIME = #{jqrSwcZhenglinTime}</if>
+            <if test="tj1Ll != null "> and TJ_1_LL = #{tj1Ll}</if>
+            <if test="tj2Ll != null "> and TJ_2_LL = #{tj2Ll}</if>
             <!-- 下面是新增的SQL检索条件  SqlServer写法-->
             <if test="timeBegin != null  and timeBegin != ''"> and SUBSTRING (TIME, 1, 10 ) &gt;= #{timeBegin}</if>
             <if test="timeEnd != null  and timeEnd != ''"> and SUBSTRING (TIME, 1, 10 ) &lt;= #{timeEnd}</if>

src/main/resources/mapper/TTbDuMapper.xml

@@ -1,20 +1,21 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.xlht.xlhtproject.mapper.TTbDuMapper">
-    
+
     <resultMap type="TTbDu" id="TTbDuResult">
         <result property="ID"    column="ID"    />
         <result property="c1TjLl"    column="C1_TJ_LL"    />
         <result property="c1TjLlTime"    column="C1_TJ_LL_TIME"    />
         <result property="c2TjLl"    column="C2_TJ_LL"    />
         <result property="c2TjLlTime"    column="C2_TJ_LL_TIME"    />
-        <result property="ACTIVE"    column="ACTIVE"    />
+        <result property="activeOne"    column="ACTIVE_ONE"    />
+        <result property="activeTwo"    column="ACTIVE_TWO"    />
     </resultMap>
 
     <sql id="selectTTbDuVo">
-        select ID, C1_TJ_LL, C1_TJ_LL_TIME, C2_TJ_LL, C2_TJ_LL_TIME, ACTIVE from T_tb_du
+        select ID, C1_TJ_LL, C1_TJ_LL_TIME, C2_TJ_LL, C2_TJ_LL_TIME, ACTIVE_ONE, ACTIVE_TWO from T_tb_du
     </sql>
 
     <select id="selectTTbDuList" parameterType="TTbDu" resultMap="TTbDuResult">
@@ -25,16 +26,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="c1TjLlTime != null  and c1TjLlTime != ''"> and C1_TJ_LL_TIME = #{c1TjLlTime}</if>
             <if test="c2TjLl != null "> and C2_TJ_LL = #{c2TjLl}</if>
             <if test="c2TjLlTime != null  and c2TjLlTime != ''"> and C2_TJ_LL_TIME = #{c2TjLlTime}</if>
-            <if test="ACTIVE != null "> and ACTIVE = #{ACTIVE}</if>
+            <if test="activeOne != null "> and ACTIVE_ONE = #{activeOne}</if>
+            <if test="activeTwo != null "> and ACTIVE_TWO = #{activeTwo}</if>
         </where>
-        order by id desc
+        and del_flag = 0 order by id desc
     </select>
-    
+
     <select id="selectTTbDuByID" parameterType="Long" resultMap="TTbDuResult">
         <include refid="selectTTbDuVo"/>
-        where ID = #{ID}
+        where ID = #{ID} and del_flag = 0
     </select>
-        
+
     <insert id="insertTTbDu" parameterType="TTbDu">
         insert into T_tb_du
         <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -43,16 +45,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="c1TjLlTime != null">C1_TJ_LL_TIME,</if>
             <if test="c2TjLl != null">C2_TJ_LL,</if>
             <if test="c2TjLlTime != null">C2_TJ_LL_TIME,</if>
-            <if test="ACTIVE != null">ACTIVE,</if>
-         </trim>
+            <if test="activeOne != null">ACTIVE_ONE,</if>
+            <if test="activeTwo != null">ACTIVE_TWO,</if>
+        </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="ID != null">#{ID},</if>
             <if test="c1TjLl != null">#{c1TjLl},</if>
             <if test="c1TjLlTime != null">#{c1TjLlTime},</if>
             <if test="c2TjLl != null">#{c2TjLl},</if>
             <if test="c2TjLlTime != null">#{c2TjLlTime},</if>
-            <if test="ACTIVE != null">#{ACTIVE},</if>
-         </trim>
+            <if test="activeOne != null">#{activeOne},</if>
+            <if test="activeTwo != null">#{activeTwo},</if>
+        </trim>
     </insert>
 
     <update id="updateTTbDu" parameterType="TTbDu">
@@ -62,12 +66,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="c1TjLlTime != null">C1_TJ_LL_TIME = #{c1TjLlTime},</if>
             <if test="c2TjLl != null">C2_TJ_LL = #{c2TjLl},</if>
             <if test="c2TjLlTime != null">C2_TJ_LL_TIME = #{c2TjLlTime},</if>
-            <if test="ACTIVE != null">ACTIVE = #{ACTIVE},</if>
+            <if test="activeOne != null">ACTIVE_ONE = #{activeOne},</if>
+            <if test="activeTwo != null">ACTIVE_TWO = #{activeTwo},</if>
         </trim>
+        ,revision = revision + 1
         where ID = #{ID}
     </update>
 
-    
+
 
     <delete id="deleteTTbDuByID" parameterType="Long">
         update T_tb_du set del_flag = 2,revision = revision + 1 where del_flag = 0 and ID = #{ID}