20211206修改异常类

cloudutil/src/main/java/com/ccsens/cloudutil/feign/Tall3FeignClient.java

@@ -54,6 +54,18 @@ public interface Tall3FeignClient {
      */
     @RequestMapping("holidays")
     JsonResponse<HolidaysVo.Holidays> getHolidays(HolidaysDto.GetHolidays getHolidays);
+
+    /**
+     * 根据手机号查找userId
+     */
+    @GetMapping("/project/businessDeleteProject")
+    JsonResponse businessDeleteProject(@RequestParam(name = "projectId")Long projectId);
+
+    /**
+     * 根据手机号查找userId
+     */
+    @GetMapping("/users/userIdByPhone")
+    JsonResponse<Long> getUserIdByPhone(@RequestParam(name = "phone")String phone);
 }
 
 @Slf4j
@@ -87,6 +99,14 @@ class Tall3FeignClientFallBack implements FallbackFactory<Tall3FeignClient> {
             public JsonResponse<HolidaysVo.Holidays> getHolidays(HolidaysDto.GetHolidays getHolidays) {
                     return JsonResponse.newInstance().fail();
             }
+            @Override
+            public JsonResponse businessDeleteProject(Long projectId) {
+                return JsonResponse.newInstance().fail();
+            }
+            @Override
+            public JsonResponse<Long> getUserIdByPhone(String phone) {
+                return JsonResponse.newInstance().fail();
+            }
 
         };
     }

signin/src/main/java/com/ccsens/signin/api/ProjectController.java

@@ -82,4 +82,12 @@ public class ProjectController {
         projectService.deleteProject(params.getParam(), params.getUserId());
         return JsonResponse.newInstance().ok();
     }
+
+
+    //业务调用删除项目
+    @RequestMapping(value = "/businessDeleteProject", method = RequestMethod.GET, produces = {"application/json;charset=UTF-8"})
+    public JsonResponse  businessDeleteProject(@RequestParam(required = true) Long projectId) throws Exception{
+        projectService.businessDeleteProject(projectId);
+        return JsonResponse.newInstance().ok();
+    }
 }

signin/src/main/java/com/ccsens/signin/service/IProjectService.java

@@ -46,4 +46,9 @@ public interface IProjectService {
      * @param userId userId
      */
     void deleteProject(ProjectDto.ProjectId param, Long userId);
+    /**
+     * 业务删除项目
+     * @param projectId 项目id
+     */
+    void businessDeleteProject(Long projectId);
 }

signin/src/main/java/com/ccsens/signin/service/ProjectService.java

@@ -197,7 +197,8 @@ public class ProjectService implements IProjectService {
             Date time = calendar.getTime();
             dateList.add(format.format(time));
         }
-        System.out.println(dateList);
+
+         System.out.println(dateList);
 
         //比较参数时间与项目时间
         for (int i = 0; i < dateList.size(); i++) {
@@ -317,4 +318,17 @@ public class ProjectService implements IProjectService {
         }
 
     }
+
+    @Override
+    public void businessDeleteProject(Long projectId) {
+        //查找项目
+        SysProjectList projectList = projectDao.selectByProjectId(projectId);
+        if (ObjectUtil.isNotNull(projectList)) {
+            projectList.setRecStatus((byte) 2);
+            projectListMapper.updateByPrimaryKeySelective(projectList);
+            //删除成员项目关联表
+            projectDao.delUserProjectByProjectId(projectId);
+        }
+
+    }
 }

util/src/main/java/com/ccsens/util/config/ControllerExceptionHandler.java

@@ -38,21 +38,21 @@ public class ControllerExceptionHandler {
 //    }
 
     @ExceptionHandler(value = MethodArgumentNotValidException.class)
-//    @ResponseBody
-    public void validateExceptionHandlero(HttpServletRequest req,HttpServletResponse response,
+    @ResponseBody
+    public JsonResponse validateExceptionHandlero(HttpServletRequest req,HttpServletResponse response,
                                           MethodArgumentNotValidException e){
         BindingResult bindingResult = e.getBindingResult();
-//        StringBuilder errorMesssage = new StringBuilder();
-//        for (FieldError fieldError : bindingResult.getFieldErrors()) {
-//            System.out.println("-------------" + fieldError.getField() + "----" + fieldError.getRejectedValue());
-//            errorMesssage.append(fieldError.getDefaultMessage() + "\n");
-//        }
-//
-//        errorMesssage.append(bindingResult.getFieldErrors().get(0).getDefaultMessage());
-//        e.printStackTrace();
+        StringBuilder errorMesssage = new StringBuilder();
+        for (FieldError fieldError : bindingResult.getFieldErrors()) {
+            System.out.println("-------------" + fieldError.getField() + "----" + fieldError.getRejectedValue());
+            errorMesssage.append(fieldError.getDefaultMessage() + "\n");
+        }
+
+        errorMesssage.append(bindingResult.getFieldErrors().get(0).getDefaultMessage());
+        e.printStackTrace();
         log.error("MethodArgumentNotValidException",e);
-//        return JsonResponse.newInstance().fail(CodeEnum.PARAM_NULL.getCode(),bindingResult.getFieldError().getDefaultMessage());
-        responseError(response, JsonResponse.newInstance().fail(-1,e.getMessage()));
+        return JsonResponse.newInstance().fail(CodeEnum.PARAM_NULL.getCode(),bindingResult.getFieldError().getDefaultMessage());
+//        responseError(response, JsonResponse.newInstance().fail(-1,e.getMessage()));
     }
 
     @ExceptionHandler(value = BindException.class)

util/src/test/java/com/ccsens/util/OtherTest.java

@@ -30,6 +30,25 @@ public class OtherTest {
 
     public static final String REGEX_PHONE = "^((13[0-9])|(14[5|7])|(15([0-3]|[5-9]))|(17[013678])|(18[0,1-9]))\\d{8}$";
 
+    @Test
+    public void test17() {
+        List<String> stringList = new ArrayList<>();
+        stringList.add("1");
+        stringList.add("2");
+        stringList.add("3");
+        stringList.add("4");
+
+        String string = stringList.toString();
+        System.out.println(string);
+
+//        list.add("测试1");
+//        list.add("测试2");
+//        list.add("测试3");
+        String join = String.join(",", stringList);
+        System.out.println(join);
+    }
+
+
     @Test
     public void test15() {
         String httpArg = "20211001";