修改了后端接口

src/main/java/com/steerinfo/baseinfo/meterbasecar/mapper/MeterBaseCarMapper.xml

@@ -5,7 +5,7 @@
     <id column="PK_NO" jdbcType="VARCHAR" property="pkNo" />
     <result column="CAR_NO" jdbcType="VARCHAR" property="carNo" />
     <result column="MNEMONIC_CODE" jdbcType="VARCHAR" property="mnemonicCode" />
-    <result column="CUSTOMER_SUPPLIER_NO" jdbcType="VARCHAR" property="batchDeleteSelf" />
+    <result column="CUSTOMER_SUPPLIER_NO" jdbcType="VARCHAR" property="customerSupplierNo" />
     <result column="CUSTOMER_SUPPLIER_NAME" jdbcType="VARCHAR" property="customerSupplierName" />
     <result column="CAR_TYPE_NO" jdbcType="VARCHAR" property="carTypeNo" />
     <result column="CAR_TYPE_NAME" jdbcType="VARCHAR" property="carTypeName" />

src/main/java/com/steerinfo/baseinfo/meterbasecarblacelist/controller/MeterBaseCarBlacelistController.java

@@ -85,7 +85,9 @@ public class MeterBaseCarBlacelistController extends BaseRESTfulController {
     public RESTfulResult add(@RequestBody MeterBaseCarBlacelist model) {
         try {
             String msg = meterBaseCarBlacelistService.checkandadd(model);
+            System.out.println(msg);
             if (StringUtils.isNotEmpty(msg)) {
+//       msg != null && !msg.equals("")
                 return failed(null, msg);
             }
         } catch (Exception e) {

src/main/java/com/steerinfo/baseinfo/meterbasecarblacelist/service/impl/MeterBaseCarBlacelistServiceImpl.java

@@ -161,15 +161,15 @@ public class MeterBaseCarBlacelistServiceImpl extends BaseServiceImpl<MeterBaseC
         if (StringUtils.isEmpty(model.getCarOwnerName())){
             return "车主不能为空！！";
         }
-        if (StringUtils.isEmpty(model.getPunishTypeNo())){
-            return "违规类型编号不能为空！！";
-        }
+//        if (StringUtils.isEmpty(model.getPunishTypeNo())){
+//            return "违规类型编号不能为空！！";
+//        }
         if (StringUtils.isEmpty(model.getPunishTypeName())){
             return "违规类型名称不能为空！！";
         }
-        if (StringUtils.isEmpty(model.getBlackLevelNo())){
-            return "黑名单级别编码不能为空！！";
-        }
+//        if (StringUtils.isEmpty(model.getBlackLevelNo())){
+//            return "黑名单级别编码不能为空！！";
+//        }
         if (StringUtils.isEmpty(model.getBlackLevelName())){
             return "黑名单级别名称不能为空！！";
         }

src/main/java/com/steerinfo/baseinfo/meterbasetermtaredata/mapper/MeterBaseTermTareDataMapper.java

@@ -16,4 +16,8 @@ public interface MeterBaseTermTareDataMapper extends IBaseMapper<MeterBaseTermTa
     List<MeterBaseTermTareData> selectBy(Map<String, Object> parameters);
 
     void cancelTermTare(HashMap<String, Object> mp);
+
+    MeterBaseTermTareData selectByCarNo(HashMap<String, Object> mp);
+
+    MeterBaseTermTareData selectByDataNo(HashMap<String, Object> mp);
 }

src/main/java/com/steerinfo/baseinfo/meterbasetermtaredata/mapper/MeterBaseTermTareDataMapper.xml

@@ -583,6 +583,21 @@
     <include refid="select"/>
     <include refid="whereBy"/>
   </select>
+
+  <select id="selectByCarNo" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+    select * from METER_BASE_TERM_TARE_DATA
+    where CAR_NO = '${carNo}'
+    and END_TIME >= to_date('${endTime}', 'yyyy-MM-dd HH24:mi:ss')
+    and rownum = 1 ORDER BY CREATE_TIME desc
+  </select>
+
+  <select id="selectByDataNo" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+    select * from METER_BASE_TERM_TARE_DATA
+    where DATA_NO = '${dataNo}'
+    and END_TIME >= to_date('${endTime}', 'yyyy-MM-dd HH24:mi:ss')
+    and rownum = 1 ORDER BY CREATE_TIME desc
+  </select>
+
   <update id="cancelTermTare">
     update METER_BASE_TERM_TARE_DATA set value_flag=#{valueFlag} where car_no=#{carNo}
   </update>

src/main/java/com/steerinfo/baseinfo/meterbaseunitdirect/mapper/MeterBaseUnitDirectMapper.java

@@ -8,12 +8,13 @@ import java.util.List;
 import java.util.Map;
 
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 @Mapper
 public interface MeterBaseUnitDirectMapper extends IBaseMapper<MeterBaseUnitDirect, String> {
     String GetNewID();
 
-    List<MeterBaseUnitDirect> selectForUpdate(Map<String, Object> parameters);
+    List<MeterBaseUnitDirect> selectForUpdate(@Param("params") Map<String, Object> parameters);
 
     void deleteBatches(Map<String, Object> parameters);
 }

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

@@ -12,6 +12,7 @@ import com.steerinfo.meterwork.meterworkcaractual.model.MeterWorkCarActual;
 import com.steerinfo.meterwork.meterworkcaractualfirst.model.MeterWorkCarActualFirst;
 import com.steerinfo.meterwork.meterworkcaractualfirst.service.IMeterWorkCarActualFirstService;
 import com.steerinfo.meterwork.meterworkprelink.model.MeterWorkPreLink;
+import com.steerinfo.pretrack.pretrackscale.model.PreTrackScale;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
@@ -907,4 +908,39 @@ public class MeterWorkCarActualFirstController extends BaseRESTfulController {
             throw new MarkerMetException(500, "操作异常！！");
         }
     }
+
+    @ApiOperation(value = "双委托匹配洁净", notes = "双委托匹配洁净")
+    //@RequiresPermissions("meterworkcaractual:view")
+    @PostMapping(value = "/doubleEntrustmentMatch")
+    public RESTfulResult doubleEntrustmentMatch(@RequestBody HashMap parmas) {
+        try {
+            String actualNo1 = parmas.get("actualNo1").toString();
+            String actualNo2 = parmas.get("actualNo2").toString();
+            String predictionNo1 = parmas.get("predictionNo1").toString();
+            String predictionNo2 = parmas.get("predictionNo2").toString();
+
+            String msg = meterWorkCarActualFirstService.doubleEntrustmentMatch(actualNo1, actualNo2,predictionNo1,predictionNo2);
+            if (msg != "" || !msg.equals("")){
+                return failed(null,msg);
+            }
+            return success();
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            throw new MarkerMetException(500, "操作异常！！");
+        }
+    }
+
+    @ApiOperation(value = "双委托洁净")
+    @Transactional
+    @PostMapping(value = "/doNetAddTwo", produces = "application/json;charset=UTF-8")
+    public RESTfulResult doNetAddTwo(@RequestBody CommonCombination<MeterWorkCarActualFirst, MeterWorkCarActual, PreTrackScale, PreTrackScale> com) {
+        try {
+            RESTfulResult rm = meterWorkCarActualFirstService.doNetAddTwo(com.getOne(), com.getTwo(), com.getThree(), com.getFour());
+            return rm;
+        } catch (Exception e) {
+            e.printStackTrace();
+            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+            return failed(null, "操作异常，请确认！");
+        }
+    }
 }

src/main/java/com/steerinfo/meterwork/meterworkcaractualfirst/service/IMeterWorkCarActualFirstService.java

@@ -8,6 +8,7 @@ import com.steerinfo.meterwork.dto.*;
 import com.steerinfo.meterwork.meterworkcaractual.model.MeterWorkCarActual;
 import com.steerinfo.meterwork.meterworkcaractualfirst.model.MeterWorkCarActualFirst;
 import com.steerinfo.meterwork.meterworkprelink.model.MeterWorkPreLink;
+import com.steerinfo.pretrack.pretrackscale.model.PreTrackScale;
 
 import java.util.HashMap;
 import java.util.List;
@@ -92,6 +93,8 @@ public interface IMeterWorkCarActualFirstService extends IBaseService<MeterWorkC
 
     RESTfulResult doAddLianDaWf(MeterWorkCarActualFirst one, MeterMonitorNote two) throws Exception;
 
+    RESTfulResult doNetAddTwo(MeterWorkCarActualFirst one, MeterWorkCarActual two, PreTrackScale three, PreTrackScale four) throws Exception;
+
     RESTfulResult doAddNetLianDaWf(MeterWorkCarActualFirst one, MeterWorkCarActual two, MeterMonitorNote three) throws Exception;
 
     RESTfulResult doAddNetDouble(MeterWorkCarActualFirst secondDb, MeterWorkCarActual netDb1, MeterMonitorNote note, MeterWorkCarActual netDb2) throws Exception;
@@ -107,4 +110,5 @@ public interface IMeterWorkCarActualFirstService extends IBaseService<MeterWorkC
 
     String mixedDischarge(String actualNo1, String actualNo2,String actualNo3, String predictionNo1,String predictionNo2);
 
+    String doubleEntrustmentMatch(String actualNo1, String actualNo2, String predictionNo1, String predictionNo2);
 }

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

@@ -72,6 +72,8 @@ import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.stream.Collectors;
 
+import static java.lang.Math.abs;
+
 /**
  * MeterWorkCarActualFirst服务实现：
  *
@@ -1024,135 +1026,157 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
     @Override
     @Transactional(value = "tm", rollbackFor = Exception.class)
     public RESTfulResult doAddNetInnerWf(MeterWorkCarActualFirst secondDb, MeterWorkCarActual netDb, String saveTare, MeterMonitorNote note) throws Exception {
-        RESTfulResult rm = new RESTfulResult();
-        rm.setCode("200");
-
+        try{
 
-        //1、存储当前计量的数据
-        SimpleDateFormat formatter = new SimpleDateFormat("yyyyMMdd");
-        String afl = formatter.format(secondDb.getCreateTime());
-        String no = meterWorkCarActualFirstMapper.getNewID(afl);
-        secondDb.setActualFirstNo(formatter.format(new Date()) + no);
-        secondDb.setValueFlag("2");//洁净
-        meterWorkCarActualFirstMapper.insertSelective(secondDb);
+            RESTfulResult rm = new RESTfulResult();
+            rm.setCode("200");
 
-        //修改一次计量数据为洁净
-        MeterWorkCarActualFirst firstUpdate = new MeterWorkCarActualFirst();
-        //2、存储洁净数据
-        if (secondDb.getMeterWeight().equals(netDb.getTareWeight())) {
-            //二次重量如果跟皮重一样
-            netDb.setActualFirst2No(secondDb.getActualFirstNo());
-            firstUpdate.setActualFirstNo(netDb.getActualFirst1No());
-            firstUpdate.setWeightType("0");
-        } else {
-            netDb.setActualFirst1No(secondDb.getActualFirstNo());
-            firstUpdate.setActualFirstNo(netDb.getActualFirst2No());
-            firstUpdate.setWeightType("1");
-        }
 
-        //3、修改第一次存储的计量数据状态为洁净
-        if (firstUpdate.getActualFirstNo() != null) {
-            firstUpdate.setValueFlag("2");
-            meterWorkCarActualFirstMapper.updateByPrimaryKeySelective(firstUpdate);
-        }
+            //1、存储当前计量的数据
+            SimpleDateFormat formatter = new SimpleDateFormat("yyyyMMdd");
+            String afl = formatter.format(secondDb.getCreateTime());
+            String no = meterWorkCarActualFirstMapper.getNewID(afl);
+            secondDb.setActualFirstNo(formatter.format(new Date()) + no);
+            secondDb.setValueFlag("2");//洁净
+            meterWorkCarActualFirstMapper.insertSelective(secondDb);
+
+            //修改一次计量数据为洁净
+            MeterWorkCarActualFirst firstUpdate = new MeterWorkCarActualFirst();
+            //2、存储洁净数据
+            if (secondDb.getMeterWeight().equals(netDb.getTareWeight())) {
+                //二次重量如果跟皮重一样
+                netDb.setActualFirst2No(secondDb.getActualFirstNo());
+                firstUpdate.setActualFirstNo(netDb.getActualFirst1No());
+                firstUpdate.setWeightType("0");
+            } else {
+                netDb.setActualFirst1No(secondDb.getActualFirstNo());
+                firstUpdate.setActualFirstNo(netDb.getActualFirst2No());
+                firstUpdate.setWeightType("1");
+            }
 
-        // 判断当前数据是否存在委托
-        if (netDb.getPredictionNo() != null && "".equals(netDb.getPredictionNo())) {
-            MeterWorkCarActualFirst gross = meterWorkCarActualFirstMapper.selectByPrimaryKey(netDb.getActualFirst1No());
-            if ((gross.getPredictionNo() == null || "".equals(gross.getPredictionNo()))) {
-                // 如果毛重数据还未匹配委托，则匹配委托操作
-                MeterWorkCarActualFirst meca1 = meterWorkCarActualFirstMapper.selectAndMatch(gross.getActualFirstNo(), netDb.getPredictionNo());
-                meterWorkCarActualFirstMapper.updateByPrimaryKeySelective(meca1);
-                PreTrackScale preTrackScale = new PreTrackScale();
-                preTrackScale.setPredictionNo(netDb.getPredictionNo());
-                preTrackScale.setValueFlag("2");
-                preTrackScale.setUploadFlag("1");
-                preTrackScaleMapper.updateByPrimaryKeySelective(preTrackScale);
+            //3、修改第一次存储的计量数据状态为洁净
+            if (firstUpdate.getActualFirstNo() != null) {
+                firstUpdate.setValueFlag("2");
+                meterWorkCarActualFirstMapper.updateByPrimaryKeySelective(firstUpdate);
             }
-        }
 
-        String no1 = meterWorkCarActualMapper.getNewID(afl);
-        netDb.setActualNo(afl + no1);
-        if (netDb != null && netDb.getNetWeight() != null) {
-            //2021年3月7日 净重保留两位小数；
-            BigDecimal net;
-            net = new BigDecimal(String.valueOf(netDb.getNetWeight())).setScale(2, BigDecimal.ROUND_HALF_UP);
-            netDb.setNetWeight(net);
-        }
-        netDb.setUploadFlag("1");
-        meterWorkCarActualMapper.insert(netDb);
+            // 判断当前数据是否存在委托
+            if (netDb.getPredictionNo() != null && "".equals(netDb.getPredictionNo())) {
+                MeterWorkCarActualFirst gross = meterWorkCarActualFirstMapper.selectByPrimaryKey(netDb.getActualFirst1No());
+                if ((gross.getPredictionNo() == null || "".equals(gross.getPredictionNo()))) {
+                    // 如果毛重数据还未匹配委托，则匹配委托操作
+                    MeterWorkCarActualFirst meca1 = meterWorkCarActualFirstMapper.selectAndMatch(gross.getActualFirstNo(), netDb.getPredictionNo());
+                    meterWorkCarActualFirstMapper.updateByPrimaryKeySelective(meca1);
+                    PreTrackScale preTrackScale = new PreTrackScale();
+                    preTrackScale.setPredictionNo(netDb.getPredictionNo());
+                    preTrackScale.setValueFlag("2");
+                    preTrackScale.setUploadFlag("1");
+                    preTrackScaleMapper.updateByPrimaryKeySelective(preTrackScale);
+                }
+            }
 
-        //4、如果为期限皮重，则将期限皮重转化为一条皮重计量数据保存
-        MeterWorkCarActualFirst mwraf = meterWorkCarActualFirstMapper.selectByPrimaryKey(netDb.getActualFirst2No());
-        if (mwraf == null) {
-            MeterBaseTermTareData mbttd = meterBaseTermTareDataMapper.selectByPrimaryKey(netDb.getActualFirst2No());
-            MeterWorkCarActualFirst imTare = new MeterWorkCarActualFirst();
-            //补充数据
-            String afl1 = formatter.format(new Date());
-            String imTareNO = meterWorkCarActualFirstMapper.getNewID(afl1);
-            imTare.setActualFirstNo(afl1 + imTareNO);
-            imTare.setMeterTypeNo(secondDb.getMeterTypeNo());
-            imTare.setMeterTypeName(secondDb.getMeterTypeName());
-            imTare.setBaseSpotNo(mbttd.getBaseSpotNo());
-            imTare.setBaseSpotName(mbttd.getBaseSpotName());
-            imTare.setCarNo(mbttd.getCarNo());
-            imTare.setCreateTime(mbttd.getCreateTime());
-            imTare.setCreateManNo(mbttd.getCreateManNo());
-            imTare.setCreateManName(mbttd.getCreateManName());
-            imTare.setMeterWeight(netDb.getTareWeight());
-            imTare.setWeightType("2");//期限皮重
-            imTare.setValueFlag("2");//洁净
-            meterWorkCarActualFirstMapper.insertSelective(imTare);
-            //将洁净数据中的皮重编号修改
-            MeterWorkCarActual mwca = new MeterWorkCarActual();
-            mwca.setActualNo(netDb.getActualNo());
-            mwca.setActualFirst2No(imTare.getActualFirstNo());
-            meterWorkCarActualMapper.updateByPrimaryKeySelective(mwca);
-        }
+            String no1 = meterWorkCarActualMapper.getNewID(afl);
+            netDb.setActualNo(afl + no1);
+            if (netDb != null && netDb.getNetWeight() != null) {
+                //2021年3月7日 净重保留两位小数；
+                BigDecimal net;
+                net = new BigDecimal(String.valueOf(netDb.getNetWeight())).setScale(2, BigDecimal.ROUND_HALF_UP);
+                netDb.setNetWeight(net);
+            }
+            netDb.setUploadFlag("1");
+            meterWorkCarActualMapper.insert(netDb);
+
+            //4、如果为期限皮重，则将期限皮重转化为一条皮重计量数据保存
+            MeterWorkCarActualFirst mwraf = meterWorkCarActualFirstMapper.selectByPrimaryKey(netDb.getActualFirst2No());
+            if (mwraf == null) {
+                MeterBaseTermTareData mbttd = new MeterBaseTermTareData();
+                HashMap mbMap = new HashMap();
+                SimpleDateFormat mbsdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+                mbMap.put("endTime",mbsdf.format(new Date()));
+                if(StringUtils.isNotEmpty(netDb.getActualFirst2No())){
+                    mbMap.put("dataNo",netDb.getActualFirst2No());
+                    mbttd = meterBaseTermTareDataMapper.selectByDataNo(mbMap);
+                }
+                else{
+                    mbMap.put("carNo",netDb.getCarNo());
+                    mbttd = meterBaseTermTareDataMapper.selectByCarNo(mbMap);
+                }
+                MeterWorkCarActualFirst imTare = new MeterWorkCarActualFirst();
+                //补充数据
+                String afl1 = formatter.format(new Date());
+                String imTareNO = meterWorkCarActualFirstMapper.getNewID(afl1);
+                imTare.setActualFirstNo(afl1 + imTareNO);
+                imTare.setMeterTypeNo(secondDb.getMeterTypeNo());
+                imTare.setMeterTypeName(secondDb.getMeterTypeName());
+                imTare.setBaseSpotNo(mbttd.getBaseSpotNo());
+                imTare.setBaseSpotName(mbttd.getBaseSpotName());
+                imTare.setCarNo(mbttd.getCarNo());
+                imTare.setCreateTime(mbttd.getCreateTime());
+                imTare.setCreateManNo(mbttd.getCreateManNo());
+                imTare.setCreateManName(mbttd.getCreateManName());
+                imTare.setMeterWeight(netDb.getTareWeight());
+                imTare.setWeightType("2");//期限皮重
+                imTare.setValueFlag("2");//洁净
+                meterWorkCarActualFirstMapper.insertSelective(imTare);
+                //将洁净数据中的皮重编号修改
+                MeterWorkCarActual mwca = new MeterWorkCarActual();
+                mwca.setActualNo(netDb.getActualNo());
+                mwca.setActualFirst2No(imTare.getActualFirstNo());
+                meterWorkCarActualMapper.updateByPrimaryKeySelective(mwca);
+            }
 
-        //4、存储历史皮重及历史皮重明细信息
-        if ("1".equals(saveTare)) {
-            MeterWorkCarActualFirst oci = new MeterWorkCarActualFirst();
-            oci.setCarNo(netDb.getCarNo());
-            oci.setCreateTime(netDb.getTareTime());
-            oci.setBaseSpotNo(netDb.getBaseSpot2No());
-            oci.setBaseSpotName(netDb.getBaseSpot2Name());
-            oci.setMeterWeight(netDb.getTareWeight());
-            oci.setActualFirstNo(netDb.getActualFirst2No());
-            doSaveHisTare(oci);
-        }
+            //4、存储历史皮重及历史皮重明细信息
+            if ("1".equals(saveTare)) {
+                MeterWorkCarActualFirst oci = new MeterWorkCarActualFirst();
+                oci.setCarNo(netDb.getCarNo());
+                oci.setCreateTime(netDb.getTareTime());
+                oci.setBaseSpotNo(netDb.getBaseSpot2No());
+                oci.setBaseSpotName(netDb.getBaseSpot2Name());
+                oci.setMeterWeight(netDb.getTareWeight());
+                oci.setActualFirstNo(netDb.getActualFirst2No());
+                doSaveHisTare(oci);
+            }
 
-        //5、保存图片
-        SaveImg(secondDb);
+            //5、保存图片
+            SaveImg(secondDb);
 
-        //6、修改计量监控
-        updateMonitor(secondDb.getBaseSpotNo());
+            //6、修改计量监控
+            updateMonitor(secondDb.getBaseSpotNo());
 
-        //保存日志
-        saveNote(note);
+            //保存日志
+            saveNote(note);
 
-        //当存储一次数据或者结净时，将本车辆的预处理重量改为已使用
-        updatePreWeight(secondDb.getCarNo());
+            //当存储一次数据或者结净时，将本车辆的预处理重量改为已使用
+            updatePreWeight(secondDb.getCarNo());
 
-        updateMonitorOver(secondDb.getActualFirstNo(), secondDb.getBaseSpotNo());
+            updateMonitorOver(secondDb.getActualFirstNo(), secondDb.getBaseSpotNo());
 
-        //重量类型为毛重则调用接口为
-        String flag = "";
-        /*
-        if("0".equals(secondDb.getWeightType())){
-            flag = transferParamForLims(netDb.getCarNo(),netDb.getMatterNo(),netDb.getReceivingUintName(),netDb.getForwardingUnitName(),netDb.getNetWeight().toString(),netDb.getNetTime(),"",netDb.getActualNo());
-        }
-        //*/
+            //重量类型为毛重则调用接口为
+            String flag = "";
+            /*
+            if("0".equals(secondDb.getWeightType())){
+                flag = transferParamForLims(netDb.getCarNo(),netDb.getMatterNo(),netDb.getReceivingUintName(),netDb.getForwardingUnitName(),netDb.getNetWeight().toString(),netDb.getNetTime(),"",netDb.getActualNo());
+            }
+            //*/
 
-        //补充附加重量的数据
-        if (StringUtils.isNotEmpty(secondDb.getAddWgtPk())) {
-            insertAddWgtNo(secondDb.getActualFirstNo(), secondDb.getAddWgtPk(), secondDb.getCreateManNo(), secondDb.getCreateManName());
-        }
+            //补充附加重量的数据
+            if (StringUtils.isNotEmpty(secondDb.getAddWgtPk())) {
+                insertAddWgtNo(secondDb.getActualFirstNo(), secondDb.getAddWgtPk(), secondDb.getCreateManNo(), secondDb.getCreateManName());
+            }
 
 
-        rm.setData(secondDb.getActualFirstNo());
-        rm.setMessage(flag);
-        return rm;
+            rm.setData(secondDb.getActualFirstNo());
+            rm.setMessage(flag);
+            return rm;
+        }
+        catch (Exception e){
+            RESTfulResult rm = new RESTfulResult();
+            rm.setCode("500");
+            rm.setData(null);
+            rm.setMessage(e.getMessage());
+            e.printStackTrace();
+            return rm;
+        }
     }
 
 
@@ -2873,7 +2897,7 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
             actualRow2.setActualNo(sdf.format(new Date()) + no1);
             actualRow2.setNetTime(new Date());
             actualRow2.setNetMode(DbConstants.TYPE);
-            actualRow2.setNote("混装结净");
+            actualRow2.setNote(" 结净");
             actualRow2.setUploadFlag("1");
             actualRow2.setIsPreScale("1");
             actualRow2.setNetWeight(mwcaf3.getMeterWeight().subtract(mwcaf4.getMeterWeight()));
@@ -2885,5 +2909,264 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
         }
         return "";
     }
+
+    @Override
+    public String doubleEntrustmentMatch(String actualNo1, String actualNo2, String predictionNo1, String predictionNo2) {
+        try{
+            //查询出一次计量数据
+            MeterWorkCarActualFirst mwcaf01 = meterWorkCarActualFirstMapper.selectByPrimaryKey(actualNo1);
+            MeterWorkCarActualFirst mwcaf02 = meterWorkCarActualFirstMapper.selectByPrimaryKey(actualNo1);
+            MeterWorkCarActualFirst mwcaf03 = meterWorkCarActualFirstMapper.selectByPrimaryKey(actualNo2);
+            MeterWorkCarActualFirst mwcaf04 = meterWorkCarActualFirstMapper.selectByPrimaryKey(actualNo2);
+
+            //查询出所有委托信息
+            PreTrackScale pts01 = preTrackScaleMapper.selectByPrimaryKey(predictionNo1);
+            PreTrackScale pts02 = preTrackScaleMapper.selectByPrimaryKey(predictionNo2);
+
+            //定义两个洁净类
+            MeterWorkCarActual actualRow1 = new MeterWorkCarActual();
+            MeterWorkCarActual actualRow2 = new MeterWorkCarActual();
+
+            BigDecimal num01 = mwcaf01.getMeterWeight().subtract(mwcaf03.getMeterWeight()).abs();
+            if(mwcaf01 == null || mwcaf03 == null ){
+                return "一次计量数据为空,请确认！!";
+            }
+            //判断毛重必须大于皮重
+            if(num01.compareTo(BigDecimal.valueOf(0)) == -1){
+                return "第一个一次计量重量一定要大于第二条一次计量重量！!";
+            }
+            if(pts01 == null || pts02 == null){
+                return "委托信息为空,请确认！！";
+            }
+            if(!mwcaf01.getCarNo().equals(mwcaf03.getCarNo())){
+                return "车号不一致,不能匹配洁净！！";
+            }
+            //洁净数据不能小于400
+            if(num01.compareTo(BigDecimal.valueOf(400)) == -1){
+                return "选择的两条一次计量数据不能小于400！！";
+            }
+            if(pts01.getValueFlag().equals("2") || pts02.getValueFlag().equals("2")){
+                return "委托信息已使用！！";
+            }
+
+            if(pts01.getValueFlag().equals("3") || pts02.getValueFlag().equals("3")){
+                return "委托信息已作废！！";
+            }
+            if(mwcaf01.getValueFlag().equals("2") || mwcaf03.getValueFlag().equals("2")){
+                return "一次计量数据已洁净！！";
+            }
+
+            //将委托中的编号和收发货的等数据拷贝进一次数据中
+            MeterWorkCarActualFirst first1 = meterWorkCarActualFirstMapper.selectAndMatch(actualNo1, predictionNo1);
+            BeanUtils.copyProperties(first1,mwcaf01);
+            MeterWorkCarActualFirst first2 = meterWorkCarActualFirstMapper.selectAndMatch(actualNo2, predictionNo1);
+            BeanUtils.copyProperties(first2, mwcaf02);
+            MeterWorkCarActualFirst first3 = meterWorkCarActualFirstMapper.selectAndMatch(actualNo1, predictionNo2);
+            BeanUtils.copyProperties(first3,mwcaf03);
+            MeterWorkCarActualFirst first4 = meterWorkCarActualFirstMapper.selectAndMatch(actualNo2, predictionNo2);
+            BeanUtils.copyProperties(first4, mwcaf04);
+
+            //将委托中的编号和收发货单位和一次数据等数据拷贝进结净数据中
+            MeterWorkCarActual mwca1 = meterWorkCarActualMapper.manualAddPre(actualNo1, actualNo2, predictionNo1);
+            BeanUtils.copyProperties(mwca1, actualRow1);
+            MeterWorkCarActual mwca2 = meterWorkCarActualMapper.manualAddPre(actualNo1, actualNo2, predictionNo2);
+            BeanUtils.copyProperties(mwca2,actualRow2);
+
+            //更新预报数据
+            PreTrackScale scale = new PreTrackScale();
+            scale.setPredictionNo(predictionNo1);
+            scale.setValueFlag(DbConstants.NET);
+            scale.setUpdateTime(new Date());
+            scale.setUpdateManNo("system");
+            scale.setUpdateManName("二次计量洁净更新");
+            scale.setUploadFlag("1");
+            preTrackScaleMapper.updateByPrimaryKeySelective(scale);
+
+            PreTrackScale scale1 = new PreTrackScale();
+            scale1.setPredictionNo(predictionNo2);
+            scale1.setValueFlag(DbConstants.NET);
+            scale1.setUpdateTime(new Date());
+            scale1.setUpdateManNo("system");
+            scale1.setUpdateManName("二次计量洁净更新");
+            scale1.setUploadFlag("1");
+            preTrackScaleMapper.updateByPrimaryKeySelective(scale1);
+
+            //更新一次数据
+            //更新第一次毛重数据库
+            mwcaf01.setValueFlag(DbConstants.NET);
+            mwcaf01.setUpdateManName("system");
+            mwcaf01.setUpdateManName("二次计量洁净更新");
+            mwcaf01.setUpdateTime(new Date());
+            mwcaf01.setIsPreScale("1");
+            meterWorkCarActualFirstMapper.updateByPrimaryKey(mwcaf01);
+            //更新第一次皮重数据库
+            mwcaf02.setValueFlag(DbConstants.NET);
+            mwcaf02.setUpdateManName("system");
+            mwcaf02.setUpdateManName("二次计量洁净更新");
+            mwcaf02.setUpdateTime(new Date());
+            mwcaf02.setIsPreScale("1");
+            meterWorkCarActualFirstMapper.updateByPrimaryKey(mwcaf02);
+            //添加第一次毛重数据库
+            SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
+            String afl = sdf.format(new Date());
+            String actualFirstNo = sdf.format(new Date()) + meterWorkCarActualFirstMapper.getNewID(afl);
+            mwcaf03.setActualFirstNo(actualFirstNo);
+            mwcaf03.setValueFlag(DbConstants.NET);
+            mwcaf03.setUpdateManName("system");
+            mwcaf03.setUpdateManName("二次计量洁净更新");
+            mwcaf03.setUpdateTime(new Date());
+            mwcaf03.setIsPreScale("1");
+            meterWorkCarActualFirstMapper.insertSelective(mwcaf03);
+            //添加第二次皮重数据库
+            SimpleDateFormat sdf01 = new SimpleDateFormat("yyyyMMdd");
+            String afl01 = sdf01.format(new Date());
+            String actualSecondNo = sdf01.format(new Date()) + meterWorkCarActualFirstMapper.getNewID(afl01);
+            mwcaf04.setActualFirstNo(actualSecondNo);
+            mwcaf04.setValueFlag(DbConstants.NET);
+            mwcaf04.setUpdateManName("system");
+            mwcaf04.setUpdateManName("二次计量洁净更新");
+            mwcaf04.setUpdateTime(new Date());
+            mwcaf04.setIsPreScale("1");
+            meterWorkCarActualFirstMapper.insertSelective(mwcaf04);
+
+            //添加结净数据
+            String no = meterWorkCarActualMapper.getNewID(sdf.format(new Date()));
+            actualRow1.setActualNo(sdf.format(new Date()) + no);
+            actualRow1.setNetTime(new Date());
+            actualRow1.setNetMode(DbConstants.TYPE);
+            actualRow1.setNote("双委托匹配洁净");
+            actualRow1.setUploadFlag("1");
+            actualRow1.setIsPreScale("1");
+            actualRow1.setNetWeight(mwcaf01.getMeterWeight().subtract(mwcaf02.getMeterWeight()));
+            meterWorkCarActualMapper.insertSelective(actualRow1);
+
+            String no1 = meterWorkCarActualMapper.getNewID(sdf.format(new Date()));
+            actualRow2.setActualNo(sdf.format(new Date()) + no1);
+            actualRow2.setNetTime(new Date());
+            actualRow2.setNetMode(DbConstants.TYPE);
+            actualRow2.setNote("双委托匹配洁净");
+            actualRow2.setUploadFlag("1");
+            actualRow2.setIsPreScale("1");
+            actualRow2.setNetWeight(mwcaf03.getMeterWeight().subtract(mwcaf04.getMeterWeight()));
+            meterWorkCarActualMapper.insertSelective(actualRow2);
+        }catch(Exception e){
+            e.printStackTrace();
+            return "操作异常，请确认";
+        }
+        return "";
+    }
+
+    @Override
+    public RESTfulResult doNetAddTwo(MeterWorkCarActualFirst one, MeterWorkCarActual two, PreTrackScale three, PreTrackScale four) throws Exception {
+        RESTfulResult rm = new RESTfulResult();
+        rm.setCode("200");
+
+        //1、存储当前计量的数据
+        SimpleDateFormat formatter = new SimpleDateFormat("yyyyMMdd");
+        String afl = formatter.format(one.getCreateTime());
+        String no = meterWorkCarActualFirstMapper.getNewID(afl);
+        one.setActualFirstNo(formatter.format(new Date()) + no);
+        one.setValueFlag("2");//洁净
+        meterWorkCarActualFirstMapper.insertSelective(one);
+
+        //修改一次计量数据为洁净
+        MeterWorkCarActualFirst firstUpdate = new MeterWorkCarActualFirst();
+        //2、存储洁净数据
+        if (one.getMeterWeight().equals(two.getTareWeight())) {
+            //二次重量如果跟皮重一样
+            two.setActualFirst2No(one.getActualFirstNo());
+            firstUpdate.setActualFirstNo(two.getActualFirst1No());
+        } else {
+            two.setActualFirst1No(one.getActualFirstNo());
+            firstUpdate.setActualFirstNo(two.getActualFirst2No());
+        }
+
+        //3、修改第一次存储的计量数据状态为洁净
+        if (firstUpdate.getActualFirstNo() != null) {
+            firstUpdate.setValueFlag("2");
+            meterWorkCarActualFirstMapper.updateByPrimaryKeySelective(firstUpdate);
+        }
+
+        //4、判断第一次计量数据是否匹配委托
+        MeterWorkCarActualFirst mwca1 = meterWorkCarActualFirstMapper.selectByPrimaryKey(two.getActualFirst1No());
+        if(mwca1.getPredictionNo().equals("")){
+            MeterWorkCarActualFirst meca1 = meterWorkCarActualFirstMapper.selectAndMatch(firstUpdate.getActualFirstNo(), three.getPredictionNo());
+            meca1.setIsPreScale("1");
+            meterWorkCarActualFirstMapper.updateByPrimaryKeySelective(meca1);
+        }
+        //5、判断这次一次计量数据是否匹配委托
+        if (one.getPredictionNo().equals("")){
+            MeterWorkCarActualFirst meca1 = meterWorkCarActualFirstMapper.selectAndMatch(one.getActualFirstNo(), three.getPredictionNo());
+            meca1.setIsPreScale("1");
+            meterWorkCarActualFirstMapper.updateByPrimaryKeySelective(meca1);
+        }
+
+        //6、插入另外两条一次数据，并匹配委托
+        MeterWorkCarActualFirst mwcaf1 = meterWorkCarActualFirstMapper.selectAndMatch(one.getActualFirstNo(), four.getPredictionNo());
+        mwcaf1.setIsPreScale("1");
+        meterWorkCarActualFirstMapper.insertSelective(mwcaf1);
+        MeterWorkCarActualFirst mwcaf2 = meterWorkCarActualFirstMapper.selectAndMatch(firstUpdate.getActualFirstNo(), four.getPredictionNo());
+        mwcaf2.setIsPreScale("1");
+        meterWorkCarActualFirstMapper.insertSelective(mwcaf2);
+
+
+        //7、判断洁净数据是否匹配委托
+        if(two.getPredictionNo().equals("")){
+            MeterWorkCarActual mwcaOld = meterWorkCarActualMapper.mathPredcition(two.getActualNo(), three.getPredictionNo());
+            BeanUtils.copyProperties(mwcaOld,two);
+        }
+
+        //8、插入洁净数据
+        String no1 = meterWorkCarActualMapper.getNewID(afl);
+        two.setActualNo(afl + no1);
+        two.setIsPreScale("1");
+        two.setUploadFlag("1");
+        if (two != null && two.getNetWeight() != null) {
+            //2021年3月7日 净重保留两位小数；
+            BigDecimal net;
+            net = new BigDecimal(String.valueOf(two.getNetWeight())).setScale(2, BigDecimal.ROUND_HALF_UP);
+            two.setNetWeight(net);
+        }
+        meterWorkCarActualMapper.insert(two);
+
+
+        //9、复制一份新的洁净数据并匹配委托
+        MeterWorkCarActual mwcaNew = meterWorkCarActualMapper.mathPredcition(two.getActualNo(),four.getPredictionNo());
+        mwcaNew.setActualNo(formatter.format(new Date()) + meterWorkCarActualMapper.getNewID(afl));
+        mwcaNew.setIsPreScale("1");
+        mwcaNew.setUploadFlag("1");
+        meterWorkCarActualMapper.insertSelective(mwcaNew);
+
+        //修改委托为已使用状态
+        three.setValueFlag("4");
+        three.setUploadFlag("1");
+        preTrackScaleMapper.updateByPrimaryKeySelective(three);
+        four.setValueFlag("4");
+        four.setUploadFlag("1");
+        preTrackScaleMapper.updateByPrimaryKeySelective(four);
+
+        //10、保存图片
+        SaveImg(one);
+
+        //11、修改计量监控
+        updateMonitor(one.getBaseSpotNo());
+
+        //12、当存储一次数据或者结净时，将本车辆的预处理重量改为已使用
+        updatePreWeight(one.getCarNo());
+
+        updateMonitorOver(one.getActualFirstNo(), one.getBaseSpotNo());
+
+        //重量类型为毛重则调用接口为
+        String flag = "";
+
+        //补充附加重量的数据
+        if (StringUtils.isNotEmpty(one.getAddWgtPk())) {
+            insertAddWgtNo(one.getActualFirstNo(), one.getAddWgtPk(), one.getCreateManNo(), one.getCreateManName());
+        }
+
+        rm.setData(one.getActualFirstNo());
+        rm.setMessage(flag);
+        return rm;
+    }
 }
 

src/main/java/com/steerinfo/meterwork/meterworkprewgttype/mapper/MeterWorkPreWgttypeMapper.xml

@@ -397,6 +397,6 @@
   </select>
 
   <update id="updatePreWeight" parameterType="java.lang.String">
-    update METER_WORK_PRE_WGTTYPE set VALUE_FLAG = '2' where VALUE_FLAG = '1' and CarNo = #{CarNo}
+    update METER_WORK_PRE_WGTTYPE set VALUE_FLAG = '2' where VALUE_FLAG = '1' and CAR_NO = #{CarNo}
   </update>
 </mapper>

src/main/java/com/steerinfo/meterwork/meterworkrailwayactfirst/controller/MeterWorkRailwayActFirstController.java

@@ -403,10 +403,11 @@ throw new MarkerMetException(500, "操作异常！！");
         RESTfulResult rm = failed();
         try {
             String railwayTypeNo = param.get("railwayTypeNo") == null ? "":param.get("railwayTypeNo").toString();
+            String railwayNo = param.get("railwayNo") == null ? "": param.get("railwayNo").toString();
             String startTime = param.get("startTime") == null ? "":param.get("startTime").toString();
             String endTime = param.get("endTime") == null ? "":param.get("endTime").toString();
             String dataSource = param.get("dataSource") == null ? "":param.get("dataSource").toString();
-            List<String> rows = meterWorkRailwayActFirstService.distinctRailwayNo(railwayTypeNo, startTime, endTime, dataSource);
+            List<String> rows = meterWorkRailwayActFirstService.distinctRailwayNo(railwayTypeNo, railwayNo, startTime, endTime, dataSource);
             return success(rows);
         } catch (MarkerMetException e) {
             e.printStackTrace();

src/main/java/com/steerinfo/meterwork/meterworkrailwayactfirst/mapper/MeterWorkRailwayActFirstMapper.xml

@@ -3226,7 +3226,7 @@
       and  RAILWAY_TYPE_NO = #{railwayTypeNo}
     </if>
     <if test="lcNo != null and lcNo != ''">
-      and lc_No = #{lcNo}
+      and lc_No like '%${lcNo}%'
     </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')
@@ -3247,6 +3247,9 @@
     <if test="railwayTypeNo != null and railwayTypeNo != ''">
       and  RAILWAY_TYPE_NO = #{railwayTypeNo}
     </if>
+    <if test="railwayNo != null and railwayNo != ''">
+      and  RAILWAY_NO like '%${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>

src/main/java/com/steerinfo/meterwork/meterworkrailwayactfirst/service/IMeterWorkRailwayActFirstService.java

@@ -50,7 +50,7 @@ public interface IMeterWorkRailwayActFirstService extends IBaseService<MeterWork
 
     List<String> distinctCarNo(String railwayTypeNo, String lcNo, String railwayNo, String startTime, String endTime, String dataSource,String valueFlag);
 
-    List<String> distinctRailwayNo(String railwayTypeNo, String startTime, String endTime, String dataSource);
+    List<String> distinctRailwayNo(String railwayTypeNo, String railwayNo, String startTime, String endTime, String dataSource);
 
 
     List<MeterWorkRailwayActFirst> selectNet(String weightType, String railwayNo, String flag);

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

@@ -319,9 +319,10 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
     }
 
     @Override
-    public List<String> distinctRailwayNo(String railwayTypeNo, String startTime, String endTime, String dataSource){
+    public List<String> distinctRailwayNo(String railwayTypeNo,String railwayNo, String startTime, String endTime, String dataSource){
         HashMap<String, Object> obj = new HashMap<>();
         obj.put("railwayTypeNo", railwayTypeNo);
+        obj.put("railwayNo", railwayNo);
         obj.put("startTime", startTime);
         obj.put("endTime", endTime);
         obj.put("dataSource", dataSource);

src/main/java/com/steerinfo/util/HttpsRequest.java

@@ -432,4 +432,80 @@ public class HttpsRequest {
         }
         return result.toString();
     }
+
+    /**
+     * 向指定 URL 发送GET方法的请求
+     *
+     * @param url
+     *            发送请求的 URL
+     * @return 所代表远程资源的响应结果
+     */
+    public static String sendGET(String url, String token) {
+        OutputStreamWriter out = null;
+        BufferedReader in = null;
+        StringBuilder result = new StringBuilder();
+        try {
+
+            // 创建SSLContext对象，并使用我们指定的信任管理器初始化
+            TrustManager[] tm = { new MyX509TrustManager() };
+            SSLContext sslContext = SSLContext.getInstance("SSL");
+            sslContext.init(null, tm, new java.security.SecureRandom());
+
+            // 从上述SSLContext对象中得到SSLSocketFactory对象
+            SSLSocketFactory ssf = sslContext.getSocketFactory();
+
+            // 打开和URL之间的连接
+            URL realUrl = new URL(url);
+            HttpsURLConnection conn = (HttpsURLConnection) realUrl.openConnection();
+            conn.setSSLSocketFactory(ssf);
+
+            // POST方法
+            conn.setRequestMethod("GET");
+            // 发送POST请求必须设置如下两行
+            conn.setDoOutput(true);
+            conn.setDoInput(true);
+            // 设置通用的请求属性
+            conn.setRequestProperty("accept", "*/*");
+            conn.setRequestProperty("connection", "Keep-Alive");
+            conn.setRequestProperty("user-agent",
+                    "Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1;SV1)");
+            conn.setRequestProperty("Content-Type",
+                    "application/json;charset=UTF-8");
+            conn.setRequestProperty("authorization",
+                    "Bearer " + token);
+            conn.connect();
+
+
+            // 获取URLConnection对象对应的输出流
+            out = new OutputStreamWriter(conn.getOutputStream(), "UTF-8");
+            // flush输出流的缓冲
+            out.flush();
+            // 定义BufferedReader输入流来读取URL的响应
+            in = new BufferedReader(new InputStreamReader(
+                    conn.getInputStream(), "UTF-8"));
+            String line;
+            while ((line = in.readLine()) != null) {
+                result.append(line);
+            }
+            System.out.println("-----result-----"+result);
+        } catch (Exception e) {
+            System.out.println("发送 GET 请求出现异常！"+e);
+            e.printStackTrace();
+        }
+        //使用finally块来关闭输出流、输入流
+        finally{
+            try{
+                if(out!=null){
+                    out.close();
+                }
+                if(in!=null){
+                    in.close();
+                }
+            }
+            catch(IOException ex){
+                ex.printStackTrace();
+            }
+        }
+        return result.toString();
+    }
 }

src/main/java/com/steerinfo/util/SSOUtil.java

@@ -300,4 +300,26 @@ public class SSOUtil {
 
         return msg;
     }
+
+//    /**
+//     * sso重置密码
+//     * @param carNo
+//     * @return
+//     */
+//    public HashMap ssoSelect(String carNo) throws Exception {
+//
+//        String ssoUrl = Configuration.readConfigString("sso.url", "application");
+//
+//        String accessToken = ssoDefaultLogin();
+//
+//        String ssomsg = HttpsRequest.sendPut(ssoUrl + "/v1/sysusers/getUsersByOrgCode/?userCode="+carNo+"&pageNum=1&pageSize=20", null, accessToken);
+//
+//        JSONObject jsonObject = JSONObject.parseObject(ssomsg);
+//
+//        HashMap<String, String> map = new HashMap<>();
+//        map.put("code", "0");
+//        map.put("data", jsonObject.get("data").toString());
+//
+//        return map;
+//    }
 }