From 87837b20ec529b8eb19f96663b71c3a3bc725512 Mon Sep 17 00:00:00 2001 From: lzq <2495532633@qq.com> Date: Wed, 10 Dec 2025 10:39:57 +0800 Subject: [PATCH] 1 --- .../main/resources/templates/java/entity.btl | 2 +- .../njzscloud/common/wechat/WechatUtil.java | 2 +- .../{supervisory => dispose}/Main.java | 2 +- .../config/AppConfiguration.java | 2 +- .../config/AppProperties.java | 2 +- .../config/Example.java | 2 +- .../config/SpringReady.java | 4 +- .../customer/constant/IdentityCategory.java | 30 ++ .../cst/customer/constant/SettlementWay.java | 24 ++ .../controller/CustomerController.java | 66 ++++ .../cst/customer/mapper/CustomerMapper.java | 12 + .../customer/pojo/entity/CustomerEntity.java | 94 ++++++ .../cst/customer/service/CustomerService.java | 60 ++++ .../dispose/cst/org/constant/OrgCategory.java | 24 ++ .../cst/org/controller/OrgController.java | 66 ++++ .../dispose/cst/org/mapper/OrgMapper.java | 12 + .../cst/org/pojo/entity/OrgEntity.java | 173 +++++++++++ .../dispose/cst/org/service/OrgService.java | 60 ++++ .../event/SysMittEvent.java | 2 +- .../sys/auth/controller/AuthController.java | 4 +- .../sys/auth/mapper/AuthMapper.java | 8 +- .../sys/auth/mapper/SysTokenMapper.java | 4 +- .../sys/auth/pojo/entity/SysTokenEntity.java | 2 +- .../auth/pojo/result/EndpointResource.java | 2 +- .../sys/auth/pojo/result/MenuResource.java | 2 +- .../sys/auth/pojo/result/MyResult.java | 4 +- .../sys/auth/service/AuthService.java | 10 +- .../sys/auth/service/TokenService.java | 6 +- .../sys/dict/controller/DictController.java | 8 +- .../controller/SysDictItemController.java | 6 +- .../sys/dict/mapper/DictItemMapper.java | 4 +- .../sys/dict/mapper/DictMapper.java | 4 +- .../sys/dict/pojo/DictEntity.java | 2 +- .../sys/dict/pojo/DictItemEntity.java | 2 +- .../sys/dict/pojo/ObtainDictDataResult.java | 2 +- .../sys/dict/service/DictItemService.java | 6 +- .../sys/dict/service/DictService.java | 10 +- .../controller/DistrictController.java | 8 +- .../sys/district/mapper/DistrictMapper.java | 4 +- .../district/pojo/entity/DistrictEntity.java | 2 +- .../pojo/param/SearchDistrictParam.java | 2 +- .../pojo/result/DistrictTreeResult.java | 2 +- .../sys/district/service/DistrictService.java | 8 +- .../sys/endpoint/contant/RequestMethod.java | 4 +- .../controller/EndpointController.java | 10 +- .../sys/endpoint/mapper/EndpointMapper.java | 4 +- .../endpoint/pojo/entity/EndpointEntity.java | 4 +- .../pojo/param/EndpointSearchParam.java | 2 +- .../pojo/result/EndpointDetailResult.java | 4 +- .../sys/endpoint/service/EndpointService.java | 10 +- .../sys/menu/contant/MenuCategory.java | 2 +- .../sys/menu/controller/MenuController.java | 12 +- .../sys/menu/mapper/MenuMapper.java | 4 +- .../sys/menu/pojo/entity/MenuEntity.java | 4 +- .../sys/menu/pojo/param/MenuAddParam.java | 4 +- .../sys/menu/pojo/param/MenuModifyParam.java | 2 +- .../sys/menu/pojo/param/MenuSearchParam.java | 2 +- .../menu/pojo/result/MenuDetailResult.java | 4 +- .../sys/menu/service/MenuService.java | 22 +- .../sys/resource/contant/ResourceOrigin.java | 2 +- .../cotroller/ResourceController.java | 6 +- .../sys/resource/mapper/ResourceMapper.java | 4 +- .../resource/pojo/entity/ResourceEntity.java | 2 +- .../sys/resource/service/ResourceService.java | 8 +- .../sys/role/controller/RoleController.java | 16 +- .../sys/role/mapper/RoleMapper.java | 4 +- .../sys/role/mapper/RoleResMapper.java | 4 +- .../sys/role/pojo/entity/RoleEntity.java | 2 +- .../role/pojo/entity/RoleResourceEntity.java | 2 +- .../sys/role/pojo/param/BindResParam.java | 2 +- .../sys/role/pojo/param/RoleAddParam.java | 2 +- .../sys/role/pojo/param/RoleModifyParam.java | 2 +- .../sys/role/pojo/param/RoleQueryParam.java | 2 +- .../role/pojo/result/RoleDetailResult.java | 2 +- .../sys/role/service/RoleResService.java | 10 +- .../sys/role/service/RoleService.java | 20 +- .../sys/user/constant}/Gender.java | 2 +- .../sys/user/controller/UserController.java | 8 +- .../sys/user/mapper/SysUserRoleMapper.java | 6 +- .../sys/user/mapper/UserAccountMapper.java | 4 +- .../sys/user/mapper/UserMapper.java | 6 +- .../user/pojo/entity/SysUserRoleEntity.java | 2 +- .../user/pojo/entity/UserAccountEntity.java | 2 +- .../sys/user/pojo/entity/UserEntity.java | 2 +- .../user/pojo/param/AddUserAccountParam.java | 2 +- .../sys/user/pojo/param/AddUserParam.java | 4 +- .../sys/user/pojo/param/BindRoleParam.java | 2 +- .../user/pojo/param/ModifyPasswdParam.java | 2 +- .../sys/user/pojo/param/UserModifyParam.java | 4 +- .../sys/user/pojo/param/UserQueryParam.java | 4 +- .../user/pojo/param/UserRegisterParam.java | 292 ++++++++++++++++++ .../pojo/result/UserAccountDetailResult.java | 2 +- .../user/pojo/result/UserDetailResult.java | 4 +- .../sys/user/service/UserAccountService.java | 10 +- .../sys/user/service/UserRoleService.java | 12 +- .../sys/user/service/UserService.java | 20 +- .../user/pojo/param/UserRegisterParam.java | 118 ------- .../mapper/cst/customer/CustomerMapper.xml | 4 + .../resources/mapper/cst/org/OrgMapper.xml | 4 + .../resources/mapper/sys/auth/AuthMapper.xml | 6 +- .../mapper/sys/resource/ResourceMapper.xml | 2 +- .../resources/mapper/sys/role/RoleMapper.xml | 4 +- .../mapper/sys/user/SysUserRoleMapper.xml | 2 +- .../resources/mapper/sys/user/UserMapper.xml | 4 +- z-doc/pdma/njzscloud-dispose.pdma | 15 +- 105 files changed, 1147 insertions(+), 337 deletions(-) rename njzscloud-svr/src/main/java/com/njzscloud/{supervisory => dispose}/Main.java (88%) rename njzscloud-svr/src/main/java/com/njzscloud/{supervisory => dispose}/config/AppConfiguration.java (85%) rename njzscloud-svr/src/main/java/com/njzscloud/{supervisory => dispose}/config/AppProperties.java (87%) rename njzscloud-svr/src/main/java/com/njzscloud/{supervisory => dispose}/config/Example.java (97%) rename njzscloud-svr/src/main/java/com/njzscloud/{supervisory => dispose}/config/SpringReady.java (80%) create mode 100644 njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/customer/constant/IdentityCategory.java create mode 100644 njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/customer/constant/SettlementWay.java create mode 100644 njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/customer/controller/CustomerController.java create mode 100644 njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/customer/mapper/CustomerMapper.java create mode 100644 njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/customer/pojo/entity/CustomerEntity.java create mode 100644 njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/customer/service/CustomerService.java create mode 100644 njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/org/constant/OrgCategory.java create mode 100644 njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/org/controller/OrgController.java create mode 100644 njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/org/mapper/OrgMapper.java create mode 100644 njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/org/pojo/entity/OrgEntity.java create mode 100644 njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/org/service/OrgService.java rename njzscloud-svr/src/main/java/com/njzscloud/{supervisory => dispose}/event/SysMittEvent.java (81%) rename njzscloud-svr/src/main/java/com/njzscloud/{supervisory => dispose}/sys/auth/controller/AuthController.java (87%) rename njzscloud-svr/src/main/java/com/njzscloud/{supervisory => dispose}/sys/auth/mapper/AuthMapper.java (67%) rename njzscloud-svr/src/main/java/com/njzscloud/{supervisory => dispose}/sys/auth/mapper/SysTokenMapper.java (63%) rename njzscloud-svr/src/main/java/com/njzscloud/{supervisory => dispose}/sys/auth/pojo/entity/SysTokenEntity.java (93%) rename njzscloud-svr/src/main/java/com/njzscloud/{supervisory => dispose}/sys/auth/pojo/result/EndpointResource.java (92%) rename njzscloud-svr/src/main/java/com/njzscloud/{supervisory => dispose}/sys/auth/pojo/result/MenuResource.java (94%) rename njzscloud-svr/src/main/java/com/njzscloud/{supervisory => dispose}/sys/auth/pojo/result/MyResult.java (85%) rename njzscloud-svr/src/main/java/com/njzscloud/{supervisory => dispose}/sys/auth/service/AuthService.java (88%) rename njzscloud-svr/src/main/java/com/njzscloud/{supervisory => dispose}/sys/auth/service/TokenService.java (95%) rename njzscloud-svr/src/main/java/com/njzscloud/{supervisory => dispose}/sys/dict/controller/DictController.java (87%) rename njzscloud-svr/src/main/java/com/njzscloud/{supervisory => dispose}/sys/dict/controller/SysDictItemController.java (89%) rename njzscloud-svr/src/main/java/com/njzscloud/{supervisory => dispose}/sys/dict/mapper/DictItemMapper.java (64%) rename njzscloud-svr/src/main/java/com/njzscloud/{supervisory => dispose}/sys/dict/mapper/DictMapper.java (64%) rename njzscloud-svr/src/main/java/com/njzscloud/{supervisory => dispose}/sys/dict/pojo/DictEntity.java (94%) rename njzscloud-svr/src/main/java/com/njzscloud/{supervisory => dispose}/sys/dict/pojo/DictItemEntity.java (95%) rename njzscloud-svr/src/main/java/com/njzscloud/{supervisory => dispose}/sys/dict/pojo/ObtainDictDataResult.java (94%) rename njzscloud-svr/src/main/java/com/njzscloud/{supervisory => dispose}/sys/dict/service/DictItemService.java (95%) rename njzscloud-svr/src/main/java/com/njzscloud/{supervisory => dispose}/sys/dict/service/DictService.java (90%) rename njzscloud-svr/src/main/java/com/njzscloud/{supervisory => dispose}/sys/district/controller/DistrictController.java (85%) rename njzscloud-svr/src/main/java/com/njzscloud/{supervisory => dispose}/sys/district/mapper/DistrictMapper.java (61%) rename njzscloud-svr/src/main/java/com/njzscloud/{supervisory => dispose}/sys/district/pojo/entity/DistrictEntity.java (94%) rename njzscloud-svr/src/main/java/com/njzscloud/{supervisory => dispose}/sys/district/pojo/param/SearchDistrictParam.java (85%) rename njzscloud-svr/src/main/java/com/njzscloud/{supervisory => dispose}/sys/district/pojo/result/DistrictTreeResult.java (92%) rename njzscloud-svr/src/main/java/com/njzscloud/{supervisory => dispose}/sys/district/service/DistrictService.java (88%) rename njzscloud-svr/src/main/java/com/njzscloud/{supervisory => dispose}/sys/endpoint/contant/RequestMethod.java (88%) rename njzscloud-svr/src/main/java/com/njzscloud/{supervisory => dispose}/sys/endpoint/controller/EndpointController.java (79%) rename njzscloud-svr/src/main/java/com/njzscloud/{supervisory => dispose}/sys/endpoint/mapper/EndpointMapper.java (61%) rename njzscloud-svr/src/main/java/com/njzscloud/{supervisory => dispose}/sys/endpoint/pojo/entity/EndpointEntity.java (88%) rename njzscloud-svr/src/main/java/com/njzscloud/{supervisory => dispose}/sys/endpoint/pojo/param/EndpointSearchParam.java (84%) rename njzscloud-svr/src/main/java/com/njzscloud/{supervisory => dispose}/sys/endpoint/pojo/result/EndpointDetailResult.java (86%) rename njzscloud-svr/src/main/java/com/njzscloud/{supervisory => dispose}/sys/endpoint/service/EndpointService.java (83%) rename njzscloud-svr/src/main/java/com/njzscloud/{supervisory => dispose}/sys/menu/contant/MenuCategory.java (89%) rename njzscloud-svr/src/main/java/com/njzscloud/{supervisory => dispose}/sys/menu/controller/MenuController.java (82%) rename njzscloud-svr/src/main/java/com/njzscloud/{supervisory => dispose}/sys/menu/mapper/MenuMapper.java (63%) rename njzscloud-svr/src/main/java/com/njzscloud/{supervisory => dispose}/sys/menu/pojo/entity/MenuEntity.java (93%) rename njzscloud-svr/src/main/java/com/njzscloud/{supervisory => dispose}/sys/menu/pojo/param/MenuAddParam.java (93%) rename njzscloud-svr/src/main/java/com/njzscloud/{supervisory => dispose}/sys/menu/pojo/param/MenuModifyParam.java (94%) rename njzscloud-svr/src/main/java/com/njzscloud/{supervisory => dispose}/sys/menu/pojo/param/MenuSearchParam.java (87%) rename njzscloud-svr/src/main/java/com/njzscloud/{supervisory => dispose}/sys/menu/pojo/result/MenuDetailResult.java (87%) rename njzscloud-svr/src/main/java/com/njzscloud/{supervisory => dispose}/sys/menu/service/MenuService.java (92%) rename njzscloud-svr/src/main/java/com/njzscloud/{supervisory => dispose}/sys/resource/contant/ResourceOrigin.java (86%) rename njzscloud-svr/src/main/java/com/njzscloud/{supervisory => dispose}/sys/resource/cotroller/ResourceController.java (87%) rename njzscloud-svr/src/main/java/com/njzscloud/{supervisory => dispose}/sys/resource/mapper/ResourceMapper.java (81%) rename njzscloud-svr/src/main/java/com/njzscloud/{supervisory => dispose}/sys/resource/pojo/entity/ResourceEntity.java (92%) rename njzscloud-svr/src/main/java/com/njzscloud/{supervisory => dispose}/sys/resource/service/ResourceService.java (83%) rename njzscloud-svr/src/main/java/com/njzscloud/{supervisory => dispose}/sys/role/controller/RoleController.java (82%) rename njzscloud-svr/src/main/java/com/njzscloud/{supervisory => dispose}/sys/role/mapper/RoleMapper.java (87%) rename njzscloud-svr/src/main/java/com/njzscloud/{supervisory => dispose}/sys/role/mapper/RoleResMapper.java (63%) rename njzscloud-svr/src/main/java/com/njzscloud/{supervisory => dispose}/sys/role/pojo/entity/RoleEntity.java (92%) rename njzscloud-svr/src/main/java/com/njzscloud/{supervisory => dispose}/sys/role/pojo/entity/RoleResourceEntity.java (93%) rename njzscloud-svr/src/main/java/com/njzscloud/{supervisory => dispose}/sys/role/pojo/param/BindResParam.java (84%) rename njzscloud-svr/src/main/java/com/njzscloud/{supervisory => dispose}/sys/role/pojo/param/RoleAddParam.java (90%) rename njzscloud-svr/src/main/java/com/njzscloud/{supervisory => dispose}/sys/role/pojo/param/RoleModifyParam.java (89%) rename njzscloud-svr/src/main/java/com/njzscloud/{supervisory => dispose}/sys/role/pojo/param/RoleQueryParam.java (82%) rename njzscloud-svr/src/main/java/com/njzscloud/{supervisory => dispose}/sys/role/pojo/result/RoleDetailResult.java (90%) rename njzscloud-svr/src/main/java/com/njzscloud/{supervisory => dispose}/sys/role/service/RoleResService.java (90%) rename njzscloud-svr/src/main/java/com/njzscloud/{supervisory => dispose}/sys/role/service/RoleService.java (88%) rename njzscloud-svr/src/main/java/com/njzscloud/{supervisory/sys/user/contant => dispose/sys/user/constant}/Gender.java (88%) rename njzscloud-svr/src/main/java/com/njzscloud/{supervisory => dispose}/sys/user/controller/UserController.java (92%) rename njzscloud-svr/src/main/java/com/njzscloud/{supervisory => dispose}/sys/user/mapper/SysUserRoleMapper.java (69%) rename njzscloud-svr/src/main/java/com/njzscloud/{supervisory => dispose}/sys/user/mapper/UserAccountMapper.java (64%) rename njzscloud-svr/src/main/java/com/njzscloud/{supervisory => dispose}/sys/user/mapper/UserMapper.java (81%) rename njzscloud-svr/src/main/java/com/njzscloud/{supervisory => dispose}/sys/user/pojo/entity/SysUserRoleEntity.java (91%) rename njzscloud-svr/src/main/java/com/njzscloud/{supervisory => dispose}/sys/user/pojo/entity/UserAccountEntity.java (96%) rename njzscloud-svr/src/main/java/com/njzscloud/{supervisory => dispose}/sys/user/pojo/entity/UserEntity.java (95%) rename njzscloud-svr/src/main/java/com/njzscloud/{supervisory => dispose}/sys/user/pojo/param/AddUserAccountParam.java (96%) rename njzscloud-svr/src/main/java/com/njzscloud/{supervisory => dispose}/sys/user/pojo/param/AddUserParam.java (91%) rename njzscloud-svr/src/main/java/com/njzscloud/{supervisory => dispose}/sys/user/pojo/param/BindRoleParam.java (84%) rename njzscloud-svr/src/main/java/com/njzscloud/{supervisory => dispose}/sys/user/pojo/param/ModifyPasswdParam.java (86%) rename njzscloud-svr/src/main/java/com/njzscloud/{supervisory => dispose}/sys/user/pojo/param/UserModifyParam.java (80%) rename njzscloud-svr/src/main/java/com/njzscloud/{supervisory => dispose}/sys/user/pojo/param/UserQueryParam.java (81%) create mode 100644 njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/user/pojo/param/UserRegisterParam.java rename njzscloud-svr/src/main/java/com/njzscloud/{supervisory => dispose}/sys/user/pojo/result/UserAccountDetailResult.java (92%) rename njzscloud-svr/src/main/java/com/njzscloud/{supervisory => dispose}/sys/user/pojo/result/UserDetailResult.java (81%) rename njzscloud-svr/src/main/java/com/njzscloud/{supervisory => dispose}/sys/user/service/UserAccountService.java (92%) rename njzscloud-svr/src/main/java/com/njzscloud/{supervisory => dispose}/sys/user/service/UserRoleService.java (83%) rename njzscloud-svr/src/main/java/com/njzscloud/{supervisory => dispose}/sys/user/service/UserService.java (91%) delete mode 100644 njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/user/pojo/param/UserRegisterParam.java create mode 100644 njzscloud-svr/src/main/resources/mapper/cst/customer/CustomerMapper.xml create mode 100644 njzscloud-svr/src/main/resources/mapper/cst/org/OrgMapper.xml diff --git a/njzscloud-common/njzscloud-common-gen/src/main/resources/templates/java/entity.btl b/njzscloud-common/njzscloud-common-gen/src/main/resources/templates/java/entity.btl index 5ee6d59..9798b31 100644 --- a/njzscloud-common/njzscloud-common-gen/src/main/resources/templates/java/entity.btl +++ b/njzscloud-common/njzscloud-common-gen/src/main/resources/templates/java/entity.btl @@ -44,7 +44,7 @@ for(column in table.columns) { @TableId(type = IdType.ASSIGN_ID) <%}%> <%if(column.name == "creator_id" || column.name == "create_time"){%> - @TableId(fill = FieldFill.INSERT) + @TableField(fill = FieldFill.INSERT) <%}else if(column.name == "modifier_id" || column.name == "modify_time"){%> @TableField(fill = FieldFill.INSERT_UPDATE) <%}else if(column.name == "deleted"){%> diff --git a/njzscloud-common/njzscloud-common-wechat/src/main/java/com/njzscloud/common/wechat/WechatUtil.java b/njzscloud-common/njzscloud-common-wechat/src/main/java/com/njzscloud/common/wechat/WechatUtil.java index 0679682..f0e3271 100644 --- a/njzscloud-common/njzscloud-common-wechat/src/main/java/com/njzscloud/common/wechat/WechatUtil.java +++ b/njzscloud-common/njzscloud-common-wechat/src/main/java/com/njzscloud/common/wechat/WechatUtil.java @@ -25,7 +25,7 @@ public class WechatUtil { return API.code2Session(param.setAccess_token(accessToken)); } - public static void auth() { + public synchronized static void auth() { if (tokenExpTime <= new Date().getTime() / 1000 + 60) { GetAccessTokenResult getAccessTokenResult = API.getAccessToken(new GetAccessTokenParam()); accessToken = getAccessTokenResult.getAccess_token(); diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/Main.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/Main.java similarity index 88% rename from njzscloud-svr/src/main/java/com/njzscloud/supervisory/Main.java rename to njzscloud-svr/src/main/java/com/njzscloud/dispose/Main.java index 2626efe..835a1bc 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/Main.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/Main.java @@ -1,4 +1,4 @@ -package com.njzscloud.supervisory; +package com.njzscloud.dispose; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/config/AppConfiguration.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/config/AppConfiguration.java similarity index 85% rename from njzscloud-svr/src/main/java/com/njzscloud/supervisory/config/AppConfiguration.java rename to njzscloud-svr/src/main/java/com/njzscloud/dispose/config/AppConfiguration.java index a88de8c..827bef8 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/config/AppConfiguration.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/config/AppConfiguration.java @@ -1,4 +1,4 @@ -package com.njzscloud.supervisory.config; +package com.njzscloud.dispose.config; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.context.annotation.Configuration; diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/config/AppProperties.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/config/AppProperties.java similarity index 87% rename from njzscloud-svr/src/main/java/com/njzscloud/supervisory/config/AppProperties.java rename to njzscloud-svr/src/main/java/com/njzscloud/dispose/config/AppProperties.java index 1e7b950..023c867 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/config/AppProperties.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/config/AppProperties.java @@ -1,4 +1,4 @@ -package com.njzscloud.supervisory.config; +package com.njzscloud.dispose.config; import lombok.Getter; import lombok.Setter; diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/config/Example.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/config/Example.java similarity index 97% rename from njzscloud-svr/src/main/java/com/njzscloud/supervisory/config/Example.java rename to njzscloud-svr/src/main/java/com/njzscloud/dispose/config/Example.java index b889726..2df7509 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/config/Example.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/config/Example.java @@ -1,4 +1,4 @@ -package com.njzscloud.supervisory.config; +package com.njzscloud.dispose.config; import cn.hutool.core.util.RandomUtil; import com.njzscloud.common.sichen.support.Task; diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/config/SpringReady.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/config/SpringReady.java similarity index 80% rename from njzscloud-svr/src/main/java/com/njzscloud/supervisory/config/SpringReady.java rename to njzscloud-svr/src/main/java/com/njzscloud/dispose/config/SpringReady.java index 68e595a..4543f8f 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/config/SpringReady.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/config/SpringReady.java @@ -1,4 +1,4 @@ -package com.njzscloud.supervisory.config; +package com.njzscloud.dispose.config; import com.njzscloud.common.security.util.SecurityUtil; import org.springframework.boot.context.event.ApplicationReadyEvent; @@ -7,7 +7,7 @@ import org.springframework.stereotype.Component; import java.util.List; -import static com.njzscloud.supervisory.event.SysMittEvent.COERCE_LOGOUT; +import static com.njzscloud.dispose.event.SysMittEvent.COERCE_LOGOUT; @Component public class SpringReady { diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/customer/constant/IdentityCategory.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/customer/constant/IdentityCategory.java new file mode 100644 index 0000000..4a14880 --- /dev/null +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/customer/constant/IdentityCategory.java @@ -0,0 +1,30 @@ +package com.njzscloud.dispose.cst.customer.constant; + +import com.njzscloud.common.core.ienum.DictStr; +import lombok.Getter; +import lombok.RequiredArgsConstructor; + +/** + * 字典代码：identity_category + * 字典名称：身份类型 + */ +@Getter +@RequiredArgsConstructor +public enum IdentityCategory implements DictStr { + PingTai("PingTai", "平台"), + + ChanFei("ChanFei", "产废方"), + + YunShu("YunShu", "运输方"), + + XiaoNa("XiaoNa", "消纳方"), + + CaiGou("CaiGou", "采购方"), + + SiJi("SiJi", "司机"), + + ; + private final String val; + + private final String txt; +} diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/customer/constant/SettlementWay.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/customer/constant/SettlementWay.java new file mode 100644 index 0000000..586cff4 --- /dev/null +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/customer/constant/SettlementWay.java @@ -0,0 +1,24 @@ +package com.njzscloud.dispose.cst.customer.constant; + +import com.njzscloud.common.core.ienum.DictStr; +import lombok.Getter; +import lombok.RequiredArgsConstructor; + +/** + * 字典代码：settlement_way + * 字典名称：结算方式 + */ +@Getter +@RequiredArgsConstructor +public enum SettlementWay implements DictStr { + YueJie("YueJie", "月结"), + + YuE("YuE", "余额"), + + XianFu("XianFu", "现付"), + + ; + private final String val; + + private final String txt; +} diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/customer/controller/CustomerController.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/customer/controller/CustomerController.java new file mode 100644 index 0000000..9be681b --- /dev/null +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/customer/controller/CustomerController.java @@ -0,0 +1,66 @@ +package com.njzscloud.dispose.cst.customer.controller; + +import com.njzscloud.common.core.utils.R; +import com.njzscloud.common.mp.support.PageParam; +import com.njzscloud.common.mp.support.PageResult; +import com.njzscloud.dispose.cst.customer.pojo.entity.CustomerEntity; +import com.njzscloud.dispose.cst.customer.service.CustomerService; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 客户信息 + */ +@Slf4j +@RestController +@RequestMapping("/customer") +@RequiredArgsConstructor +public class CustomerController { + private final CustomerService customerService; + + /** + * 新增 + */ + @PostMapping("/add") + public R add(@RequestBody CustomerEntity customerEntity) { + customerService.add(customerEntity); + return R.success(); + } + + /** + * 修改 + */ + @PostMapping("/modify") + public R modify(@RequestBody CustomerEntity customerEntity) { + customerService.modify(customerEntity); + return R.success(); + } + + /** + * 删除 + */ + @PostMapping("/del") + public R del(@RequestBody List ids) { + customerService.del(ids); + return R.success(); + } + + /** + * 详情 + */ + @GetMapping("/detail") + public R detail(@RequestParam Long id) { + return R.success(customerService.detail(id)); + } + + /** + * 分页查询 + */ + @GetMapping("/paging") + public R> paging(PageParam pageParam, CustomerEntity customerEntity) { + return R.success(customerService.paging(pageParam, customerEntity)); + } +} diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/customer/mapper/CustomerMapper.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/customer/mapper/CustomerMapper.java new file mode 100644 index 0000000..649e071 --- /dev/null +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/customer/mapper/CustomerMapper.java @@ -0,0 +1,12 @@ +package com.njzscloud.dispose.cst.customer.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.njzscloud.dispose.cst.customer.pojo.entity.CustomerEntity; +import org.apache.ibatis.annotations.Mapper; + +/** + * 客户信息 + */ +@Mapper +public interface CustomerMapper extends BaseMapper { +} diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/customer/pojo/entity/CustomerEntity.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/customer/pojo/entity/CustomerEntity.java new file mode 100644 index 0000000..651ff2e --- /dev/null +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/customer/pojo/entity/CustomerEntity.java @@ -0,0 +1,94 @@ +package com.njzscloud.dispose.cst.customer.pojo.entity; + +import com.baomidou.mybatisplus.annotation.*; +import com.njzscloud.dispose.cst.customer.constant.IdentityCategory; +import com.njzscloud.dispose.cst.customer.constant.SettlementWay; +import lombok.Getter; +import lombok.Setter; +import lombok.ToString; +import lombok.experimental.Accessors; + +import java.time.LocalDateTime; + +/** + * 客户信息 + */ +@Getter +@Setter +@ToString +@Accessors(chain = true) +@TableName("cst_customer") +public class CustomerEntity { + + /** + * Id + */ + @TableId(type = IdType.ASSIGN_ID) + private Long id; + + /** + * 用户 Id；一个用户可以有多个身份 + */ + private Long userId; + + /** + * 身份类型；多个身份多条数据，PingTai-->平台、ChanFei-->产废方、QingYun-->清运方、XiaoNa-->消纳方、CaiGou-->采购方 + */ + private IdentityCategory identityCategory; + + /** + * 组织信息 Id；cst_org.id + */ + private Long orgId; + + /** + * 客户姓名 + */ + private String customerName; + + /** + * 客户联系电话 + */ + private String phone; + + /** + * 结算方式，YueJie-->月结、YuE-->余额、XianFu-->现付 + */ + private SettlementWay settlementWay; + + /** + * 是否管理员；是否为当前的组织管理员，0-->否、1-->是 + */ + private Boolean manager; + + /** + * 创建人 Id；sys_user.id + */ + @TableField(fill = FieldFill.INSERT) + private Long creatorId; + + /** + * 修改人 Id；sys_user.id + */ + @TableField(fill = FieldFill.INSERT_UPDATE) + private Long modifierId; + + /** + * 创建时间 + */ + @TableField(fill = FieldFill.INSERT) + private LocalDateTime createTime; + + /** + * 修改时间 + */ + @TableField(fill = FieldFill.INSERT_UPDATE) + private LocalDateTime modifyTime; + + /** + * 是否删除；0-->未删除、1-->已删除 + */ + @TableLogic + private Boolean deleted; + +} diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/customer/service/CustomerService.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/customer/service/CustomerService.java new file mode 100644 index 0000000..5722003 --- /dev/null +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/customer/service/CustomerService.java @@ -0,0 +1,60 @@ +package com.njzscloud.dispose.cst.customer.service; + +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.service.IService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.njzscloud.common.mp.support.PageParam; +import com.njzscloud.common.mp.support.PageResult; +import com.njzscloud.dispose.cst.customer.mapper.CustomerMapper; +import com.njzscloud.dispose.cst.customer.pojo.entity.CustomerEntity; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; + +/** + * 客户信息 + */ +@Slf4j +@Service +@RequiredArgsConstructor +public class CustomerService extends ServiceImpl implements IService { + + /** + * 新增 + */ + public void add(CustomerEntity customerEntity) { + this.save(customerEntity); + } + + /** + * 修改 + */ + public void modify(CustomerEntity customerEntity) { + this.updateById(customerEntity); + } + + /** + * 删除 + */ + @Transactional(rollbackFor = Exception.class) + public void del(List ids) { + this.removeBatchByIds(ids); + } + + /** + * 详情 + */ + public CustomerEntity detail(Long id) { + return this.getById(id); + } + + /** + * 分页查询 + */ + public PageResult paging(PageParam pageParam, CustomerEntity customerEntity) { + return PageResult.of(this.page(pageParam.toPage(), Wrappers.query(customerEntity))); + } +} diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/org/constant/OrgCategory.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/org/constant/OrgCategory.java new file mode 100644 index 0000000..6c82025 --- /dev/null +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/org/constant/OrgCategory.java @@ -0,0 +1,24 @@ +package com.njzscloud.dispose.cst.org.constant; + +import com.njzscloud.common.core.ienum.DictStr; +import lombok.Getter; +import lombok.RequiredArgsConstructor; + +/** + * 字典代码：org_category + * 字典名称：主体类型 + */ +@Getter +@RequiredArgsConstructor +public enum OrgCategory implements DictStr { + GeTiHu("GeTiHu", "个体户"), + + QiYe("QiYe", "企业"), + + ; + private final String val; + + private final String txt; +} + + diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/org/controller/OrgController.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/org/controller/OrgController.java new file mode 100644 index 0000000..cf3ddfc --- /dev/null +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/org/controller/OrgController.java @@ -0,0 +1,66 @@ +package com.njzscloud.dispose.cst.org.controller; + +import com.njzscloud.common.core.utils.R; +import com.njzscloud.common.mp.support.PageParam; +import com.njzscloud.common.mp.support.PageResult; +import com.njzscloud.dispose.cst.org.pojo.entity.OrgEntity; +import com.njzscloud.dispose.cst.org.service.OrgService; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 组织信息 + */ +@Slf4j +@RestController +@RequestMapping("/org") +@RequiredArgsConstructor +public class OrgController { + private final OrgService orgService; + + /** + * 新增 + */ + @PostMapping("/add") + public R add(@RequestBody OrgEntity orgEntity) { + orgService.add(orgEntity); + return R.success(); + } + + /** + * 修改 + */ + @PostMapping("/modify") + public R modify(@RequestBody OrgEntity orgEntity) { + orgService.modify(orgEntity); + return R.success(); + } + + /** + * 删除 + */ + @PostMapping("/del") + public R del(@RequestBody List ids) { + orgService.del(ids); + return R.success(); + } + + /** + * 详情 + */ + @GetMapping("/detail") + public R detail(@RequestParam Long id) { + return R.success(orgService.detail(id)); + } + + /** + * 分页查询 + */ + @GetMapping("/paging") + public R> paging(PageParam pageParam, OrgEntity orgEntity) { + return R.success(orgService.paging(pageParam, orgEntity)); + } +} diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/org/mapper/OrgMapper.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/org/mapper/OrgMapper.java new file mode 100644 index 0000000..be7c309 --- /dev/null +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/org/mapper/OrgMapper.java @@ -0,0 +1,12 @@ +package com.njzscloud.dispose.cst.org.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.njzscloud.dispose.cst.org.pojo.entity.OrgEntity; +import org.apache.ibatis.annotations.Mapper; + +/** + * 组织信息 + */ +@Mapper +public interface OrgMapper extends BaseMapper { +} diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/org/pojo/entity/OrgEntity.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/org/pojo/entity/OrgEntity.java new file mode 100644 index 0000000..867117f --- /dev/null +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/org/pojo/entity/OrgEntity.java @@ -0,0 +1,173 @@ +package com.njzscloud.dispose.cst.org.pojo.entity; + +import com.baomidou.mybatisplus.annotation.*; +import com.njzscloud.dispose.cst.org.constant.OrgCategory; +import lombok.Getter; +import lombok.Setter; +import lombok.ToString; +import lombok.experimental.Accessors; + +import java.time.LocalDateTime; + +/** + * 组织信息 + */ +@Getter +@Setter +@ToString +@Accessors(chain = true) +@TableName("cst_org") +public class OrgEntity { + + /** + * Id + */ + @TableId(type = IdType.ASSIGN_ID) + private Long id; + + /** + * 主体类型，GeTiHu-->个体户、QiYe-->企业 + */ + private OrgCategory orgCategory; + + /** + * 统一社会信用代码 + */ + private String uscc; + + /** + * 组织名称 + */ + private String orgName; + + /** + * 营业执照 + */ + private String businessLicense; + + /** + * 营业执照有效期 + */ + private LocalDateTime licenseStartTime; + + /** + * 营业执照有效期 + */ + private LocalDateTime licenseEndTime; + + /** + * 法人名称 + */ + private String legalRepresentative; + + /** + * 法人身份证号 + */ + private String idcard; + + /** + * 法人身份证有效期 + */ + private LocalDateTime idcardStartTime; + + /** + * 法人身份证有效期 + */ + private LocalDateTime idcardEndTime; + + /** + * 法人身份证正面 + */ + private String idcardFront; + + /** + * 法人身份证反面 + */ + private String idcardBack; + + /** + * 省；代码 + */ + private String province; + + /** + * 市；代码 + */ + private String city; + + /** + * 区县；代码 + */ + private String area; + + /** + * 乡镇街道；代码 + */ + private String town; + + /** + * 省；名称 + */ + private String provinceName; + + /** + * 市；名称 + */ + private String cityName; + + /** + * 区县；名称 + */ + private String areaName; + + /** + * 乡镇街道；名称 + */ + private String townName; + + /** + * 详细地址 + */ + private String address; + + /** + * 经度 + */ + private Double lng; + + /** + * 纬度 + */ + private Double lat; + + /** + * 创建人 Id； sys_user.id + */ + @TableField(fill = FieldFill.INSERT) + private Long creatorId; + + /** + * 修改人 Id； sys_user.id + */ + @TableField(fill = FieldFill.INSERT_UPDATE) + private Long modifierId; + + /** + * 创建时间 + */ + @TableField(fill = FieldFill.INSERT) + private LocalDateTime createTime; + + /** + * 修改时间 + */ + @TableField(fill = FieldFill.INSERT_UPDATE) + private LocalDateTime modifyTime; + + /** + * 是否删除； 0-->未删除、1-->已删除 + */ + @TableLogic + private Boolean deleted; + +} diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/org/service/OrgService.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/org/service/OrgService.java new file mode 100644 index 0000000..6223f05 --- /dev/null +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/org/service/OrgService.java @@ -0,0 +1,60 @@ +package com.njzscloud.dispose.cst.org.service; + +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.service.IService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.njzscloud.common.mp.support.PageParam; +import com.njzscloud.common.mp.support.PageResult; +import com.njzscloud.dispose.cst.org.mapper.OrgMapper; +import com.njzscloud.dispose.cst.org.pojo.entity.OrgEntity; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; + +/** + * 组织信息 + */ +@Slf4j +@Service +@RequiredArgsConstructor +public class OrgService extends ServiceImpl implements IService { + + /** + * 新增 + */ + public void add(OrgEntity orgEntity) { + this.save(orgEntity); + } + + /** + * 修改 + */ + public void modify(OrgEntity orgEntity) { + this.updateById(orgEntity); + } + + /** + * 删除 + */ + @Transactional(rollbackFor = Exception.class) + public void del(List ids) { + this.removeBatchByIds(ids); + } + + /** + * 详情 + */ + public OrgEntity detail(Long id) { + return this.getById(id); + } + + /** + * 分页查询 + */ + public PageResult paging(PageParam pageParam, OrgEntity orgEntity) { + return PageResult.of(this.page(pageParam.toPage(), Wrappers.query(orgEntity))); + } +} diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/event/SysMittEvent.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/event/SysMittEvent.java similarity index 81% rename from njzscloud-svr/src/main/java/com/njzscloud/supervisory/event/SysMittEvent.java rename to njzscloud-svr/src/main/java/com/njzscloud/dispose/event/SysMittEvent.java index 39b8c9a..aaea1cb 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/event/SysMittEvent.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/event/SysMittEvent.java @@ -1,4 +1,4 @@ -package com.njzscloud.supervisory.event; +package com.njzscloud.dispose.event; import com.njzscloud.common.core.mitt.MittEvent; diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/auth/controller/AuthController.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/auth/controller/AuthController.java similarity index 87% rename from njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/auth/controller/AuthController.java rename to njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/auth/controller/AuthController.java index b45ed36..c158cbb 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/auth/controller/AuthController.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/auth/controller/AuthController.java @@ -1,9 +1,9 @@ -package com.njzscloud.supervisory.sys.auth.controller; +package com.njzscloud.dispose.sys.auth.controller; import com.njzscloud.common.core.utils.R; import com.njzscloud.common.security.support.UserDetail; import com.njzscloud.common.security.util.SecurityUtil; -import com.njzscloud.supervisory.sys.auth.service.AuthService; +import com.njzscloud.dispose.sys.auth.service.AuthService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.GetMapping; diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/auth/mapper/AuthMapper.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/auth/mapper/AuthMapper.java similarity index 67% rename from njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/auth/mapper/AuthMapper.java rename to njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/auth/mapper/AuthMapper.java index 5347852..353c2db 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/auth/mapper/AuthMapper.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/auth/mapper/AuthMapper.java @@ -1,9 +1,9 @@ -package com.njzscloud.supervisory.sys.auth.mapper; +package com.njzscloud.dispose.sys.auth.mapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.njzscloud.supervisory.sys.auth.pojo.result.EndpointResource; -import com.njzscloud.supervisory.sys.auth.pojo.result.MenuResource; -import com.njzscloud.supervisory.sys.auth.pojo.result.MyResult; +import com.njzscloud.dispose.sys.auth.pojo.result.EndpointResource; +import com.njzscloud.dispose.sys.auth.pojo.result.MenuResource; +import com.njzscloud.dispose.sys.auth.pojo.result.MyResult; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/auth/mapper/SysTokenMapper.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/auth/mapper/SysTokenMapper.java similarity index 63% rename from njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/auth/mapper/SysTokenMapper.java rename to njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/auth/mapper/SysTokenMapper.java index dc879b8..29271fa 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/auth/mapper/SysTokenMapper.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/auth/mapper/SysTokenMapper.java @@ -1,7 +1,7 @@ -package com.njzscloud.supervisory.sys.auth.mapper; +package com.njzscloud.dispose.sys.auth.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.njzscloud.supervisory.sys.auth.pojo.entity.SysTokenEntity; +import com.njzscloud.dispose.sys.auth.pojo.entity.SysTokenEntity; import org.apache.ibatis.annotations.Mapper; /** diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/auth/pojo/entity/SysTokenEntity.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/auth/pojo/entity/SysTokenEntity.java similarity index 93% rename from njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/auth/pojo/entity/SysTokenEntity.java rename to njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/auth/pojo/entity/SysTokenEntity.java index 1ac0a4d..90f4edf 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/auth/pojo/entity/SysTokenEntity.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/auth/pojo/entity/SysTokenEntity.java @@ -1,4 +1,4 @@ -package com.njzscloud.supervisory.sys.auth.pojo.entity; +package com.njzscloud.dispose.sys.auth.pojo.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/auth/pojo/result/EndpointResource.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/auth/pojo/result/EndpointResource.java similarity index 92% rename from njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/auth/pojo/result/EndpointResource.java rename to njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/auth/pojo/result/EndpointResource.java index 34f4027..a44bcfc 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/auth/pojo/result/EndpointResource.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/auth/pojo/result/EndpointResource.java @@ -1,4 +1,4 @@ -package com.njzscloud.supervisory.sys.auth.pojo.result; +package com.njzscloud.dispose.sys.auth.pojo.result; import lombok.Getter; import lombok.Setter; diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/auth/pojo/result/MenuResource.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/auth/pojo/result/MenuResource.java similarity index 94% rename from njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/auth/pojo/result/MenuResource.java rename to njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/auth/pojo/result/MenuResource.java index 5f8a910..7ec383b 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/auth/pojo/result/MenuResource.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/auth/pojo/result/MenuResource.java @@ -1,4 +1,4 @@ -package com.njzscloud.supervisory.sys.auth.pojo.result; +package com.njzscloud.dispose.sys.auth.pojo.result; import lombok.Getter; import lombok.Setter; diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/auth/pojo/result/MyResult.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/auth/pojo/result/MyResult.java similarity index 85% rename from njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/auth/pojo/result/MyResult.java rename to njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/auth/pojo/result/MyResult.java index 866c1bb..cd95fb2 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/auth/pojo/result/MyResult.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/auth/pojo/result/MyResult.java @@ -1,7 +1,7 @@ -package com.njzscloud.supervisory.sys.auth.pojo.result; +package com.njzscloud.dispose.sys.auth.pojo.result; import com.njzscloud.common.security.support.UserDetail; -import com.njzscloud.supervisory.sys.user.contant.Gender; +import com.njzscloud.dispose.sys.user.constant.Gender; import lombok.Getter; import lombok.Setter; import lombok.experimental.Accessors; diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/auth/service/AuthService.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/auth/service/AuthService.java similarity index 88% rename from njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/auth/service/AuthService.java rename to njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/auth/service/AuthService.java index 0d59e14..7795644 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/auth/service/AuthService.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/auth/service/AuthService.java @@ -1,4 +1,4 @@ -package com.njzscloud.supervisory.sys.auth.service; +package com.njzscloud.dispose.sys.auth.service; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.util.StrUtil; @@ -7,10 +7,10 @@ import com.njzscloud.common.security.module.password.PasswordLoginForm; import com.njzscloud.common.security.module.wechat.mini.WechatMiniLoginForm; import com.njzscloud.common.security.support.IAuthService; import com.njzscloud.common.security.support.UserDetail; -import com.njzscloud.supervisory.sys.auth.mapper.AuthMapper; -import com.njzscloud.supervisory.sys.auth.pojo.result.EndpointResource; -import com.njzscloud.supervisory.sys.auth.pojo.result.MenuResource; -import com.njzscloud.supervisory.sys.auth.pojo.result.MyResult; +import com.njzscloud.dispose.sys.auth.mapper.AuthMapper; +import com.njzscloud.dispose.sys.auth.pojo.result.EndpointResource; +import com.njzscloud.dispose.sys.auth.pojo.result.MenuResource; +import com.njzscloud.dispose.sys.auth.pojo.result.MyResult; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/auth/service/TokenService.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/auth/service/TokenService.java similarity index 95% rename from njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/auth/service/TokenService.java rename to njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/auth/service/TokenService.java index 935e787..ea378ee 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/auth/service/TokenService.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/auth/service/TokenService.java @@ -1,4 +1,4 @@ -package com.njzscloud.supervisory.sys.auth.service; +package com.njzscloud.dispose.sys.auth.service; import cn.hutool.cache.CacheUtil; import cn.hutool.cache.impl.TimedCache; @@ -8,8 +8,8 @@ import com.njzscloud.common.security.contant.Constants; import com.njzscloud.common.security.support.ITokenService; import com.njzscloud.common.security.support.Token; import com.njzscloud.common.security.support.UserDetail; -import com.njzscloud.supervisory.sys.auth.mapper.SysTokenMapper; -import com.njzscloud.supervisory.sys.auth.pojo.entity.SysTokenEntity; +import com.njzscloud.dispose.sys.auth.mapper.SysTokenMapper; +import com.njzscloud.dispose.sys.auth.pojo.entity.SysTokenEntity; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/dict/controller/DictController.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/dict/controller/DictController.java similarity index 87% rename from njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/dict/controller/DictController.java rename to njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/dict/controller/DictController.java index 7541b35..39a2925 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/dict/controller/DictController.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/dict/controller/DictController.java @@ -1,11 +1,11 @@ -package com.njzscloud.supervisory.sys.dict.controller; +package com.njzscloud.dispose.sys.dict.controller; import com.njzscloud.common.core.utils.R; import com.njzscloud.common.mp.support.PageParam; import com.njzscloud.common.mp.support.PageResult; -import com.njzscloud.supervisory.sys.dict.pojo.DictEntity; -import com.njzscloud.supervisory.sys.dict.pojo.ObtainDictDataResult; -import com.njzscloud.supervisory.sys.dict.service.DictService; +import com.njzscloud.dispose.sys.dict.pojo.DictEntity; +import com.njzscloud.dispose.sys.dict.pojo.ObtainDictDataResult; +import com.njzscloud.dispose.sys.dict.service.DictService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.*; diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/dict/controller/SysDictItemController.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/dict/controller/SysDictItemController.java similarity index 89% rename from njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/dict/controller/SysDictItemController.java rename to njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/dict/controller/SysDictItemController.java index 886bad5..f1dc128 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/dict/controller/SysDictItemController.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/dict/controller/SysDictItemController.java @@ -1,10 +1,10 @@ -package com.njzscloud.supervisory.sys.dict.controller; +package com.njzscloud.dispose.sys.dict.controller; import com.njzscloud.common.core.utils.R; import com.njzscloud.common.mp.support.PageParam; import com.njzscloud.common.mp.support.PageResult; -import com.njzscloud.supervisory.sys.dict.pojo.DictItemEntity; -import com.njzscloud.supervisory.sys.dict.service.DictItemService; +import com.njzscloud.dispose.sys.dict.pojo.DictItemEntity; +import com.njzscloud.dispose.sys.dict.service.DictItemService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.*; diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/dict/mapper/DictItemMapper.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/dict/mapper/DictItemMapper.java similarity index 64% rename from njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/dict/mapper/DictItemMapper.java rename to njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/dict/mapper/DictItemMapper.java index 5fa7fe7..909712b 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/dict/mapper/DictItemMapper.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/dict/mapper/DictItemMapper.java @@ -1,7 +1,7 @@ -package com.njzscloud.supervisory.sys.dict.mapper; +package com.njzscloud.dispose.sys.dict.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.njzscloud.supervisory.sys.dict.pojo.DictItemEntity; +import com.njzscloud.dispose.sys.dict.pojo.DictItemEntity; import org.apache.ibatis.annotations.Mapper; /** diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/dict/mapper/DictMapper.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/dict/mapper/DictMapper.java similarity index 64% rename from njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/dict/mapper/DictMapper.java rename to njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/dict/mapper/DictMapper.java index 3d2dfeb..7379bef 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/dict/mapper/DictMapper.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/dict/mapper/DictMapper.java @@ -1,7 +1,7 @@ -package com.njzscloud.supervisory.sys.dict.mapper; +package com.njzscloud.dispose.sys.dict.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.njzscloud.supervisory.sys.dict.pojo.DictEntity; +import com.njzscloud.dispose.sys.dict.pojo.DictEntity; import org.apache.ibatis.annotations.Mapper; /** diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/dict/pojo/DictEntity.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/dict/pojo/DictEntity.java similarity index 94% rename from njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/dict/pojo/DictEntity.java rename to njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/dict/pojo/DictEntity.java index 7c03589..1ff3454 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/dict/pojo/DictEntity.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/dict/pojo/DictEntity.java @@ -1,4 +1,4 @@ -package com.njzscloud.supervisory.sys.dict.pojo; +package com.njzscloud.dispose.sys.dict.pojo; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/dict/pojo/DictItemEntity.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/dict/pojo/DictItemEntity.java similarity index 95% rename from njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/dict/pojo/DictItemEntity.java rename to njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/dict/pojo/DictItemEntity.java index d3e4dd9..aae184d 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/dict/pojo/DictItemEntity.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/dict/pojo/DictItemEntity.java @@ -1,4 +1,4 @@ -package com.njzscloud.supervisory.sys.dict.pojo; +package com.njzscloud.dispose.sys.dict.pojo; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/dict/pojo/ObtainDictDataResult.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/dict/pojo/ObtainDictDataResult.java similarity index 94% rename from njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/dict/pojo/ObtainDictDataResult.java rename to njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/dict/pojo/ObtainDictDataResult.java index dd2d273..07a1f7c 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/dict/pojo/ObtainDictDataResult.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/dict/pojo/ObtainDictDataResult.java @@ -1,4 +1,4 @@ -package com.njzscloud.supervisory.sys.dict.pojo; +package com.njzscloud.dispose.sys.dict.pojo; import lombok.Getter; import lombok.Setter; diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/dict/service/DictItemService.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/dict/service/DictItemService.java similarity index 95% rename from njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/dict/service/DictItemService.java rename to njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/dict/service/DictItemService.java index 150c0dc..07bd8bc 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/dict/service/DictItemService.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/dict/service/DictItemService.java @@ -1,4 +1,4 @@ -package com.njzscloud.supervisory.sys.dict.service; +package com.njzscloud.dispose.sys.dict.service; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.lang.Assert; @@ -9,8 +9,8 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.njzscloud.common.core.ex.Exceptions; import com.njzscloud.common.mp.support.PageParam; import com.njzscloud.common.mp.support.PageResult; -import com.njzscloud.supervisory.sys.dict.mapper.DictItemMapper; -import com.njzscloud.supervisory.sys.dict.pojo.DictItemEntity; +import com.njzscloud.dispose.sys.dict.mapper.DictItemMapper; +import com.njzscloud.dispose.sys.dict.pojo.DictItemEntity; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/dict/service/DictService.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/dict/service/DictService.java similarity index 90% rename from njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/dict/service/DictService.java rename to njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/dict/service/DictService.java index 0f2ed49..8ba48ab 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/dict/service/DictService.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/dict/service/DictService.java @@ -1,4 +1,4 @@ -package com.njzscloud.supervisory.sys.dict.service; +package com.njzscloud.dispose.sys.dict.service; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.lang.Assert; @@ -9,10 +9,10 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.njzscloud.common.core.ex.Exceptions; import com.njzscloud.common.mp.support.PageParam; import com.njzscloud.common.mp.support.PageResult; -import com.njzscloud.supervisory.sys.dict.mapper.DictMapper; -import com.njzscloud.supervisory.sys.dict.pojo.DictEntity; -import com.njzscloud.supervisory.sys.dict.pojo.DictItemEntity; -import com.njzscloud.supervisory.sys.dict.pojo.ObtainDictDataResult; +import com.njzscloud.dispose.sys.dict.mapper.DictMapper; +import com.njzscloud.dispose.sys.dict.pojo.DictEntity; +import com.njzscloud.dispose.sys.dict.pojo.DictItemEntity; +import com.njzscloud.dispose.sys.dict.pojo.ObtainDictDataResult; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/district/controller/DistrictController.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/district/controller/DistrictController.java similarity index 85% rename from njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/district/controller/DistrictController.java rename to njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/district/controller/DistrictController.java index 9877f51..ca56a14 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/district/controller/DistrictController.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/district/controller/DistrictController.java @@ -1,11 +1,11 @@ -package com.njzscloud.supervisory.sys.district.controller; +package com.njzscloud.dispose.sys.district.controller; import com.njzscloud.common.core.utils.R; import com.njzscloud.common.mp.support.PageParam; import com.njzscloud.common.mp.support.PageResult; -import com.njzscloud.supervisory.sys.district.pojo.entity.DistrictEntity; -import com.njzscloud.supervisory.sys.district.pojo.param.SearchDistrictParam; -import com.njzscloud.supervisory.sys.district.service.DistrictService; +import com.njzscloud.dispose.sys.district.pojo.entity.DistrictEntity; +import com.njzscloud.dispose.sys.district.pojo.param.SearchDistrictParam; +import com.njzscloud.dispose.sys.district.service.DistrictService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.*; diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/district/mapper/DistrictMapper.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/district/mapper/DistrictMapper.java similarity index 61% rename from njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/district/mapper/DistrictMapper.java rename to njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/district/mapper/DistrictMapper.java index 9a8f93b..8344be2 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/district/mapper/DistrictMapper.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/district/mapper/DistrictMapper.java @@ -1,7 +1,7 @@ -package com.njzscloud.supervisory.sys.district.mapper; +package com.njzscloud.dispose.sys.district.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.njzscloud.supervisory.sys.district.pojo.entity.DistrictEntity; +import com.njzscloud.dispose.sys.district.pojo.entity.DistrictEntity; import org.apache.ibatis.annotations.Mapper; /** diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/district/pojo/entity/DistrictEntity.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/district/pojo/entity/DistrictEntity.java similarity index 94% rename from njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/district/pojo/entity/DistrictEntity.java rename to njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/district/pojo/entity/DistrictEntity.java index e13738a..29a7a8f 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/district/pojo/entity/DistrictEntity.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/district/pojo/entity/DistrictEntity.java @@ -1,4 +1,4 @@ -package com.njzscloud.supervisory.sys.district.pojo.entity; +package com.njzscloud.dispose.sys.district.pojo.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/district/pojo/param/SearchDistrictParam.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/district/pojo/param/SearchDistrictParam.java similarity index 85% rename from njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/district/pojo/param/SearchDistrictParam.java rename to njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/district/pojo/param/SearchDistrictParam.java index 3f37d75..9418fb3 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/district/pojo/param/SearchDistrictParam.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/district/pojo/param/SearchDistrictParam.java @@ -1,4 +1,4 @@ -package com.njzscloud.supervisory.sys.district.pojo.param; +package com.njzscloud.dispose.sys.district.pojo.param; import lombok.Getter; import lombok.Setter; diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/district/pojo/result/DistrictTreeResult.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/district/pojo/result/DistrictTreeResult.java similarity index 92% rename from njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/district/pojo/result/DistrictTreeResult.java rename to njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/district/pojo/result/DistrictTreeResult.java index beeca80..0d85015 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/district/pojo/result/DistrictTreeResult.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/district/pojo/result/DistrictTreeResult.java @@ -1,4 +1,4 @@ -package com.njzscloud.supervisory.sys.district.pojo.result; +package com.njzscloud.dispose.sys.district.pojo.result; import lombok.Getter; import lombok.Setter; diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/district/service/DistrictService.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/district/service/DistrictService.java similarity index 88% rename from njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/district/service/DistrictService.java rename to njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/district/service/DistrictService.java index c1bd984..b337e19 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/district/service/DistrictService.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/district/service/DistrictService.java @@ -1,4 +1,4 @@ -package com.njzscloud.supervisory.sys.district.service; +package com.njzscloud.dispose.sys.district.service; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.toolkit.Wrappers; @@ -6,9 +6,9 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.njzscloud.common.mp.support.PageParam; import com.njzscloud.common.mp.support.PageResult; -import com.njzscloud.supervisory.sys.district.mapper.DistrictMapper; -import com.njzscloud.supervisory.sys.district.pojo.entity.DistrictEntity; -import com.njzscloud.supervisory.sys.district.pojo.param.SearchDistrictParam; +import com.njzscloud.dispose.sys.district.mapper.DistrictMapper; +import com.njzscloud.dispose.sys.district.pojo.entity.DistrictEntity; +import com.njzscloud.dispose.sys.district.pojo.param.SearchDistrictParam; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/endpoint/contant/RequestMethod.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/endpoint/contant/RequestMethod.java similarity index 88% rename from njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/endpoint/contant/RequestMethod.java rename to njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/endpoint/contant/RequestMethod.java index 438b8d1..0572f8b 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/endpoint/contant/RequestMethod.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/endpoint/contant/RequestMethod.java @@ -1,4 +1,4 @@ -package com.njzscloud.supervisory.sys.endpoint.contant; +package com.njzscloud.dispose.sys.endpoint.contant; import com.njzscloud.common.core.ienum.DictStr; import lombok.Getter; @@ -18,4 +18,4 @@ public enum RequestMethod implements DictStr { private final String val; private final String txt; -} +} diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/endpoint/controller/EndpointController.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/endpoint/controller/EndpointController.java similarity index 79% rename from njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/endpoint/controller/EndpointController.java rename to njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/endpoint/controller/EndpointController.java index e339474..bf52215 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/endpoint/controller/EndpointController.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/endpoint/controller/EndpointController.java @@ -1,10 +1,10 @@ -package com.njzscloud.supervisory.sys.endpoint.controller; +package com.njzscloud.dispose.sys.endpoint.controller; import com.njzscloud.common.core.utils.R; -import com.njzscloud.supervisory.sys.endpoint.pojo.entity.EndpointEntity; -import com.njzscloud.supervisory.sys.endpoint.pojo.param.EndpointSearchParam; -import com.njzscloud.supervisory.sys.endpoint.pojo.result.EndpointDetailResult; -import com.njzscloud.supervisory.sys.endpoint.service.EndpointService; +import com.njzscloud.dispose.sys.endpoint.pojo.entity.EndpointEntity; +import com.njzscloud.dispose.sys.endpoint.pojo.param.EndpointSearchParam; +import com.njzscloud.dispose.sys.endpoint.pojo.result.EndpointDetailResult; +import com.njzscloud.dispose.sys.endpoint.service.EndpointService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.*; diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/endpoint/mapper/EndpointMapper.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/endpoint/mapper/EndpointMapper.java similarity index 61% rename from njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/endpoint/mapper/EndpointMapper.java rename to njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/endpoint/mapper/EndpointMapper.java index 71eb419..d349c9b 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/endpoint/mapper/EndpointMapper.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/endpoint/mapper/EndpointMapper.java @@ -1,7 +1,7 @@ -package com.njzscloud.supervisory.sys.endpoint.mapper; +package com.njzscloud.dispose.sys.endpoint.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.njzscloud.supervisory.sys.endpoint.pojo.entity.EndpointEntity; +import com.njzscloud.dispose.sys.endpoint.pojo.entity.EndpointEntity; import org.apache.ibatis.annotations.Mapper; /** diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/endpoint/pojo/entity/EndpointEntity.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/endpoint/pojo/entity/EndpointEntity.java similarity index 88% rename from njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/endpoint/pojo/entity/EndpointEntity.java rename to njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/endpoint/pojo/entity/EndpointEntity.java index 589de11..d5a3ebe 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/endpoint/pojo/entity/EndpointEntity.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/endpoint/pojo/entity/EndpointEntity.java @@ -1,10 +1,10 @@ -package com.njzscloud.supervisory.sys.endpoint.pojo.entity; +package com.njzscloud.dispose.sys.endpoint.pojo.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.njzscloud.common.security.contant.EndpointAccessModel; -import com.njzscloud.supervisory.sys.endpoint.contant.RequestMethod; +import com.njzscloud.dispose.sys.endpoint.contant.RequestMethod; import lombok.Getter; import lombok.Setter; import lombok.ToString; diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/endpoint/pojo/param/EndpointSearchParam.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/endpoint/pojo/param/EndpointSearchParam.java similarity index 84% rename from njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/endpoint/pojo/param/EndpointSearchParam.java rename to njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/endpoint/pojo/param/EndpointSearchParam.java index b28d523..22a373c 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/endpoint/pojo/param/EndpointSearchParam.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/endpoint/pojo/param/EndpointSearchParam.java @@ -1,4 +1,4 @@ -package com.njzscloud.supervisory.sys.endpoint.pojo.param; +package com.njzscloud.dispose.sys.endpoint.pojo.param; import lombok.Getter; import lombok.Setter; diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/endpoint/pojo/result/EndpointDetailResult.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/endpoint/pojo/result/EndpointDetailResult.java similarity index 86% rename from njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/endpoint/pojo/result/EndpointDetailResult.java rename to njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/endpoint/pojo/result/EndpointDetailResult.java index cfd6902..ec276cd 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/endpoint/pojo/result/EndpointDetailResult.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/endpoint/pojo/result/EndpointDetailResult.java @@ -1,7 +1,7 @@ -package com.njzscloud.supervisory.sys.endpoint.pojo.result; +package com.njzscloud.dispose.sys.endpoint.pojo.result; import com.njzscloud.common.security.contant.EndpointAccessModel; -import com.njzscloud.supervisory.sys.endpoint.contant.RequestMethod; +import com.njzscloud.dispose.sys.endpoint.contant.RequestMethod; import lombok.Getter; import lombok.Setter; import lombok.ToString; diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/endpoint/service/EndpointService.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/endpoint/service/EndpointService.java similarity index 83% rename from njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/endpoint/service/EndpointService.java rename to njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/endpoint/service/EndpointService.java index 4ca0919..a03c785 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/endpoint/service/EndpointService.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/endpoint/service/EndpointService.java @@ -1,14 +1,14 @@ -package com.njzscloud.supervisory.sys.endpoint.service; +package com.njzscloud.dispose.sys.endpoint.service; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.njzscloud.supervisory.sys.endpoint.mapper.EndpointMapper; -import com.njzscloud.supervisory.sys.endpoint.pojo.entity.EndpointEntity; -import com.njzscloud.supervisory.sys.endpoint.pojo.param.EndpointSearchParam; -import com.njzscloud.supervisory.sys.endpoint.pojo.result.EndpointDetailResult; +import com.njzscloud.dispose.sys.endpoint.mapper.EndpointMapper; +import com.njzscloud.dispose.sys.endpoint.pojo.entity.EndpointEntity; +import com.njzscloud.dispose.sys.endpoint.pojo.param.EndpointSearchParam; +import com.njzscloud.dispose.sys.endpoint.pojo.result.EndpointDetailResult; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/menu/contant/MenuCategory.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/menu/contant/MenuCategory.java similarity index 89% rename from njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/menu/contant/MenuCategory.java rename to njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/menu/contant/MenuCategory.java index 6aa6d94..a2f4962 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/menu/contant/MenuCategory.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/menu/contant/MenuCategory.java @@ -1,4 +1,4 @@ -package com.njzscloud.supervisory.sys.menu.contant; +package com.njzscloud.dispose.sys.menu.contant; import com.njzscloud.common.core.ienum.DictStr; import lombok.Getter; diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/menu/controller/MenuController.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/menu/controller/MenuController.java similarity index 82% rename from njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/menu/controller/MenuController.java rename to njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/menu/controller/MenuController.java index 2767482..42da856 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/menu/controller/MenuController.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/menu/controller/MenuController.java @@ -1,14 +1,14 @@ -package com.njzscloud.supervisory.sys.menu.controller; +package com.njzscloud.dispose.sys.menu.controller; import cn.hutool.core.lang.Assert; import com.njzscloud.common.core.utils.R; import com.njzscloud.common.mp.support.PageParam; import com.njzscloud.common.mp.support.PageResult; -import com.njzscloud.supervisory.sys.menu.pojo.param.MenuAddParam; -import com.njzscloud.supervisory.sys.menu.pojo.param.MenuModifyParam; -import com.njzscloud.supervisory.sys.menu.pojo.param.MenuSearchParam; -import com.njzscloud.supervisory.sys.menu.pojo.result.MenuDetailResult; -import com.njzscloud.supervisory.sys.menu.service.MenuService; +import com.njzscloud.dispose.sys.menu.pojo.param.MenuAddParam; +import com.njzscloud.dispose.sys.menu.pojo.param.MenuModifyParam; +import com.njzscloud.dispose.sys.menu.pojo.param.MenuSearchParam; +import com.njzscloud.dispose.sys.menu.pojo.result.MenuDetailResult; +import com.njzscloud.dispose.sys.menu.service.MenuService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.validation.annotation.Validated; diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/menu/mapper/MenuMapper.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/menu/mapper/MenuMapper.java similarity index 63% rename from njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/menu/mapper/MenuMapper.java rename to njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/menu/mapper/MenuMapper.java index b37a2d2..98d0a23 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/menu/mapper/MenuMapper.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/menu/mapper/MenuMapper.java @@ -1,7 +1,7 @@ -package com.njzscloud.supervisory.sys.menu.mapper; +package com.njzscloud.dispose.sys.menu.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.njzscloud.supervisory.sys.menu.pojo.entity.MenuEntity; +import com.njzscloud.dispose.sys.menu.pojo.entity.MenuEntity; import org.apache.ibatis.annotations.Mapper; /** diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/menu/pojo/entity/MenuEntity.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/menu/pojo/entity/MenuEntity.java similarity index 93% rename from njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/menu/pojo/entity/MenuEntity.java rename to njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/menu/pojo/entity/MenuEntity.java index f259b20..2457a1d 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/menu/pojo/entity/MenuEntity.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/menu/pojo/entity/MenuEntity.java @@ -1,8 +1,8 @@ -package com.njzscloud.supervisory.sys.menu.pojo.entity; +package com.njzscloud.dispose.sys.menu.pojo.entity; import com.baomidou.mybatisplus.annotation.*; import com.njzscloud.common.mp.support.handler.j.JsonTypeHandler; -import com.njzscloud.supervisory.sys.menu.contant.MenuCategory; +import com.njzscloud.dispose.sys.menu.contant.MenuCategory; import lombok.Getter; import lombok.Setter; import lombok.experimental.Accessors; diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/menu/pojo/param/MenuAddParam.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/menu/pojo/param/MenuAddParam.java similarity index 93% rename from njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/menu/pojo/param/MenuAddParam.java rename to njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/menu/pojo/param/MenuAddParam.java index 2454169..7c415c0 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/menu/pojo/param/MenuAddParam.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/menu/pojo/param/MenuAddParam.java @@ -1,10 +1,10 @@ -package com.njzscloud.supervisory.sys.menu.pojo.param; +package com.njzscloud.dispose.sys.menu.pojo.param; import cn.hutool.core.util.StrUtil; import com.njzscloud.common.mvc.validator.Constrained; import com.njzscloud.common.mvc.validator.Constraint; import com.njzscloud.common.mvc.validator.ValidRule; -import com.njzscloud.supervisory.sys.menu.contant.MenuCategory; +import com.njzscloud.dispose.sys.menu.contant.MenuCategory; import jakarta.validation.constraints.NotBlank; import lombok.Getter; import lombok.Setter; diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/menu/pojo/param/MenuModifyParam.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/menu/pojo/param/MenuModifyParam.java similarity index 94% rename from njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/menu/pojo/param/MenuModifyParam.java rename to njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/menu/pojo/param/MenuModifyParam.java index f67f88e..6c47779 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/menu/pojo/param/MenuModifyParam.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/menu/pojo/param/MenuModifyParam.java @@ -1,4 +1,4 @@ -package com.njzscloud.supervisory.sys.menu.pojo.param; +package com.njzscloud.dispose.sys.menu.pojo.param; import com.njzscloud.common.mvc.validator.Constrained; import com.njzscloud.common.mvc.validator.Constraint; diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/menu/pojo/param/MenuSearchParam.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/menu/pojo/param/MenuSearchParam.java similarity index 87% rename from njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/menu/pojo/param/MenuSearchParam.java rename to njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/menu/pojo/param/MenuSearchParam.java index 2d36842..abd636a 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/menu/pojo/param/MenuSearchParam.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/menu/pojo/param/MenuSearchParam.java @@ -1,4 +1,4 @@ -package com.njzscloud.supervisory.sys.menu.pojo.param; +package com.njzscloud.dispose.sys.menu.pojo.param; import com.njzscloud.common.mvc.validator.Constraint; import lombok.Getter; diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/menu/pojo/result/MenuDetailResult.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/menu/pojo/result/MenuDetailResult.java similarity index 87% rename from njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/menu/pojo/result/MenuDetailResult.java rename to njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/menu/pojo/result/MenuDetailResult.java index 5c0f743..50739f6 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/menu/pojo/result/MenuDetailResult.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/menu/pojo/result/MenuDetailResult.java @@ -1,6 +1,6 @@ -package com.njzscloud.supervisory.sys.menu.pojo.result; +package com.njzscloud.dispose.sys.menu.pojo.result; -import com.njzscloud.supervisory.sys.menu.contant.MenuCategory; +import com.njzscloud.dispose.sys.menu.contant.MenuCategory; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.Setter; diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/menu/service/MenuService.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/menu/service/MenuService.java similarity index 92% rename from njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/menu/service/MenuService.java rename to njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/menu/service/MenuService.java index ab278e1..eef7098 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/menu/service/MenuService.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/menu/service/MenuService.java @@ -1,4 +1,4 @@ -package com.njzscloud.supervisory.sys.menu.service; +package com.njzscloud.dispose.sys.menu.service; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; @@ -11,16 +11,16 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.njzscloud.common.core.ex.Exceptions; import com.njzscloud.common.mp.support.PageParam; import com.njzscloud.common.mp.support.PageResult; -import com.njzscloud.supervisory.sys.menu.contant.MenuCategory; -import com.njzscloud.supervisory.sys.menu.mapper.MenuMapper; -import com.njzscloud.supervisory.sys.menu.pojo.entity.MenuEntity; -import com.njzscloud.supervisory.sys.menu.pojo.param.MenuAddParam; -import com.njzscloud.supervisory.sys.menu.pojo.param.MenuModifyParam; -import com.njzscloud.supervisory.sys.menu.pojo.param.MenuSearchParam; -import com.njzscloud.supervisory.sys.menu.pojo.result.MenuDetailResult; -import com.njzscloud.supervisory.sys.resource.contant.ResourceOrigin; -import com.njzscloud.supervisory.sys.resource.pojo.entity.ResourceEntity; -import com.njzscloud.supervisory.sys.resource.service.ResourceService; +import com.njzscloud.dispose.sys.menu.contant.MenuCategory; +import com.njzscloud.dispose.sys.menu.mapper.MenuMapper; +import com.njzscloud.dispose.sys.menu.pojo.entity.MenuEntity; +import com.njzscloud.dispose.sys.menu.pojo.param.MenuAddParam; +import com.njzscloud.dispose.sys.menu.pojo.param.MenuModifyParam; +import com.njzscloud.dispose.sys.menu.pojo.param.MenuSearchParam; +import com.njzscloud.dispose.sys.menu.pojo.result.MenuDetailResult; +import com.njzscloud.dispose.sys.resource.contant.ResourceOrigin; +import com.njzscloud.dispose.sys.resource.pojo.entity.ResourceEntity; +import com.njzscloud.dispose.sys.resource.service.ResourceService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/resource/contant/ResourceOrigin.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/resource/contant/ResourceOrigin.java similarity index 86% rename from njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/resource/contant/ResourceOrigin.java rename to njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/resource/contant/ResourceOrigin.java index 21152f7..bc2524a 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/resource/contant/ResourceOrigin.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/resource/contant/ResourceOrigin.java @@ -1,4 +1,4 @@ -package com.njzscloud.supervisory.sys.resource.contant; +package com.njzscloud.dispose.sys.resource.contant; import com.njzscloud.common.core.ienum.DictStr; import lombok.Getter; diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/resource/cotroller/ResourceController.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/resource/cotroller/ResourceController.java similarity index 87% rename from njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/resource/cotroller/ResourceController.java rename to njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/resource/cotroller/ResourceController.java index 1dc08c9..4dd786b 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/resource/cotroller/ResourceController.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/resource/cotroller/ResourceController.java @@ -1,10 +1,10 @@ -package com.njzscloud.supervisory.sys.resource.cotroller; +package com.njzscloud.dispose.sys.resource.cotroller; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.njzscloud.common.core.utils.R; -import com.njzscloud.supervisory.sys.resource.pojo.entity.ResourceEntity; -import com.njzscloud.supervisory.sys.resource.service.ResourceService; +import com.njzscloud.dispose.sys.resource.pojo.entity.ResourceEntity; +import com.njzscloud.dispose.sys.resource.service.ResourceService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.GetMapping; diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/resource/mapper/ResourceMapper.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/resource/mapper/ResourceMapper.java similarity index 81% rename from njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/resource/mapper/ResourceMapper.java rename to njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/resource/mapper/ResourceMapper.java index 4c88fcb..01b04af 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/resource/mapper/ResourceMapper.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/resource/mapper/ResourceMapper.java @@ -1,9 +1,9 @@ -package com.njzscloud.supervisory.sys.resource.mapper; +package com.njzscloud.dispose.sys.resource.mapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.toolkit.Constants; -import com.njzscloud.supervisory.sys.resource.pojo.entity.ResourceEntity; +import com.njzscloud.dispose.sys.resource.pojo.entity.ResourceEntity; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/resource/pojo/entity/ResourceEntity.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/resource/pojo/entity/ResourceEntity.java similarity index 92% rename from njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/resource/pojo/entity/ResourceEntity.java rename to njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/resource/pojo/entity/ResourceEntity.java index 846dde4..e2872e1 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/resource/pojo/entity/ResourceEntity.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/resource/pojo/entity/ResourceEntity.java @@ -1,4 +1,4 @@ -package com.njzscloud.supervisory.sys.resource.pojo.entity; +package com.njzscloud.dispose.sys.resource.pojo.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/resource/service/ResourceService.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/resource/service/ResourceService.java similarity index 83% rename from njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/resource/service/ResourceService.java rename to njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/resource/service/ResourceService.java index b6829a2..e27c2be 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/resource/service/ResourceService.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/resource/service/ResourceService.java @@ -1,11 +1,11 @@ -package com.njzscloud.supervisory.sys.resource.service; +package com.njzscloud.dispose.sys.resource.service; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.njzscloud.supervisory.sys.resource.contant.ResourceOrigin; -import com.njzscloud.supervisory.sys.resource.mapper.ResourceMapper; -import com.njzscloud.supervisory.sys.resource.pojo.entity.ResourceEntity; +import com.njzscloud.dispose.sys.resource.contant.ResourceOrigin; +import com.njzscloud.dispose.sys.resource.mapper.ResourceMapper; +import com.njzscloud.dispose.sys.resource.pojo.entity.ResourceEntity; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/role/controller/RoleController.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/role/controller/RoleController.java similarity index 82% rename from njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/role/controller/RoleController.java rename to njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/role/controller/RoleController.java index 89b33cb..003f989 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/role/controller/RoleController.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/role/controller/RoleController.java @@ -1,4 +1,4 @@ -package com.njzscloud.supervisory.sys.role.controller; +package com.njzscloud.dispose.sys.role.controller; import cn.hutool.core.lang.Assert; import cn.hutool.core.util.StrUtil; @@ -6,13 +6,13 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.njzscloud.common.core.utils.R; import com.njzscloud.common.mp.support.PageParam; import com.njzscloud.common.mp.support.PageResult; -import com.njzscloud.supervisory.sys.role.pojo.entity.RoleEntity; -import com.njzscloud.supervisory.sys.role.pojo.param.BindResParam; -import com.njzscloud.supervisory.sys.role.pojo.param.RoleAddParam; -import com.njzscloud.supervisory.sys.role.pojo.param.RoleModifyParam; -import com.njzscloud.supervisory.sys.role.pojo.param.RoleQueryParam; -import com.njzscloud.supervisory.sys.role.pojo.result.RoleDetailResult; -import com.njzscloud.supervisory.sys.role.service.RoleService; +import com.njzscloud.dispose.sys.role.pojo.entity.RoleEntity; +import com.njzscloud.dispose.sys.role.pojo.param.BindResParam; +import com.njzscloud.dispose.sys.role.pojo.param.RoleAddParam; +import com.njzscloud.dispose.sys.role.pojo.param.RoleModifyParam; +import com.njzscloud.dispose.sys.role.pojo.param.RoleQueryParam; +import com.njzscloud.dispose.sys.role.pojo.result.RoleDetailResult; +import com.njzscloud.dispose.sys.role.service.RoleService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.validation.annotation.Validated; diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/role/mapper/RoleMapper.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/role/mapper/RoleMapper.java similarity index 87% rename from njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/role/mapper/RoleMapper.java rename to njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/role/mapper/RoleMapper.java index a27fab4..8174ef1 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/role/mapper/RoleMapper.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/role/mapper/RoleMapper.java @@ -1,11 +1,11 @@ -package com.njzscloud.supervisory.sys.role.mapper; +package com.njzscloud.dispose.sys.role.mapper; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Constants; -import com.njzscloud.supervisory.sys.role.pojo.entity.RoleEntity; +import com.njzscloud.dispose.sys.role.pojo.entity.RoleEntity; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/role/mapper/RoleResMapper.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/role/mapper/RoleResMapper.java similarity index 63% rename from njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/role/mapper/RoleResMapper.java rename to njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/role/mapper/RoleResMapper.java index f741eea..b5334c7 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/role/mapper/RoleResMapper.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/role/mapper/RoleResMapper.java @@ -1,7 +1,7 @@ -package com.njzscloud.supervisory.sys.role.mapper; +package com.njzscloud.dispose.sys.role.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.njzscloud.supervisory.sys.role.pojo.entity.RoleResourceEntity; +import com.njzscloud.dispose.sys.role.pojo.entity.RoleResourceEntity; import org.apache.ibatis.annotations.Mapper; /** diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/role/pojo/entity/RoleEntity.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/role/pojo/entity/RoleEntity.java similarity index 92% rename from njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/role/pojo/entity/RoleEntity.java rename to njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/role/pojo/entity/RoleEntity.java index 2e4ef54..fc46074 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/role/pojo/entity/RoleEntity.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/role/pojo/entity/RoleEntity.java @@ -1,4 +1,4 @@ -package com.njzscloud.supervisory.sys.role.pojo.entity; +package com.njzscloud.dispose.sys.role.pojo.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/role/pojo/entity/RoleResourceEntity.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/role/pojo/entity/RoleResourceEntity.java similarity index 93% rename from njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/role/pojo/entity/RoleResourceEntity.java rename to njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/role/pojo/entity/RoleResourceEntity.java index af46f60..c97a5f0 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/role/pojo/entity/RoleResourceEntity.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/role/pojo/entity/RoleResourceEntity.java @@ -1,4 +1,4 @@ -package com.njzscloud.supervisory.sys.role.pojo.entity; +package com.njzscloud.dispose.sys.role.pojo.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/role/pojo/param/BindResParam.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/role/pojo/param/BindResParam.java similarity index 84% rename from njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/role/pojo/param/BindResParam.java rename to njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/role/pojo/param/BindResParam.java index 0f7b11c..6b08563 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/role/pojo/param/BindResParam.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/role/pojo/param/BindResParam.java @@ -1,4 +1,4 @@ -package com.njzscloud.supervisory.sys.role.pojo.param; +package com.njzscloud.dispose.sys.role.pojo.param; import lombok.Getter; import lombok.Setter; diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/role/pojo/param/RoleAddParam.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/role/pojo/param/RoleAddParam.java similarity index 90% rename from njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/role/pojo/param/RoleAddParam.java rename to njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/role/pojo/param/RoleAddParam.java index 2e8bcdc..0bf7765 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/role/pojo/param/RoleAddParam.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/role/pojo/param/RoleAddParam.java @@ -1,4 +1,4 @@ -package com.njzscloud.supervisory.sys.role.pojo.param; +package com.njzscloud.dispose.sys.role.pojo.param; import jakarta.validation.constraints.NotBlank; import lombok.Getter; diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/role/pojo/param/RoleModifyParam.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/role/pojo/param/RoleModifyParam.java similarity index 89% rename from njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/role/pojo/param/RoleModifyParam.java rename to njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/role/pojo/param/RoleModifyParam.java index f70a4a6..06bd039 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/role/pojo/param/RoleModifyParam.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/role/pojo/param/RoleModifyParam.java @@ -1,4 +1,4 @@ -package com.njzscloud.supervisory.sys.role.pojo.param; +package com.njzscloud.dispose.sys.role.pojo.param; import jakarta.validation.constraints.NotNull; import lombok.Getter; diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/role/pojo/param/RoleQueryParam.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/role/pojo/param/RoleQueryParam.java similarity index 82% rename from njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/role/pojo/param/RoleQueryParam.java rename to njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/role/pojo/param/RoleQueryParam.java index ee3423c..8bc3e27 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/role/pojo/param/RoleQueryParam.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/role/pojo/param/RoleQueryParam.java @@ -1,4 +1,4 @@ -package com.njzscloud.supervisory.sys.role.pojo.param; +package com.njzscloud.dispose.sys.role.pojo.param; import lombok.Getter; import lombok.Setter; diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/role/pojo/result/RoleDetailResult.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/role/pojo/result/RoleDetailResult.java similarity index 90% rename from njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/role/pojo/result/RoleDetailResult.java rename to njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/role/pojo/result/RoleDetailResult.java index e5daf10..a482167 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/role/pojo/result/RoleDetailResult.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/role/pojo/result/RoleDetailResult.java @@ -1,4 +1,4 @@ -package com.njzscloud.supervisory.sys.role.pojo.result; +package com.njzscloud.dispose.sys.role.pojo.result; import lombok.Getter; import lombok.Setter; diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/role/service/RoleResService.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/role/service/RoleResService.java similarity index 90% rename from njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/role/service/RoleResService.java rename to njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/role/service/RoleResService.java index 83a5fe9..e5bf7dc 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/role/service/RoleResService.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/role/service/RoleResService.java @@ -1,4 +1,4 @@ -package com.njzscloud.supervisory.sys.role.service; +package com.njzscloud.dispose.sys.role.service; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.lang.Assert; @@ -9,10 +9,10 @@ import com.njzscloud.common.core.ex.Exceptions; import com.njzscloud.common.core.utils.GroupUtil; import com.njzscloud.common.mp.support.PageParam; import com.njzscloud.common.mp.support.PageResult; -import com.njzscloud.supervisory.sys.resource.pojo.entity.ResourceEntity; -import com.njzscloud.supervisory.sys.resource.service.ResourceService; -import com.njzscloud.supervisory.sys.role.mapper.RoleResMapper; -import com.njzscloud.supervisory.sys.role.pojo.entity.RoleResourceEntity; +import com.njzscloud.dispose.sys.resource.pojo.entity.ResourceEntity; +import com.njzscloud.dispose.sys.resource.service.ResourceService; +import com.njzscloud.dispose.sys.role.mapper.RoleResMapper; +import com.njzscloud.dispose.sys.role.pojo.entity.RoleResourceEntity; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/role/service/RoleService.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/role/service/RoleService.java similarity index 88% rename from njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/role/service/RoleService.java rename to njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/role/service/RoleService.java index 4387387..663a00e 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/role/service/RoleService.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/role/service/RoleService.java @@ -1,4 +1,4 @@ -package com.njzscloud.supervisory.sys.role.service; +package com.njzscloud.dispose.sys.role.service; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.lang.Assert; @@ -10,14 +10,14 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.njzscloud.common.core.ex.Exceptions; import com.njzscloud.common.mp.support.PageResult; -import com.njzscloud.supervisory.sys.role.mapper.RoleMapper; -import com.njzscloud.supervisory.sys.role.pojo.entity.RoleEntity; -import com.njzscloud.supervisory.sys.role.pojo.entity.RoleResourceEntity; -import com.njzscloud.supervisory.sys.role.pojo.param.BindResParam; -import com.njzscloud.supervisory.sys.role.pojo.param.RoleAddParam; -import com.njzscloud.supervisory.sys.role.pojo.param.RoleModifyParam; -import com.njzscloud.supervisory.sys.role.pojo.param.RoleQueryParam; -import com.njzscloud.supervisory.sys.role.pojo.result.RoleDetailResult; +import com.njzscloud.dispose.sys.role.mapper.RoleMapper; +import com.njzscloud.dispose.sys.role.pojo.entity.RoleEntity; +import com.njzscloud.dispose.sys.role.pojo.entity.RoleResourceEntity; +import com.njzscloud.dispose.sys.role.pojo.param.BindResParam; +import com.njzscloud.dispose.sys.role.pojo.param.RoleAddParam; +import com.njzscloud.dispose.sys.role.pojo.param.RoleModifyParam; +import com.njzscloud.dispose.sys.role.pojo.param.RoleQueryParam; +import com.njzscloud.dispose.sys.role.pojo.result.RoleDetailResult; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; @@ -28,7 +28,7 @@ import java.util.Set; import java.util.stream.Collectors; import static com.njzscloud.common.security.contant.Constants.ROLE_ADMIN; -import static com.njzscloud.supervisory.event.SysMittEvent.COERCE_LOGOUT; +import static com.njzscloud.dispose.event.SysMittEvent.COERCE_LOGOUT; /** * 角色表 diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/user/contant/Gender.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/user/constant/Gender.java similarity index 88% rename from njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/user/contant/Gender.java rename to njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/user/constant/Gender.java index b5f1215..b1e0c66 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/user/contant/Gender.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/user/constant/Gender.java @@ -1,4 +1,4 @@ -package com.njzscloud.supervisory.sys.user.contant; +package com.njzscloud.dispose.sys.user.constant; import com.njzscloud.common.core.ienum.DictStr; import lombok.Getter; diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/user/controller/UserController.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/user/controller/UserController.java similarity index 92% rename from njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/user/controller/UserController.java rename to njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/user/controller/UserController.java index 43f5ee2..e21f191 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/user/controller/UserController.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/user/controller/UserController.java @@ -1,13 +1,13 @@ -package com.njzscloud.supervisory.sys.user.controller; +package com.njzscloud.dispose.sys.user.controller; import cn.hutool.core.lang.Assert; import com.njzscloud.common.core.ex.Exceptions; import com.njzscloud.common.core.utils.R; import com.njzscloud.common.mp.support.PageParam; import com.njzscloud.common.mp.support.PageResult; -import com.njzscloud.supervisory.sys.user.pojo.param.*; -import com.njzscloud.supervisory.sys.user.pojo.result.UserDetailResult; -import com.njzscloud.supervisory.sys.user.service.UserService; +import com.njzscloud.dispose.sys.user.pojo.param.*; +import com.njzscloud.dispose.sys.user.pojo.result.UserDetailResult; +import com.njzscloud.dispose.sys.user.service.UserService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.validation.annotation.Validated; diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/user/mapper/SysUserRoleMapper.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/user/mapper/SysUserRoleMapper.java similarity index 69% rename from njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/user/mapper/SysUserRoleMapper.java rename to njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/user/mapper/SysUserRoleMapper.java index c1d70e7..ef9698c 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/user/mapper/SysUserRoleMapper.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/user/mapper/SysUserRoleMapper.java @@ -1,9 +1,9 @@ -package com.njzscloud.supervisory.sys.user.mapper; +package com.njzscloud.dispose.sys.user.mapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.njzscloud.supervisory.sys.role.pojo.result.RoleDetailResult; -import com.njzscloud.supervisory.sys.user.pojo.entity.SysUserRoleEntity; +import com.njzscloud.dispose.sys.role.pojo.result.RoleDetailResult; +import com.njzscloud.dispose.sys.user.pojo.entity.SysUserRoleEntity; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/user/mapper/UserAccountMapper.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/user/mapper/UserAccountMapper.java similarity index 64% rename from njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/user/mapper/UserAccountMapper.java rename to njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/user/mapper/UserAccountMapper.java index f8a56d0..a78dab9 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/user/mapper/UserAccountMapper.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/user/mapper/UserAccountMapper.java @@ -1,7 +1,7 @@ -package com.njzscloud.supervisory.sys.user.mapper; +package com.njzscloud.dispose.sys.user.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.njzscloud.supervisory.sys.user.pojo.entity.UserAccountEntity; +import com.njzscloud.dispose.sys.user.pojo.entity.UserAccountEntity; import org.apache.ibatis.annotations.Mapper; /** diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/user/mapper/UserMapper.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/user/mapper/UserMapper.java similarity index 81% rename from njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/user/mapper/UserMapper.java rename to njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/user/mapper/UserMapper.java index 5887a6c..120f7d0 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/user/mapper/UserMapper.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/user/mapper/UserMapper.java @@ -1,12 +1,12 @@ -package com.njzscloud.supervisory.sys.user.mapper; +package com.njzscloud.dispose.sys.user.mapper; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Constants; import com.njzscloud.common.security.support.UserDetail; -import com.njzscloud.supervisory.sys.user.pojo.entity.UserEntity; -import com.njzscloud.supervisory.sys.user.pojo.result.UserDetailResult; +import com.njzscloud.dispose.sys.user.pojo.entity.UserEntity; +import com.njzscloud.dispose.sys.user.pojo.result.UserDetailResult; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/user/pojo/entity/SysUserRoleEntity.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/user/pojo/entity/SysUserRoleEntity.java similarity index 91% rename from njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/user/pojo/entity/SysUserRoleEntity.java rename to njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/user/pojo/entity/SysUserRoleEntity.java index 6e68238..1e951b6 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/user/pojo/entity/SysUserRoleEntity.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/user/pojo/entity/SysUserRoleEntity.java @@ -1,4 +1,4 @@ -package com.njzscloud.supervisory.sys.user.pojo.entity; +package com.njzscloud.dispose.sys.user.pojo.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/user/pojo/entity/UserAccountEntity.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/user/pojo/entity/UserAccountEntity.java similarity index 96% rename from njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/user/pojo/entity/UserAccountEntity.java rename to njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/user/pojo/entity/UserAccountEntity.java index f775811..53e7f20 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/user/pojo/entity/UserAccountEntity.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/user/pojo/entity/UserAccountEntity.java @@ -1,4 +1,4 @@ -package com.njzscloud.supervisory.sys.user.pojo.entity; +package com.njzscloud.dispose.sys.user.pojo.entity; import com.baomidou.mybatisplus.annotation.*; import lombok.Getter; diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/user/pojo/entity/UserEntity.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/user/pojo/entity/UserEntity.java similarity index 95% rename from njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/user/pojo/entity/UserEntity.java rename to njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/user/pojo/entity/UserEntity.java index e2e2f80..599f307 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/user/pojo/entity/UserEntity.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/user/pojo/entity/UserEntity.java @@ -1,4 +1,4 @@ -package com.njzscloud.supervisory.sys.user.pojo.entity; +package com.njzscloud.dispose.sys.user.pojo.entity; import com.baomidou.mybatisplus.annotation.*; import lombok.Getter; diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/user/pojo/param/AddUserAccountParam.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/user/pojo/param/AddUserAccountParam.java similarity index 96% rename from njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/user/pojo/param/AddUserAccountParam.java rename to njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/user/pojo/param/AddUserAccountParam.java index 34eda68..067e49b 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/user/pojo/param/AddUserAccountParam.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/user/pojo/param/AddUserAccountParam.java @@ -1,4 +1,4 @@ -package com.njzscloud.supervisory.sys.user.pojo.param; +package com.njzscloud.dispose.sys.user.pojo.param; import cn.hutool.core.util.StrUtil; import com.njzscloud.common.mvc.validator.Constrained; diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/user/pojo/param/AddUserParam.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/user/pojo/param/AddUserParam.java similarity index 91% rename from njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/user/pojo/param/AddUserParam.java rename to njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/user/pojo/param/AddUserParam.java index 2bb5237..ab9819f 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/user/pojo/param/AddUserParam.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/user/pojo/param/AddUserParam.java @@ -1,9 +1,9 @@ -package com.njzscloud.supervisory.sys.user.pojo.param; +package com.njzscloud.dispose.sys.user.pojo.param; import cn.hutool.core.util.StrUtil; import com.njzscloud.common.mvc.validator.Constrained; import com.njzscloud.common.mvc.validator.ValidRule; -import com.njzscloud.supervisory.sys.user.contant.Gender; +import com.njzscloud.dispose.sys.user.constant.Gender; import jakarta.validation.Valid; import lombok.Getter; import lombok.Setter; diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/user/pojo/param/BindRoleParam.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/user/pojo/param/BindRoleParam.java similarity index 84% rename from njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/user/pojo/param/BindRoleParam.java rename to njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/user/pojo/param/BindRoleParam.java index 4ba06cf..4ee6c54 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/user/pojo/param/BindRoleParam.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/user/pojo/param/BindRoleParam.java @@ -1,4 +1,4 @@ -package com.njzscloud.supervisory.sys.user.pojo.param; +package com.njzscloud.dispose.sys.user.pojo.param; import lombok.Getter; import lombok.Setter; diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/user/pojo/param/ModifyPasswdParam.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/user/pojo/param/ModifyPasswdParam.java similarity index 86% rename from njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/user/pojo/param/ModifyPasswdParam.java rename to njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/user/pojo/param/ModifyPasswdParam.java index 1007ada..8c957e3 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/user/pojo/param/ModifyPasswdParam.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/user/pojo/param/ModifyPasswdParam.java @@ -1,4 +1,4 @@ -package com.njzscloud.supervisory.sys.user.pojo.param; +package com.njzscloud.dispose.sys.user.pojo.param; import jakarta.validation.constraints.NotBlank; import lombok.Getter; diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/user/pojo/param/UserModifyParam.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/user/pojo/param/UserModifyParam.java similarity index 80% rename from njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/user/pojo/param/UserModifyParam.java rename to njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/user/pojo/param/UserModifyParam.java index e9e30e8..be8b89b 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/user/pojo/param/UserModifyParam.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/user/pojo/param/UserModifyParam.java @@ -1,6 +1,6 @@ -package com.njzscloud.supervisory.sys.user.pojo.param; +package com.njzscloud.dispose.sys.user.pojo.param; -import com.njzscloud.supervisory.sys.user.contant.Gender; +import com.njzscloud.dispose.sys.user.constant.Gender; import jakarta.validation.constraints.NotNull; import lombok.Getter; import lombok.Setter; diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/user/pojo/param/UserQueryParam.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/user/pojo/param/UserQueryParam.java similarity index 81% rename from njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/user/pojo/param/UserQueryParam.java rename to njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/user/pojo/param/UserQueryParam.java index 0be5fe1..c58e37f 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/user/pojo/param/UserQueryParam.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/user/pojo/param/UserQueryParam.java @@ -1,6 +1,6 @@ -package com.njzscloud.supervisory.sys.user.pojo.param; +package com.njzscloud.dispose.sys.user.pojo.param; -import com.njzscloud.supervisory.sys.user.contant.Gender; +import com.njzscloud.dispose.sys.user.constant.Gender; import lombok.Getter; import lombok.Setter; diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/user/pojo/param/UserRegisterParam.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/user/pojo/param/UserRegisterParam.java new file mode 100644 index 0000000..5c8191f --- /dev/null +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/user/pojo/param/UserRegisterParam.java @@ -0,0 +1,292 @@ +package com.njzscloud.dispose.sys.user.pojo.param; + +import cn.hutool.core.util.StrUtil; +import com.njzscloud.common.mvc.validator.Constrained; +import com.njzscloud.common.mvc.validator.Constraint; +import com.njzscloud.common.mvc.validator.ValidRule; +import com.njzscloud.common.security.contant.AuthWay; +import com.njzscloud.dispose.cst.customer.constant.IdentityCategory; +import com.njzscloud.dispose.cst.org.constant.OrgCategory; +import com.njzscloud.dispose.sys.user.constant.Gender; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import lombok.Getter; +import lombok.Setter; +import lombok.ToString; +import lombok.experimental.Accessors; + +import java.time.LocalDateTime; +import java.util.List; + +@Getter +@Setter +@ToString +@Accessors(chain = true) +public class UserRegisterParam implements Constrained { + private AuthWay authWay; + /** + * 昵称 + */ + private String nickname; + /** + * 邮箱 + */ + private String email; + /** + * 手机号 + */ + private String phone; + /** + * 头像 + */ + private String avatar; + + /** + * 性别; 字典代码：gender + */ + private Gender gender; + /** + * 账号信息 + */ + @Valid + private Account account; + + /** + * 客户信息 + */ + @Valid + private Customer customer; + + /** + * 组织信息 + */ + @Valid + private Org org; + + /** + * 角色 Id 列表 + */ + private List roles; + + @Override + public ValidRule[] rules() { + return new ValidRule[]{ + ValidRule.of(() -> StrUtil.isNotBlank(nickname), "用户昵称不能为空"), + ValidRule.of(() -> account != null, "账号信息不能为空"), + }; + } + + @Getter + @Setter + @Constraint + @Accessors(chain = true) + public static class Account implements Constrained { + /** + * 用户 Id; sys_user.id + */ + private Long userId; + /** + * 用户名 + */ + private String username; + /** + * 手机号 + */ + private String phone; + /** + * 密码 + */ + private String secret; + /** + * 微信 openid + */ + private String wechatOpenid; + /** + * 微信 unionid + */ + private String wechatUnionid; + /** + * 允许登录的客户端; 字典代码：client_code + */ + private Integer clientCode; + /** + * 是否禁用; 0-->启用、1-->禁用 + */ + private Boolean disabled; + + + @Override + public ValidRule[] rules() { + return new ValidRule[]{ + ValidRule.of(() -> (StrUtil.isNotBlank(username) && StrUtil.isNotBlank(secret)) + || (StrUtil.isNotBlank(phone) && StrUtil.isNotBlank(secret)) + || StrUtil.isNotBlank(wechatOpenid), "账号信息不能为空"), + }; + } + + } + + @Getter + @Setter + @Constraint + @Accessors(chain = true) + public static class Customer { + + /** + * 身份类型；多个身份多条数据，ChanFei-->产废方、YunShu-->运输方、CaiGou-->采购方、SiJi-->司机 + */ + @NotNull(message = "身份类型不能为空") + private IdentityCategory identityCategory; + + /** + * 组织信息 Id；cst_org.id + */ + private Long orgId; + + /** + * 客户姓名 + */ + @NotBlank(message = "客户姓名不能为空") + private String customerName; + + /** + * 客户联系电话 + */ + @NotBlank(message = "客户联系电话不能为空") + private String phone; + + /** + * 是否管理员；是否为当前的组织管理员，0-->否、1-->是 + */ + @NotNull(message = "是否为当前组织管理员不能为空") + private Boolean manager; + } + + @Getter + @Setter + @Constraint + @Accessors(chain = true) + public static class Org { + + /** + * 主体类型，GeTiHu-->个体户、QiYe-->企业 + */ + @NotNull(message = "主体类型不能为空") + private OrgCategory orgCategory; + + /** + * 统一社会信用代码 + */ + @NotBlank(message = "统一社会信用代码不能为空") + private String uscc; + + /** + * 组织名称 + */ + @NotBlank(message = "组织名称不能为空") + private String orgName; + + /** + * 营业执照 + */ + private String businessLicense; + + /** + * 营业执照有效期 + */ + private LocalDateTime licenseStartTime; + + /** + * 营业执照有效期 + */ + private LocalDateTime licenseEndTime; + + /** + * 法人名称 + */ + private String legalRepresentative; + + /** + * 法人身份证号 + */ + private String idcard; + + /** + * 法人身份证有效期 + */ + private LocalDateTime idcardStartTime; + + /** + * 法人身份证有效期 + */ + private LocalDateTime idcardEndTime; + + /** + * 法人身份证正面 + */ + private String idcardFront; + + /** + * 法人身份证反面 + */ + private String idcardBack; + + /** + * 省；代码 + */ + private String province; + + /** + * 市；代码 + */ + private String city; + + /** + * 区县；代码 + */ + private String area; + + /** + * 乡镇街道；代码 + */ + private String town; + + /** + * 省；名称 + */ + private String provinceName; + + /** + * 市；名称 + */ + private String cityName; + + /** + * 区县；名称 + */ + private String areaName; + + /** + * 乡镇街道；名称 + */ + private String townName; + + /** + * 详细地址 + */ + private String address; + + /** + * 经度 + */ + private Double lng; + + /** + * 纬度 + */ + private Double lat; + + } + +} diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/user/pojo/result/UserAccountDetailResult.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/user/pojo/result/UserAccountDetailResult.java similarity index 92% rename from njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/user/pojo/result/UserAccountDetailResult.java rename to njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/user/pojo/result/UserAccountDetailResult.java index c7aacb4..c04cb64 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/user/pojo/result/UserAccountDetailResult.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/user/pojo/result/UserAccountDetailResult.java @@ -1,4 +1,4 @@ -package com.njzscloud.supervisory.sys.user.pojo.result; +package com.njzscloud.dispose.sys.user.pojo.result; import lombok.Getter; import lombok.Setter; diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/user/pojo/result/UserDetailResult.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/user/pojo/result/UserDetailResult.java similarity index 81% rename from njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/user/pojo/result/UserDetailResult.java rename to njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/user/pojo/result/UserDetailResult.java index 51da5d5..c8c0c7e 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/user/pojo/result/UserDetailResult.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/user/pojo/result/UserDetailResult.java @@ -1,6 +1,6 @@ -package com.njzscloud.supervisory.sys.user.pojo.result; +package com.njzscloud.dispose.sys.user.pojo.result; -import com.njzscloud.supervisory.sys.role.pojo.result.RoleDetailResult; +import com.njzscloud.dispose.sys.role.pojo.result.RoleDetailResult; import lombok.Getter; import lombok.Setter; import lombok.experimental.Accessors; diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/user/service/UserAccountService.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/user/service/UserAccountService.java similarity index 92% rename from njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/user/service/UserAccountService.java rename to njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/user/service/UserAccountService.java index 9cafa2d..769c611 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/user/service/UserAccountService.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/user/service/UserAccountService.java @@ -1,4 +1,4 @@ -package com.njzscloud.supervisory.sys.user.service; +package com.njzscloud.dispose.sys.user.service; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.lang.Assert; @@ -8,10 +8,10 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.njzscloud.common.core.ex.Exceptions; import com.njzscloud.common.security.util.EncryptUtil; -import com.njzscloud.supervisory.sys.user.mapper.UserAccountMapper; -import com.njzscloud.supervisory.sys.user.pojo.entity.UserAccountEntity; -import com.njzscloud.supervisory.sys.user.pojo.param.AddUserAccountParam; -import com.njzscloud.supervisory.sys.user.pojo.param.ModifyPasswdParam; +import com.njzscloud.dispose.sys.user.mapper.UserAccountMapper; +import com.njzscloud.dispose.sys.user.pojo.entity.UserAccountEntity; +import com.njzscloud.dispose.sys.user.pojo.param.AddUserAccountParam; +import com.njzscloud.dispose.sys.user.pojo.param.ModifyPasswdParam; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/user/service/UserRoleService.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/user/service/UserRoleService.java similarity index 83% rename from njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/user/service/UserRoleService.java rename to njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/user/service/UserRoleService.java index 6bada2b..e8b0726 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/user/service/UserRoleService.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/user/service/UserRoleService.java @@ -1,4 +1,4 @@ -package com.njzscloud.supervisory.sys.user.service; +package com.njzscloud.dispose.sys.user.service; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.lang.Assert; @@ -6,11 +6,11 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.njzscloud.common.core.ex.Exceptions; -import com.njzscloud.supervisory.sys.role.pojo.entity.RoleEntity; -import com.njzscloud.supervisory.sys.role.pojo.result.RoleDetailResult; -import com.njzscloud.supervisory.sys.role.service.RoleService; -import com.njzscloud.supervisory.sys.user.mapper.SysUserRoleMapper; -import com.njzscloud.supervisory.sys.user.pojo.entity.SysUserRoleEntity; +import com.njzscloud.dispose.sys.role.pojo.entity.RoleEntity; +import com.njzscloud.dispose.sys.role.pojo.result.RoleDetailResult; +import com.njzscloud.dispose.sys.role.service.RoleService; +import com.njzscloud.dispose.sys.user.mapper.SysUserRoleMapper; +import com.njzscloud.dispose.sys.user.pojo.entity.SysUserRoleEntity; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/user/service/UserService.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/user/service/UserService.java similarity index 91% rename from njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/user/service/UserService.java rename to njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/user/service/UserService.java index 923801f..cfc11a8 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/user/service/UserService.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/user/service/UserService.java @@ -1,4 +1,4 @@ -package com.njzscloud.supervisory.sys.user.service; +package com.njzscloud.dispose.sys.user.service; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.lang.Assert; @@ -13,14 +13,14 @@ import com.njzscloud.common.mp.support.PageResult; import com.njzscloud.common.security.support.UserDetail; import com.njzscloud.common.security.util.EncryptUtil; import com.njzscloud.common.security.util.SecurityUtil; -import com.njzscloud.supervisory.sys.role.pojo.result.RoleDetailResult; -import com.njzscloud.supervisory.sys.user.contant.Gender; -import com.njzscloud.supervisory.sys.user.mapper.UserMapper; -import com.njzscloud.supervisory.sys.user.pojo.entity.UserAccountEntity; -import com.njzscloud.supervisory.sys.user.pojo.entity.UserEntity; -import com.njzscloud.supervisory.sys.user.pojo.param.*; -import com.njzscloud.supervisory.sys.user.pojo.result.UserAccountDetailResult; -import com.njzscloud.supervisory.sys.user.pojo.result.UserDetailResult; +import com.njzscloud.dispose.sys.role.pojo.result.RoleDetailResult; +import com.njzscloud.dispose.sys.user.constant.Gender; +import com.njzscloud.dispose.sys.user.mapper.UserMapper; +import com.njzscloud.dispose.sys.user.pojo.entity.UserAccountEntity; +import com.njzscloud.dispose.sys.user.pojo.entity.UserEntity; +import com.njzscloud.dispose.sys.user.pojo.param.*; +import com.njzscloud.dispose.sys.user.pojo.result.UserAccountDetailResult; +import com.njzscloud.dispose.sys.user.pojo.result.UserDetailResult; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; @@ -31,7 +31,7 @@ import java.util.List; import java.util.Set; import java.util.stream.Collectors; -import static com.njzscloud.supervisory.event.SysMittEvent.COERCE_LOGOUT; +import static com.njzscloud.dispose.event.SysMittEvent.COERCE_LOGOUT; /** * 用户信息表 diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/user/pojo/param/UserRegisterParam.java b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/user/pojo/param/UserRegisterParam.java deleted file mode 100644 index 80e4e12..0000000 --- a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/user/pojo/param/UserRegisterParam.java +++ /dev/null @@ -1,118 +0,0 @@ -package com.njzscloud.supervisory.sys.user.pojo.param; - -import cn.hutool.core.util.StrUtil; -import com.njzscloud.common.mvc.validator.Constrained; -import com.njzscloud.common.mvc.validator.Constraint; -import com.njzscloud.common.mvc.validator.ValidRule; -import com.njzscloud.common.security.contant.AuthWay; -import com.njzscloud.supervisory.sys.user.contant.Gender; -import jakarta.validation.Valid; -import lombok.Getter; -import lombok.Setter; -import lombok.ToString; -import lombok.experimental.Accessors; - -import java.util.List; - -@Getter -@Setter -@ToString -@Accessors(chain = true) -public class UserRegisterParam implements Constrained { - private AuthWay authWay; - /** - * 昵称 - */ - private String nickname; - /** - * 邮箱 - */ - private String email; - /** - * 手机号 - */ - private String phone; - /** - * 头像 - */ - private String avatar; - - /** - * 性别; 字典代码：gender - */ - private Gender gender; - /** - * 账号信息 - */ - @Valid - private Account account; - /** - * 角色 Id 列表 - */ - private List roles; - - @Override - public ValidRule[] rules() { - return new ValidRule[]{ - ValidRule.of(() -> StrUtil.isNotBlank(nickname), "用户昵称不能为空"), - ValidRule.of(() -> account != null, "账号信息不能为空"), - }; - } - - - @Getter - @Setter - @Constraint - @Accessors(chain = true) - public static class Account implements Constrained { - /** - * 用户 Id; sys_user.id - */ - private Long userId; - /** - * 用户名 - */ - private String username; - /** - * 邮箱 - */ - private String email; - /** - * 手机号 - */ - private String phone; - /** - * 密码 - */ - private String secret; - /** - * 微信 openid - */ - private String wechatOpenid; - /** - * 微信 unionid - */ - private String wechatUnionid; - /** - * 允许登录的客户端; 字典代码：client_code - */ - private Integer clientCode; - /** - * 是否禁用; 0-->启用、1-->禁用 - */ - private Boolean disabled; - - - @Override - public ValidRule[] rules() { - return new ValidRule[]{ - ValidRule.of(() -> (StrUtil.isNotBlank(username) && StrUtil.isNotBlank(secret)) - || (StrUtil.isNotBlank(email) && StrUtil.isNotBlank(secret)) - || (StrUtil.isNotBlank(phone) && StrUtil.isNotBlank(secret)) - || StrUtil.isNotBlank(wechatOpenid), "账号信息不能为空"), - }; - } - - } - -} diff --git a/njzscloud-svr/src/main/resources/mapper/cst/customer/CustomerMapper.xml b/njzscloud-svr/src/main/resources/mapper/cst/customer/CustomerMapper.xml new file mode 100644 index 0000000..f6f26d4 --- /dev/null +++ b/njzscloud-svr/src/main/resources/mapper/cst/customer/CustomerMapper.xml @@ -0,0 +1,4 @@ + + + + diff --git a/njzscloud-svr/src/main/resources/mapper/cst/org/OrgMapper.xml b/njzscloud-svr/src/main/resources/mapper/cst/org/OrgMapper.xml new file mode 100644 index 0000000..b3d2c04 --- /dev/null +++ b/njzscloud-svr/src/main/resources/mapper/cst/org/OrgMapper.xml @@ -0,0 +1,4 @@ + + + + diff --git a/njzscloud-svr/src/main/resources/mapper/sys/auth/AuthMapper.xml b/njzscloud-svr/src/main/resources/mapper/sys/auth/AuthMapper.xml index 876714f..cfde694 100644 --- a/njzscloud-svr/src/main/resources/mapper/sys/auth/AuthMapper.xml +++ b/njzscloud-svr/src/main/resources/mapper/sys/auth/AuthMapper.xml @@ -2,7 +2,7 @@ - + @@ -33,7 +33,7 @@ INNER JOIN sys_user_role b ON b.role_id = a.id AND b.user_id = #{userId} - SELECT DISTINCT a.id, a.sn, a.pid, @@ -52,7 +52,7 @@ WHERE a.deleted = 0 - SELECT DISTINCT a.id, a.request_method, a.routing_path, diff --git a/njzscloud-svr/src/main/resources/mapper/sys/resource/ResourceMapper.xml b/njzscloud-svr/src/main/resources/mapper/sys/resource/ResourceMapper.xml index 8c43d39..27d83dc 100644 --- a/njzscloud-svr/src/main/resources/mapper/sys/resource/ResourceMapper.xml +++ b/njzscloud-svr/src/main/resources/mapper/sys/resource/ResourceMapper.xml @@ -11,7 +11,7 @@ ${ew.customSqlSegment} - SELECT a.id, a.sn, a.table_name, diff --git a/njzscloud-svr/src/main/resources/mapper/sys/role/RoleMapper.xml b/njzscloud-svr/src/main/resources/mapper/sys/role/RoleMapper.xml index 728b037..5b4de8c 100644 --- a/njzscloud-svr/src/main/resources/mapper/sys/role/RoleMapper.xml +++ b/njzscloud-svr/src/main/resources/mapper/sys/role/RoleMapper.xml @@ -3,7 +3,7 @@ - SELECT id, role_code, role_name, @@ -13,7 +13,7 @@ ${ew.customSqlSegment} - SELECT a.role_code, a.id, a.role_name, a.memo FROM sys_role a INNER JOIN sys_user_role b ON b.role_id = a.id AND b.user_id = #{userId} diff --git a/njzscloud-svr/src/main/resources/mapper/sys/user/SysUserRoleMapper.xml b/njzscloud-svr/src/main/resources/mapper/sys/user/SysUserRoleMapper.xml index 142ab05..9abe568 100644 --- a/njzscloud-svr/src/main/resources/mapper/sys/user/SysUserRoleMapper.xml +++ b/njzscloud-svr/src/main/resources/mapper/sys/user/SysUserRoleMapper.xml @@ -3,7 +3,7 @@ - SELECT b.id, b.role_code, diff --git a/njzscloud-svr/src/main/resources/mapper/sys/user/UserMapper.xml b/njzscloud-svr/src/main/resources/mapper/sys/user/UserMapper.xml index eb5e1f4..31d2a3e 100644 --- a/njzscloud-svr/src/main/resources/mapper/sys/user/UserMapper.xml +++ b/njzscloud-svr/src/main/resources/mapper/sys/user/UserMapper.xml @@ -3,9 +3,9 @@ - + - + diff --git a/z-doc/pdma/njzscloud-dispose.pdma b/z-doc/pdma/njzscloud-dispose.pdma index 57e2038..b62e20f 100644 --- a/z-doc/pdma/njzscloud-dispose.pdma +++ b/z-doc/pdma/njzscloud-dispose.pdma @@ -24162,8 +24162,8 @@ "id": "DAE6A790-C2D0-4972-9491-FEAF67E5B00C" }, { - "itemKey": "QingYun", - "itemName": "清运方", + "itemKey": "YunShu", + "itemName": "运输方", "parentKey": "", "intro": "", "id": "BDD02160-F9E7-4E0B-A227-008E0E0DCBB9" @@ -24181,6 +24181,13 @@ "parentKey": "", "intro": "", "id": "0EF79E9D-AF63-43B5-A7CB-645CA1C01597" + }, + { + "itemKey": "SiJi", + "itemName": "司机", + "parentKey": "", + "intro": "", + "id": "365597A9-A254-466D-A270-48F345A80BD5" } ], "fieldTier": "", @@ -42412,7 +42419,7 @@ "readonly": false, "allowWs": false }, - "updateTime": 1765274725045, - "signature": "7e953ff0dc6a0f9a3829d21fb8295b2d", + "updateTime": 1765330978291, + "signature": "c215676b06842c6791a3ca576a7c548a", "branchId": "1111" } \ No newline at end of file