后端修改

src/main/java/com/steerinfo/baseinfo/appphonehelp/controller/AppPhoneHelpController.java

@@ -138,9 +138,13 @@ public class AppPhoneHelpController extends BaseRESTfulController {
     }
 
     @ApiOperation(value = "App端远程求助确认按钮", notes = "App端远程求助确认按钮")
-    @GetMapping(value = "/phoneHelpComfirm")
-    public RESTfulResult phoneHelpComfirm(@RequestParam String id, String createNo, String createName, String result) {
+    @PostMapping(value = "/phoneHelpComfirm")
+    public RESTfulResult phoneHelpComfirm(@RequestBody HashMap params) {
         RESTfulResult rm = failed();
+        String id = params.get("id") == null ? "": params.get("id").toString();
+        String createNo = params.get("createNo") == null ? "" : params.get("createNo").toString();
+        String createName = params.get("createName") == null ? "" : params.get("createName").toString();
+        String result = params.get("result") == null ? "" : params.get("result").toString();
         try{
             if(com.steerinfo.util.StringUtils.isEmpty(id)){
                 rm.setMessage("远程求助ID不能为空！！");

src/main/java/com/steerinfo/baseinfo/meterbasecar/controller/MeterBaseCarController.java

@@ -20,6 +20,7 @@ import com.steerinfo.baseinfo.meterbasecar.service.IMeterBaseCarService;
 import com.steerinfo.meterwork.except.MarkerMetException;
 import com.steerinfo.util.CommonPage;
 import com.steerinfo.util.SSOUtil;
+import io.micrometer.core.instrument.Meter;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
@@ -202,12 +203,15 @@ public class MeterBaseCarController extends BaseRESTfulController {
                 HashMap queryCar = new HashMap();
                 queryCar.put("carNo", params.get("carNo").toString());
                 queryCar.put("validFlag", "0");
-                List<MeterBaseCar> queryList = meterBaseCarService.query(queryCar);
+                //查询服役状态的车辆信息
+                List<MeterBaseCar> queryList01 = meterBaseCarService.query(queryCar);
+                //查询停役、删除状态的车辆信息
+                List<MeterBaseCar> queryList02 = meterBaseCarMapper.selectByMap(params.get("carNo").toString());
 
-                meterBaseDriverMapper.batchDeleteSelf(params.get("carNo").toString());
+                //meterBaseDriverMapper.batchDeleteSelf(params.get("carNo").toString());
 
-                // 车辆表已存在时，跳过
-                if (queryList.size() == 0) {
+                // 车辆表已存在车辆信息时，跳过
+                if (queryList01.size()+queryList02.size() == 0) {
                     // 新增车辆
                     MeterBaseCar car = new MeterBaseCar();
                     car.setCarNo(params.get("carNo").toString());
@@ -217,15 +221,20 @@ public class MeterBaseCarController extends BaseRESTfulController {
                     if (params.get("carCarrierWeight") != null) {
                         new BigDecimal(params.get("carCarrierWeight").toString());
                     }
-
                     // 将sso id写入车辆表，便于以后删除和重置密码
                     car.setSsoId(ssoMap.get("data").toString());
-
                     car.setCreateManNo("admin");
                     car.setCreateManName("admins");
                     car.setCreateTime(new Date());
 
                     meterBaseCarService.add(car);
+                }else if(queryList02.size() >= 1){
+                    for (MeterBaseCar model: queryList02) {
+                        //停役或者删除状态的车辆信息更新为服役状态
+                        meterBaseCarMapper.updateValidFlagById(model.getPkNo());
+                        //停役或者删除状态的司机信息更新为服役状态
+                        meterBaseDriverMapper.updateValidFlagByCarId(model.getCarNo());
+                    }
                 }
                 // 拆分司机list，新增司机表
                 List<MeterBaseDriver> driverList = JSONObject.parseArray(params.get("driverList").toString(), MeterBaseDriver.class);

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

@@ -9,6 +9,7 @@ import java.util.Map;
 
 import com.steerinfo.meterwork.meterworkcaractual.model.MeterWorkCarActual;
 import feign.Param;
+import io.micrometer.core.instrument.Meter;
 import org.apache.ibatis.annotations.Mapper;
 
 @Mapper
@@ -19,4 +20,7 @@ public interface MeterBaseCarMapper extends IBaseMapper<MeterBaseCar, String> {
 
     void deleteCarById(@Param("list") List<String> driverNos);
 
+    List<MeterBaseCar> selectByMap(String carNo);
+
+    int updateValidFlagById(String pkNo);
 }

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

@@ -753,4 +753,19 @@
     </foreach>
   </update>
 
+  <select id="selectByMap" parameterType="java.lang.String" resultMap="BaseResultMap">
+    <include refid="select" />
+    where valid_flag in ('1', '2')
+      <if test="carNo != null">
+        and CAR_NO = #{carNo,jdbcType=VARCHAR},
+     </if>
+  </select>
+
+  <update id="updateValidFlagById" parameterType="java.lang.String">
+    update METER_BASE_CAR set VALID_FLAG = '0'
+    where 1=1
+      <if test="pkNo != null and pkNo != ''">
+        and PK_NO = #{pkNo}
+      </if>
+  </update>
 </mapper>

src/main/java/com/steerinfo/baseinfo/meterbasedriver/mapper/MeterBaseDriverMapper.java

@@ -23,4 +23,6 @@ public interface MeterBaseDriverMapper extends IBaseMapper<MeterBaseDriver, Stri
     void deleteCarById(@Param("list") List<String> carNos);
 
     List<MeterBaseDriver> getDirverBySup(String customerSupplierNo);
+
+    int updateValidFlagByCarId(String carId);
 }

src/main/java/com/steerinfo/baseinfo/meterbasedriver/mapper/MeterBaseDriverMapper.xml

@@ -538,4 +538,12 @@
   <select id="getDirverBySup" parameterType="java.lang.String" resultMap="BaseResultMap">
     select * from METER_BASE_DRIVER where CAR_ID in (select CAR_NO from METER_BASE_CAR WHERE CUSTOMER_SUPPLIER_NO = #{customerSupplierNo})
   </select>
+
+  <update id="updateValidFlagByCarId" parameterType="java.util.List">
+    update METER_BASE_DRIVER set VALID_FLAG = '0'
+    where 1=1
+      <if test="carId != null and carId != ''">
+        and car_id = #{carId}
+      </if>
+  </update>
 </mapper>

src/main/java/com/steerinfo/meterwork/meterworkcaractual/service/impl/MeterWorkCarActualServiceImpl.java

@@ -492,6 +492,10 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
         String type = params.get("type") == null ? "" : params.get("type").toString();
         MeterWorkCarActual actualModel01 = meterWorkCarActualMapper.selectByPrimaryKey(params.get("actualNo01").toString());
         MeterWorkCarActual actualModel02 = meterWorkCarActualMapper.selectByPrimaryKey(params.get("actualNo02").toString());
+        if(actualModel01 == null || actualModel02 == null){
+            rm.setMessage("未找到一次计量数据，请确认！！！");
+            return rm;
+        }
         List<MeterWorkCarActual> models = new ArrayList<MeterWorkCarActual>();
         models.add(actualModel01);
         models.add(actualModel02);
@@ -500,7 +504,6 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
             rm.setMessage("参数为空，请确认！！！");
             return rm;
         }
-
         //models必须是2个，而且他们的预报组合号一致
         if(models.size() != 2 && models.get(0).getPredictionCombination().equals(models.get(1).getPredictionCombination())){
             rm.setMessage("必须选择两个预报组合号一致的洁净数据!!!");
@@ -602,7 +605,7 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
             break;
             case "7": {         //类型为混卸类型
                 for (MeterWorkCarActual model: models) {
-                    if(!model.getPredictionType().equals("6")) {
+                    if(!model.getPredictionType().equals("7")) {
                         rm.setMessage("选中的计量数据当中有一条或多条不是混装委托洁净数据，请确认！！");
                     }
                 }

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

@@ -2787,40 +2787,35 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
             MeterWorkCarActualFirst mwcaf2 = meterWorkCarActualFirstMapper.selectByPrimaryKey(actualNo2);
             MeterWorkCarActualFirst mwcaf3 = meterWorkCarActualFirstMapper.selectByPrimaryKey(actualNo2);
             MeterWorkCarActualFirst mwcaf4 = meterWorkCarActualFirstMapper.selectByPrimaryKey(actualNo3);
-
             //查询所有的委托数据
             PreTrackScale pts1 = preTrackScaleMapper.selectByPrimaryKey(predictionNo1);
             PreTrackScale pts2 = preTrackScaleMapper.selectByPrimaryKey(predictionNo2);
-
             //定义新的结净数据实体
             MeterWorkCarActual actualRow1 = new MeterWorkCarActual();
             MeterWorkCarActual actualRow2 = new MeterWorkCarActual();
-
             //判断是否为混装逻辑
-            if(mwcaf1.getMeterWeight().compareTo(mwcaf2.getMeterWeight()) == -1 || mwcaf1.getMeterWeight().compareTo(mwcaf4.getMeterWeight()) == -1 || mwcaf2.getMeterWeight().compareTo(mwcaf4.getMeterWeight()) == -1){
+            if(mwcaf1.getMeterWeight().compareTo(mwcaf2.getMeterWeight()) == -1 ||
+                    mwcaf1.getMeterWeight().compareTo(mwcaf4.getMeterWeight()) == -1 ||
+                    mwcaf2.getMeterWeight().compareTo(mwcaf4.getMeterWeight()) == -1){
                 return "不为混卸逻辑！！";
             }
-
             //判断一次数据是否存在
             if (mwcaf1 == null || mwcaf2 == null || mwcaf3 == null || mwcaf4 == null) {
                 return "未查询到相应的一次数据！！";
             }
-
             //判断一次数据是否已结净
-            if (mwcaf1.getValueFlag().equals("2") || mwcaf2.getValueFlag().equals("2") || mwcaf3.getValueFlag().equals("2") || mwcaf4.getValueFlag().equals("2")) {
+            if (mwcaf1.getValueFlag().equals("2") || mwcaf2.getValueFlag().equals("2") ||
+                    mwcaf3.getValueFlag().equals("2") || mwcaf4.getValueFlag().equals("2")) {
                 return "存在已结净的一次数据！！";
             }
-
             //判断委托数据是否存在
             if (pts1 == null || pts2 == null) {
                 return "未查询到相应的委托数据！！";
             }
-
             //判断委托数据是否已使用
             if (!pts1.getValueFlag().equals("1") || !pts1.getValueFlag().equals("1")) {
                 return "委托不是未使用状态！！";
             }
-
             //将委托中的编号和收发货的等数据拷贝进一次数据中
             MeterWorkCarActualFirst first1 = meterWorkCarActualFirstMapper.selectAndMatch(actualNo1, predictionNo1);
             BeanUtils.copyProperties(first1,mwcaf1);
@@ -2830,7 +2825,6 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
             BeanUtils.copyProperties(first3,mwcaf3);
             MeterWorkCarActualFirst first4 = meterWorkCarActualFirstMapper.selectAndMatch(actualNo3, predictionNo2);
             BeanUtils.copyProperties(first4, mwcaf4);
-
             //将委托中的编号和收发货单位和一次数据等数据拷贝进结净数据中
             MeterWorkCarActual mwca1 = meterWorkCarActualMapper.manualAddPre(actualNo1, actualNo2, predictionNo1);
             BeanUtils.copyProperties(mwca1, actualRow1);