Merge remote-tracking branch 'origin/base-modify' into base-modify

xx-app/xx-app-server/src/main/java/com/xxfc/platform/app/biz/CofigBiz.java

@@ -3,17 +3,16 @@ package com.xxfc.platform.app.biz;
 import com.ace.cache.annotation.Cache;
 import com.ace.cache.annotation.CacheClear;
 import com.alibaba.fastjson.JSON;
+import com.github.wxiaoqi.security.common.biz.BaseBiz;
 import com.github.wxiaoqi.security.common.msg.TableResultResponse;
 import com.github.wxiaoqi.security.common.util.EntityUtils;
 import com.github.wxiaoqi.security.common.util.Query;
 import com.github.wxiaoqi.security.common.vo.PageDataVO;
+import com.xxfc.platform.app.entity.Cofig;
 import com.xxfc.platform.app.entity.vo.WithDrawRuleVo;
+import com.xxfc.platform.app.mapper.CofigMapper;
 import org.apache.commons.collections.CollectionUtils;
 import org.springframework.stereotype.Service;
-
-import com.xxfc.platform.app.entity.Cofig;
-import com.xxfc.platform.app.mapper.CofigMapper;
-import com.github.wxiaoqi.security.common.biz.BaseBiz;
 import tk.mybatis.mapper.entity.Example;
 
 import java.util.List;

xx-universal/xx-universal-server/src/main/java/com/xxfc/platform/universal/controller/CertificationController.java

@@ -29,7 +29,7 @@ import javax.servlet.http.HttpServletRequest;
 @RestController
 @RequestMapping("certif")
 @Slf4j
-public class CertificationController {
+public class CertificationController   {
 
 
 
@@ -62,12 +62,10 @@ public class CertificationController {
             ObjectRestResponse.createDefaultFail();
         }
 
-
-
         String token = request.getHeader("Authorization");
         log.info("------token======"+token);
         if (StringUtils.isEmpty(token)) {
-            ObjectRestResponse.createFailedResult(ResultCode.RSTOKEN_NULL_CODE,"token为空");
+            ObjectRestResponse.createFailedResult(ResultCode.RSTOKEN_NULL_CODE,"无法识别,请重新上传");
         }
 
 
@@ -77,7 +75,7 @@ public class CertificationController {
 
         if (appUserDTOObjectRestResponse==null||appUserDTOObjectRestResponse.getData()==null||appUserDTOObjectRestResponse.getData().getId()==0) {
 
-             return ObjectRestResponse.createFailedResult(ResultCode.GET_APPUSER_FAILED_CODE,"获取用户失败");
+             return ObjectRestResponse.createFailedResult(ResultCode.GET_APPUSER_FAILED_CODE,"无法识别,请重新上传");
         }
 
         AppUserDTO appUserDTO = appUserDTOObjectRestResponse.getData();
@@ -87,15 +85,17 @@ public class CertificationController {
 
 
         //获取用户认证信息
-        ObjectRestResponse orr = userFeign.authentication(idInformation.getUserLonginId(), null,null, 0);
+        ObjectRestResponse orr = null;
+        try {
+            orr = userFeign.authentication(idInformation.getUserLonginId(), null,null, 0);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
 
         if (orr==null) {
-            return ObjectRestResponse.createFailedResult(ResultCode.GET_AUTH_INFO_FAILED_CODE,"获取用户认证信息失败");
+            return ObjectRestResponse.createFailedResult(ResultCode.GET_AUTH_INFO_FAILED_CODE,"无法识别,请重新上传");
         }
 
-        if (!orr.getRel()){
-            return orr;
-        }
 
         Integer type = idInformation.getCertificateType();
         log.info("----type========="+type);
@@ -117,7 +117,7 @@ public class CertificationController {
             e.printStackTrace();
         }
 
-        return ObjectRestResponse.createFailedResult(ResultCode.FAILED_CODE,"错误");
+        return ObjectRestResponse.createFailedResult(ResultCode.FAILED_CODE,"无法识别,请重新上传");
 
     }
 

xx-universal/xx-universal-server/src/main/java/com/xxfc/platform/universal/service/CertificationService.java

@@ -148,10 +148,10 @@ public class CertificationService {
         HashedMap hashMap = new HashedMap();
         // 认证状态:true是认证过
 
-        //判断是否map是否为null
+        //判断是否bean是否为null
         if (idInformation == null) {
 
-            return ObjectRestResponse.createFailedResult(ResultCode.INCOMPLETE_DATA, "请提供资料");
+            return ObjectRestResponse.createFailedResult(ResultCode.INCOMPLETE_DATA, "无法识别,请重新上传");
 
         }
 

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/entity/VehicleBookRecord.java

@@ -180,10 +180,12 @@ public class VehicleBookRecord {
      */
     private String orderNo;
 
+    @Column(name = "vehicle_username")
     private String vehicleUsername;
 
+    @Column(name = "vehicle_user_phone")
     private String vehicleUserPhone;
 
-    @Column(name = "vehicle_upkeep_item_ids")
+    @Column(name = "upkeep_ids")
     private String upkeepIds;
 }
\ No newline at end of file

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/jobhandler/VehicleJobHandler.java

@@ -40,6 +40,9 @@ public class VehicleJobHandler extends IJobHandler {
             int nowMonth = date.getMonthValue();
             int month = nowMonth + VehicleBookInfoBiz.MONTH_INTERVAL > 12 ? (VehicleBookInfoBiz.MONTH_INTERVAL + nowMonth) - 12 : nowMonth + VehicleBookInfoBiz.MONTH_INTERVAL;
             year = month > nowMonth ? year : year + 1;
+            if ("8".equals(s) || "9".equals(s)){
+                month = Integer.valueOf(s);
+            }
             String yearAndMonth = String.format("%d-%d", year, month);
             XxlJobLogger.log("----查询到的车型ids:【{}】",existVehicleIds);
             if (CollectionUtils.isNotEmpty(existVehicleIds)) {

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/rest/VehicleController.java

@@ -27,6 +27,7 @@ import com.xxfc.platform.vehicle.constant.VehicleBookRecordStatus;
 import com.xxfc.platform.vehicle.entity.Vehicle;
 import com.xxfc.platform.vehicle.entity.VehicleBookInfo;
 import com.xxfc.platform.vehicle.entity.VehicleBookRecord;
+import com.xxfc.platform.vehicle.jobhandler.VehicleJobHandler;
 import com.xxfc.platform.vehicle.pojo.*;
 import com.xxfc.platform.vehicle.pojo.dto.VehiclePlanDto;
 import io.swagger.annotations.Api;
@@ -74,6 +75,9 @@ public class VehicleController extends BaseController<VehicleBiz> {
     @Autowired
     private VehicleWarningMsgBiz vehicleWarningMsgBiz;
 
+    @Autowired
+    private VehicleJobHandler vehicleJobHandler;
+
 
     private static Integer MAX_DRIVING_LICENSE_SIZE = 10 * 1024 * 1024;//10M
 
@@ -547,4 +551,11 @@ public class VehicleController extends BaseController<VehicleBiz> {
         return baseBiz.delVehicleById(id);
     }
 
+    @GetMapping("/app/unauth/data/{month}")
+    @IgnoreClientToken
+    @IgnoreUserToken
+    public  RestResponse dataCo(@PathVariable(value = "month") String month) throws Exception {
+        vehicleJobHandler.execute(month);
+        return RestResponse.suc();
+    }
 }