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

lift-business-service/src/main/java/cn/com/ty/lift/business/emergency/mapper/EmergencyRepairMapper.java

@@ -6,7 +6,6 @@ import cn.com.ty.lift.business.emergency.entity.EmergencyRepair;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.apache.ibatis.annotations.Param;
-import org.springframework.stereotype.Repository;
 
 /**
  * <p>
@@ -16,7 +15,6 @@ import org.springframework.stereotype.Repository;
  * @author wcz
  * @since 2019-12-04
  */
-@Repository
 public interface EmergencyRepairMapper extends BaseMapper<EmergencyRepair> {
 
     IPage<RepairResponse> pageByRepairing(IPage<RepairResponse> page, @Param("cond") RepairRequest request);

lift-business-service/src/main/java/cn/com/ty/lift/business/emergency/mapper/LiftFaultMapper.java

@@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
  * <p>
- *          电梯故障项 Mapper 接口
+ *     电梯故障项 Mapper 接口
  * </p>
  *
  * @author wcz

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

@@ -5,6 +5,8 @@ import cn.com.ty.lift.common.utils.JudgeException;
 import cn.com.ty.lift.common.utils.Judger;
 import cn.com.ty.lift.common.utils.StrPool;
 import cn.com.xwy.boot.web.dto.RestResponse;
+import cn.hutool.core.util.ArrayUtil;
+import cn.hutool.core.util.StrUtil;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import lombok.extern.slf4j.Slf4j;
 import org.aspectj.lang.JoinPoint;
@@ -23,6 +25,7 @@ import java.lang.reflect.Method;
 import java.time.Duration;
 import java.time.Instant;
 import java.util.Arrays;
+import java.util.stream.Collectors;
 
 /**
  * @author bieao
@@ -36,15 +39,15 @@ public class ControllerAspect {
 
     @Autowired
     private ObjectMapper objectMapper;
-    private Instant      begin = Instant.now();
-    private Instant      end   = Instant.now();
-    private String       url;
-    private String       httpMethod;
-    private String       ip;
-    private String       classMethod;
-    private String       args;
-    private String       resp;
-    private long         timing;
+    private Instant begin = Instant.now();
+    private Instant end   = Instant.now();
+    private String  url;
+    private String  httpMethod;
+    private String  ip;
+    private String  classMethod;
+    private String  args;
+    private String  resp;
+    private long    timing;
 
     @Pointcut("execution(* cn.com.ty.lift.business.*.controller..*(..))")
     public void pointcut() {
@@ -62,7 +65,22 @@ public class ControllerAspect {
         httpMethod = StrPool.LOG_HTTP_METHOD + request.getMethod();
         ip = StrPool.LOG_IP + request.getRemoteAddr();
         classMethod = StrPool.LOG_CLASS_METHOD + signature.getDeclaringTypeName() + StrPool.DOT + signature.getName();
-        args = StrPool.LOG_ARGS + Arrays.toString(joinPoint.getArgs()).replace("=null","");
+        args = StrPool.LOG_ARGS;
+        String arg = Arrays.toString(joinPoint.getArgs()).replace("=null","");
+        if(StrUtil.isNotEmpty(arg)){
+            String[] argArr = arg.split(",");
+            if(ArrayUtil.isNotEmpty(argArr)){
+                String head = argArr[0];
+                String tail = argArr[argArr.length - 1];
+                if(!head.contains("=")){
+                    args += head + ",";
+                }
+                args += Arrays.stream(argArr).filter(g -> g.contains("=")).collect(Collectors.joining(","));
+                if(!tail.contains("=")){
+                    args += ","+ tail;
+                }
+            }
+        }
 
         judge(joinPoint);
     }
@@ -84,13 +102,14 @@ public class ControllerAspect {
                         + "..." + StrPool.NEWLINE + StrPool.NEWLINE
                         + res.substring(tail, length);
             }
-            timing = Duration.between(begin, end).toMillis();
-            resp = StrPool.LOG_RESPONSE + "(" + timing + " ms)" + StrPool.NEWLINE + res;
-            if (timing > StrPool.LOG_GOOD_TIME) {
-                warn();
-            } else {
-                info();
-            }
+        }
+        timing = Duration.between(begin, end).toMillis();
+        boolean bigger = timing > StrPool.LOG_GOOD_TIME;
+        resp = StrPool.LOG_RESPONSE + timing + " ms " + (bigger ? "(>_<)" : "(^_^)") + StrPool.NEWLINE + res;
+        if (bigger) {
+            warn();
+        } else {
+            info();
         }
     }
 
@@ -98,12 +117,17 @@ public class ControllerAspect {
     public void doAfterThrowing(Exception ex) throws Throwable {
         // Processes the exception
         end = Instant.now();
+        String message = "";
         if (null != ex) {
             Class<? extends Exception> clazz = ex.getClass();
             if (clazz.equals(JudgeException.class) || clazz.equals(MethodArgumentNotValidException.class)) {
-                String res = ex.getMessage();
+                message = ex.getMessage();
+                if(clazz.equals(MethodArgumentNotValidException.class)){
+                    MethodArgumentNotValidException notValid = (MethodArgumentNotValidException) ex;
+                    message = notValid.getBindingResult().getFieldError().getDefaultMessage();
+                }
                 timing = Duration.between(begin, end).toMillis();
-                resp = StrPool.LOG_RESPONSE + "(" + timing + " ms)" + res;
+                resp = StrPool.LOG_RESPONSE + "(" + timing + " ms) " + message;
                 error();
             }
         }

lift-business-service/src/main/java/cn/com/ty/lift/business/library/service/LiftService.java

@@ -51,9 +51,6 @@ import java.util.stream.Collectors;
 @Service
 public class LiftService extends ServiceImpl<LiftMapper, Lift> {
 
-    @Resource
-    private LiftMapper liftMapper;
-
     @Resource
     private PlatformCompanyLiftRelevanceService platformService;
 
@@ -76,7 +73,7 @@ public class LiftService extends ServiceImpl<LiftMapper, Lift> {
      */
     public IPage<LiftResponse> list(LiftRequest request) {
         IPage<LiftResponse> page = new Page<>(request.getPageNum(), request.getPageSize());
-        return liftMapper.findByCondition(page, request);
+        return baseMapper.findByCondition(page, request);
     }
 
     /**
@@ -87,7 +84,7 @@ public class LiftService extends ServiceImpl<LiftMapper, Lift> {
      */
     public IPage<LiftResponse> liftProjectList(ProjectLiftRequest request) {
         IPage<LiftResponse> page = new Page<>(request.getPageNum(), request.getPageSize());
-        return liftMapper.findLiftListByProjectId(page, request);
+        return baseMapper.findLiftListByProjectId(page, request);
     }
 
     /**
@@ -98,7 +95,7 @@ public class LiftService extends ServiceImpl<LiftMapper, Lift> {
      */
     public IPage<LiftResponse> choose(LiftChooseRequest request) {
         IPage<LiftResponse> page = new Page<>(request.getPageNum(), request.getPageSize());
-        return liftMapper.chooseLiftList(page, request);
+        return baseMapper.chooseLiftList(page, request);
     }
 
     /**
@@ -108,7 +105,7 @@ public class LiftService extends ServiceImpl<LiftMapper, Lift> {
      * @date 2019/12/6 10:51 AM
      */
     public LiftExtendResponse detail(Long id) {
-        return liftMapper.queryById(id);
+        return baseMapper.queryById(id);
     }
 
 
@@ -208,7 +205,7 @@ public class LiftService extends ServiceImpl<LiftMapper, Lift> {
                 lift.setLiftCode(ApiConstants.STAIRCASE + liftCode);
             }
             //新增电梯表
-            int liftResult = liftMapper.insert(lift);
+            int liftResult = baseMapper.insert(lift);
             if (liftResult == 0) {
                 return RestResponse.fail(MessageUtils.get("msg.add.fail"));
             }
@@ -257,7 +254,7 @@ public class LiftService extends ServiceImpl<LiftMapper, Lift> {
      * @date 2019/11/27 2:22 PM
      */
     public RestResponse modify(Lift lift) {
-        int result = liftMapper.updateById(lift);
+        int result = baseMapper.updateById(lift);
         if (result > 0) {
             return RestResponse.success(null, MessageUtils.get("msg.modify.success"));
         }
@@ -271,7 +268,7 @@ public class LiftService extends ServiceImpl<LiftMapper, Lift> {
      * @date 2019/11/27 2:22 PM
      */
     public void export(ExportRequest request) {
-        List<Lift> liftList = liftMapper.selectBatchIds(request.getIds());
+        List<Lift> liftList = baseMapper.selectBatchIds(request.getIds());
         ExportUtils utils = new ExportUtils();
         utils.export(liftList, paramMap, request.getExportPath());
     }
@@ -300,7 +297,7 @@ public class LiftService extends ServiceImpl<LiftMapper, Lift> {
         List<PlatformCompanyLiftRelevance> platformCompanyLiftRelevances = new ArrayList<>();
 
         //根据维保公司和项目id查询
-        List<LiftProjectModel> liftProjectModelList = liftMapper.listByCompanyAndProject(mtCompanyId, projectId);
+        List<LiftProjectModel> liftProjectModelList = baseMapper.listByCompanyAndProject(mtCompanyId, projectId);
         //根据维保公司和项目查询
         List<ProjectLiftRelevance> projectLiftRelevanceList = projectRelevanceService.findLiftList(mtCompanyId,projectId);
         //根据维保公司

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

@@ -42,13 +42,9 @@ public class MaintenancePlanService extends ServiceImpl<MaintenancePlanMapper, M
     @Resource
     private ProjectService projectService;
 
-    @Resource
-    private MaintenancePlanMapper planMapper;
-
     @Resource
     private ProjectLiftRelevanceService projectLiftRelevanceService;
 
-
     private Map<String, String> paramMap = new HashMap<String, String>() {{
         put("projectCode", "项目编号");
         put("projectName", "项目名称");
@@ -72,7 +68,7 @@ public class MaintenancePlanService extends ServiceImpl<MaintenancePlanMapper, M
      */
     public IPage<MaintenancePlanResponse> list(MaintenancePlanRequest request) {
         IPage<MaintenancePlanResponse> page = new Page<>(request.getPageNum(), request.getPageSize());
-        return planMapper.findByCondition(page, request);
+        return baseMapper.findByCondition(page, request);
     }
 
     /**
@@ -358,7 +354,7 @@ public class MaintenancePlanService extends ServiceImpl<MaintenancePlanMapper, M
         Map<String, Object> columnMap = new HashMap<>(2);
         columnMap.put("mt_company_id", mtCompanyId);
         columnMap.put("lift_id", liftId);
-        return planMapper.deleteByMap(columnMap) > 0;
+        return baseMapper.deleteByMap(columnMap) > 0;
     }
 
     /**
@@ -368,7 +364,7 @@ public class MaintenancePlanService extends ServiceImpl<MaintenancePlanMapper, M
      * @date 2019/12/19 11:27 AM
      */
     public void export(ExportRequest request) {
-        List<MaintenancePlan> projectList = planMapper.selectBatchIds(request.getIds());
+        List<MaintenancePlan> projectList = baseMapper.selectBatchIds(request.getIds());
         ExportUtils utils = new ExportUtils();
         utils.export(projectList, paramMap, request.getExportPath());
     }

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

@@ -15,8 +15,6 @@ import cn.com.ty.lift.business.maintenance.dao.entity.model.request.MtRecordRequ
 import cn.com.ty.lift.business.maintenance.dao.entity.model.response.MaintenanceRecordResponse;
 import cn.com.ty.lift.business.maintenance.dao.entity.model.response.MtRecordResponse;
 import cn.com.ty.lift.business.maintenance.dao.mapper.MaintenanceRecordMapper;
-import cn.com.ty.lift.business.maintenance.service.impl.MtRecordCostService;
-import cn.com.ty.lift.business.maintenance.service.impl.MtRecordImgService;
 import cn.com.ty.lift.common.constants.CommonEnum;
 import cn.com.ty.lift.common.utils.MapHelper;
 import cn.com.xwy.boot.web.dto.RestResponse;
@@ -24,8 +22,8 @@ import cn.hutool.core.collection.IterUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
@@ -51,8 +49,8 @@ public class MaintenanceRecordService extends ServiceImpl<MaintenanceRecordMappe
 
 
     private LiftService            liftService;
-    private MtRecordCostService    mtRecordCostService;
-    private MtRecordImgService     mtRecordImgService;
+    private IMtRecordCostService   mtRecordCostService;
+    private IMtRecordImgService    mtRecordImgService;
     private MaintenancePlanService maintenancePlanService;
     private EvaluationService      evaluationService;
 
@@ -99,7 +97,7 @@ public class MaintenanceRecordService extends ServiceImpl<MaintenanceRecordMappe
      * @date 2020/1/20 2:41 下午
      */
     public boolean count(Long planId, Long mtCompanyId) {
-        LambdaQueryWrapper<MaintenanceRecord> lambdaQueryWrapper = new QueryWrapper<MaintenanceRecord>().lambda();
+        LambdaQueryWrapper<MaintenanceRecord> lambdaQueryWrapper = Wrappers.lambdaQuery();
         lambdaQueryWrapper.eq(MaintenanceRecord::getMtPlanId, planId);
         lambdaQueryWrapper.eq(MaintenanceRecord::getMtCompanyId, mtCompanyId);
         return count(lambdaQueryWrapper) > 0;

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

@@ -193,7 +193,7 @@ public class ProjectController {
      */
     @PostMapping("lockOrUnlock")
     public RestResponse lockOrUnlock(@Valid @RequestBody ProjectLockRequest request) {
-        return projectLiftRelevanceService.projectLockOrUnLock(request);
+        return projectService.projectLockOrUnLock(request);
     }
 
     /**

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

@@ -38,9 +38,6 @@ import java.util.stream.Collectors;
 @Service
 public class ProjectAppService extends ServiceImpl<ProjectMapper, Project> {
 
-    @Resource
-    private ProjectMapper projectMapper;
-
     @Resource
     private LiftService liftService;
 
@@ -58,7 +55,7 @@ public class ProjectAppService extends ServiceImpl<ProjectMapper, Project> {
      */
     public IPage<ProjectCompanyResponse> list(CompanyRequest request) {
         IPage<ProjectCompanyResponse> page = new Page<>(request.getPageNum(), request.getPageSize());
-        return projectMapper.findListByCompanyId(page, request);
+        return baseMapper.findListByCompanyId(page, request);
     }
 
     /**
@@ -82,7 +79,7 @@ public class ProjectAppService extends ServiceImpl<ProjectMapper, Project> {
      */
     public IPage<ProjectLiftResponse> list(ProjectDetailRequest request) {
         IPage<ProjectLiftResponse> page = new Page<>(request.getPageNum(), request.getPageSize());
-        return projectMapper.findListByProjectId(page, request);
+        return baseMapper.findListByProjectId(page, request);
     }
 
     /**
@@ -108,7 +105,7 @@ public class ProjectAppService extends ServiceImpl<ProjectMapper, Project> {
      * @date 2020/1/2 1:50 下午
      */
     public ProjectDetailResponse detail(ProjectDetailRequest request) {
-        return projectMapper.findProjectById(request);
+        return baseMapper.findProjectById(request);
     }
 
     /**

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

@@ -3,17 +3,13 @@ package cn.com.ty.lift.business.project.service;
 import cn.com.ty.lift.business.framework.util.MessageUtils;
 import cn.com.ty.lift.business.library.dao.entity.Lift;
 import cn.com.ty.lift.business.library.dao.entity.model.request.LiftBatchMoveRequest;
-import cn.com.ty.lift.business.library.dao.entity.model.request.LiftLockRequest;
 import cn.com.ty.lift.business.library.dao.entity.model.request.LiftExtensionRequest;
-import cn.com.ty.lift.business.project.dao.entity.Project;
+import cn.com.ty.lift.business.library.dao.entity.model.request.LiftLockRequest;
 import cn.com.ty.lift.business.project.dao.entity.ProjectLiftRelevance;
 import cn.com.ty.lift.business.project.dao.entity.model.request.ProjectLiftRelevanceRequest;
-import cn.com.ty.lift.business.project.dao.entity.model.request.ProjectLockRequest;
 import cn.com.ty.lift.business.project.dao.entity.model.response.ProjectRelevanceResponse;
 import cn.com.ty.lift.business.project.dao.mapper.ProjectLiftRelevanceMapper;
-import cn.com.ty.lift.business.project.dao.mapper.ProjectMapper;
 import cn.com.xwy.boot.web.dto.RestResponse;
-import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -21,9 +17,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 
-import javax.annotation.Resource;
 import java.util.List;
 
 /**
@@ -34,9 +28,6 @@ import java.util.List;
 @Service
 public class ProjectLiftRelevanceService extends ServiceImpl<ProjectLiftRelevanceMapper, ProjectLiftRelevance> {
 
-    @Resource
-    private ProjectMapper projectMapper;
-
     /**
      * @param entry 项目关联数据
      * @return RestResponse 状态码和返回消息
@@ -180,34 +171,6 @@ public class ProjectLiftRelevanceService extends ServiceImpl<ProjectLiftRelevanc
         return updateById(entry);
     }
 
-    /**
-     * @param request projectId 项目id
-     * @return RestResponse 状态码和返回消息
-     * @description 项目锁定、解锁,锁定该项目下的电梯
-     * @date 2019/12/27 5:04 PM
-     */
-    @Transactional(rollbackFor = Exception.class)
-    public RestResponse projectLockOrUnLock(ProjectLockRequest request) {
-        Project project = new Project();
-        project.setId(request.getProjectId());
-        project.setLocked(request.getLock());
-        int ret = projectMapper.updateById(project);
-        if (ret < 0) {
-            return RestResponse.fail(MessageUtils.get("msg.modify.fail"));
-        }
-        //根据项目id和公司id查询项目下电梯
-        List<ProjectLiftRelevance> relevanceList = findLiftList(request.getMtCompanyId(), request.getProjectId());
-        if (CollUtil.isEmpty(relevanceList)) {
-            return RestResponse.success(null, MessageUtils.get("msg.project.status.update"));
-        }
-        relevanceList.forEach(relevance -> relevance.setLiftLocked(request.getLock()));
-        boolean response = updateBatchById(relevanceList);
-        if (!response) {
-            return RestResponse.fail(MessageUtils.get("msg.modify.fail"));
-        }
-        return RestResponse.success(null, MessageUtils.get("msg.modify.success"));
-    }
-
     /**
      * @param request 用户id
      * @return 1.成功, 0.失败, 消息描述

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

@@ -5,10 +5,7 @@ import cn.com.ty.lift.business.library.service.PlatformCompanyLiftRelevanceServi
 import cn.com.ty.lift.business.maintenance.dao.entity.MaintenancePlan;
 import cn.com.ty.lift.business.project.dao.entity.*;
 import cn.com.ty.lift.business.project.dao.entity.model.ProjectImportModel;
-import cn.com.ty.lift.business.project.dao.entity.model.request.ProjectCompanyRequest;
-import cn.com.ty.lift.business.project.dao.entity.model.request.ProjectExtensionRequest;
-import cn.com.ty.lift.business.project.dao.entity.model.request.ProjectRegionRequest;
-import cn.com.ty.lift.business.project.dao.entity.model.request.ProjectRequest;
+import cn.com.ty.lift.business.project.dao.entity.model.request.*;
 import cn.com.ty.lift.business.project.dao.entity.model.response.ProjectResponse;
 import cn.com.ty.lift.business.project.dao.entity.model.response.ProjectUserResponse;
 import cn.com.ty.lift.business.project.dao.mapper.ProjectHistoryMapper;
@@ -20,6 +17,7 @@ import cn.com.ty.lift.common.utils.DateUtils;
 import cn.com.ty.lift.common.utils.Judge;
 import cn.com.xwy.boot.web.dto.RestResponse;
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -48,8 +46,6 @@ import java.util.stream.Collectors;
 @Service
 public class ProjectService extends ServiceImpl<ProjectMapper,Project> {
 
-    @Resource
-    private ProjectMapper projectMapper;
     @Resource
     private ProjectLiftRelevanceService projectLiftRelevanceService;
     @Resource
@@ -91,7 +87,7 @@ public class ProjectService extends ServiceImpl<ProjectMapper,Project> {
         if (request.getCondition() != null) {
             request.setCondition(StrUtil.format("%{}%", request.getCondition()));
         }
-        return projectMapper.findByCondition(page, request);
+        return baseMapper.findByCondition(page, request);
     }
 
     /**
@@ -144,7 +140,7 @@ public class ProjectService extends ServiceImpl<ProjectMapper,Project> {
      */
     public IPage<ProjectResponse> companyList(ProjectCompanyRequest request) {
         IPage<ProjectResponse> page = new Page<>(request.getPageNum(), request.getPageSize());
-        return projectMapper.findCompanyListByCondition(page, request);
+        return baseMapper.findCompanyListByCondition(page, request);
     }
 
     /**
@@ -264,11 +260,37 @@ public class ProjectService extends ServiceImpl<ProjectMapper,Project> {
      * @date 2019/11/27 2:22 PM
      */
     public void export(ExportRequest request) {
-        List<Project> projectList = projectMapper.selectBatchIds(request.getIds());
+        List<Project> projectList = baseMapper.selectBatchIds(request.getIds());
         ExportUtils utils = new ExportUtils();
         utils.export(projectList, paramMap, request.getExportPath());
     }
-
+    /**
+     * @param request projectId 项目id
+     * @return RestResponse 状态码和返回消息
+     * @description 项目锁定、解锁,锁定该项目下的电梯
+     * @date 2019/12/27 5:04 PM
+     */
+    @Transactional(rollbackFor = Exception.class)
+    public RestResponse projectLockOrUnLock(ProjectLockRequest request) {
+        Project project = new Project();
+        project.setId(request.getProjectId());
+        project.setLocked(request.getLock());
+        int ret = baseMapper.updateById(project);
+        if (ret < 0) {
+            return RestResponse.fail(MessageUtils.get("msg.modify.fail"));
+        }
+        //根据项目id和公司id查询项目下电梯
+        List<ProjectLiftRelevance> relevanceList = projectLiftRelevanceService.findLiftList(request.getMtCompanyId(), request.getProjectId());
+        if (CollUtil.isEmpty(relevanceList)) {
+            return RestResponse.success(null, MessageUtils.get("msg.project.status.update"));
+        }
+        relevanceList.forEach(relevance -> relevance.setLiftLocked(request.getLock()));
+        boolean response = projectLiftRelevanceService.updateBatchById(relevanceList);
+        if (!response) {
+            return RestResponse.fail(MessageUtils.get("msg.modify.fail"));
+        }
+        return RestResponse.success(null, MessageUtils.get("msg.modify.success"));
+    }
     private void rollback(){
         //强制手动事务回滚
         TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();

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

@@ -11,7 +11,6 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.interceptor.TransactionAspectSupport;
 
-import javax.annotation.Resource;
 import java.util.Comparator;
 import java.util.List;
 import java.util.Optional;
@@ -25,11 +24,8 @@ import java.util.stream.Collectors;
 @Service
 public class ProjectUserService extends ServiceImpl<ProjectUserMapper, ProjectUser> {
 
-    @Resource
-    private ProjectUserMapper projectUserMapper;
-
     public List<ProjectUserResponse> getUserList(Long projectId) {
-        return projectUserMapper.findUserListById(projectId);
+        return baseMapper.findUserListById(projectId);
     }
 
     /**
@@ -121,6 +117,6 @@ public class ProjectUserService extends ServiceImpl<ProjectUserMapper, ProjectUs
             entry.setMtCompanyId(request.getMtCompanyId());
             entry.setUserRole(CommonEnum.DefaultRole.MTWORK.getCode());
         });
-        return projectUserMapper.batchRemoveWithParams(request);
+        return baseMapper.batchRemoveWithParams(request);
     }
 }

lift-common/src/main/java/cn.com.ty.lift.common/utils/StrPool.java

@@ -94,7 +94,6 @@ public interface StrPool {
     String  LOG_CLASS_METHOD          = StrPool.LOG_PREFIX + "CLASS_METHOD : ";
     String  LOG_ARGS                  = StrPool.LOG_PREFIX + "ARGS         : ";
     String  LOG_RESPONSE              = StrPool.LOG_PREFIX + "RESPONSE     : ";
-    String  LOG_TIME                  = StrPool.LOG_PREFIX + "TIME         : ";
     String  LOG_STATUS                = StrPool.LOG_PREFIX + "STATUS       : ";
     String  LOG_EXCEPTION             = StrPool.LOG_PREFIX + "EXCEPTION    : ";
     //是否打印全部的结果

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

@@ -5,6 +5,8 @@ import cn.com.ty.lift.common.utils.JudgeException;
 import cn.com.ty.lift.common.utils.Judger;
 import cn.com.ty.lift.common.utils.StrPool;
 import cn.com.xwy.boot.web.dto.RestResponse;
+import cn.hutool.core.util.ArrayUtil;
+import cn.hutool.core.util.StrUtil;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import lombok.extern.slf4j.Slf4j;
 import org.aspectj.lang.JoinPoint;
@@ -23,6 +25,7 @@ import java.lang.reflect.Method;
 import java.time.Duration;
 import java.time.Instant;
 import java.util.Arrays;
+import java.util.stream.Collectors;
 
 /**
  * @author bieao
@@ -36,15 +39,15 @@ public class ControllerAspect {
 
     @Autowired
     private ObjectMapper objectMapper;
-    private Instant      begin = Instant.now();
-    private Instant      end   = Instant.now();
-    private String       url;
-    private String       httpMethod;
-    private String       ip;
-    private String       classMethod;
-    private String       args;
-    private String       resp;
-    private long         timing;
+    private Instant begin = Instant.now();
+    private Instant end   = Instant.now();
+    private String  url;
+    private String  httpMethod;
+    private String  ip;
+    private String  classMethod;
+    private String  args;
+    private String  resp;
+    private long    timing;
 
     @Pointcut("execution(* cn.com.ty.lift.enterprise.*.controller..*(..))")
     public void pointcut() {
@@ -62,7 +65,22 @@ public class ControllerAspect {
         httpMethod = StrPool.LOG_HTTP_METHOD + request.getMethod();
         ip = StrPool.LOG_IP + request.getRemoteAddr();
         classMethod = StrPool.LOG_CLASS_METHOD + signature.getDeclaringTypeName() + StrPool.DOT + signature.getName();
-        args = StrPool.LOG_ARGS + Arrays.toString(joinPoint.getArgs()).replace("=null","");
+        args = StrPool.LOG_ARGS;
+        String arg = Arrays.toString(joinPoint.getArgs()).replace("=null","");
+        if(StrUtil.isNotEmpty(arg)){
+            String[] argArr = arg.split(",");
+            if(ArrayUtil.isNotEmpty(argArr)){
+                String head = argArr[0];
+                String tail = argArr[argArr.length - 1];
+                if(!head.contains("=")){
+                    args += head + ",";
+                }
+                args += Arrays.stream(argArr).filter(g -> g.contains("=")).collect(Collectors.joining(","));
+                if(!tail.contains("=")){
+                    args += ","+ tail;
+                }
+            }
+        }
 
         judge(joinPoint);
     }
@@ -84,13 +102,14 @@ public class ControllerAspect {
                         + "..." + StrPool.NEWLINE + StrPool.NEWLINE
                         + res.substring(tail, length);
             }
-            timing = Duration.between(begin, end).toMillis();
-            resp = StrPool.LOG_RESPONSE + "(" + timing + " ms)" + StrPool.NEWLINE + res;
-            if (timing > StrPool.LOG_GOOD_TIME) {
-                warn();
-            } else {
-                info();
-            }
+        }
+        timing = Duration.between(begin, end).toMillis();
+        boolean bigger = timing > StrPool.LOG_GOOD_TIME;
+        resp = StrPool.LOG_RESPONSE + timing + " ms " + (bigger ? "(>_<)" : "(^_^)") + StrPool.NEWLINE + res;
+        if (bigger) {
+            warn();
+        } else {
+            info();
         }
     }
 
@@ -98,12 +117,17 @@ public class ControllerAspect {
     public void doAfterThrowing(Exception ex) throws Throwable {
         // Processes the exception
         end = Instant.now();
+        String message = "";
         if (null != ex) {
             Class<? extends Exception> clazz = ex.getClass();
             if (clazz.equals(JudgeException.class) || clazz.equals(MethodArgumentNotValidException.class)) {
-                String res = ex.getMessage();
+                message = ex.getMessage();
+                if(clazz.equals(MethodArgumentNotValidException.class)){
+                    MethodArgumentNotValidException notValid = (MethodArgumentNotValidException) ex;
+                    message = notValid.getBindingResult().getFieldError().getDefaultMessage();
+                }
                 timing = Duration.between(begin, end).toMillis();
-                resp = StrPool.LOG_RESPONSE + "(" + timing + " ms)" + res;
+                resp = StrPool.LOG_RESPONSE + "(" + timing + " ms) " + message;
                 error();
             }
         }

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

@@ -5,6 +5,8 @@ import cn.com.ty.lift.common.utils.JudgeException;
 import cn.com.ty.lift.common.utils.Judger;
 import cn.com.ty.lift.common.utils.StrPool;
 import cn.com.xwy.boot.web.dto.RestResponse;
+import cn.hutool.core.util.ArrayUtil;
+import cn.hutool.core.util.StrUtil;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import lombok.extern.slf4j.Slf4j;
 import org.aspectj.lang.JoinPoint;
@@ -23,6 +25,7 @@ import java.lang.reflect.Method;
 import java.time.Duration;
 import java.time.Instant;
 import java.util.Arrays;
+import java.util.stream.Collectors;
 
 /**
  * @author bieao
@@ -36,15 +39,15 @@ public class ControllerAspect {
 
     @Autowired
     private ObjectMapper objectMapper;
-    private Instant      begin = Instant.now();
-    private Instant      end   = Instant.now();
-    private String       url;
-    private String       httpMethod;
-    private String       ip;
-    private String       classMethod;
-    private String       args;
-    private String       resp;
-    private long         timing;
+    private Instant begin = Instant.now();
+    private Instant end   = Instant.now();
+    private String  url;
+    private String  httpMethod;
+    private String  ip;
+    private String  classMethod;
+    private String  args;
+    private String  resp;
+    private long    timing;
 
     @Pointcut("execution(* cn.com.ty.lift.quan.*.controller..*(..))")
     public void pointcut() {
@@ -62,7 +65,22 @@ public class ControllerAspect {
         httpMethod = StrPool.LOG_HTTP_METHOD + request.getMethod();
         ip = StrPool.LOG_IP + request.getRemoteAddr();
         classMethod = StrPool.LOG_CLASS_METHOD + signature.getDeclaringTypeName() + StrPool.DOT + signature.getName();
-        args = StrPool.LOG_ARGS + Arrays.toString(joinPoint.getArgs()).replace("=null","");
+        args = StrPool.LOG_ARGS;
+        String arg = Arrays.toString(joinPoint.getArgs()).replace("=null","");
+        if(StrUtil.isNotEmpty(arg)){
+            String[] argArr = arg.split(",");
+            if(ArrayUtil.isNotEmpty(argArr)){
+                String head = argArr[0];
+                String tail = argArr[argArr.length - 1];
+                if(!head.contains("=")){
+                    args += head + ",";
+                }
+                args += Arrays.stream(argArr).filter(g -> g.contains("=")).collect(Collectors.joining(","));
+                if(!tail.contains("=")){
+                    args += ","+ tail;
+                }
+            }
+        }
 
         judge(joinPoint);
     }
@@ -84,13 +102,14 @@ public class ControllerAspect {
                         + "..." + StrPool.NEWLINE + StrPool.NEWLINE
                         + res.substring(tail, length);
             }
-            timing = Duration.between(begin, end).toMillis();
-            resp = StrPool.LOG_RESPONSE + "(" + timing + " ms)" + StrPool.NEWLINE + res;
-            if (timing > StrPool.LOG_GOOD_TIME) {
-                warn();
-            } else {
-                info();
-            }
+        }
+        timing = Duration.between(begin, end).toMillis();
+        boolean bigger = timing > StrPool.LOG_GOOD_TIME;
+        resp = StrPool.LOG_RESPONSE + timing + " ms " + (bigger ? "(>_<)" : "(^_^)") + StrPool.NEWLINE + res;
+        if (bigger) {
+            warn();
+        } else {
+            info();
         }
     }
 
@@ -98,12 +117,17 @@ public class ControllerAspect {
     public void doAfterThrowing(Exception ex) throws Throwable {
         // Processes the exception
         end = Instant.now();
+        String message = "";
         if (null != ex) {
             Class<? extends Exception> clazz = ex.getClass();
             if (clazz.equals(JudgeException.class) || clazz.equals(MethodArgumentNotValidException.class)) {
-                String res = ex.getMessage();
+                message = ex.getMessage();
+                if(clazz.equals(MethodArgumentNotValidException.class)){
+                    MethodArgumentNotValidException notValid = (MethodArgumentNotValidException) ex;
+                    message = notValid.getBindingResult().getFieldError().getDefaultMessage();
+                }
                 timing = Duration.between(begin, end).toMillis();
-                resp = StrPool.LOG_RESPONSE + "(" + timing + " ms)" + res;
+                resp = StrPool.LOG_RESPONSE + "(" + timing + " ms) " + message;
                 error();
             }
         }

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

@@ -5,6 +5,8 @@ import cn.com.ty.lift.common.utils.JudgeException;
 import cn.com.ty.lift.common.utils.Judger;
 import cn.com.ty.lift.common.utils.StrPool;
 import cn.com.xwy.boot.web.dto.RestResponse;
+import cn.hutool.core.util.ArrayUtil;
+import cn.hutool.core.util.StrUtil;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import lombok.extern.slf4j.Slf4j;
 import org.aspectj.lang.JoinPoint;
@@ -23,6 +25,7 @@ import java.lang.reflect.Method;
 import java.time.Duration;
 import java.time.Instant;
 import java.util.Arrays;
+import java.util.stream.Collectors;
 
 /**
  * @author bieao
@@ -36,15 +39,15 @@ public class ControllerAspect {
 
     @Autowired
     private ObjectMapper objectMapper;
-    private Instant      begin = Instant.now();
-    private Instant      end   = Instant.now();
-    private String       url;
-    private String       httpMethod;
-    private String       ip;
-    private String       classMethod;
-    private String       args;
-    private String       resp;
-    private long         timing;
+    private Instant begin = Instant.now();
+    private Instant end   = Instant.now();
+    private String  url;
+    private String  httpMethod;
+    private String  ip;
+    private String  classMethod;
+    private String  args;
+    private String  resp;
+    private long    timing;
 
     @Pointcut("execution(* cn.com.ty.lift.system.*.controller..*(..))")
     public void pointcut() {
@@ -62,7 +65,22 @@ public class ControllerAspect {
         httpMethod = StrPool.LOG_HTTP_METHOD + request.getMethod();
         ip = StrPool.LOG_IP + request.getRemoteAddr();
         classMethod = StrPool.LOG_CLASS_METHOD + signature.getDeclaringTypeName() + StrPool.DOT + signature.getName();
-        args = StrPool.LOG_ARGS + Arrays.toString(joinPoint.getArgs()).replace("=null","");
+        args = StrPool.LOG_ARGS;
+        String arg = Arrays.toString(joinPoint.getArgs()).replace("=null","");
+        if(StrUtil.isNotEmpty(arg)){
+            String[] argArr = arg.split(",");
+            if(ArrayUtil.isNotEmpty(argArr)){
+                String head = argArr[0];
+                String tail = argArr[argArr.length - 1];
+                if(!head.contains("=")){
+                    args += head + ",";
+                }
+                args += Arrays.stream(argArr).filter(g -> g.contains("=")).collect(Collectors.joining(","));
+                if(!tail.contains("=")){
+                    args += ","+ tail;
+                }
+            }
+        }
 
         judge(joinPoint);
     }
@@ -84,13 +102,14 @@ public class ControllerAspect {
                         + "..." + StrPool.NEWLINE + StrPool.NEWLINE
                         + res.substring(tail, length);
             }
-            timing = Duration.between(begin, end).toMillis();
-            resp = StrPool.LOG_RESPONSE + "(" + timing + " ms)" + StrPool.NEWLINE + res;
-            if (timing > StrPool.LOG_GOOD_TIME) {
-                warn();
-            } else {
-                info();
-            }
+        }
+        timing = Duration.between(begin, end).toMillis();
+        boolean bigger = timing > StrPool.LOG_GOOD_TIME;
+        resp = StrPool.LOG_RESPONSE + timing + " ms " + (bigger ? "(>_<)" : "(^_^)") + StrPool.NEWLINE + res;
+        if (bigger) {
+            warn();
+        } else {
+            info();
         }
     }
 
@@ -98,12 +117,17 @@ public class ControllerAspect {
     public void doAfterThrowing(Exception ex) throws Throwable {
         // Processes the exception
         end = Instant.now();
+        String message = "";
         if (null != ex) {
             Class<? extends Exception> clazz = ex.getClass();
             if (clazz.equals(JudgeException.class) || clazz.equals(MethodArgumentNotValidException.class)) {
-                String res = ex.getMessage();
+                message = ex.getMessage();
+                if(clazz.equals(MethodArgumentNotValidException.class)){
+                    MethodArgumentNotValidException notValid = (MethodArgumentNotValidException) ex;
+                    message = notValid.getBindingResult().getFieldError().getDefaultMessage();
+                }
                 timing = Duration.between(begin, end).toMillis();
-                resp = StrPool.LOG_RESPONSE + "(" + timing + " ms)" + res;
+                resp = StrPool.LOG_RESPONSE + "(" + timing + " ms) " + message;
                 error();
             }
         }