1.安全相关，登录异常提示、统一异常处理

2.维修保养任务分别在9点、12点整点时进行一次提示

1.安全相关，登录异常提示、统一异常处理
2.维修保养任务分别在9点、12点整点时进行一次提示
王通
1 parent 65c24b45
Showing 3 changed files with 131 additions and 18 deletions
src/main/java/com/bsth/controller/sys/UserController.java
src/main/java/com/bsth/data/maintenance_plan/MtPlanCenter.java
src/main/java/com/bsth/exception/GlobalExceptionHandler.java
@@ -85,6 +85,12 @@ public class UserController extends BaseController&lt;SysUser, Integer&gt; {
  
             SysUser user = sysUserService.findByUserName(userName);
  
+            if (null == user) {
+                userOrPasswordInvalid(rs, userName);
+
+                return rs;
+            }
+
             // 校验用户状态
             if (!user.isEnabled()) {
                 return put(rs, "msg", "该用户已被锁定，请联系管理员");
@@ -108,19 +114,8 @@ public class UserController extends BaseController&lt;SysUser, Integer&gt; {
  
             // 校验密码
             boolean matchStatus = new BCryptPasswordEncoder(4).matches(password, user.getPassword());
-            if (null == user || !matchStatus) {
-                rs.put("msg", "密码有误");
-
-                Integer errTimes = USER_ERRTIMES.get(userName);
-                if (null == errTimes) {
-                    errTimes = 0;
-                }
-                USER_ERRTIMES.put(userName, ++errTimes);
-                if (errTimes > 3) {
-                    USER_LOCKTIME.put(userName, System.currentTimeMillis() + 600000);
-                    USER_ERRTIMES.put(userName, 0);
-                    put(rs, "msg", "密码错误4次，账户将被锁定10分钟");
-                }
+            if (!matchStatus) {
+                userOrPasswordInvalid(rs, userName);
  
                 return rs;
             }
@@ -151,6 +146,21 @@ public class UserController extends BaseController&lt;SysUser, Integer&gt; {
         return rs;
     }
  
+    private void userOrPasswordInvalid(Map<String, Object> rs, String userName) {
+        rs.put("msg", "密码有误");
+
+        Integer errTimes = USER_ERRTIMES.get(userName);
+        if (null == errTimes) {
+            errTimes = 0;
+        }
+        USER_ERRTIMES.put(userName, ++errTimes);
+        if (errTimes > 3) {
+            USER_LOCKTIME.put(userName, System.currentTimeMillis() + 600000);
+            USER_ERRTIMES.put(userName, 0);
+            put(rs, "msg", "密码错误4次，账户将被锁定10分钟");
+        }
+    }
+
     @RequestMapping(value = "/change_user", method = RequestMethod.POST)
     public Map<String, Object> changeUser(HttpServletRequest request, @RequestParam String userName,
                                           @RequestParam String password) {
@@ -11,6 +11,8 @@ import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextAware;
+import org.springframework.scheduling.annotation.EnableScheduling;
+import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
  
 import java.util.HashMap;
@@ -23,6 +25,7 @@ import java.util.Set;
  * @author Hill
  */
 @Component
+@EnableScheduling
 public class MtPlanCenter implements ApplicationContextAware {
  
     private static Set<MaintenancePlan> data;
@@ -35,13 +38,13 @@ public class MtPlanCenter implements ApplicationContextAware {
     /**
      * 车辆自编号 和 最新一条数据对照
      */
-    private static Map<String, MaintenancePlan> safeMap;
+    private static Map<String, MaintenancePlan> maintainMap;
  
     private static Logger logger = LoggerFactory.getLogger(MtPlanCenter.class);
  
     static {
         data = new HashSet<>();
-        safeMap = new HashMap<>();
+        maintainMap = new HashMap<>();
     }
  
     private static DateTimeFormatter fmt = DateTimeFormat.forPattern("yyyy-MM-dd HH:mm:ss.SSS");
@@ -55,7 +58,7 @@ public class MtPlanCenter implements ApplicationContextAware {
             //通知客户端
             sendUtils.sendMaintenancePlan(maintenancePlan);
             data.add(maintenancePlan);
-            safeMap.put(maintenancePlan.getZbh(), maintenancePlan);
+            maintainMap.put(maintenancePlan.getZbh(), maintenancePlan);
         }
     }
  
@@ -65,8 +68,16 @@ public class MtPlanCenter implements ApplicationContextAware {
  
     public static void clear(){
         data = new HashSet<>();
-        safeMap = new HashMap<>();
-        logger.info("清除安全驾驶数据，，，");
+        maintainMap = new HashMap<>();
+        logger.info("清除维修保养数据，，，");
+    }
+
+    @Scheduled(cron = "0 0 9,12 * * *")
+    public void pushMtPlan() {
+        for (MaintenancePlan maintenancePlan : data) {
+            //通知客户端
+            sendUtils.sendMaintenancePlan(maintenancePlan);
+        }
     }
  
     @Override
+package com.bsth.exception;
+
+import com.bsth.common.ResponseCode;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.security.access.AccessDeniedException;
+import org.springframework.security.authentication.AccountExpiredException;
+import org.springframework.security.core.userdetails.UsernameNotFoundException;
+import org.springframework.validation.BindException;
+import org.springframework.web.bind.MethodArgumentNotValidException;
+import org.springframework.web.bind.annotation.ExceptionHandler;
+import org.springframework.web.bind.annotation.RestControllerAdvice;
+import org.springframework.web.servlet.NoHandlerFoundException;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 全局异常处理器
+ * 
+ * @author luwu
+ */
+@RestControllerAdvice
+public class GlobalExceptionHandler
+{
+    private static final Logger log = LoggerFactory.getLogger(GlobalExceptionHandler.class);
+
+    @ExceptionHandler(NoHandlerFoundException.class)
+    public Map<String, Object> handlerNoFoundException(Exception e)
+    {
+        log.error(e.getMessage(), e);
+        return error("路径不存在，请检查路径是否正确");
+    }
+
+    @ExceptionHandler(AccessDeniedException.class)
+    public Map<String, Object> handleAuthorizationException(AccessDeniedException e)
+    {
+        log.error(e.getMessage());
+        return error("没有权限，请联系管理员授权");
+    }
+
+    @ExceptionHandler(AccountExpiredException.class)
+    public Map<String, Object> handleAccountExpiredException(AccountExpiredException e)
+    {
+        log.error(e.getMessage(), e);
+        return error(e.getMessage());
+    }
+
+    @ExceptionHandler(UsernameNotFoundException.class)
+    public Map<String, Object> handleUsernameNotFoundException(UsernameNotFoundException e)
+    {
+        log.error(e.getMessage(), e);
+        return error(e.getMessage());
+    }
+
+    @ExceptionHandler(Exception.class)
+    public Map<String, Object> handleException(Exception e)
+    {
+        log.error(e.getMessage(), e);
+        return error(e.getMessage());
+    }
+
+    /**
+     * 自定义验证异常
+     */
+    @ExceptionHandler(BindException.class)
+    public Map<String, Object> validatedBindException(BindException e)
+    {
+        log.error(e.getMessage(), e);
+        String message = e.getAllErrors().get(0).getDefaultMessage();
+        return error(message);
+    }
+
+    /**
+     * 自定义验证异常
+     */
+    @ExceptionHandler(MethodArgumentNotValidException.class)
+    public Object validExceptionHandler(MethodArgumentNotValidException e)
+    {
+        log.error(e.getMessage(), e);
+        String message = e.getBindingResult().getFieldError().getDefaultMessage();
+        return error(message);
+    }
+
+    private Map<String, Object> error(String message) {
+        Map<String, Object> result = new HashMap<>();
+        result.put("status", ResponseCode.ERROR);
+        result.put("msg", "");
+
+        return result;
+    }
+}