动轨保存AI标识皮、APP显示期限皮添加valueFlag参数条件、动轨保存数据判断创建时间是否为空

src/main/java/com/steerinfo/baseinfo/meterbaserailwayaiweight/service/impl/MeterBaseRailwayAiweightServiceImpl.java

@@ -6,6 +6,7 @@ import com.steerinfo.baseinfo.meterbaserailwayaiweight.service.IMeterBaseRailway
 import com.steerinfo.framework.controller.RESTfulResult;
 import com.steerinfo.framework.mapper.IBaseMapper;
 import com.steerinfo.framework.service.impl.BaseServiceImpl;
+import com.steerinfo.util.StringUtils;
 import io.micrometer.core.instrument.Meter;
 import org.apache.shiro.crypto.hash.Hash;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -71,7 +72,9 @@ public class MeterBaseRailwayAiweightServiceImpl extends BaseServiceImpl<MeterBa
                     model.setRailwayTypeName("动态轨道衡");
                     model.setCreateManNo("admin");
                     model.setCreateManName("admins");
-                    model.setCreateTime(new Date());
+                    if(model.getCreateTime() == null && StringUtils.isEmpty(model.getCreateTime().toString())) {
+                        model.setCreateTime(new Date());
+                    }
                     meterBaseRailwayAiweightMapper.insertSelective(model);
                 }
             }

src/main/java/com/steerinfo/baseinfo/meterbasetermtaredata/service/impl/MeterBaseTermTareDataServiceImpl.java

@@ -403,8 +403,10 @@ public class MeterBaseTermTareDataServiceImpl extends BaseServiceImpl<MeterBaseT
         rm.setFailed();
         try{
             HashMap<String, Object> map = new HashMap<>();
-            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
+            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+            parmas.put("valueFlag", "0");
             List<MeterBaseTermTareData> models = meterBaseTermTareDataMapper.selectByParameters(parmas);
+
             if(models.size() >= 1) {
                 MeterBaseTermTareData model = models.get(0);
                 //判断期限皮过期时间
@@ -414,10 +416,7 @@ public class MeterBaseTermTareDataServiceImpl extends BaseServiceImpl<MeterBaseT
                 long to = endTime.getTime();
                 int day = (int)(from - to)/(60*60*24*1000);
                 int hour = (int)(from - to)/(60*60*1000);
-                int minutes = 0;
-                if(hour != 0) {
-                    minutes = (int)(from - to)/(60*1000) - (hour*60);
-                }
+                int minutes = (int)(from - to)/(60*1000) - (hour*60);
                 if(startTime.compareTo(endTime) > 0) {
                     map.put("flag", "1");
                 }else {
@@ -432,7 +431,7 @@ public class MeterBaseTermTareDataServiceImpl extends BaseServiceImpl<MeterBaseT
                 rm.setMessage("操作成功");
                 rm.setCode("200");
             }else {
-                rm.setMessage("未找到相应期限皮重信息");
+                rm.setMessage("未找到相应有效期限皮重信息");
                 rm.setCode("500");
             }
         }catch (Exception e) {

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

@@ -5059,7 +5059,7 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
             }
         }catch (Exception e) {
             e.printStackTrace();
-            rm.setMessage("操作异常:>>>" + e.getMessage());
+            rm.setMessage(e.getMessage());
         }
         return rm;
     }

src/main/java/com/steerinfo/meterwork/meterworkimage/service/impl/MeterWorkImageServiceImpl.java

@@ -7,11 +7,20 @@ import com.steerinfo.meterwork.except.MarkerMetException;
 import com.steerinfo.meterwork.meterworkimage.mapper.MeterWorkImageMapper;
 import com.steerinfo.meterwork.meterworkimage.model.MeterWorkImage;
 import com.steerinfo.meterwork.meterworkimage.service.IMeterWorkImageService;
+import com.steerinfo.meterwork.meterworkrailwayactfirst.mapper.MeterWorkRailwayActFirstMapper;
+import com.steerinfo.meterwork.meterworkrailwayactfirst.model.MeterWorkRailwayActFirst;
+import com.steerinfo.meterwork.meterworkrailwayreceived.mapper.MeterWorkRailwayReceivedMapper;
+import com.steerinfo.meterwork.meterworkrailwayreceived.model.MeterWorkRailwayReceived;
+import com.steerinfo.util.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.HashMap;
 
 /**
  * MeterWorkImage服务实现：
@@ -32,6 +41,9 @@ public class MeterWorkImageServiceImpl extends BaseServiceImpl<MeterWorkImage, S
     @Resource
     private MeterWorkImageMapper meterWorkImageMapper;
 
+    @Resource
+    private MeterWorkRailwayReceivedMapper meterWorkRailwayReceivedMapper;
+
     @Override
     protected IBaseMapper<MeterWorkImage, String> getMapper() {
         return meterWorkImageMapper;
@@ -145,13 +157,51 @@ public class MeterWorkImageServiceImpl extends BaseServiceImpl<MeterWorkImage, S
         RESTfulResult rm = new RESTfulResult();
         try{
             rm.setCode("200");
-            MeterWorkImage mw= meterWorkImageMapper.selectByPrimaryKey(mwi.getActualFirstNo());
-            if(mw != null){
-                meterWorkImageMapper.updateByPrimaryKeySelective(mwi);
-            }else{
-                meterWorkImageMapper.insertSelective(mwi);
+            String strCar = null;
+            if(mwi.getImageFile2()!=null && StringUtils.isNotEmpty(mwi.getImageFile2())) {
+                String[] strImage = mwi.getImageFile2().split("/");
+                String[] strTemp = strImage[strImage.length - 1].split("_");
+                strCar = strTemp[strTemp.length - 1].replaceAll(".jpeg", "");
+                strCar.replaceAll(".jpg", "");
             }
+
+            if(strCar != null && strCar.length() == 7) {
+                SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+                String railwayNo = strCar;
+                Date imageTime = mwi.getImageTime();
+                Calendar beforeD = Calendar.getInstance();
+                Calendar afterD = Calendar.getInstance();
+                beforeD.setTime(imageTime);
+                afterD.setTime(imageTime);
+                beforeD.add(Calendar.MINUTE, -5);
+                afterD.add(Calendar.MINUTE, 5);
+                String startTime = sdf.format(beforeD.getTime());
+                String endTime = sdf.format(afterD.getTime());
+                HashMap<String, Object> obj = new HashMap<>();
+                obj.put("railwayNo", railwayNo);
+                obj.put("startTime", startTime);
+                obj.put("endTime", endTime);
+                MeterWorkRailwayReceived firstModel = meterWorkRailwayReceivedMapper.getPrimaryKey(obj);
+                if(firstModel != null && firstModel.getActualFirstNo() != null && StringUtils.isNotEmpty(firstModel.getActualFirstNo())) {
+                    mwi.setActualFirstNo(firstModel.getActualFirstNo());
+                    MeterWorkImage mw= meterWorkImageMapper.selectByPrimaryKey(mwi.getActualFirstNo());
+                    if(mw != null){
+                        meterWorkImageMapper.updateByPrimaryKeySelective(mwi);
+                    }else{
+                        meterWorkImageMapper.insertSelective(mwi);
+                    }
+                }
+            }else {
+                MeterWorkImage mw= meterWorkImageMapper.selectByPrimaryKey(mwi.getActualFirstNo());
+                if(mw != null){
+                    meterWorkImageMapper.updateByPrimaryKeySelective(mwi);
+                }else{
+                    meterWorkImageMapper.insertSelective(mwi);
+                }
+            }
+
         }catch(Exception ex){
+            rm.setFailed();
             rm.setCode("500");
             rm.setMessage("图片信息写入表异常："+ex.getMessage());
         }

src/main/java/com/steerinfo/meterwork/meterworkrailwayactual/mapper/MeterWorkRailwayActualMapper.xml

@@ -2974,7 +2974,7 @@
 
   <select id="getLcNo" parameterType="java.lang.String" resultType="java.lang.String">
     SELECT LPAD(NVL(MAX(TO_NUMBER(SUBSTR(LC_NO, LENGTH(LC_NO) - 2))),0) + 1,3,'0')
-    FROM METER_WORK_RAILWAY_ACTUAL where instr(LC_NO,#{afl,jdbcType=VARCHAR})>0 AND net_spot3_no=#{netSpot3Name,jdbcType=VARCHAR}
+    FROM METER_WORK_RAILWAY_ACTUAL where instr(LC_NO,#{afl,jdbcType=VARCHAR})>0 AND net_spot3_no=#{netSpot3No,jdbcType=VARCHAR}
   </select>
 
   <select id="manualAdd" parameterType="java.lang.String" resultMap="BaseResultMap">
@@ -4114,7 +4114,6 @@
     actual_first1_no = #{actualFirstNo} or
     actual_first2_no = #{actualFirstNo}
   </select>
-
   <select id="autoPrintRailway" parameterType="java.util.HashMap" resultMap="BaseResultMap">
     <include refid="select" />
     where 1 = 1

src/main/java/com/steerinfo/meterwork/meterworkrailwayreceived/mapper/MeterWorkRailwayReceivedMapper.java

@@ -1,6 +1,7 @@
 package com.steerinfo.meterwork.meterworkrailwayreceived.mapper;
 
 import com.steerinfo.framework.mapper.IBaseMapper;
+import com.steerinfo.meterwork.meterworkrailwayactfirst.model.MeterWorkRailwayActFirst;
 import com.steerinfo.meterwork.meterworkrailwaymotorialreceived.model.MeterWorkRailwayMotorialReceived;
 import com.steerinfo.meterwork.meterworkrailwayreceived.model.MeterWorkRailwayReceived;
 import java.math.*;
@@ -16,4 +17,5 @@ public interface MeterWorkRailwayReceivedMapper extends IBaseMapper<MeterWorkRai
     void updateMeterWorkRailwayReceived(@feign.Param( value = "actualFirstNo") String actualFirstNo);
     void updateMeterWorkRailwayReceiveds(String s);
     List<MeterWorkRailwayReceived> noPage(HashMap<String, Object> map);
+    MeterWorkRailwayReceived getPrimaryKey(HashMap params);
 }

src/main/java/com/steerinfo/meterwork/meterworkrailwayreceived/mapper/MeterWorkRailwayReceivedMapper.xml

@@ -1980,4 +1980,15 @@
     order by CREATE_TIME desc
   </select>
 
+  <select id="getPrimaryKey" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+    <include refid="select"/>
+    where 1 = 1
+    and rownum = 1
+    <if test="railwayNo != null and railwayNo !=''">
+      and railway_no = #{railwayNo}
+    </if>
+    <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
+      and  CREATE_TIME  >= TO_DATE(#{startTime}, 'yyyy-MM-dd HH24:mi:ss') and CREATE_TIME  &lt;=  TO_DATE(#{endTime}, 'yyyy-MM-dd HH24:mi:ss')
+    </if>
+  </select>
 </mapper>