提示信息修改

Signed-off-by: dengyj <123456>

src/main/java/com/steerinfo/baseinfo/meterbasespotinfo/service/impl/MeterBaseSpotInfoServiceImpl.java

@@ -1,5 +1,7 @@
 package com.steerinfo.baseinfo.meterbasespotinfo.service.impl;
 
+import com.steerinfo.baseinfo.combaseinfo.mapper.ComBaseInfoMapper;
+import com.steerinfo.baseinfo.combaseinfo.model.ComBaseInfo;
 import com.steerinfo.baseinfo.meterbasespotinfo.mapper.MeterBaseSpotInfoMapper;
 import com.steerinfo.baseinfo.meterbasespotinfo.model.MeterBaseSpotInfo;
 import com.steerinfo.baseinfo.meterbasespotinfo.service.IMeterBaseSpotInfoService;
@@ -33,6 +35,9 @@ import java.util.Map;
 @Service(value = "meterBaseSpotInfoService")
 public class MeterBaseSpotInfoServiceImpl extends BaseServiceImpl<MeterBaseSpotInfo, String> implements IMeterBaseSpotInfoService {
 
+    @Resource
+    private ComBaseInfoMapper comBaseInfoMapper;
+
     @Resource
     private MeterBaseSpotInfoMapper meterBaseSpotInfoMapper;
 
@@ -44,22 +49,28 @@ public class MeterBaseSpotInfoServiceImpl extends BaseServiceImpl<MeterBaseSpotI
     @Override
     public String checkandupdate(String id,MeterBaseSpotInfo model)
     {
+        HashMap<String, Object> map = new HashMap<>();
+        map.put("baseCode", model.getSpotTypeNo());
+        List<ComBaseInfo> models = comBaseInfoMapper.selectByParameters(map);
+        if(models.size() >= 1) {
+            model.setSpotTypeName(models.get(0).getBaseName());
+        }
         String msg=check(model);
         if (StringUtils.isNotEmpty(msg)){
             return msg;
         }
-            HashMap<String, Object> obj = new HashMap<>();
-            obj.put("baseSpotNo",id);
-            obj.put("baseSpotName",model.getBaseSpotName());
-//            obj.put("videoIp",model.getVideoIp());
-//            obj.put("ledIp",model.getLedIp());
-//            obj.put("printerIp",model.getPrinterIp());
-//            obj.put("controlIp",model.getControlIp());
-//            obj.put("flatComputerIp",model.getFlatComputerIp());
-        List<MeterBaseSpotInfo> com = meterBaseSpotInfoMapper.selectOrParameters(obj);
-        if (com != null && com.size() > 0) {
-            return "数据重复（名称/Ip），请确认！！";
-        }
+//            HashMap<String, Object> obj = new HashMap<>();
+//            obj.put("baseSpotNo",id);
+//            obj.put("baseSpotName",model.getBaseSpotName());
+////            obj.put("videoIp",model.getVideoIp());
+////            obj.put("ledIp",model.getLedIp());
+////            obj.put("printerIp",model.getPrinterIp());
+////            obj.put("controlIp",model.getControlIp());
+////            obj.put("flatComputerIp",model.getFlatComputerIp());
+//        List<MeterBaseSpotInfo> com = meterBaseSpotInfoMapper.selectOrParameters(obj);
+//        if (com != null && com.size() > 0) {
+//            return "数据重复（名称/Ip），请确认！！";
+//        }
         meterBaseSpotInfoMapper.updateByPrimaryKeySelective(model);
         return "";
     }

src/main/java/com/steerinfo/meterwork/meterworkcaractualfirst/service/impl/MeterWorkCarActualFirstServiceImpl.java

@@ -3088,7 +3088,7 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
             if(mwcaf1.getMeterWeight().compareTo(mwcaf2.getMeterWeight()) == 1 ||
                     mwcaf1.getMeterWeight().compareTo(mwcaf4.getMeterWeight()) == 1 ||
                     mwcaf2.getMeterWeight().compareTo(mwcaf4.getMeterWeight()) == 1){
-                return "不为混装逻辑,请确认！！";
+                return "请根据一次数据从小到大的规则，依次选择三条一次数据！！！！";
             }
             SimpleDateFormat simpleFormat = new SimpleDateFormat("yyyy-MM-dd hh:mm");
             String fromDate = simpleFormat.format(pts1.getCreateTime());
@@ -3262,7 +3262,7 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
             if(mwcaf1.getMeterWeight().compareTo(mwcaf2.getMeterWeight()) == -1 ||
                     mwcaf1.getMeterWeight().compareTo(mwcaf4.getMeterWeight()) == -1 ||
                     mwcaf2.getMeterWeight().compareTo(mwcaf4.getMeterWeight()) == -1){
-                return "不为混卸逻辑！！";
+                return "请根据一次数据从大到小的规则，依次选择三条一次数据！！";
             }
             SimpleDateFormat simpleFormat = new SimpleDateFormat("yyyy-MM-dd hh:mm");
             String fromDate = simpleFormat.format(pts1.getCreateTime());

src/main/java/com/steerinfo/meterwork/meterworkrailwayactfirst/service/impl/MeterWorkRailwayActFirstServiceImpl.java

@@ -1768,7 +1768,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
             if(mwcaf1.getMeterWeight().compareTo(mwcaf2.getMeterWeight()) == 1 ||
                     mwcaf1.getMeterWeight().compareTo(mwcaf4.getMeterWeight()) == 1 ||
                     mwcaf2.getMeterWeight().compareTo(mwcaf4.getMeterWeight()) == 1){
-                return "不为混装逻辑，请确认！！";
+                return "请根据一次数据从小到大的规则，依次选择三条一次数据！！";
             }
             SimpleDateFormat simpleFormat = new SimpleDateFormat("yyyy-MM-dd hh:mm");
             String fromDate = simpleFormat.format(pts1.getCreateTime());
@@ -1942,7 +1942,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
             if(mwcaf1.getMeterWeight().compareTo(mwcaf2.getMeterWeight()) == -1 ||
                     mwcaf1.getMeterWeight().compareTo(mwcaf4.getMeterWeight()) == -1 ||
                     mwcaf2.getMeterWeight().compareTo(mwcaf4.getMeterWeight()) == -1){
-                return "不为混卸逻辑！！";
+                return "请根据一次数据从大到小的规则，依次选择三条一次数据！！！！";
             }
             SimpleDateFormat simpleFormat = new SimpleDateFormat("yyyy-MM-dd hh:mm");
             String fromDate = simpleFormat.format(pts1.getCreateTime());

src/main/java/com/steerinfo/pretrack/pretrackscale/mapper/PreTrackScaleMapper.xml

@@ -3071,9 +3071,9 @@
   <select id="selectBy" parameterType="java.util.HashMap" resultMap="BaseResultMap">
     <include refid="select"/>
     <where>
-      (value_flag='1' or value_flag='4' )
+      ((value_flag='1' and TRUST_AVAILABILITY_TIME &gt;= SYSDATE) or value_flag='4')
       <if test="predictionNo != null and predictionNo != ''">
-        PREDICTION_NO = #{predictionNo}
+        and PREDICTION_NO = #{predictionNo}
       </if>
       <if test="noticeNo != null and noticeNo != ''">
         and NOTICE_NO = #{noticeNo}
@@ -3243,7 +3243,7 @@
       <if test="lineDesc != null and lineDesc != ''">
         and LINE_DESC = #{lineDesc}
       </if>
-      and TRUST_AVAILABILITY_TIME &gt; SYSDATE
+
     </where>
     order by CREATE_TIME desc
   </select>