Merge branch 'feature-wcz' of lift-manager/lift-server into develop

lift-business-service/src/main/java/cn/com/ty/lift/business/annualinspection/controller/AnnualInspectionController.java

@@ -9,6 +9,7 @@ import cn.com.ty.lift.business.library.dao.entity.model.response.LiftAnnualInspe
 import cn.com.ty.lift.business.library.service.LiftService;
 import cn.com.ty.lift.common.model.CountPage;
 import cn.com.ty.lift.common.utils.DateUtils;
+import cn.com.ty.lift.common.verify.Ver;
 import cn.com.ty.lift.common.verify.Verifier;
 import cn.com.ty.lift.common.verify.Verify;
 import cn.com.xwy.boot.web.dto.RestResponse;
@@ -81,7 +82,7 @@ public class AnnualInspectionController {
      */
     @PostMapping("findOne")
     @Verifier(fields = {"id"})
-    public RestResponse findOne(@RequestBody InspectionRequest request) {
+    public RestResponse findOne(@Ver @RequestBody InspectionRequest request) {
         InspectionResponse entity = annualInspectionService.infoById(request);
         return RestResponse.success(entity);
     }
@@ -94,7 +95,7 @@ public class AnnualInspectionController {
      */
     @PostMapping("page")
     @Verifier(fields = "mtCompanyId")
-    public RestResponse page(@RequestBody InspectionRequest request) {
+    public RestResponse page(@Ver @RequestBody InspectionRequest request) {
         IPage<InspectionResponse> pages = annualInspectionService.pageByCondition(request);
         long count = annualInspectionService.countByCondition(request);
         return RestResponse.success(CountPage.getCountPage(count, pages));
@@ -108,7 +109,7 @@ public class AnnualInspectionController {
      */
     @PostMapping("pageWorker")
     @Verifier(fields = {"workerId"})
-    public RestResponse pageWorker(@RequestBody InspectionRequest request) {
+    public RestResponse pageWorker(@Ver @RequestBody InspectionRequest request) {
         IPage<InspectionResponse> pages = annualInspectionService.pageByCondition(request);
         return RestResponse.success(pages);
     }
@@ -120,7 +121,7 @@ public class AnnualInspectionController {
      */
     @PostMapping("toConfirm")
     @Verifier(fields = {"mtCompanyId"})
-    public RestResponse toConfirm(@RequestBody InspectionRequest request){
+    public RestResponse toConfirm(@Ver @RequestBody InspectionRequest request){
         IPage<LiftAnnualInspectionResponse> pages = liftService.toConfirmAnnualInspection(request.getPage(), request.getMtCompanyId());
         return RestResponse.success(pages);
     }
@@ -133,7 +134,7 @@ public class AnnualInspectionController {
      */
     @PostMapping("confirm")
     @Verifier(fields = {"liftId","mtCompanyId","planDate"})
-    public RestResponse confirm(@RequestBody AnnualInspection entity){
+    public RestResponse confirm(@Ver @RequestBody AnnualInspection entity){
         long count = annualInspectionService.countConfirm(entity.getLiftId(), entity.getMtCompanyId(), entity.getPlanDate());
         Verify.nogt0(count, "年检计划已存在");
         entity.setStatus(0);
@@ -172,7 +173,7 @@ public class AnnualInspectionController {
      */
     @PostMapping("update")
     @Verifier(fields = {"id","mtCompanyId","isCheckGoverner","loadInspectionSetting"})
-    public RestResponse update(@RequestBody InspectionRequest entity){
+    public RestResponse update(@Ver @RequestBody InspectionRequest entity){
         AnnualInspection old = annualInspectionService.findByMtCompanyId(entity.getId(), entity.getMtCompanyId());
         Verify.notNull(old, Verify.Inspection.confirm);
 
@@ -192,25 +193,23 @@ public class AnnualInspectionController {
      */
     @PostMapping("stepOne")
     @Verifier(fields = {"id","mtCompanyId","stepStatus","selfcheckReportImg","selfcheckDate"})
-    public RestResponse stepOne(@RequestBody InspectionRequest entity){
+    public RestResponse stepOne(@Ver @RequestBody InspectionRequest entity){
         AnnualInspection old = annualInspectionService.findByMtCompanyId(entity.getId(), entity.getMtCompanyId());
         Verify.notNull(old, Verify.Inspection.confirm);
+        Integer oldStepName = old.getStepName();
         Integer oldStepStatus = old.getStepStatus();
         Integer stepStatus = entity.getStepStatus();
+        Verify.isTrue(oldStepName == 1, "请进行第一阶段操作");
         Verify.isTrue(oldStepStatus == 1 || oldStepStatus == 2, "请进行第一阶段操作");
-        Verify.isTrue(stepStatus == 1 || stepStatus == 2, "请进行第一阶段操作");
-        Verify.isTrue(oldStepStatus == stepStatus || (oldStepStatus + 1 == stepStatus), "请进行第一阶段操作");
+        Verify.isTrue(stepStatus == 2, "请进行第一阶段操作");
 
         old.setSelfcheckReportImg(entity.getSelfcheckReportImg());
         old.setSelfcheckDate(entity.getSelfcheckDate());
         old.setStepStatus(entity.getStepStatus());
 
         old.setStatus(0);
-        if(stepStatus == 1){
-            old.setStepName(1);
-        }else if(stepStatus == 2){
-            old.setStepName(2);//流转到阶段2
-        }
+        old.setStepName(2);//流转到阶段2
+
         boolean ai = annualInspectionService.saveOrUpdate(old);
         return RestResponse.success(ai);
     }
@@ -221,12 +220,12 @@ public class AnnualInspectionController {
      */
     @PostMapping("stepTwo")
     @Verifier(fields = {"id","mtCompanyId","checkDate","inspector","operator","telephone"})
-    public RestResponse stepTwo(@RequestBody InspectionRequest entity){
+    public RestResponse stepTwo(@Ver @RequestBody InspectionRequest entity){
         AnnualInspection old = annualInspectionService.findByMtCompanyId(entity.getId(), entity.getMtCompanyId());
         Verify.notNull(old, Verify.Inspection.confirm);
         Integer oldStepName = old.getStepName();
         Integer oldStepStatus = old.getStepStatus();
-        Verify.isTrue(oldStepName == 1, "请进行第二阶段操作");
+        Verify.isTrue(oldStepName == 1 || oldStepName == 2, "请进行第二阶段操作");
         Verify.isTrue(oldStepStatus == 2 || oldStepStatus == 3, "请进行第二阶段操作");
 
         old.setCheckDate(entity.getCheckDate());
@@ -251,13 +250,13 @@ public class AnnualInspectionController {
      */
     @PostMapping("stepThree")
     @Verifier(fields = {"id","mtCompanyId","stepStatus","checkResultImg","projectId"})
-    public RestResponse stepThree(@RequestBody InspectionRequest entity){
+    public RestResponse stepThree(@Ver @RequestBody InspectionRequest entity){
         AnnualInspection old = annualInspectionService.findByMtCompanyId(entity.getId(), entity.getMtCompanyId());
         Verify.notNull(old, Verify.Inspection.confirm);
         Integer oldStepName = old.getStepName();
         Integer oldStepStatus = old.getStepStatus();
         Integer stepStatus = entity.getStepStatus();
-        Verify.isTrue(oldStepName == 2, "请进行第三阶段操作");
+        Verify.isTrue(oldStepName == 2 || oldStepName == 3, "请进行第三阶段操作");
         Verify.isTrue(oldStepStatus >= 3 && oldStepStatus <= 7, "请进行第三阶段操作");
         Verify.isTrue(stepStatus >= 4 && stepStatus <= 7, "请进行第三阶段操作");
 
@@ -285,7 +284,7 @@ public class AnnualInspectionController {
      */
     @PostMapping("stepFour")
     @Verifier(fields = {"id","mtCompanyId","stepStatus","annualInspectionImg","certificateImgUrl"})
-    public RestResponse stepFour(@RequestBody AnnualInspection entity){
+    public RestResponse stepFour(@Ver @RequestBody InspectionRequest entity){
         AnnualInspection old = annualInspectionService.findByMtCompanyId(entity.getId(), entity.getMtCompanyId());
         Verify.notNull(old, Verify.Inspection.confirm);
         Integer oldStepName = old.getStepName();
@@ -465,7 +464,7 @@ public class AnnualInspectionController {
      */
     @PostMapping("pageByUser")
     @Verifier(fields = {"userId"})
-    public RestResponse pageByUser(@RequestBody InspectionRequest request) {
+    public RestResponse pageByUser(@Ver @RequestBody InspectionRequest request) {
         IPage<InspectionResponse> pages = annualInspectionService.pageByUser(request);
         return RestResponse.success(pages);
     }
@@ -478,7 +477,7 @@ public class AnnualInspectionController {
      */
 //    @PostMapping("confirm")
 //    @Verifier(fields = {"id"})
-    public RestResponse confirm(@RequestBody InspectionRequest request) {
+    public RestResponse confirm(@Ver @RequestBody InspectionRequest request) {
         AnnualInspection entity = annualInspectionService.getById(request.getId());
         Verify.notNull(entity);
         entity.setStepStatus(Verify.Inspection.STATUS_CONFIRM);
@@ -495,7 +494,7 @@ public class AnnualInspectionController {
      */
     @PostMapping("selfcheck")
     @Verifier(fields = {"id", "selfcheckDate", "selfcheckReportImg"})
-    public RestResponse selfcheck(@RequestBody InspectionRequest request) {
+    public RestResponse selfcheck(@Ver @RequestBody InspectionRequest request) {
         AnnualInspection entity = annualInspectionService.getById(request.getId());
         Verify.notNull(entity);
 
@@ -516,7 +515,7 @@ public class AnnualInspectionController {
      */
     @PostMapping("check")
     @Verifier(fields = {"id", "checkDate", "checkResultImg"})
-    public RestResponse check(@RequestBody InspectionRequest request) {
+    public RestResponse check(@Ver @RequestBody InspectionRequest request) {
         AnnualInspection entity = annualInspectionService.getById(request.getId());
         Verify.notNull(entity);
 
@@ -537,7 +536,7 @@ public class AnnualInspectionController {
      */
     @PostMapping("finish")
     @Verifier(fields = {"id", "certificateImgUrl", "annualInspectionImg"})
-    public RestResponse finish(@RequestBody InspectionRequest request) {
+    public RestResponse finish(@Ver @RequestBody InspectionRequest request) {
         AnnualInspection entity = annualInspectionService.getById(request.getId());
         Verify.notNull(entity);
 
@@ -552,7 +551,7 @@ public class AnnualInspectionController {
 
     @PostMapping("export")
     @Verifier(fields = {"ids"})
-    public void export(@RequestBody InspectionRequest request, HttpServletResponse response) {
+    public void export(@Ver @RequestBody InspectionRequest request, HttpServletResponse response) {
         log.info("headerAlias: {}", headerAlias);
         //查询数据
         List<InspectionResponse> inspections = annualInspectionService.listByIdList(request);
@@ -652,7 +651,7 @@ public class AnnualInspectionController {
 
     @PostMapping("pageByLift")
     @Verifier(fields = {"mtCompanyId", "liftId", "projectId"})
-    public RestResponse pageByLift(@RequestBody InspectionRequest request){
+    public RestResponse pageByLift(@Ver @RequestBody InspectionRequest request){
         IPage<InspectionResponse> pages = annualInspectionService.pageByLift(request);
         return RestResponse.success(pages);
     }

lift-business-service/src/main/java/cn/com/ty/lift/business/annualinspection/dto/InspectionRequest.java

@@ -140,4 +140,9 @@ public class InspectionRequest extends PageRequest {
      */
     @NotEmpty(message = "请设置公司年检人员")
     private String operator;
+
+    /**
+     * 下次年检日期
+     */
+    private LocalDate nextInspectionTime;
 }

lift-business-service/src/main/java/cn/com/ty/lift/business/emergency/controller/EmergencyRepairController.java

@@ -22,6 +22,7 @@ import cn.com.ty.lift.common.model.CountPage;
 import cn.com.ty.lift.common.utils.DateUtils;
 import cn.com.ty.lift.common.utils.StrPool;
 import cn.com.ty.lift.common.utils.WordUtil;
+import cn.com.ty.lift.common.verify.Ver;
 import cn.com.ty.lift.common.verify.Verifier;
 import cn.com.ty.lift.common.verify.Verify;
 import cn.com.xwy.boot.web.dto.RestResponse;
@@ -104,7 +105,7 @@ public class EmergencyRepairController {
      */
     @PostMapping("findOne")
     @Verifier(fields = {"id"})
-    public RestResponse findOne(@RequestBody RepairRequest request) {
+    public RestResponse findOne(@Ver @RequestBody RepairRequest request) {
         Long id = request.getId();
         RepairResponse result = emergencyRepairService.infoById(request);
 
@@ -195,7 +196,7 @@ public class EmergencyRepairController {
      */
     @PostMapping("list")
     @Verifier(fields = "mtCompanyId")
-    public RestResponse list(@RequestBody RepairRequest request) {
+    public RestResponse list(@Ver @RequestBody RepairRequest request) {
         IPage<RepairResponse> pages = emergencyRepairService.pageByRepairing(request);
         long count = pages.getTotal();
         return RestResponse.success(CountPage.getCountPage(count, pages));
@@ -209,7 +210,7 @@ public class EmergencyRepairController {
      */
     @PostMapping("page")
     @Verifier(fields = "mtCompanyId")
-    public RestResponse page(@RequestBody RepairRequest request) {
+    public RestResponse page(@Ver @RequestBody RepairRequest request) {
         LocalDate repairBegin = request.getRepairBegin();
         LocalDate repairEnd = request.getRepairEnd();
         if (null != repairBegin && null != repairEnd) {
@@ -236,7 +237,7 @@ public class EmergencyRepairController {
      */
     @PostMapping("pageWorker")
     @Verifier(fields = {"workerId"})
-    public RestResponse pageWorker(@RequestBody RepairRequest request) {
+    public RestResponse pageWorker(@Ver @RequestBody RepairRequest request) {
         IPage<RepairResponse> pages = emergencyRepairService.pageByCondition(request);
         return RestResponse.success(pages);
     }
@@ -249,7 +250,7 @@ public class EmergencyRepairController {
      */
     @PostMapping("transfer")
     @Verifier(fields = {"id", "workerId"})
-    public RestResponse transfer(@RequestBody RepairRequest request) {
+    public RestResponse transfer(@Ver @RequestBody RepairRequest request) {
         EmergencyRepair entity = emergencyRepairService.getById(request.getId());
         Verify.notNull(entity);
 
@@ -270,7 +271,7 @@ public class EmergencyRepairController {
      */
     @PostMapping("close")
     @Verifier(fields = {"id", "closeReason"})
-    public RestResponse close(@RequestBody RepairRequest request) {
+    public RestResponse close(@Ver @RequestBody RepairRequest request) {
         EmergencyRepair entity = emergencyRepairService.getById(request.getId());
         Verify.notNull(entity);
 
@@ -290,7 +291,7 @@ public class EmergencyRepairController {
      */
     @PostMapping("pageByUser")
     @Verifier(fields = {"userId"})
-    public RestResponse pageByUser(@RequestBody RepairRequest request) {
+    public RestResponse pageByUser(@Ver @RequestBody RepairRequest request) {
         IPage<RepairResponse> pages = emergencyRepairService.pageByUser(request);
         return RestResponse.success(pages);
     }
@@ -304,7 +305,7 @@ public class EmergencyRepairController {
      */
     @PostMapping("taking")
     @Verifier(fields = {"id", "takingTime"})
-    public RestResponse taking(@RequestBody RepairRequest request) {
+    public RestResponse taking(@Ver @RequestBody RepairRequest request) {
         EmergencyRepair entity = emergencyRepairService.getById(request.getId());
         Verify.notNull(entity);
 
@@ -325,7 +326,7 @@ public class EmergencyRepairController {
      */
     @PostMapping("arrive")
     @Verifier(fields = {"id", "arriveTime", "position"})
-    public RestResponse arrive(@RequestBody RepairRequest request) {
+    public RestResponse arrive(@Ver @RequestBody RepairRequest request) {
         EmergencyRepair entity = emergencyRepairService.getById(request.getId());
         Verify.notNull(entity);
 
@@ -345,7 +346,7 @@ public class EmergencyRepairController {
      */
     @PostMapping("stop")
     @Verifier(fields = {"id", "stopDate", "safetyConfirm"})
-    public RestResponse stopLift(@RequestBody RepairRequest request) {
+    public RestResponse stopLift(@Ver @RequestBody RepairRequest request) {
         EmergencyRepair entity = emergencyRepairService.getById(request.getId());
         Verify.notNull(entity);
 
@@ -365,7 +366,7 @@ public class EmergencyRepairController {
      */
     @PostMapping("addCost")
     @Verifier(fields = {"id", "erRecordCosts"})
-    public RestResponse addCost(@RequestBody RepairRequest request) {
+    public RestResponse addCost(@Ver @RequestBody RepairRequest request) {
         EmergencyRepair repair = emergencyRepairService.getById(request.getId());
         Verify.notNull(repair);
 
@@ -385,7 +386,7 @@ public class EmergencyRepairController {
      */
     @PostMapping("deleteCost")
     @Verifier(fields = {"id", "erCostItemId"})
-    public RestResponse deleteCost(@RequestBody RepairRequest request) {
+    public RestResponse deleteCost(@Ver @RequestBody RepairRequest request) {
         Long id = request.getId();
         Long erCostItemId = request.getErCostItemId();
 
@@ -416,7 +417,7 @@ public class EmergencyRepairController {
      */
     @PostMapping("modifyCost")
     @Verifier(fields = {"id", "erRecordCosts"})
-    public RestResponse modifyCost(@RequestBody RepairRequest request) {
+    public RestResponse modifyCost(@Ver @RequestBody RepairRequest request) {
         EmergencyRepair repair = emergencyRepairService.getById(request.getId());
         Verify.notNull(repair);
 
@@ -436,7 +437,7 @@ public class EmergencyRepairController {
      */
     @PostMapping("fault/list")
     @Verifier(fields = {"liftCategory"})
-    public RestResponse faultList(@RequestBody RepairRequest request) {
+    public RestResponse faultList(@Ver @RequestBody RepairRequest request) {
         List<LiftFault> lists = liftFaultService.listByLiftCategory(request.getLiftCategory());
         return RestResponse.success(lists);
     }
@@ -449,7 +450,7 @@ public class EmergencyRepairController {
      */
     @PostMapping("fault/tree")
     @Verifier(fields = {"liftCategory"})
-    public RestResponse faultTree(@RequestBody RepairRequest request) {
+    public RestResponse faultTree(@Ver @RequestBody RepairRequest request) {
         List<LiftFault> liftFaultList = liftFaultService.listByLiftCategory(request.getLiftCategory());
         Verify.notNull(liftFaultList, Verify.Repair.missingFault);
         //根据故障列表组装tree
@@ -504,7 +505,7 @@ public class EmergencyRepairController {
     @PostMapping("repairOrder")
     @Verifier(fields = {"id", "recoveryDate", "mainSign", "erRecordImg", "fieldDescription",
             "faultPart", "faultReason", "faultHandle", "faultNature", "faultDuty"})
-    public RestResponse repairOrder(@RequestBody RepairRequest request) {
+    public RestResponse repairOrder(@Ver @RequestBody RepairRequest request) {
         Long id = request.getId();
         List<String> erRecordImg = request.getErRecordImg();
 
@@ -543,7 +544,7 @@ public class EmergencyRepairController {
      */
     @PostMapping("images")
     @Verifier(fields = {"id"})
-    public RestResponse images(@RequestBody RepairRequest request) {
+    public RestResponse images(@Ver @RequestBody RepairRequest request) {
         List<ErRecordImg> lists = erRecordImgService.listByErRecordId(request.getId());
         return RestResponse.success(lists);
     }
@@ -556,7 +557,7 @@ public class EmergencyRepairController {
      */
     @PostMapping("listRepair")
     @Verifier(fields = {"mtCompanyId", "liftId", "projectId"})
-    public RestResponse listRepair(@RequestBody RepairRequest request) {
+    public RestResponse listRepair(@Ver @RequestBody RepairRequest request) {
         IPage<RepairResponse> pages = emergencyRepairService.pageByCompanyLiftProject(request);
         return RestResponse.success(pages);
     }
@@ -598,12 +599,12 @@ public class EmergencyRepairController {
             repair.setFaultReason(liftFaults.stream().filter(fault -> repairFaults.get(repair.getId() + "reasonIds").contains(fault.getId())).map(LiftFault::getFaultDesc).collect(Collectors.joining(",")));
             repair.setFaultNature(liftFaults.stream().filter(fault -> repairFaults.get(repair.getId() + "natureIds").contains(fault.getId())).map(LiftFault::getFaultType).collect(Collectors.joining(",")));
             repair.setFaultHandle(liftFaults.stream().filter(fault -> repairFaults.get(repair.getId() + "handleIds").contains(fault.getId())).map(LiftFault::getFaultType).collect(Collectors.joining(",")));
-            repair.setRepairDuration(liftFaults.stream().filter(fault -> repairFaults.get(repair.getId() + "dutyIds").contains(fault.getId())).map(LiftFault::getFaultType).collect(Collectors.joining(",")));
+            repair.setFaultDuty(liftFaults.stream().filter(fault -> repairFaults.get(repair.getId() + "dutyIds").contains(fault.getId())).map(LiftFault::getFaultType).collect(Collectors.joining(",")));
         });
     }
     @PostMapping("print")
     @Verifier(fields = {"ids"})
-    public RestResponse print(@RequestBody RepairRequest request){
+    public RestResponse print(@Ver @RequestBody RepairRequest request){
         List<RepairResponse> repairs = emergencyRepairService.listByIdList(request);
         if(null != repairs && !repairs.isEmpty()){
             fillLiftFaults(repairs);
@@ -620,7 +621,7 @@ public class EmergencyRepairController {
 
     @PostMapping("export")
     @Verifier(fields = {"ids"})
-    public void export(@RequestBody RepairRequest request, HttpServletResponse response) {
+    public void export(@Ver @RequestBody RepairRequest request, HttpServletResponse response) {
         log.info("headerAlias: {}", headerAlias);
         List<RepairResponse> repairs = emergencyRepairService.listByIdList(request);
         Verify.notNull(repairs);

lift-business-service/src/main/java/cn/com/ty/lift/business/emergency/controller/ErRecordCostController.java

@@ -4,6 +4,7 @@ import cn.com.ty.lift.business.emergency.dto.CostRequest;
 import cn.com.ty.lift.business.emergency.dto.CostResponse;
 import cn.com.ty.lift.business.emergency.service.ErRecordCostService;
 import cn.com.ty.lift.common.model.CountPage;
+import cn.com.ty.lift.common.verify.Ver;
 import cn.com.ty.lift.common.verify.Verifier;
 import cn.com.xwy.boot.web.dto.RestResponse;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -31,7 +32,7 @@ public class ErRecordCostController {
     private ErRecordCostService erRecordCostService;
 
     @PostMapping("page")
-    public RestResponse page(@RequestBody CostRequest request){
+    public RestResponse page(@Ver @RequestBody CostRequest request){
         IPage<CostResponse> pages = erRecordCostService.pageByCondition(request);
         long count = erRecordCostService.countByCondition(request);
         return RestResponse.success(CountPage.getCountPage(count, pages));
@@ -39,7 +40,7 @@ public class ErRecordCostController {
     
     @PostMapping("one")
     @Verifier(fields = {"id"})
-    public RestResponse one(@RequestBody CostRequest request){
+    public RestResponse one(@Ver @RequestBody CostRequest request){
 
         return RestResponse.success();
     }

lift-business-service/src/main/java/cn/com/ty/lift/business/framework/aspect/VerifyMethodInterceptor.java

@@ -1,10 +1,10 @@
 package cn.com.ty.lift.business.framework.aspect;
 
+import cn.com.ty.lift.common.verify.Ver;
 import cn.com.ty.lift.common.verify.Verification;
 import cn.com.ty.lift.common.verify.Verifier;
 import org.aopalliance.intercept.MethodInterceptor;
 import org.aopalliance.intercept.MethodInvocation;
-import org.springframework.web.bind.annotation.RequestBody;
 
 import java.lang.reflect.Method;
 import java.lang.reflect.Parameter;
@@ -31,14 +31,12 @@ public class VerifyMethodInterceptor implements MethodInterceptor {
             return invocation.proceed();
         }
         Object object = null;
-        //by default, verify the first arg present with RequestBody, otherwise the first in the arg list.
+        //by default, verify the first arg present with Ver,
         Parameter[] parameters = method.getParameters();
         for (int i = 0; i < parameters.length; i++) {
-            if(parameters[i].isAnnotationPresent(RequestBody.class)){
+            if(parameters[i].isAnnotationPresent(Ver.class)){
                 object = arguments[i];
                 break;
-            }else{
-                object = arguments[0];
             }
         }
         if (null == object) {
@@ -46,9 +44,7 @@ public class VerifyMethodInterceptor implements MethodInterceptor {
         }
         //get the verifier
         Verifier verifier = method.getDeclaredAnnotation(Verifier.class);
-
         Verification.INSTANCE.action(object, verifier.fields());
-
         return invocation.proceed();
     }
 }

lift-business-service/src/main/java/cn/com/ty/lift/business/framework/conf/SystemConfiguration.java

@@ -116,7 +116,7 @@ public class SystemConfiguration {
     /**
      * SQL是影响系统性能最重要的因素，所以拦截提示不合理的SQL语句
      */
-//    @Bean
+    @Bean
     @ConditionalOnMissingBean
     public SqlIllegalInterceptor sqlIllegalInterceptor(){
         SqlIllegalInterceptor sqlIllegalInterceptor = new SqlIllegalInterceptor();

lift-business-service/src/main/java/cn/com/ty/lift/business/maintenance/controller/MaintenanceRecordController.java

@@ -16,6 +16,7 @@ import cn.com.ty.lift.business.project.dao.entity.ProjectLiftRelevance;
 import cn.com.ty.lift.business.project.service.ProjectLiftRelevanceService;
 import cn.com.ty.lift.common.model.CountPage;
 import cn.com.ty.lift.common.utils.StrPool;
+import cn.com.ty.lift.common.verify.Ver;
 import cn.com.ty.lift.common.verify.Verifier;
 import cn.com.ty.lift.common.verify.Verify;
 import cn.com.xwy.boot.web.dto.RestResponse;
@@ -67,7 +68,7 @@ public class MaintenanceRecordController {
      */
     @PostMapping("pageRecord")
     @Verifier(fields = {"mtCompanyId"})
-    public RestResponse pageRecord(@RequestBody MtRecordRequest request){
+    public RestResponse pageRecord(@Ver @RequestBody MtRecordRequest request){
         IPage<MtRecordResponse> pages = maintenanceRecordService.pageRecordByCondition(request);
         long count = maintenanceRecordService.countRecordByCondition(request);
         return RestResponse.success(CountPage.getCountPage(count, pages));
@@ -80,7 +81,7 @@ public class MaintenanceRecordController {
      */
     @PostMapping("pagePlan")
     @Verifier(fields = {"mtCompanyId"})
-    public RestResponse pagePlan(@RequestBody MtPlanRequest request){
+    public RestResponse pagePlan(@Ver @RequestBody MtPlanRequest request){
         IPage<MtPlanResponse> pages = maintenancePlanService.pagePlanByCondition(request);
         Verify.notNull(pages);
         List<MtPlanResponse> records = pages.getRecords();
@@ -125,7 +126,7 @@ public class MaintenanceRecordController {
      */
     @PostMapping("one")
     @Verifier(fields = {"id"})
-    public RestResponse one(@RequestBody MtRecordRequest request){
+    public RestResponse one(@Ver @RequestBody MtRecordRequest request){
         MtRecordResponse entity = maintenanceRecordService.infoById(request);
         Verify.notNull(entity);
         /**
@@ -172,7 +173,7 @@ public class MaintenanceRecordController {
      */
     @PostMapping("images")
     @Verifier(fields = {"id"})
-    public RestResponse images(@RequestBody MtRecordRequest request){
+    public RestResponse images(@Ver @RequestBody MtRecordRequest request){
         List<MtRecordImg> mtRecordImgs = mtRecordImgService.listByRecord(request.getId());
         return RestResponse.success(mtRecordImgs);
     }
@@ -184,7 +185,7 @@ public class MaintenanceRecordController {
      */
     @PostMapping("treeOptions")
     @Verifier(fields = {"mtCompanyId","type","liftType"})
-    public RestResponse treeOptions(@RequestBody MtRecordRequest request){
+    public RestResponse treeOptions(@Ver @RequestBody MtRecordRequest request){
         Integer type = request.getType();
         Integer liftType = request.getLiftType();
         Long mtCompanyId = request.getMtCompanyId();
@@ -207,7 +208,7 @@ public class MaintenanceRecordController {
      */
     @PostMapping("listOptions")
     @Verifier(fields = {"mtCompanyId","type","liftType"})
-    public RestResponse listOptions(@RequestBody MtRecordRequest request){
+    public RestResponse listOptions(@Ver @RequestBody MtRecordRequest request){
         Integer type = request.getType();
         Integer liftType = request.getLiftType();
         Long mtCompanyId = request.getMtCompanyId();
@@ -270,7 +271,7 @@ public class MaintenanceRecordController {
      */
     @PostMapping("pass")
     @Verifier(fields = {"id"})
-    public RestResponse pass(@RequestBody MtRecordRequest request){
+    public RestResponse pass(@Ver @RequestBody MtRecordRequest request){
         MaintenanceRecord entity = maintenanceRecordService.getById(request.getId());
         Verify.notNull(entity);
         Verify.notTrue("-1".equals(entity.getStatus()),"维保单必须待审核才能操作");
@@ -286,7 +287,7 @@ public class MaintenanceRecordController {
      */
     @PostMapping("refuse")
     @Verifier(fields = {"id"})
-    public RestResponse refuse(@RequestBody MtRecordRequest request){
+    public RestResponse refuse(@Ver @RequestBody MtRecordRequest request){
         MaintenanceRecord entity = maintenanceRecordService.getById(request.getId());
         Verify.notNull(entity);
         Verify.notTrue("-1".equals(entity.getStatus()),"维保单必须待审核才能操作");
@@ -300,7 +301,7 @@ public class MaintenanceRecordController {
      */
     @PostMapping("fill")
     @Verifier(fields = {"id","maintenanceOption","imgs"})
-    public RestResponse fill(@RequestBody MtRecordRequest request){
+    public RestResponse fill(@Ver @RequestBody MtRecordRequest request){
         Long id = request.getId();
         MaintenanceRecord entity = maintenanceRecordService.getById(id);
         Verify.notNull(entity);
@@ -330,7 +331,7 @@ public class MaintenanceRecordController {
      */
     @PostMapping("deleteCost")
     @Verifier(fields = {"id","mtRecordCostId"})
-    public RestResponse deleteCost(@RequestBody MtRecordRequest request){
+    public RestResponse deleteCost(@Ver @RequestBody MtRecordRequest request){
         Long id = request.getId();
         Long mtRecordCostId = request.getMtRecordCostId();
         MtRecordCost mtRecordCost = mtRecordCostService.getById(mtRecordCostId);
@@ -370,7 +371,7 @@ public class MaintenanceRecordController {
 
     @PostMapping("pageByLift")
     @Verifier(fields = {"liftId","projectId","mtCompanyId"})
-    public RestResponse pageByLift(@RequestBody MtRecordRequest request){
+    public RestResponse pageByLift(@Ver @RequestBody MtRecordRequest request){
         IPage<MtRecordResponse> pages = maintenanceRecordService.pageByLift(request);
         return RestResponse.success(pages);
     }

lift-business-service/src/main/java/cn/com/ty/lift/business/project/controller/ProjectImportController.java

@@ -3,6 +3,7 @@ package cn.com.ty.lift.business.project.controller;
 import cn.com.ty.lift.business.project.dao.entity.model.ProjectImportModel;
 import cn.com.ty.lift.business.project.dao.entity.model.request.ProjectImportRequest;
 import cn.com.ty.lift.business.project.service.ProjectService;
+import cn.com.ty.lift.common.verify.Ver;
 import cn.com.ty.lift.common.verify.Verify;
 import cn.com.ty.lift.common.verify.Verifier;
 import cn.com.ty.lift.common.utils.StrPool;
@@ -44,7 +45,7 @@ public class ProjectImportController {
      */
     @PostMapping("import")
     @Verifier(fields = {"file","mtCompanyId"})
-    public RestResponse importData(@RequestBody ProjectImportRequest request) throws Exception {
+    public RestResponse importData(@Ver @RequestBody ProjectImportRequest request) throws Exception {
         MultipartFile file = request.getFile();
         Long mtCompanyId = request.getMtCompanyId();
         // 1 检查文件有效性

lift-business-service/src/main/resources/mapper/annualinspection/AnnualInspectionMapper.xml

@@ -66,6 +66,22 @@
         LEFT JOIN user_info ui ON ui.user_id = t.worker_id
     </select>
 
+    <!--根据状态查询总条数-->
+    <select id="countByCondition" resultType="java.lang.Long" parameterType="cn.com.ty.lift.business.annualinspection.dto.InspectionRequest" >
+        SELECT
+            count(*)
+        FROM
+            annual_inspection ai
+        <where>
+            <if test="cond.status != null">
+                AND ai.status = #{cond.status}
+            </if>
+            <if test="cond.mtCompanyId != null and cond.mtCompanyId > 0">
+                AND ai.mt_company_id = #{cond.mtCompanyId}
+            </if>
+        </where>
+    </select>
+
     <!--多条件分页查询年检记录-->
 	<select id="pageByCondition" resultMap="BaseResultMap" parameterType="cn.com.ty.lift.business.annualinspection.dto.InspectionRequest" >
         SELECT
@@ -181,26 +197,6 @@
         LEFT JOIN user_info ui ON ui.user_id = t.worker_id
     </select>
 
-    <!--根据状态查询总条数-->
-    <select id="countByCondition" resultType="java.lang.Long" parameterType="cn.com.ty.lift.business.annualinspection.dto.InspectionRequest" >
-        SELECT
-            count(*)
-        FROM
-            annual_inspection ai
-        LEFT JOIN project_lift_relevance plr ON ai.lift_id = plr.lift_id AND ai.mt_company_id = plr.mt_company_id
-        LEFT JOIN lift li ON ai.lift_id = li.id
-        LEFT JOIN project pr ON pr.id = plr.project_id
-        LEFT JOIN region re ON pr.region_id = re.id
-        <where>
-            <if test="cond.status != null">
-                AND ai.status = #{cond.status}
-            </if>
-            <if test="cond.mtCompanyId != null and cond.mtCompanyId > 0">
-                AND plr.mt_company_id = #{cond.mtCompanyId}
-            </if>
-        </where>
-    </select>
-
     <!--多条件查询年检记录-->
     <select id="pageByUser" resultMap="BaseResultMap" parameterType="cn.com.ty.lift.business.annualinspection.dto.InspectionRequest" >
         SELECT

lift-common/pom.xml

@@ -103,6 +103,12 @@
             <!--<artifactId>hibernate-validator</artifactId>-->
             <!--<version>6.0.16.Final</version>-->
         <!--</dependency>-->
+        <!-- https://mvnrepository.com/artifact/com.innowhere/relproxy -->
+        <!--<dependency>-->
+            <!--<groupId>com.innowhere</groupId>-->
+            <!--<artifactId>relproxy</artifactId>-->
+            <!--<version>0.8.6</version>-->
+        <!--</dependency>-->
 
     </dependencies>
 

lift-common/src/main/java/cn.com.ty.lift.common/sql/IllegalRule.java

@@ -463,29 +463,37 @@ public class IllegalRule {
                 wheres.add(verifyInfo.getWhere());
             }
         }
-        log.info("parse expression complete, WHERE: {}, INDEX: {}.",wheres.size(), indexInfos.size());
-        log.info("Verifying all WHERE expressions.");
+
+        int whereTotal = wheres.size();
+        int indexTotal = indexInfos.size();
+
+        log.info("parse expression complete, WHERE: {}, INDEX: {}.", whereTotal, indexTotal);
         int verifyCount = 0;
-        for (int i = 0; i < wheres.size(); i++) {
-            Expression where = wheres.get(i);
-            log.info("{}. where: {}", (i + 1), where);
-            int whereNoUse = whereNoUse(where);
-            verifyCount += whereNoUse;
-            if (whereNoUse > 0) {
-                verifyCount += whereHasOr(where);
-                verifyCount += whereHasNotEqualsTo(where);
-                verifyCount += whereHasNotBinary(where);
-                verifyCount += whereHasInSubSelect(where);
-                verifyCount += whereCheckNull(where);
+        if(!wheres.isEmpty()){
+            log.info("Verifying all WHERE expressions.");
+            for (int i = 0; i < whereTotal; i++) {
+                Expression where = wheres.get(i);
+                log.info("{}. where: {}", (i + 1), where);
+                int whereNoUse = whereNoUse(where);
+                verifyCount += whereNoUse;
+                if (whereNoUse > 0) {
+                    verifyCount += whereHasOr(where);
+                    verifyCount += whereHasNotEqualsTo(where);
+                    verifyCount += whereHasNotBinary(where);
+                    verifyCount += whereHasInSubSelect(where);
+                    verifyCount += whereCheckNull(where);
+                }
             }
         }
-        log.info("Verifying all INDEX on column.");
-        for (int i = 0; i < indexInfos.size(); i++) {
-            IndexInfo indexInfo = indexInfos.get(i);
-            log.info("{}. indexInfo: {}", (i + 1), indexInfo.fullyQualifiedColumn());
-            verifyCount += columnNoUseIndex(indexInfo, indexInfoCacheSet);
+        if(!indexInfos.isEmpty()){
+            log.info("Verifying all INDEX on column.");
+            for (int i = 0; i < indexTotal; i++) {
+                IndexInfo indexInfo = indexInfos.get(i);
+                log.info("{}. indexInfo: {}", (i + 1), indexInfo.fullyQualifiedColumn());
+                verifyCount += columnNoUseIndex(indexInfo, indexInfoCacheSet);
+            }
         }
-        return verifyCount == wheres.size() * 6 + indexInfos.size();
+        return verifyCount == whereTotal * 6 + indexTotal;
     }
 
     public void warn() {

lift-common/src/main/java/cn.com.ty.lift.common/sql/SqlIllegalInterceptor.java

@@ -597,29 +597,36 @@ public class SqlIllegalInterceptor implements Interceptor {
                 }
             }
 
-            log.info("parse expression complete, WHERE: {}, INDEX: {}.",wheres.size(), indexInfos.size());
-            log.info("Verifying all WHERE expressions.");
+            int whereTotal = wheres.size();
+            int indexTotal = indexInfos.size();
+
+            log.info("parse expression complete, WHERE: {}, INDEX: {}.", whereTotal, indexTotal);
             int verifyCount = 0;
-            for (int i = 0; i < wheres.size(); i++) {
-                Expression where = wheres.get(i);
-                log.info("{}. where: {}", (i + 1), where);
-                int whereNoUse = whereNoUse(where);
-                verifyCount += whereNoUse;
-                if (whereNoUse > 0) {
-                    verifyCount += whereHasOr(where);
-                    verifyCount += whereHasNotEqualsTo(where);
-                    verifyCount += whereHasNotBinary(where);
-                    verifyCount += whereHasInSubSelect(where);
-                    verifyCount += whereCheckNull(where);
+            if(!wheres.isEmpty()){
+                log.info("Verifying all WHERE expressions.");
+                for (int i = 0; i < whereTotal; i++) {
+                    Expression where = wheres.get(i);
+                    log.info("{}. where: {}", (i + 1), where);
+                    int whereNoUse = whereNoUse(where);
+                    verifyCount += whereNoUse;
+                    if (whereNoUse > 0) {
+                        verifyCount += whereHasOr(where);
+                        verifyCount += whereHasNotEqualsTo(where);
+                        verifyCount += whereHasNotBinary(where);
+                        verifyCount += whereHasInSubSelect(where);
+                        verifyCount += whereCheckNull(where);
+                    }
                 }
             }
-            log.info("Verifying all INDEX on column.");
-            for (int i = 0; i < indexInfos.size(); i++) {
-                IndexInfo indexInfo = indexInfos.get(i);
-                log.info("{}. indexInfo: {}", (i + 1), indexInfo.fullyQualifiedColumn());
-                verifyCount += columnNoUseIndex(indexInfo);
+            if(!indexInfos.isEmpty()){
+                log.info("Verifying all INDEX on column.");
+                for (int i = 0; i < indexTotal; i++) {
+                    IndexInfo indexInfo = indexInfos.get(i);
+                    log.info("{}. indexInfo: {}", (i + 1), indexInfo.fullyQualifiedColumn());
+                    verifyCount += columnNoUseIndex(indexInfo);
+                }
             }
-            return verifyCount == wheres.size() * 6 + indexInfos.size();
+            return verifyCount == whereTotal * 6 + indexTotal;
         }
 
         public void warn() {

lift-common/src/main/java/cn.com.ty.lift.common/verify/Ver.java

@@ -0,0 +1,15 @@
+package cn.com.ty.lift.common.verify;
+
+import java.lang.annotation.*;
+
+/**
+ * Modifier on the parameter to verify the values.
+ *
+ * @author wcz
+ * @since 2020/3/7
+ */
+@Target({ElementType.PARAMETER})
+@Retention(RetentionPolicy.RUNTIME)
+@Documented
+public @interface Ver {
+}

lift-common/src/main/java/cn.com.ty.lift.common/verify/Verification.java

@@ -1664,6 +1664,7 @@ public class Verification {
         log.info("{}RESULT      : (completed) {}", logPrefix, invoke);
         log.info(logLine);
     }
+
     /**
      * the list of validation annotation can be work in {@code javax.validation.constraints.*}
      */

lift-enterprise-service/src/main/java/cn/com/ty/lift/enterprise/common/VerifyMethodInterceptor.java

@@ -1,10 +1,10 @@
 package cn.com.ty.lift.enterprise.common;
 
+import cn.com.ty.lift.common.verify.Ver;
 import cn.com.ty.lift.common.verify.Verification;
 import cn.com.ty.lift.common.verify.Verifier;
 import org.aopalliance.intercept.MethodInterceptor;
 import org.aopalliance.intercept.MethodInvocation;
-import org.springframework.web.bind.annotation.RequestBody;
 
 import java.lang.reflect.Method;
 import java.lang.reflect.Parameter;
@@ -31,14 +31,12 @@ public class VerifyMethodInterceptor implements MethodInterceptor {
             return invocation.proceed();
         }
         Object object = null;
-        //by default, verify the first arg present with RequestBody, otherwise the first in the arg list.
+        //by default, verify the first arg present with Ver,
         Parameter[] parameters = method.getParameters();
         for (int i = 0; i < parameters.length; i++) {
-            if(parameters[i].isAnnotationPresent(RequestBody.class)){
+            if(parameters[i].isAnnotationPresent(Ver.class)){
                 object = arguments[i];
                 break;
-            }else{
-                object = arguments[0];
             }
         }
         if (null == object) {
@@ -46,9 +44,7 @@ public class VerifyMethodInterceptor implements MethodInterceptor {
         }
         //get the verifier
         Verifier verifier = method.getDeclaredAnnotation(Verifier.class);
-
         Verification.INSTANCE.action(object, verifier.fields());
-
         return invocation.proceed();
     }
 }

lift-enterprise-service/src/main/java/cn/com/ty/lift/enterprise/oa/controller/AnnouncementController.java

@@ -1,6 +1,7 @@
 package cn.com.ty.lift.enterprise.oa.controller;
 
 import cn.com.ty.lift.common.model.CountPage;
+import cn.com.ty.lift.common.verify.Ver;
 import cn.com.ty.lift.common.verify.Verifier;
 import cn.com.ty.lift.enterprise.oa.dto.AnnouncementRequest;
 import cn.com.ty.lift.enterprise.oa.dto.AnnouncementResponse;
@@ -44,7 +45,7 @@ public class AnnouncementController {
      */
     @PostMapping("findOne")
     @Verifier(fields = {"id"})
-    public RestResponse findOne(@RequestBody AnnouncementRequest request) {
+    public RestResponse findOne(@Ver @RequestBody AnnouncementRequest request) {
         AnnouncementResponse result = announcementService.infoById(request);
         if(null != result){
             result.setImgs(announcementImgService.listByAnnouncement(request.getId()));
@@ -59,7 +60,7 @@ public class AnnouncementController {
      */
     @PostMapping("list")
     @Verifier(fields = "mtCompanyId")
-    public RestResponse list(@RequestBody AnnouncementRequest request) {
+    public RestResponse list(@Ver @RequestBody AnnouncementRequest request) {
         IPage<AnnouncementResponse> pages = announcementService.pageByCondition(request);
         long count = announcementService.count();
         return RestResponse.success(CountPage.getCountPage(count, pages));
@@ -83,7 +84,7 @@ public class AnnouncementController {
      */
     @PostMapping("delete")
     @Verifier(fields = {"id"})
-    public RestResponse delete(@RequestBody AnnouncementRequest request) {
+    public RestResponse delete(@Ver @RequestBody AnnouncementRequest request) {
         boolean result = announcementService.removeById(request.getId());
         return RestResponse.success(result);
 

lift-enterprise-service/src/main/java/cn/com/ty/lift/enterprise/oa/controller/AttendanceController.java

@@ -1,6 +1,7 @@
 package cn.com.ty.lift.enterprise.oa.controller;
 
 import cn.com.ty.lift.common.model.CountPage;
+import cn.com.ty.lift.common.verify.Ver;
 import cn.com.ty.lift.common.verify.Verifier;
 import cn.com.ty.lift.common.verify.Verify;
 import cn.com.ty.lift.enterprise.oa.dto.AttendanceRequest;
@@ -71,7 +72,7 @@ public class AttendanceController {
      */
     @PostMapping("findOne")
     @Verifier(fields = {"id"})
-    public RestResponse findOne(@RequestBody AttendanceRequest request) {
+    public RestResponse findOne(@Ver @RequestBody AttendanceRequest request) {
         AttendanceResponse result = attendanceService.infoById(request);
         if(null != result){
             result.setImgs(attendanceImgService.listByAttendance(request.getId()));
@@ -86,7 +87,7 @@ public class AttendanceController {
      */
     @PostMapping("list")
     @Verifier(fields = "mtCompanyId")
-    public RestResponse list(@RequestBody AttendanceRequest request) {
+    public RestResponse list(@Ver @RequestBody AttendanceRequest request) {
 //        LocalDate begin = request.getBegin();
 //        LocalDate end = request.getEnd();
 //        if(null != begin && null != end){
@@ -112,7 +113,7 @@ public class AttendanceController {
      */
     @PostMapping("setupTime")
     @Verifier(fields = {"mtCompanyId"})
-    public RestResponse setupTime(@RequestBody AttendanceRequest request) {
+    public RestResponse setupTime(@Ver @RequestBody AttendanceRequest request) {
         LocalTime topTime = request.getTopTime();
         LocalTime downTime = request.getDownTime();
         boolean top = ObjectUtil.isNotNull(topTime);
@@ -243,7 +244,7 @@ public class AttendanceController {
      */
     @PostMapping("time")
     @Verifier(fields = {"mtCompanyId"})
-    public RestResponse time(@RequestBody AttendanceRequest request) {
+    public RestResponse time(@Ver @RequestBody AttendanceRequest request) {
         MaintenanceCompany entity = maintenanceCompanyService.getById(request.getMtCompanyId());
         return RestResponse.success(entity);
     }
@@ -255,14 +256,14 @@ public class AttendanceController {
      */
     @PostMapping("pageByUser")
     @Verifier(fields = {"userId","clockTime"})
-    public RestResponse pageByUser(@RequestBody AttendanceRequest request) {
+    public RestResponse pageByUser(@Ver @RequestBody AttendanceRequest request) {
         IPage<AttendanceResponse> pages = attendanceService.pageByUser(request);
         return RestResponse.success(pages);
     }
 
     @PostMapping("export")
     @Verifier(fields = {"ids","exportPath"})
-    public void export(@RequestBody AttendanceRequest request, HttpServletResponse response){
+    public void export(@Ver @RequestBody AttendanceRequest request, HttpServletResponse response){
         log.info("headerAlias: {}",headerAlias);
         List<AttendanceResponse> attendances = attendanceService.listByIdList(request);
         Verify.notNull(attendances);

lift-enterprise-service/src/main/java/cn/com/ty/lift/enterprise/oa/controller/LiftCertificateController.java

@@ -1,6 +1,7 @@
 package cn.com.ty.lift.enterprise.oa.controller;
 
 import cn.com.ty.lift.common.model.CountPage;
+import cn.com.ty.lift.common.verify.Ver;
 import cn.com.ty.lift.common.verify.Verifier;
 import cn.com.ty.lift.common.verify.Verify;
 import cn.com.ty.lift.enterprise.oa.dto.LiftCertificateRequest;
@@ -42,7 +43,7 @@ public class LiftCertificateController {
      */
     @PostMapping("findOne")
     @Verifier(fields = {"id"})
-    public RestResponse findOne(@RequestBody LiftCertificateRequest request) {
+    public RestResponse findOne(@Ver @RequestBody LiftCertificateRequest request) {
         LiftCertificateResponse result = liftCertificateService.infoById(request);
         return RestResponse.success(result);
     }
@@ -54,7 +55,7 @@ public class LiftCertificateController {
      */
     @PostMapping("list")
     @Verifier(fields = "mtCompanyId")
-    public RestResponse list(@RequestBody LiftCertificateRequest request) {
+    public RestResponse list(@Ver @RequestBody LiftCertificateRequest request) {
         IPage<LiftCertificateResponse> pages = liftCertificateService.pageByCondition(request);
         long count = liftCertificateService.countByCondition(request);
         return RestResponse.success(CountPage.getCountPage(count, pages));
@@ -84,7 +85,7 @@ public class LiftCertificateController {
      */
     @PostMapping("audit")
     @Verifier(fields = {"id"})
-    public RestResponse audit(@RequestBody LiftCertificateRequest request) {
+    public RestResponse audit(@Ver @RequestBody LiftCertificateRequest request) {
         //0：无证，1：待审核，2：审核未通过，3：审核通过，4：超期
         LiftCertificate liftCertificate = liftCertificateService.getById(request.getId());
         Verify.notNull(liftCertificate);
@@ -116,7 +117,7 @@ public class LiftCertificateController {
     }
     @PostMapping("findByUser")
     @Verifier(fields = {"ownerId","mtCompanyId"})
-    public RestResponse findByUser(@RequestBody LiftCertificateRequest request){
+    public RestResponse findByUser(@Ver @RequestBody LiftCertificateRequest request){
         LiftCertificate entity = liftCertificateService.findByUserAndMtCompany(request.getId(), request.getOwnerId(), request.getMtCompanyId());
         return RestResponse.success(entity);
     }

lift-quan-service/src/main/java/cn/com/ty/lift/quan/config/VerifyMethodInterceptor.java

@@ -1,10 +1,10 @@
 package cn.com.ty.lift.quan.config;
 
+import cn.com.ty.lift.common.verify.Ver;
 import cn.com.ty.lift.common.verify.Verification;
 import cn.com.ty.lift.common.verify.Verifier;
 import org.aopalliance.intercept.MethodInterceptor;
 import org.aopalliance.intercept.MethodInvocation;
-import org.springframework.web.bind.annotation.RequestBody;
 
 import java.lang.reflect.Method;
 import java.lang.reflect.Parameter;
@@ -31,14 +31,12 @@ public class VerifyMethodInterceptor implements MethodInterceptor {
             return invocation.proceed();
         }
         Object object = null;
-        //by default, verify the first arg present with RequestBody, otherwise the first in the arg list.
+        //by default, verify the first arg present with Ver
         Parameter[] parameters = method.getParameters();
         for (int i = 0; i < parameters.length; i++) {
-            if(parameters[i].isAnnotationPresent(RequestBody.class)){
+            if(parameters[i].isAnnotationPresent(Ver.class)){
                 object = arguments[i];
                 break;
-            }else{
-                object = arguments[0];
             }
         }
         if (null == object) {
@@ -46,9 +44,7 @@ public class VerifyMethodInterceptor implements MethodInterceptor {
         }
         //get the verifier
         Verifier verifier = method.getDeclaredAnnotation(Verifier.class);
-
         Verification.INSTANCE.action(object, verifier.fields());
-
         return invocation.proceed();
     }
 }

lift-system-service/src/main/java/cn/com/ty/lift/system/config/VerifyMethodInterceptor.java

@@ -1,10 +1,10 @@
 package cn.com.ty.lift.system.config;
 
+import cn.com.ty.lift.common.verify.Ver;
 import cn.com.ty.lift.common.verify.Verification;
 import cn.com.ty.lift.common.verify.Verifier;
 import org.aopalliance.intercept.MethodInterceptor;
 import org.aopalliance.intercept.MethodInvocation;
-import org.springframework.web.bind.annotation.RequestBody;
 
 import java.lang.reflect.Method;
 import java.lang.reflect.Parameter;
@@ -31,14 +31,12 @@ public class VerifyMethodInterceptor implements MethodInterceptor {
             return invocation.proceed();
         }
         Object object = null;
-        //by default, verify the first arg present with RequestBody, otherwise the first in the arg list.
+        //by default, verify the first arg present with Ver
         Parameter[] parameters = method.getParameters();
         for (int i = 0; i < parameters.length; i++) {
-            if(parameters[i].isAnnotationPresent(RequestBody.class)){
+            if(parameters[i].isAnnotationPresent(Ver.class)){
                 object = arguments[i];
                 break;
-            }else{
-                object = arguments[0];
             }
         }
         if (null == object) {
@@ -46,9 +44,7 @@ public class VerifyMethodInterceptor implements MethodInterceptor {
         }
         //get the verifier
         Verifier verifier = method.getDeclaredAnnotation(Verifier.class);
-
         Verification.INSTANCE.action(object, verifier.fields());
-
         return invocation.proceed();
     }
 }