LY 侧厚

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

@@ -133,20 +133,20 @@ public class TMeasureRecordController extends BaseController {
                 if (day == 0) {
                     day = day + 1;
                 }
-                logger.info(i + "----" + day);
+                logger.info(i + "-i--day-" + day);
                 BigDecimal di = new BigDecimal(day).divide(new BigDecimal(365), 4, BigDecimal.ROUND_HALF_DOWN);
-                logger.info(di + "----");
+                logger.info(di + "--di--");
                 BigDecimal st = i.divide(di, 3, BigDecimal.ROUND_HALF_DOWN);
-                logger.info(st + "----");
+                logger.info(st + "--st--");
                 thickness.setStCorrosion(String.valueOf(st));
                 //长期速率
                 TMeasureRecord r3 = list.get(list.size() - 1);
                 BigDecimal i1 = new BigDecimal(r3.getMeasureValue()).setScale(4, BigDecimal.ROUND_HALF_DOWN).subtract(new BigDecimal(r1.getMeasureValue()).setScale(4, BigDecimal.ROUND_HALF_DOWN));
                 int day1 = formatDate(r1.getMeasureDate(), r3.getMeasureDate());
-                logger.info(i1 + "----" + day1);
+                logger.info(i1 + "--i1--" + day1);
                 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 + "----");
+                logger.info(lt + "--lt--");
                 thickness.setLtCorrosion(String.valueOf(lt));
                 //预估寿命
                 if (thickness.getThicknessMin()!= null) {
@@ -156,8 +156,11 @@ public class TMeasureRecordController extends BaseController {
                     } else {
                         e = st;
                     }
+                    if(e.compareTo(new BigDecimal("0")) == 0) {
+                        e = new BigDecimal("1");
+                    }
                     BigDecimal cc = new BigDecimal(r1.getMeasureValue()).subtract(new BigDecimal(thickness.getThicknessMin()));
-                    logger.info(cc + "----");
+                    logger.info(cc + "----cc");
                     BigDecimal est = cc.divide(e, 2, BigDecimal.ROUND_HALF_DOWN);
                     thickness.setEstRemain(String.valueOf(est));
                 }
@@ -246,13 +249,17 @@ public class TMeasureRecordController extends BaseController {
                 Long id = this.tMeasureThicknessMapper.selectByRecord(t);
                 logger.info(id.toString());
                 t.setMeasureId(id.toString());
-//                this.tMeasureRecordService.deleteTMeasureRecordByDate(t);
+                this.tMeasureRecordService.deleteTMeasureRecordByDate(t);
                 this.tMeasureRecordService.insertTMeasureRecord(t);
-                this.updateMeasure(id + "");
+                try {
+                    this.updateMeasure(id + "");
+                }catch (Exception e) {
+                    logger.error("更新速率错误e:" + e);
+                }
                 successNumber++;
             } catch (Exception e) {
                 failNumber++;
-                logger.info("e:" + e);
+                logger.error("e:" + e);
                 failRow.add(failNum + 1);
             }
         }

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

@@ -119,7 +119,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select id from t_measure_thickness
         <where>
             del_flag = 0
-
             <if test="plantCode != null  and plantCode != ''"> and plant_code = #{plantCode}</if>
             <if test="unitCode != null  and unitCode != ''"> and unit_code = #{unitCode}</if>
             <if test="tagno != null  and tagno != ''"> and tagno = #{tagno}</if>