设备激活修改。

web/src/main/java/com/jpsoft/bus/modules/driver/controller/DriverApiController.java

@@ -18,10 +18,9 @@ import com.jpsoft.bus.modules.bus.entity.*;
 import com.jpsoft.bus.modules.bus.service.*;
 import com.jpsoft.bus.modules.common.dto.MessageResult;
 import com.jpsoft.bus.modules.common.dto.Sort;
-import com.jpsoft.bus.modules.common.utils.CommonUtil;
-import com.jpsoft.bus.modules.common.utils.JwtUtil;
-import com.jpsoft.bus.modules.common.utils.OSSUtil;
-import com.jpsoft.bus.modules.common.utils.PojoUtils;
+import com.jpsoft.bus.modules.common.utils.*;
+import com.jpsoft.bus.modules.sys.entity.SysLog;
+import com.jpsoft.bus.modules.sys.service.SysLogService;
 import com.jpsoft.gps.callback.GpsDataCallback;
 import io.swagger.annotations.*;
 import lombok.extern.slf4j.Slf4j;
@@ -34,6 +33,7 @@ import org.springframework.data.redis.core.ValueOperations;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
+import javax.servlet.http.HttpServletRequest;
 import java.math.BigDecimal;
 import java.text.SimpleDateFormat;
 import java.util.*;
@@ -103,23 +103,45 @@ public class DriverApiController {
     @Autowired
     private GpsDataCallback gpsDataCallback;
 
+    @Autowired
+    private SysLogService logService;
+
     @PostMapping("carActivation")
     @ApiOperation(value = "司机端激活")
     @ApiImplicitParams({
-            @ApiImplicitParam(name = "activationCode", value = "激活码", required = true, paramType = "query"),
-            @ApiImplicitParam(name = "carNum", value = "车牌号", required = true, paramType = "form")
+        @ApiImplicitParam(name = "licensePlateNumber", value = "车牌号", required = true, paramType = "form"),
+        @ApiImplicitParam(name = "padSerialNumber", value = "平板序列号", required = true, paramType = "form"),
+        @ApiImplicitParam(name = "pacsSerialNumber", value = "门禁设备序列号", required = true, paramType = "form")
     })
-    public MessageResult<Map> carActivation(String activationCode,String carNum){
-
+    public MessageResult<Map> carActivation(String licensePlateNumber, String padSerialNumber, String pacsSerialNumber, HttpServletRequest request){
         MessageResult<Map> messageResult = new MessageResult<>();
+
         try{
-            VehicleInfo vehicleInfo = vehicleInfoService.findByCodeAndCarNum(activationCode,carNum);
+            VehicleInfo vehicleInfo = vehicleInfoService.findByCodeAndCarNum(padSerialNumber,licensePlateNumber);
+
             if (vehicleInfo == null){
-                throw new Exception("车牌号或激活码错误");
+                SysLog sysLog = new SysLog();
+                sysLog.setPointcut("车辆激活");
+                sysLog.setData(licensePlateNumber + "," + padSerialNumber + "," + pacsSerialNumber);
+                sysLog.setRemark("车牌号与当前平板未绑定!");
+                sysLog.setRemoteIp(HttpUtil.getIpAddress(request));
+                sysLog.setCreateTime(new Date());
+                logService.insert(sysLog);
+
+                throw new Exception(sysLog.getRemark());
+            }
+            else if(!pacsSerialNumber.equals(vehicleInfo.getDeviceNo())){
+                SysLog sysLog = new SysLog();
+                sysLog.setPointcut("车辆激活");
+                sysLog.setData(licensePlateNumber + "," + padSerialNumber + "," + pacsSerialNumber);
+                sysLog.setRemark("车牌号与当前打卡设备未绑定!");
+                sysLog.setRemoteIp(HttpUtil.getIpAddress(request));
+                sysLog.setCreateTime(new Date());
+                logService.insert(sysLog);
+
+                throw new Exception(sysLog.getRemark());
             }
-            /*if ("1".equals(vehicleInfo.getStatus())){
-                throw new Exception("此车辆已被激活");
-            }*/
+
             vehicleInfo.setStatus("1");
             vehicleInfoService.update(vehicleInfo);