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

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

@@ -130,20 +130,23 @@ public class TMeasureRecordController extends BaseController {
                 TMeasureRecord r2 = list.get(1);
                 BigDecimal i = new BigDecimal(r2.getMeasureValue()).setScale(4, BigDecimal.ROUND_HALF_DOWN).subtract(new BigDecimal(r1.getMeasureValue()).setScale(4, BigDecimal.ROUND_HALF_DOWN));
                 int day = formatDate(r1.getMeasureDate(), r2.getMeasureDate());
-                logger.info(i + "----" + day);
+                if (day == 0) {
+                    day = day + 1;
+                }
+                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) {
@@ -153,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));
                 }
@@ -216,7 +222,7 @@ public class TMeasureRecordController extends BaseController {
                     }else if (j == 2) {//单位内编号
                         entity.setTagno(cellValue);
                     }else if (j == 3) {//侧厚部位
-                        entity.setTagno(cellValue);
+                        entity.setPosition(cellValue);
                     } else if (j == 4) {//检测编号
                         entity.setMeasureNo(cellValue);
                     } else if (j == 5) {//数值
@@ -243,12 +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.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/java/com/ruoyi/project/sems/mapper/TMeasureRecordMapper.java

@@ -66,4 +66,5 @@ public interface TMeasureRecordMapper extends BaseMapper<TMeasureRecord>
      */
     public int deleteTMeasureRecordByIds(Long[] ids);
 
+    void deleteTMeasureRecordByDate(TMeasureRecord t);
 }

master/src/main/java/com/ruoyi/project/sems/service/ITMeasureRecordService.java

@@ -62,4 +62,6 @@ public interface ITMeasureRecordService  extends IService<TMeasureRecord>
     public int deleteTMeasureRecordById(Long id);
 
     List<TMeasureRecord> queryRecords(String id);
+
+    void deleteTMeasureRecordByDate(TMeasureRecord t);
 }

master/src/main/java/com/ruoyi/project/sems/service/impl/TMeasureRecordServiceImpl.java

@@ -99,4 +99,9 @@ public class TMeasureRecordServiceImpl extends ServiceImpl<TMeasureRecordMapper,
     public List<TMeasureRecord> queryRecords(String measureId) {
         return this.list(new QueryWrapper<TMeasureRecord>().eq(!StringUtils.isEmpty(measureId),"MEASURE_ID", measureId) .orderByDesc("MEASURE_DATE"));
     }
+
+    @Override
+    public void deleteTMeasureRecordByDate(TMeasureRecord t) {
+        tMeasureRecordMapper.deleteTMeasureRecordByDate(t);
+    }
 }

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

@@ -3,7 +3,7 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.project.sems.mapper.TMeasureRecordMapper">
-    
+
     <resultMap type="TMeasureRecord" id="TMeasureRecordResult">
         <result property="id"    column="id"    />
         <result property="delFlag"    column="del_flag"    />
@@ -23,7 +23,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectTMeasureRecordList" parameterType="TMeasureRecord" resultMap="TMeasureRecordResult">
         <include refid="selectTMeasureRecordVo"/>
-        <where>  
+        <where>
             <if test="measureId != null  and measureId != ''"> and measure_id = #{measureId}</if>
             <if test="measureValue != null "> and measure_value = #{measureValue}</if>
             <if test="measureDate != null "> and measure_date = #{measureDate}</if>
@@ -31,12 +31,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
         order by measure_date desc
     </select>
-    
+
     <select id="selectTMeasureRecordById" parameterType="Long" resultMap="TMeasureRecordResult">
         <include refid="selectTMeasureRecordVo"/>
         where id = #{id}
     </select>
-        
+
     <insert id="insertTMeasureRecord" parameterType="TMeasureRecord">
         <selectKey keyProperty="id" resultType="long" order="BEFORE">
             SELECT seq_t_measure_record.NEXTVAL as id FROM DUAL
@@ -91,5 +91,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{id}
         </foreach>
     </update>
-    
-</mapper>
+
+    <update id="deleteTMeasureRecordByDate"  parameterType="TMeasureRecord">
+        update t_measure_record set del_flag = 2
+        <where>
+            <if test="measureId != null  and measureId != ''"> and measure_id = #{measureId}</if>
+            <if test="measureDate != null "> and measure_date = #{measureDate}</if>
+        </where>
+
+    </update>
+
+
+
+</mapper>

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

@@ -109,7 +109,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select id from t_measure_thickness
             <where>
                 del_flag = 0
-                <if test="tagNo != null  and tagNo != ''"> and tagno = #{tagNo}</if>
+                <if test="tagno != null  and tagno != ''"> and tagno = #{tagno}</if>
                 <if test="position != null  and position != ''"> and position = #{position}</if>
             </where>
 
@@ -119,10 +119,9 @@ 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>
+            <if test="tagno != null  and tagno != ''"> and tagno = #{tagno}</if>
             <if test="position != null  and position != ''"> and position = #{position}</if>
             <if test="measureNo != null  and measureNo != ''"> and measure_no = #{measureNo}</if>
         </where>