LY sems bug

master/src/main/java/com/ruoyi/common/thread/SpecDevYlrqThread.java

@@ -17,7 +17,7 @@ public class SpecDevYlrqThread implements Runnable {
     @Override
     public void run() {
         List<TSpecdevYlrq> list = this.specdevYlrqService.list(new QueryWrapper<TSpecdevYlrq>()
-                .eq("del_flag", 0).eq("status", "1"));
+                .eq("del_flag", 0));
         /*boolean flag = false;
         List<String> collect = list.stream().map(e -> {
             return flag ? e.getPlantCode() : e.getDevno();
@@ -32,6 +32,7 @@ public class SpecDevYlrqThread implements Runnable {
             this.specdevYlrqService.updateTSpecdevYlrq(tSpecdevYlrq);
         }*/
         for (TSpecdevYlrq t : list) {
+            System.out.println("=======压力管道更新=====================================");
             t.setIsRepeat(0L);
             this.specdevYlrqService.updateTSpecdevYlrq(t);
         }
@@ -43,7 +44,9 @@ public class SpecDevYlrqThread implements Runnable {
                 }
                 if (tSpecdevYlrq.getDevno().equals(specdevYlrq.getDevno()) && tSpecdevYlrq.getPlantCode().equals(specdevYlrq.getPlantCode())) {
                     specdevYlrq.setIsRepeat(1L);
+                    tSpecdevYlrq.setIsRepeat(1L);
                     this.specdevYlrqService.updateTSpecdevYlrq(specdevYlrq);
+                    this.specdevYlrqService.updateTSpecdevYlrq(tSpecdevYlrq);
                 }
             }
         }

master/src/main/java/com/ruoyi/project/sems/controller/TMeasureRecordController.java

@@ -138,6 +138,9 @@ public class TMeasureRecordController extends BaseController {
                 logger.info(di + "--di--");
                 BigDecimal st = i.divide(di, 3, BigDecimal.ROUND_HALF_DOWN);
                 logger.info(st + "--st--");
+                if (st.compareTo(new BigDecimal("0")) <= 0) { //速率不可小于0
+                    st = new BigDecimal("0.01");
+                }
                 thickness.setStCorrosion(String.valueOf(st));
                 //长期速率
                 TMeasureRecord r3 = list.get(list.size() - 1);
@@ -147,6 +150,9 @@ public class TMeasureRecordController extends BaseController {
                 BigDecimal di2 = new BigDecimal(day1).divide(new BigDecimal(365), 4, BigDecimal.ROUND_HALF_DOWN);
                 BigDecimal lt = i1.divide(di2, 3, BigDecimal.ROUND_HALF_DOWN);
                 logger.info(lt + "--lt--");
+                if (lt.compareTo(new BigDecimal("0")) <= 0) { //速率不可小于0
+                    lt = new BigDecimal("0.01");
+                }
                 thickness.setLtCorrosion(String.valueOf(lt));
                 //预估寿命
                 if (thickness.getThicknessMin()!= null) {

master/src/main/java/com/ruoyi/project/sems/controller/TSpecdevYlrqController.java

@@ -70,9 +70,9 @@ public class TSpecdevYlrqController extends BaseController
 //        Thread t = new Thread(specOverLifeThead);
 //        t.start();
 
-        SpecDevYlrqThread specDevYlgdThread = new SpecDevYlrqThread(tSpecdevYlrqService);
-        Thread t2 = new Thread(specDevYlgdThread);
-        t2.start();
+//        SpecDevYlrqThread specDevYlgdThread = new SpecDevYlrqThread(tSpecdevYlrqService);
+//        Thread t2 = new Thread(specDevYlgdThread);
+//        t2.start();
         return getDataTable(list);
     }
 

master/src/main/resources/mybatis/sems/TSpecdevYlrqMapper.xml

@@ -324,6 +324,7 @@
             <if test="checkConclusion != null">check_conclusion = #{checkConclusion},</if>
             <if test="yearNextWarnDate != null">year_next_warn_date = #{yearNextWarnDate},</if>
             <if test="yearReportNo != null">year_report_no = #{yearReportNo},</if>
+            <if test="isRepeat != null">is_repeat = #{isRepeat},</if>
         </trim>
         where id = #{id}
     </update>

ui/src/views/sems/specGl/bf.vue

@@ -165,7 +165,8 @@
     <pagination
       v-show="total>0"
       :total="total"
-
+      :page.sync="queryParams.pageNum"
+      :page-sizes="[20,100,300,500]"
       :limit.sync="queryParams.pageSize"
       @pagination="getList"
     />

ui/src/views/sems/specGl/index.vue

@@ -230,7 +230,8 @@
     <pagination
       v-show="total>0"
       :total="total"
-
+      :page.sync="queryParams.pageNum"
+      :page-sizes="[20,100,300,500]"
       :limit.sync="queryParams.pageSize"
       @pagination="getList"
     />

ui/src/views/sems/specGl/ty.vue

@@ -208,7 +208,8 @@
     <pagination
       v-show="total>0"
       :total="total"
-
+      :page.sync="queryParams.pageNum"
+      :page-sizes="[20,100,300,500]"
       :limit.sync="queryParams.pageSize"
       @pagination="getList"
     />

ui/src/views/sems/specGl/zx.vue

@@ -165,7 +165,8 @@
     <pagination
       v-show="total>0"
       :total="total"
-
+      :page.sync="queryParams.pageNum"
+      :page-sizes="[20,100,300,500]"
       :limit.sync="queryParams.pageSize"
       @pagination="getList"
     />

ui/src/views/sems/specYlgd/bf.vue

@@ -222,7 +222,8 @@
     <pagination
       v-show="total>0"
       :total="total"
-
+      :page.sync="queryParams.pageNum"
+      :page-sizes="[20,100,300,500]"
       :limit.sync="queryParams.pageSize"
       @pagination="getList"
     />

ui/src/views/sems/specYlgd/index.vue

@@ -295,7 +295,8 @@
     <pagination
       v-show="total>0"
       :total="total"
-
+      :page.sync="queryParams.pageNum"
+      :page-sizes="[20,100,300,500]"
       :limit.sync="queryParams.pageSize"
       @pagination="getList"
     />

ui/src/views/sems/specYlgd/ty.vue

@@ -272,7 +272,8 @@
     <pagination
       v-show="total>0"
       :total="total"
-
+      :page.sync="queryParams.pageNum"
+      :page-sizes="[20,100,300,500]"
       :limit.sync="queryParams.pageSize"
       @pagination="getList"
     />

ui/src/views/sems/specYlgd/zx.vue

@@ -221,7 +221,8 @@
     <pagination
       v-show="total>0"
       :total="total"
-
+      :page.sync="queryParams.pageNum"
+      :page-sizes="[20,100,300,500]"
       :limit.sync="queryParams.pageSize"
       @pagination="getList"
     />

ui/src/views/sems/specYlrq/index.vue

@@ -229,7 +229,7 @@
     <pagination
       v-show="total>0"
       :total="total"
-             :page.sync="queryParams.pageNum"
+       :page.sync="queryParams.pageNum"
       :page-sizes="[20,100,300,500]"
       :limit.sync="queryParams.pageSize"
       @pagination="getList"