From a727084b3f344a7148df998de953c5f7315cb7c4 Mon Sep 17 00:00:00 2001 From: luozhun <2025254074@qq.com> Date: Wed, 11 Sep 2024 11:31:10 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E6=95=B4=E5=90=88=20?= =?UTF-8?q?=E5=90=8E=E5=8F=B0=E6=8E=A5=E5=8F=A3=E7=BB=9F=E4=B8=80=E6=8E=A7?= =?UTF-8?q?=E5=88=B6=E5=99=A8=20=E5=B0=8F=E7=A8=8B=E5=BA=8F=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E7=BB=8F=E7=90=86=E8=B7=9F=E5=85=AC=E5=AE=89=E9=A6=96?= =?UTF-8?q?=E9=A1=B5=E6=88=91=E7=9A=84=E4=BC=81=E4=BA=8B=E4=B8=9A=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/annotation/CheckUserType.java | 2 +- .../com/changhu/common/pojo/vo/TokenInfo.java | 9 ++ .../com/changhu/common/utils/UserUtil.java | 2 +- .../changhu/controller/LoginController.java | 11 ++ .../enums/handler/MiniProgramUserLogin.java | 18 ++- .../controller/ManagementController.java | 4 + .../ManagementPoliceUnitUserController.java | 51 ------- .../ManagementSecurityUnitUserController.java | 49 ------- .../ManagementSuperUserController.java | 32 ----- .../controller/PoliceController.java | 58 ++++++++ .../controller/PoliceUnitController.java | 46 ------- .../controller/SecurityController.java | 59 ++++++++ .../controller/SecurityUnitController.java | 56 -------- .../controller/SuperController.java | 54 ++++++++ .../enums/handler/PoliceUnitTypeHandler.java | 36 ++++- .../handler/SecurityUnitTypeHandler.java | 7 +- .../mapper/ServiceProjectMapper.java | 11 ++ .../SecurityUnitSaveOrUpdateParams.java | 52 ------- .../ManagementPoliceUnitUserService.java | 26 ---- .../ManagementSecurityUnitUserService.java | 26 ---- .../service/ManagementSuperUserService.java | 7 - .../management/service/PoliceService.java | 46 +++++++ .../management/service/PoliceUnitService.java | 20 --- .../management/service/SecurityService.java | 46 +++++++ .../service/SecurityUnitService.java | 29 ---- .../management/service/SuperService.java | 40 ++++++ .../ManagementPoliceUnitUserServiceImpl.java | 68 ---------- ...ManagementSecurityUnitUserServiceImpl.java | 75 ----------- .../impl/ManagementSuperUserServiceImpl.java | 40 ------ .../service/impl/PoliceServiceImpl.java | 100 ++++++++++++++ .../service/impl/PoliceUnitServiceImpl.java | 20 --- .../service/impl/SecurityServiceImpl.java | 127 ++++++++++++++++++ .../service/impl/SecurityUnitServiceImpl.java | 68 ---------- .../service/impl/SuperServiceImpl.java | 81 +++++++++++ .../controller/MiniProgramUserController.java | 5 +- .../controller/PoliceIndexController.java | 35 +++++ .../ProjectManageIndexController.java | 35 +++++ .../pojo/vo/IndexServiceProjectListVo.java | 77 +++++++++++ .../miniProgram/service/MPoliceService.java | 19 +++ .../service/MiniProgramUserService.java | 3 +- .../service/ProjectManageIndexService.java | 19 +++ .../service/impl/MPoliceServiceImpl.java | 27 ++++ .../impl/MiniProgramUserServiceImpl.java | 10 +- .../impl/ProjectManageIndexServiceImpl.java | 27 ++++ .../params/SecurityUnitRegisterParams.java | 1 - .../com/changhu/service/LoginService.java | 5 + .../service/impl/LoginServiceImpl.java | 6 + .../resources/mapper/ServiceProjectMapper.xml | 48 +++++++ .../src/views/unitManage/policeUnit/index.vue | 94 +++++++------ .../views/unitManage/securityUnit/index.vue | 2 +- 50 files changed, 1048 insertions(+), 741 deletions(-) delete mode 100644 policeSecurityServer/src/main/java/com/changhu/module/management/controller/ManagementPoliceUnitUserController.java delete mode 100644 policeSecurityServer/src/main/java/com/changhu/module/management/controller/ManagementSecurityUnitUserController.java delete mode 100644 policeSecurityServer/src/main/java/com/changhu/module/management/controller/ManagementSuperUserController.java create mode 100644 policeSecurityServer/src/main/java/com/changhu/module/management/controller/PoliceController.java delete mode 100644 policeSecurityServer/src/main/java/com/changhu/module/management/controller/PoliceUnitController.java create mode 100644 policeSecurityServer/src/main/java/com/changhu/module/management/controller/SecurityController.java delete mode 100644 policeSecurityServer/src/main/java/com/changhu/module/management/controller/SecurityUnitController.java create mode 100644 policeSecurityServer/src/main/java/com/changhu/module/management/controller/SuperController.java delete mode 100644 policeSecurityServer/src/main/java/com/changhu/module/management/pojo/params/SecurityUnitSaveOrUpdateParams.java create mode 100644 policeSecurityServer/src/main/java/com/changhu/module/management/service/PoliceService.java create mode 100644 policeSecurityServer/src/main/java/com/changhu/module/management/service/SecurityService.java create mode 100644 policeSecurityServer/src/main/java/com/changhu/module/management/service/SuperService.java create mode 100644 policeSecurityServer/src/main/java/com/changhu/module/management/service/impl/PoliceServiceImpl.java create mode 100644 policeSecurityServer/src/main/java/com/changhu/module/management/service/impl/SecurityServiceImpl.java create mode 100644 policeSecurityServer/src/main/java/com/changhu/module/management/service/impl/SuperServiceImpl.java create mode 100644 policeSecurityServer/src/main/java/com/changhu/module/miniProgram/controller/PoliceIndexController.java create mode 100644 policeSecurityServer/src/main/java/com/changhu/module/miniProgram/controller/ProjectManageIndexController.java create mode 100644 policeSecurityServer/src/main/java/com/changhu/module/miniProgram/pojo/vo/IndexServiceProjectListVo.java create mode 100644 policeSecurityServer/src/main/java/com/changhu/module/miniProgram/service/MPoliceService.java create mode 100644 policeSecurityServer/src/main/java/com/changhu/module/miniProgram/service/ProjectManageIndexService.java create mode 100644 policeSecurityServer/src/main/java/com/changhu/module/miniProgram/service/impl/MPoliceServiceImpl.java create mode 100644 policeSecurityServer/src/main/java/com/changhu/module/miniProgram/service/impl/ProjectManageIndexServiceImpl.java diff --git a/policeSecurityServer/src/main/java/com/changhu/common/annotation/CheckUserType.java b/policeSecurityServer/src/main/java/com/changhu/common/annotation/CheckUserType.java index d97d4e8..4621a12 100644 --- a/policeSecurityServer/src/main/java/com/changhu/common/annotation/CheckUserType.java +++ b/policeSecurityServer/src/main/java/com/changhu/common/annotation/CheckUserType.java @@ -7,7 +7,7 @@ import java.lang.annotation.*; /** * @author 20252 * @createTime 2024/9/4 下午4:01 - * @desc CheckClientType... + * @desc 检查访问接口的用户类型 */ @Target({ElementType.TYPE, ElementType.METHOD}) @Retention(RetentionPolicy.RUNTIME) diff --git a/policeSecurityServer/src/main/java/com/changhu/common/pojo/vo/TokenInfo.java b/policeSecurityServer/src/main/java/com/changhu/common/pojo/vo/TokenInfo.java index b1e3284..e8b8aae 100644 --- a/policeSecurityServer/src/main/java/com/changhu/common/pojo/vo/TokenInfo.java +++ b/policeSecurityServer/src/main/java/com/changhu/common/pojo/vo/TokenInfo.java @@ -1,5 +1,6 @@ package com.changhu.common.pojo.vo; +import cn.hutool.core.lang.Dict; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @@ -15,9 +16,17 @@ public class TokenInfo { private String name; @Schema(description = "token的值") private String value; + @Schema(description = "拓展属性") + private Dict extData; public TokenInfo(String name, String value) { this.name = name; this.value = value; } + + public TokenInfo(String name, String value, Dict dict) { + this.name = name; + this.value = value; + this.extData = dict; + } } diff --git a/policeSecurityServer/src/main/java/com/changhu/common/utils/UserUtil.java b/policeSecurityServer/src/main/java/com/changhu/common/utils/UserUtil.java index 93dfb6c..ef4b3cd 100644 --- a/policeSecurityServer/src/main/java/com/changhu/common/utils/UserUtil.java +++ b/policeSecurityServer/src/main/java/com/changhu/common/utils/UserUtil.java @@ -51,7 +51,7 @@ public class UserUtil { } /** - * 获取客户端类型 + * 获取用户类型 */ public static UserType getUserType() { Object clientType = StpUtil.getExtra("userType"); diff --git a/policeSecurityServer/src/main/java/com/changhu/controller/LoginController.java b/policeSecurityServer/src/main/java/com/changhu/controller/LoginController.java index 3639b0a..3694b31 100644 --- a/policeSecurityServer/src/main/java/com/changhu/controller/LoginController.java +++ b/policeSecurityServer/src/main/java/com/changhu/controller/LoginController.java @@ -4,7 +4,10 @@ import com.changhu.common.annotation.JsonBody; import com.changhu.common.pojo.vo.TokenInfo; import com.changhu.pojo.params.LoginParams; import com.changhu.service.LoginService; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -13,14 +16,22 @@ import org.springframework.web.bind.annotation.RequestBody; * @createTime 2024/8/28 下午5:12 * @desc LoginController... */ +@Tag(name = "登录相关") @JsonBody public class LoginController { @Autowired private LoginService loginService; + @Operation(summary = "登录") @PostMapping("/login") public TokenInfo login(@RequestBody LoginParams loginParams) { return loginService.login(loginParams); } + + @Operation(summary = "登出") + @GetMapping("/logout") + public void logout() { + loginService.logout(); + } } diff --git a/policeSecurityServer/src/main/java/com/changhu/enums/handler/MiniProgramUserLogin.java b/policeSecurityServer/src/main/java/com/changhu/enums/handler/MiniProgramUserLogin.java index bbf35b1..2892af0 100644 --- a/policeSecurityServer/src/main/java/com/changhu/enums/handler/MiniProgramUserLogin.java +++ b/policeSecurityServer/src/main/java/com/changhu/enums/handler/MiniProgramUserLogin.java @@ -3,10 +3,14 @@ package com.changhu.enums.handler; import cn.binarywang.wx.miniapp.api.WxMaService; import cn.binarywang.wx.miniapp.bean.WxMaJscode2SessionResult; import cn.dev33.satoken.stp.SaTokenInfo; +import cn.hutool.core.lang.Dict; +import cn.hutool.core.lang.func.LambdaUtil; import cn.hutool.extra.spring.SpringUtil; import com.alibaba.fastjson2.JSONObject; import com.baomidou.mybatisplus.extension.toolkit.Db; import com.changhu.common.annotation.UserType; +import com.changhu.common.db.enums.CheckStatus; +import com.changhu.common.db.enums.IsEnable; import com.changhu.common.enums.ResultCode; import com.changhu.common.exception.MessageException; import com.changhu.common.pojo.vo.TokenInfo; @@ -49,6 +53,14 @@ public class MiniProgramUserLogin extends AbstractLoginHandler { .oneOpt() .orElseThrow(() -> new MessageException(ResultCode.USER_NOT_FOUND)); + if (CheckStatus.unChecked.equals(miniProgramUser.getCheckStatus())) { + throw new MessageException("该账号还未审核"); + } + + if (IsEnable.FALSE.equals(miniProgramUser.getIsEnable())) { + throw new MessageException(ResultCode.USER_IS_DISABLE); + } + UserType userType = switch (miniProgramUser.getIdentity()) { case POLICE -> UserType.MINI_PROGRAM_POLICE; case PROJECT_MANAGER -> UserType.MINI_PROGRAM_PROJECT_MANAGE; @@ -60,6 +72,10 @@ public class MiniProgramUserLogin extends AbstractLoginHandler { userType, miniProgramUser.getUnitId()); //返回token - return new TokenInfo(saTokenInfo.getTokenName(), saTokenInfo.getTokenValue()); + return new TokenInfo( + saTokenInfo.getTokenName(), + saTokenInfo.getTokenValue(), + Dict.of(LambdaUtil.getFieldName(MiniProgramUser::getIdentity), miniProgramUser.getIdentity()) + ); } } diff --git a/policeSecurityServer/src/main/java/com/changhu/module/management/controller/ManagementController.java b/policeSecurityServer/src/main/java/com/changhu/module/management/controller/ManagementController.java index 4218758..2c66c49 100644 --- a/policeSecurityServer/src/main/java/com/changhu/module/management/controller/ManagementController.java +++ b/policeSecurityServer/src/main/java/com/changhu/module/management/controller/ManagementController.java @@ -35,6 +35,7 @@ public class ManagementController { @Operation(summary = "审核通过") @PostMapping("/checkPass") + @CheckUserType(userTypes = UserType.MANAGEMENT_SUPER) public void checkPass(@RequestBody @Valid IndexCheckPassParams params) { managementService.checkPass(params); } @@ -47,6 +48,7 @@ public class ManagementController { @Operation(summary = "启用或禁用状态") @PostMapping("/disableOrEnable") + @CheckUserType(userTypes = UserType.MANAGEMENT_SUPER) public void disableOrEnable(@RequestBody @Valid IndexDisableOrEnableParams params) { managementService.disableOrEnable(params); } @@ -60,12 +62,14 @@ public class ManagementController { @Operation(summary = "审核通过小程序用户") @PostMapping("/passMiniProgramUser") + @CheckUserType(userTypes = {UserType.MANAGEMENT_POLICE, UserType.MANAGEMENT_SECURITY}) public void passMiniProgramUser(@RequestBody @Valid IndexDisableOrEnableParams params) { managementService.passMiniProgramUser(params); } @Operation(summary = "禁用或启用小程序用户") @PostMapping("/disableOrEnableMiniProgramUser") + @CheckUserType(userTypes = {UserType.MANAGEMENT_POLICE, UserType.MANAGEMENT_SECURITY}) public void disableOrEnableMiniProgramUser(@RequestBody @Valid IndexDisableOrEnableParams params) { managementService.disableOrEnableMiniProgramUser(params); } diff --git a/policeSecurityServer/src/main/java/com/changhu/module/management/controller/ManagementPoliceUnitUserController.java b/policeSecurityServer/src/main/java/com/changhu/module/management/controller/ManagementPoliceUnitUserController.java deleted file mode 100644 index 7882d57..0000000 --- a/policeSecurityServer/src/main/java/com/changhu/module/management/controller/ManagementPoliceUnitUserController.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.changhu.module.management.controller; - -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.changhu.common.annotation.CheckUserType; -import com.changhu.common.annotation.JsonBody; -import com.changhu.common.annotation.UserType; -import com.changhu.module.management.pojo.params.ManagementPoliceUserSaveOrUpdateParams; -import com.changhu.module.management.pojo.queryParams.ManagementPoliceUnitUserPagerQueryParams; -import com.changhu.module.management.pojo.vo.ManagementPoliceUnitUserPagerVo; -import com.changhu.module.management.service.ManagementPoliceUnitUserService; -import com.changhu.support.mybatisplus.pojo.params.PageParams; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.media.Schema; -import io.swagger.v3.oas.annotations.tags.Tag; -import jakarta.validation.Valid; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -/** - * @author 20252 - * @createTime 2024/9/3 上午10:21 - * @desc ManagementPoliceUnitUserController... - */ -@Tag(name = "后台-公安用户") -@JsonBody -@CheckUserType(userTypes = UserType.MANAGEMENT_POLICE) -@RequestMapping("/managementPoliceUnitUser") -public class ManagementPoliceUnitUserController { - - @Autowired - private ManagementPoliceUnitUserService managementPoliceUnitUserService; - - @Operation(summary = "新增或保存") - @PostMapping("/saveOrUpdate") - public void saveOrUpdate(@RequestBody @Valid ManagementPoliceUserSaveOrUpdateParams params) { - managementPoliceUnitUserService.saveOrUpdate(params); - } - - @Operation(summary = "分页查询") - @PostMapping("/pager") - public Page pager(@RequestBody PageParams queryParams) { - return managementPoliceUnitUserService.pager(queryParams); - } - - @Operation(summary = "根据id删除") - @DeleteMapping("/deleteById") - public void deleteById(@RequestParam @Schema(description = "后台公安用户id") Long managementPoliceUnitUserId) { - managementPoliceUnitUserService.deleteById(managementPoliceUnitUserId); - } - -} diff --git a/policeSecurityServer/src/main/java/com/changhu/module/management/controller/ManagementSecurityUnitUserController.java b/policeSecurityServer/src/main/java/com/changhu/module/management/controller/ManagementSecurityUnitUserController.java deleted file mode 100644 index a2bcecc..0000000 --- a/policeSecurityServer/src/main/java/com/changhu/module/management/controller/ManagementSecurityUnitUserController.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.changhu.module.management.controller; - -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.changhu.common.annotation.CheckUserType; -import com.changhu.common.annotation.JsonBody; -import com.changhu.common.annotation.UserType; -import com.changhu.module.management.pojo.params.ManagementSecurityUnitUserSaveOrUpdateParams; -import com.changhu.module.management.pojo.queryParams.ManagementSecurityUnitUserPagerQueryParams; -import com.changhu.module.management.pojo.vo.ManagementSecurityUnitUserPagerVo; -import com.changhu.module.management.service.ManagementSecurityUnitUserService; -import com.changhu.support.mybatisplus.pojo.params.PageParams; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.media.Schema; -import io.swagger.v3.oas.annotations.tags.Tag; -import jakarta.validation.Valid; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -/** - * @author 20252 - * @createTime 2024/9/3 上午10:22 - * @desc ManagementSecurityUnitUserController... - */ -@Tag(name = "后台-保安用户") -@JsonBody -@RequestMapping("/managementSecurityUnitUser") -@CheckUserType(userTypes = UserType.MANAGEMENT_SECURITY) -public class ManagementSecurityUnitUserController { - - @Autowired - private ManagementSecurityUnitUserService managementSecurityUnitUserService; - - @Operation(summary = "新增或修改") - @PostMapping("/saveOrUpdate") - public void saveOrUpdate(@RequestBody @Valid ManagementSecurityUnitUserSaveOrUpdateParams saveOrUpdateParams) { - managementSecurityUnitUserService.saveOrUpdate(saveOrUpdateParams); - } - - @Operation(summary = "分页查询") - @PostMapping("/pager") - public Page pager(@RequestBody PageParams queryParams) { - return managementSecurityUnitUserService.pager(queryParams); - } - - @DeleteMapping("/deleteById") - public void deleteById(@RequestParam @Schema(description = "后台保安用户id") Long managementSecurityUnitUserId) { - managementSecurityUnitUserService.deleteById(managementSecurityUnitUserId); - } -} diff --git a/policeSecurityServer/src/main/java/com/changhu/module/management/controller/ManagementSuperUserController.java b/policeSecurityServer/src/main/java/com/changhu/module/management/controller/ManagementSuperUserController.java deleted file mode 100644 index c8ced94..0000000 --- a/policeSecurityServer/src/main/java/com/changhu/module/management/controller/ManagementSuperUserController.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.changhu.module.management.controller; - -import com.changhu.common.annotation.JsonBody; -import com.changhu.module.management.pojo.params.ManagementSuperUserSaveOrUpdateParams; -import com.changhu.module.management.service.ManagementSuperUserService; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.tags.Tag; -import jakarta.validation.Valid; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; - -/** - * @author 20252 - * @createTime 2024/8/28 下午5:12 - * @desc 超级后台用户控制器 - */ -@Tag(name = "后台用户-超级后台") -@JsonBody -@RequestMapping("/managementSuperUser") -public class ManagementSuperUserController { - - @Autowired - private ManagementSuperUserService managementSuperUserService; - - @Operation(summary = "新增或保存") - @PostMapping("/saveOrUpdate") - public void saveOrUpdate(@RequestBody @Valid ManagementSuperUserSaveOrUpdateParams params) { - managementSuperUserService.saveOrUpdate(params); - } -} diff --git a/policeSecurityServer/src/main/java/com/changhu/module/management/controller/PoliceController.java b/policeSecurityServer/src/main/java/com/changhu/module/management/controller/PoliceController.java new file mode 100644 index 0000000..dcf3512 --- /dev/null +++ b/policeSecurityServer/src/main/java/com/changhu/module/management/controller/PoliceController.java @@ -0,0 +1,58 @@ +package com.changhu.module.management.controller; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.changhu.common.annotation.CheckUserType; +import com.changhu.common.annotation.JsonBody; +import com.changhu.common.annotation.UserType; +import com.changhu.module.management.pojo.params.ManagementPoliceUserSaveOrUpdateParams; +import com.changhu.module.management.pojo.queryParams.ManagementPoliceUnitUserPagerQueryParams; +import com.changhu.module.management.pojo.queryParams.PoliceEnterprisesUnitPagerQueryParams; +import com.changhu.module.management.pojo.vo.ManagementPoliceUnitUserPagerVo; +import com.changhu.module.management.pojo.vo.PoliceEnterprisesUnitPagerVo; +import com.changhu.module.management.service.PoliceService; +import com.changhu.support.mybatisplus.pojo.params.PageParams; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.media.Schema; +import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.validation.Valid; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +/** + * @author 20252 + * @createTime 2024/9/11 上午9:39 + * @desc PoliceController... + */ +@Tag(name = "后台-公安") +@JsonBody +@RequestMapping("/management/police") +@CheckUserType(userTypes = UserType.MANAGEMENT_POLICE) +public class PoliceController { + + @Autowired + private PoliceService policeService; + + @Operation(summary = "新增或保存后台用户") + @PostMapping("/user/saveOrUpdate") + public void userSaveOrUpdate(@RequestBody @Valid ManagementPoliceUserSaveOrUpdateParams params) { + policeService.userSaveOrUpdate(params); + } + + @Operation(summary = "分页查询后台用户") + @PostMapping("/user/pager") + public Page userPager(@RequestBody PageParams queryParams) { + return policeService.userPager(queryParams); + } + + @Operation(summary = "根据id删除后台用户") + @DeleteMapping("/user/deleteById") + public void userDeleteById(@RequestParam @Schema(description = "后台公安用户id") Long managementPoliceUnitUserId) { + policeService.userDeleteById(managementPoliceUnitUserId); + } + + @Operation(summary = "公安单位下的企事业单位分页") + @PostMapping("/enterprisesUnitPager") + public Page enterprisesUnitPager(@RequestBody PageParams queryParams) { + return policeService.enterprisesUnitPager(queryParams); + } +} diff --git a/policeSecurityServer/src/main/java/com/changhu/module/management/controller/PoliceUnitController.java b/policeSecurityServer/src/main/java/com/changhu/module/management/controller/PoliceUnitController.java deleted file mode 100644 index 0d30c78..0000000 --- a/policeSecurityServer/src/main/java/com/changhu/module/management/controller/PoliceUnitController.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.changhu.module.management.controller; - -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.changhu.common.annotation.CheckUserType; -import com.changhu.common.annotation.JsonBody; -import com.changhu.common.annotation.UserType; -import com.changhu.module.management.pojo.queryParams.PoliceEnterprisesUnitPagerQueryParams; -import com.changhu.module.management.pojo.queryParams.PoliceUnitPagerQueryParams; -import com.changhu.module.management.pojo.vo.PoliceEnterprisesUnitPagerVo; -import com.changhu.module.management.pojo.vo.PoliceUnitPagerVo; -import com.changhu.module.management.service.PoliceUnitService; -import com.changhu.support.mybatisplus.pojo.params.PageParams; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.tags.Tag; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; - -/** - * @author 20252 - * @createTime 2024/8/30 下午3:45 - * @desc PoliceUnitController... - */ -@Tag(name = "单位-公安") -@JsonBody -@RequestMapping("/policeUnit") -public class PoliceUnitController { - - @Autowired - private PoliceUnitService policeUnitService; - - @Operation(summary = "分页查询") - @PostMapping("/pager") - public Page pager(@RequestBody PageParams queryParams) { - return policeUnitService.pager(queryParams); - } - - @Operation(summary = "公安单位下的企事业单位分页") - @PostMapping("/policeEnterprisesUnitPager") - @CheckUserType(userTypes = UserType.MANAGEMENT_POLICE) - public Page policeEnterprisesUnitPager(@RequestBody PageParams queryParams) { - return policeUnitService.policeEnterprisesUnitPager(queryParams); - } - -} diff --git a/policeSecurityServer/src/main/java/com/changhu/module/management/controller/SecurityController.java b/policeSecurityServer/src/main/java/com/changhu/module/management/controller/SecurityController.java new file mode 100644 index 0000000..3daec7d --- /dev/null +++ b/policeSecurityServer/src/main/java/com/changhu/module/management/controller/SecurityController.java @@ -0,0 +1,59 @@ +package com.changhu.module.management.controller; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.changhu.common.annotation.CheckUserType; +import com.changhu.common.annotation.JsonBody; +import com.changhu.common.annotation.UserType; +import com.changhu.common.pojo.vo.SelectNodeVo; +import com.changhu.module.management.pojo.params.ManagementSecurityUnitUserSaveOrUpdateParams; +import com.changhu.module.management.pojo.queryParams.ManagementSecurityUnitUserPagerQueryParams; +import com.changhu.module.management.pojo.vo.ManagementSecurityUnitUserPagerVo; +import com.changhu.module.management.service.SecurityService; +import com.changhu.support.mybatisplus.pojo.params.PageParams; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.media.Schema; +import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.validation.Valid; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * @author 20252 + * @createTime 2024/9/11 上午9:39 + * @desc SecurityController... + */ +@Tag(name = "后台-保安") +@JsonBody +@RequestMapping("/management/security") +@CheckUserType(userTypes = UserType.MANAGEMENT_SECURITY) +public class SecurityController { + + @Autowired + private SecurityService securityService; + + @Operation(summary = "新增或修改后台用户") + @PostMapping("/user/saveOrUpdate") + public void userSaveOrUpdate(@RequestBody @Valid ManagementSecurityUnitUserSaveOrUpdateParams saveOrUpdateParams) { + securityService.userSaveOrUpdate(saveOrUpdateParams); + } + + @Operation(summary = "分页查询后台用户") + @PostMapping("/user/pager") + public Page userPager(@RequestBody PageParams queryParams) { + return securityService.userPager(queryParams); + } + + @Operation(summary = "根据id删除后台用户") + @DeleteMapping("/user/deleteById") + public void userDeleteById(@RequestParam @Schema(description = "后台保安用户id") Long managementSecurityUnitUserId) { + securityService.userDeleteById(managementSecurityUnitUserId); + } + + @Operation(summary = "查询单位下的项目经理") + @GetMapping("/listProjectManager") + public List> listProjectManager() { + return securityService.listProjectManager(); + } +} diff --git a/policeSecurityServer/src/main/java/com/changhu/module/management/controller/SecurityUnitController.java b/policeSecurityServer/src/main/java/com/changhu/module/management/controller/SecurityUnitController.java deleted file mode 100644 index 8b50174..0000000 --- a/policeSecurityServer/src/main/java/com/changhu/module/management/controller/SecurityUnitController.java +++ /dev/null @@ -1,56 +0,0 @@ -package com.changhu.module.management.controller; - -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.changhu.common.annotation.CheckUserType; -import com.changhu.common.annotation.JsonBody; -import com.changhu.common.annotation.UserType; -import com.changhu.common.pojo.vo.SelectNodeVo; -import com.changhu.module.management.pojo.params.SecurityUnitSaveOrUpdateParams; -import com.changhu.module.management.pojo.queryParams.SecurityUnitPagerQueryParams; -import com.changhu.module.management.pojo.vo.SecurityUnitPagerVo; -import com.changhu.module.management.service.SecurityUnitService; -import com.changhu.support.mybatisplus.pojo.params.PageParams; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.tags.Tag; -import jakarta.validation.Valid; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; - -import java.util.List; - -/** - * @author 20252 - * @createTime 2024/8/30 上午10:46 - * @desc SecurityUnitController... - */ -@Tag(name = "单位-保安") -@JsonBody -@RequestMapping("/securityUnit") -public class SecurityUnitController { - - @Autowired - private SecurityUnitService securityUnitService; - - @Operation(summary = "分页查询") - @PostMapping("/pager") - public Page pager(@RequestBody PageParams queryParams) { - return securityUnitService.pager(queryParams); - } - - @Operation(summary = "新增或修改") - @PostMapping("/saveOrUpdate") - public void saveOrUpdate(@RequestBody @Valid SecurityUnitSaveOrUpdateParams params) { - securityUnitService.saveOrUpdate(params); - } - - @Operation(summary = "查询单位下的项目经理") - @GetMapping("/listProjectManager") - @CheckUserType(userTypes = UserType.MANAGEMENT_SECURITY) - public List> listProjectManager() { - return securityUnitService.listProjectManager(); - } - -} diff --git a/policeSecurityServer/src/main/java/com/changhu/module/management/controller/SuperController.java b/policeSecurityServer/src/main/java/com/changhu/module/management/controller/SuperController.java new file mode 100644 index 0000000..acee393 --- /dev/null +++ b/policeSecurityServer/src/main/java/com/changhu/module/management/controller/SuperController.java @@ -0,0 +1,54 @@ +package com.changhu.module.management.controller; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.changhu.common.annotation.CheckUserType; +import com.changhu.common.annotation.JsonBody; +import com.changhu.common.annotation.UserType; +import com.changhu.module.management.pojo.params.ManagementSuperUserSaveOrUpdateParams; +import com.changhu.module.management.pojo.queryParams.PoliceUnitPagerQueryParams; +import com.changhu.module.management.pojo.queryParams.SecurityUnitPagerQueryParams; +import com.changhu.module.management.pojo.vo.PoliceUnitPagerVo; +import com.changhu.module.management.pojo.vo.SecurityUnitPagerVo; +import com.changhu.module.management.service.SuperService; +import com.changhu.support.mybatisplus.pojo.params.PageParams; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.validation.Valid; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; + +/** + * @author 20252 + * @createTime 2024/9/11 上午9:38 + * @desc ManagementSuperController... + */ +@Tag(name = "超级后台") +@JsonBody +@RequestMapping("/management/super") +@CheckUserType(userTypes = UserType.MANAGEMENT_SUPER) +public class SuperController { + + @Autowired + private SuperService superService; + + @Operation(summary = "新增或保存后台用户") + @PostMapping("/saveOrUpdateUser") + public void saveOrUpdateUser(@RequestBody @Valid ManagementSuperUserSaveOrUpdateParams params) { + superService.saveOrUpdateUser(params); + } + + @Operation(summary = "公安单位分页查询") + @PostMapping("/policeUnit/pager") + public Page policeUnitPager(@RequestBody PageParams queryParams) { + return superService.policeUnitPager(queryParams); + } + + @Operation(summary = "保安单位分页查询") + @PostMapping("/securityUnit/pager") + public Page securityUnitPager(@RequestBody PageParams queryParams) { + return superService.securityUnitPager(queryParams); + } + +} diff --git a/policeSecurityServer/src/main/java/com/changhu/module/management/enums/handler/PoliceUnitTypeHandler.java b/policeSecurityServer/src/main/java/com/changhu/module/management/enums/handler/PoliceUnitTypeHandler.java index 19ffc09..0f1c7df 100644 --- a/policeSecurityServer/src/main/java/com/changhu/module/management/enums/handler/PoliceUnitTypeHandler.java +++ b/policeSecurityServer/src/main/java/com/changhu/module/management/enums/handler/PoliceUnitTypeHandler.java @@ -3,10 +3,7 @@ package com.changhu.module.management.enums.handler; import cn.hutool.core.util.RandomUtil; import cn.hutool.core.util.StrUtil; import cn.hutool.extra.spring.SpringUtil; -import com.changhu.common.db.enums.CheckStatus; -import com.changhu.common.db.enums.IsEnable; -import com.changhu.common.db.enums.IsOrNot; -import com.changhu.common.db.enums.Sex; +import com.changhu.common.db.enums.*; import com.changhu.common.enums.ResultCode; import com.changhu.common.exception.MessageException; import com.changhu.common.utils.UserUtil; @@ -15,6 +12,8 @@ import com.changhu.module.management.pojo.entity.PoliceUnit; import com.changhu.module.management.pojo.vo.UnitCheckStatusVo; import com.changhu.module.management.service.ManagementPoliceUnitUserService; import com.changhu.module.management.service.PoliceUnitService; +import com.changhu.module.miniProgram.pojo.entity.MiniProgramUser; +import com.changhu.module.miniProgram.service.MiniProgramUserService; import com.changhu.support.mybatisplus.pojo.entity.BaseEntity; import lombok.extern.slf4j.Slf4j; import org.springframework.transaction.TransactionStatus; @@ -35,6 +34,8 @@ public class PoliceUnitTypeHandler extends AbstractUnitTypeHandler { private final ManagementPoliceUnitUserService policeUnitUserService = SpringUtil.getBean(ManagementPoliceUnitUserService.class); + private final MiniProgramUserService miniProgramUserService = SpringUtil.getBean(MiniProgramUserService.class); + @Override public void pass(Long checkDataId) { DefaultTransactionDefinition def = new DefaultTransactionDefinition(); @@ -127,11 +128,36 @@ public class PoliceUnitTypeHandler extends AbstractUnitTypeHandler { @Override public void passMiniProgramUser(Long miniProgramUserId) { - + boolean update = miniProgramUserService.lambdaUpdate() + .set(MiniProgramUser::getCheckStatus, CheckStatus.checked) + .eq(BaseEntity::getSnowFlakeId, miniProgramUserId) + .eq(MiniProgramUser::getIdentity, MiniProgramUserIdentity.POLICE) + .update(); + if (!update) { + throw new MessageException(); + } } @Override public void disableOrEnableMiniProgramUser(Long miniProgramUserId) { + MiniProgramUser miniProgramUser = miniProgramUserService.lambdaQuery() + .eq(BaseEntity::getSnowFlakeId, miniProgramUserId) + .eq(MiniProgramUser::getIdentity, MiniProgramUserIdentity.POLICE) + .oneOpt() + .orElseThrow(() -> new MessageException(ResultCode.DATA_NOT_FOUND)); + //取反 + IsEnable isEnable = switch (miniProgramUser.getIsEnable()) { + case TRUE -> IsEnable.FALSE; + case FALSE -> IsEnable.TRUE; + }; + + boolean update = miniProgramUserService.lambdaUpdate() + .set(MiniProgramUser::getIsEnable, isEnable) + .eq(BaseEntity::getSnowFlakeId, miniProgramUserId) + .update(); + if (!update) { + throw new MessageException(); + } } } diff --git a/policeSecurityServer/src/main/java/com/changhu/module/management/enums/handler/SecurityUnitTypeHandler.java b/policeSecurityServer/src/main/java/com/changhu/module/management/enums/handler/SecurityUnitTypeHandler.java index ad23979..dd5aac8 100644 --- a/policeSecurityServer/src/main/java/com/changhu/module/management/enums/handler/SecurityUnitTypeHandler.java +++ b/policeSecurityServer/src/main/java/com/changhu/module/management/enums/handler/SecurityUnitTypeHandler.java @@ -3,10 +3,7 @@ package com.changhu.module.management.enums.handler; import cn.hutool.core.util.RandomUtil; import cn.hutool.core.util.StrUtil; import cn.hutool.extra.spring.SpringUtil; -import com.changhu.common.db.enums.CheckStatus; -import com.changhu.common.db.enums.IsEnable; -import com.changhu.common.db.enums.IsOrNot; -import com.changhu.common.db.enums.Sex; +import com.changhu.common.db.enums.*; import com.changhu.common.enums.ResultCode; import com.changhu.common.exception.MessageException; import com.changhu.common.utils.UserUtil; @@ -135,6 +132,7 @@ public class SecurityUnitTypeHandler extends AbstractUnitTypeHandler { boolean update = miniProgramUserService.lambdaUpdate() .set(MiniProgramUser::getCheckStatus, CheckStatus.checked) .eq(BaseEntity::getSnowFlakeId, miniProgramUserId) + .eq(MiniProgramUser::getIdentity, MiniProgramUserIdentity.PROJECT_MANAGER) .update(); if (!update) { throw new MessageException(); @@ -145,6 +143,7 @@ public class SecurityUnitTypeHandler extends AbstractUnitTypeHandler { public void disableOrEnableMiniProgramUser(Long miniProgramUserId) { MiniProgramUser miniProgramUser = miniProgramUserService.lambdaQuery() .eq(BaseEntity::getSnowFlakeId, miniProgramUserId) + .eq(MiniProgramUser::getIdentity, MiniProgramUserIdentity.PROJECT_MANAGER) .oneOpt() .orElseThrow(() -> new MessageException(ResultCode.DATA_NOT_FOUND)); diff --git a/policeSecurityServer/src/main/java/com/changhu/module/management/mapper/ServiceProjectMapper.java b/policeSecurityServer/src/main/java/com/changhu/module/management/mapper/ServiceProjectMapper.java index bd25d7e..f1af734 100644 --- a/policeSecurityServer/src/main/java/com/changhu/module/management/mapper/ServiceProjectMapper.java +++ b/policeSecurityServer/src/main/java/com/changhu/module/management/mapper/ServiceProjectMapper.java @@ -5,9 +5,12 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.changhu.module.management.pojo.entity.ServiceProject; import com.changhu.module.management.pojo.queryParams.ServiceProjectPagerQueryParams; import com.changhu.module.management.pojo.vo.ServiceProjectPagerVo; +import com.changhu.module.miniProgram.pojo.vo.IndexServiceProjectListVo; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; +import java.util.List; + /** * service_project (服务项目) 固化类 * author: luozhun @@ -25,4 +28,12 @@ public interface ServiceProjectMapper extends BaseMapper { */ Page pager(@Param("page") Page page, @Param("params") ServiceProjectPagerQueryParams params); + + /** + * 获取服务项目 + * + * @return 服务项目列表 + */ + List getServiceProjectList(@Param("policeUnitId") Long policeUnitId, + @Param("projectManagerMiniProgramUserId") Long projectManagerMiniProgramUserId); } diff --git a/policeSecurityServer/src/main/java/com/changhu/module/management/pojo/params/SecurityUnitSaveOrUpdateParams.java b/policeSecurityServer/src/main/java/com/changhu/module/management/pojo/params/SecurityUnitSaveOrUpdateParams.java deleted file mode 100644 index cc59f7c..0000000 --- a/policeSecurityServer/src/main/java/com/changhu/module/management/pojo/params/SecurityUnitSaveOrUpdateParams.java +++ /dev/null @@ -1,52 +0,0 @@ -package com.changhu.module.management.pojo.params; - -import com.changhu.common.db.enums.IsEnable; -import com.changhu.module.management.pojo.model.LegalPersonInfo; -import io.swagger.v3.oas.annotations.media.Schema; -import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.NotEmpty; -import lombok.Data; - -import java.util.List; - -/** - * @author 20252 - * @createTime 2024/8/30 下午3:07 - * @desc SecurityUnitSaveOrUpdateParams... - */ -@Data -public class SecurityUnitSaveOrUpdateParams { - @Schema(description = "id") - private Long snowFlakeId; - - @NotBlank(message = "名字不能为空") - @Schema(description = "名称") - private String name; - - @NotBlank(message = "社会编码不能为空") - @Schema(description = "社会编码") - private String socialCode; - - @NotBlank(message = "营业执照不能为空") - @Schema(description = "营业执照") - private String businessLicense; - - @NotBlank(message = "法人信息不能为空") - @Schema(description = "法人信息") - private LegalPersonInfo legalPersonInfo; - - @NotBlank(message = "公司性质不能为空") - @Schema(description = "性质") - private String nature; - - @NotEmpty(message = "行政区划不能为空") - @Schema(description = "行政区划编码") - private List administrativeDivisionCodes; - - @NotBlank(message = "详细地址不能为空") - @Schema(description = "详细地址") - private String address; - - @Schema(description = "是否启用") - private IsEnable isEnable; -} diff --git a/policeSecurityServer/src/main/java/com/changhu/module/management/service/ManagementPoliceUnitUserService.java b/policeSecurityServer/src/main/java/com/changhu/module/management/service/ManagementPoliceUnitUserService.java index 8651bcc..d70efca 100644 --- a/policeSecurityServer/src/main/java/com/changhu/module/management/service/ManagementPoliceUnitUserService.java +++ b/policeSecurityServer/src/main/java/com/changhu/module/management/service/ManagementPoliceUnitUserService.java @@ -1,12 +1,7 @@ package com.changhu.module.management.service; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.changhu.module.management.pojo.entity.ManagementPoliceUnitUser; -import com.changhu.module.management.pojo.params.ManagementPoliceUserSaveOrUpdateParams; -import com.changhu.module.management.pojo.queryParams.ManagementPoliceUnitUserPagerQueryParams; -import com.changhu.module.management.pojo.vo.ManagementPoliceUnitUserPagerVo; -import com.changhu.support.mybatisplus.pojo.params.PageParams; /** * management_police_user (后台-公安单位用户表) 服务类 @@ -15,25 +10,4 @@ import com.changhu.support.mybatisplus.pojo.params.PageParams; */ public interface ManagementPoliceUnitUserService extends IService { - /** - * 新增或者保持 - * - * @param params 参数 - */ - void saveOrUpdate(ManagementPoliceUserSaveOrUpdateParams params); - - /** - * 分页查询 - * - * @param queryParams 查询参数 - * @return 结果 - */ - Page pager(PageParams queryParams); - - /** - * 根据id删除 - * - * @param managementPoliceUnitUserId 后台公安用户id - */ - void deleteById(Long managementPoliceUnitUserId); } diff --git a/policeSecurityServer/src/main/java/com/changhu/module/management/service/ManagementSecurityUnitUserService.java b/policeSecurityServer/src/main/java/com/changhu/module/management/service/ManagementSecurityUnitUserService.java index e1466cd..bcee24a 100644 --- a/policeSecurityServer/src/main/java/com/changhu/module/management/service/ManagementSecurityUnitUserService.java +++ b/policeSecurityServer/src/main/java/com/changhu/module/management/service/ManagementSecurityUnitUserService.java @@ -1,12 +1,7 @@ package com.changhu.module.management.service; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.changhu.module.management.pojo.entity.ManagementSecurityUnitUser; -import com.changhu.module.management.pojo.params.ManagementSecurityUnitUserSaveOrUpdateParams; -import com.changhu.module.management.pojo.queryParams.ManagementSecurityUnitUserPagerQueryParams; -import com.changhu.module.management.pojo.vo.ManagementSecurityUnitUserPagerVo; -import com.changhu.support.mybatisplus.pojo.params.PageParams; /** * management_security_unit_user (后台-保安单位用户表) 服务类 @@ -15,25 +10,4 @@ import com.changhu.support.mybatisplus.pojo.params.PageParams; */ public interface ManagementSecurityUnitUserService extends IService { - /** - * 新增或者修改 - * - * @param saveOrUpdateParams 参数 - */ - void saveOrUpdate(ManagementSecurityUnitUserSaveOrUpdateParams saveOrUpdateParams); - - /** - * 分页查询 - * - * @param queryParams 查询参数 - * @return 分页结果 - */ - Page pager(PageParams queryParams); - - /** - * 根据id删除 - * - * @param managementSecurityUnitUserId 后台保安用户id - */ - void deleteById(Long managementSecurityUnitUserId); } diff --git a/policeSecurityServer/src/main/java/com/changhu/module/management/service/ManagementSuperUserService.java b/policeSecurityServer/src/main/java/com/changhu/module/management/service/ManagementSuperUserService.java index 12ba3b7..90d8e43 100644 --- a/policeSecurityServer/src/main/java/com/changhu/module/management/service/ManagementSuperUserService.java +++ b/policeSecurityServer/src/main/java/com/changhu/module/management/service/ManagementSuperUserService.java @@ -2,7 +2,6 @@ package com.changhu.module.management.service; import com.baomidou.mybatisplus.extension.service.IService; import com.changhu.module.management.pojo.entity.ManagementSuperUser; -import com.changhu.module.management.pojo.params.ManagementSuperUserSaveOrUpdateParams; /** * management_super_user (后台-超级后台) 服务类 @@ -11,10 +10,4 @@ import com.changhu.module.management.pojo.params.ManagementSuperUserSaveOrUpdate */ public interface ManagementSuperUserService extends IService { - /** - * 新增或保存 - * - * @param params 参数 - */ - void saveOrUpdate(ManagementSuperUserSaveOrUpdateParams params); } diff --git a/policeSecurityServer/src/main/java/com/changhu/module/management/service/PoliceService.java b/policeSecurityServer/src/main/java/com/changhu/module/management/service/PoliceService.java new file mode 100644 index 0000000..d1fac7a --- /dev/null +++ b/policeSecurityServer/src/main/java/com/changhu/module/management/service/PoliceService.java @@ -0,0 +1,46 @@ +package com.changhu.module.management.service; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.changhu.module.management.pojo.params.ManagementPoliceUserSaveOrUpdateParams; +import com.changhu.module.management.pojo.queryParams.ManagementPoliceUnitUserPagerQueryParams; +import com.changhu.module.management.pojo.queryParams.PoliceEnterprisesUnitPagerQueryParams; +import com.changhu.module.management.pojo.vo.ManagementPoliceUnitUserPagerVo; +import com.changhu.module.management.pojo.vo.PoliceEnterprisesUnitPagerVo; +import com.changhu.support.mybatisplus.pojo.params.PageParams; + +/** + * @author 20252 + * @createTime 2024/9/11 上午9:59 + * @desc MPoliceService... + */ +public interface PoliceService { + /** + * 新增或保存后台用户 + * + * @param params 参数 + */ + void userSaveOrUpdate(ManagementPoliceUserSaveOrUpdateParams params); + + /** + * 后台用户分页查询 + * + * @param queryParams 查询参数 + * @return 结果 + */ + Page userPager(PageParams queryParams); + + /** + * 根据id删除后台用户 + * + * @param managementPoliceUnitUserId 后台用户id + */ + void userDeleteById(Long managementPoliceUnitUserId); + + /** + * 公安单位下的企事业单位分页 + * + * @param queryParams 查询参数 + * @return 结果 + */ + Page enterprisesUnitPager(PageParams queryParams); +} diff --git a/policeSecurityServer/src/main/java/com/changhu/module/management/service/PoliceUnitService.java b/policeSecurityServer/src/main/java/com/changhu/module/management/service/PoliceUnitService.java index 89efd8b..5ebe889 100644 --- a/policeSecurityServer/src/main/java/com/changhu/module/management/service/PoliceUnitService.java +++ b/policeSecurityServer/src/main/java/com/changhu/module/management/service/PoliceUnitService.java @@ -1,13 +1,7 @@ package com.changhu.module.management.service; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.changhu.module.management.pojo.entity.PoliceUnit; -import com.changhu.module.management.pojo.queryParams.PoliceEnterprisesUnitPagerQueryParams; -import com.changhu.module.management.pojo.queryParams.PoliceUnitPagerQueryParams; -import com.changhu.module.management.pojo.vo.PoliceEnterprisesUnitPagerVo; -import com.changhu.module.management.pojo.vo.PoliceUnitPagerVo; -import com.changhu.support.mybatisplus.pojo.params.PageParams; /** * police_unit (公安单位) 服务类 @@ -16,19 +10,5 @@ import com.changhu.support.mybatisplus.pojo.params.PageParams; */ public interface PoliceUnitService extends IService { - /** - * 分页查询 - * - * @param queryParams 查询参数 - * @return 结果 - */ - Page pager(PageParams queryParams); - /** - * 公安单位下的企事业单位分页 - * - * @param queryParams 查询参数 - * @return 结果 - */ - Page policeEnterprisesUnitPager(PageParams queryParams); } diff --git a/policeSecurityServer/src/main/java/com/changhu/module/management/service/SecurityService.java b/policeSecurityServer/src/main/java/com/changhu/module/management/service/SecurityService.java new file mode 100644 index 0000000..fde7bda --- /dev/null +++ b/policeSecurityServer/src/main/java/com/changhu/module/management/service/SecurityService.java @@ -0,0 +1,46 @@ +package com.changhu.module.management.service; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.changhu.common.pojo.vo.SelectNodeVo; +import com.changhu.module.management.pojo.params.ManagementSecurityUnitUserSaveOrUpdateParams; +import com.changhu.module.management.pojo.queryParams.ManagementSecurityUnitUserPagerQueryParams; +import com.changhu.module.management.pojo.vo.ManagementSecurityUnitUserPagerVo; +import com.changhu.support.mybatisplus.pojo.params.PageParams; + +import java.util.List; + +/** + * @author 20252 + * @createTime 2024/9/11 上午10:17 + * @desc SecurityService... + */ +public interface SecurityService { + /** + * 新增或修改后台用户 + * + * @param saveOrUpdateParams 参数 + */ + void userSaveOrUpdate(ManagementSecurityUnitUserSaveOrUpdateParams saveOrUpdateParams); + + /** + * 分页查询后台用户 + * + * @param queryParams 分页查询后台用户 + * @return 结果 + */ + Page userPager(PageParams queryParams); + + /** + * 根据id删除后台用户 + * + * @param managementSecurityUnitUserId 用户id + */ + void userDeleteById(Long managementSecurityUnitUserId); + + /** + * 查询单位下的项目经理 + * + * @return 项目经理 + */ + List> listProjectManager(); +} diff --git a/policeSecurityServer/src/main/java/com/changhu/module/management/service/SecurityUnitService.java b/policeSecurityServer/src/main/java/com/changhu/module/management/service/SecurityUnitService.java index 138dafa..cc3b160 100644 --- a/policeSecurityServer/src/main/java/com/changhu/module/management/service/SecurityUnitService.java +++ b/policeSecurityServer/src/main/java/com/changhu/module/management/service/SecurityUnitService.java @@ -1,15 +1,7 @@ package com.changhu.module.management.service; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; -import com.changhu.common.pojo.vo.SelectNodeVo; import com.changhu.module.management.pojo.entity.SecurityUnit; -import com.changhu.module.management.pojo.params.SecurityUnitSaveOrUpdateParams; -import com.changhu.module.management.pojo.queryParams.SecurityUnitPagerQueryParams; -import com.changhu.module.management.pojo.vo.SecurityUnitPagerVo; -import com.changhu.support.mybatisplus.pojo.params.PageParams; - -import java.util.List; /** * security_unit (保安单位) 服务类 @@ -18,25 +10,4 @@ import java.util.List; */ public interface SecurityUnitService extends IService { - /** - * 分页查询 - * - * @param queryParams 查询参数 - * @return 结果 - */ - Page pager(PageParams queryParams); - - /** - * 新增或修改保安单位 - * - * @param params 参数 - */ - void saveOrUpdate(SecurityUnitSaveOrUpdateParams params); - - /** - * 查询单位下的项目经理 - * - * @return 项目经理 - */ - List> listProjectManager(); } diff --git a/policeSecurityServer/src/main/java/com/changhu/module/management/service/SuperService.java b/policeSecurityServer/src/main/java/com/changhu/module/management/service/SuperService.java new file mode 100644 index 0000000..abf8694 --- /dev/null +++ b/policeSecurityServer/src/main/java/com/changhu/module/management/service/SuperService.java @@ -0,0 +1,40 @@ +package com.changhu.module.management.service; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.changhu.module.management.pojo.params.ManagementSuperUserSaveOrUpdateParams; +import com.changhu.module.management.pojo.queryParams.PoliceUnitPagerQueryParams; +import com.changhu.module.management.pojo.queryParams.SecurityUnitPagerQueryParams; +import com.changhu.module.management.pojo.vo.PoliceUnitPagerVo; +import com.changhu.module.management.pojo.vo.SecurityUnitPagerVo; +import com.changhu.support.mybatisplus.pojo.params.PageParams; +import org.apache.ibatis.annotations.Param; + +/** + * @author 20252 + * @createTime 2024/9/11 上午9:52 + * @desc SuperService... + */ +public interface SuperService { + /** + * 新增或保存后台用户 + * + * @param params 参数 + */ + void saveOrUpdateUser(ManagementSuperUserSaveOrUpdateParams params); + + /** + * 公安单位分页查询 + * + * @param queryParams 查询参数 + * @return 结果 + */ + Page policeUnitPager(@Param("queryParams") PageParams queryParams); + + /** + * 保安单位分页查询 + * + * @param queryParams 查询参数 + * @return 结果 + */ + Page securityUnitPager(PageParams queryParams); +} diff --git a/policeSecurityServer/src/main/java/com/changhu/module/management/service/impl/ManagementPoliceUnitUserServiceImpl.java b/policeSecurityServer/src/main/java/com/changhu/module/management/service/impl/ManagementPoliceUnitUserServiceImpl.java index 072a0f3..3d6d0e5 100644 --- a/policeSecurityServer/src/main/java/com/changhu/module/management/service/impl/ManagementPoliceUnitUserServiceImpl.java +++ b/policeSecurityServer/src/main/java/com/changhu/module/management/service/impl/ManagementPoliceUnitUserServiceImpl.java @@ -1,25 +1,11 @@ package com.changhu.module.management.service.impl; -import cn.hutool.core.bean.BeanUtil; -import cn.hutool.core.util.RandomUtil; -import cn.hutool.core.util.StrUtil; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.changhu.common.enums.ResultCode; -import com.changhu.common.exception.MessageException; -import com.changhu.common.utils.UserUtil; import com.changhu.module.management.mapper.ManagementPoliceUnitUserMapper; import com.changhu.module.management.pojo.entity.ManagementPoliceUnitUser; -import com.changhu.module.management.pojo.params.ManagementPoliceUserSaveOrUpdateParams; -import com.changhu.module.management.pojo.queryParams.ManagementPoliceUnitUserPagerQueryParams; -import com.changhu.module.management.pojo.vo.ManagementPoliceUnitUserPagerVo; import com.changhu.module.management.service.ManagementPoliceUnitUserService; -import com.changhu.support.mybatisplus.pojo.entity.BaseEntity; -import com.changhu.support.mybatisplus.pojo.params.PageParams; import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; -import java.util.List; /** * management_police_user (后台-公安单位用户表) 服务实现类 @@ -29,58 +15,4 @@ import java.util.List; @Service public class ManagementPoliceUnitUserServiceImpl extends ServiceImpl implements ManagementPoliceUnitUserService { - @Transactional(rollbackFor = Exception.class) - @Override - public void saveOrUpdate(ManagementPoliceUserSaveOrUpdateParams params) { - //查看手机号是否存在 - boolean exists = this.lambdaQuery() - .ne(params.getSnowFlakeId() != null, BaseEntity::getSnowFlakeId, params.getSnowFlakeId()) - .eq(ManagementPoliceUnitUser::getTelephone, params.getTelephone()) - .exists(); - if (exists) { - throw new MessageException("该手机号已存在"); - } - ManagementPoliceUnitUser managementPoliceUnitUser = BeanUtil.copyProperties(params, ManagementPoliceUnitUser.class); - //新增 补全信息 - if (managementPoliceUnitUser.getSnowFlakeId() == null) { - String account = RandomUtil.randomString(6); - boolean accExits = this.lambdaQuery().eq(ManagementPoliceUnitUser::getAccount, account).exists(); - if (accExits) { - throw new MessageException("生成的账号已存在 请重新提交生成"); - } - //生成账号 - managementPoliceUnitUser.setAccount(account); - //补全单位 - managementPoliceUnitUser.setPoliceUnitId(UserUtil.getUnitId()); - //生成密码 - String passWordEncrypt = UserUtil.passWordEncrypt(UserUtil.DEFAULT_PASSWORD); - List saltAndPassWord = StrUtil.split(passWordEncrypt, "$$"); - managementPoliceUnitUser.setSalt(saltAndPassWord.get(0)); - managementPoliceUnitUser.setPassword(saltAndPassWord.get(1)); - } - this.saveOrUpdate(managementPoliceUnitUser); - } - - @Override - public Page pager(PageParams queryParams) { - return baseMapper.pager(queryParams.getPage(), queryParams.getParams()); - } - - @Override - public void deleteById(Long managementPoliceUnitUserId) { - Long unitId = UserUtil.getUnitId(); - Long l = this.lambdaQuery() - .eq(BaseEntity::getSnowFlakeId, managementPoliceUnitUserId) - .oneOpt() - .map(ManagementPoliceUnitUser::getPoliceUnitId) - .orElseThrow(() -> new MessageException(ResultCode.USER_NOT_FOUND)); - if (!unitId.equals(l)) { - throw new MessageException("单位不匹配,无权操作"); - } - boolean b = this.removeById(managementPoliceUnitUserId); - if (!b) { - throw new MessageException(); - } - - } } diff --git a/policeSecurityServer/src/main/java/com/changhu/module/management/service/impl/ManagementSecurityUnitUserServiceImpl.java b/policeSecurityServer/src/main/java/com/changhu/module/management/service/impl/ManagementSecurityUnitUserServiceImpl.java index 23f7dd6..38a4fc6 100644 --- a/policeSecurityServer/src/main/java/com/changhu/module/management/service/impl/ManagementSecurityUnitUserServiceImpl.java +++ b/policeSecurityServer/src/main/java/com/changhu/module/management/service/impl/ManagementSecurityUnitUserServiceImpl.java @@ -1,26 +1,10 @@ package com.changhu.module.management.service.impl; -import cn.hutool.core.bean.BeanUtil; -import cn.hutool.core.util.RandomUtil; -import cn.hutool.core.util.StrUtil; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.changhu.common.annotation.UserType; -import com.changhu.common.enums.ResultCode; -import com.changhu.common.exception.MessageException; -import com.changhu.common.utils.UserUtil; import com.changhu.module.management.mapper.ManagementSecurityUnitUserMapper; import com.changhu.module.management.pojo.entity.ManagementSecurityUnitUser; -import com.changhu.module.management.pojo.params.ManagementSecurityUnitUserSaveOrUpdateParams; -import com.changhu.module.management.pojo.queryParams.ManagementSecurityUnitUserPagerQueryParams; -import com.changhu.module.management.pojo.vo.ManagementSecurityUnitUserPagerVo; import com.changhu.module.management.service.ManagementSecurityUnitUserService; -import com.changhu.support.mybatisplus.pojo.entity.BaseEntity; -import com.changhu.support.mybatisplus.pojo.params.PageParams; import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.util.List; /** * management_security_unit_user (后台-保安单位用户表) 服务实现类 @@ -30,63 +14,4 @@ import java.util.List; @Service public class ManagementSecurityUnitUserServiceImpl extends ServiceImpl implements ManagementSecurityUnitUserService { - @Transactional(rollbackFor = Exception.class) - @Override - public void saveOrUpdate(ManagementSecurityUnitUserSaveOrUpdateParams saveOrUpdateParams) { - //查看手机号是否已存在 - boolean exists = this.lambdaQuery() - .ne(saveOrUpdateParams.getSnowFlakeId() != null, BaseEntity::getSnowFlakeId, saveOrUpdateParams.getSnowFlakeId()) - .eq(ManagementSecurityUnitUser::getTelephone, saveOrUpdateParams.getTelephone()) - .exists(); - if (exists) { - throw new MessageException("该手机号已存在"); - } - - ManagementSecurityUnitUser managementSecurityUnitUser = BeanUtil.copyProperties(saveOrUpdateParams, ManagementSecurityUnitUser.class); - //新增 需要补全一些信息 - if (managementSecurityUnitUser.getSnowFlakeId() == null) { - String account = RandomUtil.randomString(6); - boolean accExits = this.lambdaQuery() - .eq(ManagementSecurityUnitUser::getAccount, account) - .exists(); - if (accExits) { - throw new MessageException("生成的账号已存在 请重新提交生成"); - } - //生成账号 - managementSecurityUnitUser.setAccount(account); - if (!UserType.MANAGEMENT_SECURITY.equals(UserUtil.getUserType())) { - throw new MessageException("客户端类型不对"); - } - //补全单位 - managementSecurityUnitUser.setSecurityUnitId(UserUtil.getUnitId()); - //生成密码 - String passWordEncrypt = UserUtil.passWordEncrypt(UserUtil.DEFAULT_PASSWORD); - List saltAndPassWord = StrUtil.split(passWordEncrypt, "$$"); - managementSecurityUnitUser.setSalt(saltAndPassWord.get(0)); - managementSecurityUnitUser.setPassword(saltAndPassWord.get(1)); - } - this.saveOrUpdate(managementSecurityUnitUser); - } - - @Override - public Page pager(PageParams queryParams) { - return baseMapper.pager(queryParams.getPage(), queryParams.getParams()); - } - - @Override - public void deleteById(Long managementSecurityUnitUserId) { - Long unitId = UserUtil.getUnitId(); - Long l = this.lambdaQuery() - .eq(BaseEntity::getSnowFlakeId, managementSecurityUnitUserId) - .oneOpt() - .map(ManagementSecurityUnitUser::getSecurityUnitId) - .orElseThrow(() -> new MessageException(ResultCode.USER_NOT_FOUND)); - if (!unitId.equals(l)) { - throw new MessageException("单位不匹配,无权操作"); - } - boolean b = this.removeById(managementSecurityUnitUserId); - if (!b) { - throw new MessageException(); - } - } } diff --git a/policeSecurityServer/src/main/java/com/changhu/module/management/service/impl/ManagementSuperUserServiceImpl.java b/policeSecurityServer/src/main/java/com/changhu/module/management/service/impl/ManagementSuperUserServiceImpl.java index a90debf..501cab0 100644 --- a/policeSecurityServer/src/main/java/com/changhu/module/management/service/impl/ManagementSuperUserServiceImpl.java +++ b/policeSecurityServer/src/main/java/com/changhu/module/management/service/impl/ManagementSuperUserServiceImpl.java @@ -1,19 +1,11 @@ package com.changhu.module.management.service.impl; -import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.changhu.common.enums.ResultCode; -import com.changhu.common.exception.MessageException; -import com.changhu.common.utils.UserUtil; import com.changhu.module.management.mapper.ManagementSuperUserMapper; import com.changhu.module.management.pojo.entity.ManagementSuperUser; -import com.changhu.module.management.pojo.params.ManagementSuperUserSaveOrUpdateParams; import com.changhu.module.management.service.ManagementSuperUserService; import org.springframework.stereotype.Service; -import java.util.List; - /** * management_super_user (后台-超级后台) 服务实现类 * author: luozhun @@ -22,36 +14,4 @@ import java.util.List; @Service public class ManagementSuperUserServiceImpl extends ServiceImpl implements ManagementSuperUserService { - @Override - public void saveOrUpdate(ManagementSuperUserSaveOrUpdateParams params) { - //查看手机号是否存在 - boolean exists = this.lambdaQuery() - .eq(ManagementSuperUser::getTelephone, params.getTelephone()) - .exists(); - if (exists) { - throw new MessageException("手机号已注册"); - } - - //构建用户 - ManagementSuperUser managementSuperUser = ManagementSuperUser.builder() - .snowFlakeId(params.getSnowFlakeId()) - .name(params.getName()) - .telephone(params.getTelephone()) - .build(); - - //如果是新增需要初始化密码 - if (managementSuperUser.getSnowFlakeId() == null) { - //生成加密密码: salt$$uuid - String passWordEncrypt = UserUtil.passWordEncrypt(UserUtil.DEFAULT_PASSWORD); - List saltAndPassWord = StrUtil.split(passWordEncrypt, "$$"); - if (CollUtil.size(saltAndPassWord) != 2) { - throw new MessageException(ResultCode.ERROR); - } - managementSuperUser.setSalt(saltAndPassWord.get(0)); - managementSuperUser.setPassword(saltAndPassWord.get(1)); - } - - //保存到数据库 - this.saveOrUpdate(managementSuperUser); - } } diff --git a/policeSecurityServer/src/main/java/com/changhu/module/management/service/impl/PoliceServiceImpl.java b/policeSecurityServer/src/main/java/com/changhu/module/management/service/impl/PoliceServiceImpl.java new file mode 100644 index 0000000..821e5b4 --- /dev/null +++ b/policeSecurityServer/src/main/java/com/changhu/module/management/service/impl/PoliceServiceImpl.java @@ -0,0 +1,100 @@ +package com.changhu.module.management.service.impl; + +import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.util.RandomUtil; +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.toolkit.Db; +import com.changhu.common.enums.ResultCode; +import com.changhu.common.exception.MessageException; +import com.changhu.common.utils.UserUtil; +import com.changhu.module.management.mapper.EnterprisesUnitMapper; +import com.changhu.module.management.mapper.ManagementPoliceUnitUserMapper; +import com.changhu.module.management.pojo.entity.ManagementPoliceUnitUser; +import com.changhu.module.management.pojo.params.ManagementPoliceUserSaveOrUpdateParams; +import com.changhu.module.management.pojo.queryParams.ManagementPoliceUnitUserPagerQueryParams; +import com.changhu.module.management.pojo.queryParams.PoliceEnterprisesUnitPagerQueryParams; +import com.changhu.module.management.pojo.vo.ManagementPoliceUnitUserPagerVo; +import com.changhu.module.management.pojo.vo.PoliceEnterprisesUnitPagerVo; +import com.changhu.module.management.service.PoliceService; +import com.changhu.support.mybatisplus.pojo.entity.BaseEntity; +import com.changhu.support.mybatisplus.pojo.params.PageParams; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; + +/** + * @author 20252 + * @createTime 2024/9/11 上午9:59 + * @desc MPoliceServiceImpl... + */ +@Service +public class PoliceServiceImpl implements PoliceService { + + @Autowired + private ManagementPoliceUnitUserMapper managementPoliceUnitUserMapper; + + @Autowired + private EnterprisesUnitMapper enterprisesUnitMapper; + + @Transactional(rollbackFor = Exception.class) + @Override + public void userSaveOrUpdate(ManagementPoliceUserSaveOrUpdateParams params) { + //查看手机号是否存在 + boolean exists = Db.lambdaQuery(ManagementPoliceUnitUser.class) + .ne(params.getSnowFlakeId() != null, BaseEntity::getSnowFlakeId, params.getSnowFlakeId()) + .eq(ManagementPoliceUnitUser::getTelephone, params.getTelephone()) + .exists(); + if (exists) { + throw new MessageException("该手机号已存在"); + } + ManagementPoliceUnitUser managementPoliceUnitUser = BeanUtil.copyProperties(params, ManagementPoliceUnitUser.class); + //新增 补全信息 + if (managementPoliceUnitUser.getSnowFlakeId() == null) { + String account = RandomUtil.randomString(6); + boolean accExits = Db.lambdaQuery(ManagementPoliceUnitUser.class).eq(ManagementPoliceUnitUser::getAccount, account).exists(); + if (accExits) { + throw new MessageException("生成的账号已存在 请重新提交生成"); + } + //生成账号 + managementPoliceUnitUser.setAccount(account); + //补全单位 + managementPoliceUnitUser.setPoliceUnitId(UserUtil.getUnitId()); + //生成密码 + String passWordEncrypt = UserUtil.passWordEncrypt(UserUtil.DEFAULT_PASSWORD); + List saltAndPassWord = StrUtil.split(passWordEncrypt, "$$"); + managementPoliceUnitUser.setSalt(saltAndPassWord.get(0)); + managementPoliceUnitUser.setPassword(saltAndPassWord.get(1)); + } + Db.saveOrUpdate(managementPoliceUnitUser); + } + + @Override + public Page userPager(PageParams queryParams) { + return managementPoliceUnitUserMapper.pager(queryParams.getPage(), queryParams.getParams()); + } + + @Override + public void userDeleteById(Long managementPoliceUnitUserId) { + Long unitId = UserUtil.getUnitId(); + Long l = Db.lambdaQuery(ManagementPoliceUnitUser.class) + .eq(BaseEntity::getSnowFlakeId, managementPoliceUnitUserId) + .oneOpt() + .map(ManagementPoliceUnitUser::getPoliceUnitId) + .orElseThrow(() -> new MessageException(ResultCode.USER_NOT_FOUND)); + if (!unitId.equals(l)) { + throw new MessageException("单位不匹配,无权操作"); + } + boolean b = Db.removeById(managementPoliceUnitUserId, ManagementPoliceUnitUser.class); + if (!b) { + throw new MessageException(); + } + } + + @Override + public Page enterprisesUnitPager(PageParams queryParams) { + return enterprisesUnitMapper.policeEnterprisesUnitPager(queryParams.getPage(), queryParams.getParams()); + } +} diff --git a/policeSecurityServer/src/main/java/com/changhu/module/management/service/impl/PoliceUnitServiceImpl.java b/policeSecurityServer/src/main/java/com/changhu/module/management/service/impl/PoliceUnitServiceImpl.java index 925ac1e..32716b8 100644 --- a/policeSecurityServer/src/main/java/com/changhu/module/management/service/impl/PoliceUnitServiceImpl.java +++ b/policeSecurityServer/src/main/java/com/changhu/module/management/service/impl/PoliceUnitServiceImpl.java @@ -1,17 +1,9 @@ package com.changhu.module.management.service.impl; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.changhu.module.management.mapper.EnterprisesUnitMapper; import com.changhu.module.management.mapper.PoliceUnitMapper; import com.changhu.module.management.pojo.entity.PoliceUnit; -import com.changhu.module.management.pojo.queryParams.PoliceEnterprisesUnitPagerQueryParams; -import com.changhu.module.management.pojo.queryParams.PoliceUnitPagerQueryParams; -import com.changhu.module.management.pojo.vo.PoliceEnterprisesUnitPagerVo; -import com.changhu.module.management.pojo.vo.PoliceUnitPagerVo; import com.changhu.module.management.service.PoliceUnitService; -import com.changhu.support.mybatisplus.pojo.params.PageParams; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; /** @@ -22,16 +14,4 @@ import org.springframework.stereotype.Service; @Service public class PoliceUnitServiceImpl extends ServiceImpl implements PoliceUnitService { - @Autowired - private EnterprisesUnitMapper enterprisesUnitMapper; - - @Override - public Page pager(PageParams queryParams) { - return baseMapper.pager(queryParams.getPage(), queryParams.getParams()); - } - - @Override - public Page policeEnterprisesUnitPager(PageParams queryParams) { - return enterprisesUnitMapper.policeEnterprisesUnitPager(queryParams.getPage(), queryParams.getParams()); - } } diff --git a/policeSecurityServer/src/main/java/com/changhu/module/management/service/impl/SecurityServiceImpl.java b/policeSecurityServer/src/main/java/com/changhu/module/management/service/impl/SecurityServiceImpl.java new file mode 100644 index 0000000..f7a504b --- /dev/null +++ b/policeSecurityServer/src/main/java/com/changhu/module/management/service/impl/SecurityServiceImpl.java @@ -0,0 +1,127 @@ +package com.changhu.module.management.service.impl; + +import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.lang.Dict; +import cn.hutool.core.lang.func.LambdaUtil; +import cn.hutool.core.util.RandomUtil; +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.toolkit.Db; +import com.changhu.common.annotation.UserType; +import com.changhu.common.db.enums.IsEnable; +import com.changhu.common.db.enums.MiniProgramUserIdentity; +import com.changhu.common.enums.ResultCode; +import com.changhu.common.exception.MessageException; +import com.changhu.common.pojo.vo.SelectNodeVo; +import com.changhu.common.utils.UserUtil; +import com.changhu.module.management.mapper.ManagementSecurityUnitUserMapper; +import com.changhu.module.management.pojo.entity.ManagementSecurityUnitUser; +import com.changhu.module.management.pojo.params.ManagementSecurityUnitUserSaveOrUpdateParams; +import com.changhu.module.management.pojo.queryParams.ManagementSecurityUnitUserPagerQueryParams; +import com.changhu.module.management.pojo.vo.ManagementSecurityUnitUserPagerVo; +import com.changhu.module.management.service.SecurityService; +import com.changhu.module.miniProgram.mapper.MiniProgramUserMapper; +import com.changhu.module.miniProgram.pojo.entity.MiniProgramUser; +import com.changhu.support.mybatisplus.pojo.entity.BaseEntity; +import com.changhu.support.mybatisplus.pojo.params.PageParams; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; + +/** + * @author 20252 + * @createTime 2024/9/11 上午10:17 + * @desc SecurityServiceImpl... + */ +@Service +public class SecurityServiceImpl implements SecurityService { + + @Autowired + private ManagementSecurityUnitUserMapper managementSecurityUnitUserMapper; + + @Autowired + private MiniProgramUserMapper miniProgramUserMapper; + + @Transactional(rollbackFor = Exception.class) + @Override + public void userSaveOrUpdate(ManagementSecurityUnitUserSaveOrUpdateParams saveOrUpdateParams) { + //查看手机号是否已存在 + boolean exists = Db.lambdaQuery(ManagementSecurityUnitUser.class) + .ne(saveOrUpdateParams.getSnowFlakeId() != null, BaseEntity::getSnowFlakeId, saveOrUpdateParams.getSnowFlakeId()) + .eq(ManagementSecurityUnitUser::getTelephone, saveOrUpdateParams.getTelephone()) + .exists(); + if (exists) { + throw new MessageException("该手机号已存在"); + } + + ManagementSecurityUnitUser managementSecurityUnitUser = BeanUtil.copyProperties(saveOrUpdateParams, ManagementSecurityUnitUser.class); + //新增 需要补全一些信息 + if (managementSecurityUnitUser.getSnowFlakeId() == null) { + String account = RandomUtil.randomString(6); + boolean accExits = Db.lambdaQuery(ManagementSecurityUnitUser.class) + .eq(ManagementSecurityUnitUser::getAccount, account) + .exists(); + if (accExits) { + throw new MessageException("生成的账号已存在 请重新提交生成"); + } + //生成账号 + managementSecurityUnitUser.setAccount(account); + if (!UserType.MANAGEMENT_SECURITY.equals(UserUtil.getUserType())) { + throw new MessageException("客户端类型不对"); + } + //补全单位 + managementSecurityUnitUser.setSecurityUnitId(UserUtil.getUnitId()); + //生成密码 + String passWordEncrypt = UserUtil.passWordEncrypt(UserUtil.DEFAULT_PASSWORD); + List saltAndPassWord = StrUtil.split(passWordEncrypt, "$$"); + managementSecurityUnitUser.setSalt(saltAndPassWord.get(0)); + managementSecurityUnitUser.setPassword(saltAndPassWord.get(1)); + } + Db.saveOrUpdate(managementSecurityUnitUser); + } + + @Override + public Page userPager(PageParams queryParams) { + return managementSecurityUnitUserMapper.pager(queryParams.getPage(), queryParams.getParams()); + } + + @Override + public void userDeleteById(Long managementSecurityUnitUserId) { + Long unitId = UserUtil.getUnitId(); + Long l = Db.lambdaQuery(ManagementSecurityUnitUser.class) + .eq(BaseEntity::getSnowFlakeId, managementSecurityUnitUserId) + .oneOpt() + .map(ManagementSecurityUnitUser::getSecurityUnitId) + .orElseThrow(() -> new MessageException(ResultCode.USER_NOT_FOUND)); + if (!unitId.equals(l)) { + throw new MessageException("单位不匹配,无权操作"); + } + boolean b = Db.removeById(managementSecurityUnitUserId, ManagementSecurityUnitUser.class); + if (!b) { + throw new MessageException(); + } + } + + @Override + public List> listProjectManager() { + String tel = LambdaUtil.getFieldName(MiniProgramUser::getTelephone); + String sex = LambdaUtil.getFieldName(MiniProgramUser::getSex); + return miniProgramUserMapper.selectList(Wrappers.lambdaQuery() + .eq(MiniProgramUser::getIsEnable, IsEnable.TRUE) + .eq(MiniProgramUser::getIdentity, MiniProgramUserIdentity.PROJECT_MANAGER) + .eq(MiniProgramUser::getUnitId, UserUtil.getUnitId())) + .stream() + .map(item -> SelectNodeVo.builder() + .value(item.getSnowFlakeId()) + .label(item.getName()) + .extData(Dict.of( + tel, item.getTelephone(), + sex, item.getSex() + )) + .build()) + .toList(); + } +} diff --git a/policeSecurityServer/src/main/java/com/changhu/module/management/service/impl/SecurityUnitServiceImpl.java b/policeSecurityServer/src/main/java/com/changhu/module/management/service/impl/SecurityUnitServiceImpl.java index 2bae0e3..a5d45a0 100644 --- a/policeSecurityServer/src/main/java/com/changhu/module/management/service/impl/SecurityUnitServiceImpl.java +++ b/policeSecurityServer/src/main/java/com/changhu/module/management/service/impl/SecurityUnitServiceImpl.java @@ -1,30 +1,11 @@ package com.changhu.module.management.service.impl; -import cn.hutool.core.bean.BeanUtil; -import cn.hutool.core.lang.Dict; -import cn.hutool.core.lang.func.LambdaUtil; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.changhu.common.db.enums.IsEnable; -import com.changhu.common.db.enums.MiniProgramUserIdentity; -import com.changhu.common.pojo.vo.SelectNodeVo; -import com.changhu.common.utils.UserUtil; import com.changhu.module.management.mapper.SecurityUnitMapper; import com.changhu.module.management.pojo.entity.SecurityUnit; -import com.changhu.module.management.pojo.params.SecurityUnitSaveOrUpdateParams; -import com.changhu.module.management.pojo.queryParams.SecurityUnitPagerQueryParams; -import com.changhu.module.management.pojo.vo.SecurityUnitPagerVo; import com.changhu.module.management.service.SecurityUnitService; -import com.changhu.module.miniProgram.mapper.MiniProgramUserMapper; -import com.changhu.module.miniProgram.pojo.entity.MiniProgramUser; -import com.changhu.support.mybatisplus.pojo.params.PageParams; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.util.List; -import java.util.Optional; - /** * security_unit (保安单位) 服务实现类 * author: luozhun @@ -33,53 +14,4 @@ import java.util.Optional; @Service public class SecurityUnitServiceImpl extends ServiceImpl implements SecurityUnitService { - @Autowired - private MiniProgramUserMapper miniProgramUserMapper; - - @Override - public Page pager(PageParams queryParams) { - return baseMapper.pager(queryParams.getPage(), queryParams.getParams()); - } - - @Override - public void saveOrUpdate(SecurityUnitSaveOrUpdateParams params) { - SecurityUnit securityUnit = BeanUtil.copyProperties(params, SecurityUnit.class); - Optional.ofNullable(params.getAdministrativeDivisionCodes()) - .ifPresent(codes -> { - if (!codes.isEmpty()) { - securityUnit.setProvince(codes.get(0)); - } - if (codes.size() >= 2) { - securityUnit.setCity(codes.get(1)); - } - if (codes.size() >= 3) { - securityUnit.setDistricts(codes.get(2)); - } - if (codes.size() >= 4) { - securityUnit.setStreet(codes.get(3)); - } - }); - this.saveOrUpdate(securityUnit); - } - - @Override - public List> listProjectManager() { - String tel = LambdaUtil.getFieldName(MiniProgramUser::getTelephone); - String sex = LambdaUtil.getFieldName(MiniProgramUser::getSex); - return miniProgramUserMapper.selectList(Wrappers.lambdaQuery() - .eq(MiniProgramUser::getIsEnable, IsEnable.TRUE) - .eq(MiniProgramUser::getIdentity, MiniProgramUserIdentity.PROJECT_MANAGER) - .eq(MiniProgramUser::getUnitId, UserUtil.getUnitId())) - .stream() - .map(item -> SelectNodeVo.builder() - .value(item.getSnowFlakeId()) - .label(item.getName()) - .extData(Dict.of( - tel, item.getTelephone(), - sex, item.getSex() - )) - .build()) - .toList(); - } - } diff --git a/policeSecurityServer/src/main/java/com/changhu/module/management/service/impl/SuperServiceImpl.java b/policeSecurityServer/src/main/java/com/changhu/module/management/service/impl/SuperServiceImpl.java new file mode 100644 index 0000000..37395fb --- /dev/null +++ b/policeSecurityServer/src/main/java/com/changhu/module/management/service/impl/SuperServiceImpl.java @@ -0,0 +1,81 @@ +package com.changhu.module.management.service.impl; + +import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.toolkit.Db; +import com.changhu.common.enums.ResultCode; +import com.changhu.common.exception.MessageException; +import com.changhu.common.utils.UserUtil; +import com.changhu.module.management.mapper.PoliceUnitMapper; +import com.changhu.module.management.mapper.SecurityUnitMapper; +import com.changhu.module.management.pojo.entity.ManagementSuperUser; +import com.changhu.module.management.pojo.params.ManagementSuperUserSaveOrUpdateParams; +import com.changhu.module.management.pojo.queryParams.PoliceUnitPagerQueryParams; +import com.changhu.module.management.pojo.queryParams.SecurityUnitPagerQueryParams; +import com.changhu.module.management.pojo.vo.PoliceUnitPagerVo; +import com.changhu.module.management.pojo.vo.SecurityUnitPagerVo; +import com.changhu.module.management.service.SuperService; +import com.changhu.support.mybatisplus.pojo.params.PageParams; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * @author 20252 + * @createTime 2024/9/11 上午9:52 + * @desc SuperServiceImpl... + */ +@Service +public class SuperServiceImpl implements SuperService { + + @Autowired + private PoliceUnitMapper policeUnitMapper; + + @Autowired + private SecurityUnitMapper securityUnitMapper; + + @Override + public void saveOrUpdateUser(ManagementSuperUserSaveOrUpdateParams params) { + //查看手机号是否存在 + boolean exists = Db.lambdaQuery(ManagementSuperUser.class) + .eq(ManagementSuperUser::getTelephone, params.getTelephone()) + .exists(); + if (exists) { + throw new MessageException("手机号已注册"); + } + + //构建用户 + ManagementSuperUser managementSuperUser = ManagementSuperUser.builder() + .snowFlakeId(params.getSnowFlakeId()) + .name(params.getName()) + .telephone(params.getTelephone()) + .build(); + + //如果是新增需要初始化密码 + if (managementSuperUser.getSnowFlakeId() == null) { + //生成加密密码: salt$$uuid + String passWordEncrypt = UserUtil.passWordEncrypt(UserUtil.DEFAULT_PASSWORD); + List saltAndPassWord = StrUtil.split(passWordEncrypt, "$$"); + if (CollUtil.size(saltAndPassWord) != 2) { + throw new MessageException(ResultCode.ERROR); + } + managementSuperUser.setSalt(saltAndPassWord.get(0)); + managementSuperUser.setPassword(saltAndPassWord.get(1)); + } + + //保存到数据库 + Db.saveOrUpdate(managementSuperUser); + } + + @Override + public Page policeUnitPager(PageParams queryParams) { + return policeUnitMapper.pager(queryParams.getPage(), queryParams.getParams()); + } + + @Override + public Page securityUnitPager(PageParams queryParams) { + return securityUnitMapper.pager(queryParams.getPage(), queryParams.getParams()); + } +} diff --git a/policeSecurityServer/src/main/java/com/changhu/module/miniProgram/controller/MiniProgramUserController.java b/policeSecurityServer/src/main/java/com/changhu/module/miniProgram/controller/MiniProgramUserController.java index 381edf8..c540f55 100644 --- a/policeSecurityServer/src/main/java/com/changhu/module/miniProgram/controller/MiniProgramUserController.java +++ b/policeSecurityServer/src/main/java/com/changhu/module/miniProgram/controller/MiniProgramUserController.java @@ -1,7 +1,6 @@ package com.changhu.module.miniProgram.controller; import com.changhu.common.annotation.JsonBody; -import com.changhu.common.pojo.vo.TokenInfo; import com.changhu.module.miniProgram.pojo.params.MiniProgramUserRegisterParams; import com.changhu.module.miniProgram.service.MiniProgramUserService; import io.swagger.v3.oas.annotations.Operation; @@ -27,7 +26,7 @@ public class MiniProgramUserController { @Operation(summary = "注册") @PostMapping("/register") - public TokenInfo register(@RequestBody @Valid MiniProgramUserRegisterParams params) { - return miniProgramUserService.register(params); + public void register(@RequestBody @Valid MiniProgramUserRegisterParams params) { + miniProgramUserService.register(params); } } diff --git a/policeSecurityServer/src/main/java/com/changhu/module/miniProgram/controller/PoliceIndexController.java b/policeSecurityServer/src/main/java/com/changhu/module/miniProgram/controller/PoliceIndexController.java new file mode 100644 index 0000000..7c2c0bc --- /dev/null +++ b/policeSecurityServer/src/main/java/com/changhu/module/miniProgram/controller/PoliceIndexController.java @@ -0,0 +1,35 @@ +package com.changhu.module.miniProgram.controller; + +import com.changhu.common.annotation.CheckUserType; +import com.changhu.common.annotation.JsonBody; +import com.changhu.common.annotation.UserType; +import com.changhu.module.miniProgram.pojo.vo.IndexServiceProjectListVo; +import com.changhu.module.miniProgram.service.MPoliceService; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; + +import java.util.List; + +/** + * @author 20252 + * @createTime 2024/9/11 上午10:44 + * @desc PoliceIndexController... + */ +@Tag(name = "公安人员首页") +@JsonBody +@RequestMapping("/policeIndex") +public class PoliceIndexController { + + @Autowired + private MPoliceService policeIndexService; + + @Operation(summary = "获取单位内的服务项目") + @GetMapping("/getUnitServiceProjectList") + @CheckUserType(userTypes = UserType.MINI_PROGRAM_POLICE) + public List getUnitServiceProjectList() { + return policeIndexService.getUnitServiceProjectList(); + } +} diff --git a/policeSecurityServer/src/main/java/com/changhu/module/miniProgram/controller/ProjectManageIndexController.java b/policeSecurityServer/src/main/java/com/changhu/module/miniProgram/controller/ProjectManageIndexController.java new file mode 100644 index 0000000..9be9dea --- /dev/null +++ b/policeSecurityServer/src/main/java/com/changhu/module/miniProgram/controller/ProjectManageIndexController.java @@ -0,0 +1,35 @@ +package com.changhu.module.miniProgram.controller; + +import com.changhu.common.annotation.CheckUserType; +import com.changhu.common.annotation.JsonBody; +import com.changhu.common.annotation.UserType; +import com.changhu.module.miniProgram.pojo.vo.IndexServiceProjectListVo; +import com.changhu.module.miniProgram.service.ProjectManageIndexService; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; + +import java.util.List; + +/** + * @author 20252 + * @createTime 2024/9/10 下午3:48 + * @desc 项目经理首页控制器 + */ +@Tag(name = "项目经理首页") +@JsonBody +@RequestMapping("/projectManageIndex") +public class ProjectManageIndexController { + + @Autowired + private ProjectManageIndexService projectManageIndexService; + + @Operation(summary = "获取我的服务项目") + @GetMapping("/getMyServiceProject") + @CheckUserType(userTypes = UserType.MINI_PROGRAM_PROJECT_MANAGE) + public List getMyServiceProjectList() { + return projectManageIndexService.getMyServiceProjectList(); + } +} diff --git a/policeSecurityServer/src/main/java/com/changhu/module/miniProgram/pojo/vo/IndexServiceProjectListVo.java b/policeSecurityServer/src/main/java/com/changhu/module/miniProgram/pojo/vo/IndexServiceProjectListVo.java new file mode 100644 index 0000000..40af593 --- /dev/null +++ b/policeSecurityServer/src/main/java/com/changhu/module/miniProgram/pojo/vo/IndexServiceProjectListVo.java @@ -0,0 +1,77 @@ +package com.changhu.module.miniProgram.pojo.vo; + +import com.changhu.common.db.enums.IsOrNot; +import com.changhu.common.db.enums.ServiceProjectType; +import com.changhu.module.management.pojo.model.ContactPersonInfo; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import java.util.List; + +/** + * @author 20252 + * @createTime 2024/9/10 下午3:55 + * @desc 首页服务项目列表 + */ +@Data +public class IndexServiceProjectListVo { + + @Schema(description = "企事业单位id") + private Long snowFlakeId; + @Schema(description = "企事业单位名称") + private String name; + + @Schema(description = "省编码") + private String province; + @Schema(description = "省名字") + private String provinceName; + @Schema(description = "市编码") + private String city; + @Schema(description = "市名字") + private String cityName; + @Schema(description = "区编码") + private String districts; + @Schema(description = "区名字") + private String districtsName; + @Schema(description = "街道编码") + private String street; + @Schema(description = "街道名字") + private String streetName; + + @Schema(description = "详细地址") + private String address; + @Schema(description = "联系人") + private ContactPersonInfo contactPersonInfo; + @Schema(description = "备注") + private String remark; + + @Schema(description = "服务项目列表") + private List serviceProjectList; + + @Data + static class ServiceProjectVo { + @Schema(description = "服务项目id") + private Long snowFlakeId; + @Schema(description = "服务项目名称") + private String name; + @Schema(description = "服务项目类型") + private ServiceProjectType type; + @Schema(description = "是否自招保安(只有当type为property 此字段必填)") + private IsOrNot isRecruitSecurity; + @Schema(description = "证件号(服务类型为保安必填 服务类型为物业则需自招保安为必填)") + private String idNumber; + @Schema(description = "服务区域面积") + private Double serviceArea; + @Schema(description = "楼栋数量") + private Integer buildingTotal; + @Schema(description = "户数") + private Integer houseTotal; + @Schema(description = "工作人员数量") + private Integer staffTotal; + @Schema(description = "保安人员数量") + private Integer securityUserTotal; + @Schema(description = "备注") + private String remark; + } + +} diff --git a/policeSecurityServer/src/main/java/com/changhu/module/miniProgram/service/MPoliceService.java b/policeSecurityServer/src/main/java/com/changhu/module/miniProgram/service/MPoliceService.java new file mode 100644 index 0000000..60954f9 --- /dev/null +++ b/policeSecurityServer/src/main/java/com/changhu/module/miniProgram/service/MPoliceService.java @@ -0,0 +1,19 @@ +package com.changhu.module.miniProgram.service; + +import com.changhu.module.miniProgram.pojo.vo.IndexServiceProjectListVo; + +import java.util.List; + +/** + * @author 20252 + * @createTime 2024/9/11 上午10:52 + * @desc MPoliceService... + */ +public interface MPoliceService { + /** + * 获取单位内的服务项目 + * + * @return 服务项目 + */ + List getUnitServiceProjectList(); +} diff --git a/policeSecurityServer/src/main/java/com/changhu/module/miniProgram/service/MiniProgramUserService.java b/policeSecurityServer/src/main/java/com/changhu/module/miniProgram/service/MiniProgramUserService.java index 73299b3..454c4ed 100644 --- a/policeSecurityServer/src/main/java/com/changhu/module/miniProgram/service/MiniProgramUserService.java +++ b/policeSecurityServer/src/main/java/com/changhu/module/miniProgram/service/MiniProgramUserService.java @@ -1,7 +1,6 @@ package com.changhu.module.miniProgram.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.changhu.common.pojo.vo.TokenInfo; import com.changhu.module.miniProgram.pojo.entity.MiniProgramUser; import com.changhu.module.miniProgram.pojo.params.MiniProgramUserRegisterParams; @@ -17,5 +16,5 @@ public interface MiniProgramUserService extends IService { * * @param params 参数 */ - TokenInfo register(MiniProgramUserRegisterParams params); + void register(MiniProgramUserRegisterParams params); } diff --git a/policeSecurityServer/src/main/java/com/changhu/module/miniProgram/service/ProjectManageIndexService.java b/policeSecurityServer/src/main/java/com/changhu/module/miniProgram/service/ProjectManageIndexService.java new file mode 100644 index 0000000..158ef7c --- /dev/null +++ b/policeSecurityServer/src/main/java/com/changhu/module/miniProgram/service/ProjectManageIndexService.java @@ -0,0 +1,19 @@ +package com.changhu.module.miniProgram.service; + +import com.changhu.module.miniProgram.pojo.vo.IndexServiceProjectListVo; + +import java.util.List; + +/** + * @author 20252 + * @createTime 2024/9/10 下午3:49 + * @desc ProjectManageIndexService... + */ +public interface ProjectManageIndexService { + /** + * 获取我的服务项目 + * + * @return 服务项目列表 + */ + List getMyServiceProjectList(); +} diff --git a/policeSecurityServer/src/main/java/com/changhu/module/miniProgram/service/impl/MPoliceServiceImpl.java b/policeSecurityServer/src/main/java/com/changhu/module/miniProgram/service/impl/MPoliceServiceImpl.java new file mode 100644 index 0000000..d8ec8b6 --- /dev/null +++ b/policeSecurityServer/src/main/java/com/changhu/module/miniProgram/service/impl/MPoliceServiceImpl.java @@ -0,0 +1,27 @@ +package com.changhu.module.miniProgram.service.impl; + +import com.changhu.common.utils.UserUtil; +import com.changhu.module.management.mapper.ServiceProjectMapper; +import com.changhu.module.miniProgram.pojo.vo.IndexServiceProjectListVo; +import com.changhu.module.miniProgram.service.MPoliceService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * @author 20252 + * @createTime 2024/9/11 上午10:53 + * @desc MPoliceServiceImpl... + */ +@Service +public class MPoliceServiceImpl implements MPoliceService { + + @Autowired + private ServiceProjectMapper serviceProjectMapper; + + @Override + public List getUnitServiceProjectList() { + return serviceProjectMapper.getServiceProjectList(UserUtil.getUnitId(), null); + } +} diff --git a/policeSecurityServer/src/main/java/com/changhu/module/miniProgram/service/impl/MiniProgramUserServiceImpl.java b/policeSecurityServer/src/main/java/com/changhu/module/miniProgram/service/impl/MiniProgramUserServiceImpl.java index 4c1339f..28efb2d 100644 --- a/policeSecurityServer/src/main/java/com/changhu/module/miniProgram/service/impl/MiniProgramUserServiceImpl.java +++ b/policeSecurityServer/src/main/java/com/changhu/module/miniProgram/service/impl/MiniProgramUserServiceImpl.java @@ -2,15 +2,11 @@ package com.changhu.module.miniProgram.service.impl; import cn.binarywang.wx.miniapp.api.WxMaService; import cn.binarywang.wx.miniapp.bean.WxMaJscode2SessionResult; -import cn.dev33.satoken.stp.SaTokenInfo; import cn.hutool.core.bean.BeanUtil; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.changhu.common.annotation.UserType; import com.changhu.common.exception.MessageException; -import com.changhu.common.pojo.vo.TokenInfo; import com.changhu.common.utils.SnowFlakeIdUtil; -import com.changhu.common.utils.UserUtil; import com.changhu.module.miniProgram.mapper.MiniProgramUserMapper; import com.changhu.module.miniProgram.pojo.entity.MiniProgramUser; import com.changhu.module.miniProgram.pojo.params.MiniProgramUserRegisterParams; @@ -31,7 +27,7 @@ public class MiniProgramUserServiceImpl extends ServiceImpl getMyServiceProjectList() { + return serviceProjectMapper.getServiceProjectList(null, UserUtil.getUserId()); + } +} diff --git a/policeSecurityServer/src/main/java/com/changhu/pojo/params/SecurityUnitRegisterParams.java b/policeSecurityServer/src/main/java/com/changhu/pojo/params/SecurityUnitRegisterParams.java index cd3ee47..0947412 100644 --- a/policeSecurityServer/src/main/java/com/changhu/pojo/params/SecurityUnitRegisterParams.java +++ b/policeSecurityServer/src/main/java/com/changhu/pojo/params/SecurityUnitRegisterParams.java @@ -41,7 +41,6 @@ public class SecurityUnitRegisterParams { @Schema(description = "行政区划编码") private List administrativeDivisionCodes; - @NotBlank(message = "详细地址不能为空") @Schema(description = "详细地址") private String address; } diff --git a/policeSecurityServer/src/main/java/com/changhu/service/LoginService.java b/policeSecurityServer/src/main/java/com/changhu/service/LoginService.java index b2dd6ed..2015363 100644 --- a/policeSecurityServer/src/main/java/com/changhu/service/LoginService.java +++ b/policeSecurityServer/src/main/java/com/changhu/service/LoginService.java @@ -16,4 +16,9 @@ public interface LoginService { * @return token */ TokenInfo login(LoginParams loginParams); + + /** + * 登出 + */ + void logout(); } diff --git a/policeSecurityServer/src/main/java/com/changhu/service/impl/LoginServiceImpl.java b/policeSecurityServer/src/main/java/com/changhu/service/impl/LoginServiceImpl.java index 2bdf875..df74e8f 100644 --- a/policeSecurityServer/src/main/java/com/changhu/service/impl/LoginServiceImpl.java +++ b/policeSecurityServer/src/main/java/com/changhu/service/impl/LoginServiceImpl.java @@ -1,6 +1,7 @@ package com.changhu.service.impl; import com.changhu.common.pojo.vo.TokenInfo; +import com.changhu.common.utils.UserUtil; import com.changhu.pojo.params.LoginParams; import com.changhu.service.LoginService; import org.springframework.stereotype.Service; @@ -18,4 +19,9 @@ public class LoginServiceImpl implements LoginService { .getLoginHandler() .login(loginParams.getLoginParams()); } + + @Override + public void logout() { + UserUtil.logout(); + } } diff --git a/policeSecurityServer/src/main/resources/mapper/ServiceProjectMapper.xml b/policeSecurityServer/src/main/resources/mapper/ServiceProjectMapper.xml index fe45dcc..44ad736 100644 --- a/policeSecurityServer/src/main/resources/mapper/ServiceProjectMapper.xml +++ b/policeSecurityServer/src/main/resources/mapper/ServiceProjectMapper.xml @@ -28,4 +28,52 @@ order by sp.create_time desc + + + + + \ No newline at end of file diff --git a/superManagement/src/views/unitManage/policeUnit/index.vue b/superManagement/src/views/unitManage/policeUnit/index.vue index 1f92d39..026eda6 100644 --- a/superManagement/src/views/unitManage/policeUnit/index.vue +++ b/superManagement/src/views/unitManage/policeUnit/index.vue @@ -32,7 +32,7 @@ type TableProps = TableProMaxProps>(null!) -const reqApi: TableProps['requestApi'] = (params) => api.post('/policeUnit/pager', params) +const reqApi: TableProps['requestApi'] = (params) => api.post('/management/super/policeUnit/pager', params) const columns: TableProps['columns'] = [ { dataIndex: 'name', @@ -140,56 +140,54 @@ const showEnterprisesUnit = (policeUnitPagerVo: PoliceUnitPagerVo) => { const saveOrUpdateEnterprisesUnit = (data?: EnterprisesUnitSaveOrUpdateParams & { contactPersonInfoName?: string; contactPersonInfoTelephone?: string - }) => { - submitSimpleFormModal({ - title: data.snowFlakeId ? `【${data.name}】 信息编辑` : '新增企事业单位', - formOptions: { - name: { - type: 'input', - label: '单位名称', - required: true - }, - administrativeDivisionCodes: { - type: 'cascader', - label: '行政区划', - required: true, - options: administrativeDivisionTree.value, - componentsProps: { - showSearch: true - } - }, - address: { - type: 'inputTextArea', - label: '详细地址' - }, - contactPersonInfoName: { - type: 'input', - label: '联系人名称' - }, - contactPersonInfoTelephone: { - type: 'input', - label: '联系人电话' - }, - remark: { - type: 'inputTextArea', - label: '备注' + }) => submitSimpleFormModal({ + title: data.snowFlakeId ? `【${data.name}】 信息编辑` : '新增企事业单位', + formOptions: { + name: { + type: 'input', + label: '单位名称', + required: true + }, + administrativeDivisionCodes: { + type: 'cascader', + label: '行政区划', + required: true, + options: administrativeDivisionTree.value, + componentsProps: { + showSearch: true } }, - formParams: data, - submit: async (params) => { - params.contactPersonInfo = { - name: params.contactPersonInfoName, - telephone: params.contactPersonInfoTelephone - } - const resp = await api.post('/enterprisesUnit/saveOrUpdate', params) - message.success(resp.message) - await _tableRef.value?.requestGetTableData() + address: { + type: 'inputTextArea', + label: '详细地址' + }, + contactPersonInfoName: { + type: 'input', + label: '联系人名称' + }, + contactPersonInfoTelephone: { + type: 'input', + label: '联系人电话' + }, + remark: { + type: 'inputTextArea', + label: '备注' } - }) - } + }, + formParams: data, + submit: async (params) => { + params.contactPersonInfo = { + name: params.contactPersonInfoName, + telephone: params.contactPersonInfoTelephone + } + const resp = await api.post('/enterprisesUnit/saveOrUpdate', params) + message.success(resp.message) + await _tableRef.value?.requestGetTableData() + } + }) const _tableRef = ref>(null) const _columns: _TableProps['columns'] = [ { diff --git a/superManagement/src/views/unitManage/securityUnit/index.vue b/superManagement/src/views/unitManage/securityUnit/index.vue index a60f479..9af6903 100644 --- a/superManagement/src/views/unitManage/securityUnit/index.vue +++ b/superManagement/src/views/unitManage/securityUnit/index.vue @@ -25,7 +25,7 @@ import {UNIT_TYPE} from "@/config"; type TableProps = TableProMaxProps const tableRef = ref>(null!) -const reqApi: TableProps['requestApi'] = (params) => api.post('/securityUnit/pager', params) +const reqApi: TableProps['requestApi'] = (params) => api.post('/management/super/securityUnit/pager', params) const columns: TableProps['columns'] = [ { dataIndex: 'name',