Merge branch 'master' of http://47.114.101.16:7070/ssy/newcpms

master/src/main/java/com/ruoyi/framework/task/sems/MeasureThicknessTask.java

@@ -95,7 +95,7 @@ public class MeasureThicknessTask extends BaseController {
                 plants.add(s.getName());
             }
             List<TMeasureThickness> list = this.measureThicknessService.list(new QueryWrapper<TMeasureThickness>()
-                    .eq("del_flag", 0)
+                    .eq("del_flag", 0).eq("is_send" , 0)
                     .in("plant_code", plants)
             );
             for (TMeasureThickness tMeasureThickness : list) {
@@ -113,6 +113,15 @@ public class MeasureThicknessTask extends BaseController {
             sendEmailBySt(stList , o );
             sendEmailByEst(estList , o );
         }
+        // 标记 已发送邮件
+        List<TMeasureThickness> sendList = this.measureThicknessService.list(new QueryWrapper<TMeasureThickness>()
+                .eq("del_flag", 0)
+        );
+        for (TMeasureThickness t: sendList
+             ) {
+            t.setIsSend(1);
+            this.measureThicknessService.updateTMeasureThickness(t);
+        }
     }
 
 

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

@@ -1,6 +1,7 @@
 package com.ruoyi.project.sems.controller;
 
 import com.alibaba.fastjson.JSON;
+import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.file.ExcelUtils;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.framework.aspectj.lang.annotation.Log;
@@ -26,9 +27,7 @@ import java.io.IOException;
 import java.math.BigDecimal;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
 
 /**
  * 测厚记录Controller
@@ -114,6 +113,16 @@ public class TMeasureRecordController extends BaseController {
     @DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids) {
         int res = tMeasureRecordService.deleteTMeasureRecordByIds(ids);
+        try {
+            for (Long id: ids
+            ) {
+                TMeasureRecord tMeasureRecord = tMeasureRecordService.selectTMeasureRecordById(id);
+                String measureId = tMeasureRecord.getMeasureId();
+                updateMeasure(measureId);
+            }
+        }catch (Exception e) {
+            logger.error(JSON.toJSONString(e));
+        }
         return toAjax(res);
     }
 
@@ -172,7 +181,22 @@ public class TMeasureRecordController extends BaseController {
                     thickness.setEstRemain(String.valueOf(est));
                 }
             }
+            //计算下次侧厚日期
+            try {
+                if(list.size() > 0 && StringUtils.isNotEmpty(thickness.getMeasureCycle())) {
+                    int monthCycle = Integer.parseInt(thickness.getMeasureCycle());
+                    int dayCycel = monthCycle * 30 ;
+                    TMeasureRecord r1 = list.get(0);
+                    Calendar calendar = new GregorianCalendar();
+                    calendar.setTime(r1.getMeasureDate());
+                    calendar.add(calendar.DATE, dayCycel);
+                    thickness.setNextWarnDate(calendar.getTime());
+                }
+            }catch (Exception e) {
+                logger.error("计算下次侧厚日期出错" , JSON.toJSONString(e));
+            }
         }
+        thickness.setIsSend(0);
         tMeasureThicknessService.updateTMeasureThickness(thickness);
     }
 

master/src/main/java/com/ruoyi/project/sems/domain/TMeasureThickness.java

@@ -245,6 +245,8 @@ public class TMeasureThickness extends BaseEntity
     @Excel(name = "备注")
     private String remarks;
 
+    /** 是否发送过预警 */
+    private Integer isSend;
 
     public Date getNextWarnDate() {
         return nextWarnDate;
@@ -704,6 +706,14 @@ public class TMeasureThickness extends BaseEntity
         this.nextMeasureDate = nextMeasureDate;
     }
 
+    public Integer getIsSend() {
+        return isSend;
+    }
+
+    public void setIsSend(Integer isSend) {
+        this.isSend = isSend;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

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

@@ -48,11 +48,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="otherContent"    column="other_content"    />
         <result property="measureNo"    column="measure_no"    />
         <result property="nextWarnDate"    column="next_warn_date"    />
+        <result property="isSend"    column="is_send"    />
         <result property="deptName" column="dept_name" />
     </resultMap>
 
     <sql id="selectTMeasureThicknessVo">
-        select d.id,d.next_warn_date, d.plant_code, d.unit_code, d.tagno, d.status, d.createdate, d.updater_code, d.updatedate, d.dept_id, d.remarks, d.position, d.recorder, d.recorder_date, d.equipment_name, d.material, d.cor_allowance, d.original_thickness, d.medium, d.pressure, d.specification, d.flow_rate, d.temperature, d.corrosion_type, d.inspection_method, d.photo, d.analysis, d.nominal_tickness, d.thickness_min, d.st_corrosion, d.lt_corrosion, d.est_remain, d.method_cause, d.effect_tracing, d.raiser, d.raiser_date, d.del_flag, d.location_url, d.analysis_url, d.measure_cycle, d.record_url, d.other_content ,d.measure_no ,s.dept_name from t_measure_thickness d
+        select d.id,d.next_warn_date, d.plant_code, d.unit_code, d.tagno, d.status, d.createdate, d.updater_code, d.updatedate, d.dept_id, d.remarks, d.position, d.recorder, d.recorder_date, d.equipment_name, d.material, d.cor_allowance, d.original_thickness, d.medium, d.pressure, d.specification, d.flow_rate, d.temperature, d.corrosion_type, d.inspection_method, d.photo, d.analysis, d.nominal_tickness, d.thickness_min, d.st_corrosion, d.lt_corrosion, d.est_remain, d.method_cause, d.effect_tracing, d.raiser, d.raiser_date, d.del_flag, d.location_url, d.analysis_url, d.measure_cycle, d.record_url, d.other_content ,d.measure_no, d.is_send,s.dept_name from t_measure_thickness d
       left join sys_dept s on s.dept_id = d.dept_id
     </sql>
 
@@ -270,6 +271,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="otherContent != null and otherContent != ''">other_content = #{otherContent},</if>
             <if test="measureNo != null">measure_no = #{measureNo},</if>
             <if test="nextWarnDate != null">next_warn_date = #{nextWarnDate},</if>
+            <if test="isSend != null">is_send = #{isSend},</if>
             </trim>
         where id = #{id}
     </update>

ui/src/views/login.vue

@@ -158,8 +158,8 @@ export default {
   justify-content: center;
   align-items: center;
   height: 100%;
-  //background-image: url("../assets/image/CPMS20210107.jpg");
-  background-image: url("../assets/image/CPMS20211128.jpg");
+  background-image: url("../assets/image/CPMS20210107.jpg");
+  //background-image: url("../assets/image/CPMS20211128.jpg");
   background-size: cover;
 }
 .title {