+ 平台业务代码适配

bd-park/park-backend/park-application/src/main/java/com/huashe/park/application/engine/EvtFusionEngine.java

@@ -1,9 +1,9 @@
 package com.huashe.park.application.engine;
 
 import com.alibaba.fastjson2.JSONObject;
+import com.huashe.common.utils.StringUtils;
 import com.huashe.park.common.DateTimeUtil;
 import com.ruoyi.common.core.redis.RedisCache;
-import com.ruoyi.common.utils.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Value;

bd-park/park-backend/park-core/src/main/java/com/huashe/park/core/interceptor/MybatisInterceptor.java → bd-park/park-backend/park-application/src/main/java/com/huashe/park/application/mybatis/interceptor/MybatisInterceptor.java

@@ -1,4 +1,5 @@
-package com.huashe.park.core.interceptor;
+package com.huashe.park.application.mybatis.interceptor;
+
 
 import com.ruoyi.common.core.domain.model.LoginUser;
 import com.ruoyi.common.utils.SecurityUtils;
@@ -7,7 +8,11 @@ import org.apache.ibatis.binding.MapperMethod.ParamMap;
 import org.apache.ibatis.executor.Executor;
 import org.apache.ibatis.mapping.MappedStatement;
 import org.apache.ibatis.mapping.SqlCommandType;
-import org.apache.ibatis.plugin.*;
+import org.apache.ibatis.plugin.Interceptor;
+import org.apache.ibatis.plugin.Intercepts;
+import org.apache.ibatis.plugin.Invocation;
+import org.apache.ibatis.plugin.Plugin;
+import org.apache.ibatis.plugin.Signature;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;

bd-park/park-backend/park-core/src/main/java/com/huashe/park/core/interceptor/RegisterCustomerInterceptor.java → bd-park/park-backend/park-application/src/main/java/com/huashe/park/application/mybatis/interceptor/RegisterCustomerInterceptor.java

@@ -1,4 +1,4 @@
-package com.huashe.park.core.interceptor;
+package com.huashe.park.application.mybatis.interceptor;
 
 import org.apache.ibatis.session.SqlSessionFactory;
 import org.springframework.beans.factory.annotation.Autowired;

bd-park/park-backend/park-application/src/main/java/com/huashe/park/application/web/controller/bd/BdDevcTrailController.java

@@ -1,11 +1,11 @@
 package com.huashe.park.application.web.controller.bd;
 
 
+import com.huashe.common.domain.AjaxResult;
 import com.huashe.park.core.service.IBdDevcTrailService;
 import com.huashe.park.domain.entity.BdDevcTrail;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.poi.ExcelUtil;

bd-park/park-backend/park-application/src/main/java/com/huashe/park/application/web/controller/bd/BdDevcTrailUwbController.java

@@ -8,7 +8,7 @@ import com.huashe.park.domain.entity.BdDevcTrailUwb;
 import com.ruoyi.common.annotation.Anonymous;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
+import com.huashe.common.domain.AjaxResult;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.poi.ExcelUtil;

bd-park/park-backend/park-application/src/main/java/com/huashe/park/application/web/controller/bd/BdFenceInfoController.java

@@ -5,7 +5,7 @@ import com.huashe.park.domain.entity.BdFenceInfo;
 import com.ruoyi.common.annotation.Anonymous;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
+import com.huashe.common.domain.AjaxResult;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.poi.ExcelUtil;

bd-park/park-backend/park-application/src/main/java/com/huashe/park/application/web/controller/bd/BdFenceVioEvtController.java

@@ -5,7 +5,7 @@ import com.huashe.park.domain.entity.BdFenceVioEvt;
 import com.ruoyi.common.annotation.Anonymous;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
+import com.huashe.common.domain.AjaxResult;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.poi.ExcelUtil;

bd-park/park-backend/park-application/src/main/java/com/huashe/park/application/web/controller/common/CaptchaController.java

@@ -1,13 +1,13 @@
 package com.huashe.park.application.web.controller.common;
 
 import com.google.code.kaptcha.Producer;
+import com.huashe.common.constant.CacheConstants;
+import com.huashe.common.utils.sign.Base64;
+import com.huashe.common.utils.uuid.IdUtils;
 import com.ruoyi.common.config.RuoYiConfig;
-import com.ruoyi.common.constant.CacheConstants;
 import com.ruoyi.common.constant.Constants;
-import com.ruoyi.common.core.domain.AjaxResult;
+import com.huashe.common.domain.AjaxResult;
 import com.ruoyi.common.core.redis.RedisCache;
-import com.ruoyi.common.utils.sign.Base64;
-import com.ruoyi.common.utils.uuid.IdUtils;
 import com.ruoyi.system.service.ISysConfigService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.FastByteArrayOutputStream;

bd-park/park-backend/park-application/src/main/java/com/huashe/park/application/web/controller/common/CommonController.java

@@ -1,9 +1,9 @@
 package com.huashe.park.application.web.controller.common;
 
+import com.huashe.common.domain.AjaxResult;
+import com.huashe.common.utils.StringUtils;
 import com.ruoyi.common.config.RuoYiConfig;
 import com.ruoyi.common.constant.Constants;
-import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.file.FileUploadUtils;
 import com.ruoyi.common.utils.file.FileUtils;
 import com.ruoyi.framework.config.ServerConfig;

bd-park/park-backend/park-application/src/main/java/com/huashe/park/application/web/controller/monitor/CacheController.java

@@ -1,8 +1,9 @@
 package com.huashe.park.application.web.controller.monitor;
 
-import com.ruoyi.common.constant.CacheConstants;
-import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.utils.StringUtils;
+
+import com.huashe.common.constant.CacheConstants;
+import com.huashe.common.domain.AjaxResult;
+import com.huashe.common.utils.StringUtils;
 import com.ruoyi.system.domain.SysCache;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.RedisCallback;

bd-park/park-backend/park-application/src/main/java/com/huashe/park/application/web/controller/monitor/ServerController.java

@@ -1,6 +1,6 @@
 package com.huashe.park.application.web.controller.monitor;
 
-import com.ruoyi.common.core.domain.AjaxResult;
+import com.huashe.common.domain.AjaxResult;
 import com.ruoyi.framework.web.domain.Server;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.GetMapping;

bd-park/park-backend/park-application/src/main/java/com/huashe/park/application/web/controller/monitor/SysLogininforController.java

@@ -2,7 +2,7 @@ package com.huashe.park.application.web.controller.monitor;
 
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
+import com.huashe.common.domain.AjaxResult;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.poi.ExcelUtil;

bd-park/park-backend/park-application/src/main/java/com/huashe/park/application/web/controller/monitor/SysOperlogController.java

@@ -2,7 +2,7 @@ package com.huashe.park.application.web.controller.monitor;
 
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
+import com.huashe.common.domain.AjaxResult;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.poi.ExcelUtil;

bd-park/park-backend/park-application/src/main/java/com/huashe/park/application/web/controller/monitor/SysUserOnlineController.java

@@ -1,19 +1,23 @@
 package com.huashe.park.application.web.controller.monitor;
 
+import com.huashe.common.constant.CacheConstants;
+import com.huashe.common.domain.AjaxResult;
+import com.huashe.common.utils.StringUtils;
 import com.ruoyi.common.annotation.Log;
-import com.ruoyi.common.constant.CacheConstants;
 import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.domain.model.LoginUser;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.core.redis.RedisCache;
 import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.system.domain.SysUserOnline;
 import com.ruoyi.system.service.ISysUserOnlineService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -22,13 +26,12 @@ import java.util.List;
 
 /**
  * 在线用户监控
- * 
+ *
  * @author ruoyi
  */
 @RestController
 @RequestMapping("/monitor/online")
-public class SysUserOnlineController extends BaseController
-{
+public class SysUserOnlineController extends BaseController {
     @Autowired
     private ISysUserOnlineService userOnlineService;
 
@@ -37,27 +40,18 @@ public class SysUserOnlineController extends BaseController
 
     @PreAuthorize("@ss.hasPermi('monitor:online:list')")
     @GetMapping("/list")
-    public TableDataInfo list(String ipaddr, String userName)
-    {
+    public TableDataInfo list(String ipaddr, String userName) {
         Collection<String> keys = redisCache.keys(CacheConstants.LOGIN_TOKEN_KEY + "*");
         List<SysUserOnline> userOnlineList = new ArrayList<SysUserOnline>();
-        for (String key : keys)
-        {
+        for (String key : keys) {
             LoginUser user = redisCache.getCacheObject(key);
-            if (StringUtils.isNotEmpty(ipaddr) && StringUtils.isNotEmpty(userName))
-            {
+            if (StringUtils.isNotEmpty(ipaddr) && StringUtils.isNotEmpty(userName)) {
                 userOnlineList.add(userOnlineService.selectOnlineByInfo(ipaddr, userName, user));
-            }
-            else if (StringUtils.isNotEmpty(ipaddr))
-            {
+            } else if (StringUtils.isNotEmpty(ipaddr)) {
                 userOnlineList.add(userOnlineService.selectOnlineByIpaddr(ipaddr, user));
-            }
-            else if (StringUtils.isNotEmpty(userName) && StringUtils.isNotNull(user.getUser()))
-            {
+            } else if (StringUtils.isNotEmpty(userName) && StringUtils.isNotNull(user.getUser())) {
                 userOnlineList.add(userOnlineService.selectOnlineByUserName(userName, user));
-            }
-            else
-            {
+            } else {
                 userOnlineList.add(userOnlineService.loginUserToUserOnline(user));
             }
         }
@@ -72,8 +66,7 @@ public class SysUserOnlineController extends BaseController
     @PreAuthorize("@ss.hasPermi('monitor:online:forceLogout')")
     @Log(title = "在线用户", businessType = BusinessType.FORCE)
     @DeleteMapping("/{tokenId}")
-    public AjaxResult forceLogout(@PathVariable String tokenId)
-    {
+    public AjaxResult forceLogout(@PathVariable String tokenId) {
         redisCache.deleteObject(CacheConstants.LOGIN_TOKEN_KEY + tokenId);
         return success();
     }

bd-park/park-backend/park-application/src/main/java/com/huashe/park/application/web/controller/park/ParkAttendGroupController.java

@@ -1,10 +1,10 @@
 package com.huashe.park.application.web.controller.park;
 
+import com.huashe.common.domain.AjaxResult;
 import com.huashe.park.core.service.IParkAttendGroupService;
 import com.huashe.park.domain.entity.ParkAttendGroup;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.poi.ExcelUtil;

bd-park/park-backend/park-application/src/main/java/com/huashe/park/application/web/controller/park/ParkAttendGroupUsrController.java

@@ -4,7 +4,7 @@ import com.huashe.park.core.service.IParkAttendGroupUsrService;
 import com.huashe.park.domain.entity.ParkAttendGroupUsr;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
+import com.huashe.common.domain.AjaxResult;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.poi.ExcelUtil;

bd-park/park-backend/park-application/src/main/java/com/huashe/park/application/web/controller/park/ParkAttendUsrDetailController.java

@@ -4,7 +4,7 @@ import com.huashe.park.core.service.IParkAttendUsrDetailService;
 import com.huashe.park.domain.entity.ParkAttendUsrDetail;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
+import com.huashe.common.domain.AjaxResult;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.poi.ExcelUtil;

bd-park/park-backend/park-application/src/main/java/com/huashe/park/application/web/controller/park/ParkInspectProjController.java

@@ -17,7 +17,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
+import com.huashe.common.domain.AjaxResult;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.common.core.page.TableDataInfo;

bd-park/park-backend/park-application/src/main/java/com/huashe/park/application/web/controller/park/ParkInspectTaskController.java

@@ -17,7 +17,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
+import com.huashe.common.domain.AjaxResult;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.common.core.page.TableDataInfo;

bd-park/park-backend/park-application/src/main/java/com/huashe/park/application/web/controller/park/ParkInspectTaskUsrTrailController.java

@@ -17,7 +17,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
+import com.huashe.common.domain.AjaxResult;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.common.core.page.TableDataInfo;

bd-park/park-backend/park-application/src/main/java/com/huashe/park/application/web/controller/system/SysConfigController.java

@@ -3,7 +3,7 @@ package com.huashe.park.application.web.controller.system;
 import com.ruoyi.common.annotation.Anonymous;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
+import com.huashe.common.domain.AjaxResult;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.poi.ExcelUtil;

bd-park/park-backend/park-application/src/main/java/com/huashe/park/application/web/controller/system/SysDeptController.java

@@ -1,12 +1,12 @@
 package com.huashe.park.application.web.controller.system;
 
+import com.huashe.common.constant.UserConstants;
+import com.huashe.common.utils.StringUtils;
 import com.ruoyi.common.annotation.Log;
-import com.ruoyi.common.constant.UserConstants;
 import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
+import com.huashe.common.domain.AjaxResult;
 import com.ruoyi.common.core.domain.entity.SysDept;
 import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.system.service.ISysDeptService;
 import org.apache.commons.lang3.ArrayUtils;
 import org.springframework.beans.factory.annotation.Autowired;

bd-park/park-backend/park-application/src/main/java/com/huashe/park/application/web/controller/system/SysDictDataController.java

@@ -1,13 +1,13 @@
 package com.huashe.park.application.web.controller.system;
 
+import com.huashe.common.utils.StringUtils;
 import com.ruoyi.common.annotation.Anonymous;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
+import com.huashe.common.domain.AjaxResult;
 import com.ruoyi.common.core.domain.entity.SysDictData;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.system.service.ISysDictDataService;
 import com.ruoyi.system.service.ISysDictTypeService;

bd-park/park-backend/park-application/src/main/java/com/huashe/park/application/web/controller/system/SysDictTypeController.java

@@ -1,8 +1,8 @@
 package com.huashe.park.application.web.controller.system;
 
+import com.huashe.common.domain.AjaxResult;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.domain.entity.SysDictType;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;

bd-park/park-backend/park-application/src/main/java/com/huashe/park/application/web/controller/system/SysIndexController.java

@@ -1,7 +1,7 @@
 package com.huashe.park.application.web.controller.system;
 
+import com.huashe.common.utils.StringUtils;
 import com.ruoyi.common.config.RuoYiConfig;
-import com.ruoyi.common.utils.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;

bd-park/park-backend/park-application/src/main/java/com/huashe/park/application/web/controller/system/SysLoginController.java

@@ -1,7 +1,7 @@
 package com.huashe.park.application.web.controller.system;
 
 import com.ruoyi.common.constant.Constants;
-import com.ruoyi.common.core.domain.AjaxResult;
+import com.huashe.common.domain.AjaxResult;
 import com.ruoyi.common.core.domain.entity.SysMenu;
 import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.core.domain.model.LoginBody;

bd-park/park-backend/park-application/src/main/java/com/huashe/park/application/web/controller/system/SysMenuController.java

@@ -1,12 +1,13 @@
 package com.huashe.park.application.web.controller.system;
 
+import com.huashe.common.constant.UserConstants;
+import com.huashe.common.utils.StringUtils;
 import com.ruoyi.common.annotation.Log;
-import com.ruoyi.common.constant.UserConstants;
 import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
+import com.huashe.common.domain.AjaxResult;
 import com.ruoyi.common.core.domain.entity.SysMenu;
 import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.common.utils.StringUtils;
+
 import com.ruoyi.system.service.ISysMenuService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;

bd-park/park-backend/park-application/src/main/java/com/huashe/park/application/web/controller/system/SysNoticeController.java

@@ -2,7 +2,7 @@ package com.huashe.park.application.web.controller.system;
 
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
+import com.huashe.common.domain.AjaxResult;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.system.domain.SysNotice;

bd-park/park-backend/park-application/src/main/java/com/huashe/park/application/web/controller/system/SysPostController.java

@@ -2,7 +2,7 @@ package com.huashe.park.application.web.controller.system;
 
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
+import com.huashe.common.domain.AjaxResult;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.poi.ExcelUtil;

bd-park/park-backend/park-application/src/main/java/com/huashe/park/application/web/controller/system/SysProfileController.java

@@ -1,14 +1,14 @@
 package com.huashe.park.application.web.controller.system;
 
+import com.huashe.common.utils.StringUtils;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.config.RuoYiConfig;
 import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
+import com.huashe.common.domain.AjaxResult;
 import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.core.domain.model.LoginUser;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.SecurityUtils;
-import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.file.FileUploadUtils;
 import com.ruoyi.common.utils.file.MimeTypeUtils;
 import com.ruoyi.framework.web.service.TokenService;

bd-park/park-backend/park-application/src/main/java/com/huashe/park/application/web/controller/system/SysRegisterController.java

@@ -1,9 +1,10 @@
 package com.huashe.park.application.web.controller.system;
 
+import com.huashe.common.utils.StringUtils;
 import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
+import com.huashe.common.domain.AjaxResult;
 import com.ruoyi.common.core.domain.model.RegisterBody;
-import com.ruoyi.common.utils.StringUtils;
+
 import com.ruoyi.framework.web.service.SysRegisterService;
 import com.ruoyi.system.service.ISysConfigService;
 import org.springframework.beans.factory.annotation.Autowired;

bd-park/park-backend/park-application/src/main/java/com/huashe/park/application/web/controller/system/SysRoleController.java

@@ -1,15 +1,16 @@
 package com.huashe.park.application.web.controller.system;
 
+import com.huashe.common.utils.StringUtils;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
+import com.huashe.common.domain.AjaxResult;
 import com.ruoyi.common.core.domain.entity.SysDept;
 import com.ruoyi.common.core.domain.entity.SysRole;
 import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.core.domain.model.LoginUser;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.common.utils.StringUtils;
+
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.framework.web.service.SysPermissionService;
 import com.ruoyi.framework.web.service.TokenService;

bd-park/park-backend/park-application/src/main/java/com/huashe/park/application/web/controller/system/SysUserController.java

@@ -1,15 +1,16 @@
 package com.huashe.park.application.web.controller.system;
 
+import com.huashe.common.utils.StringUtils;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
+import com.huashe.common.domain.AjaxResult;
 import com.ruoyi.common.core.domain.entity.SysDept;
 import com.ruoyi.common.core.domain.entity.SysRole;
 import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.SecurityUtils;
-import com.ruoyi.common.utils.StringUtils;
+
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.system.service.ISysDeptService;
 import com.ruoyi.system.service.ISysPostService;

bd-park/park-backend/park-application/src/main/java/com/huashe/park/application/web/controller/tool/TestController.java

@@ -1,8 +1,9 @@
 package com.huashe.park.application.web.controller.tool;
 
+import com.huashe.common.utils.StringUtils;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.R;
-import com.ruoyi.common.utils.StringUtils;
+
 import io.swagger.annotations.*;
 import org.springframework.web.bind.annotation.*;
 

bd-park/park-backend/park-core/pom.xml

@@ -48,15 +48,9 @@
         </dependency>
 
         <dependency>
-            <groupId>com.huashe.application</groupId>
-            <artifactId>ruoyi-common</artifactId>
-            <version>${ruoyi.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>com.huashe.application</groupId>
-            <artifactId>ruoyi-quartz</artifactId>
-            <version>${ruoyi.version}</version>
+            <groupId>com.huashe.common</groupId>
+            <artifactId>prod-commons</artifactId>
+            <version>${prod-commons.version}</version>
         </dependency>
         <dependency>
             <groupId>com.huashe.park</groupId>

bd-park/park-backend/park-core/src/main/java/com/huashe/park/core/service/impl/BdDevcTrailServiceImpl.java

@@ -4,7 +4,6 @@ package com.huashe.park.core.service.impl;
 import com.huashe.park.core.mapper.BdDevcTrailMapper;
 import com.huashe.park.core.service.IBdDevcTrailService;
 import com.huashe.park.domain.entity.BdDevcTrail;
-import com.ruoyi.common.utils.DateUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -55,7 +54,6 @@ public class BdDevcTrailServiceImpl implements IBdDevcTrailService
     @Override
     public int insertBdDevcTrail(BdDevcTrail bdDevcTrail)
     {
-        bdDevcTrail.setCreateTime(DateUtils.getNowDate());
         return bdDevcTrailMapper.insertBdDevcTrail(bdDevcTrail);
     }
 
@@ -68,7 +66,6 @@ public class BdDevcTrailServiceImpl implements IBdDevcTrailService
     @Override
     public int updateBdDevcTrail(BdDevcTrail bdDevcTrail)
     {
-        bdDevcTrail.setUpdateTime(DateUtils.getNowDate());
         return bdDevcTrailMapper.updateBdDevcTrail(bdDevcTrail);
     }
 

bd-park/park-backend/park-core/src/main/java/com/huashe/park/core/service/impl/BdDevcTrailUwbServiceImpl.java

@@ -5,7 +5,6 @@ import com.huashe.park.core.mapper.BdDevcTrailUwbMapper;
 import com.huashe.park.core.service.IBdDevcTrailUwbService;
 import com.huashe.park.domain.entity.BdDevcTrailUwb;
 import com.huashe.park.infrastructure.uwb.UWBWebService;
-import com.ruoyi.common.utils.DateUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -57,7 +56,6 @@ public class BdDevcTrailUwbServiceImpl implements IBdDevcTrailUwbService {
      */
     @Override
     public int insertBdDevcTrailUwb(BdDevcTrailUwb bdDevcTrailUwb) {
-        bdDevcTrailUwb.setCreateTime(DateUtils.getNowDate());
         return bdDevcTrailUwbMapper.insertBdDevcTrailUwb(bdDevcTrailUwb);
     }
 
@@ -69,7 +67,6 @@ public class BdDevcTrailUwbServiceImpl implements IBdDevcTrailUwbService {
      */
     @Override
     public int updateBdDevcTrailUwb(BdDevcTrailUwb bdDevcTrailUwb) {
-        bdDevcTrailUwb.setUpdateTime(DateUtils.getNowDate());
         return bdDevcTrailUwbMapper.updateBdDevcTrailUwb(bdDevcTrailUwb);
     }
 

bd-park/park-backend/park-core/src/main/java/com/huashe/park/core/service/impl/BdFenceInfoServiceImpl.java

@@ -5,7 +5,6 @@ import com.huashe.park.common.geo.GeoUtils;
 import com.huashe.park.core.mapper.BdFenceInfoMapper;
 import com.huashe.park.core.service.IBdFenceInfoService;
 import com.huashe.park.domain.entity.BdFenceInfo;
-import com.ruoyi.common.utils.DateUtils;
 import org.locationtech.jts.geom.Point;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -53,7 +52,6 @@ public class BdFenceInfoServiceImpl implements IBdFenceInfoService {
      */
     @Override
     public int insertBdFenceInfo(BdFenceInfo bdFenceInfo) {
-        bdFenceInfo.setCreateTime(DateUtils.getNowDate());
         Point polyCenter = GeoUtils.getPolyCenter(bdFenceInfo.getPoly());
         bdFenceInfo.setCenterLat(polyCenter.getY());
         bdFenceInfo.setCenterLng(polyCenter.getX());
@@ -68,7 +66,6 @@ public class BdFenceInfoServiceImpl implements IBdFenceInfoService {
      */
     @Override
     public int updateBdFenceInfo(BdFenceInfo bdFenceInfo) {
-        bdFenceInfo.setUpdateTime(DateUtils.getNowDate());
         Point polyCenter = GeoUtils.getPolyCenter(bdFenceInfo.getPoly());
         bdFenceInfo.setCenterLat(polyCenter.getY());
         bdFenceInfo.setCenterLng(polyCenter.getX());

bd-park/park-backend/park-core/src/main/java/com/huashe/park/core/service/impl/BdFenceVioEvtServiceImpl.java

@@ -4,7 +4,6 @@ package com.huashe.park.core.service.impl;
 import com.huashe.park.core.mapper.BdFenceVioEvtMapper;
 import com.huashe.park.core.service.IBdFenceVioEvtService;
 import com.huashe.park.domain.entity.BdFenceVioEvt;
-import com.ruoyi.common.utils.DateUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -55,7 +54,6 @@ public class BdFenceVioEvtServiceImpl implements IBdFenceVioEvtService
     @Override
     public int insertBdFenceVioEvt(BdFenceVioEvt bdFenceVioEvt)
     {
-        bdFenceVioEvt.setCreateTime(DateUtils.getNowDate());
         return bdFenceVioEvtMapper.insertBdFenceVioEvt(bdFenceVioEvt);
     }
 
@@ -68,7 +66,6 @@ public class BdFenceVioEvtServiceImpl implements IBdFenceVioEvtService
     @Override
     public int updateBdFenceVioEvt(BdFenceVioEvt bdFenceVioEvt)
     {
-        bdFenceVioEvt.setUpdateTime(DateUtils.getNowDate());
         return bdFenceVioEvtMapper.updateBdFenceVioEvt(bdFenceVioEvt);
     }
 

bd-park/park-backend/park-core/src/main/java/com/huashe/park/core/service/impl/ParkAttendGroupUsrServiceImpl.java

@@ -3,7 +3,6 @@ package com.huashe.park.core.service.impl;
 import com.huashe.park.core.mapper.ParkAttendGroupUsrMapper;
 import com.huashe.park.core.service.IParkAttendGroupUsrService;
 import com.huashe.park.domain.entity.ParkAttendGroupUsr;
-import com.ruoyi.common.utils.DateUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -66,7 +65,6 @@ public class ParkAttendGroupUsrServiceImpl implements IParkAttendGroupUsrService
      */
     @Override
     public int updateParkAttendGroupUsr(ParkAttendGroupUsr parkAttendGroupUsr) {
-        parkAttendGroupUsr.setUpdateTime(DateUtils.getNowDate());
         return parkAttendGroupUsrMapper.updateParkAttendGroupUsr(parkAttendGroupUsr);
     }
 

bd-park/park-backend/park-core/src/main/java/com/huashe/park/core/service/impl/ParkAttendUsrDetailServiceImpl.java

@@ -5,7 +5,6 @@ import java.util.List;
 import com.huashe.park.core.mapper.ParkAttendUsrDetailMapper;
 import com.huashe.park.core.service.IParkAttendUsrDetailService;
 import com.huashe.park.domain.entity.ParkAttendUsrDetail;
-import com.ruoyi.common.utils.DateUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -50,7 +49,6 @@ public class ParkAttendUsrDetailServiceImpl implements IParkAttendUsrDetailServi
      */
     @Override
     public int insertParkAttendUsrDetail(ParkAttendUsrDetail parkAttendUsrDetail) {
-        parkAttendUsrDetail.setCreateTime(DateUtils.getNowDate());
         return parkAttendUsrDetailMapper.insertParkAttendUsrDetail(parkAttendUsrDetail);
     }
 
@@ -62,7 +60,6 @@ public class ParkAttendUsrDetailServiceImpl implements IParkAttendUsrDetailServi
      */
     @Override
     public int updateParkAttendUsrDetail(ParkAttendUsrDetail parkAttendUsrDetail) {
-        parkAttendUsrDetail.setUpdateTime(DateUtils.getNowDate());
         return parkAttendUsrDetailMapper.updateParkAttendUsrDetail(parkAttendUsrDetail);
     }
 

bd-park/park-backend/park-core/src/main/java/com/huashe/park/core/service/impl/ParkInspectProjServiceImpl.java

@@ -5,7 +5,6 @@ import java.util.List;
 import com.huashe.park.core.mapper.ParkInspectProjMapper;
 import com.huashe.park.core.service.IParkInspectProjService;
 import com.huashe.park.domain.entity.ParkInspectProj;
-import com.ruoyi.common.utils.DateUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -54,7 +53,6 @@ public class ParkInspectProjServiceImpl implements IParkInspectProjService
     @Override
     public int insertParkInspectProj(ParkInspectProj parkInspectProj)
     {
-        parkInspectProj.setCreateTime(DateUtils.getNowDate());
         return parkInspectProjMapper.insertParkInspectProj(parkInspectProj);
     }
 
@@ -67,7 +65,6 @@ public class ParkInspectProjServiceImpl implements IParkInspectProjService
     @Override
     public int updateParkInspectProj(ParkInspectProj parkInspectProj)
     {
-        parkInspectProj.setUpdateTime(DateUtils.getNowDate());
         return parkInspectProjMapper.updateParkInspectProj(parkInspectProj);
     }
 

bd-park/park-backend/park-core/src/main/java/com/huashe/park/core/service/impl/ParkInspectTaskServiceImpl.java

@@ -5,7 +5,6 @@ import java.util.List;
 import com.huashe.park.core.mapper.ParkInspectTaskMapper;
 import com.huashe.park.core.service.IParkInspectTaskService;
 import com.huashe.park.domain.entity.ParkInspectTask;
-import com.ruoyi.common.utils.DateUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -50,7 +49,6 @@ public class ParkInspectTaskServiceImpl implements IParkInspectTaskService {
      */
     @Override
     public int insertParkInspectTask(ParkInspectTask parkInspectTask) {
-        parkInspectTask.setCreateTime(DateUtils.getNowDate());
         return parkInspectTaskMapper.insertParkInspectTask(parkInspectTask);
     }
 
@@ -62,7 +60,6 @@ public class ParkInspectTaskServiceImpl implements IParkInspectTaskService {
      */
     @Override
     public int updateParkInspectTask(ParkInspectTask parkInspectTask) {
-        parkInspectTask.setUpdateTime(DateUtils.getNowDate());
         return parkInspectTaskMapper.updateParkInspectTask(parkInspectTask);
     }
 

bd-park/park-backend/park-core/src/main/java/com/huashe/park/core/service/impl/ParkInspectTaskUsrTrailServiceImpl.java

@@ -3,7 +3,6 @@ package com.huashe.park.core.service.impl;
 import com.huashe.park.core.mapper.ParkInspectTaskUsrTrailMapper;
 import com.huashe.park.core.service.IParkInspectTaskUsrTrailService;
 import com.huashe.park.domain.entity.ParkInspectTaskUsrTrail;
-import com.ruoyi.common.utils.DateUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -50,7 +49,6 @@ public class ParkInspectTaskUsrTrailServiceImpl implements IParkInspectTaskUsrTr
      */
     @Override
     public int insertParkInspectTaskUsrTrail(ParkInspectTaskUsrTrail parkInspectTaskUsrTrail) {
-        parkInspectTaskUsrTrail.setCreateTime(DateUtils.getNowDate());
         return parkInspectTaskUsrTrailMapper.insertParkInspectTaskUsrTrail(parkInspectTaskUsrTrail);
     }
 
@@ -62,7 +60,6 @@ public class ParkInspectTaskUsrTrailServiceImpl implements IParkInspectTaskUsrTr
      */
     @Override
     public int updateParkInspectTaskUsrTrail(ParkInspectTaskUsrTrail parkInspectTaskUsrTrail) {
-        parkInspectTaskUsrTrail.setUpdateTime(DateUtils.getNowDate());
         return parkInspectTaskUsrTrailMapper.updateParkInspectTaskUsrTrail(parkInspectTaskUsrTrail);
     }
 

bd-park/park-backend/park-domain/pom.xml

@@ -26,8 +26,9 @@
         </dependency>
         <!-- 通用工具-->
         <dependency>
-            <groupId>com.huashe.application</groupId>
-            <artifactId>ruoyi-common</artifactId>
+            <groupId>com.huashe.common</groupId>
+            <artifactId>prod-commons</artifactId>
+            <version>${prod-commons.version}</version>
         </dependency>
         <dependency>
             <groupId>org.locationtech.jts</groupId>

bd-park/park-backend/park-domain/src/main/java/com/huashe/park/domain/entity/BdDevcTrail.java

@@ -1,7 +1,7 @@
 package com.huashe.park.domain.entity;
 
-import com.ruoyi.common.annotation.Excel;
-import com.ruoyi.common.core.domain.BaseEntity;
+import com.huashe.common.annotation.Excel;
+import com.huashe.common.domain.BaseEntity;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 

bd-park/park-backend/park-domain/src/main/java/com/huashe/park/domain/entity/BdDevcTrailUwb.java

@@ -1,7 +1,7 @@
 package com.huashe.park.domain.entity;
 
-import com.ruoyi.common.annotation.Excel;
-import com.ruoyi.common.core.domain.BaseEntity;
+import com.huashe.common.annotation.Excel;
+import com.huashe.common.domain.BaseEntity;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 

bd-park/park-backend/park-domain/src/main/java/com/huashe/park/domain/entity/BdFenceInfo.java

@@ -1,7 +1,8 @@
 package com.huashe.park.domain.entity;
 
-import com.ruoyi.common.annotation.Excel;
-import com.ruoyi.common.core.domain.BaseEntity;
+
+import com.huashe.common.annotation.Excel;
+import com.huashe.common.domain.BaseEntity;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.locationtech.jts.geom.Polygon;

bd-park/park-backend/park-domain/src/main/java/com/huashe/park/domain/entity/BdFenceVioEvt.java

@@ -1,7 +1,7 @@
 package com.huashe.park.domain.entity;
 
-import com.ruoyi.common.annotation.Excel;
-import com.ruoyi.common.core.domain.BaseEntity;
+import com.huashe.common.annotation.Excel;
+import com.huashe.common.domain.BaseEntity;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 

bd-park/park-backend/park-domain/src/main/java/com/huashe/park/domain/entity/ParkAttendGroup.java

@@ -1,8 +1,8 @@
 package com.huashe.park.domain.entity;
 
 import com.alibaba.fastjson2.JSONArray;
-import com.ruoyi.common.annotation.Excel;
-import com.ruoyi.common.core.domain.BaseEntity;
+import com.huashe.common.annotation.Excel;
+import com.huashe.common.domain.BaseEntity;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 

bd-park/park-backend/park-domain/src/main/java/com/huashe/park/domain/entity/ParkAttendGroupUsr.java

@@ -1,7 +1,7 @@
 package com.huashe.park.domain.entity;
 
-import com.ruoyi.common.annotation.Excel;
-import com.ruoyi.common.core.domain.BaseEntity;
+import com.huashe.common.annotation.Excel;
+import com.huashe.common.domain.BaseEntity;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 

bd-park/park-backend/park-domain/src/main/java/com/huashe/park/domain/entity/ParkAttendUsrDetail.java

@@ -1,8 +1,8 @@
 package com.huashe.park.domain.entity;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.ruoyi.common.annotation.Excel;
-import com.ruoyi.common.core.domain.BaseEntity;
+import com.huashe.common.annotation.Excel;
+import com.huashe.common.domain.BaseEntity;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 

bd-park/park-backend/park-domain/src/main/java/com/huashe/park/domain/entity/ParkInspectProj.java

@@ -1,8 +1,8 @@
 package com.huashe.park.domain.entity;
 
 import com.alibaba.fastjson2.JSONArray;
-import com.ruoyi.common.annotation.Excel;
-import com.ruoyi.common.core.domain.BaseEntity;
+import com.huashe.common.annotation.Excel;
+import com.huashe.common.domain.BaseEntity;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 

bd-park/park-backend/park-domain/src/main/java/com/huashe/park/domain/entity/ParkInspectTask.java

@@ -2,8 +2,8 @@ package com.huashe.park.domain.entity;
 
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import com.ruoyi.common.annotation.Excel;
-import com.ruoyi.common.core.domain.BaseEntity;
+import com.huashe.common.annotation.Excel;
+import com.huashe.common.domain.BaseEntity;
 
 /**
  * 巡检任务对象 park_inspect_task

bd-park/park-backend/park-domain/src/main/java/com/huashe/park/domain/entity/ParkInspectTaskUsrTrail.java

@@ -2,9 +2,8 @@ package com.huashe.park.domain.entity;
 
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import com.ruoyi.common.annotation.Excel;
-import com.ruoyi.common.core.domain.BaseEntity;
-
+import com.huashe.common.annotation.Excel;
+import com.huashe.common.domain.BaseEntity;
 /**
  * 巡检轨迹对象 park_inspect_task_usr_trail
  * 

bd-park/park-backend/park-infrastructure/pom.xml

@@ -25,6 +25,10 @@
             <groupId>com.dtflys.forest</groupId>
             <artifactId>forest-spring-boot-starter</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-autoconfigure</artifactId>
+        </dependency>
     </dependencies>
 
 </project>

bd-park/park-backend/park-infrastructure/src/main/java/com/huashe/park/infrastructure/cfg/forest/UWBCfg.java

@@ -6,6 +6,7 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.context.annotation.Configuration;
 
+
 @Configuration
 @ConfigurationProperties(prefix = "forest.custom.uwb")
 @ConditionalOnProperty(name = "forest.custom.uwb.enabled", havingValue = "true")

bd-park/park-backend/pom.xml

@@ -47,6 +47,7 @@
         <park.version>1.0-SNAPSHOT</park.version>
         <java.ws.version>1.5.2</java.ws.version>
         <hutool.version>5.8.26</hutool.version>
+        <prod-commons.version>1.0-SNAPSHOT</prod-commons.version>
     </properties>
 
     <!-- 依赖声明 -->