Merge remote-tracking branch 'origin/master'

business/src/main/java/com/fizz/business/service/impl/SetupFurTempServiceImpl.java

@@ -53,6 +53,10 @@ public class SetupFurTempServiceImpl implements ISetupFurTempService
     @Override
     public int insertSetupFurTemp(SetupFurTemp setupFurTemp)
     {
+        //如果 String steelGrade 存在则不能新增
+        if (setupFurTempMapper.selectSetupFurTempBySteelGrade(setupFurTemp.getSteelGrade()) != null) {
+            throw new RuntimeException("该参数已存在");
+        }
         setupFurTemp.setCreateTime(DateUtils.getNowDate());
         return setupFurTempMapper.insertSetupFurTemp(setupFurTemp);
     }

business/src/main/java/com/fizz/business/service/impl/SetupTensionServiceImpl.java

@@ -53,6 +53,10 @@ public class SetupTensionServiceImpl implements ISetupTensionService
     @Override
     public int insertSetupTension(SetupTension setupTension)
     {
+        //如果thick 和 yield_stren已存在那么就不需要插入
+        if(setupTensionMapper.selectSetupTensionByThick(setupTension.getThick(), setupTension.getYieldStren()) != null){
+            throw new RuntimeException("该参数已存在");
+        }
         setupTension.setCreateTime(DateUtils.getNowDate());
         return setupTensionMapper.insertSetupTension(setupTension);
     }

business/src/main/java/com/fizz/business/service/impl/SetupTlServiceImpl.java

@@ -53,6 +53,10 @@ public class SetupTlServiceImpl implements ISetupTlService
     @Override
     public int insertSetupTl(SetupTl setupTl)
     {
+        //如果thick 和 yield_stren已存在那么就不需要插入
+         if(setupTlMapper.selectSetupTlBySteelGrade(setupTl.getSteelGrade(), setupTl.getYieldStren(), setupTl.getThick()) != null){
+            throw new RuntimeException("该参数已存在");
+        }
         setupTl.setCreateTime(DateUtils.getNowDate());
         return setupTlMapper.insertSetupTl(setupTl);
     }

business/src/main/java/com/fizz/business/service/impl/SetupTmBendforceServiceImpl.java

@@ -53,6 +53,10 @@ public class SetupTmBendforceServiceImpl implements ISetupTmBendforceService
     @Override
     public int insertSetupTmBendforce(SetupTmBendforce setupTmBendforce)
     {
+        // 如果width 和 rollForce 在表里已存在则不能新增
+        if (setupTmBendforceMapper.selectSetupTmBendforceByWidth(setupTmBendforce.getWidth(),setupTmBendforce.getRollForce()) != null) {
+            throw new RuntimeException("该参数已存在");
+        }
         setupTmBendforce.setCreateTime(DateUtils.getNowDate());
         return setupTmBendforceMapper.insertSetupTmBendforce(setupTmBendforce);
     }

business/src/main/java/com/fizz/business/service/impl/SetupTmMeshServiceImpl.java

@@ -53,6 +53,10 @@ public class SetupTmMeshServiceImpl implements ISetupTmMeshService
     @Override
     public int insertSetupTmMesh(SetupTmMesh setupTmMesh)
     {
+        // 如果steelGrade,yieldStren,thick 在表里已存在则不能新增
+        if (setupTmMeshMapper.selectSetupTmMeshBySteelGrade(setupTmMesh.getSteelGrade(), setupTmMesh.getYieldStren(), setupTmMesh.getThick()) != null) {
+            throw new RuntimeException("该参数已存在");
+        }
         setupTmMesh.setCreateTime(DateUtils.getNowDate());
         return setupTmMeshMapper.insertSetupTmMesh(setupTmMesh);
     }

business/src/main/java/com/fizz/business/service/impl/SetupTmRollforceServiceImpl.java

@@ -53,6 +53,10 @@ public class SetupTmRollforceServiceImpl implements ISetupTmRollforceService
     @Override
     public int insertSetupTmRollforce(SetupTmRollforce setupTmRollforce)
     {
+        //如果steelGrade,yieldStren,thick,elong 在表里已存在则不能新增
+        if (setupTmRollforceMapper.selectSetupTmRollforceBySteelGrade(setupTmRollforce.getSteelGrade(), setupTmRollforce.getYieldStren(), setupTmRollforce.getThick(), setupTmRollforce.getElong()) != null) {
+            throw new RuntimeException("该数据已存在");
+        }
         setupTmRollforce.setCreateTime(DateUtils.getNowDate());
         return setupTmRollforceMapper.insertSetupTmRollforce(setupTmRollforce);
     }

business/target/classes/mapper/SegmentTotalMapper.xml

@@ -1,7 +1,21 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
 <mapper namespace="com.fizz.business.mapper.SegmentTotalMapper">
-    <select id="getLatestRecord" resultType="com.fizz.business.domain.SegmentTotal">
+
-        SELECT * FROM cpg_segment_total where id=(SELECT max(id) FROM cpg_segment_total)
+    <!-- 根据入库钢卷号查询最新一段的 total_values_json -->
+    <select id="selectLatestTotalValuesJsonByCoilId"
+            parameterType="java.lang.String"
+            resultType="java.lang.String">
+        SELECT
+            total_values_json
+        FROM cpl_segment_total
+        WHERE en_coil_id = #{coilId}
+        ORDER BY seg_no DESC
+            LIMIT 1
     </select>
+
 </mapper>
+