From 34de42f43fd75a31fe0c0d51adf30fb554ad5fa6 Mon Sep 17 00:00:00 2001
From: liyanqi <15181887205@163.com>
Date: 星期四, 15 九月 2022 12:45:26 +0800
Subject: [PATCH] 1：代码迁移
---
ycl-common/src/main/java/com/ycl/mapper/platform/user/UmsMenuMapper.java | 4
ycl-common/src/main/resources/mapper/platform/store/UmsStoreInfoMapper.xml | 4
ycl-platform/src/main/java/com/ycl/controller/user/UmsAdminController.java | 11
ycl-common/src/main/java/com/ycl/dto/UmsMenuNode.java | 2
ycl-common/src/main/java/com/ycl/service/platform/user/impl/UmsAdminCacheServiceImpl.java | 17
ycl-common/src/main/java/com/ycl/entity/platform/user/UmsResourceCategory.java | 2
ycl-common/src/main/java/com/ycl/service/platform/depart/impl/UmsDepartServiceImpl.java | 72 ++--
ycl-common/src/main/java/com/ycl/service/platform/user/UmsRoleMenuRelationService.java | 4
ycl-common/src/main/java/com/ycl/service/platform/user/UmsAdminCacheService.java | 6
ycl-common/src/main/java/com/ycl/service/platform/user/UmsDepartManageService.java | 4
ycl-common/src/main/java/com/ycl/service/platform/zfreport/IEnforcelawReportService.java | 16 +
ycl-common/src/main/java/com/ycl/entity/platform/user/UmsResource.java | 2
ycl-common/src/main/resources/mapper/platform/user/UmsRoleMenuRelationMapper.xml | 4
ycl-platform/src/main/java/com/ycl/controller/user/UmsRoleController.java | 9
ycl-common/src/main/java/com/ycl/entity/platform/user/UmsRole.java | 2
ycl-common/src/main/java/com/ycl/service/platform/depart/UmsDepartService.java | 14
ycl-common/src/main/java/com/ycl/service/platform/user/impl/UmsAdminRoleRelationServiceImpl.java | 8
ycl-common/src/main/java/com/ycl/mapper/platform/user/UmsAdminMapper.java | 4
ycl-common/src/main/java/com/ycl/entity/platform/user/vo/UmsMenuVo.java | 3
ycl-common/src/main/java/com/ycl/service/platform/user/UmsRoleService.java | 8
ycl-common/src/main/java/com/ycl/service/platform/zfreport/impl/EnforcelawReportServiceImpl.java | 20 +
ycl-common/src/main/java/com/ycl/mapper/platform/store/StoreScoreRuleMapper.java | 4
ycl-common/src/main/java/com/ycl/service/platform/user/impl/UmsRoleResourceRelationServiceImpl.java | 8
ycl-common/src/main/resources/mapper/platform/depart/UmsDepartMapper.xml | 4
ycl-common/src/main/resources/mapper/platform/user/UmsDepartManageMapper.xml | 4
ycl-common/src/main/java/com/ycl/entity/platform/user/UmsMenu.java | 2
ycl-common/src/main/resources/mapper/platform/user/UmsAdminLoginLogMapper.xml | 4
ycl-common/src/main/java/com/ycl/mapper/platform/depart/UmsDepartMapper.java | 16 +
ycl-common/src/main/java/com/ycl/entity/platform/portal/UmsWebsiteLogo.java | 3
ycl-common/src/main/java/com/ycl/mapper/platform/user/UmsAdminRoleRelationMapper.java | 4
ycl-common/src/main/java/com/ycl/service/platform/user/UmsResourceCategoryService.java | 4
ycl-common/src/main/resources/mapper/platform/portal/UmsWebsiteLogoMapper.xml | 4
ycl-platform/src/main/java/com/ycl/controller/portal/UmsWebsitePortalController.java | 16
ycl-platform/src/main/java/com/ycl/controller/user/UmsResourceCategoryController.java | 5
ycl-common/src/main/java/com/ycl/service/platform/user/impl/UmsMenuServiceImpl.java | 8
ycl-common/src/main/java/com/ycl/mapper/platform/portal/UmsThirdApplicationsMapper.java | 4
ycl-platform/src/main/java/com/ycl/controller/depart/DepartController.java | 20
ycl-common/src/main/java/com/ycl/mapper/platform/zfreport/EnforcelawReportMapper.java | 16 +
ycl-common/src/main/java/com/ycl/entity/platform/user/UmsAdminRoleRelation.java | 2
ycl-common/src/main/java/com/ycl/mapper/platform/user/UmsResourceMapper.java | 4
ycl-common/src/main/java/com/ycl/mapper/platform/user/UmsRoleMapper.java | 4
ycl-common/src/main/resources/mapper/platform/user/UmsResourceMapper.xml | 8
ycl-platform/src/main/java/com/ycl/controller/store/StoreScoreRuleController.java | 7
ycl-common/src/main/java/com/ycl/entity/platform/user/UmsDepartManage.java | 2
ycl-common/src/main/java/com/ycl/entity/platform/user/UmsRoleMenuRelation.java | 2
ycl-common/src/main/resources/mapper/platform/user/UmsAdminRoleRelationMapper.xml | 4
ycl-common/src/main/java/com/ycl/service/platform/store/StoreInfoService.java | 4
ycl-common/src/main/java/com/ycl/service/platform/user/impl/UmsRoleMenuRelationServiceImpl.java | 8
ycl-common/src/main/java/com/ycl/mapper/platform/user/UmsResourceCategoryMapper.java | 4
ycl-common/src/main/java/com/ycl/service/platform/user/impl/UmsAdminServiceImpl.java | 28
ycl-common/src/main/java/com/ycl/service/platform/user/UmsMenuService.java | 4
ycl-common/src/main/java/com/ycl/service/platform/user/impl/UmsRoleServiceImpl.java | 18
ycl-common/src/main/java/com/ycl/mapper/platform/store/StoreInfoMapper.java | 4
ycl-common/src/main/java/com/ycl/mapper/platform/user/UmsDepartManageMapper.java | 4
ycl-common/src/main/java/com/ycl/service/platform/user/UmsAdminService.java | 8
ycl-common/src/main/java/com/ycl/entity/platform/user/UmsRoleResourceRelation.java | 2
ycl-common/src/main/resources/mapper/platform/user/UmsRoleMapper.xml | 6
ycl-common/src/main/java/com/ycl/service/platform/user/impl/UmsResourceServiceImpl.java | 10
ycl-common/src/main/java/com/ycl/mapper/platform/user/UmsAdminLoginLogMapper.java | 4
ycl-common/src/main/resources/mapper/platform/portal/UmsThirdApplicationsMapper.xml | 4
ycl-common/src/main/resources/mapper/platform/user/UmsResourceCategoryMapper.xml | 4
ycl-common/src/main/java/com/ycl/service/platform/user/UmsResourceService.java | 4
ycl-common/src/main/java/com/ycl/entity/platform/user/UmsAdmin.java | 2
ycl-common/src/main/java/com/ycl/mapper/platform/user/UmsRoleResourceRelationMapper.java | 4
ycl-common/src/main/java/com/ycl/service/platform/store/impl/StoreScoreRuleServiceImpl.java | 8
ycl-common/src/main/java/com/ycl/entity/platform/depart/UmsDepart.java | 10
ycl-common/src/main/java/com/ycl/service/platform/portal/impl/UmsThirdApplicationsServiceImpl.java | 8
ycl-common/src/main/java/com/ycl/service/platform/portal/impl/UmsWebsiteLogoServiceImpl.java | 8
ycl-platform/src/main/java/com/ycl/controller/zfreport/EnforcelawReportController.java | 22 +
ycl-common/src/main/resources/mapper/platform/user/UmsMenuMapper.xml | 8
ycl-common/src/main/java/com/ycl/bo/AdminUserDetails.java | 4
ycl-common/src/main/java/com/ycl/entity/platform/user/UmsAdminLoginLog.java | 2
ycl-common/src/main/java/com/ycl/service/platform/portal/UmsWebsiteLogoService.java | 4
ycl-common/src/main/java/com/ycl/service/platform/user/impl/UmsResourceCategoryServiceImpl.java | 8
ycl-common/src/main/java/com/ycl/entity/platform/store/StoreScoreRule.java | 2
ycl-common/src/main/java/com/ycl/service/platform/store/impl/StoreInfoServiceImpl.java | 8
/dev/null | 16 -
ycl-common/src/main/java/com/ycl/service/platform/store/StoreScoreRuleService.java | 4
ycl-common/src/main/java/com/ycl/entity/platform/portal/UmsThirdApplications.java | 2
ycl-common/src/main/java/com/ycl/mapper/platform/user/UmsRoleMenuRelationMapper.java | 4
ycl-platform/src/main/java/com/ycl/config/YclSecurityConfig.java | 8
ycl-common/src/main/java/com/ycl/mapper/platform/portal/UmsWebsiteLogoMapper.java | 4
ycl-platform/src/main/java/com/ycl/controller/store/StoreInfoController.java | 4
ycl-common/src/main/java/com/ycl/service/platform/user/UmsRoleResourceRelationService.java | 4
ycl-common/src/main/java/com/ycl/service/platform/user/impl/UmsDepartManageServiceImpl.java | 20
ycl-common/src/main/resources/mapper/platform/zfreport/EnforcelawReportMapper.xml | 42 ++
ycl-common/src/main/java/com/ycl/service/platform/portal/UmsThirdApplicationsService.java | 4
ycl-platform/src/main/java/com/ycl/controller/user/UmsResourceController.java | 5
ycl-common/src/main/java/com/ycl/entity/platform/zfreport/EnforcelawReport.java | 197 ++++++++++++
ycl-common/src/main/java/com/ycl/service/platform/user/UmsAdminRoleRelationService.java | 4
ycl-common/src/main/resources/mapper/platform/user/UmsRoleResourceRelationMapper.xml | 4
ycl-common/src/main/java/com/ycl/entity/platform/store/StoreInfo.java | 2
ycl-common/src/main/resources/mapper/platform/user/UmsAdminMapper.xml | 4
ycl-platform/src/main/java/com/ycl/controller/user/UmsMenuController.java | 5
94 files changed, 611 insertions(+), 311 deletions(-)
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 b1a6671..cb00fbd 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.user.UmsAdmin;
-import com.ycl.entity.user.UmsResource;
+import com.ycl.entity.platform.user.UmsAdmin;
+import com.ycl.entity.platform.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 0e80f38..999f615 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.user.UmsMenu;
+import com.ycl.entity.platform.user.UmsMenu;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.Setter;
diff --git a/ycl-common/src/main/java/com/ycl/entity/depart/SccgDepart.java b/ycl-common/src/main/java/com/ycl/entity/platform/depart/UmsDepart.java
similarity index 83%
rename from ycl-common/src/main/java/com/ycl/entity/depart/SccgDepart.java
rename to ycl-common/src/main/java/com/ycl/entity/platform/depart/UmsDepart.java
index 4150605..eb2cdd7 100644
--- a/ycl-common/src/main/java/com/ycl/entity/depart/SccgDepart.java
+++ b/ycl-common/src/main/java/com/ycl/entity/platform/depart/UmsDepart.java
@@ -1,4 +1,4 @@
-package com.ycl.entity.depart;
+package com.ycl.entity.platform.depart;
import com.baomidou.mybatisplus.annotation.*;
import com.ycl.api.BaseEntity;
@@ -21,9 +21,9 @@
*/
@Getter
@Setter
-@TableName("sccg_depart")
-@ApiModel(value = "SccgDepart瀵硅薄", description = "閮ㄩ棬琛�")
-public class SccgDepart extends BaseEntity implements Serializable {
+@TableName("ums_depart")
+@ApiModel(value = "umsDepart瀵硅薄", description = "閮ㄩ棬琛�")
+public class UmsDepart extends BaseEntity implements Serializable {
private static final long serialVersionUID = 1L;
@@ -55,7 +55,7 @@
private byte isDeleted;
@TableField(exist = false)
- private List<SccgDepart> children;
+ private List<UmsDepart> children;
@TableField(exist = false)
private List<AdminDepartDTO.UserInfoDTO> userInfoDTOS;
diff --git a/ycl-common/src/main/java/com/ycl/entity/platform/UmsThirdApplications.java b/ycl-common/src/main/java/com/ycl/entity/platform/portal/UmsThirdApplications.java
similarity index 96%
rename from ycl-common/src/main/java/com/ycl/entity/platform/UmsThirdApplications.java
rename to ycl-common/src/main/java/com/ycl/entity/platform/portal/UmsThirdApplications.java
index c8a8eec..85ed3c9 100644
--- a/ycl-common/src/main/java/com/ycl/entity/platform/UmsThirdApplications.java
+++ b/ycl-common/src/main/java/com/ycl/entity/platform/portal/UmsThirdApplications.java
@@ -1,4 +1,4 @@
-package com.ycl.entity.platform;
+package com.ycl.entity.platform.portal;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
diff --git a/ycl-common/src/main/java/com/ycl/entity/platform/UmsWebsiteLogo.java b/ycl-common/src/main/java/com/ycl/entity/platform/portal/UmsWebsiteLogo.java
similarity index 93%
rename from ycl-common/src/main/java/com/ycl/entity/platform/UmsWebsiteLogo.java
rename to ycl-common/src/main/java/com/ycl/entity/platform/portal/UmsWebsiteLogo.java
index 08c1f87..b65e3cc 100644
--- a/ycl-common/src/main/java/com/ycl/entity/platform/UmsWebsiteLogo.java
+++ b/ycl-common/src/main/java/com/ycl/entity/platform/portal/UmsWebsiteLogo.java
@@ -1,7 +1,6 @@
-package com.ycl.entity.platform;
+package com.ycl.entity.platform.portal;
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;
diff --git a/ycl-common/src/main/java/com/ycl/entity/store/StoreInfo.java b/ycl-common/src/main/java/com/ycl/entity/platform/store/StoreInfo.java
similarity index 96%
rename from ycl-common/src/main/java/com/ycl/entity/store/StoreInfo.java
rename to ycl-common/src/main/java/com/ycl/entity/platform/store/StoreInfo.java
index 2ad5553..f5b8665 100644
--- a/ycl-common/src/main/java/com/ycl/entity/store/StoreInfo.java
+++ b/ycl-common/src/main/java/com/ycl/entity/platform/store/StoreInfo.java
@@ -1,4 +1,4 @@
-package com.ycl.entity.store;
+package com.ycl.entity.platform.store;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
diff --git a/ycl-common/src/main/java/com/ycl/entity/store/StoreScoreRule.java b/ycl-common/src/main/java/com/ycl/entity/platform/store/StoreScoreRule.java
similarity index 96%
rename from ycl-common/src/main/java/com/ycl/entity/store/StoreScoreRule.java
rename to ycl-common/src/main/java/com/ycl/entity/platform/store/StoreScoreRule.java
index 2517486..326a6e4 100644
--- a/ycl-common/src/main/java/com/ycl/entity/store/StoreScoreRule.java
+++ b/ycl-common/src/main/java/com/ycl/entity/platform/store/StoreScoreRule.java
@@ -1,4 +1,4 @@
-package com.ycl.entity.store;
+package com.ycl.entity.platform.store;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
diff --git a/ycl-common/src/main/java/com/ycl/entity/user/UmsAdmin.java b/ycl-common/src/main/java/com/ycl/entity/platform/user/UmsAdmin.java
similarity index 97%
rename from ycl-common/src/main/java/com/ycl/entity/user/UmsAdmin.java
rename to ycl-common/src/main/java/com/ycl/entity/platform/user/UmsAdmin.java
index 9b8376d..80a1abc 100644
--- a/ycl-common/src/main/java/com/ycl/entity/user/UmsAdmin.java
+++ b/ycl-common/src/main/java/com/ycl/entity/platform/user/UmsAdmin.java
@@ -1,4 +1,4 @@
-package com.ycl.entity.user;
+package com.ycl.entity.platform.user;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
diff --git a/ycl-common/src/main/java/com/ycl/entity/user/UmsAdminLoginLog.java b/ycl-common/src/main/java/com/ycl/entity/platform/user/UmsAdminLoginLog.java
similarity index 96%
rename from ycl-common/src/main/java/com/ycl/entity/user/UmsAdminLoginLog.java
rename to ycl-common/src/main/java/com/ycl/entity/platform/user/UmsAdminLoginLog.java
index 8ee790a..8131834 100644
--- a/ycl-common/src/main/java/com/ycl/entity/user/UmsAdminLoginLog.java
+++ b/ycl-common/src/main/java/com/ycl/entity/platform/user/UmsAdminLoginLog.java
@@ -1,4 +1,4 @@
-package com.ycl.entity.user;
+package com.ycl.entity.platform.user;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
diff --git a/ycl-common/src/main/java/com/ycl/entity/user/UmsAdminRoleRelation.java b/ycl-common/src/main/java/com/ycl/entity/platform/user/UmsAdminRoleRelation.java
similarity index 95%
rename from ycl-common/src/main/java/com/ycl/entity/user/UmsAdminRoleRelation.java
rename to ycl-common/src/main/java/com/ycl/entity/platform/user/UmsAdminRoleRelation.java
index 9d0f1f9..4179857 100644
--- a/ycl-common/src/main/java/com/ycl/entity/user/UmsAdminRoleRelation.java
+++ b/ycl-common/src/main/java/com/ycl/entity/platform/user/UmsAdminRoleRelation.java
@@ -1,4 +1,4 @@
-package com.ycl.entity.user;
+package com.ycl.entity.platform.user;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
diff --git a/ycl-common/src/main/java/com/ycl/entity/user/UmsDepartManage.java b/ycl-common/src/main/java/com/ycl/entity/platform/user/UmsDepartManage.java
similarity index 94%
rename from ycl-common/src/main/java/com/ycl/entity/user/UmsDepartManage.java
rename to ycl-common/src/main/java/com/ycl/entity/platform/user/UmsDepartManage.java
index 09ffb0a..2caf06e 100644
--- a/ycl-common/src/main/java/com/ycl/entity/user/UmsDepartManage.java
+++ b/ycl-common/src/main/java/com/ycl/entity/platform/user/UmsDepartManage.java
@@ -1,4 +1,4 @@
-package com.ycl.entity.user;
+package com.ycl.entity.platform.user;
import com.baomidou.mybatisplus.annotation.TableName;
import com.ycl.api.BaseEntity;
diff --git a/ycl-common/src/main/java/com/ycl/entity/user/UmsMenu.java b/ycl-common/src/main/java/com/ycl/entity/platform/user/UmsMenu.java
similarity index 97%
rename from ycl-common/src/main/java/com/ycl/entity/user/UmsMenu.java
rename to ycl-common/src/main/java/com/ycl/entity/platform/user/UmsMenu.java
index 7bd5278..6334521 100644
--- a/ycl-common/src/main/java/com/ycl/entity/user/UmsMenu.java
+++ b/ycl-common/src/main/java/com/ycl/entity/platform/user/UmsMenu.java
@@ -1,4 +1,4 @@
-package com.ycl.entity.user;
+package com.ycl.entity.platform.user;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
diff --git a/ycl-common/src/main/java/com/ycl/entity/user/UmsResource.java b/ycl-common/src/main/java/com/ycl/entity/platform/user/UmsResource.java
similarity index 96%
rename from ycl-common/src/main/java/com/ycl/entity/user/UmsResource.java
rename to ycl-common/src/main/java/com/ycl/entity/platform/user/UmsResource.java
index 021743d..7930f74 100644
--- a/ycl-common/src/main/java/com/ycl/entity/user/UmsResource.java
+++ b/ycl-common/src/main/java/com/ycl/entity/platform/user/UmsResource.java
@@ -1,4 +1,4 @@
-package com.ycl.entity.user;
+package com.ycl.entity.platform.user;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
diff --git a/ycl-common/src/main/java/com/ycl/entity/user/UmsResourceCategory.java b/ycl-common/src/main/java/com/ycl/entity/platform/user/UmsResourceCategory.java
similarity index 96%
rename from ycl-common/src/main/java/com/ycl/entity/user/UmsResourceCategory.java
rename to ycl-common/src/main/java/com/ycl/entity/platform/user/UmsResourceCategory.java
index facfe93..eb61c32 100644
--- a/ycl-common/src/main/java/com/ycl/entity/user/UmsResourceCategory.java
+++ b/ycl-common/src/main/java/com/ycl/entity/platform/user/UmsResourceCategory.java
@@ -1,4 +1,4 @@
-package com.ycl.entity.user;
+package com.ycl.entity.platform.user;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
diff --git a/ycl-common/src/main/java/com/ycl/entity/user/UmsRole.java b/ycl-common/src/main/java/com/ycl/entity/platform/user/UmsRole.java
similarity index 96%
rename from ycl-common/src/main/java/com/ycl/entity/user/UmsRole.java
rename to ycl-common/src/main/java/com/ycl/entity/platform/user/UmsRole.java
index 49cbd8f..14565d1 100644
--- a/ycl-common/src/main/java/com/ycl/entity/user/UmsRole.java
+++ b/ycl-common/src/main/java/com/ycl/entity/platform/user/UmsRole.java
@@ -1,4 +1,4 @@
-package com.ycl.entity.user;
+package com.ycl.entity.platform.user;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
diff --git a/ycl-common/src/main/java/com/ycl/entity/user/UmsRoleMenuRelation.java b/ycl-common/src/main/java/com/ycl/entity/platform/user/UmsRoleMenuRelation.java
similarity index 95%
rename from ycl-common/src/main/java/com/ycl/entity/user/UmsRoleMenuRelation.java
rename to ycl-common/src/main/java/com/ycl/entity/platform/user/UmsRoleMenuRelation.java
index 17c2df6..60a1c20 100644
--- a/ycl-common/src/main/java/com/ycl/entity/user/UmsRoleMenuRelation.java
+++ b/ycl-common/src/main/java/com/ycl/entity/platform/user/UmsRoleMenuRelation.java
@@ -1,4 +1,4 @@
-package com.ycl.entity.user;
+package com.ycl.entity.platform.user;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
diff --git a/ycl-common/src/main/java/com/ycl/entity/user/UmsRoleResourceRelation.java b/ycl-common/src/main/java/com/ycl/entity/platform/user/UmsRoleResourceRelation.java
similarity index 95%
rename from ycl-common/src/main/java/com/ycl/entity/user/UmsRoleResourceRelation.java
rename to ycl-common/src/main/java/com/ycl/entity/platform/user/UmsRoleResourceRelation.java
index caf8337..3fe0ee1 100644
--- a/ycl-common/src/main/java/com/ycl/entity/user/UmsRoleResourceRelation.java
+++ b/ycl-common/src/main/java/com/ycl/entity/platform/user/UmsRoleResourceRelation.java
@@ -1,4 +1,4 @@
-package com.ycl.entity.user;
+package com.ycl.entity.platform.user;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
diff --git a/ycl-common/src/main/java/com/ycl/entity/user/vo/UmsMenuVo.java b/ycl-common/src/main/java/com/ycl/entity/platform/user/vo/UmsMenuVo.java
similarity index 95%
rename from ycl-common/src/main/java/com/ycl/entity/user/vo/UmsMenuVo.java
rename to ycl-common/src/main/java/com/ycl/entity/platform/user/vo/UmsMenuVo.java
index 0ee884a..0a1c437 100644
--- a/ycl-common/src/main/java/com/ycl/entity/user/vo/UmsMenuVo.java
+++ b/ycl-common/src/main/java/com/ycl/entity/platform/user/vo/UmsMenuVo.java
@@ -1,4 +1,4 @@
-package com.ycl.entity.user.vo;
+package com.ycl.entity.platform.user.vo;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
@@ -9,7 +9,6 @@
import lombok.EqualsAndHashCode;
import java.io.Serializable;
-import java.util.ArrayList;
import java.util.Date;
import java.util.List;
diff --git a/ycl-common/src/main/java/com/ycl/entity/platform/zfreport/EnforcelawReport.java b/ycl-common/src/main/java/com/ycl/entity/platform/zfreport/EnforcelawReport.java
new file mode 100644
index 0000000..142c95e
--- /dev/null
+++ b/ycl-common/src/main/java/com/ycl/entity/platform/zfreport/EnforcelawReport.java
@@ -0,0 +1,197 @@
+package com.ycl.entity.platform.zfreport;
+
+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 lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * <p>
+ * 杩濊浜嬮」澶勭疆绠＄悊锛氬寘鍚繚娉�(杩濆缓)鎯呭喌涓婃姤銆佺珛妗堛�佹淳閬ｃ�佸缃�佹牳鏌ャ�佺粨妗�
+ * </p>
+ *
+ * @author lyq
+ * @since 2022-09-14
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName("ums_enforcelaw_report")
+public class EnforcelawReport implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 涓婚敭
+ */
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+
+ /**
+ * 杩濇硶/杩濆缓淇℃伅鏉ユ簮锛屽瓧鍏搁」
+ */
+ @TableField("inforesoure")
+ private String inforesoure;
+
+ /**
+ * 鍙楃悊浜�
+ */
+ @TableField("acceptor")
+ private String acceptor;
+
+ /**
+ * 闂绫诲瀷
+ */
+ @TableField("problemtypes")
+ private String problemtypes;
+
+ /**
+ * 杩濆缓/杩濊绫诲埆
+ */
+ @TableField("category")
+ private String category;
+
+ /**
+ * 鎵�灞炲尯鍘�
+ */
+ @TableField("county")
+ private String county;
+
+ /**
+ * 鎵�灞炶閬�
+ */
+ @TableField("street")
+ private String street;
+
+ /**
+ * 浜嬪彂鍦板潃
+ */
+ @TableField("afaddr")
+ private String afaddr;
+
+ /**
+ * 涓炬姤浜�
+ */
+ @TableField("informer")
+ private String informer;
+
+ /**
+ * 鑱旂郴鏂瑰紡
+ */
+ @TableField("contact")
+ private String contact;
+
+ /**
+ * 妗堢敱锛屽瓧鍏搁」
+ */
+ @TableField("reason")
+ private String reason;
+
+ /**
+ * 闂鎻忚堪
+ */
+ @TableField("problemdesc")
+ private String problemdesc;
+
+ /**
+ * 鎵ф硶浜�
+ */
+ @TableField("lawOfficer")
+ private String lawOfficer;
+
+ /**
+ * 褰撲簨浜哄鍚�
+ */
+ @TableField("partiesName")
+ private String partiesName;
+
+ /**
+ * 褰撲簨浜鸿韩浠借瘉鍙风爜
+ */
+ @TableField("partiesID")
+ private String partiesID;
+
+ /**
+ * 褰撲簨浜鸿仈绯荤數璇�
+ */
+ @TableField("partiesPhone")
+ private String partiesPhone;
+
+ /**
+ * 韬唤璇佹闈㈢収鐗�
+ */
+ @TableField("idPositiveImage")
+ private String idPositiveImage;
+
+ /**
+ * 韬唤璇佸弽闈㈢収鐗�
+ */
+ @TableField("idNegativeImage")
+ private String idNegativeImage;
+
+ /**
+ * 杩濆缓鍏蜂綋浣嶇疆
+ */
+ @TableField("illegalBuildLocation")
+ private String illegalBuildLocation;
+
+ /**
+ * 杩濇硶寤鸿闀�(绫�)
+ */
+ @TableField("illegalBuildLength")
+ private BigDecimal illegalBuildLength;
+
+ /**
+ * 杩濇硶寤鸿瀹�(绫�)
+ */
+ @TableField("illegalBuildWidth")
+ private BigDecimal illegalBuildWidth;
+
+ /**
+ * 杩濇硶寤鸿楂�(绫�)
+ */
+ @TableField("illegalBuildHigh")
+ private BigDecimal illegalBuildHigh;
+
+ /**
+ * 杩濇硶寤虹瓚鏉愭枡
+ */
+ @TableField("illegalBuildMaterials")
+ private String illegalBuildMaterials;
+
+ /**
+ * 涓婁紶闄勪欢(杩濇硶鐓х墖)
+ */
+ @TableField("IllegalPhotos")
+ private String IllegalPhotos;
+
+ /**
+ * 鏁存敼鍚庣収鐗�
+ */
+ @TableField("rectifidPhotos")
+ private String rectifidPhotos;
+
+ /**
+ * 涓婁紶闄勪欢
+ */
+ @TableField("accessory")
+ private String accessory;
+
+ /**
+ * 澶勭疆澶囨敞淇℃伅
+ */
+ @TableField("disposeRemark")
+ private String disposeRemark;
+
+ /**
+ * 瀹℃牳浜�
+ */
+ @TableField("inspectors")
+ private String inspectors;
+
+
+}
diff --git a/ycl-common/src/main/java/com/ycl/mapper/depart/SccgDepartMapper.java b/ycl-common/src/main/java/com/ycl/mapper/depart/SccgDepartMapper.java
deleted file mode 100644
index 52b501b..0000000
--- a/ycl-common/src/main/java/com/ycl/mapper/depart/SccgDepartMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.ycl.mapper.depart;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.ycl.entity.depart.SccgDepart;
-
-/**
- * <p>
- * 閮ㄩ棬琛� Mapper 鎺ュ彛
- * </p>
- *
- * @author lyq
- * @since 2022-09-07
- */
-public interface SccgDepartMapper extends BaseMapper<SccgDepart> {
-
-}
diff --git a/ycl-common/src/main/java/com/ycl/mapper/platform/depart/UmsDepartMapper.java b/ycl-common/src/main/java/com/ycl/mapper/platform/depart/UmsDepartMapper.java
new file mode 100644
index 0000000..24f7907
--- /dev/null
+++ b/ycl-common/src/main/java/com/ycl/mapper/platform/depart/UmsDepartMapper.java
@@ -0,0 +1,16 @@
+package com.ycl.mapper.platform.depart;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ycl.entity.platform.depart.UmsDepart;
+
+/**
+ * <p>
+ * 閮ㄩ棬琛� Mapper 鎺ュ彛
+ * </p>
+ *
+ * @author lyq
+ * @since 2022-09-07
+ */
+public interface UmsDepartMapper extends BaseMapper<UmsDepart> {
+
+}
diff --git a/ycl-common/src/main/java/com/ycl/mapper/platform/UmsThirdApplicationsMapper.java b/ycl-common/src/main/java/com/ycl/mapper/platform/portal/UmsThirdApplicationsMapper.java
similarity index 69%
rename from ycl-common/src/main/java/com/ycl/mapper/platform/UmsThirdApplicationsMapper.java
rename to ycl-common/src/main/java/com/ycl/mapper/platform/portal/UmsThirdApplicationsMapper.java
index 78368fa..8aa45c0 100644
--- a/ycl-common/src/main/java/com/ycl/mapper/platform/UmsThirdApplicationsMapper.java
+++ b/ycl-common/src/main/java/com/ycl/mapper/platform/portal/UmsThirdApplicationsMapper.java
@@ -1,7 +1,7 @@
-package com.ycl.mapper.platform;
+package com.ycl.mapper.platform.portal;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.ycl.entity.platform.UmsThirdApplications;
+import com.ycl.entity.platform.portal.UmsThirdApplications;
/**
* <p>
diff --git a/ycl-common/src/main/java/com/ycl/mapper/platform/UmsWebsiteLogoMapper.java b/ycl-common/src/main/java/com/ycl/mapper/platform/portal/UmsWebsiteLogoMapper.java
similarity index 69%
rename from ycl-common/src/main/java/com/ycl/mapper/platform/UmsWebsiteLogoMapper.java
rename to ycl-common/src/main/java/com/ycl/mapper/platform/portal/UmsWebsiteLogoMapper.java
index 1e55a4d..6957fc8 100644
--- a/ycl-common/src/main/java/com/ycl/mapper/platform/UmsWebsiteLogoMapper.java
+++ b/ycl-common/src/main/java/com/ycl/mapper/platform/portal/UmsWebsiteLogoMapper.java
@@ -1,7 +1,7 @@
-package com.ycl.mapper.platform;
+package com.ycl.mapper.platform.portal;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.ycl.entity.platform.UmsWebsiteLogo;
+import com.ycl.entity.platform.portal.UmsWebsiteLogo;
/**
* <p>
diff --git a/ycl-common/src/main/java/com/ycl/mapper/store/StoreInfoMapper.java b/ycl-common/src/main/java/com/ycl/mapper/platform/store/StoreInfoMapper.java
similarity index 70%
rename from ycl-common/src/main/java/com/ycl/mapper/store/StoreInfoMapper.java
rename to ycl-common/src/main/java/com/ycl/mapper/platform/store/StoreInfoMapper.java
index 829546c..2450bf4 100644
--- a/ycl-common/src/main/java/com/ycl/mapper/store/StoreInfoMapper.java
+++ b/ycl-common/src/main/java/com/ycl/mapper/platform/store/StoreInfoMapper.java
@@ -1,7 +1,7 @@
-package com.ycl.mapper.store;
+package com.ycl.mapper.platform.store;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.ycl.entity.store.StoreInfo;
+import com.ycl.entity.platform.store.StoreInfo;
/**
* <p>
diff --git a/ycl-common/src/main/java/com/ycl/mapper/store/StoreScoreRuleMapper.java b/ycl-common/src/main/java/com/ycl/mapper/platform/store/StoreScoreRuleMapper.java
similarity index 72%
rename from ycl-common/src/main/java/com/ycl/mapper/store/StoreScoreRuleMapper.java
rename to ycl-common/src/main/java/com/ycl/mapper/platform/store/StoreScoreRuleMapper.java
index 9a553a0..9fa72e7 100644
--- a/ycl-common/src/main/java/com/ycl/mapper/store/StoreScoreRuleMapper.java
+++ b/ycl-common/src/main/java/com/ycl/mapper/platform/store/StoreScoreRuleMapper.java
@@ -1,7 +1,7 @@
-package com.ycl.mapper.store;
+package com.ycl.mapper.platform.store;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.ycl.entity.store.StoreScoreRule;
+import com.ycl.entity.platform.store.StoreScoreRule;
/**
* <p>
diff --git a/ycl-common/src/main/java/com/ycl/mapper/user/UmsAdminLoginLogMapper.java b/ycl-common/src/main/java/com/ycl/mapper/platform/user/UmsAdminLoginLogMapper.java
similarity index 69%
rename from ycl-common/src/main/java/com/ycl/mapper/user/UmsAdminLoginLogMapper.java
rename to ycl-common/src/main/java/com/ycl/mapper/platform/user/UmsAdminLoginLogMapper.java
index 032973c..0fdbc56 100644
--- a/ycl-common/src/main/java/com/ycl/mapper/user/UmsAdminLoginLogMapper.java
+++ b/ycl-common/src/main/java/com/ycl/mapper/platform/user/UmsAdminLoginLogMapper.java
@@ -1,7 +1,7 @@
-package com.ycl.mapper.user;
+package com.ycl.mapper.platform.user;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.ycl.entity.user.UmsAdminLoginLog;
+import com.ycl.entity.platform.user.UmsAdminLoginLog;
/**
* <p>
diff --git a/ycl-common/src/main/java/com/ycl/mapper/user/UmsAdminMapper.java b/ycl-common/src/main/java/com/ycl/mapper/platform/user/UmsAdminMapper.java
similarity index 83%
rename from ycl-common/src/main/java/com/ycl/mapper/user/UmsAdminMapper.java
rename to ycl-common/src/main/java/com/ycl/mapper/platform/user/UmsAdminMapper.java
index 13224f1..651c05a 100644
--- a/ycl-common/src/main/java/com/ycl/mapper/user/UmsAdminMapper.java
+++ b/ycl-common/src/main/java/com/ycl/mapper/platform/user/UmsAdminMapper.java
@@ -1,7 +1,7 @@
-package com.ycl.mapper.user;
+package com.ycl.mapper.platform.user;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.ycl.entity.user.UmsAdmin;
+import com.ycl.entity.platform.user.UmsAdmin;
import org.apache.ibatis.annotations.Param;
import java.util.List;
diff --git a/ycl-common/src/main/java/com/ycl/mapper/user/UmsAdminRoleRelationMapper.java b/ycl-common/src/main/java/com/ycl/mapper/platform/user/UmsAdminRoleRelationMapper.java
similarity index 69%
rename from ycl-common/src/main/java/com/ycl/mapper/user/UmsAdminRoleRelationMapper.java
rename to ycl-common/src/main/java/com/ycl/mapper/platform/user/UmsAdminRoleRelationMapper.java
index b8f06c7..846b722 100644
--- a/ycl-common/src/main/java/com/ycl/mapper/user/UmsAdminRoleRelationMapper.java
+++ b/ycl-common/src/main/java/com/ycl/mapper/platform/user/UmsAdminRoleRelationMapper.java
@@ -1,7 +1,7 @@
-package com.ycl.mapper.user;
+package com.ycl.mapper.platform.user;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.ycl.entity.user.UmsAdminRoleRelation;
+import com.ycl.entity.platform.user.UmsAdminRoleRelation;
/**
* <p>
diff --git a/ycl-common/src/main/java/com/ycl/mapper/user/UmsDepartManageMapper.java b/ycl-common/src/main/java/com/ycl/mapper/platform/user/UmsDepartManageMapper.java
similarity index 84%
rename from ycl-common/src/main/java/com/ycl/mapper/user/UmsDepartManageMapper.java
rename to ycl-common/src/main/java/com/ycl/mapper/platform/user/UmsDepartManageMapper.java
index 7c8bffa..beee100 100644
--- a/ycl-common/src/main/java/com/ycl/mapper/user/UmsDepartManageMapper.java
+++ b/ycl-common/src/main/java/com/ycl/mapper/platform/user/UmsDepartManageMapper.java
@@ -1,7 +1,7 @@
-package com.ycl.mapper.user;
+package com.ycl.mapper.platform.user;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.ycl.entity.user.UmsDepartManage;
+import com.ycl.entity.platform.user.UmsDepartManage;
import org.apache.ibatis.annotations.Param;
import java.util.List;
diff --git a/ycl-common/src/main/java/com/ycl/mapper/user/UmsMenuMapper.java b/ycl-common/src/main/java/com/ycl/mapper/platform/user/UmsMenuMapper.java
similarity index 86%
rename from ycl-common/src/main/java/com/ycl/mapper/user/UmsMenuMapper.java
rename to ycl-common/src/main/java/com/ycl/mapper/platform/user/UmsMenuMapper.java
index a5fd464..33e6f1c 100644
--- a/ycl-common/src/main/java/com/ycl/mapper/user/UmsMenuMapper.java
+++ b/ycl-common/src/main/java/com/ycl/mapper/platform/user/UmsMenuMapper.java
@@ -1,7 +1,7 @@
-package com.ycl.mapper.user;
+package com.ycl.mapper.platform.user;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.ycl.entity.user.UmsMenu;
+import com.ycl.entity.platform.user.UmsMenu;
import org.apache.ibatis.annotations.Param;
import java.util.List;
diff --git a/ycl-common/src/main/java/com/ycl/mapper/user/UmsResourceCategoryMapper.java b/ycl-common/src/main/java/com/ycl/mapper/platform/user/UmsResourceCategoryMapper.java
similarity index 71%
rename from ycl-common/src/main/java/com/ycl/mapper/user/UmsResourceCategoryMapper.java
rename to ycl-common/src/main/java/com/ycl/mapper/platform/user/UmsResourceCategoryMapper.java
index 2cbd932..838606f 100644
--- a/ycl-common/src/main/java/com/ycl/mapper/user/UmsResourceCategoryMapper.java
+++ b/ycl-common/src/main/java/com/ycl/mapper/platform/user/UmsResourceCategoryMapper.java
@@ -1,7 +1,7 @@
-package com.ycl.mapper.user;
+package com.ycl.mapper.platform.user;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.ycl.entity.user.UmsResourceCategory;
+import com.ycl.entity.platform.user.UmsResourceCategory;
/**
* <p>
diff --git a/ycl-common/src/main/java/com/ycl/mapper/user/UmsResourceMapper.java b/ycl-common/src/main/java/com/ycl/mapper/platform/user/UmsResourceMapper.java
similarity index 86%
rename from ycl-common/src/main/java/com/ycl/mapper/user/UmsResourceMapper.java
rename to ycl-common/src/main/java/com/ycl/mapper/platform/user/UmsResourceMapper.java
index 5ef819d..45b168f 100644
--- a/ycl-common/src/main/java/com/ycl/mapper/user/UmsResourceMapper.java
+++ b/ycl-common/src/main/java/com/ycl/mapper/platform/user/UmsResourceMapper.java
@@ -1,7 +1,7 @@
-package com.ycl.mapper.user;
+package com.ycl.mapper.platform.user;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.ycl.entity.user.UmsResource;
+import com.ycl.entity.platform.user.UmsResource;
import org.apache.ibatis.annotations.Param;
import java.util.List;
diff --git a/ycl-common/src/main/java/com/ycl/mapper/user/UmsRoleMapper.java b/ycl-common/src/main/java/com/ycl/mapper/platform/user/UmsRoleMapper.java
similarity index 82%
rename from ycl-common/src/main/java/com/ycl/mapper/user/UmsRoleMapper.java
rename to ycl-common/src/main/java/com/ycl/mapper/platform/user/UmsRoleMapper.java
index 877f65b..5ecd2ea 100644
--- a/ycl-common/src/main/java/com/ycl/mapper/user/UmsRoleMapper.java
+++ b/ycl-common/src/main/java/com/ycl/mapper/platform/user/UmsRoleMapper.java
@@ -1,7 +1,7 @@
-package com.ycl.mapper.user;
+package com.ycl.mapper.platform.user;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.ycl.entity.user.UmsRole;
+import com.ycl.entity.platform.user.UmsRole;
import org.apache.ibatis.annotations.Param;
import java.util.List;
diff --git a/ycl-common/src/main/java/com/ycl/mapper/user/UmsRoleMenuRelationMapper.java b/ycl-common/src/main/java/com/ycl/mapper/platform/user/UmsRoleMenuRelationMapper.java
similarity index 72%
rename from ycl-common/src/main/java/com/ycl/mapper/user/UmsRoleMenuRelationMapper.java
rename to ycl-common/src/main/java/com/ycl/mapper/platform/user/UmsRoleMenuRelationMapper.java
index ba47f03..ce29749 100644
--- a/ycl-common/src/main/java/com/ycl/mapper/user/UmsRoleMenuRelationMapper.java
+++ b/ycl-common/src/main/java/com/ycl/mapper/platform/user/UmsRoleMenuRelationMapper.java
@@ -1,7 +1,7 @@
-package com.ycl.mapper.user;
+package com.ycl.mapper.platform.user;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.ycl.entity.user.UmsRoleMenuRelation;
+import com.ycl.entity.platform.user.UmsRoleMenuRelation;
/**
* <p>
diff --git a/ycl-common/src/main/java/com/ycl/mapper/user/UmsRoleResourceRelationMapper.java b/ycl-common/src/main/java/com/ycl/mapper/platform/user/UmsRoleResourceRelationMapper.java
similarity index 72%
rename from ycl-common/src/main/java/com/ycl/mapper/user/UmsRoleResourceRelationMapper.java
rename to ycl-common/src/main/java/com/ycl/mapper/platform/user/UmsRoleResourceRelationMapper.java
index b719f34..1c603ca 100644
--- a/ycl-common/src/main/java/com/ycl/mapper/user/UmsRoleResourceRelationMapper.java
+++ b/ycl-common/src/main/java/com/ycl/mapper/platform/user/UmsRoleResourceRelationMapper.java
@@ -1,7 +1,7 @@
-package com.ycl.mapper.user;
+package com.ycl.mapper.platform.user;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.ycl.entity.user.UmsRoleResourceRelation;
+import com.ycl.entity.platform.user.UmsRoleResourceRelation;
/**
* <p>
diff --git a/ycl-common/src/main/java/com/ycl/mapper/platform/zfreport/EnforcelawReportMapper.java b/ycl-common/src/main/java/com/ycl/mapper/platform/zfreport/EnforcelawReportMapper.java
new file mode 100644
index 0000000..c9bdbe9
--- /dev/null
+++ b/ycl-common/src/main/java/com/ycl/mapper/platform/zfreport/EnforcelawReportMapper.java
@@ -0,0 +1,16 @@
+package com.ycl.mapper.platform.zfreport;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ycl.entity.platform.zfreport.EnforcelawReport;
+
+/**
+ * <p>
+ * 杩濊浜嬮」澶勭疆绠＄悊锛氬寘鍚繚娉�(杩濆缓)鎯呭喌涓婃姤銆佺珛妗堛�佹淳閬ｃ�佸缃�佹牳鏌ャ�佺粨妗� Mapper 鎺ュ彛
+ * </p>
+ *
+ * @author lyq
+ * @since 2022-09-14
+ */
+public interface EnforcelawReportMapper extends BaseMapper<EnforcelawReport> {
+
+}
diff --git a/ycl-common/src/main/java/com/ycl/service/depart/SccgDepartService.java b/ycl-common/src/main/java/com/ycl/service/platform/depart/UmsDepartService.java
similarity index 71%
rename from ycl-common/src/main/java/com/ycl/service/depart/SccgDepartService.java
rename to ycl-common/src/main/java/com/ycl/service/platform/depart/UmsDepartService.java
index 0d2d5df..4b8501f 100644
--- a/ycl-common/src/main/java/com/ycl/service/depart/SccgDepartService.java
+++ b/ycl-common/src/main/java/com/ycl/service/platform/depart/UmsDepartService.java
@@ -1,11 +1,9 @@
-package com.ycl.service.depart;
+package com.ycl.service.platform.depart;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
-import com.ycl.api.BasePageDTO;
-import com.ycl.entity.depart.SccgDepart;
+import com.ycl.entity.platform.depart.UmsDepart;
import com.ycl.vo.depart.DepartVO;
-import org.apache.catalina.LifecycleState;
import java.util.List;
@@ -17,7 +15,7 @@
* @author lyq
* @since 2022-09-07
*/
-public interface SccgDepartService extends IService<SccgDepart> {
+public interface UmsDepartService extends IService<UmsDepart> {
/**
* 鏂板
*
@@ -31,7 +29,7 @@
* @param id
* @return
*/
- SccgDepart loadDepartById(long id);
+ UmsDepart loadDepartById(long id);
/**
* 淇敼
@@ -50,14 +48,14 @@
* 鏍戝舰
* @return
*/
- List<SccgDepart> tree();
+ List<UmsDepart> tree();
/**
* 鍒嗛〉
* @param params
* @return
*/
- IPage<SccgDepart> pageDepart(DepartVO.PageDepartVO params);
+ IPage<UmsDepart> pageDepart(DepartVO.PageDepartVO params);
/**
* 淇敼鐘舵��
diff --git a/ycl-common/src/main/java/com/ycl/service/depart/impl/SccgDepartServiceImpl.java b/ycl-common/src/main/java/com/ycl/service/platform/depart/impl/UmsDepartServiceImpl.java
similarity index 72%
rename from ycl-common/src/main/java/com/ycl/service/depart/impl/SccgDepartServiceImpl.java
rename to ycl-common/src/main/java/com/ycl/service/platform/depart/impl/UmsDepartServiceImpl.java
index 1cfee0f..60717c6 100644
--- a/ycl-common/src/main/java/com/ycl/service/depart/impl/SccgDepartServiceImpl.java
+++ b/ycl-common/src/main/java/com/ycl/service/platform/depart/impl/UmsDepartServiceImpl.java
@@ -1,4 +1,4 @@
-package com.ycl.service.depart.impl;
+package com.ycl.service.platform.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.depart.SccgDepart;
-import com.ycl.entity.user.UmsDepartManage;
+import com.ycl.entity.platform.depart.UmsDepart;
+import com.ycl.entity.platform.user.UmsDepartManage;
import com.ycl.enums.common.ResultCode;
import com.ycl.exception.ApiException;
-import com.ycl.mapper.depart.SccgDepartMapper;
-import com.ycl.service.depart.SccgDepartService;
-import com.ycl.service.user.UmsDepartManageService;
-import com.ycl.service.user.UmsAdminService;
+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.utils.common.PojoUtils;
import com.ycl.vo.depart.DepartVO;
import org.apache.commons.lang3.StringUtils;
@@ -34,9 +34,9 @@
* @since 2022-09-07
*/
@Service
-public class SccgDepartServiceImpl extends ServiceImpl<SccgDepartMapper, SccgDepart> implements SccgDepartService {
+public class UmsDepartServiceImpl extends ServiceImpl<UmsDepartMapper, UmsDepart> implements UmsDepartService {
@Resource
- private SccgDepartMapper sccgDepartMapper;
+ private UmsDepartMapper sccgDepartMapper;
@Resource
private UmsDepartManageService umsAdminDepartService;
@Resource
@@ -45,11 +45,11 @@
@Override
@Transactional(rollbackFor = Exception.class)
public void create(DepartVO.AddDepartVO addDepartVO) {
- SccgDepart sccgDepart = this.queryByName(addDepartVO.getDepartName());
+ UmsDepart sccgDepart = this.queryByName(addDepartVO.getDepartName());
if (null != sccgDepart) {
throw new ApiException(ResultCode.RECORD_ALREADY_EXISTS);
}
- SccgDepart depart = new SccgDepart();
+ UmsDepart depart = new UmsDepart();
BeanUtils.copyProperties(addDepartVO, depart);
if (sccgDepartMapper.insert(depart) <= 0) {
throw new ApiException(ResultCode.RECORD_SAVE_FAIL);
@@ -57,8 +57,8 @@
}
@Override
- public SccgDepart loadDepartById(long id) {
- SccgDepart sccgDepart = sccgDepartMapper.selectById(id);
+ public UmsDepart loadDepartById(long id) {
+ UmsDepart sccgDepart = sccgDepartMapper.selectById(id);
if (null == sccgDepart) {
throw new ApiException(ResultCode.RECORD_NOT_EXISTS);
}
@@ -68,11 +68,11 @@
@Override
@Transactional(rollbackFor = Exception.class)
public void update(DepartVO.UpdateDepartVO updateDepartVO) {
- SccgDepart sccgDepart = this.queryByName(updateDepartVO.getDepartName());
+ UmsDepart sccgDepart = this.queryByName(updateDepartVO.getDepartName());
if (null != sccgDepart && sccgDepart.getId() != updateDepartVO.getId()) {
throw new ApiException(ResultCode.RECORD_ALREADY_EXISTS);
}
- SccgDepart depart = this.getById(updateDepartVO.getId());
+ UmsDepart depart = this.getById(updateDepartVO.getId());
BeanUtils.copyProperties(updateDepartVO, depart);
List<Long> userIds = updateDepartVO.getUserIds();
if (CollUtil.isNotEmpty(userIds)) {
@@ -103,13 +103,13 @@
}
@Override
- public List<SccgDepart> tree() {
+ public List<UmsDepart> tree() {
// 1.鏌ュ嚭鎵�鏈夌綉鏍�
- List<SccgDepart> list = list();
+ List<UmsDepart> list = list();
// 2.缁勮鎴愮埗瀛愮殑鏍戝瀷缁撴瀯
// 2.1銆佹壘鍒版墍鏈夌殑涓�绾х綉鏍�:浣跨敤jdk8鐨剆tream娴佽繘琛岃繃婊�
- List<SccgDepart> collect = list.stream().filter(griddingEntity -> {
+ List<UmsDepart> collect = list.stream().filter(griddingEntity -> {
//鍒嗙被鐖秈d涓�0灏辫〃绀鸿缃戞牸涓� 涓�绾х綉鏍�
return griddingEntity.getParentId() == 0;
}).map(item -> {
@@ -117,26 +117,26 @@
item.setChildren(getChildrens(item, list));
return item;
}).collect(Collectors.toList());
- List<SccgDepart> treeData = getTreeData(collect);
+ List<UmsDepart> treeData = getTreeData(collect);
return treeData;
}
@Override
- public IPage<SccgDepart> pageDepart(DepartVO.PageDepartVO params) {
- Page<SccgDepart> page = new Page<>(params.getCurrent(), params.getPageSize());
- LambdaQueryWrapper<SccgDepart> query = new LambdaQueryWrapper<>();
+ public IPage<UmsDepart> pageDepart(DepartVO.PageDepartVO params) {
+ Page<UmsDepart> page = new Page<>(params.getCurrent(), params.getPageSize());
+ LambdaQueryWrapper<UmsDepart> query = new LambdaQueryWrapper<>();
if (StringUtils.isNotBlank(params.getDepartName())) {
- query.like(SccgDepart::getDepartName, params.getDepartName());
+ query.like(UmsDepart::getDepartName, params.getDepartName());
}
if (PojoUtils.Vo.isUsefulSearchParam(params.getDepartType())) {
- query.like(SccgDepart::getDepartType, params.getDepartType());
+ query.like(UmsDepart::getDepartType, params.getDepartType());
}
- query.orderByDesc(SccgDepart::getCreateTime);
- Page<SccgDepart> departPage = sccgDepartMapper.selectPage(page, query);
- List<SccgDepart> records = departPage.getRecords();
+ query.orderByDesc(UmsDepart::getCreateTime);
+ Page<UmsDepart> departPage = sccgDepartMapper.selectPage(page, query);
+ List<UmsDepart> records = departPage.getRecords();
//璐熻矗浜�
if (CollUtil.isNotEmpty(records)) {
- for (SccgDepart record : records) {
+ for (UmsDepart record : records) {
List<UmsDepartManage> umsAdminDeparts = umsAdminDepartService.queryByDepartId(record.getId());
if (CollUtil.isNotEmpty(umsAdminDeparts)) {
List<AdminDepartDTO.UserInfoDTO> userInfoDTOS = umsAdminDeparts.stream().map(a -> {
@@ -154,7 +154,7 @@
@Override
public void updateStatus(DepartVO.StatusDepartVO params) {
- SccgDepart sccgDepart = this.loadDepartById(params.getId());
+ UmsDepart sccgDepart = this.loadDepartById(params.getId());
BeanUtils.copyProperties(params, sccgDepart);
if (sccgDepartMapper.updateById(sccgDepart) <= 0) {
throw new ApiException(ResultCode.RECORD_UPDATE_FAIL);
@@ -167,7 +167,7 @@
*
* @return
*/
- public List<SccgDepart> getTreeData(List<SccgDepart> griddingEntities) {
+ public List<UmsDepart> getTreeData(List<UmsDepart> griddingEntities) {
for (int i = 0; i < griddingEntities.size(); i++) {
//濡傛灉Children鐨剆ize灏忎簬1灏辫鏄庝负绌猴紝璁剧疆涓簄ull
if (griddingEntities.get(i).getChildren().size() < 1) {
@@ -187,8 +187,8 @@
* @param all 鎵�鏈夌綉鏍�
* @return
*/
- public List<SccgDepart> getChildrens(SccgDepart root, List<SccgDepart> all) {
- List<SccgDepart> collect = all.stream().filter(griddingEntity -> {
+ public List<UmsDepart> getChildrens(UmsDepart root, List<UmsDepart> all) {
+ List<UmsDepart> collect = all.stream().filter(griddingEntity -> {
return griddingEntity.getParentId().equals(root.getId());
}).map(item -> {
item.setChildren(getChildrens(item, all));
@@ -204,10 +204,10 @@
* @param name
* @return
*/
- private SccgDepart queryByName(String name) {
- LambdaQueryWrapper<SccgDepart> queryWrapper = new LambdaQueryWrapper<>();
- queryWrapper.eq(SccgDepart::getDepartName, name);
- SccgDepart sccgDepart = this.sccgDepartMapper.selectOne(queryWrapper);
+ private UmsDepart queryByName(String name) {
+ LambdaQueryWrapper<UmsDepart> queryWrapper = new LambdaQueryWrapper<>();
+ queryWrapper.eq(UmsDepart::getDepartName, name);
+ UmsDepart sccgDepart = this.sccgDepartMapper.selectOne(queryWrapper);
return sccgDepart;
}
diff --git a/ycl-common/src/main/java/com/ycl/service/platform/UmsThirdApplicationsService.java b/ycl-common/src/main/java/com/ycl/service/platform/portal/UmsThirdApplicationsService.java
similarity index 69%
rename from ycl-common/src/main/java/com/ycl/service/platform/UmsThirdApplicationsService.java
rename to ycl-common/src/main/java/com/ycl/service/platform/portal/UmsThirdApplicationsService.java
index fd2952d..088c63f 100644
--- a/ycl-common/src/main/java/com/ycl/service/platform/UmsThirdApplicationsService.java
+++ b/ycl-common/src/main/java/com/ycl/service/platform/portal/UmsThirdApplicationsService.java
@@ -1,7 +1,7 @@
-package com.ycl.service.platform;
+package com.ycl.service.platform.portal;
import com.baomidou.mybatisplus.extension.service.IService;
-import com.ycl.entity.platform.UmsThirdApplications;
+import com.ycl.entity.platform.portal.UmsThirdApplications;
/**
* <p>
diff --git a/ycl-common/src/main/java/com/ycl/service/platform/UmsWebsiteLogoService.java b/ycl-common/src/main/java/com/ycl/service/platform/portal/UmsWebsiteLogoService.java
similarity index 69%
rename from ycl-common/src/main/java/com/ycl/service/platform/UmsWebsiteLogoService.java
rename to ycl-common/src/main/java/com/ycl/service/platform/portal/UmsWebsiteLogoService.java
index dde03ce..b1939d9 100644
--- a/ycl-common/src/main/java/com/ycl/service/platform/UmsWebsiteLogoService.java
+++ b/ycl-common/src/main/java/com/ycl/service/platform/portal/UmsWebsiteLogoService.java
@@ -1,7 +1,7 @@
-package com.ycl.service.platform;
+package com.ycl.service.platform.portal;
import com.baomidou.mybatisplus.extension.service.IService;
-import com.ycl.entity.platform.UmsWebsiteLogo;
+import com.ycl.entity.platform.portal.UmsWebsiteLogo;
/**
* <p>
diff --git a/ycl-common/src/main/java/com/ycl/service/platform/impl/UmsThirdApplicationsServiceImpl.java b/ycl-common/src/main/java/com/ycl/service/platform/portal/impl/UmsThirdApplicationsServiceImpl.java
similarity index 60%
rename from ycl-common/src/main/java/com/ycl/service/platform/impl/UmsThirdApplicationsServiceImpl.java
rename to ycl-common/src/main/java/com/ycl/service/platform/portal/impl/UmsThirdApplicationsServiceImpl.java
index 984cbd2..501705a 100644
--- a/ycl-common/src/main/java/com/ycl/service/platform/impl/UmsThirdApplicationsServiceImpl.java
+++ b/ycl-common/src/main/java/com/ycl/service/platform/portal/impl/UmsThirdApplicationsServiceImpl.java
@@ -1,9 +1,9 @@
-package com.ycl.service.platform.impl;
+package com.ycl.service.platform.portal.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ycl.entity.platform.UmsThirdApplications;
-import com.ycl.mapper.platform.UmsThirdApplicationsMapper;
-import com.ycl.service.platform.UmsThirdApplicationsService;
+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;
/**
diff --git a/ycl-common/src/main/java/com/ycl/service/platform/impl/UmsWebsiteLogoServiceImpl.java b/ycl-common/src/main/java/com/ycl/service/platform/portal/impl/UmsWebsiteLogoServiceImpl.java
similarity index 60%
rename from ycl-common/src/main/java/com/ycl/service/platform/impl/UmsWebsiteLogoServiceImpl.java
rename to ycl-common/src/main/java/com/ycl/service/platform/portal/impl/UmsWebsiteLogoServiceImpl.java
index 82e0d23..e34da2f 100644
--- a/ycl-common/src/main/java/com/ycl/service/platform/impl/UmsWebsiteLogoServiceImpl.java
+++ b/ycl-common/src/main/java/com/ycl/service/platform/portal/impl/UmsWebsiteLogoServiceImpl.java
@@ -1,9 +1,9 @@
-package com.ycl.service.platform.impl;
+package com.ycl.service.platform.portal.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ycl.entity.platform.UmsWebsiteLogo;
-import com.ycl.mapper.platform.UmsWebsiteLogoMapper;
-import com.ycl.service.platform.UmsWebsiteLogoService;
+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;
/**
diff --git a/ycl-common/src/main/java/com/ycl/service/store/StoreInfoService.java b/ycl-common/src/main/java/com/ycl/service/platform/store/StoreInfoService.java
similarity index 89%
rename from ycl-common/src/main/java/com/ycl/service/store/StoreInfoService.java
rename to ycl-common/src/main/java/com/ycl/service/platform/store/StoreInfoService.java
index 59dca5d..29f5271 100644
--- a/ycl-common/src/main/java/com/ycl/service/store/StoreInfoService.java
+++ b/ycl-common/src/main/java/com/ycl/service/platform/store/StoreInfoService.java
@@ -1,8 +1,8 @@
-package com.ycl.service.store;
+package com.ycl.service.platform.store;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
-import com.ycl.entity.store.StoreInfo;
+import com.ycl.entity.platform.store.StoreInfo;
import org.springframework.web.multipart.MultipartFile;
/**
diff --git a/ycl-common/src/main/java/com/ycl/service/store/StoreScoreRuleService.java b/ycl-common/src/main/java/com/ycl/service/platform/store/StoreScoreRuleService.java
similarity index 88%
rename from ycl-common/src/main/java/com/ycl/service/store/StoreScoreRuleService.java
rename to ycl-common/src/main/java/com/ycl/service/platform/store/StoreScoreRuleService.java
index ea2fc55..e4cfe9a 100644
--- a/ycl-common/src/main/java/com/ycl/service/store/StoreScoreRuleService.java
+++ b/ycl-common/src/main/java/com/ycl/service/platform/store/StoreScoreRuleService.java
@@ -1,8 +1,8 @@
-package com.ycl.service.store;
+package com.ycl.service.platform.store;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
-import com.ycl.entity.store.StoreScoreRule;
+import com.ycl.entity.platform.store.StoreScoreRule;
import com.ycl.vo.store.StoreScoreRuleVO;
/**
diff --git a/ycl-common/src/main/java/com/ycl/service/store/impl/StoreInfoServiceImpl.java b/ycl-common/src/main/java/com/ycl/service/platform/store/impl/StoreInfoServiceImpl.java
similarity index 92%
rename from ycl-common/src/main/java/com/ycl/service/store/impl/StoreInfoServiceImpl.java
rename to ycl-common/src/main/java/com/ycl/service/platform/store/impl/StoreInfoServiceImpl.java
index 35be9ec..08a5d4c 100644
--- a/ycl-common/src/main/java/com/ycl/service/store/impl/StoreInfoServiceImpl.java
+++ b/ycl-common/src/main/java/com/ycl/service/platform/store/impl/StoreInfoServiceImpl.java
@@ -1,14 +1,14 @@
-package com.ycl.service.store.impl;
+package com.ycl.service.platform.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.store.StoreInfo;
+import com.ycl.entity.platform.store.StoreInfo;
import com.ycl.enums.common.ResultCode;
import com.ycl.exception.ApiException;
-import com.ycl.mapper.store.StoreInfoMapper;
-import com.ycl.service.store.StoreInfoService;
+import com.ycl.mapper.platform.store.StoreInfoMapper;
+import com.ycl.service.platform.store.StoreInfoService;
import com.ycl.utils.ExcelUtils;
import com.ycl.vo.store.StoreInfoExcelVo;
import lombok.extern.slf4j.Slf4j;
diff --git a/ycl-common/src/main/java/com/ycl/service/store/impl/StoreScoreRuleServiceImpl.java b/ycl-common/src/main/java/com/ycl/service/platform/store/impl/StoreScoreRuleServiceImpl.java
similarity index 88%
rename from ycl-common/src/main/java/com/ycl/service/store/impl/StoreScoreRuleServiceImpl.java
rename to ycl-common/src/main/java/com/ycl/service/platform/store/impl/StoreScoreRuleServiceImpl.java
index 5185b18..ab9caa9 100644
--- a/ycl-common/src/main/java/com/ycl/service/store/impl/StoreScoreRuleServiceImpl.java
+++ b/ycl-common/src/main/java/com/ycl/service/platform/store/impl/StoreScoreRuleServiceImpl.java
@@ -1,13 +1,13 @@
-package com.ycl.service.store.impl;
+package com.ycl.service.platform.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.store.StoreScoreRule;
+import com.ycl.entity.platform.store.StoreScoreRule;
import com.ycl.exception.ApiException;
-import com.ycl.mapper.store.StoreScoreRuleMapper;
-import com.ycl.service.store.StoreScoreRuleService;
+import com.ycl.mapper.platform.store.StoreScoreRuleMapper;
+import com.ycl.service.platform.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/user/UmsAdminCacheService.java b/ycl-common/src/main/java/com/ycl/service/platform/user/UmsAdminCacheService.java
similarity index 89%
rename from ycl-common/src/main/java/com/ycl/service/user/UmsAdminCacheService.java
rename to ycl-common/src/main/java/com/ycl/service/platform/user/UmsAdminCacheService.java
index 37a26a1..65e327e 100644
--- a/ycl-common/src/main/java/com/ycl/service/user/UmsAdminCacheService.java
+++ b/ycl-common/src/main/java/com/ycl/service/platform/user/UmsAdminCacheService.java
@@ -1,10 +1,10 @@
-package com.ycl.service.user;
+package com.ycl.service.platform.user;
-import com.ycl.entity.user.UmsAdmin;
-import com.ycl.entity.user.UmsResource;
+import com.ycl.entity.platform.user.UmsAdmin;
+import com.ycl.entity.platform.user.UmsResource;
import java.util.List;
diff --git a/ycl-common/src/main/java/com/ycl/service/user/UmsAdminRoleRelationService.java b/ycl-common/src/main/java/com/ycl/service/platform/user/UmsAdminRoleRelationService.java
similarity index 70%
rename from ycl-common/src/main/java/com/ycl/service/user/UmsAdminRoleRelationService.java
rename to ycl-common/src/main/java/com/ycl/service/platform/user/UmsAdminRoleRelationService.java
index 0746cdb..bf88be8 100644
--- a/ycl-common/src/main/java/com/ycl/service/user/UmsAdminRoleRelationService.java
+++ b/ycl-common/src/main/java/com/ycl/service/platform/user/UmsAdminRoleRelationService.java
@@ -1,7 +1,7 @@
-package com.ycl.service.user;
+package com.ycl.service.platform.user;
import com.baomidou.mybatisplus.extension.service.IService;
-import com.ycl.entity.user.UmsAdminRoleRelation;
+import com.ycl.entity.platform.user.UmsAdminRoleRelation;
/**
* 绠＄悊鍛樿鑹插叧绯荤鐞哠ervice
diff --git a/ycl-common/src/main/java/com/ycl/service/user/UmsAdminService.java b/ycl-common/src/main/java/com/ycl/service/platform/user/UmsAdminService.java
similarity index 92%
rename from ycl-common/src/main/java/com/ycl/service/user/UmsAdminService.java
rename to ycl-common/src/main/java/com/ycl/service/platform/user/UmsAdminService.java
index 765ab4e..cd024bc 100644
--- a/ycl-common/src/main/java/com/ycl/service/user/UmsAdminService.java
+++ b/ycl-common/src/main/java/com/ycl/service/platform/user/UmsAdminService.java
@@ -1,13 +1,13 @@
-package com.ycl.service.user;
+package com.ycl.service.platform.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.user.UmsAdmin;
-import com.ycl.entity.user.UmsResource;
-import com.ycl.entity.user.UmsRole;
+import com.ycl.entity.platform.user.UmsAdmin;
+import com.ycl.entity.platform.user.UmsResource;
+import com.ycl.entity.platform.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/user/UmsDepartManageService.java b/ycl-common/src/main/java/com/ycl/service/platform/user/UmsDepartManageService.java
similarity index 84%
rename from ycl-common/src/main/java/com/ycl/service/user/UmsDepartManageService.java
rename to ycl-common/src/main/java/com/ycl/service/platform/user/UmsDepartManageService.java
index d09e114..70f0705 100644
--- a/ycl-common/src/main/java/com/ycl/service/user/UmsDepartManageService.java
+++ b/ycl-common/src/main/java/com/ycl/service/platform/user/UmsDepartManageService.java
@@ -1,8 +1,8 @@
-package com.ycl.service.user;
+package com.ycl.service.platform.user;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ycl.api.BasePageDTO;
-import com.ycl.entity.user.UmsDepartManage;
+import com.ycl.entity.platform.user.UmsDepartManage;
import java.util.List;
diff --git a/ycl-common/src/main/java/com/ycl/service/user/UmsMenuService.java b/ycl-common/src/main/java/com/ycl/service/platform/user/UmsMenuService.java
similarity index 90%
rename from ycl-common/src/main/java/com/ycl/service/user/UmsMenuService.java
rename to ycl-common/src/main/java/com/ycl/service/platform/user/UmsMenuService.java
index 7a19c1d..4e153b5 100644
--- a/ycl-common/src/main/java/com/ycl/service/user/UmsMenuService.java
+++ b/ycl-common/src/main/java/com/ycl/service/platform/user/UmsMenuService.java
@@ -1,10 +1,10 @@
-package com.ycl.service.user;
+package com.ycl.service.platform.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.user.UmsMenu;
+import com.ycl.entity.platform.user.UmsMenu;
import java.util.List;
diff --git a/ycl-common/src/main/java/com/ycl/service/user/UmsResourceCategoryService.java b/ycl-common/src/main/java/com/ycl/service/platform/user/UmsResourceCategoryService.java
similarity index 82%
rename from ycl-common/src/main/java/com/ycl/service/user/UmsResourceCategoryService.java
rename to ycl-common/src/main/java/com/ycl/service/platform/user/UmsResourceCategoryService.java
index 0c2a576..6887458 100644
--- a/ycl-common/src/main/java/com/ycl/service/user/UmsResourceCategoryService.java
+++ b/ycl-common/src/main/java/com/ycl/service/platform/user/UmsResourceCategoryService.java
@@ -1,8 +1,8 @@
-package com.ycl.service.user;
+package com.ycl.service.platform.user;
import com.baomidou.mybatisplus.extension.service.IService;
-import com.ycl.entity.user.UmsResourceCategory;
+import com.ycl.entity.platform.user.UmsResourceCategory;
import java.util.List;
diff --git a/ycl-common/src/main/java/com/ycl/service/user/UmsResourceService.java b/ycl-common/src/main/java/com/ycl/service/platform/user/UmsResourceService.java
similarity index 88%
rename from ycl-common/src/main/java/com/ycl/service/user/UmsResourceService.java
rename to ycl-common/src/main/java/com/ycl/service/platform/user/UmsResourceService.java
index d74c306..2d092b9 100644
--- a/ycl-common/src/main/java/com/ycl/service/user/UmsResourceService.java
+++ b/ycl-common/src/main/java/com/ycl/service/platform/user/UmsResourceService.java
@@ -1,9 +1,9 @@
-package com.ycl.service.user;
+package com.ycl.service.platform.user;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
-import com.ycl.entity.user.UmsResource;
+import com.ycl.entity.platform.user.UmsResource;
/**
* 鍚庡彴璧勬簮绠＄悊Service
diff --git a/ycl-common/src/main/java/com/ycl/service/user/UmsRoleMenuRelationService.java b/ycl-common/src/main/java/com/ycl/service/platform/user/UmsRoleMenuRelationService.java
similarity index 70%
rename from ycl-common/src/main/java/com/ycl/service/user/UmsRoleMenuRelationService.java
rename to ycl-common/src/main/java/com/ycl/service/platform/user/UmsRoleMenuRelationService.java
index c6ffa36..6c1ff88 100644
--- a/ycl-common/src/main/java/com/ycl/service/user/UmsRoleMenuRelationService.java
+++ b/ycl-common/src/main/java/com/ycl/service/platform/user/UmsRoleMenuRelationService.java
@@ -1,7 +1,7 @@
-package com.ycl.service.user;
+package com.ycl.service.platform.user;
import com.baomidou.mybatisplus.extension.service.IService;
-import com.ycl.entity.user.UmsRoleMenuRelation;
+import com.ycl.entity.platform.user.UmsRoleMenuRelation;
/**
* 瑙掕壊鑿滃崟鍏崇郴绠＄悊Service
diff --git a/ycl-common/src/main/java/com/ycl/service/user/UmsRoleResourceRelationService.java b/ycl-common/src/main/java/com/ycl/service/platform/user/UmsRoleResourceRelationService.java
similarity index 69%
rename from ycl-common/src/main/java/com/ycl/service/user/UmsRoleResourceRelationService.java
rename to ycl-common/src/main/java/com/ycl/service/platform/user/UmsRoleResourceRelationService.java
index d9b8c96..eedc3b8 100644
--- a/ycl-common/src/main/java/com/ycl/service/user/UmsRoleResourceRelationService.java
+++ b/ycl-common/src/main/java/com/ycl/service/platform/user/UmsRoleResourceRelationService.java
@@ -1,7 +1,7 @@
-package com.ycl.service.user;
+package com.ycl.service.platform.user;
import com.baomidou.mybatisplus.extension.service.IService;
-import com.ycl.entity.user.UmsRoleResourceRelation;
+import com.ycl.entity.platform.user.UmsRoleResourceRelation;
/**
* 瑙掕壊璧勬簮鍏崇郴绠＄悊Service
diff --git a/ycl-common/src/main/java/com/ycl/service/user/UmsRoleService.java b/ycl-common/src/main/java/com/ycl/service/platform/user/UmsRoleService.java
similarity index 86%
rename from ycl-common/src/main/java/com/ycl/service/user/UmsRoleService.java
rename to ycl-common/src/main/java/com/ycl/service/platform/user/UmsRoleService.java
index 7057986..75aafef 100644
--- a/ycl-common/src/main/java/com/ycl/service/user/UmsRoleService.java
+++ b/ycl-common/src/main/java/com/ycl/service/platform/user/UmsRoleService.java
@@ -1,10 +1,10 @@
-package com.ycl.service.user;
+package com.ycl.service.platform.user;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
-import com.ycl.entity.user.UmsMenu;
-import com.ycl.entity.user.UmsResource;
-import com.ycl.entity.user.UmsRole;
+import com.ycl.entity.platform.user.UmsMenu;
+import com.ycl.entity.platform.user.UmsResource;
+import com.ycl.entity.platform.user.UmsRole;
import org.springframework.transaction.annotation.Transactional;
import java.util.List;
diff --git a/ycl-common/src/main/java/com/ycl/service/user/impl/UmsAdminCacheServiceImpl.java b/ycl-common/src/main/java/com/ycl/service/platform/user/impl/UmsAdminCacheServiceImpl.java
similarity index 90%
rename from ycl-common/src/main/java/com/ycl/service/user/impl/UmsAdminCacheServiceImpl.java
rename to ycl-common/src/main/java/com/ycl/service/platform/user/impl/UmsAdminCacheServiceImpl.java
index 1953b96..d84340b 100644
--- a/ycl-common/src/main/java/com/ycl/service/user/impl/UmsAdminCacheServiceImpl.java
+++ b/ycl-common/src/main/java/com/ycl/service/platform/user/impl/UmsAdminCacheServiceImpl.java
@@ -1,16 +1,15 @@
-package com.ycl.service.user.impl;
+package com.ycl.service.platform.user.impl;
import cn.hutool.core.collection.CollUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-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.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.service.redis.RedisService;
-import com.ycl.service.user.UmsAdminCacheService;
-import com.ycl.service.user.UmsAdminRoleRelationService;
-import com.ycl.service.user.UmsAdminService;
-import org.springframework.beans.factory.annotation.Autowired;
+import com.ycl.service.platform.user.UmsAdminCacheService;
+import com.ycl.service.platform.user.UmsAdminRoleRelationService;
+import com.ycl.service.platform.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/user/impl/UmsAdminRoleRelationServiceImpl.java b/ycl-common/src/main/java/com/ycl/service/platform/user/impl/UmsAdminRoleRelationServiceImpl.java
similarity index 61%
rename from ycl-common/src/main/java/com/ycl/service/user/impl/UmsAdminRoleRelationServiceImpl.java
rename to ycl-common/src/main/java/com/ycl/service/platform/user/impl/UmsAdminRoleRelationServiceImpl.java
index 4cb9924..36f279f 100644
--- a/ycl-common/src/main/java/com/ycl/service/user/impl/UmsAdminRoleRelationServiceImpl.java
+++ b/ycl-common/src/main/java/com/ycl/service/platform/user/impl/UmsAdminRoleRelationServiceImpl.java
@@ -1,9 +1,9 @@
-package com.ycl.service.user.impl;
+package com.ycl.service.platform.user.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ycl.entity.user.UmsAdminRoleRelation;
-import com.ycl.mapper.user.UmsAdminRoleRelationMapper;
-import com.ycl.service.user.UmsAdminRoleRelationService;
+import com.ycl.entity.platform.user.UmsAdminRoleRelation;
+import com.ycl.mapper.platform.user.UmsAdminRoleRelationMapper;
+import com.ycl.service.platform.user.UmsAdminRoleRelationService;
import org.springframework.stereotype.Service;
/**
diff --git a/ycl-common/src/main/java/com/ycl/service/user/impl/UmsAdminServiceImpl.java b/ycl-common/src/main/java/com/ycl/service/platform/user/impl/UmsAdminServiceImpl.java
similarity index 93%
rename from ycl-common/src/main/java/com/ycl/service/user/impl/UmsAdminServiceImpl.java
rename to ycl-common/src/main/java/com/ycl/service/platform/user/impl/UmsAdminServiceImpl.java
index fd79564..55e726a 100644
--- a/ycl-common/src/main/java/com/ycl/service/user/impl/UmsAdminServiceImpl.java
+++ b/ycl-common/src/main/java/com/ycl/service/platform/user/impl/UmsAdminServiceImpl.java
@@ -1,4 +1,4 @@
-package com.ycl.service.user.impl;
+package com.ycl.service.platform.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.depart.SccgDepart;
-import com.ycl.entity.user.*;
+import com.ycl.entity.platform.depart.UmsDepart;
+import com.ycl.entity.platform.user.*;
import com.ycl.exception.Asserts;
-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.SccgDepartService;
+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.service.redis.RedisService;
-import com.ycl.service.user.UmsAdminCacheService;
-import com.ycl.service.user.UmsDepartManageService;
-import com.ycl.service.user.UmsAdminRoleRelationService;
-import com.ycl.service.user.UmsAdminService;
+import com.ycl.service.platform.user.UmsAdminCacheService;
+import com.ycl.service.platform.user.UmsAdminRoleRelationService;
+import com.ycl.service.platform.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 SccgDepartService sccgDepartService;
+ private UmsDepartService sccgDepartService;
@Resource
private UmsDepartManageService umsAdminDepartService;
@Resource
@@ -322,7 +322,7 @@
List<UmsAdmin> records = page1.getRecords();
if (CollUtil.isNotEmpty(records)) {
records.forEach(e -> {
- SccgDepart sccgDepart = sccgDepartService.getById(e.getDepartmentId());
+ UmsDepart sccgDepart = sccgDepartService.getById(e.getDepartmentId());
if (null != sccgDepart) {
e.setDepartName(sccgDepart.getDepartName());
}
diff --git a/ycl-common/src/main/java/com/ycl/service/user/impl/UmsDepartManageServiceImpl.java b/ycl-common/src/main/java/com/ycl/service/platform/user/impl/UmsDepartManageServiceImpl.java
similarity index 84%
rename from ycl-common/src/main/java/com/ycl/service/user/impl/UmsDepartManageServiceImpl.java
rename to ycl-common/src/main/java/com/ycl/service/platform/user/impl/UmsDepartManageServiceImpl.java
index e9cf66c..378bd11 100644
--- a/ycl-common/src/main/java/com/ycl/service/user/impl/UmsDepartManageServiceImpl.java
+++ b/ycl-common/src/main/java/com/ycl/service/platform/user/impl/UmsDepartManageServiceImpl.java
@@ -1,16 +1,16 @@
-package com.ycl.service.user.impl;
+package com.ycl.service.platform.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.depart.SccgDepart;
-import com.ycl.entity.user.UmsAdmin;
-import com.ycl.entity.user.UmsDepartManage;
-import com.ycl.mapper.user.UmsDepartManageMapper;
-import com.ycl.service.depart.SccgDepartService;
-import com.ycl.service.user.UmsDepartManageService;
-import com.ycl.service.user.UmsAdminService;
+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.vo.depart.DepartVO;
import org.springframework.stereotype.Service;
@@ -32,7 +32,7 @@
@Resource
private UmsDepartManageMapper umsDepartManageMapper;
@Resource
- private SccgDepartService sccgDepartService;
+ private UmsDepartService sccgDepartService;
@Resource
private UmsAdminService umsAdminService;
@@ -72,7 +72,7 @@
DepartVO.AdminDepartInfoVO adminDepartInfoVO = null;
for (UmsDepartManage umsAdminDepart : departList) {
adminDepartInfoVO = new DepartVO.AdminDepartInfoVO();
- SccgDepart sccgDepart = sccgDepartService.loadDepartById(umsAdminDepart.getDepartId());
+ UmsDepart sccgDepart = sccgDepartService.loadDepartById(umsAdminDepart.getDepartId());
UmsAdmin umsAdmin = umsAdminService.getById(userId);
adminDepartInfoVO.setDepartId(umsAdminDepart.getDepartId());
adminDepartInfoVO.setDepartName(sccgDepart.getDepartName());
diff --git a/ycl-common/src/main/java/com/ycl/service/user/impl/UmsMenuServiceImpl.java b/ycl-common/src/main/java/com/ycl/service/platform/user/impl/UmsMenuServiceImpl.java
similarity index 93%
rename from ycl-common/src/main/java/com/ycl/service/user/impl/UmsMenuServiceImpl.java
rename to ycl-common/src/main/java/com/ycl/service/platform/user/impl/UmsMenuServiceImpl.java
index 1370b28..7fbd008 100644
--- a/ycl-common/src/main/java/com/ycl/service/user/impl/UmsMenuServiceImpl.java
+++ b/ycl-common/src/main/java/com/ycl/service/platform/user/impl/UmsMenuServiceImpl.java
@@ -1,12 +1,12 @@
-package com.ycl.service.user.impl;
+package com.ycl.service.platform.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.user.UmsMenu;
-import com.ycl.mapper.user.UmsMenuMapper;
-import com.ycl.service.user.UmsMenuService;
+import com.ycl.entity.platform.user.UmsMenu;
+import com.ycl.mapper.platform.user.UmsMenuMapper;
+import com.ycl.service.platform.user.UmsMenuService;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
diff --git a/ycl-common/src/main/java/com/ycl/service/user/impl/UmsResourceCategoryServiceImpl.java b/ycl-common/src/main/java/com/ycl/service/platform/user/impl/UmsResourceCategoryServiceImpl.java
similarity index 79%
rename from ycl-common/src/main/java/com/ycl/service/user/impl/UmsResourceCategoryServiceImpl.java
rename to ycl-common/src/main/java/com/ycl/service/platform/user/impl/UmsResourceCategoryServiceImpl.java
index 4ba5e4c..48fdf37 100644
--- a/ycl-common/src/main/java/com/ycl/service/user/impl/UmsResourceCategoryServiceImpl.java
+++ b/ycl-common/src/main/java/com/ycl/service/platform/user/impl/UmsResourceCategoryServiceImpl.java
@@ -1,10 +1,10 @@
-package com.ycl.service.user.impl;
+package com.ycl.service.platform.user.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ycl.entity.user.UmsResourceCategory;
-import com.ycl.mapper.user.UmsResourceCategoryMapper;
-import com.ycl.service.user.UmsResourceCategoryService;
+import com.ycl.entity.platform.user.UmsResourceCategory;
+import com.ycl.mapper.platform.user.UmsResourceCategoryMapper;
+import com.ycl.service.platform.user.UmsResourceCategoryService;
import org.springframework.stereotype.Service;
import java.util.Date;
diff --git a/ycl-common/src/main/java/com/ycl/service/user/impl/UmsResourceServiceImpl.java b/ycl-common/src/main/java/com/ycl/service/platform/user/impl/UmsResourceServiceImpl.java
similarity index 88%
rename from ycl-common/src/main/java/com/ycl/service/user/impl/UmsResourceServiceImpl.java
rename to ycl-common/src/main/java/com/ycl/service/platform/user/impl/UmsResourceServiceImpl.java
index 7a59404..c7bd595 100644
--- a/ycl-common/src/main/java/com/ycl/service/user/impl/UmsResourceServiceImpl.java
+++ b/ycl-common/src/main/java/com/ycl/service/platform/user/impl/UmsResourceServiceImpl.java
@@ -1,14 +1,14 @@
-package com.ycl.service.user.impl;
+package com.ycl.service.platform.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.user.UmsResource;
-import com.ycl.mapper.user.UmsResourceMapper;
-import com.ycl.service.user.UmsAdminCacheService;
-import com.ycl.service.user.UmsResourceService;
+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 org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
diff --git a/ycl-common/src/main/java/com/ycl/service/user/impl/UmsRoleMenuRelationServiceImpl.java b/ycl-common/src/main/java/com/ycl/service/platform/user/impl/UmsRoleMenuRelationServiceImpl.java
similarity index 61%
rename from ycl-common/src/main/java/com/ycl/service/user/impl/UmsRoleMenuRelationServiceImpl.java
rename to ycl-common/src/main/java/com/ycl/service/platform/user/impl/UmsRoleMenuRelationServiceImpl.java
index e789f49..210ea47 100644
--- a/ycl-common/src/main/java/com/ycl/service/user/impl/UmsRoleMenuRelationServiceImpl.java
+++ b/ycl-common/src/main/java/com/ycl/service/platform/user/impl/UmsRoleMenuRelationServiceImpl.java
@@ -1,9 +1,9 @@
-package com.ycl.service.user.impl;
+package com.ycl.service.platform.user.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ycl.entity.user.UmsRoleMenuRelation;
-import com.ycl.mapper.user.UmsRoleMenuRelationMapper;
-import com.ycl.service.user.UmsRoleMenuRelationService;
+import com.ycl.entity.platform.user.UmsRoleMenuRelation;
+import com.ycl.mapper.platform.user.UmsRoleMenuRelationMapper;
+import com.ycl.service.platform.user.UmsRoleMenuRelationService;
import org.springframework.stereotype.Service;
/**
diff --git a/ycl-common/src/main/java/com/ycl/service/user/impl/UmsRoleResourceRelationServiceImpl.java b/ycl-common/src/main/java/com/ycl/service/platform/user/impl/UmsRoleResourceRelationServiceImpl.java
similarity index 61%
rename from ycl-common/src/main/java/com/ycl/service/user/impl/UmsRoleResourceRelationServiceImpl.java
rename to ycl-common/src/main/java/com/ycl/service/platform/user/impl/UmsRoleResourceRelationServiceImpl.java
index 3b7d7e1..5877446 100644
--- a/ycl-common/src/main/java/com/ycl/service/user/impl/UmsRoleResourceRelationServiceImpl.java
+++ b/ycl-common/src/main/java/com/ycl/service/platform/user/impl/UmsRoleResourceRelationServiceImpl.java
@@ -1,9 +1,9 @@
-package com.ycl.service.user.impl;
+package com.ycl.service.platform.user.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ycl.entity.user.UmsRoleResourceRelation;
-import com.ycl.mapper.user.UmsRoleResourceRelationMapper;
-import com.ycl.service.user.UmsRoleResourceRelationService;
+import com.ycl.entity.platform.user.UmsRoleResourceRelation;
+import com.ycl.mapper.platform.user.UmsRoleResourceRelationMapper;
+import com.ycl.service.platform.user.UmsRoleResourceRelationService;
import org.springframework.stereotype.Service;
/**
diff --git a/ycl-common/src/main/java/com/ycl/service/user/impl/UmsRoleServiceImpl.java b/ycl-common/src/main/java/com/ycl/service/platform/user/impl/UmsRoleServiceImpl.java
similarity index 88%
rename from ycl-common/src/main/java/com/ycl/service/user/impl/UmsRoleServiceImpl.java
rename to ycl-common/src/main/java/com/ycl/service/platform/user/impl/UmsRoleServiceImpl.java
index 9bfaf58..aab1843 100644
--- a/ycl-common/src/main/java/com/ycl/service/user/impl/UmsRoleServiceImpl.java
+++ b/ycl-common/src/main/java/com/ycl/service/platform/user/impl/UmsRoleServiceImpl.java
@@ -1,18 +1,18 @@
-package com.ycl.service.user.impl;
+package com.ycl.service.platform.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.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 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 org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
diff --git a/ycl-common/src/main/java/com/ycl/service/platform/zfreport/IEnforcelawReportService.java b/ycl-common/src/main/java/com/ycl/service/platform/zfreport/IEnforcelawReportService.java
new file mode 100644
index 0000000..3940bcb
--- /dev/null
+++ b/ycl-common/src/main/java/com/ycl/service/platform/zfreport/IEnforcelawReportService.java
@@ -0,0 +1,16 @@
+package com.ycl.service.platform.zfreport;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ycl.entity.platform.zfreport.EnforcelawReport;
+
+/**
+ * <p>
+ * 杩濊浜嬮」澶勭疆绠＄悊锛氬寘鍚繚娉�(杩濆缓)鎯呭喌涓婃姤銆佺珛妗堛�佹淳閬ｃ�佸缃�佹牳鏌ャ�佺粨妗� 鏈嶅姟绫�
+ * </p>
+ *
+ * @author lyq
+ * @since 2022-09-14
+ */
+public interface IEnforcelawReportService extends IService<EnforcelawReport> {
+
+}
diff --git a/ycl-common/src/main/java/com/ycl/service/platform/zfreport/impl/EnforcelawReportServiceImpl.java b/ycl-common/src/main/java/com/ycl/service/platform/zfreport/impl/EnforcelawReportServiceImpl.java
new file mode 100644
index 0000000..fcee2e8
--- /dev/null
+++ b/ycl-common/src/main/java/com/ycl/service/platform/zfreport/impl/EnforcelawReportServiceImpl.java
@@ -0,0 +1,20 @@
+package com.ycl.service.platform.zfreport.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ycl.entity.platform.zfreport.EnforcelawReport;
+import com.ycl.mapper.platform.zfreport.EnforcelawReportMapper;
+import com.ycl.service.platform.zfreport.IEnforcelawReportService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 杩濊浜嬮」澶勭疆绠＄悊锛氬寘鍚繚娉�(杩濆缓)鎯呭喌涓婃姤銆佺珛妗堛�佹淳閬ｃ�佸缃�佹牳鏌ャ�佺粨妗� 鏈嶅姟瀹炵幇绫�
+ * </p>
+ *
+ * @author lyq
+ * @since 2022-09-14
+ */
+@Service
+public class EnforcelawReportServiceImpl extends ServiceImpl<EnforcelawReportMapper, EnforcelawReport> implements IEnforcelawReportService {
+
+}
diff --git a/ycl-common/src/main/resources/mapper/depart/SccgDepartMapper.xml b/ycl-common/src/main/resources/mapper/platform/depart/UmsDepartMapper.xml
similarity index 82%
rename from ycl-common/src/main/resources/mapper/depart/SccgDepartMapper.xml
rename to ycl-common/src/main/resources/mapper/platform/depart/UmsDepartMapper.xml
index 7fd7640..7b28c31 100644
--- a/ycl-common/src/main/resources/mapper/depart/SccgDepartMapper.xml
+++ b/ycl-common/src/main/resources/mapper/platform/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.depart.SccgDepartMapper">
+<mapper namespace="com.ycl.mapper.platform.depart.UmsDepartMapper">
<!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
- <resultMap id="BaseResultMap" type="com.ycl.entity.depart.SccgDepart">
+ <resultMap id="BaseResultMap" type="com.ycl.entity.platform.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/UmsThirdApplicationsMapper.xml b/ycl-common/src/main/resources/mapper/platform/portal/UmsThirdApplicationsMapper.xml
similarity index 85%
rename from ycl-common/src/main/resources/mapper/platform/UmsThirdApplicationsMapper.xml
rename to ycl-common/src/main/resources/mapper/platform/portal/UmsThirdApplicationsMapper.xml
index ea02c62..226dd46 100644
--- a/ycl-common/src/main/resources/mapper/platform/UmsThirdApplicationsMapper.xml
+++ b/ycl-common/src/main/resources/mapper/platform/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.UmsThirdApplicationsMapper">
+<mapper namespace="com.ycl.mapper.platform.portal.UmsThirdApplicationsMapper">
<!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
- <resultMap id="BaseResultMap" type="com.ycl.entity.platform.UmsThirdApplications">
+ <resultMap id="BaseResultMap" type="com.ycl.entity.platform.portal.UmsThirdApplications">
<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/UmsWebsiteLogoMapper.xml b/ycl-common/src/main/resources/mapper/platform/portal/UmsWebsiteLogoMapper.xml
similarity index 85%
rename from ycl-common/src/main/resources/mapper/platform/UmsWebsiteLogoMapper.xml
rename to ycl-common/src/main/resources/mapper/platform/portal/UmsWebsiteLogoMapper.xml
index 4962342..28a9ca7 100644
--- a/ycl-common/src/main/resources/mapper/platform/UmsWebsiteLogoMapper.xml
+++ b/ycl-common/src/main/resources/mapper/platform/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.UmsWebsiteLogoMapper">
+<mapper namespace="com.ycl.mapper.platform.portal.UmsWebsiteLogoMapper">
<!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
- <resultMap id="BaseResultMap" type="com.ycl.entity.platform.UmsWebsiteLogo">
+ <resultMap id="BaseResultMap" type="com.ycl.entity.platform.portal.UmsWebsiteLogo">
<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/store/UmsStoreInfoMapper.xml b/ycl-common/src/main/resources/mapper/platform/store/UmsStoreInfoMapper.xml
similarity index 81%
rename from ycl-common/src/main/resources/mapper/store/UmsStoreInfoMapper.xml
rename to ycl-common/src/main/resources/mapper/platform/store/UmsStoreInfoMapper.xml
index e4d975d..ef81b7a 100644
--- a/ycl-common/src/main/resources/mapper/store/UmsStoreInfoMapper.xml
+++ b/ycl-common/src/main/resources/mapper/platform/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.store.StoreInfoMapper">
+<mapper namespace="com.ycl.mapper.platform.store.StoreInfoMapper">
<!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
- <resultMap id="BaseResultMap" type="com.ycl.entity.store.StoreInfo">
+ <resultMap id="BaseResultMap" type="com.ycl.entity.platform.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/user/UmsAdminLoginLogMapper.xml b/ycl-common/src/main/resources/mapper/platform/user/UmsAdminLoginLogMapper.xml
similarity index 76%
rename from ycl-common/src/main/resources/mapper/user/UmsAdminLoginLogMapper.xml
rename to ycl-common/src/main/resources/mapper/platform/user/UmsAdminLoginLogMapper.xml
index 48e945f..61b333e 100644
--- a/ycl-common/src/main/resources/mapper/user/UmsAdminLoginLogMapper.xml
+++ b/ycl-common/src/main/resources/mapper/platform/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.user.UmsAdminLoginLogMapper">
+<mapper namespace="com.ycl.mapper.platform.user.UmsAdminLoginLogMapper">
<!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
- <resultMap id="BaseResultMap" type="com.ycl.entity.user.UmsAdminLoginLog">
+ <resultMap id="BaseResultMap" type="com.ycl.entity.platform.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/user/UmsAdminMapper.xml b/ycl-common/src/main/resources/mapper/platform/user/UmsAdminMapper.xml
similarity index 90%
rename from ycl-common/src/main/resources/mapper/user/UmsAdminMapper.xml
rename to ycl-common/src/main/resources/mapper/platform/user/UmsAdminMapper.xml
index 5ae33ba..51eca7a 100644
--- a/ycl-common/src/main/resources/mapper/user/UmsAdminMapper.xml
+++ b/ycl-common/src/main/resources/mapper/platform/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.user.UmsAdminMapper">
+<mapper namespace="com.ycl.mapper.platform.user.UmsAdminMapper">
<!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
- <resultMap id="BaseResultMap" type="com.ycl.entity.user.UmsAdmin">
+ <resultMap id="BaseResultMap" type="com.ycl.entity.platform.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/user/UmsAdminRoleRelationMapper.xml b/ycl-common/src/main/resources/mapper/platform/user/UmsAdminRoleRelationMapper.xml
similarity index 68%
rename from ycl-common/src/main/resources/mapper/user/UmsAdminRoleRelationMapper.xml
rename to ycl-common/src/main/resources/mapper/platform/user/UmsAdminRoleRelationMapper.xml
index 091d309..0463e8a 100644
--- a/ycl-common/src/main/resources/mapper/user/UmsAdminRoleRelationMapper.xml
+++ b/ycl-common/src/main/resources/mapper/platform/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.user.UmsAdminRoleRelationMapper">
+<mapper namespace="com.ycl.mapper.platform.user.UmsAdminRoleRelationMapper">
<!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
- <resultMap id="BaseResultMap" type="com.ycl.entity.user.UmsAdminRoleRelation">
+ <resultMap id="BaseResultMap" type="com.ycl.entity.platform.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/user/UmsDepartManageMapper.xml b/ycl-common/src/main/resources/mapper/platform/user/UmsDepartManageMapper.xml
similarity index 86%
rename from ycl-common/src/main/resources/mapper/user/UmsDepartManageMapper.xml
rename to ycl-common/src/main/resources/mapper/platform/user/UmsDepartManageMapper.xml
index 932ebc0..753ac7c 100644
--- a/ycl-common/src/main/resources/mapper/user/UmsDepartManageMapper.xml
+++ b/ycl-common/src/main/resources/mapper/platform/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.user.UmsDepartManageMapper">
+<mapper namespace="com.ycl.mapper.platform.user.UmsDepartManageMapper">
<!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
- <resultMap id="BaseResultMap" type="com.ycl.entity.user.UmsDepartManage">
+ <resultMap id="BaseResultMap" type="com.ycl.entity.platform.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/user/UmsMenuMapper.xml b/ycl-common/src/main/resources/mapper/platform/user/UmsMenuMapper.xml
similarity index 88%
rename from ycl-common/src/main/resources/mapper/user/UmsMenuMapper.xml
rename to ycl-common/src/main/resources/mapper/platform/user/UmsMenuMapper.xml
index 11212c6..3095b7d 100644
--- a/ycl-common/src/main/resources/mapper/user/UmsMenuMapper.xml
+++ b/ycl-common/src/main/resources/mapper/platform/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.user.UmsMenuMapper">
+<mapper namespace="com.ycl.mapper.platform.user.UmsMenuMapper">
<!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
- <resultMap id="BaseResultMap" type="com.ycl.entity.user.UmsMenu">
+ <resultMap id="BaseResultMap" type="com.ycl.entity.platform.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.user.UmsMenu">
+ <select id="getMenuList" resultType="com.ycl.entity.platform.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.user.UmsMenu">
+ <select id="getMenuListByRoleId" resultType="com.ycl.entity.platform.user.UmsMenu">
SELECT
m.id id,
m.parent_id parentId,
diff --git a/ycl-common/src/main/resources/mapper/user/UmsResourceCategoryMapper.xml b/ycl-common/src/main/resources/mapper/platform/user/UmsResourceCategoryMapper.xml
similarity index 71%
rename from ycl-common/src/main/resources/mapper/user/UmsResourceCategoryMapper.xml
rename to ycl-common/src/main/resources/mapper/platform/user/UmsResourceCategoryMapper.xml
index 6bd167e..8c917d2 100644
--- a/ycl-common/src/main/resources/mapper/user/UmsResourceCategoryMapper.xml
+++ b/ycl-common/src/main/resources/mapper/platform/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.user.UmsResourceCategoryMapper">
+<mapper namespace="com.ycl.mapper.platform.user.UmsResourceCategoryMapper">
<!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
- <resultMap id="BaseResultMap" type="com.ycl.entity.user.UmsResourceCategory">
+ <resultMap id="BaseResultMap" type="com.ycl.entity.platform.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/user/UmsResourceMapper.xml b/ycl-common/src/main/resources/mapper/platform/user/UmsResourceMapper.xml
similarity index 85%
rename from ycl-common/src/main/resources/mapper/user/UmsResourceMapper.xml
rename to ycl-common/src/main/resources/mapper/platform/user/UmsResourceMapper.xml
index ce97928..266a768 100644
--- a/ycl-common/src/main/resources/mapper/user/UmsResourceMapper.xml
+++ b/ycl-common/src/main/resources/mapper/platform/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.user.UmsResourceMapper">
+<mapper namespace="com.ycl.mapper.platform.user.UmsResourceMapper">
<!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
- <resultMap id="BaseResultMap" type="com.ycl.entity.user.UmsResource">
+ <resultMap id="BaseResultMap" type="com.ycl.entity.platform.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.user.UmsResource">
+ <select id="getResourceList" resultType="com.ycl.entity.platform.user.UmsResource">
SELECT
ur.id id,
ur.create_time createTime,
@@ -32,7 +32,7 @@
ur.id
</select>
- <select id="getResourceListByRoleId" resultType="com.ycl.entity.user.UmsResource">
+ <select id="getResourceListByRoleId" resultType="com.ycl.entity.platform.user.UmsResource">
SELECT
r.id id,
r.create_time createTime,
diff --git a/ycl-common/src/main/resources/mapper/user/UmsRoleMapper.xml b/ycl-common/src/main/resources/mapper/platform/user/UmsRoleMapper.xml
similarity index 76%
rename from ycl-common/src/main/resources/mapper/user/UmsRoleMapper.xml
rename to ycl-common/src/main/resources/mapper/platform/user/UmsRoleMapper.xml
index dae0a5a..25edb6d 100644
--- a/ycl-common/src/main/resources/mapper/user/UmsRoleMapper.xml
+++ b/ycl-common/src/main/resources/mapper/platform/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.user.UmsRoleMapper">
+<mapper namespace="com.ycl.mapper.platform.user.UmsRoleMapper">
<!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
- <resultMap id="BaseResultMap" type="com.ycl.entity.user.UmsRole">
+ <resultMap id="BaseResultMap" type="com.ycl.entity.platform.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.user.UmsRole">
+ <select id="getRoleList" resultType="com.ycl.entity.platform.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/user/UmsRoleMenuRelationMapper.xml b/ycl-common/src/main/resources/mapper/platform/user/UmsRoleMenuRelationMapper.xml
similarity index 68%
rename from ycl-common/src/main/resources/mapper/user/UmsRoleMenuRelationMapper.xml
rename to ycl-common/src/main/resources/mapper/platform/user/UmsRoleMenuRelationMapper.xml
index 6d8268c..6ecc43e 100644
--- a/ycl-common/src/main/resources/mapper/user/UmsRoleMenuRelationMapper.xml
+++ b/ycl-common/src/main/resources/mapper/platform/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.user.UmsRoleMenuRelationMapper">
+<mapper namespace="com.ycl.mapper.platform.user.UmsRoleMenuRelationMapper">
<!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
- <resultMap id="BaseResultMap" type="com.ycl.entity.user.UmsRoleMenuRelation">
+ <resultMap id="BaseResultMap" type="com.ycl.entity.platform.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/user/UmsRoleResourceRelationMapper.xml b/ycl-common/src/main/resources/mapper/platform/user/UmsRoleResourceRelationMapper.xml
similarity index 67%
rename from ycl-common/src/main/resources/mapper/user/UmsRoleResourceRelationMapper.xml
rename to ycl-common/src/main/resources/mapper/platform/user/UmsRoleResourceRelationMapper.xml
index 3013849..7523559 100644
--- a/ycl-common/src/main/resources/mapper/user/UmsRoleResourceRelationMapper.xml
+++ b/ycl-common/src/main/resources/mapper/platform/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.user.UmsRoleResourceRelationMapper">
+<mapper namespace="com.ycl.mapper.platform.user.UmsRoleResourceRelationMapper">
<!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
- <resultMap id="BaseResultMap" type="com.ycl.entity.user.UmsRoleResourceRelation">
+ <resultMap id="BaseResultMap" type="com.ycl.entity.platform.user.UmsRoleResourceRelation">
<id column="id" property="id" />
<result column="role_id" property="roleId" />
<result column="resource_id" property="resourceId" />
diff --git a/ycl-common/src/main/resources/mapper/platform/zfreport/EnforcelawReportMapper.xml b/ycl-common/src/main/resources/mapper/platform/zfreport/EnforcelawReportMapper.xml
new file mode 100644
index 0000000..64344ef
--- /dev/null
+++ b/ycl-common/src/main/resources/mapper/platform/zfreport/EnforcelawReportMapper.xml
@@ -0,0 +1,42 @@
+<?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.zfreport.EnforcelawReportMapper">
+
+ <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
+ <resultMap id="BaseResultMap" type="com.ycl.entity.platform.zfreport.EnforcelawReport">
+ <id column="id" property="id" />
+ <result column="inforesoure" property="inforesoure" />
+ <result column="acceptor" property="acceptor" />
+ <result column="problemtypes" property="problemtypes" />
+ <result column="category" property="category" />
+ <result column="county" property="county" />
+ <result column="street" property="street" />
+ <result column="afaddr" property="afaddr" />
+ <result column="informer" property="informer" />
+ <result column="contact" property="contact" />
+ <result column="reason" property="reason" />
+ <result column="problemdesc" property="problemdesc" />
+ <result column="lawOfficer" property="lawOfficer" />
+ <result column="partiesName" property="partiesName" />
+ <result column="partiesID" property="partiesID" />
+ <result column="partiesPhone" property="partiesPhone" />
+ <result column="idPositiveImage" property="idPositiveImage" />
+ <result column="idNegativeImage" property="idNegativeImage" />
+ <result column="illegalBuildLocation" property="illegalBuildLocation" />
+ <result column="illegalBuildLength" property="illegalBuildLength" />
+ <result column="illegalBuildWidth" property="illegalBuildWidth" />
+ <result column="illegalBuildHigh" property="illegalBuildHigh" />
+ <result column="illegalBuildMaterials" property="illegalBuildMaterials" />
+ <result column="IllegalPhotos" property="IllegalPhotos" />
+ <result column="rectifidPhotos" property="rectifidPhotos" />
+ <result column="accessory" property="accessory" />
+ <result column="disposeRemark" property="disposeRemark" />
+ <result column="inspectors" property="inspectors" />
+ </resultMap>
+
+ <!-- 閫氱敤鏌ヨ缁撴灉鍒� -->
+ <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
+ </sql>
+
+</mapper>
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 bc56fd5..6d9367d 100644
--- a/ycl-platform/src/main/java/com/ycl/config/YclSecurityConfig.java
+++ b/ycl-platform/src/main/java/com/ycl/config/YclSecurityConfig.java
@@ -1,15 +1,13 @@
package com.ycl.config;
import com.ycl.component.DynamicSecurityService;
-import com.ycl.entity.user.UmsResource;
-import com.ycl.service.user.UmsAdminService;
-import com.ycl.service.user.UmsResourceService;
+import com.ycl.entity.platform.user.UmsResource;
+import com.ycl.service.platform.user.UmsAdminService;
+import com.ycl.service.platform.user.UmsResourceService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.security.access.ConfigAttribute;
-import org.springframework.security.config.annotation.method.configuration.EnableGlobalMethodSecurity;
-import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
import org.springframework.security.core.userdetails.UserDetailsService;
import java.util.List;
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 7cb83da..4188a35 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.depart.SccgDepart;
-import com.ycl.service.depart.SccgDepartService;
-import com.ycl.service.user.UmsDepartManageService;
+import com.ycl.entity.platform.depart.UmsDepart;
+import com.ycl.service.platform.depart.UmsDepartService;
+import com.ycl.service.platform.user.UmsDepartManageService;
import com.ycl.utils.auth.UserAuthUtil;
import com.ycl.vo.depart.DepartVO;
import io.swagger.annotations.Api;
@@ -34,7 +34,7 @@
public class DepartController extends BaseController {
@Autowired
- private SccgDepartService departService;
+ private UmsDepartService departService;
@Resource
private UmsDepartManageService umsAdminDepartService;
@Resource
@@ -63,15 +63,15 @@
@ApiOperation("璇︽儏")
@PostMapping(value = "/detail")
- public CommonResult<SccgDepart> detail(@Validated @RequestBody DepartVO.IdDepartVO params) {
- SccgDepart sccgDepart = departService.loadDepartById(params.getId());
+ public CommonResult<UmsDepart> detail(@Validated @RequestBody DepartVO.IdDepartVO params) {
+ UmsDepart sccgDepart = departService.loadDepartById(params.getId());
return CommonResult.success(sccgDepart);
}
@ApiOperation("鏍戠粨鏋�")
@GetMapping(value = "/tree")
- public CommonResult<List<SccgDepart>> tree() {
- List<SccgDepart> tree = departService.tree();
+ public CommonResult<List<UmsDepart>> tree() {
+ List<UmsDepart> tree = departService.tree();
return CommonResult.success(tree);
}
@@ -84,8 +84,8 @@
@ApiOperation("鏌ヨ鍏ㄩ儴閮ㄩ棬")
@GetMapping(value = "/page")
- public CommonResult<IPage<SccgDepart>> page(DepartVO.PageDepartVO params) {
- IPage<SccgDepart> page = departService.pageDepart(params);
+ public CommonResult<IPage<UmsDepart>> page(DepartVO.PageDepartVO params) {
+ IPage<UmsDepart> page = departService.pageDepart(params);
return CommonResult.success(page);
}
diff --git a/ycl-platform/src/main/java/com/ycl/controller/platform/UmsWebsitePortalController.java b/ycl-platform/src/main/java/com/ycl/controller/portal/UmsWebsitePortalController.java
similarity index 92%
rename from ycl-platform/src/main/java/com/ycl/controller/platform/UmsWebsitePortalController.java
rename to ycl-platform/src/main/java/com/ycl/controller/portal/UmsWebsitePortalController.java
index 0e1ffd2..6b93823 100644
--- a/ycl-platform/src/main/java/com/ycl/controller/platform/UmsWebsitePortalController.java
+++ b/ycl-platform/src/main/java/com/ycl/controller/portal/UmsWebsitePortalController.java
@@ -1,14 +1,14 @@
-package com.ycl.controller.platform;
+package com.ycl.controller.portal;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.ycl.api.CommonResult;
-import com.ycl.entity.platform.UmsThirdApplications;
-import com.ycl.entity.user.UmsMenu;
-import com.ycl.entity.platform.UmsWebsiteLogo;
-import com.ycl.entity.user.vo.UmsMenuVo;
-import com.ycl.service.platform.UmsThirdApplicationsService;
-import com.ycl.service.user.UmsMenuService;
-import com.ycl.service.platform.UmsWebsiteLogoService;
+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 io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.BeanUtils;
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 98fbc98..4451d3c 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.store.StoreInfo;
-import com.ycl.service.store.StoreInfoService;
+import com.ycl.entity.platform.store.StoreInfo;
+import com.ycl.service.platform.store.StoreInfoService;
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/store/StoreScoreRuleController.java b/ycl-platform/src/main/java/com/ycl/controller/store/StoreScoreRuleController.java
index d23c7a9..c2616de 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,10 +4,10 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ycl.api.CommonPage;
import com.ycl.api.CommonResult;
-import com.ycl.entity.store.StoreInfo;
-import com.ycl.entity.store.StoreScoreRule;
-import com.ycl.service.store.StoreScoreRuleService;
+import com.ycl.entity.platform.store.StoreScoreRule;
+import com.ycl.service.platform.store.StoreScoreRuleService;
import com.ycl.vo.store.StoreScoreRuleVO;
+import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
@@ -23,6 +23,7 @@
*/
@RestController
@RequestMapping("/store/scorerule")
+@Api(tags = "绉垎绠＄悊")
public class StoreScoreRuleController {
private StoreScoreRuleService storeScoreRuleService;
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 de4e2b0..5a172a2 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
@@ -2,23 +2,20 @@
import cn.hutool.core.collection.CollUtil;
import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ycl.api.CommonPage;
import com.ycl.api.CommonResult;
import com.ycl.controller.BaseController;
import com.ycl.dto.UmsAdminLoginParam;
import com.ycl.dto.UmsAdminParam;
import com.ycl.dto.UpdateAdminPasswordParam;
-import com.ycl.entity.user.UmsAdmin;
-import com.ycl.entity.user.UmsRole;
+import com.ycl.entity.platform.user.UmsAdmin;
+import com.ycl.entity.platform.user.UmsRole;
import com.ycl.service.redis.RedisService;
-import com.ycl.service.user.UmsAdminService;
-import com.ycl.service.user.UmsRoleService;
+import com.ycl.service.platform.user.UmsAdminService;
+import com.ycl.service.platform.user.UmsRoleService;
import com.ycl.utils.redis.RedisKey;
import com.ycl.vo.user.UserVO;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
-import io.swagger.v3.oas.annotations.tags.Tag;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Controller;
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 fad1cdd..d966392 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,11 +4,10 @@
import com.ycl.api.CommonPage;
import com.ycl.api.CommonResult;
import com.ycl.dto.UmsMenuNode;
-import com.ycl.entity.user.UmsMenu;
-import com.ycl.service.user.UmsMenuService;
+import com.ycl.entity.platform.user.UmsMenu;
+import com.ycl.service.platform.user.UmsMenuService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
-import io.swagger.v3.oas.annotations.tags.Tag;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.*;
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 93dbede..d2e8762 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,11 +1,10 @@
package com.ycl.controller.user;
import com.ycl.api.CommonResult;
-import com.ycl.entity.user.UmsResourceCategory;
-import com.ycl.service.user.UmsResourceCategoryService;
+import com.ycl.entity.platform.user.UmsResourceCategory;
+import com.ycl.service.platform.user.UmsResourceCategoryService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
-import io.swagger.v3.oas.annotations.tags.Tag;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.*;
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 eb3c9e4..6ba9f34 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,11 +4,10 @@
import com.ycl.api.CommonPage;
import com.ycl.api.CommonResult;
import com.ycl.component.DynamicSecurityMetadataSource;
-import com.ycl.entity.user.UmsResource;
-import com.ycl.service.user.UmsResourceService;
+import com.ycl.entity.platform.user.UmsResource;
+import com.ycl.service.platform.user.UmsResourceService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
-import io.swagger.v3.oas.annotations.tags.Tag;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.*;
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 c395768..b26c437 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,13 +3,12 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ycl.api.CommonPage;
import com.ycl.api.CommonResult;
-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 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 io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
-import io.swagger.v3.oas.annotations.tags.Tag;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.*;
diff --git a/ycl-platform/src/main/java/com/ycl/controller/zfreport/EnforcelawReportController.java b/ycl-platform/src/main/java/com/ycl/controller/zfreport/EnforcelawReportController.java
new file mode 100644
index 0000000..784dc4d
--- /dev/null
+++ b/ycl-platform/src/main/java/com/ycl/controller/zfreport/EnforcelawReportController.java
@@ -0,0 +1,22 @@
+package com.ycl.controller.zfreport;
+
+
+import com.ycl.controller.BaseController;
+import io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 杩濊浜嬮」澶勭疆绠＄悊锛氬寘鍚繚娉�(杩濆缓)鎯呭喌涓婃姤銆佺珛妗堛�佹淳閬ｃ�佸缃�佹牳鏌ャ�佺粨妗� 鍓嶇鎺у埗鍣�
+ * </p>
+ *
+ * @author lyq
+ * @since 2022-09-14
+ */
+@RestController
+@RequestMapping("/enforcelaw-report")
+@Api(tags = "鎵ф硶绠＄悊锛氳繚瑙勪簨椤瑰缃鐞�")
+public class EnforcelawReportController extends BaseController {
+
+}
--
Gitblit v1.8.0