dengyj vor 4 Jahren
Ursprung
Commit
a377b12102

+ 87 - 0
src/main/java/com/steerinfo/filter/SecurityFilter.java

@@ -0,0 +1,87 @@
+package com.steerinfo.filter;
+
+import cn.hutool.json.JSONObject;
+import com.steerinfo.framework.controller.RESTfulResult;
+import org.springframework.stereotype.Component;
+import org.springframework.util.DigestUtils;
+
+import javax.servlet.*;
+import javax.servlet.annotation.WebFilter;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.Locale;
+
+@Component
+@WebFilter("/*")
+public class SecurityFilter implements Filter {
+
+    @Override
+    public void init(FilterConfig filterConfig) throws ServletException {
+    }
+
+    @Override
+    public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse, FilterChain filterChain) throws IOException, ServletException {
+        //获取请求
+        HttpServletRequest request = (HttpServletRequest) servletRequest;
+        HttpServletResponse response = (HttpServletResponse) servletResponse;
+        String path = request.getRequestURI();
+
+        //不拦截
+        if ("/v1/meterbasecars/appregister".equals(path)
+                ||"/v1/meterbasecars/applogin".equals(path)
+                || 1 == 1){
+            filterChain.doFilter(servletRequest,servletResponse);
+            return;
+        }
+
+        if(request.getRemoteAddr().equals("10.104.4.105")) {
+            filterChain.doFilter(servletRequest,servletResponse);
+            return;
+        }
+
+        String temp = request.getParameter("verificationCode");
+        //取出验证码
+        if(request.getParameter("verificationCode") == null) {
+            response.setContentType("application/json;charset=UTF-8");
+            RESTfulResult result = new RESTfulResult("500", "验证参数为空,不能请求!!");
+            result.setData(null);
+            JSONObject object = new JSONObject(result);
+            response.getWriter().print(object);
+            return;
+        }
+        String verificationCode1 = request.getParameter("verificationCode");
+        verificationCode1 = verificationCode1.toLowerCase(Locale.ROOT);
+//        System.out.println(verificationCode1);
+
+        //生成原数据
+        SimpleDateFormat df = new SimpleDateFormat("MM-yyyy-dd");
+        StringBuffer date = new StringBuffer(df.format(new Date()));
+        date = date.insert(2,"jisco");
+//        System.out.println(date);
+
+        //原数据MD5加密
+        String verificationCode2 = DigestUtils.md5DigestAsHex(date.toString().getBytes(StandardCharsets.UTF_8)).toLowerCase(Locale.ROOT);
+
+        //比对
+        if (verificationCode2.equals(verificationCode1)){//比对成功
+            filterChain.doFilter(servletRequest,servletResponse);
+            return;
+        }else {//比对失败
+            response.setContentType("application/json;charset=UTF-8");
+            RESTfulResult result = new RESTfulResult("500", "访问未授权");
+            result.setData(null);
+            JSONObject object = new JSONObject(result);
+            response.getWriter().print(object);
+            return;
+        }
+    }
+
+    @Override
+    public void destroy() {
+
+    }
+}

+ 1 - 0
src/main/java/com/steerinfo/meterwork/meterworkbeltscaleactual/service/impl/MeterWorkBeltScaleActualServiceImpl.java

@@ -47,6 +47,7 @@ public class MeterWorkBeltScaleActualServiceImpl extends BaseServiceImpl<MeterWo
         try{
             String maxID = comBaseInfoMapper.getConfigID("METER_WORK_BELT_SCALE_ACTUAL","ACTUAL_NO");
             model.setActualNo(maxID);
+            model.setCreateTime(new Date());
             return  meterWorkBeltScaleActualMapper.insertSelective(model);
         }catch (Exception ex){
             throw ex;

+ 11 - 0
src/main/java/com/steerinfo/meterwork/meterworkcaractual/service/impl/MeterWorkCarActualServiceImpl.java

@@ -113,6 +113,7 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
         try {
             check(model);
             model.setUploadFlag("1");
+            model.setCreateTime(new Date());
             int num = meterWorkCarActualMapper.insertSelective(model);
             return num;
         } catch (MarkerMetException e) {
@@ -352,6 +353,7 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
                 actualRow.setUploadFlag("1");
                 actualRow.setIsPreScale("1");
                 actualRow.setNetWeight(mwcaf1.getMeterWeight().subtract(mwcaf2.getMeterWeight()));
+                actualRow.setCreateTime(new Date());
                 meterWorkCarActualMapper.insertSelective(actualRow);
             }else if(StringUtils.isNotEmpty(mwcaf1.getPredictionNo()) || StringUtils.isNotEmpty(mwcaf2.getPredictionNo())){
                 String preNo = null;
@@ -413,6 +415,7 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
                         actualRow.setPredictionNo(scale.getPredictionNo());
                         actualRow.setIsPreScale("1");
                         actualRow.setNetWeight(mwcaf1.getMeterWeight().subtract(mwcaf2.getMeterWeight()));
+                        actualRow.setCreateTime(new Date());
                         meterWorkCarActualMapper.insertSelective(actualRow);
                     }else {
                         throw new MarkerMetException(500, "委托表不存在该"+ preNo + "委托编号信息!!");
@@ -454,6 +457,7 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
                 actualRow.setUploadFlag("1");
                 actualRow.setIsPreScale("0");
                 actualRow.setNetWeight(first1.getMeterWeight().subtract(first2.getMeterWeight()));
+                actualRow.setCreateTime(new Date());
                 meterWorkCarActualMapper.insertSelective(actualRow);
             }
             return actualRow;
@@ -843,6 +847,7 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
         try {
             // 校验传入数据是否完整
             manualCheck(model);
+            model.setCreateTime(new Date());
             int num = meterWorkCarActualMapper.insertSelective(model);
             return num;
         } catch (MarkerMetException e) {
@@ -1145,6 +1150,7 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
 
             mwca.setUploadFlag("1");
             mwca.setNetWeight(mwcaf1.getMeterWeight().subtract(mbttd.getMeterWeight()));
+            mwca.setCreateTime(new Date());
             meterWorkCarActualMapper.insertSelective(mwca);
 
             //修改预报
@@ -1500,6 +1506,7 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
         carActual.setActualFirst1No(railwayActual.getActualNo()); //汽车毛重编号,存火车实绩z编号
         carActual.setActualFirst2No(""); //皮重编号
         carActual.setUploadFlag("1");
+        carActual.setCreateTime(new Date());
         meterWorkCarActualMapper.insert(carActual);
 
         railwayActual.setMemo(railwayActual.getMemo() + "汽车实绩转换,转换净重" + railwayActual.getNetWeight() + "");
@@ -1579,6 +1586,7 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
             actual.setPredictionNo(trackScale.getPredictionNo());
             actual.setValueFlag(DbConstants.INVALID);
             actual.setUploadFlag("1");
+            actual.setCreateTime(new Date());
             meterWorkCarActualMapper.insertSelective(actual);
             return actual;
         } catch (MarkerMetException e) {
@@ -1651,6 +1659,7 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
             actual.setNetTime(new Date());
             actual.setValueFlag(DbConstants.INVALID);
             actual.setUploadFlag("1");
+            actual.setCreateTime(new Date());
             meterWorkCarActualMapper.insertSelective(actual);
 
             return actual;
@@ -1867,6 +1876,7 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
                 model.setDataSource("4");
                 model.setIsPreScale("0");
                 model.setUploadFlag("1");
+                model.setCreateTime(new Date());
                 meterWorkCarActualMapper.insertSelective(model);
                 num++;
             }
@@ -1931,6 +1941,7 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
                 model.setNetMode("3");
                 model.setDataSource("4");
                 model.setUploadFlag("1");
+                model.setCreateTime(new Date());
                 meterWorkCarActualMapper.insertSelective(model);
                 num++;
             }

+ 45 - 2
src/main/java/com/steerinfo/meterwork/meterworkcaractualfirst/service/impl/MeterWorkCarActualFirstServiceImpl.java

@@ -207,6 +207,7 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
             if(StringUtils.isNotEmpty(model.getPredictionNo())){
                 model.setIsPreScale("1");
             }
+            model.setCreateTime(new Date());
             int num = meterWorkCarActualFirstMapper.insertSelective(model);
             rm.setData(model.getActualFirstNo());
             rm.setMessage(enStr);
@@ -1067,6 +1068,7 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
         if(oci.getWeightType().equals("1")){
 
         }*/
+        oci.setCreateTime(new Date());
         meterWorkCarActualFirstMapper.insert(oci);
 
         //2、存储历史皮重及历史皮重明细信息
@@ -1128,6 +1130,7 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
             secondDb.setActualFirstNo(no);
 
             secondDb.setValueFlag("2");//洁净
+            secondDb.setCreateTime(new Date());
             meterWorkCarActualFirstMapper.insertSelective(secondDb);
 
             //修改一次计量数据为洁净
@@ -1198,6 +1201,7 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
                 netDb.setNetWeight(net);
             }
             netDb.setUploadFlag("1");
+            netDb.setCreateTime(new Date());
             meterWorkCarActualMapper.insert(netDb);
 
             //4、如果为期限皮重,则将期限皮重转化为一条皮重计量数据保存
@@ -1222,7 +1226,7 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
 //                imTare.setActualFirstNo(afl1 + imTareNO);
 
                 String imTareNO = PublicMethod.IdCreate(3);
-                imTare.setActualFirstNo(no);
+                imTare.setActualFirstNo(imTareNO);
 
                 imTare.setMeterTypeNo(secondDb.getMeterTypeNo());
                 imTare.setMeterTypeName(secondDb.getMeterTypeName());
@@ -1354,6 +1358,7 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
             secondDb.setUpdateManNo("system");
             secondDb.setUpdateManName("混装洁净更新");
             secondDb.setPredictionType("7");
+            secondDb.setCreateTime(new Date());
             secondDb.setPredictionCombination(upModel.getPredictionNo() + "," + netDb.getPredictionNo());
             meterWorkCarActualFirstMapper.insertSelective(secondDb);
 
@@ -1369,6 +1374,7 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
             once.setUpdateManNo("system");
             once.setUpdateManName("混装洁净更新");
             once.setPredictionType("7");
+            once.setCreateTime(new Date());
             once.setPredictionCombination(upModel.getPredictionNo() + "," + netDb.getPredictionNo());
             meterWorkCarActualFirstMapper.insertSelective(once);
 
@@ -1390,6 +1396,7 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
             netDb.setUploadFlag("1");
             // 拿到洁净编号B
             netDb.setPredictionCombination(upModel.getPredictionNo() + "," + netDb.getPredictionNo());
+            netDb.setCreateTime(new Date());
             meterWorkCarActualMapper.insert(netDb);
 
             //1b.如果receive_remark是H01,拿到委托单号,拿到上一个洁净编号A
@@ -1513,6 +1520,7 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
                 oci.setLoadEndTime(gc.getTime());
             }
         }
+        oci.setCreateTime(new Date());
         meterWorkCarActualFirstMapper.insertSelective(oci);
 
         //2、修改预环节为使用
@@ -1949,6 +1957,7 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
         String iActualNo = PublicMethod.IdCreate(3);
         secondDb.setActualFirstNo(iActualNo);
 
+        secondDb.setCreateTime(new Date());
         meterWorkCarActualFirstMapper.insertSelective(secondDb);
         if (!secondDb.getPredictionNo().equals(netDb.getPredictionNo())) {
             //杨秀东2021-3-22;一车联运检化验处理;
@@ -1983,6 +1992,7 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
             netDb.setNetWeight(net);
         }
         netDb.setUploadFlag("1");
+        netDb.setCreateTime(new Date());
         meterWorkCarActualMapper.insertSelective(netDb);
 
         //7、修改第一次存储的计量数据状态为洁净;预报编号相同时才处理(不是一车联运非互锁式)
@@ -2208,6 +2218,7 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
         oci.setActualFirstNo(iActualNo);
 
         oci.setValueFlag("2");
+        oci.setCreateTime(new Date());
         meterWorkCarActualFirstMapper.insertSelective(oci);
         //2、补充期限皮重的数据
         MeterBaseTermTareData mbttd = meterBaseTermTareDataMapper.selectByPrimaryKey(netDb.getActualFirst2No());
@@ -2249,6 +2260,7 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
             net = new BigDecimal(String.valueOf(netDb.getNetWeight())).setScale(2, BigDecimal.ROUND_HALF_UP);
             netDb.setNetWeight(net);
         }
+        netDb.setCreateTime(new Date());
         meterWorkCarActualMapper.insertSelective(netDb);
 
         //4、修改预报
@@ -2463,6 +2475,7 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
         oci.setActualFirstNo(no);
 
         oci.setValueFlag("1");
+        oci.setCreateTime(new Date());
         meterWorkCarActualFirstMapper.insertSelective(oci);
 
         //6、存储图片
@@ -2530,6 +2543,7 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
         String iActualNo = PublicMethod.IdCreate(3);
         secondDb.setActualFirstNo(iActualNo);
 
+        secondDb.setCreateTime(new Date());
         meterWorkCarActualFirstMapper.insertSelective(secondDb);
 
 
@@ -2561,6 +2575,7 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
             netDb.setNetWeight(net);
         }
         netDb.setUploadFlag("1");
+        netDb.setCreateTime(new Date());
         meterWorkCarActualMapper.insertSelective(netDb);
 
         //7、修改第一次存储的计量数据状态为洁净;预报编号相同时才处理(不是一车联运非互锁式)
@@ -2632,6 +2647,7 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
         } else {
             netDb1.setActualFirst2No(secondDb.getActualFirstNo());
         }
+        secondDb.setCreateTime(new Date());
         meterWorkCarActualFirstMapper.insertSelective(secondDb);
 
         // 第二条洁净数据的一次重量数据
@@ -2665,6 +2681,7 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
             net = new BigDecimal(String.valueOf(netDb1.getNetWeight())).setScale(2, BigDecimal.ROUND_HALF_UP);
             netDb1.setNetWeight(net);
         }
+        netDb1.setCreateTime(new Date());
         meterWorkCarActualMapper.insertSelective(netDb1);
 
 
@@ -2720,6 +2737,7 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
         String no = PublicMethod.IdCreate(3);
         oci.setActualFirstNo(no);
         oci.setValueFlag("1");
+        oci.setCreateTime(new Date());
         meterWorkCarActualFirstMapper.insertSelective(oci);
 
         //根据车号加预报编号修改 craneActualMapper
@@ -2776,6 +2794,7 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
         oci.setActualFirstNo(no);
 
         oci.setValueFlag("2");
+        oci.setCreateTime(new Date());
         meterWorkCarActualFirstMapper.insertSelective(oci);
 
         netDB.setActualFirst2No(oci.getActualFirstNo());
@@ -2792,6 +2811,7 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
         meterWorkCarActualFirstMapper.updateByPrimaryKeySelective(firstDb);
 
         //3、存储数据到洁净表
+        netDB.setCreateTime(new Date());
         meterWorkCarActualMapper.insert(netDB);
 
         //4、根据车号加预报编号修改 craneActualMapper
@@ -2846,6 +2866,7 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
             String firstNo01 = PublicMethod.IdCreate(3);
             first02.setActualFirstNo(firstNo01);
 
+            first02.setCreateTime(new Date());
             meterWorkCarActualFirstMapper.insertSelective(first02);
 
             MeterWorkCarActual actualRow = new MeterWorkCarActual();
@@ -2920,6 +2941,7 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
                 actualRow.setPredictionNo(scale.getPredictionNo());
                 actualRow.setPredictionType("7");
                 actualRow.setNetWeight(first02.getMeterWeight().subtract(model02.getMeterWeight()));
+
                 meterWorkCarActualMapper.insertSelective(actualRow);
 
             } else if (first02.getWeightType().equals("1")) {         //混卸
@@ -2999,6 +3021,7 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
                 first03.setActualFirstNo(fristNo03);
 
                 first03.setIsPreScale("0");
+                first03.setCreateTime(new Date());
                 meterWorkCarActualFirstMapper.insertSelective(first03);
             }
             //6、修改计量监控
@@ -3039,7 +3062,7 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
 
             String firstNo01 = PublicMethod.IdCreate(3);
             one.setActualFirstNo(firstNo01);
-
+            one.setCreateTime(new Date());
             meterWorkCarActualFirstMapper.insertSelective(one);
 
             MeterWorkCarActualFirst model01 = new MeterWorkCarActualFirst();
@@ -3131,6 +3154,7 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
             model03.setPredictionNo(scale02.getPredictionNo());
             model03.setPredictionType("5");
             model03.setPredictionCombination(scale01.getPredictionNo() + "," + scale02.getPredictionNo());
+            model03.setCreateTime(new Date());
             meterWorkCarActualFirstMapper.insertSelective(model03);
             //添加第二次皮重数据库
 //            String actualSecondNo = sdf.format(new Date()) + meterWorkCarActualFirstMapper.getNewID(afl);
@@ -3147,6 +3171,7 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
             model04.setPredictionNo(scale02.getPredictionNo());
             model04.setPredictionType("5");
             model04.setPredictionCombination(scale01.getPredictionNo() + "," + scale02.getPredictionNo());
+            model04.setCreateTime(new Date());
             meterWorkCarActualFirstMapper.insertSelective(model04);
 
             //将委托中的编号和收发货单位和一次数据等数据拷贝进结净数据中
@@ -3358,6 +3383,7 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
             mwcaf3.setPredictionNo(predictionNo2);
             mwcaf3.setPredictionType("7");
             mwcaf3.setPredictionCombination(predictionNo1 + "," + predictionNo2);
+            mwcaf3.setCreateTime(new Date());
             meterWorkCarActualFirstMapper.insertSelective(mwcaf3);
             //更新第二次毛重数据
             mwcaf4.setValueFlag(DbConstants.NET);
@@ -3547,6 +3573,7 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
             mwcaf3.setPredictionNo(predictionNo2);
             mwcaf3.setPredictionType("6");
             mwcaf3.setPredictionCombination(predictionNo1 + "," + predictionNo2);
+            mwcaf3.setCreateTime(new Date());
             meterWorkCarActualFirstMapper.insertSelective(mwcaf3);
             //更新第二次皮重数据
             mwcaf4.setValueFlag(DbConstants.NET);
@@ -3751,6 +3778,7 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
             mwcaf03.setPredictionNo(predictionNo2);
             mwcaf03.setPredictionType("5");
             mwcaf03.setPredictionCombination(predictionNo1 + "," + predictionNo2);
+            mwcaf03.setCreateTime(new Date());
             meterWorkCarActualFirstMapper.insertSelective(mwcaf03);
             //添加第二次皮重数据库
             SimpleDateFormat sdf01 = new SimpleDateFormat("yyyyMMdd");
@@ -3768,6 +3796,7 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
             mwcaf04.setPredictionNo(predictionNo2);
             mwcaf04.setPredictionType("5");
             mwcaf04.setPredictionCombination(predictionNo1 + "," + predictionNo2);
+            mwcaf04.setCreateTime(new Date());
             meterWorkCarActualFirstMapper.insertSelective(mwcaf04);
 
             //将委托中的编号和收发货单位和一次数据等数据拷贝进结净数据中
@@ -3792,6 +3821,7 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
             actualRow1.setPredictionType("5");
             actualRow1.setPredictionCombination(predictionNo1 + "," + predictionNo2);
             actualRow1.setNetWeight(mwcaf01.getMeterWeight().subtract(mwcaf02.getMeterWeight()));
+            actualRow1.setCreateTime(new Date());
             meterWorkCarActualMapper.insertSelective(actualRow1);
 
 //            String no1 = meterWorkCarActualMapper.getNewID(sdf.format(new Date()));
@@ -3809,6 +3839,7 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
             actualRow2.setPredictionType("5");
             actualRow2.setPredictionCombination(predictionNo1 + "," + predictionNo2);
             actualRow2.setNetWeight(mwcaf03.getMeterWeight().subtract(mwcaf04.getMeterWeight()));
+            actualRow2.setCreateTime(new Date());
             meterWorkCarActualMapper.insertSelective(actualRow2);
 
             rm.setSucceed();
@@ -3849,6 +3880,7 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
             secondDb.setActualFirstNo(no);
 
             secondDb.setValueFlag("2");//洁净
+            secondDb.setCreateTime(new Date());
             meterWorkCarActualFirstMapper.insertSelective(secondDb);
 
 //            String no1 = meterWorkCarActualMapper.getNewID(afl);
@@ -3863,6 +3895,7 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
             }
             netDb.setUploadFlag("1");
             netDb.setActualFirst1No(secondDb.getActualFirstNo());
+            netDb.setCreateTime(new Date());
             meterWorkCarActualMapper.insert(netDb);
 
             //4、将期限皮重转化为一条皮重计量数据保存
@@ -3997,6 +4030,7 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
                 model.setValueFlag("1");
                 model.setIsPreScale("0");
                 model.setDataSource("3");
+                model.setCreateTime(new Date());
                 meterWorkCarActualFirstMapper.insertSelective(model);
                 num++;
             }
@@ -4077,6 +4111,7 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
                 actualFirst.setActualFirstNo(no);
 
                 actualFirst.setValueFlag("2");//未洁净
+                actualFirst.setCreateTime(new Date());
                 int i = meterWorkCarActualFirstMapper.insertSelective(actualFirst);
 
                 //将毛重委托匹配到皮重中
@@ -4106,6 +4141,7 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
                 meterWorkCarActual.setIsPreScale("1");
                 meterWorkCarActual.setValueFlag("1");
                 meterWorkCarActual.setNetWeight(model.getMeterWeight().subtract(actualFirst.getMeterWeight()));
+                meterWorkCarActual.setCreateTime(new Date());
                 meterWorkCarActualMapper.insertSelective(meterWorkCarActual);
 
                 PreTrackScale preTrackScale = new PreTrackScale();
@@ -4157,6 +4193,7 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
             String no = PublicMethod.IdCreate(3);
             secondDb.setActualFirstNo(no);
             secondDb.setValueFlag("2");//洁净
+            secondDb.setCreateTime(new Date());
             meterWorkCarActualFirstMapper.insertSelective(secondDb);
 
             //修改一次计量数据为洁净
@@ -4200,6 +4237,7 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
                 netDb.setNetWeight(net);
             }
             netDb.setUploadFlag("1");
+            netDb.setCreateTime(new Date());
             meterWorkCarActualMapper.insert(netDb);
 
             //4、如果为期限皮重,则将期限皮重转化为一条皮重计量数据保存
@@ -4314,6 +4352,7 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
                     String no1 = PublicMethod.IdCreate(3);
                     grossModel.setActualFirstNo(no1);
                     grossModel.setValueFlag("2");//洁净
+                    grossModel.setCreateTime(new Date());
                     meterWorkCarActualFirstMapper.insertSelective(grossModel);
                 }
                 else {
@@ -4324,6 +4363,7 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
                     String no1 = PublicMethod.IdCreate(3);
                     tareModel.setActualFirstNo(no1);
                     tareModel.setValueFlag("2");//洁净
+                    tareModel.setCreateTime(new Date());
                     meterWorkCarActualFirstMapper.insertSelective(tareModel);
                 }
 
@@ -4382,6 +4422,7 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
                 model.setPredictionNo(scale.getPredictionNo());
                 model.setPredictionType("1");
                 model.setNetWeight(grossModel.getMeterWeight().subtract(tareModel.getMeterWeight()));
+                model.setCreateTime(new Date());
                 meterWorkCarActualMapper.insertSelective(model);
             } else {
                 rm.setMessage("委托信息编号不能为空,请确认!!");
@@ -4543,6 +4584,7 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
 
             tare.setValueFlag("0");//洁净
             tare.setWeightType("1");
+            tare.setCreateTime(new Date());
             meterWorkCarActualFirstMapper.insertSelective(tare);
 
             //将皮重数据保存或更新到期限皮中
@@ -4644,6 +4686,7 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
                 mwca.setPredictionNo(model.getPredictionNo());
                 mwca.setPredictionType("1");
                 mwca.setNetWeight(model.getMeterWeight().subtract(imTare.getMeterWeight()));
+                mwca.setCreateTime(new Date());
                 meterWorkCarActualMapper.insertSelective(mwca);
 
                 //修改委托

+ 1 - 0
src/main/java/com/steerinfo/meterwork/meterworkgrabactual/service/impl/MeterWorkGrabActualServiceImpl.java

@@ -51,6 +51,7 @@ public class MeterWorkGrabActualServiceImpl extends BaseServiceImpl<MeterWorkGra
             String no = meterWorkGrabActualMapper.getNewID(afl);
             model.setActualNo(sdf.format(new Date()) + no);
             model.setValidFlag("1");
+            model.setCreateTime(new Date());
             int num = meterWorkGrabActualMapper.insertSelective(model);
             return num;
         } catch (MarkerMetException e) {

+ 2 - 0
src/main/java/com/steerinfo/meterwork/meterworkhookactfirst/service/impl/MeterWorkHookActFirstServiceImpl.java

@@ -80,6 +80,7 @@ public class MeterWorkHookActFirstServiceImpl extends BaseServiceImpl<MeterWorkH
             SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
             String no = meterWorkHookActFirstMapper.getNewID(sdf.format(new Date()));
             model.setActualFirstNo(sdf.format(new Date()) + no);
+            model.setCreateTime(new Date());
             int num = meterWorkHookActFirstMapper.insertSelective(model);
             return num;
         } catch (MarkerMetException e) {
@@ -687,6 +688,7 @@ public class MeterWorkHookActFirstServiceImpl extends BaseServiceImpl<MeterWorkH
         model.setValueFlag("1");
         model.setCheckFlag("0");
         model.setMeterMode("1");
+        model.setCreateTime(new Date());
         meterWorkHookActFirstMapper.insertSelective(model);
         return model.getActualFirstNo();
     }

+ 33 - 2
src/main/java/com/steerinfo/meterwork/meterworkrailwayactfirst/service/impl/MeterWorkRailwayActFirstServiceImpl.java

@@ -130,6 +130,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
             SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
             String no = meterWorkRailwayActFirstMapper.getNewID(sdf.format(new Date()));
             model.setActualFirstNo(sdf.format(new Date()) + no);
+            model.setCreateTime(new Date());
             int i = meterWorkRailwayActFirstMapper.insertSelective(model);
 
             if(i >= 1) {
@@ -591,6 +592,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
             //存储当前计量的数据
             String firstNo01 = sdf.format(new Date()) + meterWorkRailwayActFirstMapper.getNewID(afl);
             first02.setActualFirstNo(firstNo01);
+            first02.setCreateTime(new Date());
             meterWorkRailwayActFirstMapper.insertSelective(first02);
 
             MeterWorkRailwayActual actualRow = new MeterWorkRailwayActual();
@@ -734,6 +736,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
             if(first03 != null) {
                 String fristNo03 = sdf.format(new Date()) + meterWorkRailwayActFirstMapper.getNewID(afl);
                 first03.setActualFirstNo(fristNo03);
+                first03.setCreateTime(new Date());
                 meterWorkRailwayActFirstMapper.insertSelective(first03);
             }
             /*//6、修改计量监控
@@ -770,6 +773,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
             //存储当前计量的数据
             String firstNo01 = sdf.format(new Date()) + meterWorkRailwayActFirstMapper.getNewID(afl);
             one.setActualFirstNo(firstNo01);
+            one.setCreateTime(new Date());
             meterWorkRailwayActFirstMapper.insertSelective(one);
 
             MeterWorkRailwayActFirst model01 = new MeterWorkRailwayActFirst();
@@ -858,6 +862,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
             model03.setPredictionNo(scale02.getPredictionNo());
             model03.setPredictionType("5");
             model03.setPredictionCombination(scale01.getPredictionNo() + "," + scale02.getPredictionNo());
+            model03.setCreateTime(new Date());
             meterWorkRailwayActFirstMapper.insertSelective(model03);
             //添加第二次皮重数据库
             String actualSecondNo = sdf.format(new Date()) + meterWorkRailwayActFirstMapper.getNewID(afl);
@@ -871,6 +876,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
             model04.setPredictionNo(scale02.getPredictionNo());
             model04.setPredictionType("5");
             model04.setPredictionCombination(scale01.getPredictionNo() + "," + scale02.getPredictionNo());
+            model04.setCreateTime(new Date());
             meterWorkRailwayActFirstMapper.insertSelective(model04);
 
             //将委托中的编号和收发货单位和一次数据等数据拷贝进结净数据中
@@ -986,6 +992,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                 //存储当前计量的数据
                 String firstNo01 = sdf.format(new Date()) + meterWorkRailwayActFirstMapper.getNewID(afl);
                 first02.setActualFirstNo(firstNo01);
+                first02.setCreateTime(new Date());
                 meterWorkRailwayActFirstMapper.insertSelective(first02);
 
                 MeterWorkRailwayActual actualRow = new MeterWorkRailwayActual();
@@ -1115,6 +1122,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                     first02.setActualFirstNo(firstNo);
                     first02.setPredictionNo("混装混卸复制");
                     first02.setValueFlag("1");
+                    first02.setCreateTime(new Date());
                     meterWorkRailwayActFirstMapper.insertSelective(first02);
                 }else {
                     model01.setPredictionNo("");
@@ -1177,6 +1185,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                 //存储当前计量的数据
                 String firstNo01 = sdf.format(new Date()) + meterWorkRailwayActFirstMapper.getNewID(afl);
                 first02.setActualFirstNo(firstNo01);
+                first02.setCreateTime(new Date());
                 meterWorkRailwayActFirstMapper.insertSelective(first02);
 
                 MeterWorkRailwayActual actualRow = new MeterWorkRailwayActual();
@@ -1319,6 +1328,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                     first02.setActualFirstNo(firstNo);
                     first02.setPredictionNo("混装混卸复制");
                     first02.setValueFlag("1");
+                    first02.setCreateTime(new Date());
                     meterWorkRailwayActFirstMapper.insertSelective(first02);
                 }
             /*//6、修改计量监控
@@ -1403,6 +1413,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
             //存储当前计量的数据
             String firstNo01 = sdf.format(new Date()) + meterWorkRailwayActFirstMapper.getNewID(afl);
             first02.setActualFirstNo(firstNo01);
+            first02.setCreateTime(new Date());
             meterWorkRailwayActFirstMapper.insertSelective(first02);
 
             MeterWorkRailwayActFirst model01 = new MeterWorkRailwayActFirst();
@@ -1489,6 +1500,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
             model03.setPredictionNo(scale02.getPredictionNo());
             model03.setPredictionType("5");
             model03.setPredictionCombination(scale01.getPredictionNo() + "," + scale02.getPredictionNo());
+            model03.setCreateTime(new Date());
             meterWorkRailwayActFirstMapper.insertSelective(model03);
             //添加第二次皮重数据库
             String actualSecondNo = sdf.format(new Date()) + meterWorkRailwayActFirstMapper.getNewID(afl);
@@ -1502,6 +1514,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
             model04.setPredictionNo(scale02.getPredictionNo());
             model04.setPredictionType("5");
             model04.setPredictionCombination(scale01.getPredictionNo() + "," + scale02.getPredictionNo());
+            model04.setCreateTime(new Date());
             meterWorkRailwayActFirstMapper.insertSelective(model04);
 
             //将委托中的编号和收发货单位和一次数据等数据拷贝进结净数据中
@@ -1692,6 +1705,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
             mwcaf03.setPredictionNo(predictionNo2);
             mwcaf03.setPredictionType("5");
             mwcaf03.setPredictionCombination(predictionNo1 + "," + predictionNo2);
+            mwcaf03.setCreateTime(new Date());
             meterWorkRailwayActFirstMapper.insertSelective(mwcaf03);
             //添加第二次皮重数据库
             SimpleDateFormat sdf01 = new SimpleDateFormat("yyyyMMdd");
@@ -1706,6 +1720,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
             mwcaf04.setPredictionNo(predictionNo2);
             mwcaf04.setPredictionType("5");
             mwcaf04.setPredictionCombination(predictionNo1 + "," + predictionNo2);
+            mwcaf04.setCreateTime(new Date());
             meterWorkRailwayActFirstMapper.insertSelective(mwcaf04);
             //将委托中的编号和收发货单位和一次数据等数据拷贝进结净数据中
             MeterWorkRailwayActual mwca1 = meterWorkRailwayActualMapper.manualAddPre(actualNo1, actualNo2, predictionNo1);
@@ -1865,6 +1880,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
             mwcaf3.setPredictionNo(predictionNo2);
             mwcaf3.setPredictionType("7");
             mwcaf3.setPredictionCombination(predictionNo1 + "," + predictionNo2);
+            mwcaf3.setCreateTime(new Date());
             meterWorkRailwayActFirstMapper.insertSelective(mwcaf3);
             //更新第二次毛重数据
             mwcaf4.setValueFlag(DbConstants.NET);
@@ -2043,6 +2059,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
             mwcaf3.setPredictionNo(predictionNo2);
             mwcaf3.setPredictionType("6");
             mwcaf3.setPredictionCombination(predictionNo1 + "," + predictionNo2);
+            mwcaf3.setCreateTime(new Date());
             meterWorkRailwayActFirstMapper.insertSelective(mwcaf3);
             //更新第二次皮重数据
             mwcaf4.setValueFlag(DbConstants.NET);
@@ -2121,6 +2138,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
         BigDecimal weight = (new BigDecimal(tareWeight)).multiply(new BigDecimal(1000));
         tareModel.setMeterWeight(weight);
         tareModel.setWeightType("4");
+        tareModel.setCreateTime(new Date());
         int i = meterWorkRailwayActFirstMapper.insert(tareModel);
 
         if(i >= 1){
@@ -2219,6 +2237,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
             tareModel.setActualFirstNo(firstNo);
             tareModel.setMeterWeight(new BigDecimal(tareWeight));
             tareModel.setWeightType("3");
+            tareModel.setCreateTime(new Date());
             int i = meterWorkRailwayActFirstMapper.insert(tareModel);
 
             if(i >= 1){
@@ -2323,7 +2342,6 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
             mwcaf1.setCreateManNo(model.getCreateManNo());
             mwcaf1.setCreateManName(model.getCreateManName());
             mwcaf1.setCreateTime(new Date());
-
             mwcaf1.setBaseSpotNo(model.getBaseSpotNo());
             mwcaf1.setBaseSpotName(model.getBaseSpotName());
             mwcaf1.setRailwayModelNo(model.getRailwayModelNo());
@@ -2736,7 +2754,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
         netRail.setUploadFlag("1");
 //        String netNoNew= PublicMethod.IdCreate(2);
 //        netRail.setActualNo(netNoNew);
-
+        firstRail.setCreateTime(new Date());
         meterWorkRailwayActFirstMapper.insertSelective(firstRail);
         meterWorkRailwayActualMapper.insertSelective(netRail);
         //修改预报状态
@@ -3121,11 +3139,13 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
             //存储当前计量的数据
             if(grossModel.getActualFirstNo() == null) {
                 grossModel.setActualFirstNo(firstNo);
+                grossModel.setCreateTime(new Date());
                 meterWorkRailwayActFirstMapper.insertSelective(grossModel);
                 flag = "0";
             }
             if(tareModel.getActualFirstNo() == null) {
                 tareModel.setActualFirstNo(firstNo);
+                tareModel.setCreateTime(new Date());
                 meterWorkRailwayActFirstMapper.insertSelective(tareModel);
                 flag = "1";
             }
@@ -3315,6 +3335,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
         model.setValueFlag("1");
         model.setCheckFlag("0");
         model.setMeterMode("1");
+        model.setCreateTime(new Date());
         meterWorkRailwayActFirstMapper.insertSelective(model);
         return model.getActualFirstNo();
     }
@@ -3332,6 +3353,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
         model.setValueFlag("1");
         model.setCheckFlag("0");
         model.setMeterMode("1");
+        model.setCreateTime(new Date());
         meterWorkRailwayActFirstMapper.insertSelective(model);
         return model.getActualFirstNo();
     }
@@ -3380,6 +3402,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
         firstRail.setActualFirstNo(afl + firstNo);
         firstRail.setValueFlag("1");
         firstRail.setCheckFlag("0");
+        firstRail.setCreateTime(new Date());
         meterWorkRailwayActFirstMapper.insertSelective(firstRail);
         return firstRail;
     }
@@ -3810,6 +3833,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                 String afl = sdf.format(new Date());
                 String netNo = meterWorkRailwayActFirstMapper.getNewID(afl);
                 mwrac.setActualFirstNo(afl + netNo);
+                mwrac.setCreateTime(new Date());
                 meterWorkRailwayActFirstMapper.insertSelective(mwrac);
                 count++;
             }
@@ -4100,6 +4124,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
             if (StringUtils.isEmpty(first.getRailwayNo())) {
                 first.setActualFirstNo(afl + meterWorkRailwayActFirstMapper.getNewID(afl));
                 first.setRailwayNo("无车号");
+                first.setCreateTime(new Date());
                 int i = meterWorkRailwayActFirstMapper.insertSelective(first);
                 if (i >= 1) {
                     firsts.add(first);
@@ -4121,11 +4146,13 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                 if (firstList.size() >= 1) {
                     if (firstList.size() == 1) {
                         first.setActualFirstNo(afl + meterWorkRailwayActFirstMapper.getNewID(afl));
+                        first.setCreateTime(new Date());
                         meterWorkRailwayActFirstMapper.insertSelective(first);
                         BigDecimal num = firstList.get(0).getMeterWeight().subtract(first.getMeterWeight()).abs();
                         //洁净数据不能小于10t
                         if(num.compareTo(DbConstants.RAILWAY_WEIGHT) == -1){
                             first.setActualFirstNo(afl + meterWorkRailwayActFirstMapper.getNewID(afl));
+                            first.setCreateTime(new Date());
                             int i = meterWorkRailwayActFirstMapper.insertSelective(first);
                             if (i >= 1) {
                                 railwayHelp.setHelpContent("计量完成,车号" + first.getRailwayNo() + "存在重量相近的一次记录,无法自动结净匹配");
@@ -4164,6 +4191,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                         return rm;
                     } else if (firstList.size() >= 2) {
                         first.setActualFirstNo(afl + meterWorkRailwayActFirstMapper.getNewID(afl));
+                        first.setCreateTime(new Date());
                         int i = meterWorkRailwayActFirstMapper.insertSelective(first);
                         if (i >= 1) {
                             firsts.add(first);
@@ -4179,6 +4207,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                     }
                 } else {
                     first.setActualFirstNo(afl + meterWorkRailwayActFirstMapper.getNewID(afl));
+                    first.setCreateTime(new Date());
                     int i = meterWorkRailwayActFirstMapper.insertSelective(first);
                     if (i >= 1) {
                         firsts.add(first);
@@ -4383,12 +4412,14 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
             MeterWorkRailwayActFirst grossModel = model;
             grossModel.setActualFirstNo(afl + meterWorkRailwayActFirstMapper.getNewID(afl));
             grossModel.setWeightType("0");
+            grossModel.setCreateTime(new Date());
             meterWorkRailwayActFirstMapper.insertSelective(grossModel);
             //标识皮重保存
             MeterWorkRailwayActFirst tareModel = meterWorkRailwayActFirstMapper.selectByPrimaryKey(grossModel.getActualFirstNo());
             tareModel.setActualFirstNo(afl + meterWorkRailwayActFirstMapper.getNewID(afl));
             tareModel.setMeterWeight(model.getRailwayFactoryWeight());
             tareModel.setWeightType("1");
+            tareModel.setCreateTime(new Date());
             meterWorkRailwayActFirstMapper.insertSelective(tareModel);
 
             MeterWorkRailwayActual actualRow = new MeterWorkRailwayActual();

+ 6 - 1
src/main/java/com/steerinfo/meterwork/meterworkrailwayactual/service/impl/MeterWorkRailwayActualServiceImpl.java

@@ -292,6 +292,7 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
             }else{
                 throw new MarkerMetException(500, "选中两条一次计量数据中列车车次不一致!!!");
             }
+            actualRow.setCreateTime(new Date());
             meterWorkRailwayActualMapper.insertSelective(actualRow);
 
             //预报的处理
@@ -367,7 +368,7 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
                 actualRow.setUploadFlag("1");
                 actualRow.setNote(Notes);
                 actualRow.setLcNo(actFirst01.getLcNo());
-
+                actualRow.setCreateTime(new Date());
                 meterWorkRailwayActualMapper.insertSelective(actualRow);
                 rm.setSucceed();
                 rm.setData(actualRow);
@@ -523,6 +524,7 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
         model.setValueFlag("1");
         model.setUploadFlag("1");
 //        model.setNote(); // 添加修改原因记录
+        model.setCreateTime(new Date());
         int num = meterWorkRailwayActualMapper.insertSelective(model);
         return num;
     }
@@ -904,6 +906,7 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
             mwca.setActualNo(sdf.format(new Date()) + no);
             mwca.setNetWeight(mwraf1.getMeterWeight().subtract(mbrw.getRailwayWeight()));
             mwca.setUploadFlag("1");
+            mwca.setCreateTime(new Date());
             meterWorkRailwayActualMapper.insertSelective(mwca);
             return mwca;
         } catch (MarkerMetException e) {
@@ -1525,6 +1528,7 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
                 model.setDataSource("4");
                 model.setIsPreSacale("0");
                 model.setUploadFlag("1");
+                model.setCreateTime(new Date());
                 meterWorkRailwayActualMapper.insertSelective(model);
                 num++;
             }
@@ -1586,6 +1590,7 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
                 model.setNetMode("3");
                 model.setDataSource("4");
                 model.setUploadFlag("1");
+                model.setCreateTime(new Date());
                 meterWorkRailwayActualMapper.insertSelective(model);
                 num++;
             }

+ 3 - 0
src/main/java/com/steerinfo/meterwork/meterworkstorageactual/service/impl/MeterWorkStorageActualServiceImpl.java

@@ -201,6 +201,7 @@ public class MeterWorkStorageActualServiceImpl extends BaseServiceImpl<MeterWork
         String no = meterWorkStorageActualMapper.getNewID(sdf.format(new Date()));
         model.setActualNo(sdf.format(new Date()) + no);
         model.setPredictionNo(model.getActualNo());
+        model.setCreateTime(new Date());
         meterWorkStorageActualMapper.insertSelective(model);
         //保存图片
         SaveImg(model);
@@ -376,6 +377,7 @@ public class MeterWorkStorageActualServiceImpl extends BaseServiceImpl<MeterWork
                 String maxID = comBaseInfoMapper.getConfigID("meter_work_storage_actual", "actual_no");
                 InsertStorage.setActualNo(maxID);
                 InsertStorage.setValueFlag(DbConstants.STORAGE_ACTUAL_VALUE_VALID);
+                InsertStorage.setCreateTime(new Date());
                 meterWorkStorageActualMapper.insertSelective(InsertStorage);
                 //保存图片
                 SaveImg(InsertStorage);
@@ -400,6 +402,7 @@ public class MeterWorkStorageActualServiceImpl extends BaseServiceImpl<MeterWork
                 InsertStorage.setValueFlag(DbConstants.STORAGE_ACTUAL_VALUE_VALID);
                 String maxID = comBaseInfoMapper.getConfigID("meter_work_storage_actual", "actual_no");
                 InsertStorage.setActualNo(maxID);
+                InsertStorage.setCreateTime(new Date());
                 meterWorkStorageActualMapper.insertSelective(InsertStorage);
                 SyncDataToMes00031(InsertStorage);
                 SyncDataToMes00033(InsertStorage);

+ 1 - 0
src/main/java/com/steerinfo/server/serverimpl/WebServerimpl.java

@@ -101,6 +101,7 @@ public class WebServerimpl implements WebServer {
             int icnt=storageActualMapper.isHaveCntWf(mq);
             if(icnt==0) {
                 online.setActualNo(no + String.format("%04d", i++));
+                online.setCreateTime(new Date());
                 storageActualMapper.insertSelective(online);
             }
         }