web端接口调整

portal-service-application/src/main/java/com/hfln/portal/application/controller/admin/AdminLoginController.java

@@ -1,84 +0,0 @@
-
-package com.hfln.portal.application.controller.admin;
-
-
-import cn.dev33.satoken.stp.StpUtil;
-import cn.hfln.framework.catchlog.CatchAndLog;
-import cn.hfln.framework.dto.ApiResult;
-import com.hfln.portal.common.request.admin.AdminAddParam;
-import com.hfln.portal.common.request.admin.AdminLoginParam;
-import com.hfln.portal.common.request.admin.AdminResetParam;
-import com.hfln.portal.common.response.admin.AdminLoginRes;
-import com.hfln.portal.common.response.user.UserTokenInfo;
-import com.hfln.portal.domain.customer.util.CopyUtils;
-import com.hfln.portal.domain.gateway.AdminGateway;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import javax.validation.Valid;
-
-@RestController
-@CatchAndLog
-@Tag(name = "管理登录")
-@Slf4j
-@RequestMapping("/admin/manage")
-public class AdminLoginController {
-
-    @Autowired
-    private AdminGateway adminGateway;
-
-
-    /**
-     * 	port 项目加一个 网页登录接口  账号密码登录，要录入手机号，加上 忘记密码 功能
-     * 		网页给不给 c端用，只给b端用
-     */
-    @PostMapping("/login")
-    @Operation(summary = "账户密码登录")
-    public ApiResult<AdminLoginRes> login(@Valid @RequestBody AdminLoginParam param) {
-
-        return ApiResult.success(adminGateway.login(param));
-    }
-
-    @GetMapping("/getTokenInfo")
-    @Operation(summary = "获取当前token信息")
-    public ApiResult<UserTokenInfo> getTokenInfo() {
-
-        return ApiResult.success(CopyUtils.copy(StpUtil.getTokenInfo(), UserTokenInfo.class));
-    }
-
-    @GetMapping("/logout")
-    @Operation(summary = "退出登录")
-    public ApiResult<Void> logout() {
-
-        adminGateway.logout();
-        return ApiResult.success();
-    }
-
-    @GetMapping("/sendCode")
-    @Operation(summary = "忘记密码,发送验证码")
-    public ApiResult<Void> sendCode() {
-
-        adminGateway.sendCode();
-        return ApiResult.success();
-    }
-
-
-    @PostMapping("/reset")
-    @Operation(summary = "重置密码")
-    public ApiResult<Void> resetPassword(@Valid @RequestBody AdminResetParam param) {
-
-        adminGateway.reset(param);
-        return ApiResult.success();
-    }
-
-    @PostMapping("/addAccount")
-    @Operation(summary = "创建b端用户密码")
-    public ApiResult<Void> addAccount(@Valid @RequestBody AdminAddParam param) {
-
-        adminGateway.addAccount(param);
-        return ApiResult.success();
-    }
-}

portal-service-application/src/main/java/com/hfln/portal/application/controller/admin/AdminRoleController.java

@@ -1,51 +0,0 @@
-package com.hfln.portal.application.controller.admin;
-
-
-import cn.hfln.framework.catchlog.CatchAndLog;
-import cn.hfln.framework.dto.ApiResult;
-import com.hfln.portal.common.dto.data.role.RoleListDTO;
-import com.hfln.portal.common.request.admin.AddRoleParam;
-import com.hfln.portal.domain.gateway.AdminGateway;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import javax.validation.Valid;
-import java.util.List;
-
-@RestController
-@CatchAndLog
-@Tag(name = "web端角色相关")
-@Slf4j
-@RequestMapping("/admin/role")
-public class AdminRoleController {
-
-    @Autowired
-    private AdminGateway adminGateway;
-
-    @PostMapping("/addRole")
-    @Operation(summary = "新增角色")
-    public ApiResult<Void> addRole(@RequestBody @Valid AddRoleParam params){
-
-        adminGateway.addRole(params);
-        return ApiResult.success();
-    }
-
-    @PostMapping("/disable")
-    @Operation(summary = "禁用角色")
-    public ApiResult<Void> disableRole(@RequestParam String roleCode){
-
-        adminGateway.disableRole(roleCode);
-        return ApiResult.success();
-    }
-
-    @GetMapping("/roleList")
-    @Operation(summary = "获取角色列表")
-    public ApiResult<List<RoleListDTO>> roleList(){
-        List<RoleListDTO> roleList = adminGateway.roleList();
-        return ApiResult.success(roleList);
-    }
-
-}

portal-service-application/src/main/java/com/hfln/portal/application/controller/admin/AdminDataController.java → portal-service-application/src/main/java/com/hfln/portal/application/controller/web/WebDeviceController.java

@@ -1,4 +1,4 @@
-package com.hfln.portal.application.controller.admin;
+package com.hfln.portal.application.controller.web;
 
 import cn.hfln.framework.catchlog.CatchAndLog;
 import cn.hfln.framework.dto.ApiResult;
@@ -7,7 +7,7 @@ import com.hfln.portal.common.request.admin.DeviceAddParam;
 import com.hfln.portal.common.request.device.DeviceListQueryReq;
 import com.hfln.portal.common.vo.PageRecord;
 import com.hfln.portal.common.vo.UploadRes;
-import com.hfln.portal.domain.gateway.AdminGateway;
+import com.hfln.portal.domain.gateway.WebGateway;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.extern.slf4j.Slf4j;
@@ -20,30 +20,30 @@ import java.io.IOException;
 
 @RestController
 @CatchAndLog
-@Tag(name = "后台数据")
+@Tag(name = "web端设备相关")
 @Slf4j
-@RequestMapping("/admin/data")
-public class AdminDataController {
+@RequestMapping("/web/device")
+public class WebDeviceController {
 
     @Autowired
-    private AdminGateway adminGateway;
+    private WebGateway webGateway;
 
     @PostMapping("/uploadDev")
     @Operation(summary = "excel上传设备信息")
     public ApiResult<UploadRes> uploadDev(@Valid @RequestParam MultipartFile file) throws IOException {
-        return ApiResult.success(adminGateway.uploadDev(file));
+        return ApiResult.success(webGateway.uploadDev(file));
     }
 
     @PostMapping("/queryDevList")
     @Operation(summary = "查询上传设备信息")
     public ApiResult<PageRecord<DeviceDTO>> queryDevList(@Valid @RequestBody DeviceListQueryReq queryReq) {
-        return ApiResult.success(adminGateway.queryDevList(queryReq));
+        return ApiResult.success(webGateway.queryDevList(queryReq));
     }
 
     @PostMapping("/addOneDevice")
     @Operation(summary = "添加上传设备信息")
     public ApiResult<Void> addOneDevice(@Valid @RequestBody DeviceAddParam addParam) {
-        adminGateway.addOneDevice(addParam);
+        webGateway.addOneDevice(addParam);
         return ApiResult.success();
     }
 

portal-service-application/src/main/java/com/hfln/portal/application/controller/web/WebUserController.java

@@ -0,0 +1,106 @@
+
+package com.hfln.portal.application.controller.web;
+
+
+import cn.dev33.satoken.stp.StpUtil;
+import cn.hfln.framework.catchlog.CatchAndLog;
+import cn.hfln.framework.dto.ApiResult;
+import com.hfln.portal.common.dto.data.role.RoleListDTO;
+import com.hfln.portal.common.request.admin.AddRoleParam;
+import com.hfln.portal.common.request.admin.AdminAddParam;
+import com.hfln.portal.common.request.admin.AdminLoginParam;
+import com.hfln.portal.common.request.admin.AdminResetParam;
+import com.hfln.portal.common.response.admin.AdminLoginRes;
+import com.hfln.portal.common.response.user.UserTokenInfo;
+import com.hfln.portal.domain.customer.util.CopyUtils;
+import com.hfln.portal.domain.gateway.WebGateway;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+import java.util.List;
+
+@RestController
+@CatchAndLog
+@Tag(name = "web端用户相关")
+@Slf4j
+@RequestMapping("/web/user")
+public class WebUserController {
+
+    @Autowired
+    private WebGateway webGateway;
+
+
+    @PostMapping("/login")
+    @Operation(summary = "用户账户密码登录")
+    public ApiResult<AdminLoginRes> login(@Valid @RequestBody AdminLoginParam param) {
+
+        return ApiResult.success(webGateway.login(param));
+    }
+
+    @GetMapping("/getTokenInfo")
+    @Operation(summary = "获取当前token信息（后端测试自用）")
+    public ApiResult<UserTokenInfo> getTokenInfo() {
+
+        return ApiResult.success(CopyUtils.copy(StpUtil.getTokenInfo(), UserTokenInfo.class));
+    }
+
+    @GetMapping("/logout")
+    @Operation(summary = "用户退出登录")
+    public ApiResult<Void> logout() {
+
+        webGateway.logout();
+        return ApiResult.success();
+    }
+
+    @GetMapping("/sendCode")
+    @Operation(summary = "用户忘记密码,发送验证码")
+    public ApiResult<Void> sendCode() {
+
+        webGateway.sendCode();
+        return ApiResult.success();
+    }
+
+    @PostMapping("/reset")
+    @Operation(summary = "超管重置密码")
+    public ApiResult<Void> resetPassword(@Valid @RequestBody AdminResetParam param) {
+
+        webGateway.reset(param);
+        return ApiResult.success();
+    }
+
+    @PostMapping("/addAccount")
+    @Operation(summary = "超管添加用户")
+    public ApiResult<Void> addAccount(@Valid @RequestBody AdminAddParam param) {
+
+        webGateway.addAccount(param);
+        return ApiResult.success();
+    }
+
+    @PostMapping("/addRole")
+    @Operation(summary = "新增角色")
+    public ApiResult<Void> addRole(@RequestBody @Valid AddRoleParam params){
+
+        webGateway.addRole(params);
+        return ApiResult.success();
+    }
+
+    @PostMapping("/disable")
+    @Operation(summary = "禁用角色")
+    public ApiResult<Void> disableRole(@RequestParam @Parameter(description = "角色编码") String roleCode){
+
+        webGateway.disableRole(roleCode);
+        return ApiResult.success();
+    }
+
+    @GetMapping("/roleList")
+    @Operation(summary = "获取角色列表")
+    public ApiResult<List<RoleListDTO>> roleList(){
+        List<RoleListDTO> roleList = webGateway.roleList();
+        return ApiResult.success(roleList);
+    }
+}

portal-service-domain/src/main/java/com/hfln/portal/domain/customer/MenuTypeEnum.java

@@ -0,0 +1,45 @@
+package com.hfln.portal.domain.customer;
+
+
+/**
+ * web端菜单类型
+ *
+ */
+public enum MenuTypeEnum {
+    /**
+     * 目录
+     */
+    CATALOG("1", "目录"),
+    /**
+     * 菜单
+     */
+    MENU("2", "菜单"),
+    /**
+     * 功能点
+     */
+    POINTS("3", "功能点");
+
+    String code;
+    String desc;
+
+    MenuTypeEnum(String code, String desc) {
+        this.code = code;
+        this.desc = desc;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public void setCode(String code) {
+        this.code = code;
+    }
+
+    public String getDesc() {
+        return desc;
+    }
+
+    public void setDesc(String desc) {
+        this.desc = desc;
+    }
+}

portal-service-domain/src/main/java/com/hfln/portal/domain/exception/ErrorEnum.java

@@ -53,6 +53,11 @@ public enum ErrorEnum implements ErrorEnumInterface{
     DEVICE_IS_EXIST("50004", "设备已存在!"),
 
     /**
+     * 设备房间相关
+     */
+    ROOM_IS_NOT_EXIST("60001", "房间信息不存在!"),
+
+    /**
      * 群组相关
      */
     GROUP_NAME_ISNULL("70001", "群组名称不能为空!"),
@@ -64,20 +69,10 @@ public enum ErrorEnum implements ErrorEnumInterface{
     DEVICE_ALREADY_IN_GROUP("70007","设备已绑定群组，请勿重复添加"),
     GROUP_NAME_IS_EXIST("70008", "群组名称已存在!"),
 
-    /**
-     * 设备房间相关
-     */
-    ROOM_IS_NOT_EXIST("60001", "房间信息不存在!"),
 
 
-    /**
-     * 设备分享相关
-     */
-    SHARE_IS_NOT_REPEAT("70001", "请勿重复发送分享邀请!"),
-    SHARER_IS_NOT_EXIST("70002", "分享人不存在!"),
-    EXIST_NOT_DEAL_SHARE("70003", "存在未处理的邀请，请回主页查看!"),
-    SHARE_INFO_NOT_EXIST("70004", "分享邀请不存在!"),
-    SHARE_INFO_ALREADY_DEAL("70005", "分享邀请已处理!"),
+
+
 
     /**
      * 文件相关
@@ -93,10 +88,19 @@ public enum ErrorEnum implements ErrorEnumInterface{
     /**
      * web端角色相关
      */
-    ROLE_ALREADY_EXISTS("90001","角色已存在"),
-    ROLE_ALREADY_DISABLED("90002","角色已禁用"),
-    ROLE_CODE_NOT_NULL("90003","角色编码不能为空"),
-    ROLE_NOT_EXIST("90004","角色不存在")
+    ROLE_ALREADY_EXISTS("90001","角色已存在!"),
+    ROLE_ALREADY_DISABLED("90002","角色已禁用!"),
+    ROLE_CODE_NOT_NULL("90003","角色编码不能为空!"),
+    ROLE_NOT_EXIST("90004","角色不存在!"),
+
+    /**
+     * 分享相关
+     */
+    SHARE_IS_NOT_REPEAT("11001", "请勿重复发送分享邀请!"),
+    SHARER_IS_NOT_EXIST("11002", "分享人不存在!"),
+    EXIST_NOT_DEAL_SHARE("11003", "存在未处理的邀请，请回主页查看!"),
+    SHARE_INFO_NOT_EXIST("11004", "分享邀请不存在!"),
+    SHARE_INFO_ALREADY_DEAL("11005", "分享邀请已处理!"),
     ;
 
     private final String errorCode;

portal-service-domain/src/main/java/com/hfln/portal/domain/gateway/AdminGateway.java → portal-service-domain/src/main/java/com/hfln/portal/domain/gateway/WebGateway.java

@@ -14,7 +14,7 @@ import javax.validation.Valid;
 import java.io.IOException;
 import java.util.List;
 
-public interface AdminGateway {
+public interface WebGateway {
 
     /**
      * web设备列表相关
@@ -33,10 +33,14 @@ public interface AdminGateway {
 
     void sendCode();
 
+    /**
+     * web超管相关
+     */
     void reset(AdminResetParam param);
 
     void addAccount(@Valid AdminAddParam param);;
 
+
     /**
      * web角色相关
      */

portal-service-infrastructure/src/main/java/com/hfln/portal/infrastructure/gateway/impl/AdminGatewayImpl.java → portal-service-infrastructure/src/main/java/com/hfln/portal/infrastructure/gateway/impl/WebGatewayImpl.java

@@ -21,7 +21,7 @@ import com.hfln.portal.domain.customer.DeviceType;
 import com.hfln.portal.domain.customer.util.CopyUtils;
 import com.hfln.portal.domain.customer.util.PasswordUtil;
 import com.hfln.portal.domain.exception.ErrorEnum;
-import com.hfln.portal.domain.gateway.AdminGateway;
+import com.hfln.portal.domain.gateway.WebGateway;
 import com.hfln.portal.domain.gateway.sms.SmsGateway;
 import com.hfln.portal.infrastructure.config.UserAuthService;
 import com.hfln.portal.infrastructure.po.*;
@@ -48,7 +48,7 @@ import java.util.stream.Collectors;
 
 @Slf4j
 @Service
-public class AdminGatewayImpl implements AdminGateway {
+public class WebGatewayImpl implements WebGateway {
 
     @Autowired
     private DevInfoService devInfoService;

portal-service-infrastructure/src/main/java/com/hfln/portal/infrastructure/po/TblSystemMenu.java

@@ -27,7 +27,7 @@ public class TblSystemMenu extends BasePO{
     private String menuName;
 
     /**
-     * 菜单类型
+     * 菜单类型  枚举值：MenuTypeEnum
      */
     private Long menuType;