From f14cde028709b5b883cf8d79fb6fd25db3f6a7f7 Mon Sep 17 00:00:00 2001 From: gaoxq <376340421@qq.com> Date: Sun, 8 Mar 2026 13:05:57 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=A7=E5=B1=8F=E9=A1=B9=E7=9B=AE=E5=88=9D?= =?UTF-8?q?=E5=A7=8B=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- screen-vue/src/api/bizModule.js | 11 + screen-vue/src/api/bizModuleUser.js | 34 ++ screen-vue/src/api/bizUser.js | 11 + .../src/views/database/screen/index.vue | 27 +- screen-vue/src/views/database/screen/role.vue | 378 +++++++++--------- screen-vue/src/views/system/menu/list.vue | 2 +- screen-vue/src/views/system/role/index.vue | 1 + screen-vue/src/views/system/user/list.vue | 2 +- .../mini/mybigscreen/Model/ModuleUser.java | 14 + .../biz/controller/HomeModuleController.java | 6 +- .../controller/HomeModuleGroupController.java | 31 -- .../controller/HomeModuleUserController.java | 27 +- .../biz/controller/HomeUserController.java | 5 + .../biz/domain/HomeModuleGroup.java | 38 -- .../mini/mybigscreen/biz/domain/HomeUser.java | 44 +- .../biz/mapper/HomeModuleGroupMapper.java | 16 - .../biz/mapper/HomeUserMapper.java | 3 +- .../biz/service/HomeModuleGroupService.java | 16 - .../impl/HomeModuleGroupServiceImpl.java | 20 - 19 files changed, 329 insertions(+), 357 deletions(-) create mode 100644 screen-vue/src/api/bizModuleUser.js create mode 100644 src/main/java/com/mini/mybigscreen/Model/ModuleUser.java delete mode 100644 src/main/java/com/mini/mybigscreen/biz/controller/HomeModuleGroupController.java delete mode 100644 src/main/java/com/mini/mybigscreen/biz/domain/HomeModuleGroup.java delete mode 100644 src/main/java/com/mini/mybigscreen/biz/mapper/HomeModuleGroupMapper.java delete mode 100644 src/main/java/com/mini/mybigscreen/biz/service/HomeModuleGroupService.java delete mode 100644 src/main/java/com/mini/mybigscreen/biz/service/impl/HomeModuleGroupServiceImpl.java diff --git a/screen-vue/src/api/bizModule.js b/screen-vue/src/api/bizModule.js index d7a8c43..ac9d59e 100644 --- a/screen-vue/src/api/bizModule.js +++ b/screen-vue/src/api/bizModule.js @@ -9,4 +9,15 @@ export function getHomeModuleList(params) { method: 'get', params: params }) +} + +/** + * 删除信息列表 + */ +export function getHomeModuleDelete(params) { + return request({ + url: '/biz/homeModule/delete', + method: 'post', + params: params + }) } \ No newline at end of file diff --git a/screen-vue/src/api/bizModuleUser.js b/screen-vue/src/api/bizModuleUser.js new file mode 100644 index 0000000..2c6e6af --- /dev/null +++ b/screen-vue/src/api/bizModuleUser.js @@ -0,0 +1,34 @@ +import request from '@/utils/request' + +/** + * 获取指标信息列表 + */ +export function getHomeModuleUserList(params) { + return request({ + url: '/biz/homeModuleUser/userList', + method: 'get', + params: params + }) +} + +/** + * 保存信息列表 + */ +export function getHomeModuleUserSave(data) { + return request({ + url: '/biz/homeModuleUser/save', + method: 'post', + data + }) +} + +/** + * 删除信息列表 + */ +export function getHomeModuleUserDelete(params) { + return request({ + url: '/biz/homeModuleUser/delete', + method: 'post', + params: params + }) +} \ No newline at end of file diff --git a/screen-vue/src/api/bizUser.js b/screen-vue/src/api/bizUser.js index 4b9b504..011ebaa 100644 --- a/screen-vue/src/api/bizUser.js +++ b/screen-vue/src/api/bizUser.js @@ -11,6 +11,17 @@ export function getHomeUserList(params) { }) } +/** + * 获取用户信息列表 + */ +export function getHomeUserListAll(params) { + return request({ + url: '/biz/homeUser/listAll', + method: 'get', + params: params + }) +} + /** * 保存用户信息列表 */ diff --git a/screen-vue/src/views/database/screen/index.vue b/screen-vue/src/views/database/screen/index.vue index b59c769..2557db3 100644 --- a/screen-vue/src/views/database/screen/index.vue +++ b/screen-vue/src/views/database/screen/index.vue @@ -9,8 +9,8 @@
{ try { - const res = await getHomeModuleGroupList({}); - - - console.log(res ) - - // listData.value = res || [] + const res = await getHomeModuleList(); + listData.value = res || [] } catch (error) { console.log(error); } @@ -82,7 +78,7 @@ const handleEdit = (item) => { } const handleDelete = (item) => { - ElMessageBox.confirm('确定要删除当前角色吗?', '删除确认', { + ElMessageBox.confirm('确定要删除当前模块吗?', '删除确认', { type: 'warning', closeOnClickModal: false, showClose: false @@ -91,12 +87,12 @@ const handleDelete = (item) => { const reqParams = { roleId: item.roleId } - const res = await getHomeRoleDelete(reqParams); + const res = await getHomeModuleUserDelete(reqParams); ElMessage.success(res.msg); getListData(); }) .catch(() => { - ElMessage.info('已取消删除角色操作'); + ElMessage.info('已取消删除模块操作'); }); } @@ -120,16 +116,15 @@ const handleSave = async () => { if (formComponentRef.value) { const isValid = await formComponentRef.value.validate() if (!isValid) { + ElMessage.warning('表单验证失败,请检查必填项'); return } - const selectedMenuIds = formComponentRef.value.getSelectedMenuIds() - roleForm.value.menuIds = selectedMenuIds } const reqParams = { ... roleForm.value } saveLoading.value = true - const res = await getHomeRoleAssign(reqParams); + const res = await getHomeModuleUserSave(reqParams); setTimeout(() => { ElMessage.success(res.msg) saveLoading.value = false diff --git a/screen-vue/src/views/database/screen/role.vue b/screen-vue/src/views/database/screen/role.vue index 8dd27bf..7f30b5b 100644 --- a/screen-vue/src/views/database/screen/role.vue +++ b/screen-vue/src/views/database/screen/role.vue @@ -1,246 +1,236 @@ \ No newline at end of file diff --git a/screen-vue/src/views/system/menu/list.vue b/screen-vue/src/views/system/menu/list.vue index b9d1eb8..e00af68 100644 --- a/screen-vue/src/views/system/menu/list.vue +++ b/screen-vue/src/views/system/menu/list.vue @@ -235,7 +235,7 @@ const handleSave = async () => { if (formComponentRef.value) { const isValid = await formComponentRef.value.validate() if (!isValid) { - ElMessage.warning('表单验证失败，请检查必填项') + ElMessage.warning('表单验证失败,请检查必填项'); return } } diff --git a/screen-vue/src/views/system/role/index.vue b/screen-vue/src/views/system/role/index.vue index 4fc3d3f..def568b 100644 --- a/screen-vue/src/views/system/role/index.vue +++ b/screen-vue/src/views/system/role/index.vue @@ -114,6 +114,7 @@ const handleSave = async () => { if (formComponentRef.value) { const isValid = await formComponentRef.value.validate() if (!isValid) { + ElMessage.warning('表单验证失败,请检查必填项'); return } const selectedMenuIds = formComponentRef.value.getSelectedMenuIds() diff --git a/screen-vue/src/views/system/user/list.vue b/screen-vue/src/views/system/user/list.vue index daca23d..db62551 100644 --- a/screen-vue/src/views/system/user/list.vue +++ b/screen-vue/src/views/system/user/list.vue @@ -266,7 +266,7 @@ const handleSave = async () => { if (formComponentRef.value) { const isValid = await formComponentRef.value.validate() if (!isValid) { - ElMessage.warning('表单验证失败，请检查必填项') + ElMessage.warning('表单验证失败,请检查必填项') return } } diff --git a/src/main/java/com/mini/mybigscreen/Model/ModuleUser.java b/src/main/java/com/mini/mybigscreen/Model/ModuleUser.java new file mode 100644 index 0000000..b76d2b1 --- /dev/null +++ b/src/main/java/com/mini/mybigscreen/Model/ModuleUser.java @@ -0,0 +1,14 @@ +package com.mini.mybigscreen.Model; + +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +@Data +public class ModuleUser implements Serializable { + + private String moduleId; + private String moduleName; + private List userIds; +} diff --git a/src/main/java/com/mini/mybigscreen/biz/controller/HomeModuleController.java b/src/main/java/com/mini/mybigscreen/biz/controller/HomeModuleController.java index ad92364..6b625f0 100644 --- a/src/main/java/com/mini/mybigscreen/biz/controller/HomeModuleController.java +++ b/src/main/java/com/mini/mybigscreen/biz/controller/HomeModuleController.java @@ -2,10 +2,10 @@ package com.mini.mybigscreen.biz.controller; import com.mini.mybigscreen.Model.Message; import com.mini.mybigscreen.Model.Result; -import com.mini.mybigscreen.biz.service.HomeModuleGroupService; import com.mini.mybigscreen.biz.service.HomeModuleService; import jakarta.annotation.Resource; import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -34,7 +34,9 @@ public class HomeModuleController { } - public Result delete() { + @PostMapping("delete") + public Result delete(String moduleId) { + System.out.println(moduleId); return Result.success(new Message("数据删除成功", 200)); } } diff --git a/src/main/java/com/mini/mybigscreen/biz/controller/HomeModuleGroupController.java b/src/main/java/com/mini/mybigscreen/biz/controller/HomeModuleGroupController.java deleted file mode 100644 index df7d34b..0000000 --- a/src/main/java/com/mini/mybigscreen/biz/controller/HomeModuleGroupController.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.mini.mybigscreen.biz.controller; - -import com.mini.mybigscreen.Model.Result; -import com.mini.mybigscreen.biz.service.HomeModuleGroupService; -import jakarta.annotation.Resource; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -/** - *

- * 前端控制器 - *

- * - * @author gaoxq - * @since 2026-03-07 - */ -@RestController -@RequestMapping("/biz/homeModuleGroup") -public class HomeModuleGroupController { - - - @Resource - private HomeModuleGroupService moduleGroupService; - - @GetMapping("list") - public Result getList(){ - return Result.success(moduleGroupService.list()); - } - -} diff --git a/src/main/java/com/mini/mybigscreen/biz/controller/HomeModuleUserController.java b/src/main/java/com/mini/mybigscreen/biz/controller/HomeModuleUserController.java index bb4e65e..3d539d5 100644 --- a/src/main/java/com/mini/mybigscreen/biz/controller/HomeModuleUserController.java +++ b/src/main/java/com/mini/mybigscreen/biz/controller/HomeModuleUserController.java @@ -3,18 +3,18 @@ package com.mini.mybigscreen.biz.controller; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.github.yulichang.wrapper.MPJLambdaWrapper; import com.mini.mybigscreen.Model.Message; +import com.mini.mybigscreen.Model.ModuleUser; import com.mini.mybigscreen.Model.Result; import com.mini.mybigscreen.biz.domain.HomeModule; import com.mini.mybigscreen.biz.domain.HomeModuleUser; import com.mini.mybigscreen.biz.domain.HomeUser; import com.mini.mybigscreen.biz.mapper.HomeModuleMapper; +import com.mini.mybigscreen.biz.service.HomeModuleUserService; import com.mini.mybigscreen.biz.service.HomeUserService; import jakarta.annotation.Resource; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpSession; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import java.util.List; @@ -37,6 +37,9 @@ public class HomeModuleUserController { @Resource private HomeModuleMapper homeModuleMapper; + @Resource + private HomeModuleUserService moduleUserService; + @GetMapping("list") public Result> getList(HttpServletRequest request) { HttpSession session = request.getSession(false); @@ -56,12 +59,24 @@ public class HomeModuleUserController { return Result.success(moduleList); } - - public Result save() { - return Result.success(new Message("数据新增成功", 200)); + /** + * 获取模块已有的用户 + */ + @GetMapping("userList") + public Result getUserModuleList(String moduleId) { + LambdaQueryWrapper ModuleUserQuery = new LambdaQueryWrapper() + .eq(HomeModuleUser::getModuleId, moduleId); + List moduleUserList = moduleUserService.list(ModuleUserQuery); + return Result.success(moduleUserList); } + @PostMapping("save") + public Result save(@RequestBody ModuleUser moduleUser) { + return Result.success(new Message("数据新增成功", 200)); + } + + @PostMapping("delete") public Result delete() { return Result.success(new Message("数据删除成功", 200)); } diff --git a/src/main/java/com/mini/mybigscreen/biz/controller/HomeUserController.java b/src/main/java/com/mini/mybigscreen/biz/controller/HomeUserController.java index aa370b0..24d3471 100644 --- a/src/main/java/com/mini/mybigscreen/biz/controller/HomeUserController.java +++ b/src/main/java/com/mini/mybigscreen/biz/controller/HomeUserController.java @@ -32,6 +32,11 @@ public class HomeUserController { @Resource private HomeUserService userService; + @GetMapping("listAll") + public Result getListAll() { + return Result.success(userService.list()); + } + @GetMapping("list") public Result getList(Integer pageNum, Integer pageSize, diff --git a/src/main/java/com/mini/mybigscreen/biz/domain/HomeModuleGroup.java b/src/main/java/com/mini/mybigscreen/biz/domain/HomeModuleGroup.java deleted file mode 100644 index e6f0b25..0000000 --- a/src/main/java/com/mini/mybigscreen/biz/domain/HomeModuleGroup.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.mini.mybigscreen.biz.domain; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import java.io.Serializable; -import java.time.LocalDateTime; -import lombok.Getter; -import lombok.Setter; - -/** - *

- * - *

- * - * @author gaoxq - * @since 2026-03-07 - */ -@Getter -@Setter -@TableName("biz_home_module_group") -public class HomeModuleGroup implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableField("create_time") - private LocalDateTime createTime; - - @TableId(value = "group_id", type = IdType.AUTO) - private String groupId; - - @TableField("group_name") - private String groupName; - - @TableField("ustatus") - private Integer ustatus; -} diff --git a/src/main/java/com/mini/mybigscreen/biz/domain/HomeUser.java b/src/main/java/com/mini/mybigscreen/biz/domain/HomeUser.java index 4faf463..0224eff 100644 --- a/src/main/java/com/mini/mybigscreen/biz/domain/HomeUser.java +++ b/src/main/java/com/mini/mybigscreen/biz/domain/HomeUser.java @@ -4,9 +4,8 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; - -import java.io.Serial; import java.io.Serializable; +import java.time.LocalDateTime; import com.mini.mybigscreen.Model.BaseEntity; import lombok.Getter; @@ -14,22 +13,24 @@ import lombok.Setter; /** *

- * + * *

* * @author gaoxq - * @since 2026-02-28 + * @since 2026-03-07 */ @Getter @Setter @TableName("biz_home_user") -public class HomeUser extends BaseEntity implements Serializable { +public class HomeUser extends BaseEntity implements Serializable { - @Serial private static final long serialVersionUID = 1L; + /** + * 记录日期 + */ @TableField("create_time") - private String createTime; + private LocalDateTime createTime; @TableId(value = "user_id", type = IdType.AUTO) private String userId; @@ -47,7 +48,7 @@ public class HomeUser extends BaseEntity implements Serializable { * 性别 */ @TableField("sex") - private String sex; + private Integer sex; /** * 电子邮件 @@ -67,12 +68,6 @@ public class HomeUser extends BaseEntity implements Serializable { @TableField("role_id") private String roleId; - /** - * 模块名称 - */ - @TableField("group_module_id") - private String groupModuleId; - /** * 用户状态 */ @@ -90,4 +85,25 @@ public class HomeUser extends BaseEntity implements Serializable { */ @TableField("last_login_ip") private String lastLoginIp; + + @TableField("f_tenant_id") + private String fTenantId; + + /** + * 流程id + */ + @TableField("f_flow_id") + private String fFlowId; + + /** + * 流程任务主键 + */ + @TableField("f_flow_task_id") + private String fFlowTaskId; + + /** + * 流程任务状态 + */ + @TableField("f_flow_state") + private Integer fFlowState; } diff --git a/src/main/java/com/mini/mybigscreen/biz/mapper/HomeModuleGroupMapper.java b/src/main/java/com/mini/mybigscreen/biz/mapper/HomeModuleGroupMapper.java deleted file mode 100644 index cfdbf44..0000000 --- a/src/main/java/com/mini/mybigscreen/biz/mapper/HomeModuleGroupMapper.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.mini.mybigscreen.biz.mapper; - -import com.github.yulichang.base.MPJBaseMapper; -import com.mini.mybigscreen.biz.domain.HomeModuleGroup; - -/** - *

- * Mapper 接口 - *

- * - * @author gaoxq - * @since 2026-03-07 - */ -public interface HomeModuleGroupMapper extends MPJBaseMapper { - -} diff --git a/src/main/java/com/mini/mybigscreen/biz/mapper/HomeUserMapper.java b/src/main/java/com/mini/mybigscreen/biz/mapper/HomeUserMapper.java index 4ca3e0e..224c7db 100644 --- a/src/main/java/com/mini/mybigscreen/biz/mapper/HomeUserMapper.java +++ b/src/main/java/com/mini/mybigscreen/biz/mapper/HomeUserMapper.java @@ -2,14 +2,13 @@ package com.mini.mybigscreen.biz.mapper; import com.github.yulichang.base.MPJBaseMapper; import com.mini.mybigscreen.biz.domain.HomeUser; - /** *

* Mapper 接口 *

* * @author gaoxq - * @since 2026-02-28 + * @since 2026-03-07 */ public interface HomeUserMapper extends MPJBaseMapper { diff --git a/src/main/java/com/mini/mybigscreen/biz/service/HomeModuleGroupService.java b/src/main/java/com/mini/mybigscreen/biz/service/HomeModuleGroupService.java deleted file mode 100644 index f9da9a2..0000000 --- a/src/main/java/com/mini/mybigscreen/biz/service/HomeModuleGroupService.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.mini.mybigscreen.biz.service; - -import com.mini.mybigscreen.biz.domain.HomeModuleGroup; -import com.baomidou.mybatisplus.extension.service.IService; - -/** - *

- * 服务类 - *

- * - * @author gaoxq - * @since 2026-03-07 - */ -public interface HomeModuleGroupService extends IService { - -} diff --git a/src/main/java/com/mini/mybigscreen/biz/service/impl/HomeModuleGroupServiceImpl.java b/src/main/java/com/mini/mybigscreen/biz/service/impl/HomeModuleGroupServiceImpl.java deleted file mode 100644 index 67a2061..0000000 --- a/src/main/java/com/mini/mybigscreen/biz/service/impl/HomeModuleGroupServiceImpl.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.mini.mybigscreen.biz.service.impl; - -import com.mini.mybigscreen.biz.domain.HomeModuleGroup; -import com.mini.mybigscreen.biz.mapper.HomeModuleGroupMapper; -import com.mini.mybigscreen.biz.service.HomeModuleGroupService; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import org.springframework.stereotype.Service; - -/** - *

- * 服务实现类 - *

- * - * @author gaoxq - * @since 2026-03-07 - */ -@Service -public class HomeModuleGroupServiceImpl extends ServiceImpl implements HomeModuleGroupService { - -}