后端提交

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

@@ -211,4 +211,28 @@ public class MeterBaseCarBlacelistController extends BaseRESTfulController {
         }
         return success();
     }
+
+    @ApiOperation(value = "判断车辆是否为一级黑名单", notes = "判断车辆是否为一级黑名单")
+    @GetMapping(value = "/blackCarByCarNo")
+    public RESTfulResult blackCarByCarNo(@RequestParam HashMap parmas) {
+        try {
+            RESTfulResult rm = meterBaseCarBlacelistService.blackCarByCarNo(parmas);
+            return rm;
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            throw new MarkerMetException(500, "操作异常！！");
+        }
+    }
+
+    @ApiOperation(value = "查询所有为一级黑名单的车辆", notes = "查询所有为一级黑名单的车辆")
+    @GetMapping(value = "/allBlackCarByCarNo")
+    public RESTfulResult allBlackCarByCarNo() {
+        try {
+            RESTfulResult rm = meterBaseCarBlacelistService.allBlackCarByCarNo();
+            return rm;
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            throw new MarkerMetException(500, "操作异常！！");
+        }
+    }
 }

src/main/java/com/steerinfo/baseinfo/meterbasecarblacelist/mapper/MeterBaseCarBlacelistMapper.java

@@ -4,12 +4,13 @@ import com.steerinfo.framework.mapper.IBaseMapper;
 import com.steerinfo.baseinfo.meterbasecarblacelist.model.MeterBaseCarBlacelist;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
 @Mapper
 public interface MeterBaseCarBlacelistMapper extends IBaseMapper<MeterBaseCarBlacelist, String> {
      String GetNewID();
-
+     List<MeterBaseCarBlacelist> allBlackCarByCarNo(HashMap<String, Object> map);
      List<MeterBaseCarBlacelist> selectForUpdate(Map<String, Object> parameters);
 }

src/main/java/com/steerinfo/baseinfo/meterbasecarblacelist/mapper/MeterBaseCarBlacelistMapper.xml

@@ -743,4 +743,10 @@
       </if>
     </where>
   </select>
+
+  <select id="allBlackCarByCarNo" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+    select distinct car_no
+        from meter_base_car_blacelist
+    <include refid="where"/>
+  </select>
 </mapper>

src/main/java/com/steerinfo/baseinfo/meterbasecarblacelist/service/IMeterBaseCarBlacelistService.java

@@ -1,8 +1,10 @@
 package com.steerinfo.baseinfo.meterbasecarblacelist.service;
 
+import com.steerinfo.framework.controller.RESTfulResult;
 import com.steerinfo.framework.service.IBaseService;
 import com.steerinfo.baseinfo.meterbasecarblacelist.model.MeterBaseCarBlacelist;
 
+import java.util.HashMap;
 import java.util.List;
 
 /**
@@ -28,4 +30,6 @@ public interface IMeterBaseCarBlacelistService extends IBaseService<MeterBaseCar
      String checkandupdate(String id,MeterBaseCarBlacelist model);
 
      String abolish(List<MeterBaseCarBlacelist> models);
+     RESTfulResult blackCarByCarNo(HashMap<String, Object> parmas);
+     RESTfulResult allBlackCarByCarNo();
 }

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

@@ -1,19 +1,23 @@
 package com.steerinfo.baseinfo.meterbasecarblacelist.service.impl;
 
+import com.steerinfo.framework.controller.RESTfulResult;
 import com.steerinfo.framework.mapper.IBaseMapper;
 import com.steerinfo.framework.service.impl.BaseServiceImpl;
 import com.steerinfo.baseinfo.meterbasecarblacelist.model.MeterBaseCarBlacelist;
 import com.steerinfo.baseinfo.meterbasecarblacelist.mapper.MeterBaseCarBlacelistMapper;
 import com.steerinfo.baseinfo.meterbasecarblacelist.service.IMeterBaseCarBlacelistService;
 import com.steerinfo.framework.utils.base.StringUtils;
+import com.steerinfo.meterwork.meterworkrailwayactfirst.model.MeterWorkRailwayActFirst;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.interceptor.TransactionAspectSupport;
 
+import javax.annotation.Resource;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * MeterBaseCarBlacelist服务实现：
@@ -31,7 +35,7 @@ import java.util.List;
 @Service(value = "meterBaseCarBlacelistService")
 public class MeterBaseCarBlacelistServiceImpl extends BaseServiceImpl<MeterBaseCarBlacelist, String> implements IMeterBaseCarBlacelistService {
 
-    @Autowired
+    @Resource
     private MeterBaseCarBlacelistMapper meterBaseCarBlacelistMapper;
 
     @Override
@@ -181,4 +185,58 @@ public class MeterBaseCarBlacelistServiceImpl extends BaseServiceImpl<MeterBaseC
         }
         return "";
     }
+
+    @Override
+    public RESTfulResult blackCarByCarNo(HashMap<String, Object> parmas) {
+        RESTfulResult rm = new RESTfulResult();
+        rm.setFailed();
+        try{
+            String carNo = parmas.get("carNo") == null ? "": parmas.get("carNo").toString();
+            if(StringUtils.isEmpty(carNo)) {
+                rm.setMessage("车号为空，请确认！！");
+                return rm;
+            }
+            carNo = carNo.replaceAll("-", "");
+            //查询车号在黑名单是否在一级黑名单
+            HashMap<String, Object> map = new HashMap<>();
+            map.put("blackLevelName", "1");
+            map.put("valueFlag", "1");
+            map.put("carNo", carNo);
+            List<MeterBaseCarBlacelist> models = meterBaseCarBlacelistMapper.selectByParameters(map);
+            rm.setSucceed();
+            rm.setCode("0");
+            if(models.size() >= 1) {
+                rm.setMessage("1");
+            }else {
+                rm.setMessage("0");
+            }
+        }catch(Exception e) {
+            e.printStackTrace();
+            rm.setMessage("操作异常！！！>>>" + e.getMessage());
+        }
+        return rm;
+    }
+
+    @Override
+    public RESTfulResult allBlackCarByCarNo() {
+        RESTfulResult rm = new RESTfulResult();
+        rm.setFailed();
+        try{
+            //查询车号在黑名单是否在一级黑名单
+            HashMap<String, Object> map = new HashMap<>();
+            map.put("blackLevelName", "1");
+            map.put("valueFlag", "1");
+            List<String> models = meterBaseCarBlacelistMapper.allBlackCarByCarNo(map).stream().map(MeterBaseCarBlacelist::getCarNo).collect(Collectors.toList());
+            rm.setSucceed();
+            rm.setCode("0");
+            rm.setMessage("操作成功！！");
+            if(models.size() >= 1) {
+                rm.setData(models);
+            }
+        }catch(Exception e) {
+            e.printStackTrace();
+            rm.setMessage("操作异常！！！>>>" + e.getMessage());
+        }
+        return rm;
+    }
 }

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

@@ -1235,6 +1235,7 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
             String no = meterWorkCarActualFirstMapper.getNewID(afl);
             secondDb.setActualFirstNo(formatter.format(new Date()) + no);
             secondDb.setValueFlag("2");//洁净
+            secondDb.setPredictionType("7");
             meterWorkCarActualFirstMapper.insertSelective(secondDb);
 
             //1、存储当前计量的数据
@@ -1243,6 +1244,7 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
             String noHZ = meterWorkCarActualFirstMapper.getNewID(aflHZ);
             once.setActualFirstNo(formatter.format(new Date()) + noHZ);
             once.setValueFlag("2");//洁净
+            once.setPredictionType("7");
             meterWorkCarActualFirstMapper.insertSelective(once);
 
             String no1 = meterWorkCarActualMapper.getNewID(afl);
@@ -1255,6 +1257,7 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
                 net = new BigDecimal(String.valueOf(netDb.getNetWeight())).setScale(2, BigDecimal.ROUND_HALF_UP);
                 netDb.setNetWeight(net);
             }
+            netDb.setPredictionType("7");
             netDb.setUploadFlag("1");
             meterWorkCarActualMapper.insert(netDb);
 

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

@@ -1032,6 +1032,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                     meterWorkRailwayActFirstMapper.updateByPrimaryKeySelective(model02);
 
                     MeterWorkRailwayActual mwca1 = meterWorkRailwayActualMapper.manualAdd(model01.getActualFirstNo(), model02.getActualFirstNo());
+                    mwca1.setPredictionNo("");
                     BeanUtils.copyProperties(mwca1, actualRow);
                     //保存洁净
                     String no = meterWorkRailwayActualMapper.getNewID(sdf.format(new Date()));
@@ -1085,6 +1086,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                     meterWorkRailwayActFirstMapper.updateByPrimaryKeySelective(model02);
 
                     MeterWorkRailwayActual mwca1 = meterWorkRailwayActualMapper.manualAdd(model01.getActualFirstNo(), model02.getActualFirstNo());
+                    mwca1.setPredictionNo("");
                     BeanUtils.copyProperties(mwca1, actualRow);
 
                     //保存洁净
@@ -1115,8 +1117,8 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                     first02.setValueFlag("1");
                     meterWorkRailwayActFirstMapper.insertSelective(first02);
                 }else {
-                    first02.setPredictionNo("");
-                    meterWorkRailwayActFirstMapper.updateByPrimaryKeySelective(first02);
+                    first01.setPredictionNo("");
+                    meterWorkRailwayActFirstMapper.updateByPrimaryKeySelective(first01);
                 }
             /*//6、修改计量监控
             updateMonitor(first02.getBaseSpotNo());
@@ -2956,6 +2958,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                     actual = doAddWfStaticNet(preRailwayScale, model, railwayActFirstTare); //预报，毛重，皮重
                 }else{
                     actual = doAddWfStaticNetNot(model, railwayActFirstTare);
+
                 }
 
                 railwayActFirstTare.setValueFlag("0");
@@ -3610,9 +3613,9 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
         one.setValueFlag("2");//洁净
         one.setWeightType("0");//毛重
         two.setValueFlag("2");//洁净
-        two.setWeightType("1");//皮重
+        two.setWeightType("1");//皮重s
         meterWorkRailwayActFirstMapper.updateByPrimaryKeySelective(one);
-        meterWorkRailwayActFirstMapper.updateByPrimaryKeySelective(two);
+        meterWorkRailwayActFirstMapper.deleteByPrimaryKey(two.getActualFirstNo());
         return netRail;
     }