车辆注册

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

@@ -264,6 +264,8 @@ public class MeterBaseCarController extends BaseRESTfulController {
                     // 将sso id写入车辆表，便于以后删除和重置密码
                     if(!ssoMap.get("code").toString().equals("1")){
                         car.setSsoId(ssoMap.get("data").toString());
+                    }else{
+                        msg = ssoUtil.ssoResetPwd(car.getSsoId(), params.get("password").toString(), "");
                     }
                     car.setCreateManNo("admin");
                     car.setCreateManName("admins");
@@ -280,6 +282,41 @@ public class MeterBaseCarController extends BaseRESTfulController {
                         //停役或者删除状态的司机信息更新为服役状态
                         meterBaseDriverMapper.updateValidFlagByCarId(map);
                     }
+
+                    // 新增车辆
+                    queryList01 = meterBaseCarService.query(queryCar);
+                    MeterBaseCar car = queryList01.get(0);
+                    car.setValidFlag("0");
+
+                    String unitNo = params.get("unitNo").toString();
+                    HashMap<String, Object> unitMap = new HashMap<>();
+                    unitMap.put("unitNo", unitNo);
+
+                    List<MeterBaseSpecialUnit> unitList = meterBaseSpecialUnitMapper.selectByParameters(unitMap);
+                    if(unitList.size() >= 1) {
+                        if(unitNo.equals(unitList.get(0).getUnitNo())) {
+                            car.setIsSpecialunit("1");
+                        }else {
+                            car.setIsSpecialunit("0");
+                        }
+                    }else {
+                        car.setIsSpecialunit("0");
+                    }
+                    car.setUsetDepartmentNo(params.get("unitNo").toString());
+                    car.setUsetDepartment(params.get("unitName").toString());
+
+                    car.setCarTypeNo(params.get("carTypeNo").toString());
+                    car.setCarTypeName(params.get("carTypeName").toString());
+                    if (params.get("carCarrierWeight") != null) {
+                        new BigDecimal(params.get("carCarrierWeight").toString());
+                    }
+                    ssoUtil.ssoResetPwd(car.getSsoId(), params.get("password").toString(), "");
+
+                    car.setCreateManNo("admin");
+                    car.setCreateManName("admins");
+                    car.setCreateTime(new Date());
+
+                    meterBaseCarMapper.updateByPrimaryKeySelective(car);
                 }
                 // 拆分司机list，新增司机表
                 List<MeterBaseDriver> driverList = JSONObject.parseArray(params.get("driverList").toString(), MeterBaseDriver.class);
@@ -876,6 +913,24 @@ public class MeterBaseCarController extends BaseRESTfulController {
         }
     }
 
+    @ApiOperation(value = "根据车辆直接废除", notes = "根据url的id来指定删除对象")
+    @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "String")
+    //@RequiresPermissions("meterbasecar:delete")
+    @PostMapping(value = "/deleteByCarNo")//String
+    public RESTfulResult deleteByCarNo(@RequestBody Map carNo) {
+        try {
+            List<String> list = new ArrayList<>();
+            list.add(carNo.get("carNo").toString());
+            meterBaseDriverMapper.deleteCarById(list);
+            meterBaseCarMapper.deleteCarById(list);
+            return success();
+        }
+        catch (Exception e){
+            e.printStackTrace();
+            return failed(null,"操作异常，请确认");
+        }
+    }
+
 
     @ApiOperation(value = "批量车辆导入", notes = "批量车辆导入")
 

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

@@ -928,7 +928,7 @@
 
   <!--  批量删除车辆-->
   <update id="deleteCarById" parameterType="java.util.List">
-    update METER_BASE_CAR set VALID_FLAG = '2' where CAR_NO in
+    update METER_BASE_CAR set VALID_FLAG = '1' where CAR_NO in
     <foreach item="carNos" collection="list" open="(" separator="," close=")">
       #{carNos}
     </foreach>

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

@@ -522,14 +522,14 @@
 <!--  </delete>-->
 
   <update id="deleteDriverById" parameterType="java.util.List">
-    update METER_BASE_DRIVER set VALID_FLAG = '2' where DRIVER_NO in
+    update METER_BASE_DRIVER set VALID_FLAG = '1' where DRIVER_NO in
     <foreach item="driverNos" collection="list" open="(" separator="," close=")">
       #{driverNos}
     </foreach>
   </update>
 
   <update id="deleteCarById" parameterType="java.util.List">
-    update METER_BASE_DRIVER set VALID_FLAG = '2' where CAR_ID in
+    update METER_BASE_DRIVER set VALID_FLAG = '1' where CAR_ID in
     <foreach item="carNos" collection="list" open="(" separator="," close=")">
       #{carNos}
     </foreach>

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

@@ -38,6 +38,7 @@ import com.steerinfo.pretrack.prerailwayscale.model.PreRailwayScale;
 import com.steerinfo.pretrack.pretrackscale.model.PreTrackScale;
 import com.steerinfo.util.FieldsCollector;
 import com.steerinfo.util.StringUtils;
+import org.apache.shiro.crypto.hash.Hash;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -2418,17 +2419,22 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
         rm.setFailed();
 
         try {
+            HashMap<String, Object> map = new HashMap<>();
+
             SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
             String afl = sdf.format(new Date());
             String firstNo = sdf.format(new Date()) + meterWorkRailwayActFirstMapper.getNewID(afl);
+            String flag = null;
             //存储当前计量的数据
             if(grossModel.getActualFirstNo() == null) {
                 grossModel.setActualFirstNo(firstNo);
                 meterWorkRailwayActFirstMapper.insertSelective(grossModel);
+                flag = "0";
             }
             if(tareModel.getActualFirstNo() == null) {
                 tareModel.setActualFirstNo(firstNo);
                 meterWorkRailwayActFirstMapper.insertSelective(tareModel);
+                flag = "1";
             }
 
             MeterWorkRailwayActual actualRow = new MeterWorkRailwayActual();
@@ -2524,8 +2530,15 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                 meterWorkRailwayActualMapper.insertSelective(actualRow);
             }
 
+            if(flag.equals("0")) {
+                map.put("firstModel", model01);
+            }else if(flag.equals("1")) {
+                map.put("firstModel", model02);
+            }
+            map.put("actualModel", actualRow);
+
             rm.setSucceed();
-            rm.setData(actualRow.getActualNo());
+            rm.setData(map);
             rm.setCode("200");
             rm.setMessage("操作成功！！");
             return rm;