代码优化

project-framework/src/main/java/com/project/framework/config/SecurityConfig.java

@@ -112,7 +112,7 @@ public class SecurityConfig  {
                     permitAllUrl.getUrls().forEach(url -> requests.antMatchers(url).permitAll());
 
                     // 对于登录login 注册register 验证码captchaImage 允许匿名访问"/large/**","/sxgw/**"
-                    requests.antMatchers("/login", "/captchaImage","/synchronize/**","/large/**").permitAll()
+                    requests.antMatchers("/login", "/captchaImage","/synchronize/**").permitAll()
                             // 静态资源，可匿名访问
                             .antMatchers(HttpMethod.GET, "/", "/*.html", "/**/*.html", "/**/*.css", "/**/*.js", "/profile/**").permitAll()
                             // 除上面外的所有请求全部需要鉴权认证

project-framework/src/main/java/com/project/framework/web/service/TokenService.java

@@ -20,10 +20,7 @@ import org.springframework.stereotype.Component;
 
 import javax.servlet.http.Cookie;
 import javax.servlet.http.HttpServletRequest;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
+import java.util.*;
 import java.util.concurrent.TimeUnit;
 
 /**
@@ -62,8 +59,11 @@ public class TokenService {
                 // 解析对应的权限以及用户信息
                 String uuid = (String) claims.get(Constants.LOGIN_USER_KEY);
                 String userKey = getTokenKey(uuid);
-                LoginUser user = JSON.parseObject(redisCache.getCacheObject(userKey).toString(), LoginUser.class);
-                return user;
+                Object redisCacheStr = redisCache.getCacheObject(userKey);
+                if (Objects.nonNull(redisCacheStr)) {
+                    LoginUser user = JSON.parseObject(redisCacheStr.toString(), LoginUser.class);
+                    return user;
+                }
             } catch (Exception e) {
                 e.printStackTrace();
             }

project-zcustom/src/main/java/com/project/zcustom/controller/service/PlatEmployeeController.java

@@ -32,6 +32,11 @@ public class PlatEmployeeController extends BaseController {
     }
 
 
+    /**
+     * 入楼情况
+     * @param appOrg
+     * @return
+     */
     @RequestMapping("/getEnterBuildData")
     public AjaxResult getEnterBuildData(@RequestParam String appOrg) {
         return AjaxResult.success("查询成功", platEmployeeTypeService.getEnterBuildData(appOrg));

project-zcustom/src/main/java/com/project/zcustom/service/service/employee/impl/PlatEmployeeTypeServiceImpl.java

@@ -244,7 +244,7 @@ public class PlatEmployeeTypeServiceImpl extends ServiceImpl<PlatEmployeeTypeMap
             valueList = Arrays.asList(employeeType.getInsideNum(), employeeType.getLoanNum(), employeeType.getAssociationNum(), employeeType.getPropertyNum());
         }
         List<String> xList = Arrays.asList("内部员工", "借调人员", "外协人员", "物业人员");
-        List<String> colorList = Arrays.asList("#fec72f", "#2f82fe", "#7565ef", "#00ffff");
+        List<String> colorList = Arrays.asList("#00ffdf", "#ffd296", "#7565ef", "#0084ff");
         List<Map<String, Object>> tempList = new ArrayList<>();
         StringUtils.createdPieData(xList, colorList, valueList, tempList);
         return tempList;
@@ -288,7 +288,7 @@ public class PlatEmployeeTypeServiceImpl extends ServiceImpl<PlatEmployeeTypeMap
         List<String> nameList = Arrays.asList("内部人员", "借调人员", "外协人员", "物业人员","访客");
         // 获取7天前的日期
         List<String> dateList = DateUtils.generateDateList(7);
-        List<String> colorList = Arrays.asList("#0084ff", "#ffd296", "#7565ef", "#00ffff","#ffcd3e");
+        List<String> colorList = Arrays.asList("#00ffdf", "#ffd296", "#7565ef", "#00ffff","#f4cb57");
         List<String> keyList = Arrays.asList("inside", "loan", "association", "property","visitor");
         QueryWrapper<PlatEmployeeTypeFlow> flowQueryWrapper = new QueryWrapper<>();
         if(!Objects.equals(appOrg,"0000")){