Merge remote-tracking branch 'origin/main'

project-admin/src/main/java/com/project/web/controller/system/SysRoleController.java

@@ -84,6 +84,7 @@ public class SysRoleController extends BaseController {
             return AjaxResult.error("新增角色'" + role.getRoleName() + "'失败，角色权限已存在");
         }
         role.setCreateBy(getUsername());
+        role.setDelFlag("0");
         return toAjax(roleService.insertRole(role));
 
     }

project-admin/src/main/java/com/project/web/controller/system/SysUserController.java

@@ -113,6 +113,7 @@ public class SysUserController extends BaseController {
 //        }
         user.setCreateBy(getUsername());
         user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
+        user.setDelFlag("0");
         return toAjax(userService.insertUser(user));
     }
 

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

@@ -111,26 +111,15 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter {
                 // 过滤请求
                 .authorizeRequests()
 
-                // 业务放开接口
-//                // 账号密码登录
-//                .antMatchers("/au/defaultLogin/login").anonymous()
-//                // 获取验证码
-//                .antMatchers("/au/defaultLogin/getCode/**").anonymous()
-//                // 账号验证码登录
-//                .antMatchers("/au/defaultLogin/loginByCode").anonymous()
-//                // 注册验证码登录
-//                .antMatchers("/au/defaultLogin/register").anonymous()
-//                // 获取授权登录Url
-//                .antMatchers("/au/weiXinMp/getLoginUrl").anonymous()
-//                // 授权登录回调地址
-                .antMatchers("/large/**").anonymous()
+                // 授权大屏地址
+                //.antMatchers("/large/**").anonymous()
                 //.antMatchers("/xxl-job-admin/**").anonymous()
                 // 对于登录login 注册register 验证码captchaImage 允许匿名访问
                 .antMatchers("/login", "/register", "/captchaImage").anonymous()
                 // 静态资源，可匿名访问
                 .antMatchers(HttpMethod.GET, "/", "/*.html", "/**/*.html", "/**/*.css", "/**/*.js", "/profile/**").permitAll()
                 .antMatchers( "/sxgw/**","/sxgw/**/**","/sxgw/**/**/**","/basics/**", "/basics/**/**", "/build/**", "/build/**/**","/employee/**", "/employee/**/**","/health/**", "/health/**/**","/post/**", "/post/**/**","/property/**", "/property/**/**","/smart/**", "/smart/**/**","/video/**", "/video/**/**").permitAll()
-                .antMatchers("/large/**", "/webjars/**", "/*/api-docs", "/druid/**").permitAll()
+                .antMatchers( "/webjars/**", "/*/api-docs", "/druid/**").permitAll()
                 // 除上面外的所有请求全部需要鉴权认证
                 .anyRequest().authenticated()
                 .and()

project-framework/src/main/java/com/project/framework/web/exception/GlobalExceptionHandler.java

@@ -102,11 +102,5 @@ public class GlobalExceptionHandler {
         return AjaxResult.error(message);
     }
 
-    /**
-     * 演示模式异常
-     */
-    @ExceptionHandler(DemoModeException.class)
-    public AjaxResult handleDemoModeException(DemoModeException e) {
-        return AjaxResult.error("演示模式，不允许操作");
-    }
+
 }

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

@@ -53,8 +53,6 @@ public class SysLoginService {
     @Autowired
     private SysPermissionService permissionService;
     @Autowired
-    private ISysUserService sysUserService;
-    @Autowired
     private SysUserRoleMapper sysUserRoleMapper;
 
     /**
@@ -87,6 +85,7 @@ public class SysLoginService {
             // 该方法会去调用UserDetailsServiceImpl.loadUserByUsername
             authentication = authenticationManager.authenticate(authenticationToken);
         } catch (Exception e) {
+            AuthenticationContextHolder.clearContext();
             if (e instanceof BadCredentialsException) {
                 AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_FAIL, MessageUtils.message("user.password.not.match")));
                 throw new UserPasswordNotMatchException();
@@ -94,9 +93,8 @@ public class SysLoginService {
                 AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_FAIL, e.getMessage()));
                 throw new ServiceException(e.getMessage());
             }
-        } finally {
-            AuthenticationContextHolder.clearContext();
         }
+
         AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_SUCCESS, MessageUtils.message("user.login.success")));
         LoginUser loginUser = (LoginUser) authentication.getPrincipal();
         recordLoginInfo(loginUser.getUserId());
@@ -196,9 +194,9 @@ public class SysLoginService {
             handleSex(sysUser, sex);
             sysUser.setPassword(SecurityUtils.encryptPassword("123456"));
             sysUser.setRoleIds(new Long[]{RoleConstants.USER.getRoleId()});
-            sysUserService.insertUser(sysUser);
+            userService.insertUser(sysUser);
             // 生成token
-            sysUser = sysUserService.selectUserByUserName(sysUser.getUserName());
+            sysUser = userService.selectUserByUserName(sysUser.getUserName());
             LoginUser loginUser = new LoginUser(sysUser, permissionService.getMenuPermission(sysUser));
             token = tokenService.createToken(loginUser);
         } else {
@@ -206,14 +204,14 @@ public class SysLoginService {
             user.setNickName(nickName);
             user.setAvatar(avatar);
             handleSex(user, sex);
-            sysUserService.updateById(user);
+            userService.updateById(user);
             user.setAvatar(StringUtils.isNotEmpty(avatar) ? avatar : user.getAvatar());
-            SysUser sysUser = sysUserService.selectUserByUserName(user.getUserName());
+            SysUser sysUser = userService.selectUserByUserName(user.getUserName());
             List<String> roleKeys = sysUser.getRoles().stream().map(SysRole::getRoleKey).collect(Collectors.toList());
             if (!roleKeys.contains(RoleConstants.USER.getRoleKey())) {
                 // 如果没有用户角色，给角色用户
                 sysUserRoleMapper.insert(new SysUserRole().setUserId(user.getUserId()).setRoleId(RoleConstants.USER.getRoleId()));
-                sysUser = sysUserService.selectUserByUserName(user.getUserName());
+                sysUser = userService.selectUserByUserName(user.getUserName());
             }
             LoginUser loginUser = new LoginUser(sysUser, permissionService.getMenuPermission(sysUser));
             token = tokenService.createToken(loginUser);

project-zcustom/src/main/java/com/project/zcustom/service/service/basics/impl/PlatBasicsServiceImpl.java

@@ -339,7 +339,7 @@ public class PlatBasicsServiceImpl extends ServiceImpl<PlatBasicsMapper, PlatBas
         if (StringUtils.isNull(platBasics)) {
             StringUtils.getMapData("注册用户数", "registerNum", 0, tempMap);
             StringUtils.getMapData("活跃人数", "orderNum", 0, tempMap);
-            tempMap.put("onlineRate", "0");
+            tempMap.put("onlineRate", 0);
         }else{
             StringUtils.getMapData("注册用户数", "registerNum", platBasics.getRegisterNum(), tempMap);
             StringUtils.getMapData("活跃人数", "orderNum", platBasics.getOrderNum(), tempMap);
@@ -347,7 +347,7 @@ public class PlatBasicsServiceImpl extends ServiceImpl<PlatBasicsMapper, PlatBas
             BigDecimal b = new BigDecimal(platBasics.getRegisterNum());
             BigDecimal result = a.divide(b, 4, RoundingMode.HALF_UP);
             BigDecimal percentage = result.multiply(new BigDecimal("100")).stripTrailingZeros();
-            tempMap.put("onlineRate", percentage.toPlainString());
+            tempMap.put("onlineRate", percentage);
         }
         return tempMap;
     }

project-zcustom/src/main/java/com/project/zcustom/tools/BuildingService.java

@@ -160,7 +160,12 @@ public class BuildingService {
             }
 
         } catch (Exception e){
-            result = e.getMessage();
+            // 添加接口请求记录
+            PlatApiRecord platApiRecord = new PlatApiRecord();
+            platApiRecord.setApiUrl(url);
+            platApiRecord.setApiResult(result);
+            iPlatApiRecordService.save(platApiRecord);
+            return result;
         }
         // 添加接口请求记录
         PlatApiRecord platApiRecord = new PlatApiRecord();

project-zcustom/src/main/java/com/project/zcustom/tools/CarService.java

@@ -11,14 +11,12 @@ import com.project.zcustom.domain.addional.LargeCarRank;
 import com.project.zcustom.domain.addional.LargeWarnDetail;
 import com.project.zcustom.domain.basics.PlatAppOrg;
 import com.project.zcustom.domain.plat.PlatApiRecord;
-import com.project.zcustom.domain.property.PlatProperty;
 import com.project.zcustom.service.plat.IPlatApiRecordService;
 import com.project.zcustom.service.service.basics.IPlatAppOrgService;
 import com.project.zcustom.service.unit.ILargeCarDetailService;
 import com.project.zcustom.service.unit.ILargeCarRankService;
 import com.project.zcustom.service.unit.ILargePublicCarService;
 import com.project.zcustom.service.unit.ILargeWarnDetailService;
-import com.sun.xml.internal.bind.v2.TODO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

project-zcustom/src/main/java/com/project/zcustom/tools/LogisticsService.java

@@ -5,12 +5,14 @@ import com.alibaba.fastjson2.JSONArray;
 import com.alibaba.fastjson2.JSONObject;
 import com.project.common.utils.StringUtils;
 import com.project.common.utils.http.HttpUtils;
+import com.project.zcustom.domain.addional.BizMetric;
 import com.project.zcustom.domain.addional.LargeAssetDirs;
 import com.project.zcustom.domain.addional.LargeLogistics;
 import com.project.zcustom.domain.basics.PlatAppOrg;
 import com.project.zcustom.domain.plat.AssetMonitoringResponse;
 import com.project.zcustom.domain.plat.PlatApiRecord;
 import com.project.zcustom.mapper.logistics.PlatAssetMapper;
+import com.project.zcustom.service.logistics.IBizMetricService;
 import com.project.zcustom.service.service.basics.IPlatAppOrgService;
 import com.project.zcustom.service.plat.IPlatApiRecordService;
 import org.apache.commons.compress.utils.Lists;
@@ -36,6 +38,8 @@ public class LogisticsService {
     private IPlatAppOrgService platAppOrgService;
     @Resource
     IPlatApiRecordService iPlatApiRecordService;
+    @Resource
+    private IBizMetricService bizMetricService;
 
 
     public void getLogisticsData(){
@@ -57,6 +61,24 @@ public class LogisticsService {
     private void postLoginRequest(int current,String logistUrl,Map<String, String> orgMap,List<LargeLogistics> list,List<LargeAssetDirs> officeAssetList,List<LargeAssetDirs> buildingAssetList,List<LargeAssetDirs> serviceAssetList){
         // 分页查询页数
         JSONObject jsonObject = this.repeat(logistUrl, current);
+
+        /* 测试代码
+        List<BizMetric> metrics = bizMetricService.list();
+        System.out.println(metrics.size());
+        Map<String, Object> map = new HashMap<>();
+        map.put("code", 200);
+        Map<String, Object> data = new HashMap<>();
+        Map<String, Object> listMap = new HashMap<>();
+        listMap.put("total",124);
+        listMap.put("size",1);
+        listMap.put("pages",1);
+        listMap.put("records", metrics);
+        data.put("quotaAssetMonitoringList", listMap);
+        map.put("data", data);
+        String str = JSONObject.toJSONString(map);
+        System.out.println(str);
+        jsonObject = JSONObject.parseObject(str);*/
+
         if (Objects.isNull(jsonObject)) {
             return;
         }
@@ -134,8 +156,8 @@ public class LogisticsService {
             LargeAssetDirs largeAssetDirs = new LargeAssetDirs();
             JSONObject assetItem = buildingAssetArray.getJSONObject(k);
             largeAssetDirs.setAppCode(appCode);
-            largeAssetDirs.setCategoryName(assetItem.getString("categoryName"));
-            largeAssetDirs.setAssetNum(assetItem.getLong("assetNum"));
+            largeAssetDirs.setCategoryName(assetItem.getString("CATEGORY_NAME"));
+            largeAssetDirs.setAssetNum(assetItem.getLong("ASSET_NUM"));
             list.add(largeAssetDirs);
         }
         return list;