后端提交

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

@@ -16,6 +16,7 @@ import com.steerinfo.baseinfo.meterbaseverificationcode.mapper.MeterBaseVerifica
 import com.steerinfo.framework.controller.BaseRESTfulController;
 import com.steerinfo.framework.controller.RESTfulResult;
 import com.steerinfo.framework.service.pagehelper.PageList;
+import com.steerinfo.framework.user.UserPayload;
 import com.steerinfo.framework.utils.collection.ListUtils;
 import com.steerinfo.baseinfo.meterbasecar.model.MeterBaseCar;
 import com.steerinfo.baseinfo.meterbasecar.service.IMeterBaseCarService;
@@ -774,12 +775,6 @@ public class MeterBaseCarController extends BaseRESTfulController {
                         car.setCarCarrierWeight(new BigDecimal(params.get("carCarrierWeight").toString()));
                     }
                 }
-                /*if (params.get("carSelfWeight") != null) {
-                    car.setCarSelfWeight(new BigDecimal(params.get("carSelfWeight").toString()));
-                }
-                if (params.get("carCarrierWeight") != null) {
-                    car.setCarCarrierWeight(new BigDecimal(params.get("carCarrierWeight").toString()));
-                }*/
                 car.setUpdateManNo("admin");
                 car.setUpdateManName("admins");
                 car.setUpdateTime(new Date());
@@ -809,6 +804,9 @@ public class MeterBaseCarController extends BaseRESTfulController {
     public RESTfulResult addByCarNo(@RequestBody HashMap params) {
         MeterBaseCar car = new MeterBaseCar();
         try {
+            UserPayload payload = UserPayload.getCurrUser();
+            String userId = payload.getId();
+            String userName = payload.getUserName();
             String msg = "";
             // 检查车辆是否存在
             HashMap query = new HashMap();
@@ -832,12 +830,11 @@ public class MeterBaseCarController extends BaseRESTfulController {
 //                        car.setMnemonicCode(params.get("mnemonicCode").toString());
 //                        car.setCustomerSupplierName(params.get("customerSupplierName").toString());
 //                        car.setMemo(params.get("memo").toString());
-                    car.setCreateManNo("admin");
-                    car.setCreateManName("admins");
+                    car.setCreateManNo(userId);
+                    car.setCreateManName(userName);
                     car.setCreateTime(new Date());
                     // 将sso id写入车辆表，便于以后删除和重置密码
                     car.setSsoId(ssoMap.get("data").toString());
-
                     msg = meterBaseCarService.checkandadd(car);
                 }
             } else {
@@ -847,8 +844,8 @@ public class MeterBaseCarController extends BaseRESTfulController {
                 car.setCarTypeNo(params.get("carTypeNo").toString());
                 car.setCarTypeName(params.get("carTypeName").toString());
                 car.setValidFlag("0");
-                car.setUpdateManNo("admin");
-                car.setUpdateManName("admins");
+                car.setUpdateManNo(userId);
+                car.setUpdateManName(userName);
                 car.setUpdateTime(new Date());
 
                 // 将sso id写入车辆表，便于以后删除和重置密码
@@ -859,11 +856,9 @@ public class MeterBaseCarController extends BaseRESTfulController {
                 }
                 meterBaseCarMapper.updateByPrimaryKeySelective(car);
             }
-
             if (com.steerinfo.util.StringUtils.isNotEmpty(msg)) {
                 return failed(null, msg);
             }
-
         } catch (Exception e) {
             e.printStackTrace();
             TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
@@ -882,35 +877,27 @@ public class MeterBaseCarController extends BaseRESTfulController {
             List<MeterBaseDriver> driverList = JSONObject.parseArray(params.get("driverList").toString(), MeterBaseDriver.class);
             // 循环新增司机
             for (MeterBaseDriver driver : driverList) {
-                // 检查司机是否存在
                 HashMap query = new HashMap();
-                query.put("carNo", params.get("carNo").toString());
-                query.put("telNum", driver.getTelNum());
-                query.put("validFlag", "0");
-
+                query.put("driverNo",params.get("carNo") + driver.getTelNum());
                 List<MeterBaseDriver> list = meterBaseDriverService.query(query);
-                // 司机表已存在时，跳过
-                if (list.size() == 0) {
-                    // 将司机信息加入实体
-                    // 主键改为日期主键
-                    driver.setId(params.get("carNo").toString() + driver.getTelNum());
+                // 检查司机是否存在
+                if (list.size() >= 1) {
+                    // 主键改为车号+电话号码
+                    driver.setDriverNo(params.get("carNo")+driver.getTelNum());
+                    driver.setCarId(params.get("carNo").toString());
+                    UserPayload payload = UserPayload.getCurrUser();
+                    String userId = payload.getId();
+                    String userName = payload.getUserName();
+                    driver.setUpdateManNo(userId);
+                    driver.setUpdateManName(userName);
+                    driver.setUpdateTime(new Date());
+                    driver.setValidFlag("0");//服役
+                    meterBaseDriverMapper.updateByPrimaryKeySelective(driver);
+                }else {
                     driver.setCarId(params.get("carNo").toString());
-                    driver.setValidFlag("0");
-                    driver.setCreateManNo("admin");
-                    driver.setCreateManName("admins");
-                    driver.setCreateTime(new Date());
                     meterBaseDriverService.checkandadd(driver);
                 }
-                if (com.steerinfo.util.StringUtils.isNotEmpty(msg)) {
-                    TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
-                    break;
-                }
             }
-            if (com.steerinfo.util.StringUtils.isNotEmpty(msg)) {
-                TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
-                return failed(null, msg);
-            }
-
         } catch (Exception e) {
             e.printStackTrace();
             TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();

src/main/java/com/steerinfo/baseinfo/meterbasedriver/controller/MeterBaseDriverController.java

@@ -166,6 +166,37 @@ public class MeterBaseDriverController extends BaseRESTfulController {
         }
     }
 
+    @ApiOperation(value = "根据司机直接废除", notes = "根据url的id来指定删除对象")
+    //@RequiresPermissions("meterbasecar:delete")
+    @PostMapping(value = "/deleteByDriverNo")//String
+    public RESTfulResult deleteByCarNo(@RequestBody Map driverNo) {
+        try {
+            List<String> list = new ArrayList<>();
+            list.add(driverNo.get("driverNo").toString());
+            meterBaseDriverMapper.deleteCarById01(list);
+            return success();
+        }
+        catch (Exception e){
+            e.printStackTrace();
+            return failed(null,"操作异常，请确认");
+        }
+    }
+    @ApiOperation(value = "根据司机直接启用", notes = "根据url的id来指定删除对象")
+    //@RequiresPermissions("meterbasecar:delete")
+    @PostMapping(value = "/enableByDriverNo")//String
+    public RESTfulResult enableByCarNo(@RequestBody Map driverNo) {
+        try {
+            List<String> list = new ArrayList<>();
+            list.add(driverNo.get("driverNo").toString());
+            meterBaseDriverMapper.enableCarById01(list);
+            return success();
+        }
+        catch (Exception e){
+            e.printStackTrace();
+            return failed(null,"操作异常，请确认");
+        }
+    }
+
     @ApiOperation(value = "获取该客商对应司机新信息", notes = "获取该客商对应车辆")
     //@RequiresPermissions("meterbasecar:view")
     @PostMapping(value = "/getCarBySup")

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

@@ -23,6 +23,8 @@ public interface MeterBaseDriverMapper extends IBaseMapper<MeterBaseDriver, Stri
 
     void deleteCarById(@Param("list") List<String> carNos);
     void enableCarById(@Param("list") List<String> carNos);
+    void deleteCarById01(@Param("list") List<String> carNos);
+    void enableCarById01(@Param("list") List<String> carNos);
 
     List<MeterBaseDriver> getDirverBySup(String customerSupplierNo);
 

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

@@ -542,6 +542,20 @@
     </foreach>
   </update>
 
+  <update id="deleteCarById01" parameterType="java.util.List">
+    update METER_BASE_DRIVER set VALID_FLAG = '1' where driver_no in
+    <foreach item="carNos" collection="list" open="(" separator="," close=")">
+      #{carNos}
+    </foreach>
+  </update>
+
+  <update id="enableCarById01" parameterType="java.util.List">
+    update METER_BASE_DRIVER set VALID_FLAG = '0' where driver_no in
+    <foreach item="carNos" collection="list" open="(" separator="," close=")">
+      #{carNos}
+    </foreach>
+  </update>
+
   <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>

src/main/java/com/steerinfo/baseinfo/meterbasedriver/service/impl/MeterBaseDriverServiceImpl.java

@@ -49,16 +49,13 @@ public class MeterBaseDriverServiceImpl extends BaseServiceImpl<MeterBaseDriver,
         if (StringUtils.isNotEmpty(msg)){
             return msg;
         }
-
         String no=model.getCarId()+model.getTelNum();
         model.setDriverNo(no);
-
-        /*UserPayload payload = UserPayload.getCurrUser();
+        UserPayload payload = UserPayload.getCurrUser();
         String userId = payload.getId();
         String userName = payload.getUserName();
-
         model.setCreateManNo(userId);
-        model.setCreateManName(userName);*/
+        model.setCreateManName(userName);
         model.setCreateTime(new Date());
         model.setValidFlag("0");//服役
 

src/main/java/com/steerinfo/meterwork/meterworkmonitor/mapper/MeterWorkMonitorMapper.xml

@@ -1946,6 +1946,9 @@
   <select id="weightByCarNo" parameterType="java.util.HashMap" resultMap="BaseResultMap">
     <include refid="select" />
     where 1 != 1
+      <if test="setCar != null and setCar != ''">
+        or set_car = #{setCar}
+      </if>
       <if test="rfidCar != null and rfidCar != ''">
         or RFID_CAR = #{rfidCar}
       </if>

src/main/java/com/steerinfo/meterwork/meterworkmonitor/service/impl/MeterWorkMonitorServiceImpl.java

@@ -115,6 +115,7 @@ public class MeterWorkMonitorServiceImpl extends BaseServiceImpl<MeterWorkMonito
         rm.setFailed();
         try{
             HashMap<String, Object> map = new HashMap();
+            map.put("setCar", rfidCar);
             map.put("rfidCar", rfidCar);
             map.put("photoCar", rfidCar);
             map.put("scanCar", rfidCar);