From 78515395d832445e5423895caaab21195cc12ac3 Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期二, 20 九月 2022 16:31:56 +0800
Subject: [PATCH] 项目结构调整
---
ycl-common/src/main/java/com/ycl/service/user/impl/UmsRoleServiceImpl.java | 18
ycl-platform/src/main/java/com/ycl/controller/user/UmsAdminController.java | 8
ycl-common/src/main/resources/mapper/user/UmsDepartManageMapper.xml | 4
ycl-common/src/main/resources/mapper/depart/UmsDepartMapper.xml | 4
ycl-platform/src/main/java/com/ycl/entity/portal/ThirdApplications.java | 4
ycl-platform/src/main/java/com/ycl/service/dict/impl/DatabaseDictionaryServiceImpl.java | 13
ycl-platform/src/main/java/com/ycl/controller/user/UmsRoleController.java | 8
ycl-platform/src/main/java/com/ycl/entity/portal/WebsiteLogo.java | 4
ycl-platform/src/main/java/com/ycl/service/zf/IVideowarmEventsreportService.java | 9
ycl-platform/src/main/resources/mapper/region/SccgRegionMapper.xml | 4
ycl-platform/src/main/java/com/ycl/service/portal/impl/UmsWebsiteLogoServiceImpl.java | 20 +
ycl-common/src/main/java/com/ycl/mapper/user/UmsMenuMapper.java | 4
ycl-platform/src/main/java/com/ycl/mapper/region/SccgRegionMapper.java | 4
ycl-common/src/main/resources/mapper/user/UmsRoleResourceRelationMapper.xml | 4
ycl-platform/src/main/java/com/ycl/controller/portal/UmsWebsitePortalController.java | 34 +-
ycl-common/src/main/java/com/ycl/service/user/impl/UmsResourceCategoryServiceImpl.java | 8
ycl-common/src/main/java/com/ycl/mapper/user/UmsRoleResourceRelationMapper.java | 4
ycl-common/src/main/java/com/ycl/entity/user/UmsAdmin.java | 2
ycl-common/src/main/java/com/ycl/service/user/UmsRoleResourceRelationService.java | 4
ycl-platform/src/main/java/com/ycl/controller/store/StoreScoreRuleController.java | 4
ycl-platform/src/main/resources/mapper/store/UmsStoreInfoMapper.xml | 4
ycl-common/src/main/java/com/ycl/service/user/UmsRoleMenuRelationService.java | 4
ycl-platform/src/main/resources/mapper/zf/VideowarmEventsreportMapper.xml | 46 ++
ycl-common/src/main/java/com/ycl/entity/user/UmsMenu.java | 2
ycl-common/src/main/java/com/ycl/service/user/UmsDepartManageService.java | 4
ycl-platform/src/main/java/com/ycl/entity/zf/VideoWarnEventsReport.java | 30
ycl-platform/src/main/java/com/ycl/mapper/zf/EnforcelawReportMapper.java | 8
ycl-common/src/main/java/com/ycl/service/user/impl/UmsAdminServiceImpl.java | 32
ycl-platform/src/main/resources/mapper/portal/UmsThirdApplicationsMapper.xml | 4
ycl-common/src/main/java/com/ycl/service/user/UmsResourceCategoryService.java | 4
ycl-platform/src/main/java/com/ycl/service/store/impl/StoreScoreRuleServiceImpl.java | 8
ycl-common/src/main/java/com/ycl/mapper/depart/UmsDepartMapper.java | 4
ycl-platform/src/main/java/com/ycl/entity/dict/DatabaseDictionary.java | 2
ycl-common/src/main/java/com/ycl/entity/user/UmsRoleMenuRelation.java | 2
ycl-common/src/main/java/com/ycl/service/user/UmsAdminService.java | 8
ycl-platform/src/main/java/com/ycl/service/region/ISccgRegionService.java | 4
ycl-common/src/main/java/com/ycl/mapper/user/UmsAdminMapper.java | 4
ycl-common/src/main/java/com/ycl/service/user/impl/UmsAdminRoleRelationServiceImpl.java | 8
ycl-common/src/main/java/com/ycl/mapper/user/UmsResourceMapper.java | 4
ycl-common/src/main/java/com/ycl/service/user/UmsMenuService.java | 4
ycl-common/src/main/java/com/ycl/mapper/user/UmsResourceCategoryMapper.java | 4
document/问题类型.xls | 0
ycl-common/src/main/java/com/ycl/service/user/UmsRoleService.java | 8
ycl-platform/src/main/java/com/ycl/controller/region/SccgRegionController.java | 4
ycl-platform/src/main/resources/mapper/portal/UmsWebsiteLogoMapper.xml | 4
ycl-common/src/main/java/com/ycl/service/user/impl/UmsResourceServiceImpl.java | 10
ycl-platform/src/main/java/com/ycl/config/YclSecurityConfig.java | 6
ycl-platform/src/main/java/com/ycl/service/portal/impl/UmsThirdApplicationsServiceImpl.java | 20 +
ycl-platform/src/main/java/com/ycl/mapper/zf/VideowarmEventsreportMapper.java | 9
ycl-common/src/main/java/com/ycl/service/user/impl/UmsRoleMenuRelationServiceImpl.java | 8
ycl-common/src/main/java/com/ycl/service/user/impl/UmsMenuServiceImpl.java | 8
ycl-platform/src/main/java/com/ycl/controller/user/UmsMenuController.java | 4
ycl-common/src/main/java/com/ycl/dto/UmsMenuNode.java | 2
ycl-common/src/main/java/com/ycl/entity/user/UmsRole.java | 2
ycl-common/src/main/java/com/ycl/entity/user/UmsDepartManage.java | 2
ycl-common/src/main/java/com/ycl/mapper/user/UmsDepartManageMapper.java | 4
ycl-platform/src/main/java/com/ycl/service/region/impl/SccgRegionServiceImpl.java | 10
ycl-common/src/main/java/com/ycl/service/user/UmsAdminRoleRelationService.java | 4
ycl-common/src/main/java/com/ycl/service/user/impl/UmsDepartManageServiceImpl.java | 16
ycl-common/src/main/resources/mapper/user/UmsAdminRoleRelationMapper.xml | 4
ycl-platform/src/main/java/com/ycl/service/zf/impl/EnforcelawReportServiceImpl.java | 14
ycl-common/src/main/resources/mapper/user/UmsAdminMapper.xml | 4
ycl-platform/src/main/java/com/ycl/service/zf/impl/VideowarmEventsreportServiceImpl.java | 13
ycl-common/src/main/resources/mapper/user/UmsAdminLoginLogMapper.xml | 4
ycl-platform/src/main/java/com/ycl/entity/zf/EnforceLawReport.java | 59 +-
ycl-common/src/main/java/com/ycl/mapper/user/UmsRoleMenuRelationMapper.java | 4
ycl-platform/src/main/java/com/ycl/controller/zf/ViolateRuleController.java | 2
ycl-common/src/main/java/com/ycl/entity/user/UmsResource.java | 2
ycl-platform/src/main/java/com/ycl/service/store/StoreInfoService.java | 4
ycl-common/src/main/java/com/ycl/entity/depart/UmsDepart.java | 2
ycl-common/src/main/java/com/ycl/entity/user/UmsRoleResourceRelation.java | 2
ycl-common/src/main/java/com/ycl/service/depart/UmsDepartService.java | 4
ycl-platform/src/main/java/com/ycl/mapper/store/StoreScoreRuleMapper.java | 4
ycl-platform/src/main/java/com/ycl/controller/user/UmsResourceCategoryController.java | 4
ycl-common/src/main/java/com/ycl/service/user/UmsAdminCacheService.java | 6
ycl-common/src/main/resources/mapper/user/UmsResourceMapper.xml | 8
ycl-platform/src/main/java/com/ycl/controller/zf/VideowarmEventsreportController.java | 22
ycl-platform/src/main/java/com/ycl/service/portal/UmsWebsiteLogoService.java | 16
ycl-platform/src/main/java/com/ycl/controller/dict/DatabaseDictionaryController.java | 4
ycl-platform/src/main/java/com/ycl/mapper/portal/UmsWebsiteLogoMapper.java | 16
ycl-platform/src/main/resources/mapper/zf/EnforcelawReportMapper.xml | 10
ycl-common/src/main/java/com/ycl/service/user/impl/UmsAdminCacheServiceImpl.java | 16
ycl-platform/src/main/java/com/ycl/controller/depart/DepartController.java | 6
ycl-common/src/main/java/com/ycl/entity/user/UmsResourceCategory.java | 2
ycl-common/src/main/java/com/ycl/service/user/UmsResourceService.java | 4
ycl-common/src/main/resources/mapper/user/UmsMenuMapper.xml | 8
ycl-platform/src/main/java/com/ycl/service/store/impl/StoreInfoServiceImpl.java | 10
ycl-common/src/main/java/com/ycl/service/depart/impl/UmsDepartServiceImpl.java | 14
ycl-platform/src/main/java/com/ycl/entity/store/StoreInfo.java | 22
ycl-platform/src/main/java/com/ycl/mapper/dict/DatabaseDictionaryMapper.java | 4
ycl-platform/src/main/java/com/ycl/mapper/portal/UmsThirdApplicationsMapper.java | 16
ycl-common/src/main/java/com/ycl/bo/AdminUserDetails.java | 4
ycl-platform/src/main/java/com/ycl/entity/store/StoreScoreRule.java | 2
ycl-platform/src/main/java/com/ycl/service/zf/IEnforcelawReportService.java | 8
ycl-platform/src/main/java/com/ycl/controller/zf/EnforcelawReportController.java | 18
ycl-generator/src/main/java/com/ycl/MysqlGenerator.java | 8
ycl-common/src/main/java/com/ycl/mapper/user/UmsAdminLoginLogMapper.java | 4
ycl-platform/src/main/java/com/ycl/service/portal/UmsThirdApplicationsService.java | 16
ycl-common/src/main/resources/mapper/user/UmsRoleMapper.xml | 6
ycl-platform/src/main/java/com/ycl/mapper/store/StoreInfoMapper.java | 4
/dev/null | 46 --
ycl-common/src/main/java/com/ycl/mapper/user/UmsAdminRoleRelationMapper.java | 4
ycl-common/src/main/java/com/ycl/service/user/impl/UmsRoleResourceRelationServiceImpl.java | 8
ycl-platform/src/main/java/com/ycl/service/dict/IDatabaseDictionaryService.java | 4
ycl-common/src/main/java/com/ycl/vo/zf/ZfVO.java | 2
ycl-platform/src/main/resources/mapper/dict/DatabaseDictionaryMapper.xml | 4
ycl-common/src/main/java/com/ycl/entity/user/vo/UmsMenuVo.java | 2
ycl-platform/src/main/java/com/ycl/controller/store/StoreInfoController.java | 14
ycl-common/src/main/java/com/ycl/entity/user/UmsAdminRoleRelation.java | 2
ycl-platform/src/main/java/com/ycl/controller/user/UmsResourceController.java | 4
ycl-platform/src/main/java/com/ycl/service/store/StoreScoreRuleService.java | 4
ycl-common/src/main/java/com/ycl/entity/user/UmsAdminLoginLog.java | 2
ycl-common/src/main/java/com/ycl/mapper/user/UmsRoleMapper.java | 4
ycl-common/src/main/resources/mapper/user/UmsRoleMenuRelationMapper.xml | 4
ycl-platform/src/main/java/com/ycl/entity/region/SccgRegion.java | 3
document/~$视频分析报警（2.X版）推送模块接口说明.docx | 0
ycl-common/src/main/resources/mapper/user/UmsResourceCategoryMapper.xml | 4
117 files changed, 532 insertions(+), 434 deletions(-)
diff --git "a/document/~$\350\247\206\351\242\221\345\210\206\346\236\220\346\212\245\350\255\246\357\274\2102.X\347\211\210\357\274\211\346\216\250\351\200\201\346\250\241\345\235\227\346\216\245\345\217\243\350\257\264\346\230\216.docx" "b/document/~$\350\247\206\351\242\221\345\210\206\346\236\220\346\212\245\350\255\246\357\274\2102.X\347\211\210\357\274\211\346\216\250\351\200\201\346\250\241\345\235\227\346\216\245\345\217\243\350\257\264\346\230\216.docx"
new file mode 100644
index 0000000..43cdad0
--- /dev/null
+++ "b/document/~$\350\247\206\351\242\221\345\210\206\346\236\220\346\212\245\350\255\246\357\274\2102.X\347\211\210\357\274\211\346\216\250\351\200\201\346\250\241\345\235\227\346\216\245\345\217\243\350\257\264\346\230\216.docx"
Binary files differ
diff --git "a/document/\351\227\256\351\242\230\347\261\273\345\236\213.xls" "b/document/\351\227\256\351\242\230\347\261\273\345\236\213.xls"
new file mode 100644
index 0000000..b1553dd
--- /dev/null
+++ "b/document/\351\227\256\351\242\230\347\261\273\345\236\213.xls"
Binary files differ
diff --git a/ycl-common/src/main/java/com/ycl/bo/AdminUserDetails.java b/ycl-common/src/main/java/com/ycl/bo/AdminUserDetails.java
index cb00fbd..b1a6671 100644
--- a/ycl-common/src/main/java/com/ycl/bo/AdminUserDetails.java
+++ b/ycl-common/src/main/java/com/ycl/bo/AdminUserDetails.java
@@ -1,7 +1,7 @@
package com.ycl.bo;
-import com.ycl.entity.platform.user.UmsAdmin;
-import com.ycl.entity.platform.user.UmsResource;
+import com.ycl.entity.user.UmsAdmin;
+import com.ycl.entity.user.UmsResource;
import org.springframework.security.core.GrantedAuthority;
import org.springframework.security.core.authority.SimpleGrantedAuthority;
import org.springframework.security.core.userdetails.UserDetails;
diff --git a/ycl-common/src/main/java/com/ycl/dto/UmsMenuNode.java b/ycl-common/src/main/java/com/ycl/dto/UmsMenuNode.java
index 999f615..0e80f38 100644
--- a/ycl-common/src/main/java/com/ycl/dto/UmsMenuNode.java
+++ b/ycl-common/src/main/java/com/ycl/dto/UmsMenuNode.java
@@ -1,6 +1,6 @@
package com.ycl.dto;
-import com.ycl.entity.platform.user.UmsMenu;
+import com.ycl.entity.user.UmsMenu;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.Setter;
diff --git a/ycl-common/src/main/java/com/ycl/entity/platform/depart/UmsDepart.java b/ycl-common/src/main/java/com/ycl/entity/depart/UmsDepart.java
similarity index 97%
rename from ycl-common/src/main/java/com/ycl/entity/platform/depart/UmsDepart.java
rename to ycl-common/src/main/java/com/ycl/entity/depart/UmsDepart.java
index eb2cdd7..1d38845 100644
--- a/ycl-common/src/main/java/com/ycl/entity/platform/depart/UmsDepart.java
+++ b/ycl-common/src/main/java/com/ycl/entity/depart/UmsDepart.java
@@ -1,4 +1,4 @@
-package com.ycl.entity.platform.depart;
+package com.ycl.entity.depart;
import com.baomidou.mybatisplus.annotation.*;
import com.ycl.api.BaseEntity;
diff --git a/ycl-common/src/main/java/com/ycl/entity/platform/user/UmsAdmin.java b/ycl-common/src/main/java/com/ycl/entity/user/UmsAdmin.java
similarity index 97%
rename from ycl-common/src/main/java/com/ycl/entity/platform/user/UmsAdmin.java
rename to ycl-common/src/main/java/com/ycl/entity/user/UmsAdmin.java
index 80a1abc..9b8376d 100644
--- a/ycl-common/src/main/java/com/ycl/entity/platform/user/UmsAdmin.java
+++ b/ycl-common/src/main/java/com/ycl/entity/user/UmsAdmin.java
@@ -1,4 +1,4 @@
-package com.ycl.entity.platform.user;
+package com.ycl.entity.user;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
diff --git a/ycl-common/src/main/java/com/ycl/entity/platform/user/UmsAdminLoginLog.java b/ycl-common/src/main/java/com/ycl/entity/user/UmsAdminLoginLog.java
similarity index 96%
rename from ycl-common/src/main/java/com/ycl/entity/platform/user/UmsAdminLoginLog.java
rename to ycl-common/src/main/java/com/ycl/entity/user/UmsAdminLoginLog.java
index 8131834..8ee790a 100644
--- a/ycl-common/src/main/java/com/ycl/entity/platform/user/UmsAdminLoginLog.java
+++ b/ycl-common/src/main/java/com/ycl/entity/user/UmsAdminLoginLog.java
@@ -1,4 +1,4 @@
-package com.ycl.entity.platform.user;
+package com.ycl.entity.user;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
diff --git a/ycl-common/src/main/java/com/ycl/entity/platform/user/UmsAdminRoleRelation.java b/ycl-common/src/main/java/com/ycl/entity/user/UmsAdminRoleRelation.java
similarity index 95%
rename from ycl-common/src/main/java/com/ycl/entity/platform/user/UmsAdminRoleRelation.java
rename to ycl-common/src/main/java/com/ycl/entity/user/UmsAdminRoleRelation.java
index 4179857..9d0f1f9 100644
--- a/ycl-common/src/main/java/com/ycl/entity/platform/user/UmsAdminRoleRelation.java
+++ b/ycl-common/src/main/java/com/ycl/entity/user/UmsAdminRoleRelation.java
@@ -1,4 +1,4 @@
-package com.ycl.entity.platform.user;
+package com.ycl.entity.user;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
diff --git a/ycl-common/src/main/java/com/ycl/entity/platform/user/UmsDepartManage.java b/ycl-common/src/main/java/com/ycl/entity/user/UmsDepartManage.java
similarity index 94%
rename from ycl-common/src/main/java/com/ycl/entity/platform/user/UmsDepartManage.java
rename to ycl-common/src/main/java/com/ycl/entity/user/UmsDepartManage.java
index 2caf06e..09ffb0a 100644
--- a/ycl-common/src/main/java/com/ycl/entity/platform/user/UmsDepartManage.java
+++ b/ycl-common/src/main/java/com/ycl/entity/user/UmsDepartManage.java
@@ -1,4 +1,4 @@
-package com.ycl.entity.platform.user;
+package com.ycl.entity.user;
import com.baomidou.mybatisplus.annotation.TableName;
import com.ycl.api.BaseEntity;
diff --git a/ycl-common/src/main/java/com/ycl/entity/platform/user/UmsMenu.java b/ycl-common/src/main/java/com/ycl/entity/user/UmsMenu.java
similarity index 97%
rename from ycl-common/src/main/java/com/ycl/entity/platform/user/UmsMenu.java
rename to ycl-common/src/main/java/com/ycl/entity/user/UmsMenu.java
index 6334521..7bd5278 100644
--- a/ycl-common/src/main/java/com/ycl/entity/platform/user/UmsMenu.java
+++ b/ycl-common/src/main/java/com/ycl/entity/user/UmsMenu.java
@@ -1,4 +1,4 @@
-package com.ycl.entity.platform.user;
+package com.ycl.entity.user;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
diff --git a/ycl-common/src/main/java/com/ycl/entity/platform/user/UmsResource.java b/ycl-common/src/main/java/com/ycl/entity/user/UmsResource.java
similarity index 96%
rename from ycl-common/src/main/java/com/ycl/entity/platform/user/UmsResource.java
rename to ycl-common/src/main/java/com/ycl/entity/user/UmsResource.java
index 7930f74..021743d 100644
--- a/ycl-common/src/main/java/com/ycl/entity/platform/user/UmsResource.java
+++ b/ycl-common/src/main/java/com/ycl/entity/user/UmsResource.java
@@ -1,4 +1,4 @@
-package com.ycl.entity.platform.user;
+package com.ycl.entity.user;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
diff --git a/ycl-common/src/main/java/com/ycl/entity/platform/user/UmsResourceCategory.java b/ycl-common/src/main/java/com/ycl/entity/user/UmsResourceCategory.java
similarity index 96%
rename from ycl-common/src/main/java/com/ycl/entity/platform/user/UmsResourceCategory.java
rename to ycl-common/src/main/java/com/ycl/entity/user/UmsResourceCategory.java
index eb61c32..facfe93 100644
--- a/ycl-common/src/main/java/com/ycl/entity/platform/user/UmsResourceCategory.java
+++ b/ycl-common/src/main/java/com/ycl/entity/user/UmsResourceCategory.java
@@ -1,4 +1,4 @@
-package com.ycl.entity.platform.user;
+package com.ycl.entity.user;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
diff --git a/ycl-common/src/main/java/com/ycl/entity/platform/user/UmsRole.java b/ycl-common/src/main/java/com/ycl/entity/user/UmsRole.java
similarity index 96%
rename from ycl-common/src/main/java/com/ycl/entity/platform/user/UmsRole.java
rename to ycl-common/src/main/java/com/ycl/entity/user/UmsRole.java
index 14565d1..49cbd8f 100644
--- a/ycl-common/src/main/java/com/ycl/entity/platform/user/UmsRole.java
+++ b/ycl-common/src/main/java/com/ycl/entity/user/UmsRole.java
@@ -1,4 +1,4 @@
-package com.ycl.entity.platform.user;
+package com.ycl.entity.user;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
diff --git a/ycl-common/src/main/java/com/ycl/entity/platform/user/UmsRoleMenuRelation.java b/ycl-common/src/main/java/com/ycl/entity/user/UmsRoleMenuRelation.java
similarity index 95%
rename from ycl-common/src/main/java/com/ycl/entity/platform/user/UmsRoleMenuRelation.java
rename to ycl-common/src/main/java/com/ycl/entity/user/UmsRoleMenuRelation.java
index 60a1c20..17c2df6 100644
--- a/ycl-common/src/main/java/com/ycl/entity/platform/user/UmsRoleMenuRelation.java
+++ b/ycl-common/src/main/java/com/ycl/entity/user/UmsRoleMenuRelation.java
@@ -1,4 +1,4 @@
-package com.ycl.entity.platform.user;
+package com.ycl.entity.user;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
diff --git a/ycl-common/src/main/java/com/ycl/entity/platform/user/UmsRoleResourceRelation.java b/ycl-common/src/main/java/com/ycl/entity/user/UmsRoleResourceRelation.java
similarity index 95%
rename from ycl-common/src/main/java/com/ycl/entity/platform/user/UmsRoleResourceRelation.java
rename to ycl-common/src/main/java/com/ycl/entity/user/UmsRoleResourceRelation.java
index 3fe0ee1..caf8337 100644
--- a/ycl-common/src/main/java/com/ycl/entity/platform/user/UmsRoleResourceRelation.java
+++ b/ycl-common/src/main/java/com/ycl/entity/user/UmsRoleResourceRelation.java
@@ -1,4 +1,4 @@
-package com.ycl.entity.platform.user;
+package com.ycl.entity.user;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
diff --git a/ycl-common/src/main/java/com/ycl/entity/platform/user/vo/UmsMenuVo.java b/ycl-common/src/main/java/com/ycl/entity/user/vo/UmsMenuVo.java
similarity index 96%
rename from ycl-common/src/main/java/com/ycl/entity/platform/user/vo/UmsMenuVo.java
rename to ycl-common/src/main/java/com/ycl/entity/user/vo/UmsMenuVo.java
index 0a1c437..053a5cd 100644
--- a/ycl-common/src/main/java/com/ycl/entity/platform/user/vo/UmsMenuVo.java
+++ b/ycl-common/src/main/java/com/ycl/entity/user/vo/UmsMenuVo.java
@@ -1,4 +1,4 @@
-package com.ycl.entity.platform.user.vo;
+package com.ycl.entity.user.vo;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
diff --git a/ycl-common/src/main/java/com/ycl/mapper/platform/depart/UmsDepartMapper.java b/ycl-common/src/main/java/com/ycl/mapper/depart/UmsDepartMapper.java
similarity index 70%
rename from ycl-common/src/main/java/com/ycl/mapper/platform/depart/UmsDepartMapper.java
rename to ycl-common/src/main/java/com/ycl/mapper/depart/UmsDepartMapper.java
index 24f7907..dc615c7 100644
--- a/ycl-common/src/main/java/com/ycl/mapper/platform/depart/UmsDepartMapper.java
+++ b/ycl-common/src/main/java/com/ycl/mapper/depart/UmsDepartMapper.java
@@ -1,7 +1,7 @@
-package com.ycl.mapper.platform.depart;
+package com.ycl.mapper.depart;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.ycl.entity.platform.depart.UmsDepart;
+import com.ycl.entity.depart.UmsDepart;
/**
* <p>
diff --git a/ycl-common/src/main/java/com/ycl/mapper/platform/portal/UmsThirdApplicationsMapper.java b/ycl-common/src/main/java/com/ycl/mapper/platform/portal/UmsThirdApplicationsMapper.java
deleted file mode 100644
index 8aa45c0..0000000
--- a/ycl-common/src/main/java/com/ycl/mapper/platform/portal/UmsThirdApplicationsMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.ycl.mapper.platform.portal;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.ycl.entity.platform.portal.UmsThirdApplications;
-
-/**
- * <p>
- * Mapper 鎺ュ彛
- * </p>
- *
- * @author wl
- * @since 2022-09-08
- */
-public interface UmsThirdApplicationsMapper extends BaseMapper<UmsThirdApplications> {
-
-}
diff --git a/ycl-common/src/main/java/com/ycl/mapper/platform/portal/UmsWebsiteLogoMapper.java b/ycl-common/src/main/java/com/ycl/mapper/platform/portal/UmsWebsiteLogoMapper.java
deleted file mode 100644
index 6957fc8..0000000
--- a/ycl-common/src/main/java/com/ycl/mapper/platform/portal/UmsWebsiteLogoMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.ycl.mapper.platform.portal;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.ycl.entity.platform.portal.UmsWebsiteLogo;
-
-/**
- * <p>
- * Mapper 鎺ュ彛
- * </p>
- *
- * @author wl
- * @since 2022-09-07
- */
-public interface UmsWebsiteLogoMapper extends BaseMapper<UmsWebsiteLogo> {
-
-}
diff --git a/ycl-common/src/main/java/com/ycl/mapper/platform/user/UmsAdminLoginLogMapper.java b/ycl-common/src/main/java/com/ycl/mapper/user/UmsAdminLoginLogMapper.java
similarity index 69%
rename from ycl-common/src/main/java/com/ycl/mapper/platform/user/UmsAdminLoginLogMapper.java
rename to ycl-common/src/main/java/com/ycl/mapper/user/UmsAdminLoginLogMapper.java
index 0fdbc56..032973c 100644
--- a/ycl-common/src/main/java/com/ycl/mapper/platform/user/UmsAdminLoginLogMapper.java
+++ b/ycl-common/src/main/java/com/ycl/mapper/user/UmsAdminLoginLogMapper.java
@@ -1,7 +1,7 @@
-package com.ycl.mapper.platform.user;
+package com.ycl.mapper.user;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.ycl.entity.platform.user.UmsAdminLoginLog;
+import com.ycl.entity.user.UmsAdminLoginLog;
/**
* <p>
diff --git a/ycl-common/src/main/java/com/ycl/mapper/platform/user/UmsAdminMapper.java b/ycl-common/src/main/java/com/ycl/mapper/user/UmsAdminMapper.java
similarity index 83%
rename from ycl-common/src/main/java/com/ycl/mapper/platform/user/UmsAdminMapper.java
rename to ycl-common/src/main/java/com/ycl/mapper/user/UmsAdminMapper.java
index 651c05a..13224f1 100644
--- a/ycl-common/src/main/java/com/ycl/mapper/platform/user/UmsAdminMapper.java
+++ b/ycl-common/src/main/java/com/ycl/mapper/user/UmsAdminMapper.java
@@ -1,7 +1,7 @@
-package com.ycl.mapper.platform.user;
+package com.ycl.mapper.user;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.ycl.entity.platform.user.UmsAdmin;
+import com.ycl.entity.user.UmsAdmin;
import org.apache.ibatis.annotations.Param;
import java.util.List;
diff --git a/ycl-common/src/main/java/com/ycl/mapper/platform/user/UmsAdminRoleRelationMapper.java b/ycl-common/src/main/java/com/ycl/mapper/user/UmsAdminRoleRelationMapper.java
similarity index 69%
rename from ycl-common/src/main/java/com/ycl/mapper/platform/user/UmsAdminRoleRelationMapper.java
rename to ycl-common/src/main/java/com/ycl/mapper/user/UmsAdminRoleRelationMapper.java
index 846b722..b8f06c7 100644
--- a/ycl-common/src/main/java/com/ycl/mapper/platform/user/UmsAdminRoleRelationMapper.java
+++ b/ycl-common/src/main/java/com/ycl/mapper/user/UmsAdminRoleRelationMapper.java
@@ -1,7 +1,7 @@
-package com.ycl.mapper.platform.user;
+package com.ycl.mapper.user;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.ycl.entity.platform.user.UmsAdminRoleRelation;
+import com.ycl.entity.user.UmsAdminRoleRelation;
/**
* <p>
diff --git a/ycl-common/src/main/java/com/ycl/mapper/platform/user/UmsDepartManageMapper.java b/ycl-common/src/main/java/com/ycl/mapper/user/UmsDepartManageMapper.java
similarity index 84%
rename from ycl-common/src/main/java/com/ycl/mapper/platform/user/UmsDepartManageMapper.java
rename to ycl-common/src/main/java/com/ycl/mapper/user/UmsDepartManageMapper.java
index beee100..7c8bffa 100644
--- a/ycl-common/src/main/java/com/ycl/mapper/platform/user/UmsDepartManageMapper.java
+++ b/ycl-common/src/main/java/com/ycl/mapper/user/UmsDepartManageMapper.java
@@ -1,7 +1,7 @@
-package com.ycl.mapper.platform.user;
+package com.ycl.mapper.user;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.ycl.entity.platform.user.UmsDepartManage;
+import com.ycl.entity.user.UmsDepartManage;
import org.apache.ibatis.annotations.Param;
import java.util.List;
diff --git a/ycl-common/src/main/java/com/ycl/mapper/platform/user/UmsMenuMapper.java b/ycl-common/src/main/java/com/ycl/mapper/user/UmsMenuMapper.java
similarity index 86%
rename from ycl-common/src/main/java/com/ycl/mapper/platform/user/UmsMenuMapper.java
rename to ycl-common/src/main/java/com/ycl/mapper/user/UmsMenuMapper.java
index 33e6f1c..a5fd464 100644
--- a/ycl-common/src/main/java/com/ycl/mapper/platform/user/UmsMenuMapper.java
+++ b/ycl-common/src/main/java/com/ycl/mapper/user/UmsMenuMapper.java
@@ -1,7 +1,7 @@
-package com.ycl.mapper.platform.user;
+package com.ycl.mapper.user;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.ycl.entity.platform.user.UmsMenu;
+import com.ycl.entity.user.UmsMenu;
import org.apache.ibatis.annotations.Param;
import java.util.List;
diff --git a/ycl-common/src/main/java/com/ycl/mapper/platform/user/UmsResourceCategoryMapper.java b/ycl-common/src/main/java/com/ycl/mapper/user/UmsResourceCategoryMapper.java
similarity index 71%
rename from ycl-common/src/main/java/com/ycl/mapper/platform/user/UmsResourceCategoryMapper.java
rename to ycl-common/src/main/java/com/ycl/mapper/user/UmsResourceCategoryMapper.java
index 838606f..2cbd932 100644
--- a/ycl-common/src/main/java/com/ycl/mapper/platform/user/UmsResourceCategoryMapper.java
+++ b/ycl-common/src/main/java/com/ycl/mapper/user/UmsResourceCategoryMapper.java
@@ -1,7 +1,7 @@
-package com.ycl.mapper.platform.user;
+package com.ycl.mapper.user;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.ycl.entity.platform.user.UmsResourceCategory;
+import com.ycl.entity.user.UmsResourceCategory;
/**
* <p>
diff --git a/ycl-common/src/main/java/com/ycl/mapper/platform/user/UmsResourceMapper.java b/ycl-common/src/main/java/com/ycl/mapper/user/UmsResourceMapper.java
similarity index 86%
rename from ycl-common/src/main/java/com/ycl/mapper/platform/user/UmsResourceMapper.java
rename to ycl-common/src/main/java/com/ycl/mapper/user/UmsResourceMapper.java
index 45b168f..5ef819d 100644
--- a/ycl-common/src/main/java/com/ycl/mapper/platform/user/UmsResourceMapper.java
+++ b/ycl-common/src/main/java/com/ycl/mapper/user/UmsResourceMapper.java
@@ -1,7 +1,7 @@
-package com.ycl.mapper.platform.user;
+package com.ycl.mapper.user;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.ycl.entity.platform.user.UmsResource;
+import com.ycl.entity.user.UmsResource;
import org.apache.ibatis.annotations.Param;
import java.util.List;
diff --git a/ycl-common/src/main/java/com/ycl/mapper/platform/user/UmsRoleMapper.java b/ycl-common/src/main/java/com/ycl/mapper/user/UmsRoleMapper.java
similarity index 82%
rename from ycl-common/src/main/java/com/ycl/mapper/platform/user/UmsRoleMapper.java
rename to ycl-common/src/main/java/com/ycl/mapper/user/UmsRoleMapper.java
index 5ecd2ea..877f65b 100644
--- a/ycl-common/src/main/java/com/ycl/mapper/platform/user/UmsRoleMapper.java
+++ b/ycl-common/src/main/java/com/ycl/mapper/user/UmsRoleMapper.java
@@ -1,7 +1,7 @@
-package com.ycl.mapper.platform.user;
+package com.ycl.mapper.user;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.ycl.entity.platform.user.UmsRole;
+import com.ycl.entity.user.UmsRole;
import org.apache.ibatis.annotations.Param;
import java.util.List;
diff --git a/ycl-common/src/main/java/com/ycl/mapper/platform/user/UmsRoleMenuRelationMapper.java b/ycl-common/src/main/java/com/ycl/mapper/user/UmsRoleMenuRelationMapper.java
similarity index 72%
rename from ycl-common/src/main/java/com/ycl/mapper/platform/user/UmsRoleMenuRelationMapper.java
rename to ycl-common/src/main/java/com/ycl/mapper/user/UmsRoleMenuRelationMapper.java
index ce29749..ba47f03 100644
--- a/ycl-common/src/main/java/com/ycl/mapper/platform/user/UmsRoleMenuRelationMapper.java
+++ b/ycl-common/src/main/java/com/ycl/mapper/user/UmsRoleMenuRelationMapper.java
@@ -1,7 +1,7 @@
-package com.ycl.mapper.platform.user;
+package com.ycl.mapper.user;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.ycl.entity.platform.user.UmsRoleMenuRelation;
+import com.ycl.entity.user.UmsRoleMenuRelation;
/**
* <p>
diff --git a/ycl-common/src/main/java/com/ycl/mapper/platform/user/UmsRoleResourceRelationMapper.java b/ycl-common/src/main/java/com/ycl/mapper/user/UmsRoleResourceRelationMapper.java
similarity index 72%
rename from ycl-common/src/main/java/com/ycl/mapper/platform/user/UmsRoleResourceRelationMapper.java
rename to ycl-common/src/main/java/com/ycl/mapper/user/UmsRoleResourceRelationMapper.java
index 1c603ca..b719f34 100644
--- a/ycl-common/src/main/java/com/ycl/mapper/platform/user/UmsRoleResourceRelationMapper.java
+++ b/ycl-common/src/main/java/com/ycl/mapper/user/UmsRoleResourceRelationMapper.java
@@ -1,7 +1,7 @@
-package com.ycl.mapper.platform.user;
+package com.ycl.mapper.user;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.ycl.entity.platform.user.UmsRoleResourceRelation;
+import com.ycl.entity.user.UmsRoleResourceRelation;
/**
* <p>
diff --git a/ycl-common/src/main/java/com/ycl/service/platform/depart/UmsDepartService.java b/ycl-common/src/main/java/com/ycl/service/depart/UmsDepartService.java
similarity index 91%
rename from ycl-common/src/main/java/com/ycl/service/platform/depart/UmsDepartService.java
rename to ycl-common/src/main/java/com/ycl/service/depart/UmsDepartService.java
index 4b8501f..06e0a45 100644
--- a/ycl-common/src/main/java/com/ycl/service/platform/depart/UmsDepartService.java
+++ b/ycl-common/src/main/java/com/ycl/service/depart/UmsDepartService.java
@@ -1,8 +1,8 @@
-package com.ycl.service.platform.depart;
+package com.ycl.service.depart;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
-import com.ycl.entity.platform.depart.UmsDepart;
+import com.ycl.entity.depart.UmsDepart;
import com.ycl.vo.depart.DepartVO;
import java.util.List;
diff --git a/ycl-common/src/main/java/com/ycl/service/platform/depart/impl/UmsDepartServiceImpl.java b/ycl-common/src/main/java/com/ycl/service/depart/impl/UmsDepartServiceImpl.java
similarity index 95%
rename from ycl-common/src/main/java/com/ycl/service/platform/depart/impl/UmsDepartServiceImpl.java
rename to ycl-common/src/main/java/com/ycl/service/depart/impl/UmsDepartServiceImpl.java
index 1b52a84..0d55321 100644
--- a/ycl-common/src/main/java/com/ycl/service/platform/depart/impl/UmsDepartServiceImpl.java
+++ b/ycl-common/src/main/java/com/ycl/service/depart/impl/UmsDepartServiceImpl.java
@@ -1,4 +1,4 @@
-package com.ycl.service.platform.depart.impl;
+package com.ycl.service.depart.impl;
import cn.hutool.core.collection.CollUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -6,14 +6,14 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ycl.dto.user.AdminDepartDTO;
-import com.ycl.entity.platform.depart.UmsDepart;
-import com.ycl.entity.platform.user.UmsDepartManage;
+import com.ycl.entity.depart.UmsDepart;
+import com.ycl.entity.user.UmsDepartManage;
import com.ycl.enums.common.ResultCode;
import com.ycl.exception.ApiException;
-import com.ycl.mapper.platform.depart.UmsDepartMapper;
-import com.ycl.service.platform.depart.UmsDepartService;
-import com.ycl.service.platform.user.UmsDepartManageService;
-import com.ycl.service.platform.user.UmsAdminService;
+import com.ycl.mapper.depart.UmsDepartMapper;
+import com.ycl.service.depart.UmsDepartService;
+import com.ycl.service.user.UmsDepartManageService;
+import com.ycl.service.user.UmsAdminService;
import com.ycl.utils.common.PojoUtils;
import com.ycl.vo.depart.DepartVO;
import org.apache.commons.lang3.StringUtils;
diff --git a/ycl-common/src/main/java/com/ycl/service/platform/portal/UmsThirdApplicationsService.java b/ycl-common/src/main/java/com/ycl/service/platform/portal/UmsThirdApplicationsService.java
deleted file mode 100644
index 088c63f..0000000
--- a/ycl-common/src/main/java/com/ycl/service/platform/portal/UmsThirdApplicationsService.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.ycl.service.platform.portal;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.ycl.entity.platform.portal.UmsThirdApplications;
-
-/**
- * <p>
- * 鏈嶅姟绫�
- * </p>
- *
- * @author wl
- * @since 2022-09-08
- */
-public interface UmsThirdApplicationsService extends IService<UmsThirdApplications> {
-
-}
diff --git a/ycl-common/src/main/java/com/ycl/service/platform/portal/UmsWebsiteLogoService.java b/ycl-common/src/main/java/com/ycl/service/platform/portal/UmsWebsiteLogoService.java
deleted file mode 100644
index b1939d9..0000000
--- a/ycl-common/src/main/java/com/ycl/service/platform/portal/UmsWebsiteLogoService.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.ycl.service.platform.portal;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.ycl.entity.platform.portal.UmsWebsiteLogo;
-
-/**
- * <p>
- * 鏈嶅姟绫�
- * </p>
- *
- * @author wl
- * @since 2022-09-07
- */
-public interface UmsWebsiteLogoService extends IService<UmsWebsiteLogo> {
-
-}
diff --git a/ycl-common/src/main/java/com/ycl/service/platform/portal/impl/UmsThirdApplicationsServiceImpl.java b/ycl-common/src/main/java/com/ycl/service/platform/portal/impl/UmsThirdApplicationsServiceImpl.java
deleted file mode 100644
index 501705a..0000000
--- a/ycl-common/src/main/java/com/ycl/service/platform/portal/impl/UmsThirdApplicationsServiceImpl.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.ycl.service.platform.portal.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ycl.entity.platform.portal.UmsThirdApplications;
-import com.ycl.mapper.platform.portal.UmsThirdApplicationsMapper;
-import com.ycl.service.platform.portal.UmsThirdApplicationsService;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * 鏈嶅姟瀹炵幇绫�
- * </p>
- *
- * @author wl
- * @since 2022-09-08
- */
-@Service
-public class UmsThirdApplicationsServiceImpl extends ServiceImpl<UmsThirdApplicationsMapper, UmsThirdApplications> implements UmsThirdApplicationsService {
-
-}
diff --git a/ycl-common/src/main/java/com/ycl/service/platform/portal/impl/UmsWebsiteLogoServiceImpl.java b/ycl-common/src/main/java/com/ycl/service/platform/portal/impl/UmsWebsiteLogoServiceImpl.java
deleted file mode 100644
index e34da2f..0000000
--- a/ycl-common/src/main/java/com/ycl/service/platform/portal/impl/UmsWebsiteLogoServiceImpl.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.ycl.service.platform.portal.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ycl.entity.platform.portal.UmsWebsiteLogo;
-import com.ycl.mapper.platform.portal.UmsWebsiteLogoMapper;
-import com.ycl.service.platform.portal.UmsWebsiteLogoService;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * 鏈嶅姟瀹炵幇绫�
- * </p>
- *
- * @author wl
- * @since 2022-09-07
- */
-@Service
-public class UmsWebsiteLogoServiceImpl extends ServiceImpl<UmsWebsiteLogoMapper, UmsWebsiteLogo> implements UmsWebsiteLogoService {
-
-}
diff --git a/ycl-common/src/main/java/com/ycl/service/platform/user/UmsAdminCacheService.java b/ycl-common/src/main/java/com/ycl/service/user/UmsAdminCacheService.java
similarity index 89%
rename from ycl-common/src/main/java/com/ycl/service/platform/user/UmsAdminCacheService.java
rename to ycl-common/src/main/java/com/ycl/service/user/UmsAdminCacheService.java
index 65e327e..37a26a1 100644
--- a/ycl-common/src/main/java/com/ycl/service/platform/user/UmsAdminCacheService.java
+++ b/ycl-common/src/main/java/com/ycl/service/user/UmsAdminCacheService.java
@@ -1,10 +1,10 @@
-package com.ycl.service.platform.user;
+package com.ycl.service.user;
-import com.ycl.entity.platform.user.UmsAdmin;
-import com.ycl.entity.platform.user.UmsResource;
+import com.ycl.entity.user.UmsAdmin;
+import com.ycl.entity.user.UmsResource;
import java.util.List;
diff --git a/ycl-common/src/main/java/com/ycl/service/platform/user/UmsAdminRoleRelationService.java b/ycl-common/src/main/java/com/ycl/service/user/UmsAdminRoleRelationService.java
similarity index 70%
rename from ycl-common/src/main/java/com/ycl/service/platform/user/UmsAdminRoleRelationService.java
rename to ycl-common/src/main/java/com/ycl/service/user/UmsAdminRoleRelationService.java
index bf88be8..0746cdb 100644
--- a/ycl-common/src/main/java/com/ycl/service/platform/user/UmsAdminRoleRelationService.java
+++ b/ycl-common/src/main/java/com/ycl/service/user/UmsAdminRoleRelationService.java
@@ -1,7 +1,7 @@
-package com.ycl.service.platform.user;
+package com.ycl.service.user;
import com.baomidou.mybatisplus.extension.service.IService;
-import com.ycl.entity.platform.user.UmsAdminRoleRelation;
+import com.ycl.entity.user.UmsAdminRoleRelation;
/**
* 绠＄悊鍛樿鑹插叧绯荤鐞哠ervice
diff --git a/ycl-common/src/main/java/com/ycl/service/platform/user/UmsAdminService.java b/ycl-common/src/main/java/com/ycl/service/user/UmsAdminService.java
similarity index 92%
rename from ycl-common/src/main/java/com/ycl/service/platform/user/UmsAdminService.java
rename to ycl-common/src/main/java/com/ycl/service/user/UmsAdminService.java
index cd024bc..765ab4e 100644
--- a/ycl-common/src/main/java/com/ycl/service/platform/user/UmsAdminService.java
+++ b/ycl-common/src/main/java/com/ycl/service/user/UmsAdminService.java
@@ -1,13 +1,13 @@
-package com.ycl.service.platform.user;
+package com.ycl.service.user;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ycl.dto.UmsAdminParam;
import com.ycl.dto.UpdateAdminPasswordParam;
-import com.ycl.entity.platform.user.UmsAdmin;
-import com.ycl.entity.platform.user.UmsResource;
-import com.ycl.entity.platform.user.UmsRole;
+import com.ycl.entity.user.UmsAdmin;
+import com.ycl.entity.user.UmsResource;
+import com.ycl.entity.user.UmsRole;
import com.ycl.vo.user.UserVO;
import org.springframework.security.core.userdetails.UserDetails;
import org.springframework.transaction.annotation.Transactional;
diff --git a/ycl-common/src/main/java/com/ycl/service/platform/user/UmsDepartManageService.java b/ycl-common/src/main/java/com/ycl/service/user/UmsDepartManageService.java
similarity index 84%
rename from ycl-common/src/main/java/com/ycl/service/platform/user/UmsDepartManageService.java
rename to ycl-common/src/main/java/com/ycl/service/user/UmsDepartManageService.java
index 70f0705..d09e114 100644
--- a/ycl-common/src/main/java/com/ycl/service/platform/user/UmsDepartManageService.java
+++ b/ycl-common/src/main/java/com/ycl/service/user/UmsDepartManageService.java
@@ -1,8 +1,8 @@
-package com.ycl.service.platform.user;
+package com.ycl.service.user;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ycl.api.BasePageDTO;
-import com.ycl.entity.platform.user.UmsDepartManage;
+import com.ycl.entity.user.UmsDepartManage;
import java.util.List;
diff --git a/ycl-common/src/main/java/com/ycl/service/platform/user/UmsMenuService.java b/ycl-common/src/main/java/com/ycl/service/user/UmsMenuService.java
similarity index 90%
rename from ycl-common/src/main/java/com/ycl/service/platform/user/UmsMenuService.java
rename to ycl-common/src/main/java/com/ycl/service/user/UmsMenuService.java
index 4e153b5..7a19c1d 100644
--- a/ycl-common/src/main/java/com/ycl/service/platform/user/UmsMenuService.java
+++ b/ycl-common/src/main/java/com/ycl/service/user/UmsMenuService.java
@@ -1,10 +1,10 @@
-package com.ycl.service.platform.user;
+package com.ycl.service.user;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ycl.dto.UmsMenuNode;
-import com.ycl.entity.platform.user.UmsMenu;
+import com.ycl.entity.user.UmsMenu;
import java.util.List;
diff --git a/ycl-common/src/main/java/com/ycl/service/platform/user/UmsResourceCategoryService.java b/ycl-common/src/main/java/com/ycl/service/user/UmsResourceCategoryService.java
similarity index 82%
rename from ycl-common/src/main/java/com/ycl/service/platform/user/UmsResourceCategoryService.java
rename to ycl-common/src/main/java/com/ycl/service/user/UmsResourceCategoryService.java
index 6887458..0c2a576 100644
--- a/ycl-common/src/main/java/com/ycl/service/platform/user/UmsResourceCategoryService.java
+++ b/ycl-common/src/main/java/com/ycl/service/user/UmsResourceCategoryService.java
@@ -1,8 +1,8 @@
-package com.ycl.service.platform.user;
+package com.ycl.service.user;
import com.baomidou.mybatisplus.extension.service.IService;
-import com.ycl.entity.platform.user.UmsResourceCategory;
+import com.ycl.entity.user.UmsResourceCategory;
import java.util.List;
diff --git a/ycl-common/src/main/java/com/ycl/service/platform/user/UmsResourceService.java b/ycl-common/src/main/java/com/ycl/service/user/UmsResourceService.java
similarity index 88%
rename from ycl-common/src/main/java/com/ycl/service/platform/user/UmsResourceService.java
rename to ycl-common/src/main/java/com/ycl/service/user/UmsResourceService.java
index 2d092b9..d74c306 100644
--- a/ycl-common/src/main/java/com/ycl/service/platform/user/UmsResourceService.java
+++ b/ycl-common/src/main/java/com/ycl/service/user/UmsResourceService.java
@@ -1,9 +1,9 @@
-package com.ycl.service.platform.user;
+package com.ycl.service.user;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
-import com.ycl.entity.platform.user.UmsResource;
+import com.ycl.entity.user.UmsResource;
/**
* 鍚庡彴璧勬簮绠＄悊Service
diff --git a/ycl-common/src/main/java/com/ycl/service/platform/user/UmsRoleMenuRelationService.java b/ycl-common/src/main/java/com/ycl/service/user/UmsRoleMenuRelationService.java
similarity index 70%
rename from ycl-common/src/main/java/com/ycl/service/platform/user/UmsRoleMenuRelationService.java
rename to ycl-common/src/main/java/com/ycl/service/user/UmsRoleMenuRelationService.java
index 6c1ff88..c6ffa36 100644
--- a/ycl-common/src/main/java/com/ycl/service/platform/user/UmsRoleMenuRelationService.java
+++ b/ycl-common/src/main/java/com/ycl/service/user/UmsRoleMenuRelationService.java
@@ -1,7 +1,7 @@
-package com.ycl.service.platform.user;
+package com.ycl.service.user;
import com.baomidou.mybatisplus.extension.service.IService;
-import com.ycl.entity.platform.user.UmsRoleMenuRelation;
+import com.ycl.entity.user.UmsRoleMenuRelation;
/**
* 瑙掕壊鑿滃崟鍏崇郴绠＄悊Service
diff --git a/ycl-common/src/main/java/com/ycl/service/platform/user/UmsRoleResourceRelationService.java b/ycl-common/src/main/java/com/ycl/service/user/UmsRoleResourceRelationService.java
similarity index 69%
rename from ycl-common/src/main/java/com/ycl/service/platform/user/UmsRoleResourceRelationService.java
rename to ycl-common/src/main/java/com/ycl/service/user/UmsRoleResourceRelationService.java
index eedc3b8..d9b8c96 100644
--- a/ycl-common/src/main/java/com/ycl/service/platform/user/UmsRoleResourceRelationService.java
+++ b/ycl-common/src/main/java/com/ycl/service/user/UmsRoleResourceRelationService.java
@@ -1,7 +1,7 @@
-package com.ycl.service.platform.user;
+package com.ycl.service.user;
import com.baomidou.mybatisplus.extension.service.IService;
-import com.ycl.entity.platform.user.UmsRoleResourceRelation;
+import com.ycl.entity.user.UmsRoleResourceRelation;
/**
* 瑙掕壊璧勬簮鍏崇郴绠＄悊Service
diff --git a/ycl-common/src/main/java/com/ycl/service/platform/user/UmsRoleService.java b/ycl-common/src/main/java/com/ycl/service/user/UmsRoleService.java
similarity index 86%
rename from ycl-common/src/main/java/com/ycl/service/platform/user/UmsRoleService.java
rename to ycl-common/src/main/java/com/ycl/service/user/UmsRoleService.java
index 75aafef..7057986 100644
--- a/ycl-common/src/main/java/com/ycl/service/platform/user/UmsRoleService.java
+++ b/ycl-common/src/main/java/com/ycl/service/user/UmsRoleService.java
@@ -1,10 +1,10 @@
-package com.ycl.service.platform.user;
+package com.ycl.service.user;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
-import com.ycl.entity.platform.user.UmsMenu;
-import com.ycl.entity.platform.user.UmsResource;
-import com.ycl.entity.platform.user.UmsRole;
+import com.ycl.entity.user.UmsMenu;
+import com.ycl.entity.user.UmsResource;
+import com.ycl.entity.user.UmsRole;
import org.springframework.transaction.annotation.Transactional;
import java.util.List;
diff --git a/ycl-common/src/main/java/com/ycl/service/platform/user/impl/UmsAdminCacheServiceImpl.java b/ycl-common/src/main/java/com/ycl/service/user/impl/UmsAdminCacheServiceImpl.java
similarity index 91%
rename from ycl-common/src/main/java/com/ycl/service/platform/user/impl/UmsAdminCacheServiceImpl.java
rename to ycl-common/src/main/java/com/ycl/service/user/impl/UmsAdminCacheServiceImpl.java
index ad7b7ef..63fc7fe 100644
--- a/ycl-common/src/main/java/com/ycl/service/platform/user/impl/UmsAdminCacheServiceImpl.java
+++ b/ycl-common/src/main/java/com/ycl/service/user/impl/UmsAdminCacheServiceImpl.java
@@ -1,16 +1,16 @@
-package com.ycl.service.platform.user.impl;
+package com.ycl.service.user.impl;
import cn.hutool.core.collection.CollUtil;
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.ycl.entity.platform.user.UmsAdmin;
-import com.ycl.entity.platform.user.UmsAdminRoleRelation;
-import com.ycl.entity.platform.user.UmsResource;
-import com.ycl.mapper.platform.user.UmsAdminMapper;
+import com.ycl.entity.user.UmsAdmin;
+import com.ycl.entity.user.UmsAdminRoleRelation;
+import com.ycl.entity.user.UmsResource;
+import com.ycl.mapper.user.UmsAdminMapper;
import com.ycl.service.redis.RedisService;
-import com.ycl.service.platform.user.UmsAdminCacheService;
-import com.ycl.service.platform.user.UmsAdminRoleRelationService;
-import com.ycl.service.platform.user.UmsAdminService;
+import com.ycl.service.user.UmsAdminCacheService;
+import com.ycl.service.user.UmsAdminRoleRelationService;
+import com.ycl.service.user.UmsAdminService;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
diff --git a/ycl-common/src/main/java/com/ycl/service/platform/user/impl/UmsAdminRoleRelationServiceImpl.java b/ycl-common/src/main/java/com/ycl/service/user/impl/UmsAdminRoleRelationServiceImpl.java
similarity index 61%
rename from ycl-common/src/main/java/com/ycl/service/platform/user/impl/UmsAdminRoleRelationServiceImpl.java
rename to ycl-common/src/main/java/com/ycl/service/user/impl/UmsAdminRoleRelationServiceImpl.java
index 36f279f..4cb9924 100644
--- a/ycl-common/src/main/java/com/ycl/service/platform/user/impl/UmsAdminRoleRelationServiceImpl.java
+++ b/ycl-common/src/main/java/com/ycl/service/user/impl/UmsAdminRoleRelationServiceImpl.java
@@ -1,9 +1,9 @@
-package com.ycl.service.platform.user.impl;
+package com.ycl.service.user.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ycl.entity.platform.user.UmsAdminRoleRelation;
-import com.ycl.mapper.platform.user.UmsAdminRoleRelationMapper;
-import com.ycl.service.platform.user.UmsAdminRoleRelationService;
+import com.ycl.entity.user.UmsAdminRoleRelation;
+import com.ycl.mapper.user.UmsAdminRoleRelationMapper;
+import com.ycl.service.user.UmsAdminRoleRelationService;
import org.springframework.stereotype.Service;
/**
diff --git a/ycl-common/src/main/java/com/ycl/service/platform/user/impl/UmsAdminServiceImpl.java b/ycl-common/src/main/java/com/ycl/service/user/impl/UmsAdminServiceImpl.java
similarity index 93%
rename from ycl-common/src/main/java/com/ycl/service/platform/user/impl/UmsAdminServiceImpl.java
rename to ycl-common/src/main/java/com/ycl/service/user/impl/UmsAdminServiceImpl.java
index 55e726a..e30bfab 100644
--- a/ycl-common/src/main/java/com/ycl/service/platform/user/impl/UmsAdminServiceImpl.java
+++ b/ycl-common/src/main/java/com/ycl/service/user/impl/UmsAdminServiceImpl.java
@@ -1,4 +1,4 @@
-package com.ycl.service.platform.user.impl;
+package com.ycl.service.user.impl;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.StrUtil;
@@ -10,19 +10,19 @@
import com.ycl.bo.AdminUserDetails;
import com.ycl.dto.UmsAdminParam;
import com.ycl.dto.UpdateAdminPasswordParam;
-import com.ycl.entity.platform.depart.UmsDepart;
-import com.ycl.entity.platform.user.*;
+import com.ycl.entity.depart.UmsDepart;
+import com.ycl.entity.user.*;
import com.ycl.exception.Asserts;
-import com.ycl.mapper.platform.user.UmsAdminLoginLogMapper;
-import com.ycl.mapper.platform.user.UmsAdminMapper;
-import com.ycl.mapper.platform.user.UmsResourceMapper;
-import com.ycl.mapper.platform.user.UmsRoleMapper;
-import com.ycl.service.platform.depart.UmsDepartService;
-import com.ycl.service.platform.user.UmsDepartManageService;
+import com.ycl.mapper.user.UmsAdminLoginLogMapper;
+import com.ycl.mapper.user.UmsAdminMapper;
+import com.ycl.mapper.user.UmsResourceMapper;
+import com.ycl.mapper.user.UmsRoleMapper;
+import com.ycl.service.depart.UmsDepartService;
+import com.ycl.service.user.UmsDepartManageService;
import com.ycl.service.redis.RedisService;
-import com.ycl.service.platform.user.UmsAdminCacheService;
-import com.ycl.service.platform.user.UmsAdminRoleRelationService;
-import com.ycl.service.platform.user.UmsAdminService;
+import com.ycl.service.user.UmsAdminCacheService;
+import com.ycl.service.user.UmsAdminRoleRelationService;
+import com.ycl.service.user.UmsAdminService;
import com.ycl.utils.JwtTokenUtil;
import com.ycl.utils.SpringUtil;
import com.ycl.utils.common.LiveTimeMillisecond;
@@ -74,7 +74,7 @@
@Resource
private UmsResourceMapper umsResourceMapper;
@Resource
- private UmsDepartService sccgDepartService;
+ private UmsDepartService departService;
@Resource
private UmsDepartManageService umsAdminDepartService;
@Resource
@@ -322,9 +322,9 @@
List<UmsAdmin> records = page1.getRecords();
if (CollUtil.isNotEmpty(records)) {
records.forEach(e -> {
- UmsDepart sccgDepart = sccgDepartService.getById(e.getDepartmentId());
- if (null != sccgDepart) {
- e.setDepartName(sccgDepart.getDepartName());
+ UmsDepart umsDepart = departService.getById(e.getDepartmentId());
+ if (null != umsDepart) {
+ e.setDepartName(umsDepart.getDepartName());
}
});
}
diff --git a/ycl-common/src/main/java/com/ycl/service/platform/user/impl/UmsDepartManageServiceImpl.java b/ycl-common/src/main/java/com/ycl/service/user/impl/UmsDepartManageServiceImpl.java
similarity index 88%
rename from ycl-common/src/main/java/com/ycl/service/platform/user/impl/UmsDepartManageServiceImpl.java
rename to ycl-common/src/main/java/com/ycl/service/user/impl/UmsDepartManageServiceImpl.java
index 378bd11..514b105 100644
--- a/ycl-common/src/main/java/com/ycl/service/platform/user/impl/UmsDepartManageServiceImpl.java
+++ b/ycl-common/src/main/java/com/ycl/service/user/impl/UmsDepartManageServiceImpl.java
@@ -1,16 +1,16 @@
-package com.ycl.service.platform.user.impl;
+package com.ycl.service.user.impl;
import cn.hutool.core.collection.CollUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ycl.api.BasePageDTO;
-import com.ycl.entity.platform.depart.UmsDepart;
-import com.ycl.entity.platform.user.UmsAdmin;
-import com.ycl.entity.platform.user.UmsDepartManage;
-import com.ycl.mapper.platform.user.UmsDepartManageMapper;
-import com.ycl.service.platform.depart.UmsDepartService;
-import com.ycl.service.platform.user.UmsDepartManageService;
-import com.ycl.service.platform.user.UmsAdminService;
+import com.ycl.entity.depart.UmsDepart;
+import com.ycl.entity.user.UmsAdmin;
+import com.ycl.entity.user.UmsDepartManage;
+import com.ycl.mapper.user.UmsDepartManageMapper;
+import com.ycl.service.depart.UmsDepartService;
+import com.ycl.service.user.UmsDepartManageService;
+import com.ycl.service.user.UmsAdminService;
import com.ycl.vo.depart.DepartVO;
import org.springframework.stereotype.Service;
diff --git a/ycl-common/src/main/java/com/ycl/service/platform/user/impl/UmsMenuServiceImpl.java b/ycl-common/src/main/java/com/ycl/service/user/impl/UmsMenuServiceImpl.java
similarity index 93%
rename from ycl-common/src/main/java/com/ycl/service/platform/user/impl/UmsMenuServiceImpl.java
rename to ycl-common/src/main/java/com/ycl/service/user/impl/UmsMenuServiceImpl.java
index 7fbd008..1370b28 100644
--- a/ycl-common/src/main/java/com/ycl/service/platform/user/impl/UmsMenuServiceImpl.java
+++ b/ycl-common/src/main/java/com/ycl/service/user/impl/UmsMenuServiceImpl.java
@@ -1,12 +1,12 @@
-package com.ycl.service.platform.user.impl;
+package com.ycl.service.user.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ycl.dto.UmsMenuNode;
-import com.ycl.entity.platform.user.UmsMenu;
-import com.ycl.mapper.platform.user.UmsMenuMapper;
-import com.ycl.service.platform.user.UmsMenuService;
+import com.ycl.entity.user.UmsMenu;
+import com.ycl.mapper.user.UmsMenuMapper;
+import com.ycl.service.user.UmsMenuService;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
diff --git a/ycl-common/src/main/java/com/ycl/service/platform/user/impl/UmsResourceCategoryServiceImpl.java b/ycl-common/src/main/java/com/ycl/service/user/impl/UmsResourceCategoryServiceImpl.java
similarity index 79%
rename from ycl-common/src/main/java/com/ycl/service/platform/user/impl/UmsResourceCategoryServiceImpl.java
rename to ycl-common/src/main/java/com/ycl/service/user/impl/UmsResourceCategoryServiceImpl.java
index 48fdf37..4ba5e4c 100644
--- a/ycl-common/src/main/java/com/ycl/service/platform/user/impl/UmsResourceCategoryServiceImpl.java
+++ b/ycl-common/src/main/java/com/ycl/service/user/impl/UmsResourceCategoryServiceImpl.java
@@ -1,10 +1,10 @@
-package com.ycl.service.platform.user.impl;
+package com.ycl.service.user.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ycl.entity.platform.user.UmsResourceCategory;
-import com.ycl.mapper.platform.user.UmsResourceCategoryMapper;
-import com.ycl.service.platform.user.UmsResourceCategoryService;
+import com.ycl.entity.user.UmsResourceCategory;
+import com.ycl.mapper.user.UmsResourceCategoryMapper;
+import com.ycl.service.user.UmsResourceCategoryService;
import org.springframework.stereotype.Service;
import java.util.Date;
diff --git a/ycl-common/src/main/java/com/ycl/service/platform/user/impl/UmsResourceServiceImpl.java b/ycl-common/src/main/java/com/ycl/service/user/impl/UmsResourceServiceImpl.java
similarity index 88%
rename from ycl-common/src/main/java/com/ycl/service/platform/user/impl/UmsResourceServiceImpl.java
rename to ycl-common/src/main/java/com/ycl/service/user/impl/UmsResourceServiceImpl.java
index c7bd595..7a59404 100644
--- a/ycl-common/src/main/java/com/ycl/service/platform/user/impl/UmsResourceServiceImpl.java
+++ b/ycl-common/src/main/java/com/ycl/service/user/impl/UmsResourceServiceImpl.java
@@ -1,14 +1,14 @@
-package com.ycl.service.platform.user.impl;
+package com.ycl.service.user.impl;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ycl.entity.platform.user.UmsResource;
-import com.ycl.mapper.platform.user.UmsResourceMapper;
-import com.ycl.service.platform.user.UmsAdminCacheService;
-import com.ycl.service.platform.user.UmsResourceService;
+import com.ycl.entity.user.UmsResource;
+import com.ycl.mapper.user.UmsResourceMapper;
+import com.ycl.service.user.UmsAdminCacheService;
+import com.ycl.service.user.UmsResourceService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
diff --git a/ycl-common/src/main/java/com/ycl/service/platform/user/impl/UmsRoleMenuRelationServiceImpl.java b/ycl-common/src/main/java/com/ycl/service/user/impl/UmsRoleMenuRelationServiceImpl.java
similarity index 61%
rename from ycl-common/src/main/java/com/ycl/service/platform/user/impl/UmsRoleMenuRelationServiceImpl.java
rename to ycl-common/src/main/java/com/ycl/service/user/impl/UmsRoleMenuRelationServiceImpl.java
index 210ea47..e789f49 100644
--- a/ycl-common/src/main/java/com/ycl/service/platform/user/impl/UmsRoleMenuRelationServiceImpl.java
+++ b/ycl-common/src/main/java/com/ycl/service/user/impl/UmsRoleMenuRelationServiceImpl.java
@@ -1,9 +1,9 @@
-package com.ycl.service.platform.user.impl;
+package com.ycl.service.user.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ycl.entity.platform.user.UmsRoleMenuRelation;
-import com.ycl.mapper.platform.user.UmsRoleMenuRelationMapper;
-import com.ycl.service.platform.user.UmsRoleMenuRelationService;
+import com.ycl.entity.user.UmsRoleMenuRelation;
+import com.ycl.mapper.user.UmsRoleMenuRelationMapper;
+import com.ycl.service.user.UmsRoleMenuRelationService;
import org.springframework.stereotype.Service;
/**
diff --git a/ycl-common/src/main/java/com/ycl/service/platform/user/impl/UmsRoleResourceRelationServiceImpl.java b/ycl-common/src/main/java/com/ycl/service/user/impl/UmsRoleResourceRelationServiceImpl.java
similarity index 61%
rename from ycl-common/src/main/java/com/ycl/service/platform/user/impl/UmsRoleResourceRelationServiceImpl.java
rename to ycl-common/src/main/java/com/ycl/service/user/impl/UmsRoleResourceRelationServiceImpl.java
index 5877446..3b7d7e1 100644
--- a/ycl-common/src/main/java/com/ycl/service/platform/user/impl/UmsRoleResourceRelationServiceImpl.java
+++ b/ycl-common/src/main/java/com/ycl/service/user/impl/UmsRoleResourceRelationServiceImpl.java
@@ -1,9 +1,9 @@
-package com.ycl.service.platform.user.impl;
+package com.ycl.service.user.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ycl.entity.platform.user.UmsRoleResourceRelation;
-import com.ycl.mapper.platform.user.UmsRoleResourceRelationMapper;
-import com.ycl.service.platform.user.UmsRoleResourceRelationService;
+import com.ycl.entity.user.UmsRoleResourceRelation;
+import com.ycl.mapper.user.UmsRoleResourceRelationMapper;
+import com.ycl.service.user.UmsRoleResourceRelationService;
import org.springframework.stereotype.Service;
/**
diff --git a/ycl-common/src/main/java/com/ycl/service/platform/user/impl/UmsRoleServiceImpl.java b/ycl-common/src/main/java/com/ycl/service/user/impl/UmsRoleServiceImpl.java
similarity index 88%
rename from ycl-common/src/main/java/com/ycl/service/platform/user/impl/UmsRoleServiceImpl.java
rename to ycl-common/src/main/java/com/ycl/service/user/impl/UmsRoleServiceImpl.java
index aab1843..9bfaf58 100644
--- a/ycl-common/src/main/java/com/ycl/service/platform/user/impl/UmsRoleServiceImpl.java
+++ b/ycl-common/src/main/java/com/ycl/service/user/impl/UmsRoleServiceImpl.java
@@ -1,18 +1,18 @@
-package com.ycl.service.platform.user.impl;
+package com.ycl.service.user.impl;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ycl.entity.platform.user.*;
-import com.ycl.mapper.platform.user.UmsMenuMapper;
-import com.ycl.mapper.platform.user.UmsResourceMapper;
-import com.ycl.mapper.platform.user.UmsRoleMapper;
-import com.ycl.service.platform.user.UmsAdminCacheService;
-import com.ycl.service.platform.user.UmsRoleMenuRelationService;
-import com.ycl.service.platform.user.UmsRoleResourceRelationService;
-import com.ycl.service.platform.user.UmsRoleService;
+import com.ycl.entity.user.*;
+import com.ycl.mapper.user.UmsMenuMapper;
+import com.ycl.mapper.user.UmsResourceMapper;
+import com.ycl.mapper.user.UmsRoleMapper;
+import com.ycl.service.user.UmsAdminCacheService;
+import com.ycl.service.user.UmsRoleMenuRelationService;
+import com.ycl.service.user.UmsRoleResourceRelationService;
+import com.ycl.service.user.UmsRoleService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
diff --git a/ycl-common/src/main/java/com/ycl/vo/zf/ZfVO.java b/ycl-common/src/main/java/com/ycl/vo/zf/ZfVO.java
index f82f2c3..52a26bf 100644
--- a/ycl-common/src/main/java/com/ycl/vo/zf/ZfVO.java
+++ b/ycl-common/src/main/java/com/ycl/vo/zf/ZfVO.java
@@ -45,7 +45,7 @@
@ApiModelProperty("浜嬪彂鍦板潃")
@NotBlank(message = "浜嬪彂鍦板潃涓嶈兘涓虹┖")
- private String afAddr;
+ private String address;
@ApiModelProperty("涓炬姤浜�")
@NotBlank(message = "涓炬姤浜轰笉鑳戒负绌�")
diff --git a/ycl-common/src/main/resources/mapper/platform/depart/UmsDepartMapper.xml b/ycl-common/src/main/resources/mapper/depart/UmsDepartMapper.xml
similarity index 82%
rename from ycl-common/src/main/resources/mapper/platform/depart/UmsDepartMapper.xml
rename to ycl-common/src/main/resources/mapper/depart/UmsDepartMapper.xml
index 7b28c31..ebc2f28 100644
--- a/ycl-common/src/main/resources/mapper/platform/depart/UmsDepartMapper.xml
+++ b/ycl-common/src/main/resources/mapper/depart/UmsDepartMapper.xml
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ycl.mapper.platform.depart.UmsDepartMapper">
+<mapper namespace="com.ycl.mapper.depart.UmsDepartMapper">
<!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
- <resultMap id="BaseResultMap" type="com.ycl.entity.platform.depart.UmsDepart">
+ <resultMap id="BaseResultMap" type="com.ycl.entity.depart.UmsDepart">
<id column="id" property="id" />
<result column="depart_name" property="departName" />
<result column="depart_des" property="departDes" />
diff --git a/ycl-common/src/main/resources/mapper/platform/zf/VideowarmEventsreportMapper.xml b/ycl-common/src/main/resources/mapper/platform/zf/VideowarmEventsreportMapper.xml
deleted file mode 100644
index 2c32279..0000000
--- a/ycl-common/src/main/resources/mapper/platform/zf/VideowarmEventsreportMapper.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ycl.mapper.platform.zf.VideowarmEventsreportMapper">
-
- <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
- <resultMap id="BaseResultMap" type="com.ycl.entity.platform.zf.VideowarmEventsreport">
- <id column="id" property="id" />
- <result column="eventName" property="eventName" />
- <result column="eventType" property="eventType" />
- <result column="associatedShops" property="associatedShops" />
- <result column="eventLocaation" property="eventLocaation" />
- <result column="eventRegion" property="eventRegion" />
- <result column="videoOrImage" property="videoOrImage" />
- <result column="contentDesc" property="contentDesc" />
- <result column="eventTime" property="eventTime" />
- <result column="cTime" property="cTime" />
- </resultMap>
-
- <!-- 閫氱敤鏌ヨ缁撴灉鍒� -->
- <sql id="Base_Column_List">
- id, eventName, eventType, associatedShops, eventLocaation, eventRegion, videoOrImage, contentDesc, eventTime, cTime
- </sql>
-
-
- <select id="selectPageVo" resultType="com.ycl.entity.platform.zf.VideowarmEventsreport">
- SELECT * FROM ums_videowarm_eventsreport
- <where>
- <if test="eventName!=null and eventName!=''" >
- eventName=#{eventName}
- </if>
- <if test="eventType!=null and eventType!=''" >
- eventType=#{eventType}
- </if>
- <if test="eventLocation!=null and eventLocation!=''" >
- eventLocation=#{eventLocation}
- </if>
- <if test="eventRegion!=null and eventRegion!=''" >
- eventRegion=#{eventRegion}
- </if>
- <if test="startTime!=null and startTime!=''and endTime!=null and endTime!=''" >
- ctime between #{startTime} and #{endTime}
- </if>
- </where>
- </select>
-
-</mapper>
diff --git a/ycl-common/src/main/resources/mapper/platform/user/UmsAdminLoginLogMapper.xml b/ycl-common/src/main/resources/mapper/user/UmsAdminLoginLogMapper.xml
similarity index 76%
rename from ycl-common/src/main/resources/mapper/platform/user/UmsAdminLoginLogMapper.xml
rename to ycl-common/src/main/resources/mapper/user/UmsAdminLoginLogMapper.xml
index 61b333e..48e945f 100644
--- a/ycl-common/src/main/resources/mapper/platform/user/UmsAdminLoginLogMapper.xml
+++ b/ycl-common/src/main/resources/mapper/user/UmsAdminLoginLogMapper.xml
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ycl.mapper.platform.user.UmsAdminLoginLogMapper">
+<mapper namespace="com.ycl.mapper.user.UmsAdminLoginLogMapper">
<!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
- <resultMap id="BaseResultMap" type="com.ycl.entity.platform.user.UmsAdminLoginLog">
+ <resultMap id="BaseResultMap" type="com.ycl.entity.user.UmsAdminLoginLog">
<id column="id" property="id" />
<result column="admin_id" property="adminId" />
<result column="create_time" property="createTime" />
diff --git a/ycl-common/src/main/resources/mapper/platform/user/UmsAdminMapper.xml b/ycl-common/src/main/resources/mapper/user/UmsAdminMapper.xml
similarity index 90%
rename from ycl-common/src/main/resources/mapper/platform/user/UmsAdminMapper.xml
rename to ycl-common/src/main/resources/mapper/user/UmsAdminMapper.xml
index 51eca7a..5ae33ba 100644
--- a/ycl-common/src/main/resources/mapper/platform/user/UmsAdminMapper.xml
+++ b/ycl-common/src/main/resources/mapper/user/UmsAdminMapper.xml
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ycl.mapper.platform.user.UmsAdminMapper">
+<mapper namespace="com.ycl.mapper.user.UmsAdminMapper">
<!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
- <resultMap id="BaseResultMap" type="com.ycl.entity.platform.user.UmsAdmin">
+ <resultMap id="BaseResultMap" type="com.ycl.entity.user.UmsAdmin">
<id column="id" property="id"/>
<result column="username" property="username"/>
<result column="password" property="password"/>
diff --git a/ycl-common/src/main/resources/mapper/platform/user/UmsAdminRoleRelationMapper.xml b/ycl-common/src/main/resources/mapper/user/UmsAdminRoleRelationMapper.xml
similarity index 68%
rename from ycl-common/src/main/resources/mapper/platform/user/UmsAdminRoleRelationMapper.xml
rename to ycl-common/src/main/resources/mapper/user/UmsAdminRoleRelationMapper.xml
index 0463e8a..091d309 100644
--- a/ycl-common/src/main/resources/mapper/platform/user/UmsAdminRoleRelationMapper.xml
+++ b/ycl-common/src/main/resources/mapper/user/UmsAdminRoleRelationMapper.xml
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ycl.mapper.platform.user.UmsAdminRoleRelationMapper">
+<mapper namespace="com.ycl.mapper.user.UmsAdminRoleRelationMapper">
<!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
- <resultMap id="BaseResultMap" type="com.ycl.entity.platform.user.UmsAdminRoleRelation">
+ <resultMap id="BaseResultMap" type="com.ycl.entity.user.UmsAdminRoleRelation">
<id column="id" property="id" />
<result column="admin_id" property="adminId" />
<result column="role_id" property="roleId" />
diff --git a/ycl-common/src/main/resources/mapper/platform/user/UmsDepartManageMapper.xml b/ycl-common/src/main/resources/mapper/user/UmsDepartManageMapper.xml
similarity index 86%
rename from ycl-common/src/main/resources/mapper/platform/user/UmsDepartManageMapper.xml
rename to ycl-common/src/main/resources/mapper/user/UmsDepartManageMapper.xml
index 753ac7c..932ebc0 100644
--- a/ycl-common/src/main/resources/mapper/platform/user/UmsDepartManageMapper.xml
+++ b/ycl-common/src/main/resources/mapper/user/UmsDepartManageMapper.xml
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ycl.mapper.platform.user.UmsDepartManageMapper">
+<mapper namespace="com.ycl.mapper.user.UmsDepartManageMapper">
<!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
- <resultMap id="BaseResultMap" type="com.ycl.entity.platform.user.UmsDepartManage">
+ <resultMap id="BaseResultMap" type="com.ycl.entity.user.UmsDepartManage">
<id column="id" property="id"/>
<result column="user_id" property="userId"/>
<result column="depart_id" property="departId"/>
diff --git a/ycl-common/src/main/resources/mapper/platform/user/UmsMenuMapper.xml b/ycl-common/src/main/resources/mapper/user/UmsMenuMapper.xml
similarity index 88%
rename from ycl-common/src/main/resources/mapper/platform/user/UmsMenuMapper.xml
rename to ycl-common/src/main/resources/mapper/user/UmsMenuMapper.xml
index 3095b7d..11212c6 100644
--- a/ycl-common/src/main/resources/mapper/platform/user/UmsMenuMapper.xml
+++ b/ycl-common/src/main/resources/mapper/user/UmsMenuMapper.xml
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ycl.mapper.platform.user.UmsMenuMapper">
+<mapper namespace="com.ycl.mapper.user.UmsMenuMapper">
<!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
- <resultMap id="BaseResultMap" type="com.ycl.entity.platform.user.UmsMenu">
+ <resultMap id="BaseResultMap" type="com.ycl.entity.user.UmsMenu">
<id column="id" property="id" />
<result column="parent_id" property="parentId" />
<result column="create_time" property="createTime" />
@@ -15,7 +15,7 @@
<result column="hidden" property="hidden" />
</resultMap>
- <select id="getMenuList" resultType="com.ycl.entity.platform.user.UmsMenu">
+ <select id="getMenuList" resultType="com.ycl.entity.user.UmsMenu">
SELECT
m.id id,
m.parent_id parentId,
@@ -37,7 +37,7 @@
GROUP BY
m.id
</select>
- <select id="getMenuListByRoleId" resultType="com.ycl.entity.platform.user.UmsMenu">
+ <select id="getMenuListByRoleId" resultType="com.ycl.entity.user.UmsMenu">
SELECT
m.id id,
m.parent_id parentId,
diff --git a/ycl-common/src/main/resources/mapper/platform/user/UmsResourceCategoryMapper.xml b/ycl-common/src/main/resources/mapper/user/UmsResourceCategoryMapper.xml
similarity index 71%
rename from ycl-common/src/main/resources/mapper/platform/user/UmsResourceCategoryMapper.xml
rename to ycl-common/src/main/resources/mapper/user/UmsResourceCategoryMapper.xml
index 8c917d2..6bd167e 100644
--- a/ycl-common/src/main/resources/mapper/platform/user/UmsResourceCategoryMapper.xml
+++ b/ycl-common/src/main/resources/mapper/user/UmsResourceCategoryMapper.xml
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ycl.mapper.platform.user.UmsResourceCategoryMapper">
+<mapper namespace="com.ycl.mapper.user.UmsResourceCategoryMapper">
<!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
- <resultMap id="BaseResultMap" type="com.ycl.entity.platform.user.UmsResourceCategory">
+ <resultMap id="BaseResultMap" type="com.ycl.entity.user.UmsResourceCategory">
<id column="id" property="id" />
<result column="create_time" property="createTime" />
<result column="name" property="name" />
diff --git a/ycl-common/src/main/resources/mapper/platform/user/UmsResourceMapper.xml b/ycl-common/src/main/resources/mapper/user/UmsResourceMapper.xml
similarity index 85%
rename from ycl-common/src/main/resources/mapper/platform/user/UmsResourceMapper.xml
rename to ycl-common/src/main/resources/mapper/user/UmsResourceMapper.xml
index 266a768..ce97928 100644
--- a/ycl-common/src/main/resources/mapper/platform/user/UmsResourceMapper.xml
+++ b/ycl-common/src/main/resources/mapper/user/UmsResourceMapper.xml
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ycl.mapper.platform.user.UmsResourceMapper">
+<mapper namespace="com.ycl.mapper.user.UmsResourceMapper">
<!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
- <resultMap id="BaseResultMap" type="com.ycl.entity.platform.user.UmsResource">
+ <resultMap id="BaseResultMap" type="com.ycl.entity.user.UmsResource">
<id column="id" property="id" />
<result column="create_time" property="createTime" />
<result column="name" property="name" />
@@ -12,7 +12,7 @@
<result column="category_id" property="categoryId" />
</resultMap>
- <select id="getResourceList" resultType="com.ycl.entity.platform.user.UmsResource">
+ <select id="getResourceList" resultType="com.ycl.entity.user.UmsResource">
SELECT
ur.id id,
ur.create_time createTime,
@@ -32,7 +32,7 @@
ur.id
</select>
- <select id="getResourceListByRoleId" resultType="com.ycl.entity.platform.user.UmsResource">
+ <select id="getResourceListByRoleId" resultType="com.ycl.entity.user.UmsResource">
SELECT
r.id id,
r.create_time createTime,
diff --git a/ycl-common/src/main/resources/mapper/platform/user/UmsRoleMapper.xml b/ycl-common/src/main/resources/mapper/user/UmsRoleMapper.xml
similarity index 76%
rename from ycl-common/src/main/resources/mapper/platform/user/UmsRoleMapper.xml
rename to ycl-common/src/main/resources/mapper/user/UmsRoleMapper.xml
index 25edb6d..dae0a5a 100644
--- a/ycl-common/src/main/resources/mapper/platform/user/UmsRoleMapper.xml
+++ b/ycl-common/src/main/resources/mapper/user/UmsRoleMapper.xml
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ycl.mapper.platform.user.UmsRoleMapper">
+<mapper namespace="com.ycl.mapper.user.UmsRoleMapper">
<!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
- <resultMap id="BaseResultMap" type="com.ycl.entity.platform.user.UmsRole">
+ <resultMap id="BaseResultMap" type="com.ycl.entity.user.UmsRole">
<id column="id" property="id" />
<result column="name" property="name" />
<result column="description" property="description" />
@@ -13,7 +13,7 @@
<result column="sort" property="sort" />
</resultMap>
- <select id="getRoleList" resultType="com.ycl.entity.platform.user.UmsRole">
+ <select id="getRoleList" resultType="com.ycl.entity.user.UmsRole">
select r.*
from ums_admin_role_relation ar left join ums_role r on ar.role_id = r.id
where ar.admin_id = #{adminId}
diff --git a/ycl-common/src/main/resources/mapper/platform/user/UmsRoleMenuRelationMapper.xml b/ycl-common/src/main/resources/mapper/user/UmsRoleMenuRelationMapper.xml
similarity index 68%
rename from ycl-common/src/main/resources/mapper/platform/user/UmsRoleMenuRelationMapper.xml
rename to ycl-common/src/main/resources/mapper/user/UmsRoleMenuRelationMapper.xml
index 6ecc43e..6d8268c 100644
--- a/ycl-common/src/main/resources/mapper/platform/user/UmsRoleMenuRelationMapper.xml
+++ b/ycl-common/src/main/resources/mapper/user/UmsRoleMenuRelationMapper.xml
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ycl.mapper.platform.user.UmsRoleMenuRelationMapper">
+<mapper namespace="com.ycl.mapper.user.UmsRoleMenuRelationMapper">
<!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
- <resultMap id="BaseResultMap" type="com.ycl.entity.platform.user.UmsRoleMenuRelation">
+ <resultMap id="BaseResultMap" type="com.ycl.entity.user.UmsRoleMenuRelation">
<id column="id" property="id" />
<result column="role_id" property="roleId" />
<result column="menu_id" property="menuId" />
diff --git a/ycl-common/src/main/resources/mapper/platform/user/UmsRoleResourceRelationMapper.xml b/ycl-common/src/main/resources/mapper/user/UmsRoleResourceRelationMapper.xml
similarity index 67%
rename from ycl-common/src/main/resources/mapper/platform/user/UmsRoleResourceRelationMapper.xml
rename to ycl-common/src/main/resources/mapper/user/UmsRoleResourceRelationMapper.xml
index 7523559..3013849 100644
--- a/ycl-common/src/main/resources/mapper/platform/user/UmsRoleResourceRelationMapper.xml
+++ b/ycl-common/src/main/resources/mapper/user/UmsRoleResourceRelationMapper.xml
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ycl.mapper.platform.user.UmsRoleResourceRelationMapper">
+<mapper namespace="com.ycl.mapper.user.UmsRoleResourceRelationMapper">
<!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
- <resultMap id="BaseResultMap" type="com.ycl.entity.platform.user.UmsRoleResourceRelation">
+ <resultMap id="BaseResultMap" type="com.ycl.entity.user.UmsRoleResourceRelation">
<id column="id" property="id" />
<result column="role_id" property="roleId" />
<result column="resource_id" property="resourceId" />
diff --git a/ycl-generator/src/main/java/com/ycl/MysqlGenerator.java b/ycl-generator/src/main/java/com/ycl/MysqlGenerator.java
index 899b392..ef859a5 100644
--- a/ycl-generator/src/main/java/com/ycl/MysqlGenerator.java
+++ b/ycl-generator/src/main/java/com/ycl/MysqlGenerator.java
@@ -57,7 +57,7 @@
// 鍏ㄥ眬閰嶇疆
GlobalConfig gc = new GlobalConfig();
- String projectPath = System.getProperty("user.dir");
+ final String projectPath = System.getProperty("user.dir");
gc.setOutputDir(projectPath + "/ycl-generator/src/main/java");
gc.setAuthor("wl");//浣滆��
gc.setBaseResultMap(true); //mapper.xml 鐢熸垚 ResultMap
@@ -83,7 +83,7 @@
// pc.setModuleName(scanner("妯″潡鍚�"));
pc.setModuleName(null);
pc.setParent("com.ycl");
- String packageName = scanner("璇疯緭鍏ュ寘鍚�");
+ final String packageName = scanner("璇疯緭鍏ュ寘鍚�");
//鑷畾涔夋墍鍦ㄥ寘鐨勫悕绉� 鍩烘湰娌″繀瑕�
pc.setEntity(PN_ENTITY + PN_DELIMITER + packageName);
pc.setController(PN_CONTROLLER + PN_DELIMITER + packageName);
@@ -108,7 +108,7 @@
// String templatePath = "/templates/mapper.xml.vm";
// 鑷畾涔夎緭鍑洪厤缃�
- List<FileOutConfig> focList = new ArrayList<>();
+ List<FileOutConfig> focList = new ArrayList<FileOutConfig>();
// 鑷畾涔夐厤缃細琚紭鍏堣緭鍑�
focList.add(new FileOutConfig(templatePath) {
@Override
@@ -158,7 +158,7 @@
//鍘婚櫎瀛楁鍓嶇紑
strategy.setFieldPrefix("");
- List<TableFill> tableFills = new ArrayList<>();
+ List<TableFill> tableFills = new ArrayList<TableFill>();
TableFill createTimeFill = new TableFill("createTime", FieldFill.INSERT);
TableFill modifiedTimeFill = new TableFill("modifiedTime", FieldFill.UPDATE);
diff --git a/ycl-platform/src/main/java/com/ycl/config/YclSecurityConfig.java b/ycl-platform/src/main/java/com/ycl/config/YclSecurityConfig.java
index 6d9367d..b5d2bfb 100644
--- a/ycl-platform/src/main/java/com/ycl/config/YclSecurityConfig.java
+++ b/ycl-platform/src/main/java/com/ycl/config/YclSecurityConfig.java
@@ -1,9 +1,9 @@
package com.ycl.config;
import com.ycl.component.DynamicSecurityService;
-import com.ycl.entity.platform.user.UmsResource;
-import com.ycl.service.platform.user.UmsAdminService;
-import com.ycl.service.platform.user.UmsResourceService;
+import com.ycl.entity.user.UmsResource;
+import com.ycl.service.user.UmsAdminService;
+import com.ycl.service.user.UmsResourceService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
diff --git a/ycl-platform/src/main/java/com/ycl/controller/depart/DepartController.java b/ycl-platform/src/main/java/com/ycl/controller/depart/DepartController.java
index 4188a35..54f2c56 100644
--- a/ycl-platform/src/main/java/com/ycl/controller/depart/DepartController.java
+++ b/ycl-platform/src/main/java/com/ycl/controller/depart/DepartController.java
@@ -6,9 +6,9 @@
import com.ycl.api.BasePageVO;
import com.ycl.api.CommonResult;
import com.ycl.controller.BaseController;
-import com.ycl.entity.platform.depart.UmsDepart;
-import com.ycl.service.platform.depart.UmsDepartService;
-import com.ycl.service.platform.user.UmsDepartManageService;
+import com.ycl.entity.depart.UmsDepart;
+import com.ycl.service.depart.UmsDepartService;
+import com.ycl.service.user.UmsDepartManageService;
import com.ycl.utils.auth.UserAuthUtil;
import com.ycl.vo.depart.DepartVO;
import io.swagger.annotations.Api;
diff --git a/ycl-platform/src/main/java/com/ycl/controller/dict/DatabaseDictionaryController.java b/ycl-platform/src/main/java/com/ycl/controller/dict/DatabaseDictionaryController.java
index 24b73c8..1b3d6d0 100644
--- a/ycl-platform/src/main/java/com/ycl/controller/dict/DatabaseDictionaryController.java
+++ b/ycl-platform/src/main/java/com/ycl/controller/dict/DatabaseDictionaryController.java
@@ -3,8 +3,8 @@
import com.ycl.api.CommonResult;
import com.ycl.controller.BaseController;
-import com.ycl.entity.platform.dict.DatabaseDictionary;
-import com.ycl.service.platform.dict.IDatabaseDictionaryService;
+import com.ycl.entity.dict.DatabaseDictionary;
+import com.ycl.service.dict.IDatabaseDictionaryService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.GetMapping;
diff --git a/ycl-platform/src/main/java/com/ycl/controller/portal/UmsWebsitePortalController.java b/ycl-platform/src/main/java/com/ycl/controller/portal/UmsWebsitePortalController.java
index 6b93823..bd9238f 100644
--- a/ycl-platform/src/main/java/com/ycl/controller/portal/UmsWebsitePortalController.java
+++ b/ycl-platform/src/main/java/com/ycl/controller/portal/UmsWebsitePortalController.java
@@ -2,13 +2,13 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.ycl.api.CommonResult;
-import com.ycl.entity.platform.portal.UmsThirdApplications;
-import com.ycl.entity.platform.user.UmsMenu;
-import com.ycl.entity.platform.portal.UmsWebsiteLogo;
-import com.ycl.entity.platform.user.vo.UmsMenuVo;
-import com.ycl.service.platform.portal.UmsThirdApplicationsService;
-import com.ycl.service.platform.user.UmsMenuService;
-import com.ycl.service.platform.portal.UmsWebsiteLogoService;
+import com.ycl.entity.portal.ThirdApplications;
+import com.ycl.entity.user.UmsMenu;
+import com.ycl.entity.portal.WebsiteLogo;
+import com.ycl.entity.user.vo.UmsMenuVo;
+import com.ycl.service.portal.UmsThirdApplicationsService;
+import com.ycl.service.user.UmsMenuService;
+import com.ycl.service.portal.UmsWebsiteLogoService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.BeanUtils;
@@ -33,14 +33,14 @@
@ApiOperation("logo绠＄悊-娣诲姞logo")
@PostMapping("/logo/add")
- public CommonResult addLogo(@RequestBody @Validated UmsWebsiteLogo umsWebsiteLogo) {
- return CommonResult.success(umsWebsiteLogoService.save(umsWebsiteLogo));
+ public CommonResult addLogo(@RequestBody @Validated WebsiteLogo websiteLogo) {
+ return CommonResult.success(umsWebsiteLogoService.save(websiteLogo));
}
@ApiOperation("logo绠＄悊-淇敼logo")
@PutMapping("/logo/update")
- public CommonResult updateLogo(@RequestBody UmsWebsiteLogo umsWebsiteLogo) {
- return CommonResult.success(umsWebsiteLogoService.updateById(umsWebsiteLogo));
+ public CommonResult updateLogo(@RequestBody WebsiteLogo websiteLogo) {
+ return CommonResult.success(umsWebsiteLogoService.updateById(websiteLogo));
}
@ApiOperation("logo绠＄悊-鏌ヨlogo")
@@ -52,7 +52,7 @@
@ApiOperation("logo绠＄悊-鏌ヨlogo")
@GetMapping("/logo/searchOne")
public CommonResult searchLogo(@RequestParam Integer id) {
- return CommonResult.success(umsWebsiteLogoService.getOne(new QueryWrapper<UmsWebsiteLogo>().eq("id", id)));
+ return CommonResult.success(umsWebsiteLogoService.getOne(new QueryWrapper<WebsiteLogo>().eq("id", id)));
}
@ApiOperation("logo绠＄悊-鍒犻櫎logo")
@@ -112,14 +112,14 @@
@ApiOperation("绗笁鏂规帴鍙ｇ鐞�-娣诲姞")
@PostMapping("/thirdApp/add")
- public CommonResult addThirdApp(@RequestBody @Validated UmsThirdApplications umsThirdApplications) {
- return CommonResult.success(umsThirdApplicationsService.save(umsThirdApplications));
+ public CommonResult addThirdApp(@RequestBody @Validated ThirdApplications thirdApplications) {
+ return CommonResult.success(umsThirdApplicationsService.save(thirdApplications));
}
@ApiOperation("绗笁鏂规帴鍙ｇ鐞�-淇敼")
@PutMapping("/thirdApp/update")
- public CommonResult updateThirdApp(@RequestBody UmsThirdApplications umsThirdApplications) {
- return CommonResult.success(umsThirdApplicationsService.updateById(umsThirdApplications));
+ public CommonResult updateThirdApp(@RequestBody ThirdApplications thirdApplications) {
+ return CommonResult.success(umsThirdApplicationsService.updateById(thirdApplications));
}
@ApiOperation("绗笁鏂规帴鍙ｇ鐞�-鏌ヨ")
@@ -131,7 +131,7 @@
@ApiOperation("绗笁鏂规帴鍙ｇ鐞�-鏌ヨ閫氳繃id")
@GetMapping("/thirdApp/searchOne")
public CommonResult searchThirdApp(@RequestParam Integer id) {
- return CommonResult.success(umsThirdApplicationsService.getOne(new QueryWrapper<UmsThirdApplications>().eq("id", id)));
+ return CommonResult.success(umsThirdApplicationsService.getOne(new QueryWrapper<ThirdApplications>().eq("id", id)));
}
@ApiOperation("绗笁鏂规帴鍙ｇ鐞�-鍒犻櫎")
diff --git a/ycl-platform/src/main/java/com/ycl/controller/region/SccgRegionController.java b/ycl-platform/src/main/java/com/ycl/controller/region/SccgRegionController.java
index 6df1ce5..3a22e82 100644
--- a/ycl-platform/src/main/java/com/ycl/controller/region/SccgRegionController.java
+++ b/ycl-platform/src/main/java/com/ycl/controller/region/SccgRegionController.java
@@ -3,8 +3,8 @@
import com.ycl.api.CommonResult;
import com.ycl.controller.BaseController;
-import com.ycl.entity.platform.region.SccgRegion;
-import com.ycl.service.platform.region.ISccgRegionService;
+import com.ycl.entity.region.SccgRegion;
+import com.ycl.service.region.ISccgRegionService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.GetMapping;
diff --git a/ycl-platform/src/main/java/com/ycl/controller/store/StoreInfoController.java b/ycl-platform/src/main/java/com/ycl/controller/store/StoreInfoController.java
index 4451d3c..403db6f 100644
--- a/ycl-platform/src/main/java/com/ycl/controller/store/StoreInfoController.java
+++ b/ycl-platform/src/main/java/com/ycl/controller/store/StoreInfoController.java
@@ -5,8 +5,8 @@
import com.ycl.api.CommonPage;
import com.ycl.api.CommonResult;
import com.ycl.dto.UmsStoreInfoParam;
-import com.ycl.entity.platform.store.StoreInfo;
-import com.ycl.service.platform.store.StoreInfoService;
+import com.ycl.entity.store.StoreInfo;
+import com.ycl.service.store.StoreInfoService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
@@ -57,12 +57,12 @@
public CommonResult<StoreInfo> add(@Validated @RequestBody UmsStoreInfoParam umsStoreInfoParam) {
StoreInfo storeInfo = StoreInfo.builder()
.owner(umsStoreInfoParam.getOwner())
- .storename(umsStoreInfoParam.getStorename())
+ .storeName(umsStoreInfoParam.getStorename())
.contact(umsStoreInfoParam.getContact())
- .storeaddr(umsStoreInfoParam.getStoreaddr())
- .storephoto(umsStoreInfoParam.getStorephoto())
- .idcardinfo(umsStoreInfoParam.getIdcardinfo())
- .storescore(umsStoreInfoParam.getStorescore()).build();
+ .storeAddress(umsStoreInfoParam.getStoreaddr())
+ .storePhoto(umsStoreInfoParam.getStorephoto())
+ .idCardInfo(umsStoreInfoParam.getIdcardinfo())
+ .storeScore(umsStoreInfoParam.getStorescore()).build();
boolean success = storeInfoService.save(storeInfo);
if (success) {
return CommonResult.success(null);
diff --git a/ycl-platform/src/main/java/com/ycl/controller/store/StoreScoreRuleController.java b/ycl-platform/src/main/java/com/ycl/controller/store/StoreScoreRuleController.java
index c2616de..06e09b2 100644
--- a/ycl-platform/src/main/java/com/ycl/controller/store/StoreScoreRuleController.java
+++ b/ycl-platform/src/main/java/com/ycl/controller/store/StoreScoreRuleController.java
@@ -4,8 +4,8 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ycl.api.CommonPage;
import com.ycl.api.CommonResult;
-import com.ycl.entity.platform.store.StoreScoreRule;
-import com.ycl.service.platform.store.StoreScoreRuleService;
+import com.ycl.entity.store.StoreScoreRule;
+import com.ycl.service.store.StoreScoreRuleService;
import com.ycl.vo.store.StoreScoreRuleVO;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
diff --git a/ycl-platform/src/main/java/com/ycl/controller/user/UmsAdminController.java b/ycl-platform/src/main/java/com/ycl/controller/user/UmsAdminController.java
index 5a172a2..700ec04 100644
--- a/ycl-platform/src/main/java/com/ycl/controller/user/UmsAdminController.java
+++ b/ycl-platform/src/main/java/com/ycl/controller/user/UmsAdminController.java
@@ -7,11 +7,11 @@
import com.ycl.dto.UmsAdminLoginParam;
import com.ycl.dto.UmsAdminParam;
import com.ycl.dto.UpdateAdminPasswordParam;
-import com.ycl.entity.platform.user.UmsAdmin;
-import com.ycl.entity.platform.user.UmsRole;
+import com.ycl.entity.user.UmsAdmin;
+import com.ycl.entity.user.UmsRole;
import com.ycl.service.redis.RedisService;
-import com.ycl.service.platform.user.UmsAdminService;
-import com.ycl.service.platform.user.UmsRoleService;
+import com.ycl.service.user.UmsAdminService;
+import com.ycl.service.user.UmsRoleService;
import com.ycl.utils.redis.RedisKey;
import com.ycl.vo.user.UserVO;
import io.swagger.annotations.Api;
diff --git a/ycl-platform/src/main/java/com/ycl/controller/user/UmsMenuController.java b/ycl-platform/src/main/java/com/ycl/controller/user/UmsMenuController.java
index d966392..02d942e 100644
--- a/ycl-platform/src/main/java/com/ycl/controller/user/UmsMenuController.java
+++ b/ycl-platform/src/main/java/com/ycl/controller/user/UmsMenuController.java
@@ -4,8 +4,8 @@
import com.ycl.api.CommonPage;
import com.ycl.api.CommonResult;
import com.ycl.dto.UmsMenuNode;
-import com.ycl.entity.platform.user.UmsMenu;
-import com.ycl.service.platform.user.UmsMenuService;
+import com.ycl.entity.user.UmsMenu;
+import com.ycl.service.user.UmsMenuService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
diff --git a/ycl-platform/src/main/java/com/ycl/controller/user/UmsResourceCategoryController.java b/ycl-platform/src/main/java/com/ycl/controller/user/UmsResourceCategoryController.java
index d2e8762..25143ed 100644
--- a/ycl-platform/src/main/java/com/ycl/controller/user/UmsResourceCategoryController.java
+++ b/ycl-platform/src/main/java/com/ycl/controller/user/UmsResourceCategoryController.java
@@ -1,8 +1,8 @@
package com.ycl.controller.user;
import com.ycl.api.CommonResult;
-import com.ycl.entity.platform.user.UmsResourceCategory;
-import com.ycl.service.platform.user.UmsResourceCategoryService;
+import com.ycl.entity.user.UmsResourceCategory;
+import com.ycl.service.user.UmsResourceCategoryService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
diff --git a/ycl-platform/src/main/java/com/ycl/controller/user/UmsResourceController.java b/ycl-platform/src/main/java/com/ycl/controller/user/UmsResourceController.java
index 6ba9f34..4d52b2d 100644
--- a/ycl-platform/src/main/java/com/ycl/controller/user/UmsResourceController.java
+++ b/ycl-platform/src/main/java/com/ycl/controller/user/UmsResourceController.java
@@ -4,8 +4,8 @@
import com.ycl.api.CommonPage;
import com.ycl.api.CommonResult;
import com.ycl.component.DynamicSecurityMetadataSource;
-import com.ycl.entity.platform.user.UmsResource;
-import com.ycl.service.platform.user.UmsResourceService;
+import com.ycl.entity.user.UmsResource;
+import com.ycl.service.user.UmsResourceService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
diff --git a/ycl-platform/src/main/java/com/ycl/controller/user/UmsRoleController.java b/ycl-platform/src/main/java/com/ycl/controller/user/UmsRoleController.java
index b26c437..72e1abf 100644
--- a/ycl-platform/src/main/java/com/ycl/controller/user/UmsRoleController.java
+++ b/ycl-platform/src/main/java/com/ycl/controller/user/UmsRoleController.java
@@ -3,10 +3,10 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ycl.api.CommonPage;
import com.ycl.api.CommonResult;
-import com.ycl.entity.platform.user.UmsMenu;
-import com.ycl.entity.platform.user.UmsResource;
-import com.ycl.entity.platform.user.UmsRole;
-import com.ycl.service.platform.user.UmsRoleService;
+import com.ycl.entity.user.UmsMenu;
+import com.ycl.entity.user.UmsResource;
+import com.ycl.entity.user.UmsRole;
+import com.ycl.service.user.UmsRoleService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
diff --git a/ycl-platform/src/main/java/com/ycl/controller/zf/EnforcelawReportController.java b/ycl-platform/src/main/java/com/ycl/controller/zf/EnforcelawReportController.java
index a531ff8..0bd8575 100644
--- a/ycl-platform/src/main/java/com/ycl/controller/zf/EnforcelawReportController.java
+++ b/ycl-platform/src/main/java/com/ycl/controller/zf/EnforcelawReportController.java
@@ -3,13 +3,12 @@
import com.alibaba.excel.EasyExcel;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ycl.api.CommonResult;
import com.ycl.controller.BaseController;
-import com.ycl.entity.platform.zf.EnforcelawReport;
-import com.ycl.service.platform.zf.IEnforcelawReportService;
+import com.ycl.entity.zf.EnforceLawReport;
+import com.ycl.service.zf.IEnforcelawReportService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.SneakyThrows;
@@ -20,7 +19,6 @@
import java.net.URLEncoder;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
-import java.util.stream.Collectors;
/**
* <p>
@@ -49,7 +47,7 @@
@RequestParam(required = false) Integer current,
@RequestParam(required = false) Integer size
) {
- Page<EnforcelawReport> enforcelawReportPage = new Page<>();
+ Page<EnforceLawReport> enforcelawReportPage = new Page<>();
enforcelawReportPage.setCurrent(current);
enforcelawReportPage.setSize(size);
return CommonResult.success(enforcelawReportService.selectPageVo(enforcelawReportPage,startTime,endTime,community,status,partiesName,partiesID));
@@ -57,12 +55,12 @@
@GetMapping("/search/one")
@ApiOperation("鏌ヨ鍩庡競杩濆缓璇︽儏")
public CommonResult getOne(@RequestParam Integer id) {
- return CommonResult.success(enforcelawReportService.getOne(new QueryWrapper<EnforcelawReport>().eq("id", id)));
+ return CommonResult.success(enforcelawReportService.getOne(new QueryWrapper<EnforceLawReport>().eq("id", id)));
}
@PostMapping("/add")
@ApiOperation("娣诲姞鍩庡競杩濆缓璇︽儏")
- public CommonResult add(@RequestBody EnforcelawReport enforcelawReport) {
+ public CommonResult add(@RequestBody EnforceLawReport enforcelawReport) {
return CommonResult.success(enforcelawReportService.save(enforcelawReport));
}
@@ -74,7 +72,7 @@
@PutMapping("/update")
@ApiOperation("淇敼鍩庡競杩濆缓璇︽儏")
- public CommonResult modify(@RequestBody EnforcelawReport enforcelawReport) {
+ public CommonResult modify(@RequestBody EnforceLawReport enforcelawReport) {
return CommonResult.success(enforcelawReportService.updateById(enforcelawReport));
}
@@ -88,7 +86,7 @@
@RequestParam(required = false) String partiesName,
@RequestParam(required = false) String partiesID,
HttpServletResponse response) {
- QueryWrapper<EnforcelawReport> enforcelawReportQueryWrapper = new QueryWrapper<>();
+ QueryWrapper<EnforceLawReport> enforcelawReportQueryWrapper = new QueryWrapper<>();
if (StringUtils.isNotBlank(startTime) && StringUtils.isNotBlank(endTime)) {
enforcelawReportQueryWrapper.between("cTime", startTime, endTime);
}
@@ -107,6 +105,6 @@
response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
response.setCharacterEncoding("utf-8");
response.setHeader("Content-disposition", "attachment;filename=" + LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd")) + URLEncoder.encode("鍩庡競杩濆缓" + ".xlsx", "utf-8"));
- EasyExcel.write(response.getOutputStream(), EnforcelawReport.class).sheet("鍒楄〃").doWrite(enforcelawReportService.list(enforcelawReportQueryWrapper));
+ EasyExcel.write(response.getOutputStream(), EnforceLawReport.class).sheet("鍒楄〃").doWrite(enforcelawReportService.list(enforcelawReportQueryWrapper));
}
}
\ No newline at end of file
diff --git a/ycl-platform/src/main/java/com/ycl/controller/zf/VideowarmEventsreportController.java b/ycl-platform/src/main/java/com/ycl/controller/zf/VideowarmEventsreportController.java
index e192ad8..cd11cac 100644
--- a/ycl-platform/src/main/java/com/ycl/controller/zf/VideowarmEventsreportController.java
+++ b/ycl-platform/src/main/java/com/ycl/controller/zf/VideowarmEventsreportController.java
@@ -7,9 +7,8 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ycl.api.CommonResult;
import com.ycl.controller.BaseController;
-import com.ycl.entity.platform.zf.EnforcelawReport;
-import com.ycl.entity.platform.zf.VideowarmEventsreport;
-import com.ycl.service.platform.zf.IVideowarmEventsreportService;
+import com.ycl.entity.zf.VideoWarnEventsReport;
+import com.ycl.service.zf.IVideowarmEventsreportService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.SneakyThrows;
@@ -20,7 +19,6 @@
import java.net.URLEncoder;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
-import java.util.stream.Collectors;
/**
* <p>
@@ -49,7 +47,7 @@
@RequestParam(required = false) Integer current,
@RequestParam(required = false) Integer size
) {
- Page<VideowarmEventsreport> page = new Page<>();
+ Page<VideoWarnEventsReport> page = new Page<>();
page.setCurrent(current);
page.setSize(size);
return CommonResult.success(iVideowarmEventsreportService.selectPageVo(page,startTime,endTime,eventName,eventType,eventLocation,eventRegion));
@@ -57,13 +55,13 @@
@GetMapping("/search/one")
@ApiOperation("鏌ヨ杩濊鎯呭喌璇︽儏")
public CommonResult getOne(@RequestParam Integer id) {
- return CommonResult.success(iVideowarmEventsreportService.getOne(new QueryWrapper<VideowarmEventsreport>().eq("id", id)));
+ return CommonResult.success(iVideowarmEventsreportService.getOne(new QueryWrapper<VideoWarnEventsReport>().eq("id", id)));
}
@PostMapping("/add")
@ApiOperation("娣诲姞杩濊鎯呭喌璇︽儏")
- public CommonResult add(@RequestBody VideowarmEventsreport videowarmEventsreport) {
- return CommonResult.success(iVideowarmEventsreportService.save(videowarmEventsreport));
+ public CommonResult add(@RequestBody VideoWarnEventsReport videoWarnEventsReport) {
+ return CommonResult.success(iVideowarmEventsreportService.save(videoWarnEventsReport));
}
@DeleteMapping("/delete")
@@ -74,8 +72,8 @@
@PutMapping("/update")
@ApiOperation("淇敼杩濊鎯呭喌璇︽儏")
- public CommonResult modify(@RequestBody VideowarmEventsreport videowarmEventsreport) {
- return CommonResult.success(iVideowarmEventsreportService.updateById(videowarmEventsreport));
+ public CommonResult modify(@RequestBody VideoWarnEventsReport videoWarnEventsReport) {
+ return CommonResult.success(iVideowarmEventsreportService.updateById(videoWarnEventsReport));
}
@GetMapping("/download")
@@ -88,7 +86,7 @@
@RequestParam(required = false) String eventLocation,
@RequestParam(required = false) String eventRegion,
HttpServletResponse response) {
- QueryWrapper<VideowarmEventsreport> VideowarmEventsreportQueryWrapper = new QueryWrapper<>();
+ QueryWrapper<VideoWarnEventsReport> VideowarmEventsreportQueryWrapper = new QueryWrapper<>();
if (StringUtils.isNotBlank(startTime) && StringUtils.isNotBlank(endTime)) {
VideowarmEventsreportQueryWrapper.between("cTime", startTime, endTime);
}
@@ -107,6 +105,6 @@
response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
response.setCharacterEncoding("utf-8");
response.setHeader("Content-disposition", "attachment;filename=" + LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd")) + URLEncoder.encode("杩濊鎯呭喌" + ".xlsx", "utf-8"));
- EasyExcel.write(response.getOutputStream(), VideowarmEventsreport.class).sheet("鍒楄〃").doWrite(iVideowarmEventsreportService.list(VideowarmEventsreportQueryWrapper));
+ EasyExcel.write(response.getOutputStream(), VideoWarnEventsReport.class).sheet("鍒楄〃").doWrite(iVideowarmEventsreportService.list(VideowarmEventsreportQueryWrapper));
}
}
\ No newline at end of file
diff --git a/ycl-platform/src/main/java/com/ycl/controller/zf/ViolateRuleController.java b/ycl-platform/src/main/java/com/ycl/controller/zf/ViolateRuleController.java
index 432caeb..f2305d0 100644
--- a/ycl-platform/src/main/java/com/ycl/controller/zf/ViolateRuleController.java
+++ b/ycl-platform/src/main/java/com/ycl/controller/zf/ViolateRuleController.java
@@ -1,7 +1,7 @@
package com.ycl.controller.zf;
import com.ycl.api.CommonResult;
-import com.ycl.service.platform.zf.IEnforcelawReportService;
+import com.ycl.service.zf.IEnforcelawReportService;
import com.ycl.vo.zf.ZfVO;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
diff --git a/ycl-common/src/main/java/com/ycl/entity/platform/dict/DatabaseDictionary.java b/ycl-platform/src/main/java/com/ycl/entity/dict/DatabaseDictionary.java
similarity index 95%
rename from ycl-common/src/main/java/com/ycl/entity/platform/dict/DatabaseDictionary.java
rename to ycl-platform/src/main/java/com/ycl/entity/dict/DatabaseDictionary.java
index 5babd87..e537c8d 100644
--- a/ycl-common/src/main/java/com/ycl/entity/platform/dict/DatabaseDictionary.java
+++ b/ycl-platform/src/main/java/com/ycl/entity/dict/DatabaseDictionary.java
@@ -1,4 +1,4 @@
-package com.ycl.entity.platform.dict;
+package com.ycl.entity.dict;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
diff --git a/ycl-common/src/main/java/com/ycl/entity/platform/portal/UmsThirdApplications.java b/ycl-platform/src/main/java/com/ycl/entity/portal/ThirdApplications.java
similarity index 91%
rename from ycl-common/src/main/java/com/ycl/entity/platform/portal/UmsThirdApplications.java
rename to ycl-platform/src/main/java/com/ycl/entity/portal/ThirdApplications.java
index 3b35d0c..d3b76a0 100644
--- a/ycl-common/src/main/java/com/ycl/entity/platform/portal/UmsThirdApplications.java
+++ b/ycl-platform/src/main/java/com/ycl/entity/portal/ThirdApplications.java
@@ -1,4 +1,4 @@
-package com.ycl.entity.platform.portal;
+package com.ycl.entity.portal;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
@@ -22,7 +22,7 @@
@Setter
@TableName("ums_third_applications")
@ApiModel(value = "UmsThirdApplications瀵硅薄", description = "绗笁鏂规帴鍙�")
-public class UmsThirdApplications implements Serializable {
+public class ThirdApplications implements Serializable {
private static final long serialVersionUID = 1L;
diff --git a/ycl-common/src/main/java/com/ycl/entity/platform/portal/UmsWebsiteLogo.java b/ycl-platform/src/main/java/com/ycl/entity/portal/WebsiteLogo.java
similarity index 92%
rename from ycl-common/src/main/java/com/ycl/entity/platform/portal/UmsWebsiteLogo.java
rename to ycl-platform/src/main/java/com/ycl/entity/portal/WebsiteLogo.java
index b65e3cc..ab52710 100644
--- a/ycl-common/src/main/java/com/ycl/entity/platform/portal/UmsWebsiteLogo.java
+++ b/ycl-platform/src/main/java/com/ycl/entity/portal/WebsiteLogo.java
@@ -1,4 +1,4 @@
-package com.ycl.entity.platform.portal;
+package com.ycl.entity.portal;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
@@ -23,7 +23,7 @@
@Setter
@TableName("ums_website_logo")
@ApiModel(value = "UmsWebsiteLogo瀵硅薄", description = "logo")
-public class UmsWebsiteLogo implements Serializable {
+public class WebsiteLogo implements Serializable {
private static final long serialVersionUID = 1L;
diff --git a/ycl-common/src/main/java/com/ycl/entity/platform/region/SccgRegion.java b/ycl-platform/src/main/java/com/ycl/entity/region/SccgRegion.java
similarity index 91%
rename from ycl-common/src/main/java/com/ycl/entity/platform/region/SccgRegion.java
rename to ycl-platform/src/main/java/com/ycl/entity/region/SccgRegion.java
index 1b1df03..2800a93 100644
--- a/ycl-common/src/main/java/com/ycl/entity/platform/region/SccgRegion.java
+++ b/ycl-platform/src/main/java/com/ycl/entity/region/SccgRegion.java
@@ -1,4 +1,4 @@
-package com.ycl.entity.platform.region;
+package com.ycl.entity.region;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
@@ -6,7 +6,6 @@
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import lombok.EqualsAndHashCode;
-import org.apache.catalina.LifecycleState;
import java.io.Serializable;
import java.util.List;
diff --git a/ycl-common/src/main/java/com/ycl/entity/platform/store/StoreInfo.java b/ycl-platform/src/main/java/com/ycl/entity/store/StoreInfo.java
similarity index 68%
rename from ycl-common/src/main/java/com/ycl/entity/platform/store/StoreInfo.java
rename to ycl-platform/src/main/java/com/ycl/entity/store/StoreInfo.java
index f5b8665..89cb0e4 100644
--- a/ycl-common/src/main/java/com/ycl/entity/platform/store/StoreInfo.java
+++ b/ycl-platform/src/main/java/com/ycl/entity/store/StoreInfo.java
@@ -1,6 +1,7 @@
-package com.ycl.entity.platform.store;
+package com.ycl.entity.store;
import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
@@ -21,7 +22,7 @@
*/
@Getter
@Setter
-@TableName("ums_store_storeinfo")
+@TableName("ums_store_store_info")
@NoArgsConstructor
@AllArgsConstructor
@ApiModel(value = "StoreInfo瀵硅薄", description = "")
@@ -36,25 +37,32 @@
private Integer id;
@ApiModelProperty("濮撳悕")
+ @TableField("owner")
private String owner;
@ApiModelProperty("闂ㄥ簵鍚嶇О")
- private String storename;
+ @TableField("store_name")
+ private String storeName;
@ApiModelProperty("鑱旂郴鏂瑰紡")
+ @TableField("contact")
private String contact;
@ApiModelProperty("鍦板潃")
- private String storeaddr;
+ @TableField("store_address")
+ private String storeAddress;
@ApiModelProperty("鐓х墖")
- private String storephoto;
+ @TableField("store_photo")
+ private String storePhoto;
@ApiModelProperty("韬唤璇佷俊鎭�")
- private String idcardinfo;
+ @TableField("id_card")
+ private String idCardInfo;
@ApiModelProperty("闂ㄥ簵绉垎")
- private BigDecimal storescore;
+ @TableField("store_score")
+ private BigDecimal storeScore;
}
diff --git a/ycl-common/src/main/java/com/ycl/entity/platform/store/StoreScoreRule.java b/ycl-platform/src/main/java/com/ycl/entity/store/StoreScoreRule.java
similarity index 96%
rename from ycl-common/src/main/java/com/ycl/entity/platform/store/StoreScoreRule.java
rename to ycl-platform/src/main/java/com/ycl/entity/store/StoreScoreRule.java
index 326a6e4..2517486 100644
--- a/ycl-common/src/main/java/com/ycl/entity/platform/store/StoreScoreRule.java
+++ b/ycl-platform/src/main/java/com/ycl/entity/store/StoreScoreRule.java
@@ -1,4 +1,4 @@
-package com.ycl.entity.platform.store;
+package com.ycl.entity.store;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
diff --git a/ycl-common/src/main/java/com/ycl/entity/platform/zf/EnforcelawReport.java b/ycl-platform/src/main/java/com/ycl/entity/zf/EnforceLawReport.java
similarity index 75%
rename from ycl-common/src/main/java/com/ycl/entity/platform/zf/EnforcelawReport.java
rename to ycl-platform/src/main/java/com/ycl/entity/zf/EnforceLawReport.java
index 391b397..39e82c2 100644
--- a/ycl-common/src/main/java/com/ycl/entity/platform/zf/EnforcelawReport.java
+++ b/ycl-platform/src/main/java/com/ycl/entity/zf/EnforceLawReport.java
@@ -1,4 +1,4 @@
-package com.ycl.entity.platform.zf;
+package com.ycl.entity.zf;
import com.alibaba.excel.annotation.ExcelProperty;
import com.baomidou.mybatisplus.annotation.IdType;
@@ -22,8 +22,8 @@
*/
@Data
@EqualsAndHashCode(callSuper = false)
-@TableName("ums_enforcelaw_report")
-public class EnforcelawReport implements Serializable {
+@TableName("ums_enforce_law_report")
+public class EnforceLawReport implements Serializable {
private static final long serialVersionUID = 1L;
@@ -36,8 +36,8 @@
/**
* 杩濇硶/杩濆缓淇℃伅鏉ユ簮锛屽瓧鍏搁」
*/
- @TableField("infoResoure")
- private String infoResoure;
+ @TableField("info_resource")
+ private String infoResource;
/**
* 鍙楃悊浜�
@@ -48,7 +48,7 @@
/**
* 闂绫诲瀷
*/
- @TableField("problemTypes")
+ @TableField("problem_types")
private String problemTypes;
/**
@@ -62,7 +62,6 @@
*/
@TableField("county")
private String county;
-
/**
* 鎵�灞炶閬�
*/
@@ -72,8 +71,8 @@
/**
* 浜嬪彂鍦板潃
*/
- @TableField("afAddr")
- private String afAddr;
+ @TableField("address")
+ private String address;
/**
* 涓炬姤浜�
@@ -96,89 +95,89 @@
/**
* 闂鎻忚堪
*/
- @TableField("problemDesc")
+ @TableField("problem_desc")
private String problemDesc;
/**
* 鎵ф硶浜�
*/
- @TableField("lawOfficer")
+ @TableField("law_officer")
private String lawOfficer;
/**
* 褰撲簨浜哄鍚�
*/
- @TableField("partiesName")
+ @TableField("parties_name")
@ExcelProperty(value = "褰撲簨浜哄鍚�",index = 0)
private String partiesName;
/**
* 褰撲簨浜鸿韩浠借瘉鍙风爜
*/
- @TableField("partiesID")
+ @TableField("parties_id_card")
@ExcelProperty(value = "褰撲簨浜鸿韩浠借瘉鍙风爜",index = 1)
private String partiesID;
/**
* 褰撲簨浜鸿仈绯荤數璇�
*/
- @TableField("partiesPhone")
+ @TableField("parties_phone")
@ExcelProperty(value = "褰撲簨浜鸿仈绯荤數璇�",index = 2)
private String partiesPhone;
/**
* 韬唤璇佹闈㈢収鐗�
*/
- @TableField("idPositiveImage")
- private String idPositiveImage;
+ @TableField("id_card_positive")
+ private String idCardPositive;
/**
* 韬唤璇佸弽闈㈢収鐗�
*/
- @TableField("idNegativeImage")
- private String idNegativeImage;
+ @TableField("id_card_negative")
+ private String idCardNegative;
/**
* 杩濆缓鍏蜂綋浣嶇疆
*/
- @TableField("illegalBuildLocation")
+ @TableField("illegal_build_location")
private String illegalBuildLocation;
/**
* 杩濇硶寤鸿闀�(绫�)
*/
- @TableField("illegalBuildLength")
+ @TableField("illegal_build_length")
private BigDecimal illegalBuildLength;
/**
* 杩濇硶寤鸿瀹�(绫�)
*/
- @TableField("illegalBuildWidth")
+ @TableField("illegal_build_width")
private BigDecimal illegalBuildWidth;
/**
* 杩濇硶寤鸿楂�(绫�)
*/
- @TableField("illegalBuildHigh")
- private BigDecimal illegalBuildHigh;
+ @TableField("illegal_build_height")
+ private BigDecimal illegalBuildHeight;
/**
* 杩濇硶寤虹瓚鏉愭枡
*/
- @TableField("illegalBuildMaterials")
+ @TableField("illegal_build_materials")
private String illegalBuildMaterials;
/**
* 涓婁紶闄勪欢(杩濇硶鐓х墖)
*/
- @TableField("illegalPhotos")
+ @TableField("illegal_photos")
private String illegalPhotos;
/**
* 鏁存敼鍚庣収鐗�
*/
- @TableField("rectifidPhotos")
- private String rectifidPhotos;
+ @TableField("rectification_photos")
+ private String rectificationPhotos;
/**
* 涓婁紶闄勪欢
@@ -189,7 +188,7 @@
/**
* 澶勭疆澶囨敞淇℃伅
*/
- @TableField("disposeRemark")
+ @TableField("dispose_remark")
private String disposeRemark;
/**
@@ -207,8 +206,8 @@
/**
* 鍒涘缓鏃堕棿
*/
- @TableField("cTime")
- private LocalDateTime cTime;
+ @TableField("create_time")
+ private LocalDateTime createTime;
/**
* 鎵�灞炵ぞ鍖�
diff --git a/ycl-common/src/main/java/com/ycl/entity/platform/zf/VideowarmEventsreport.java b/ycl-platform/src/main/java/com/ycl/entity/zf/VideoWarnEventsReport.java
similarity index 73%
rename from ycl-common/src/main/java/com/ycl/entity/platform/zf/VideowarmEventsreport.java
rename to ycl-platform/src/main/java/com/ycl/entity/zf/VideoWarnEventsReport.java
index 31eae74..1aa4b6b 100644
--- a/ycl-common/src/main/java/com/ycl/entity/platform/zf/VideowarmEventsreport.java
+++ b/ycl-platform/src/main/java/com/ycl/entity/zf/VideoWarnEventsReport.java
@@ -1,4 +1,4 @@
-package com.ycl.entity.platform.zf;
+package com.ycl.entity.zf;
import com.alibaba.excel.annotation.ExcelIgnore;
import com.alibaba.excel.annotation.ExcelProperty;
@@ -23,8 +23,8 @@
*/
@Data
@EqualsAndHashCode(callSuper = false)
-@TableName("ums_videowarm_eventsreport")
-public class VideowarmEventsreport implements Serializable {
+@TableName("ums_video_warn_events_report")
+public class VideoWarnEventsReport implements Serializable {
private static final long serialVersionUID = 1L;
@@ -38,58 +38,58 @@
/**
* 浜嬩欢鍚嶇О
*/
- @TableField("eventName")
+ @TableField("event_name")
@ExcelProperty(value = "浜嬩欢鍚嶇О",index = 0)
private String eventName;
/**
* 鎵�灞炵被鍨�
*/
- @TableField("eventType")
+ @TableField("event_type")
@ExcelProperty(value = "鎵�灞炵被鍨�",index = 1)
private String eventType;
/**
* 鏄惁鍏宠仈鍟嗛摵
*/
- @TableField("associatedShops")
+ @TableField("associated_shops")
private String associatedShops;
/**
* 鎵�灞炰綅缃�(鍦板浘涓婂畾浣�)
*/
- @TableField("eventLocation")
+ @TableField("event_location")
private String eventLocation;
/**
* 鎵�灞炲尯鍩�
*/
- @TableField("eventRegion")
+ @TableField("event_region")
private String eventRegion;
/**
* 涓婁紶瑙嗛/鍥剧墖(鎴浘)
*/
- @TableField("videoOrImage")
- private String videoOrImage;
+ @TableField("media")
+ private String media;
/**
* 鍐呭鎻忚堪(杩濇硶杩濈珷鎻忚堪)
*/
- @TableField("contentDesc")
- private String contentDesc;
+ @TableField("content")
+ private String content;
/**
* 鏃堕棿淇℃伅
*/
- @TableField("eventTime")
+ @TableField("event_time")
private LocalDate eventTime;
/**
* 鍒涘缓鏃堕棿
*/
- @TableField("cTime")
- private LocalDateTime cTime;
+ @TableField("create_time")
+ private LocalDateTime createTime;
}
diff --git a/ycl-common/src/main/java/com/ycl/mapper/platform/dict/DatabaseDictionaryMapper.java b/ycl-platform/src/main/java/com/ycl/mapper/dict/DatabaseDictionaryMapper.java
similarity index 70%
rename from ycl-common/src/main/java/com/ycl/mapper/platform/dict/DatabaseDictionaryMapper.java
rename to ycl-platform/src/main/java/com/ycl/mapper/dict/DatabaseDictionaryMapper.java
index 6376e60..d151e13 100644
--- a/ycl-common/src/main/java/com/ycl/mapper/platform/dict/DatabaseDictionaryMapper.java
+++ b/ycl-platform/src/main/java/com/ycl/mapper/dict/DatabaseDictionaryMapper.java
@@ -1,7 +1,7 @@
-package com.ycl.mapper.platform.dict;
+package com.ycl.mapper.dict;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.ycl.entity.platform.dict.DatabaseDictionary;
+import com.ycl.entity.dict.DatabaseDictionary;
/**
* <p>
diff --git a/ycl-platform/src/main/java/com/ycl/mapper/portal/UmsThirdApplicationsMapper.java b/ycl-platform/src/main/java/com/ycl/mapper/portal/UmsThirdApplicationsMapper.java
new file mode 100644
index 0000000..ba1904b
--- /dev/null
+++ b/ycl-platform/src/main/java/com/ycl/mapper/portal/UmsThirdApplicationsMapper.java
@@ -0,0 +1,16 @@
+package com.ycl.mapper.portal;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ycl.entity.portal.ThirdApplications;
+
+/**
+ * <p>
+ * Mapper 鎺ュ彛
+ * </p>
+ *
+ * @author wl
+ * @since 2022-09-08
+ */
+public interface UmsThirdApplicationsMapper extends BaseMapper<ThirdApplications> {
+
+}
diff --git a/ycl-platform/src/main/java/com/ycl/mapper/portal/UmsWebsiteLogoMapper.java b/ycl-platform/src/main/java/com/ycl/mapper/portal/UmsWebsiteLogoMapper.java
new file mode 100644
index 0000000..3649615
--- /dev/null
+++ b/ycl-platform/src/main/java/com/ycl/mapper/portal/UmsWebsiteLogoMapper.java
@@ -0,0 +1,16 @@
+package com.ycl.mapper.portal;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ycl.entity.portal.WebsiteLogo;
+
+/**
+ * <p>
+ * Mapper 鎺ュ彛
+ * </p>
+ *
+ * @author wl
+ * @since 2022-09-07
+ */
+public interface UmsWebsiteLogoMapper extends BaseMapper<WebsiteLogo> {
+
+}
diff --git a/ycl-common/src/main/java/com/ycl/mapper/platform/region/SccgRegionMapper.java b/ycl-platform/src/main/java/com/ycl/mapper/region/SccgRegionMapper.java
similarity index 71%
rename from ycl-common/src/main/java/com/ycl/mapper/platform/region/SccgRegionMapper.java
rename to ycl-platform/src/main/java/com/ycl/mapper/region/SccgRegionMapper.java
index 9032082..78eb826 100644
--- a/ycl-common/src/main/java/com/ycl/mapper/platform/region/SccgRegionMapper.java
+++ b/ycl-platform/src/main/java/com/ycl/mapper/region/SccgRegionMapper.java
@@ -1,7 +1,7 @@
-package com.ycl.mapper.platform.region;
+package com.ycl.mapper.region;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.ycl.entity.platform.region.SccgRegion;
+import com.ycl.entity.region.SccgRegion;
/**
* <p>
diff --git a/ycl-common/src/main/java/com/ycl/mapper/platform/store/StoreInfoMapper.java b/ycl-platform/src/main/java/com/ycl/mapper/store/StoreInfoMapper.java
similarity index 70%
rename from ycl-common/src/main/java/com/ycl/mapper/platform/store/StoreInfoMapper.java
rename to ycl-platform/src/main/java/com/ycl/mapper/store/StoreInfoMapper.java
index 2450bf4..829546c 100644
--- a/ycl-common/src/main/java/com/ycl/mapper/platform/store/StoreInfoMapper.java
+++ b/ycl-platform/src/main/java/com/ycl/mapper/store/StoreInfoMapper.java
@@ -1,7 +1,7 @@
-package com.ycl.mapper.platform.store;
+package com.ycl.mapper.store;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.ycl.entity.platform.store.StoreInfo;
+import com.ycl.entity.store.StoreInfo;
/**
* <p>
diff --git a/ycl-common/src/main/java/com/ycl/mapper/platform/store/StoreScoreRuleMapper.java b/ycl-platform/src/main/java/com/ycl/mapper/store/StoreScoreRuleMapper.java
similarity index 72%
rename from ycl-common/src/main/java/com/ycl/mapper/platform/store/StoreScoreRuleMapper.java
rename to ycl-platform/src/main/java/com/ycl/mapper/store/StoreScoreRuleMapper.java
index 9fa72e7..9a553a0 100644
--- a/ycl-common/src/main/java/com/ycl/mapper/platform/store/StoreScoreRuleMapper.java
+++ b/ycl-platform/src/main/java/com/ycl/mapper/store/StoreScoreRuleMapper.java
@@ -1,7 +1,7 @@
-package com.ycl.mapper.platform.store;
+package com.ycl.mapper.store;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.ycl.entity.platform.store.StoreScoreRule;
+import com.ycl.entity.store.StoreScoreRule;
/**
* <p>
diff --git a/ycl-common/src/main/java/com/ycl/mapper/platform/zf/EnforcelawReportMapper.java b/ycl-platform/src/main/java/com/ycl/mapper/zf/EnforcelawReportMapper.java
similarity index 74%
rename from ycl-common/src/main/java/com/ycl/mapper/platform/zf/EnforcelawReportMapper.java
rename to ycl-platform/src/main/java/com/ycl/mapper/zf/EnforcelawReportMapper.java
index bbb2d99..7800abf 100644
--- a/ycl-common/src/main/java/com/ycl/mapper/platform/zf/EnforcelawReportMapper.java
+++ b/ycl-platform/src/main/java/com/ycl/mapper/zf/EnforcelawReportMapper.java
@@ -1,8 +1,8 @@
-package com.ycl.mapper.platform.zf;
+package com.ycl.mapper.zf;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ycl.entity.platform.zf.EnforcelawReport;
+import com.ycl.entity.zf.EnforceLawReport;
/**
* <p>
@@ -12,7 +12,7 @@
* @author lyq
* @since 2022-09-14
*/
-public interface EnforcelawReportMapper extends BaseMapper<EnforcelawReport> {
+public interface EnforcelawReportMapper extends BaseMapper<EnforceLawReport> {
- Page<EnforcelawReport> selectPageVo(Page<EnforcelawReport> page, String startTime, String endTime, String community, String status, String partiesName, String partiesID);
+ Page<EnforceLawReport> selectPageVo(Page<EnforceLawReport> page, String startTime, String endTime, String community, String status, String partiesName, String partiesID);
}
diff --git a/ycl-common/src/main/java/com/ycl/mapper/platform/zf/VideowarmEventsreportMapper.java b/ycl-platform/src/main/java/com/ycl/mapper/zf/VideowarmEventsreportMapper.java
similarity index 61%
rename from ycl-common/src/main/java/com/ycl/mapper/platform/zf/VideowarmEventsreportMapper.java
rename to ycl-platform/src/main/java/com/ycl/mapper/zf/VideowarmEventsreportMapper.java
index 842bbc2..23e893a 100644
--- a/ycl-common/src/main/java/com/ycl/mapper/platform/zf/VideowarmEventsreportMapper.java
+++ b/ycl-platform/src/main/java/com/ycl/mapper/zf/VideowarmEventsreportMapper.java
@@ -1,9 +1,8 @@
-package com.ycl.mapper.platform.zf;
+package com.ycl.mapper.zf;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ycl.entity.platform.zf.EnforcelawReport;
-import com.ycl.entity.platform.zf.VideowarmEventsreport;
+import com.ycl.entity.zf.VideoWarnEventsReport;
/**
* <p>
@@ -13,7 +12,7 @@
* @author wl
* @since 2022-09-16
*/
-public interface VideowarmEventsreportMapper extends BaseMapper<VideowarmEventsreport> {
+public interface VideowarmEventsreportMapper extends BaseMapper<VideoWarnEventsReport> {
- Page selectPageVo(Page<VideowarmEventsreport> page, String startTime, String endTime, String eventLocation, String eventName, String eventType, String eventRegion);
+ Page selectPageVo(Page<VideoWarnEventsReport> page, String startTime, String endTime, String eventLocation, String eventName, String eventType, String eventRegion);
}
diff --git a/ycl-common/src/main/java/com/ycl/service/platform/dict/IDatabaseDictionaryService.java b/ycl-platform/src/main/java/com/ycl/service/dict/IDatabaseDictionaryService.java
similarity index 83%
rename from ycl-common/src/main/java/com/ycl/service/platform/dict/IDatabaseDictionaryService.java
rename to ycl-platform/src/main/java/com/ycl/service/dict/IDatabaseDictionaryService.java
index cab91c8..12d5ace 100644
--- a/ycl-common/src/main/java/com/ycl/service/platform/dict/IDatabaseDictionaryService.java
+++ b/ycl-platform/src/main/java/com/ycl/service/dict/IDatabaseDictionaryService.java
@@ -1,7 +1,7 @@
-package com.ycl.service.platform.dict;
+package com.ycl.service.dict;
import com.baomidou.mybatisplus.extension.service.IService;
-import com.ycl.entity.platform.dict.DatabaseDictionary;
+import com.ycl.entity.dict.DatabaseDictionary;
import java.util.List;
diff --git a/ycl-common/src/main/java/com/ycl/service/platform/dict/impl/DatabaseDictionaryServiceImpl.java b/ycl-platform/src/main/java/com/ycl/service/dict/impl/DatabaseDictionaryServiceImpl.java
similarity index 78%
rename from ycl-common/src/main/java/com/ycl/service/platform/dict/impl/DatabaseDictionaryServiceImpl.java
rename to ycl-platform/src/main/java/com/ycl/service/dict/impl/DatabaseDictionaryServiceImpl.java
index 3d0caac..199aac2 100644
--- a/ycl-common/src/main/java/com/ycl/service/platform/dict/impl/DatabaseDictionaryServiceImpl.java
+++ b/ycl-platform/src/main/java/com/ycl/service/dict/impl/DatabaseDictionaryServiceImpl.java
@@ -1,20 +1,15 @@
-package com.ycl.service.platform.dict.impl;
+package com.ycl.service.dict.impl;
-import cn.hutool.core.collection.CollUtil;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.sql.StringEscape;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ycl.entity.platform.dict.DatabaseDictionary;
-import com.ycl.mapper.platform.dict.DatabaseDictionaryMapper;
-import com.ycl.service.platform.dict.IDatabaseDictionaryService;
+import com.ycl.entity.dict.DatabaseDictionary;
+import com.ycl.mapper.dict.DatabaseDictionaryMapper;
+import com.ycl.service.dict.IDatabaseDictionaryService;
import com.ycl.service.redis.RedisService;
import com.ycl.utils.common.LiveTimeMillisecond;
import com.ycl.utils.redis.RedisKey;
-import io.micrometer.core.instrument.util.StringEscapeUtils;
-import org.apache.commons.lang3.ObjectUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
diff --git a/ycl-platform/src/main/java/com/ycl/service/portal/UmsThirdApplicationsService.java b/ycl-platform/src/main/java/com/ycl/service/portal/UmsThirdApplicationsService.java
new file mode 100644
index 0000000..fb81a73
--- /dev/null
+++ b/ycl-platform/src/main/java/com/ycl/service/portal/UmsThirdApplicationsService.java
@@ -0,0 +1,16 @@
+package com.ycl.service.portal;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ycl.entity.portal.ThirdApplications;
+
+/**
+ * <p>
+ * 鏈嶅姟绫�
+ * </p>
+ *
+ * @author wl
+ * @since 2022-09-08
+ */
+public interface UmsThirdApplicationsService extends IService<ThirdApplications> {
+
+}
diff --git a/ycl-platform/src/main/java/com/ycl/service/portal/UmsWebsiteLogoService.java b/ycl-platform/src/main/java/com/ycl/service/portal/UmsWebsiteLogoService.java
new file mode 100644
index 0000000..cabd876
--- /dev/null
+++ b/ycl-platform/src/main/java/com/ycl/service/portal/UmsWebsiteLogoService.java
@@ -0,0 +1,16 @@
+package com.ycl.service.portal;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ycl.entity.portal.WebsiteLogo;
+
+/**
+ * <p>
+ * 鏈嶅姟绫�
+ * </p>
+ *
+ * @author wl
+ * @since 2022-09-07
+ */
+public interface UmsWebsiteLogoService extends IService<WebsiteLogo> {
+
+}
diff --git a/ycl-platform/src/main/java/com/ycl/service/portal/impl/UmsThirdApplicationsServiceImpl.java b/ycl-platform/src/main/java/com/ycl/service/portal/impl/UmsThirdApplicationsServiceImpl.java
new file mode 100644
index 0000000..bd8e048
--- /dev/null
+++ b/ycl-platform/src/main/java/com/ycl/service/portal/impl/UmsThirdApplicationsServiceImpl.java
@@ -0,0 +1,20 @@
+package com.ycl.service.portal.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ycl.entity.portal.ThirdApplications;
+import com.ycl.mapper.portal.UmsThirdApplicationsMapper;
+import com.ycl.service.portal.UmsThirdApplicationsService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 鏈嶅姟瀹炵幇绫�
+ * </p>
+ *
+ * @author wl
+ * @since 2022-09-08
+ */
+@Service
+public class UmsThirdApplicationsServiceImpl extends ServiceImpl<UmsThirdApplicationsMapper, ThirdApplications> implements UmsThirdApplicationsService {
+
+}
diff --git a/ycl-platform/src/main/java/com/ycl/service/portal/impl/UmsWebsiteLogoServiceImpl.java b/ycl-platform/src/main/java/com/ycl/service/portal/impl/UmsWebsiteLogoServiceImpl.java
new file mode 100644
index 0000000..12a68b3
--- /dev/null
+++ b/ycl-platform/src/main/java/com/ycl/service/portal/impl/UmsWebsiteLogoServiceImpl.java
@@ -0,0 +1,20 @@
+package com.ycl.service.portal.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ycl.entity.portal.WebsiteLogo;
+import com.ycl.mapper.portal.UmsWebsiteLogoMapper;
+import com.ycl.service.portal.UmsWebsiteLogoService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 鏈嶅姟瀹炵幇绫�
+ * </p>
+ *
+ * @author wl
+ * @since 2022-09-07
+ */
+@Service
+public class UmsWebsiteLogoServiceImpl extends ServiceImpl<UmsWebsiteLogoMapper, WebsiteLogo> implements UmsWebsiteLogoService {
+
+}
diff --git a/ycl-common/src/main/java/com/ycl/service/platform/region/ISccgRegionService.java b/ycl-platform/src/main/java/com/ycl/service/region/ISccgRegionService.java
similarity index 78%
rename from ycl-common/src/main/java/com/ycl/service/platform/region/ISccgRegionService.java
rename to ycl-platform/src/main/java/com/ycl/service/region/ISccgRegionService.java
index 0296019..98aff41 100644
--- a/ycl-common/src/main/java/com/ycl/service/platform/region/ISccgRegionService.java
+++ b/ycl-platform/src/main/java/com/ycl/service/region/ISccgRegionService.java
@@ -1,7 +1,7 @@
-package com.ycl.service.platform.region;
+package com.ycl.service.region;
import com.baomidou.mybatisplus.extension.service.IService;
-import com.ycl.entity.platform.region.SccgRegion;
+import com.ycl.entity.region.SccgRegion;
import java.util.List;
diff --git a/ycl-common/src/main/java/com/ycl/service/platform/region/impl/SccgRegionServiceImpl.java b/ycl-platform/src/main/java/com/ycl/service/region/impl/SccgRegionServiceImpl.java
similarity index 91%
rename from ycl-common/src/main/java/com/ycl/service/platform/region/impl/SccgRegionServiceImpl.java
rename to ycl-platform/src/main/java/com/ycl/service/region/impl/SccgRegionServiceImpl.java
index 0da890f..b0ddd36 100644
--- a/ycl-common/src/main/java/com/ycl/service/platform/region/impl/SccgRegionServiceImpl.java
+++ b/ycl-platform/src/main/java/com/ycl/service/region/impl/SccgRegionServiceImpl.java
@@ -1,11 +1,11 @@
-package com.ycl.service.platform.region.impl;
+package com.ycl.service.region.impl;
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ycl.entity.platform.depart.UmsDepart;
-import com.ycl.entity.platform.region.SccgRegion;
-import com.ycl.mapper.platform.region.SccgRegionMapper;
-import com.ycl.service.platform.region.ISccgRegionService;
+import com.ycl.entity.depart.UmsDepart;
+import com.ycl.entity.region.SccgRegion;
+import com.ycl.mapper.region.SccgRegionMapper;
+import com.ycl.service.region.ISccgRegionService;
import com.ycl.service.redis.RedisService;
import com.ycl.utils.common.LiveTimeMillisecond;
import com.ycl.utils.redis.RedisKey;
diff --git a/ycl-common/src/main/java/com/ycl/service/platform/store/StoreInfoService.java b/ycl-platform/src/main/java/com/ycl/service/store/StoreInfoService.java
similarity index 88%
rename from ycl-common/src/main/java/com/ycl/service/platform/store/StoreInfoService.java
rename to ycl-platform/src/main/java/com/ycl/service/store/StoreInfoService.java
index 29f5271..59dca5d 100644
--- a/ycl-common/src/main/java/com/ycl/service/platform/store/StoreInfoService.java
+++ b/ycl-platform/src/main/java/com/ycl/service/store/StoreInfoService.java
@@ -1,8 +1,8 @@
-package com.ycl.service.platform.store;
+package com.ycl.service.store;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
-import com.ycl.entity.platform.store.StoreInfo;
+import com.ycl.entity.store.StoreInfo;
import org.springframework.web.multipart.MultipartFile;
/**
diff --git a/ycl-common/src/main/java/com/ycl/service/platform/store/StoreScoreRuleService.java b/ycl-platform/src/main/java/com/ycl/service/store/StoreScoreRuleService.java
similarity index 88%
rename from ycl-common/src/main/java/com/ycl/service/platform/store/StoreScoreRuleService.java
rename to ycl-platform/src/main/java/com/ycl/service/store/StoreScoreRuleService.java
index e4cfe9a..ea2fc55 100644
--- a/ycl-common/src/main/java/com/ycl/service/platform/store/StoreScoreRuleService.java
+++ b/ycl-platform/src/main/java/com/ycl/service/store/StoreScoreRuleService.java
@@ -1,8 +1,8 @@
-package com.ycl.service.platform.store;
+package com.ycl.service.store;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
-import com.ycl.entity.platform.store.StoreScoreRule;
+import com.ycl.entity.store.StoreScoreRule;
import com.ycl.vo.store.StoreScoreRuleVO;
/**
diff --git a/ycl-common/src/main/java/com/ycl/service/platform/store/impl/StoreInfoServiceImpl.java b/ycl-platform/src/main/java/com/ycl/service/store/impl/StoreInfoServiceImpl.java
similarity index 89%
rename from ycl-common/src/main/java/com/ycl/service/platform/store/impl/StoreInfoServiceImpl.java
rename to ycl-platform/src/main/java/com/ycl/service/store/impl/StoreInfoServiceImpl.java
index 08a5d4c..33b9652 100644
--- a/ycl-common/src/main/java/com/ycl/service/platform/store/impl/StoreInfoServiceImpl.java
+++ b/ycl-platform/src/main/java/com/ycl/service/store/impl/StoreInfoServiceImpl.java
@@ -1,14 +1,14 @@
-package com.ycl.service.platform.store.impl;
+package com.ycl.service.store.impl;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ycl.entity.platform.store.StoreInfo;
+import com.ycl.entity.store.StoreInfo;
import com.ycl.enums.common.ResultCode;
import com.ycl.exception.ApiException;
-import com.ycl.mapper.platform.store.StoreInfoMapper;
-import com.ycl.service.platform.store.StoreInfoService;
+import com.ycl.mapper.store.StoreInfoMapper;
+import com.ycl.service.store.StoreInfoService;
import com.ycl.utils.ExcelUtils;
import com.ycl.vo.store.StoreInfoExcelVo;
import lombok.extern.slf4j.Slf4j;
@@ -37,7 +37,7 @@
Page<StoreInfo> page = new Page<>(pageSize, pageNum);
LambdaQueryWrapper<StoreInfo> wrapper = new LambdaQueryWrapper<>();
if (StrUtil.isNotEmpty(keyword)) {
- wrapper.like(StoreInfo::getStorename, keyword);
+ wrapper.like(StoreInfo::getStoreName, keyword);
}
return page(page, wrapper);
}
diff --git a/ycl-common/src/main/java/com/ycl/service/platform/store/impl/StoreScoreRuleServiceImpl.java b/ycl-platform/src/main/java/com/ycl/service/store/impl/StoreScoreRuleServiceImpl.java
similarity index 87%
rename from ycl-common/src/main/java/com/ycl/service/platform/store/impl/StoreScoreRuleServiceImpl.java
rename to ycl-platform/src/main/java/com/ycl/service/store/impl/StoreScoreRuleServiceImpl.java
index ab9caa9..5185b18 100644
--- a/ycl-common/src/main/java/com/ycl/service/platform/store/impl/StoreScoreRuleServiceImpl.java
+++ b/ycl-platform/src/main/java/com/ycl/service/store/impl/StoreScoreRuleServiceImpl.java
@@ -1,13 +1,13 @@
-package com.ycl.service.platform.store.impl;
+package com.ycl.service.store.impl;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ycl.entity.platform.store.StoreScoreRule;
+import com.ycl.entity.store.StoreScoreRule;
import com.ycl.exception.ApiException;
-import com.ycl.mapper.platform.store.StoreScoreRuleMapper;
-import com.ycl.service.platform.store.StoreScoreRuleService;
+import com.ycl.mapper.store.StoreScoreRuleMapper;
+import com.ycl.service.store.StoreScoreRuleService;
import com.ycl.vo.store.StoreScoreRuleVO;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
diff --git a/ycl-common/src/main/java/com/ycl/service/platform/zf/IEnforcelawReportService.java b/ycl-platform/src/main/java/com/ycl/service/zf/IEnforcelawReportService.java
similarity index 78%
rename from ycl-common/src/main/java/com/ycl/service/platform/zf/IEnforcelawReportService.java
rename to ycl-platform/src/main/java/com/ycl/service/zf/IEnforcelawReportService.java
index edbd11f..ce8818e 100644
--- a/ycl-common/src/main/java/com/ycl/service/platform/zf/IEnforcelawReportService.java
+++ b/ycl-platform/src/main/java/com/ycl/service/zf/IEnforcelawReportService.java
@@ -1,8 +1,8 @@
-package com.ycl.service.platform.zf;
+package com.ycl.service.zf;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
-import com.ycl.entity.platform.zf.EnforcelawReport;
+import com.ycl.entity.zf.EnforceLawReport;
import com.ycl.vo.zf.ZfVO;
/**
@@ -13,7 +13,7 @@
* @author wl
* @since 2022-09-14
*/
-public interface IEnforcelawReportService extends IService<EnforcelawReport> {
+public interface IEnforcelawReportService extends IService<EnforceLawReport> {
/**
* 涓婃姤
@@ -22,5 +22,5 @@
void report(ZfVO.ZfReportVO params);
- Page<EnforcelawReport> selectPageVo(Page<EnforcelawReport> page, String startTime, String endTime, String community, String status, String partiesName, String partiesID);
+ Page<EnforceLawReport> selectPageVo(Page<EnforceLawReport> page, String startTime, String endTime, String community, String status, String partiesName, String partiesID);
}
diff --git a/ycl-common/src/main/java/com/ycl/service/platform/zf/IVideowarmEventsreportService.java b/ycl-platform/src/main/java/com/ycl/service/zf/IVideowarmEventsreportService.java
similarity index 62%
rename from ycl-common/src/main/java/com/ycl/service/platform/zf/IVideowarmEventsreportService.java
rename to ycl-platform/src/main/java/com/ycl/service/zf/IVideowarmEventsreportService.java
index 107cef3..965e2dc 100644
--- a/ycl-common/src/main/java/com/ycl/service/platform/zf/IVideowarmEventsreportService.java
+++ b/ycl-platform/src/main/java/com/ycl/service/zf/IVideowarmEventsreportService.java
@@ -1,9 +1,8 @@
-package com.ycl.service.platform.zf;
+package com.ycl.service.zf;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
-import com.ycl.entity.platform.zf.EnforcelawReport;
-import com.ycl.entity.platform.zf.VideowarmEventsreport;
+import com.ycl.entity.zf.VideoWarnEventsReport;
/**
* <p>
@@ -13,7 +12,7 @@
* @author wl
* @since 2022-09-16
*/
-public interface IVideowarmEventsreportService extends IService<VideowarmEventsreport> {
+public interface IVideowarmEventsreportService extends IService<VideoWarnEventsReport> {
- Page selectPageVo(Page<VideowarmEventsreport> enforcelawReportPage, String startTime, String endTime, String eventName, String eventType, String eventLocation, String eventRegion);
+ Page selectPageVo(Page<VideoWarnEventsReport> enforcelawReportPage, String startTime, String endTime, String eventName, String eventType, String eventLocation, String eventRegion);
}
\ No newline at end of file
diff --git a/ycl-common/src/main/java/com/ycl/service/platform/zf/impl/EnforcelawReportServiceImpl.java b/ycl-platform/src/main/java/com/ycl/service/zf/impl/EnforcelawReportServiceImpl.java
similarity index 76%
rename from ycl-common/src/main/java/com/ycl/service/platform/zf/impl/EnforcelawReportServiceImpl.java
rename to ycl-platform/src/main/java/com/ycl/service/zf/impl/EnforcelawReportServiceImpl.java
index 427b35a..0354de9 100644
--- a/ycl-common/src/main/java/com/ycl/service/platform/zf/impl/EnforcelawReportServiceImpl.java
+++ b/ycl-platform/src/main/java/com/ycl/service/zf/impl/EnforcelawReportServiceImpl.java
@@ -1,12 +1,12 @@
-package com.ycl.service.platform.zf.impl;
+package com.ycl.service.zf.impl;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ycl.entity.platform.zf.EnforcelawReport;
+import com.ycl.entity.zf.EnforceLawReport;
import com.ycl.enums.common.ResultCode;
import com.ycl.exception.ApiException;
-import com.ycl.mapper.platform.zf.EnforcelawReportMapper;
-import com.ycl.service.platform.zf.IEnforcelawReportService;
+import com.ycl.mapper.zf.EnforcelawReportMapper;
+import com.ycl.service.zf.IEnforcelawReportService;
import com.ycl.vo.zf.ZfVO;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
@@ -23,7 +23,7 @@
* @since 2022-09-14
*/
@Service
-public class EnforcelawReportServiceImpl extends ServiceImpl<EnforcelawReportMapper, EnforcelawReport> implements IEnforcelawReportService {
+public class EnforcelawReportServiceImpl extends ServiceImpl<EnforcelawReportMapper, EnforceLawReport> implements IEnforcelawReportService {
@Resource
private EnforcelawReportMapper enforcelawReportMapper;
@@ -31,7 +31,7 @@
@Override
@Transactional(rollbackFor = Exception.class)
public void report(ZfVO.ZfReportVO params) {
- EnforcelawReport enforcelawReport = new EnforcelawReport();
+ EnforceLawReport enforcelawReport = new EnforceLawReport();
BeanUtils.copyProperties(params, enforcelawReport);
if (enforcelawReportMapper.insert(enforcelawReport) != 1) {
throw new ApiException(ResultCode.RECORD_SAVE_FAIL);
@@ -39,7 +39,7 @@
}
@Override
- public Page<EnforcelawReport> selectPageVo(Page<EnforcelawReport> page, String startTime, String endTime, String community, String status, String partiesName, String partiesID) {
+ public Page<EnforceLawReport> selectPageVo(Page<EnforceLawReport> page, String startTime, String endTime, String community, String status, String partiesName, String partiesID) {
return enforcelawReportMapper.selectPageVo(page, startTime, endTime, community, status, partiesName, partiesID);
}
}
diff --git a/ycl-common/src/main/java/com/ycl/service/platform/zf/impl/VideowarmEventsreportServiceImpl.java b/ycl-platform/src/main/java/com/ycl/service/zf/impl/VideowarmEventsreportServiceImpl.java
similarity index 64%
rename from ycl-common/src/main/java/com/ycl/service/platform/zf/impl/VideowarmEventsreportServiceImpl.java
rename to ycl-platform/src/main/java/com/ycl/service/zf/impl/VideowarmEventsreportServiceImpl.java
index 43f9b79..0554af1 100644
--- a/ycl-common/src/main/java/com/ycl/service/platform/zf/impl/VideowarmEventsreportServiceImpl.java
+++ b/ycl-platform/src/main/java/com/ycl/service/zf/impl/VideowarmEventsreportServiceImpl.java
@@ -1,11 +1,10 @@
-package com.ycl.service.platform.zf.impl;
+package com.ycl.service.zf.impl;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ycl.entity.platform.zf.EnforcelawReport;
-import com.ycl.entity.platform.zf.VideowarmEventsreport;
-import com.ycl.mapper.platform.zf.VideowarmEventsreportMapper;
-import com.ycl.service.platform.zf.IVideowarmEventsreportService;
+import com.ycl.entity.zf.VideoWarnEventsReport;
+import com.ycl.mapper.zf.VideowarmEventsreportMapper;
+import com.ycl.service.zf.IVideowarmEventsreportService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -18,13 +17,13 @@
* @since 2022-09-16
*/
@Service
-public class VideowarmEventsreportServiceImpl extends ServiceImpl<VideowarmEventsreportMapper, VideowarmEventsreport> implements IVideowarmEventsreportService {
+public class VideowarmEventsreportServiceImpl extends ServiceImpl<VideowarmEventsreportMapper, VideoWarnEventsReport> implements IVideowarmEventsreportService {
@Autowired
VideowarmEventsreportMapper eventsreportMapper;
@Override
- public Page selectPageVo(Page<VideowarmEventsreport> page, String startTime, String endTime, String eventName, String eventType, String eventLocation, String eventRegion) {
+ public Page selectPageVo(Page<VideoWarnEventsReport> page, String startTime, String endTime, String eventName, String eventType, String eventLocation, String eventRegion) {
return eventsreportMapper.selectPageVo(page, startTime, endTime, eventLocation, eventName, eventType, eventRegion);
}
}
diff --git a/ycl-common/src/main/resources/mapper/platform/dict/DatabaseDictionaryMapper.xml b/ycl-platform/src/main/resources/mapper/dict/DatabaseDictionaryMapper.xml
similarity index 76%
rename from ycl-common/src/main/resources/mapper/platform/dict/DatabaseDictionaryMapper.xml
rename to ycl-platform/src/main/resources/mapper/dict/DatabaseDictionaryMapper.xml
index fade9ae..f327df6 100644
--- a/ycl-common/src/main/resources/mapper/platform/dict/DatabaseDictionaryMapper.xml
+++ b/ycl-platform/src/main/resources/mapper/dict/DatabaseDictionaryMapper.xml
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ycl.mapper.platform.dict.DatabaseDictionaryMapper">
+<mapper namespace="com.ycl.mapper.dict.DatabaseDictionaryMapper">
<!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
- <resultMap id="BaseResultMap" type="com.ycl.entity.platform.dict.DatabaseDictionary">
+ <resultMap id="BaseResultMap" type="com.ycl.entity.dict.DatabaseDictionary">
<id column="id" property="id" />
<result column="dictName" property="dictName" />
<result column="typeName" property="typeName" />
diff --git a/ycl-common/src/main/resources/mapper/platform/portal/UmsThirdApplicationsMapper.xml b/ycl-platform/src/main/resources/mapper/portal/UmsThirdApplicationsMapper.xml
similarity index 77%
rename from ycl-common/src/main/resources/mapper/platform/portal/UmsThirdApplicationsMapper.xml
rename to ycl-platform/src/main/resources/mapper/portal/UmsThirdApplicationsMapper.xml
index 226dd46..90c6e71 100644
--- a/ycl-common/src/main/resources/mapper/platform/portal/UmsThirdApplicationsMapper.xml
+++ b/ycl-platform/src/main/resources/mapper/portal/UmsThirdApplicationsMapper.xml
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ycl.mapper.platform.portal.UmsThirdApplicationsMapper">
+<mapper namespace="com.ycl.mapper.portal.UmsThirdApplicationsMapper">
<!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
- <resultMap id="BaseResultMap" type="com.ycl.entity.platform.portal.UmsThirdApplications">
+ <resultMap id="BaseResultMap" type="com.ycl.entity.portal.ThirdApplications">
<id column="id" property="id" />
<result column="application_name" property="applicationName" />
<result column="application_icon_url" property="applicationIconUrl" />
diff --git a/ycl-common/src/main/resources/mapper/platform/portal/UmsWebsiteLogoMapper.xml b/ycl-platform/src/main/resources/mapper/portal/UmsWebsiteLogoMapper.xml
similarity index 76%
rename from ycl-common/src/main/resources/mapper/platform/portal/UmsWebsiteLogoMapper.xml
rename to ycl-platform/src/main/resources/mapper/portal/UmsWebsiteLogoMapper.xml
index 28a9ca7..ae266b2 100644
--- a/ycl-common/src/main/resources/mapper/platform/portal/UmsWebsiteLogoMapper.xml
+++ b/ycl-platform/src/main/resources/mapper/portal/UmsWebsiteLogoMapper.xml
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ycl.mapper.platform.portal.UmsWebsiteLogoMapper">
+<mapper namespace="com.ycl.mapper.portal.UmsWebsiteLogoMapper">
<!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
- <resultMap id="BaseResultMap" type="com.ycl.entity.platform.portal.UmsWebsiteLogo">
+ <resultMap id="BaseResultMap" type="com.ycl.entity.portal.WebsiteLogo">
<id column="id" property="id" />
<result column="title" property="title" />
<result column="login_page_icon_url" property="loginPageIconUrl" />
diff --git a/ycl-common/src/main/resources/mapper/platform/region/SccgRegionMapper.xml b/ycl-platform/src/main/resources/mapper/region/SccgRegionMapper.xml
similarity index 75%
rename from ycl-common/src/main/resources/mapper/platform/region/SccgRegionMapper.xml
rename to ycl-platform/src/main/resources/mapper/region/SccgRegionMapper.xml
index c39f2ec..597be4a 100644
--- a/ycl-common/src/main/resources/mapper/platform/region/SccgRegionMapper.xml
+++ b/ycl-platform/src/main/resources/mapper/region/SccgRegionMapper.xml
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ycl.mapper.platform.region.SccgRegionMapper">
+<mapper namespace="com.ycl.mapper.region.SccgRegionMapper">
<!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
- <resultMap id="BaseResultMap" type="com.ycl.entity.platform.region.SccgRegion">
+ <resultMap id="BaseResultMap" type="com.ycl.entity.region.SccgRegion">
<id column="id" property="id"/>
<result column="region_name" property="regionName"/>
<result column="parent_id" property="parentId"/>
diff --git a/ycl-common/src/main/resources/mapper/platform/store/UmsStoreInfoMapper.xml b/ycl-platform/src/main/resources/mapper/store/UmsStoreInfoMapper.xml
similarity index 81%
rename from ycl-common/src/main/resources/mapper/platform/store/UmsStoreInfoMapper.xml
rename to ycl-platform/src/main/resources/mapper/store/UmsStoreInfoMapper.xml
index ef81b7a..e4d975d 100644
--- a/ycl-common/src/main/resources/mapper/platform/store/UmsStoreInfoMapper.xml
+++ b/ycl-platform/src/main/resources/mapper/store/UmsStoreInfoMapper.xml
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ycl.mapper.platform.store.StoreInfoMapper">
+<mapper namespace="com.ycl.mapper.store.StoreInfoMapper">
<!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
- <resultMap id="BaseResultMap" type="com.ycl.entity.platform.store.StoreInfo">
+ <resultMap id="BaseResultMap" type="com.ycl.entity.store.StoreInfo">
<id column="id" property="id"/>
<result column="owner" property="owner"/>
<result column="storename" property="storename"/>
diff --git a/ycl-common/src/main/resources/mapper/platform/zf/EnforcelawReportMapper.xml b/ycl-platform/src/main/resources/mapper/zf/EnforcelawReportMapper.xml
similarity index 82%
rename from ycl-common/src/main/resources/mapper/platform/zf/EnforcelawReportMapper.xml
rename to ycl-platform/src/main/resources/mapper/zf/EnforcelawReportMapper.xml
index 64a359e..019a0f7 100644
--- a/ycl-common/src/main/resources/mapper/platform/zf/EnforcelawReportMapper.xml
+++ b/ycl-platform/src/main/resources/mapper/zf/EnforcelawReportMapper.xml
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ycl.mapper.platform.zf.EnforcelawReportMapper">
+<mapper namespace="com.ycl.mapper.zf.EnforcelawReportMapper">
<!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
- <resultMap id="BaseResultMap" type="com.ycl.entity.platform.zf.EnforcelawReport">
+ <resultMap id="BaseResultMap" type="com.ycl.entity.zf.EnforceLawReport">
<id column="id" property="id" />
<result column="infoResoure" property="infoResoure" />
<result column="acceptor" property="acceptor" />
@@ -11,7 +11,7 @@
<result column="category" property="category" />
<result column="county" property="county" />
<result column="street" property="street" />
- <result column="afAddr" property="afAddr" />
+ <result column="address" property="address" />
<result column="informer" property="informer" />
<result column="contact" property="contact" />
<result column="reason" property="reason" />
@@ -39,10 +39,10 @@
<!-- 閫氱敤鏌ヨ缁撴灉鍒� -->
<sql id="Base_Column_List">
- id, infoResoure, acceptor, problemTypes, category, county, street, afAddr, informer, contact, reason, problemDesc, lawOfficer, partiesName, partiesID, partiesPhone, idPositiveImage, idNegativeImage, illegalBuildLocation, illegalBuildLength, illegalBuildWidth, illegalBuildHigh, illegalBuildMaterials, IllegalPhotos, rectifidPhotos, accessory, disposeRemark, inspectors, status, cTime, community
+ id, infoResoure, acceptor, problemTypes, category, county, street, address, informer, contact, reason, problemDesc, lawOfficer, partiesName, partiesID, partiesPhone, idPositiveImage, idNegativeImage, illegalBuildLocation, illegalBuildLength, illegalBuildWidth, illegalBuildHigh, illegalBuildMaterials, IllegalPhotos, rectifidPhotos, accessory, disposeRemark, inspectors, status, cTime, community
</sql>
- <select id="selectPageVo" resultType="com.ycl.entity.platform.zf.EnforcelawReport">
+ <select id="selectPageVo" resultType="com.ycl.entity.zf.EnforceLawReport">
SELECT * FROM ums_enforcelaw_report
<where>
<if test="community!=null and community!=''" >
diff --git a/ycl-platform/src/main/resources/mapper/zf/VideowarmEventsreportMapper.xml b/ycl-platform/src/main/resources/mapper/zf/VideowarmEventsreportMapper.xml
new file mode 100644
index 0000000..9df6e57
--- /dev/null
+++ b/ycl-platform/src/main/resources/mapper/zf/VideowarmEventsreportMapper.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ycl.mapper.zf.VideowarmEventsreportMapper">
+
+ <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
+ <resultMap id="BaseResultMap" type="com.ycl.entity.zf.VideoWarnEventsReport">
+ <id column="id" property="id" />
+ <result column="event_name" property="eventName" />
+ <result column="event_type" property="eventType" />
+ <result column="associated_shop" property="associatedShops" />
+ <result column="event_location" property="eventLocation" />
+ <result column="event_region" property="eventRegion" />
+ <result column="media" property="media" />
+ <result column="content" property="content" />
+ <result column="event_time" property="eventTime" />
+ <result column="create_time" property="createTime" />
+ </resultMap>
+
+ <!-- 閫氱敤鏌ヨ缁撴灉鍒� -->
+ <sql id="Base_Column_List">
+ id, event_name, event_type, associated_shop, event_location, event_region, media, content, event_time, create_time
+ </sql>
+
+
+ <select id="selectPageVo" resultType="com.ycl.entity.zf.VideoWarnEventsReport">
+ SELECT * FROM ums_videowarm_eventsreport
+ <where>
+ <if test="eventName!=null and eventName!=''" >
+ event_name=#{eventName}
+ </if>
+ <if test="eventType!=null and eventType!=''" >
+ event_type=#{eventType}
+ </if>
+ <if test="eventLocation!=null and eventLocation!=''" >
+ event_location=#{eventLocation}
+ </if>
+ <if test="eventRegion!=null and eventRegion!=''" >
+ event_region=#{eventRegion}
+ </if>
+ <if test="startTime!=null and startTime!=''and endTime!=null and endTime!=''" >
+ create_time between #{startTime} and #{endTime}
+ </if>
+ </where>
+ </select>
+
+</mapper>
--
Gitblit v1.8.0