李扬

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

@@ -95,7 +95,11 @@ public class TMeasureRecordController extends BaseController {
     public AjaxResult edit(@RequestBody TMeasureRecord tMeasureRecord) {
         tMeasureRecordService.updateTMeasureRecord(tMeasureRecord);
         String measureId = tMeasureRecord.getMeasureId();
-        updateMeasure(measureId);
+        try {
+            updateMeasure(measureId);
+        }catch (Exception e) {
+            logger.error(JSON.toJSONString(e));
+        }
         return toAjax(1);
     }
 
@@ -115,7 +119,7 @@ public class TMeasureRecordController extends BaseController {
         t.setMeasureId(id);
         List<TMeasureRecord> list = tMeasureRecordService.selectTMeasureRecordList(t);
         if (list != null) {
-            if (list.size() > 1) {
+            if (list.size() > 1 ) {
                 logger.info(JSON.toJSONString(list));
                 //短期速率
                 TMeasureRecord r1 = list.get(0);
@@ -138,16 +142,18 @@ public class TMeasureRecordController extends BaseController {
                 logger.info(lt + "----");
                 thickness.setLtCorrosion(String.valueOf(lt));
                 //预估寿命
-                BigDecimal e;
-                if (lt.compareTo(st) > 0) {
-                    e = lt;
-                } else {
-                    e = st;
+                if (thickness.getThicknessMin()!= null) {
+                    BigDecimal e;
+                    if (lt.compareTo(st) > 0) {
+                        e = lt;
+                    } else {
+                        e = st;
+                    }
+                    BigDecimal cc = new BigDecimal(r1.getMeasureValue()).subtract(new BigDecimal(thickness.getThicknessMin()));
+                    logger.info(cc + "----");
+                    BigDecimal est = cc.divide(e, 2, BigDecimal.ROUND_HALF_DOWN);
+                    thickness.setEstRemain(String.valueOf(est));
                 }
-                BigDecimal cc = new BigDecimal(r1.getMeasureValue()).subtract(new BigDecimal(thickness.getThicknessMin()));
-                logger.info(cc + "----");
-                BigDecimal est = cc.divide(e, 2, BigDecimal.ROUND_HALF_DOWN);
-                thickness.setEstRemain(String.valueOf(est));
             }
         }
         tMeasureThicknessService.updateTMeasureThickness(thickness);

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

@@ -261,7 +261,12 @@
         align="center"
         :label="$t('下次测厚日期')">
       </el-table-column>
-      <el-table-column :label="$t('预估剩余寿命(year)')" align="center" prop="estRemain" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('预估剩余寿命(year)')" align="center" prop="estRemain" :show-overflow-tooltip="true">
+        <template slot-scope="scope">
+          <span v-if="scope.row.estRemain"> {{ scope.row.estRemain }}</span>
+          <span v-else-if="!scope.row.thicknessMin">缺少最小允许壁厚</span>
+        </template>
+      </el-table-column>
       <el-table-column
         prop="nextWarnDate"
         header-align="center"
@@ -1031,9 +1036,9 @@ export default {
         specification: [
           { required: true, message: this.$t('规格')+this.$t('不能为空'), trigger: "blur" }
         ],
-        flowRate: [
+/*        flowRate: [
           { required: true, message: this.$t('流速(m/s)')+this.$t('不能为空'), trigger: "blur" }
-        ],
+        ],*/
         temperature: [
           { required: true, message: this.$t('温度(℃)')+this.$t('不能为空'), trigger: "blur" }
         ],
@@ -1049,9 +1054,9 @@ export default {
         nominalTickness: [
           { required: true, message: this.$t('名义壁厚(mm)')+this.$t('不能为空'), trigger: "blur" }
         ],
-        thicknessMin: [
-          { required: true, message: this.$t('最小允许壁厚(mm)')+this.$t('不能为空'), trigger: "blur" }
-        ],
+        // thicknessMin: [
+        //   { required: true, message: this.$t('最小允许壁厚(mm)')+this.$t('不能为空'), trigger: "blur" }
+        // ],
         /*stCorrosion: [
           { required: true, message: "短期腐蚀速率不能为空", trigger: "blur" }
         ],