后端修改

src/main/java/com/steerinfo/filter/SecurityFilter.java

@@ -4,6 +4,7 @@ import cn.hutool.json.JSONObject;
 import com.alibaba.fastjson.JSON;
 import com.steerinfo.framework.controller.RESTfulResult;
 import org.springframework.stereotype.Component;
+import org.springframework.transaction.interceptor.TransactionAspectSupport;
 import org.springframework.util.DigestUtils;
 import org.springframework.util.StringUtils;
 
@@ -38,6 +39,10 @@ public class SecurityFilter implements Filter {
         ///apifox导入请求路径：v2/api-docs
         if ("/jgjl/v1/meterbasecars/appregister".equals(path)
                 ||"/jgjl/v1/meterbasecars/applogin".equals(path)
+                ||"/v1/MeterWorkZnlc/GetWeightFromJL".equals(path)
+                ||"/v1/MeterWorkZnlc/HasPermissionGivenByJL".equals(path)
+                ||"/v1/MeterWorkZnlc/IsRecorded".equals(path)
+                ||"/v1/MeterWorkZnlc/SendTruckInPlaceToJL".equals(path)
                 ||"/v2/api-docs".equals(path)){
             filterChain.doFilter(servletRequest,servletResponse);
             return;
@@ -48,7 +53,7 @@ public class SecurityFilter implements Filter {
         //网页代理ip：https://jgwzjl.jiugang.com/icore.icp.web/pass/systemBase/v1/meterbasecars/applogin
         //本地：http://10.104.4.105:9004/v1/meterbasecars/applogin
         if(request.getRemoteAddr().equals("10.1.201.188")
-                ||request.getRemoteAddr().equals("10.104.4.105")
+//                ||request.getRemoteAddr().equals("10.104.4.105")
                 ||request.getRemoteAddr().equals("0:0:0:0:0:0:0:1")
                 ||request.getRemoteAddr().equals("10.104.0.1")
             ) {

src/main/java/com/steerinfo/meterwork/meterworkcaractualfirst/controller/MeterWorkCarActualFirstController.java

@@ -1145,12 +1145,10 @@ public class MeterWorkCarActualFirstController extends BaseRESTfulController {
             String predictionNo2 = parmas.get("predictionNo2").toString();
 
             rm = meterWorkCarActualFirstService.doubleEntrustmentMatch(actualNo1, actualNo2,predictionNo1,predictionNo2);
-            if(!rm.isSucceed()) {
-                TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
-            }
             return rm;
         } catch (Exception ex) {
             ex.printStackTrace();
+            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
             throw new MarkerMetException(500, "操作异常！！");
         }
     }

src/main/java/com/steerinfo/meterwork/meterworkimagetemp/mapper/MeterWorkImageTempMapper.java

@@ -1,9 +1,14 @@
 package com.steerinfo.meterwork.meterworkimagetemp.mapper;
 
+import com.steerinfo.framework.controller.RESTfulResult;
 import com.steerinfo.framework.mapper.IBaseMapper;
 import com.steerinfo.meterwork.meterworkimagetemp.model.MeterWorkImageTemp;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.HashMap;
+import java.util.List;
+
 @Mapper
 public interface MeterWorkImageTempMapper extends IBaseMapper<MeterWorkImageTemp, String> {
+    List<MeterWorkImageTemp> imageQuery(HashMap<String, Object> params);
 }

src/main/java/com/steerinfo/meterwork/meterworkimagetemp/mapper/MeterWorkImageTempMapper.xml

@@ -261,5 +261,15 @@
   </delete>
   <!-- 友情提示！！！-->
   <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
-  
+
+  <select id="imageQuery" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+    <include refid="select"/>
+    where 1 = 1
+      <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
+        and  image_time  >= TO_DATE(#{startTime}, 'yyyy-MM-dd HH24:mi:ss') and image_time  &lt;=  TO_DATE(#{endTime}, 'yyyy-MM-dd HH24:mi:ss')
+      </if>
+      <if test="valueFlag != null and valueFlag != ''">
+        and  value_flag = #{valueFlag}
+      </if>
+  </select>
 </mapper>

src/main/java/com/steerinfo/meterwork/meterworkimagetemp/service/impl/MeterWorkImageTempServiceImpl.java

@@ -1,12 +1,16 @@
 package com.steerinfo.meterwork.meterworkimagetemp.service.impl;
 
+import com.steerinfo.baseinfo.combaseinfo.mapper.ComBaseInfoMapper;
+import com.steerinfo.baseinfo.combaseinfo.model.ComBaseInfo;
 import com.steerinfo.framework.controller.RESTfulResult;
 import com.steerinfo.framework.mapper.IBaseMapper;
 import com.steerinfo.framework.service.impl.BaseServiceImpl;
+import com.steerinfo.meterwork.meterworkimage.mapper.MeterWorkImageMapper;
 import com.steerinfo.meterwork.meterworkimage.model.MeterWorkImage;
 import com.steerinfo.meterwork.meterworkimagetemp.mapper.MeterWorkImageTempMapper;
 import com.steerinfo.meterwork.meterworkimagetemp.model.MeterWorkImageTemp;
 import com.steerinfo.meterwork.meterworkimagetemp.service.IMeterWorkImageTempService;
+import com.steerinfo.meterwork.meterworkrailwayreceived.mapper.MeterWorkRailwayReceivedMapper;
 import com.steerinfo.meterwork.meterworkrailwayreceived.model.MeterWorkRailwayReceived;
 import com.steerinfo.util.PublicMethod;
 import com.steerinfo.util.StringUtils;
@@ -15,10 +19,12 @@ import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import javax.annotation.Resource;
 import java.text.SimpleDateFormat;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.HashMap;
+import java.util.List;
 
 /**
  * MeterWorkImageTemp服务实现：
@@ -36,9 +42,18 @@ import java.util.HashMap;
 @Service(value = "meterWorkImageTempService")
 public class MeterWorkImageTempServiceImpl extends BaseServiceImpl<MeterWorkImageTemp, String> implements IMeterWorkImageTempService {
 
-    @Autowired(required = false)
+    @Resource
     private MeterWorkImageTempMapper meterWorkImageTempMapper;
 
+    @Resource
+    private MeterWorkImageMapper meterWorkImageMapper;
+
+    @Resource
+    private MeterWorkRailwayReceivedMapper meterWorkRailwayReceivedMapper;
+
+    @Resource
+    private ComBaseInfoMapper comBaseInfoMapper;
+
     @Override
     protected IBaseMapper<MeterWorkImageTemp, String> getMapper() {
         return meterWorkImageTempMapper;
@@ -64,6 +79,59 @@ public class MeterWorkImageTempServiceImpl extends BaseServiceImpl<MeterWorkImag
 //    @Scheduled(cron = "0/30 * * * * ? ")
     @Transactional
     public void imageAutoUpload(){
+        ComBaseInfo baseInfo = comBaseInfoMapper.selectByPrimaryKey("001043006");
+        if(baseInfo != null && baseInfo.getBaseName() != null && StringUtils.isNotEmpty(baseInfo.getBaseName())) {
+            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+            Date imageTime = new Date();
+            Calendar beforeD = Calendar.getInstance();
+            Calendar afterD = Calendar.getInstance();
+            beforeD.setTime(imageTime);
+            afterD.setTime(imageTime);
+            beforeD.add(Calendar.MINUTE, -Integer.parseInt(baseInfo.getBaseName()));
+            afterD.add(Calendar.MINUTE, 0);
+            String startTime = sdf.format(beforeD.getTime());
+            String endTime = sdf.format(afterD.getTime());
+            HashMap<String, Object> imageMap = new HashMap();
+            imageMap.put("startTime", startTime);
+            imageMap.put("endTime", endTime);
+            imageMap.put("valueFlag", "1");
 
+            //查询图片中间表 当前时间-baseInfo.getBaseName()至当前时间的图片信息
+            List<MeterWorkImageTemp> imageTemps = meterWorkImageTempMapper.imageQuery(imageMap);
+            if(imageTemps.size() >= 1) {
+                for(MeterWorkImageTemp imageTemp: imageTemps) {
+                    Date createTime = new Date();
+                    Calendar beforeDTemp = Calendar.getInstance();
+                    Calendar afterDTemp = Calendar.getInstance();
+                    beforeDTemp.setTime(createTime);
+                    afterDTemp.setTime(createTime);
+                    beforeD.add(Calendar.MINUTE, -6);
+                    afterD.add(Calendar.MINUTE, 0);
+                    String startTimeTemp = sdf.format(beforeDTemp.getTime());
+                    String endTimeTemp = sdf.format(afterDTemp.getTime());
+                    HashMap<String, Object> receivedMap = new HashMap();
+                    receivedMap.put("startTime", startTimeTemp);
+                    receivedMap.put("endTime", endTimeTemp);
+                    receivedMap.put("railwayNo", imageTemp.getRailwayNo());
+                    receivedMap.put("baseSpotNo", imageTemp.getBaseSpotNo());
+
+                    List<MeterWorkRailwayReceived> receiveds = meterWorkRailwayReceivedMapper.getReceived(receivedMap);
+                    if(receiveds.size() == 1) {
+                        MeterWorkImage image = meterWorkImageMapper.selectByPrimaryKey(receiveds.get(0).getActualFirstNo());
+                        if(image != null) {
+                            if(imageTemp.getImageUrl1().indexOf("P1") != -1) {
+                                image.setImageFile3(imageTemp.getImageUrl1());
+                            }else if(imageTemp.getImageUrl1().indexOf("P2") != -1) {
+                                image.setImageFile4(imageTemp.getImageUrl1());
+                            }
+                            meterWorkImageMapper.updateByPrimaryKeySelective(image);
+
+                            imageTemp.setValueFlag("1");
+                            meterWorkImageTempMapper.updateByPrimaryKeySelective(imageTemp);
+                        }
+                    }
+                }
+            }
+        }
     }
 }

src/main/java/com/steerinfo/meterwork/meterworkoldandnew/mapper/MeterWorkOldAndNewMapper.xml

@@ -96,7 +96,7 @@
         <if test="remark != null and remark != ''">
             and '老系统' LIKE '%${remark}%'
         </if>
-        <if test="predictionNo != null and predictionNo != ''">Dynamic
+        <if test="predictionNo != null and predictionNo != ''">
             and fs_noticeId LIKE '%${predictionNo}%'
         </if>
         <if test="senderRemark != null and senderRemark != ''">
@@ -903,7 +903,7 @@ where FS_ISVALID = '1' and FS_DELETEDTAG = 'N' and (FS_BALANCETYPE='静态' or F
         sender_remark,
         '新系统' remark
         from meter_work_railway_act_first
-        where VALUE_FLAG in ('2') and RAILWAY_TYPE_NO in ('001019002', '001019004')
+        where VALUE_FLAG in ('1','2') and RAILWAY_TYPE_NO in ('001019002', '001019004')
         <if test="remark != null and remark != ''">
             and '新系统' LIKE '%${remark}%'
         </if>

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

@@ -5072,6 +5072,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                 String netNo = PublicMethod.IdCreate(3);
                 mwrac.setActualFirstNo(netNo);
                 mwrac.setLcNo(model.getRailwayWorkNo());
+                mwrac.setWeightType("1");
 //                mwrac.setCreateTime(new Date());
                 meterWorkRailwayActFirstMapper.insertSelective(mwrac);
                 count++;

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

@@ -20,4 +20,7 @@ public interface MeterWorkRailwayReceivedMapper extends IBaseMapper<MeterWorkRai
     MeterWorkRailwayReceived getPrimaryKey(HashMap params);
     HashMap getCount(HashMap params);
     MeterWorkRailwayReceived selectAndRemove(@Param(value = "actualFirstNo")String actualFirstNo);
+
+    //动态衡图片中间表自动获取从表数据
+    List<MeterWorkRailwayReceived> getReceived(HashMap<String, Object> params);
 }

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

@@ -2033,5 +2033,21 @@
   <select id="getCount" parameterType="java.util.HashMap" resultType="HashMap">
     select count(1) as countNum from meter_work_railway_received A where railway_work_no = #{railwayWorkNo} and  value_flag = '1'
   </select>
-  
+
+  <select id="getReceived" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+    <include refid="select" />
+    where 1 = 1
+      <if test="railwayNo != null and railwayNo != ''">
+        and  railway_no = #{railwayNo}
+      </if>
+      <if test="valueFlag != null and valueFlag != ''">
+        and  value_flag = #{valueFlag}
+      </if>
+      <if test="baseSpotNo != null and baseSpotNo != ''">
+        and  base_spot_no = #{baseSpotNo}
+      </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>

src/main/java/com/steerinfo/meterwork/meterworkznlc/controller/MeterWorkZnlcController.java

@@ -11,6 +11,7 @@ import com.steerinfo.meterwork.meterworkcaractualfirst.mapper.MeterWorkCarActual
 import com.steerinfo.meterwork.meterworkcaractualfirst.model.MeterWorkCarActualFirst;
 import com.steerinfo.meterwork.meterworkznlc.service.IMeterWorkZnlcService;
 import com.steerinfo.meterwork.meterworkznlc.service.impl.MeterWorkZnlcService;
+import com.steerinfo.util.StringUtils;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -74,7 +75,21 @@ public class MeterWorkZnlcController extends BaseRESTfulController {
     @ApiOperation(value="根据检斤号查询称重信息", notes="根据检斤号查询称重信息")
     @PostMapping(value = "/GetWeightFromJL")
     public RESTfulResult GetWeightFromJL(@RequestBody String weightVoucherNo) {
-        RESTfulResult rm = meterWorkZnlcService.getOldActual(weightVoucherNo);
+        RESTfulResult rm = new RESTfulResult();
+        rm.setSucceed();
+        rm.setCode("200");
+        rm.setMessage("操作成功！！");
+        if(StringUtils.isEmpty(weightVoucherNo)) {
+            rm.setData(null);
+            return rm;
+        }
+
+        HashMap<String, Object> map = new HashMap<>();
+        HashMap<String, Object> param = new HashMap<>();
+        map.put("predictionNo", weightVoucherNo);
+        if(meterWorkZnlcService.getNewActual(rm, map, param)) return rm;
+        else if (meterWorkZnlcService.getOldActual(rm, map, param)) return rm;
+
         return rm;
     }
 

src/main/java/com/steerinfo/meterwork/meterworkznlc/mapper/MeterWorkZnlcMapper.xml

@@ -11,7 +11,7 @@
         FS_NetWeight as NetWeight,
         FS_NETWeighttime as MeteringTime,
         '系统' as MetringPerson
-        from view_car_net
+        from JGWEIGHT.view_car_net
         where fs_noticeid = #{predictionNo}
     </select>
 
@@ -21,8 +21,8 @@
                 carNo as ConveyanceNo,
                 weight as GrossWeight,
                 weightTime as MeteringTime
-                from view_car_first
-        where fs_noticeid = #{predictionNo}
+                from JGWEIGHT.view_car_first
+        where noticeid = #{predictionNo}
     </select>
 
 </mapper>

src/main/java/com/steerinfo/meterwork/meterworkznlc/service/IMeterWorkZnlcService.java

@@ -12,6 +12,6 @@ import java.util.List;
 public interface IMeterWorkZnlcService {
 
     // 汽车衡联合查询Service
-    RESTfulResult getOldActual(String predictionNo);
-    Boolean oldMetering(RESTfulResult rm, HashMap<String, Object> map, HashMap<String, Object> param);
+    Boolean getNewActual(RESTfulResult rm, HashMap<String, Object> map, HashMap<String, Object> param);
+    Boolean getOldActual(RESTfulResult rm, HashMap<String, Object> map, HashMap<String, Object> param);
 }

src/main/java/com/steerinfo/meterwork/meterworkznlc/service/impl/MeterWorkZnlcService.java

@@ -9,7 +9,6 @@ import com.steerinfo.meterwork.meterworkcaractualfirst.mapper.MeterWorkCarActual
 import com.steerinfo.meterwork.meterworkcaractualfirst.model.MeterWorkCarActualFirst;
 import com.steerinfo.meterwork.meterworkznlc.mapper.MeterWorkZnlcMapper;
 import com.steerinfo.meterwork.meterworkznlc.service.IMeterWorkZnlcService;
-import com.steerinfo.util.StringUtils;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -31,20 +30,7 @@ public class MeterWorkZnlcService implements IMeterWorkZnlcService {
     MeterWorkCarActualFirstMapper meterWorkCarActualFirstMapper;
 
     @Override
-    public RESTfulResult getOldActual(String predictionNo) {
-        RESTfulResult rm =new RESTfulResult();
-        rm.setSucceed();
-        rm.setCode("200");
-        rm.setMessage("操作成功！！");
-
-        if(StringUtils.isEmpty(predictionNo)) {
-            rm.setData(null);
-            return rm;
-        }
-
-        HashMap<String, Object> map = new HashMap<>();
-        HashMap<String, Object> param = new HashMap<>();
-        map.put("predictionNo", predictionNo);
+    public Boolean getNewActual(RESTfulResult rm, HashMap<String, Object> map, HashMap<String, Object> param) {
 
         //根据委托号查询洁净数据（新系统）
         List<MeterWorkCarActual> actualList = meterWorkCarActualMapper.selectByParameters(map);
@@ -58,7 +44,7 @@ public class MeterWorkZnlcService implements IMeterWorkZnlcService {
             param.put("MeteringTime", actualList.get(0).getNetTime());   //计量时刻
             param.put("MetringPerson", actualList.get(0).getNetManName());  //计量人
             rm.setData(param);
-            return rm;
+            return true;
         }else {
             //根据委托号查询一次数据（新系统）
             List<MeterWorkCarActualFirst> firstList = meterWorkCarActualFirstMapper.selectByParameters(map);
@@ -73,18 +59,16 @@ public class MeterWorkZnlcService implements IMeterWorkZnlcService {
                 param.put("MetringPerson", firstList.get(0).getCreateManName());  //计量人
 
                 rm.setData(param);
-                return rm;
-            }else {
-                if (oldMetering(rm, map, param)) return rm;
+                return true;
             }
         }
-        return rm;
+        return false;
     }
 
 
     @Override
     @TargetDataSource(dataSourceKey = DataSourceKey.DB_SLAVE1)
-    public Boolean oldMetering(RESTfulResult rm, HashMap<String, Object> map, HashMap<String, Object> param) {
+    public Boolean getOldActual(RESTfulResult rm, HashMap<String, Object> map, HashMap<String, Object> param) {
         List<HashMap> oldActuals = meterWorkZnlcMapper.doQueryActualOld(map);
         if(oldActuals.size() >= 1) {
             param.put("DeviceNo", oldActuals.get(0).get("DEVICENO"));    //计量设备号
@@ -96,20 +80,25 @@ public class MeterWorkZnlcService implements IMeterWorkZnlcService {
             param.put("MeteringTime", oldActuals.get(0).get("METERINGTIME"));   //计量时刻
             param.put("MetringPerson", oldActuals.get(0).get("METRINGPERSON"));  //计量人
             rm.setData(param);
-        }else {
-            List<HashMap> oldFirsts = meterWorkZnlcMapper.doQueryFirstOld(map);
-            param.put("DeviceNo", oldFirsts.get(0).get("DEVICENO"));    //计量设备号
-            param.put("WeightVoucherNo", oldFirsts.get(0).get("WEIGHTVOUCHERNO")); //检斤委托号
-            param.put("ConveyanceNo", oldFirsts.get(0).get("CONVEYANCENO").toString().replaceAll("-", ""));   //车牌号
-            param.put("GrossWeight", oldFirsts.get(0).get("GROSSWEIGHT"));    //过磅量
-            param.put("TareWeight", null);     //空车重
-            param.put("NetWeight", null);      //过磅净重
-            param.put("MeteringTime", oldFirsts.get(0).get("METERINGTIME"));   //计量时刻
-            param.put("MetringPerson", "老系统一次");  //计量人
 
-            rm.setData(param);
             return true;
         }
+        else {
+            List<HashMap> oldFirsts = meterWorkZnlcMapper.doQueryFirstOld(map);
+            if(oldFirsts.size() >= 1) {
+                param.put("DeviceNo", oldFirsts.get(0).get("DEVICENO"));    //计量设备号
+                param.put("WeightVoucherNo", oldFirsts.get(0).get("WEIGHTVOUCHERNO")); //检斤委托号
+                param.put("ConveyanceNo", oldFirsts.get(0).get("CONVEYANCENO").toString().replaceAll("-", ""));   //车牌号
+                param.put("GrossWeight", oldFirsts.get(0).get("GROSSWEIGHT"));    //过磅量
+                param.put("TareWeight", null);     //空车重
+                param.put("NetWeight", null);      //过磅净重
+                param.put("MeteringTime", oldFirsts.get(0).get("METERINGTIME"));   //计量时刻
+                param.put("MetringPerson", "老系统一次");  //计量人
+
+                rm.setData(param);
+                return true;
+            }
+        }
         return false;
     }
 }