前端预览加权限设置页面相关sql修改

2026-06-26 17:31:10 +08:00
parent 046f4c5e1b
commit 94c5e076f8
358 changed files with 19634 additions and 603 deletions
--- a/fad-rolling-mill/src/main/java/com/ruoyi/rm/controller/RmCommissioningController.java
+++ b/fad-rolling-mill/src/main/java/com/ruoyi/rm/controller/RmCommissioningController.java
@@ -0,0 +1,69 @@
+package com.ruoyi.rm.controller;
+
+import java.util.List;
+import java.util.Arrays;
+
+import lombok.RequiredArgsConstructor;
+import javax.validation.constraints.*;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.validation.annotation.Validated;
+import com.ruoyi.common.annotation.RepeatSubmit;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.PageQuery;
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.validate.AddGroup;
+import com.ruoyi.common.core.validate.EditGroup;
+import com.ruoyi.common.core.validate.QueryGroup;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.rm.domain.vo.RmCommissioningVo;
+import com.ruoyi.rm.domain.bo.RmCommissioningBo;
+import com.ruoyi.rm.service.IRmCommissioningService;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/rm/commissioning")
+public class RmCommissioningController extends BaseController {
+
+    private final IRmCommissioningService iRmCommissioningService;
+
+    @GetMapping("/list")
+    public TableDataInfo<RmCommissioningVo> list(RmCommissioningBo bo, PageQuery pageQuery) {
+        return iRmCommissioningService.queryPageList(bo, pageQuery);
+    }
+
+    @GetMapping("/all")
+    public R<List<RmCommissioningVo>> all(RmCommissioningBo bo) {
+        return R.ok(iRmCommissioningService.queryList(bo));
+    }
+
+    @GetMapping("/byProject/{projectId}")
+    public R<RmCommissioningVo> getByProjectId(@PathVariable Long projectId) {
+        return R.ok(iRmCommissioningService.queryByProjectId(projectId));
+    }
+
+    @GetMapping("/{commissioningId}")
+    public R<RmCommissioningVo> getInfo(@NotNull(message = "主键不能为空") @PathVariable Long commissioningId) {
+        return R.ok(iRmCommissioningService.queryById(commissioningId));
+    }
+
+    @PostMapping()
+    @RepeatSubmit()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody RmCommissioningBo bo) {
+        return toAjax(iRmCommissioningService.insertByBo(bo));
+    }
+
+    @PutMapping()
+    @RepeatSubmit()
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody RmCommissioningBo bo) {
+        return toAjax(iRmCommissioningService.updateByBo(bo));
+    }
+
+    @DeleteMapping("/{commissioningIds}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空") @PathVariable Long[] commissioningIds) {
+        return toAjax(iRmCommissioningService.deleteWithValidByIds(Arrays.asList(commissioningIds), true));
+    }
+}
--- a/fad-rolling-mill/src/main/java/com/ruoyi/rm/controller/RmDashboardController.java
+++ b/fad-rolling-mill/src/main/java/com/ruoyi/rm/controller/RmDashboardController.java
@@ -19,7 +19,7 @@ public class RmDashboardController extends BaseController {
    private final IRmDashboardService dashboardService;

    @GetMapping("/stageStatus/{projectId}")
-    public R<Map<String, String>> stageStatus(@PathVariable @NotNull Long projectId) {
+    public R<Map<String, Object>> stageStatus(@PathVariable @NotNull Long projectId) {
        return R.ok(dashboardService.getStageStatus(projectId));
    }
 }
--- a/fad-rolling-mill/src/main/java/com/ruoyi/rm/controller/RmStageConfirmController.java
+++ b/fad-rolling-mill/src/main/java/com/ruoyi/rm/controller/RmStageConfirmController.java
@@ -0,0 +1,38 @@
+package com.ruoyi.rm.controller;
+
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.rm.domain.bo.RmStageConfirmBo;
+import com.ruoyi.rm.domain.vo.RmStageConfirmVo;
+import com.ruoyi.rm.service.IRmStageConfirmService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.constraints.NotNull;
+import java.util.List;
+
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/rm/stageConfirm")
+public class RmStageConfirmController extends BaseController {
+
+    private final IRmStageConfirmService stageConfirmService;
+
+    @GetMapping("/{projectId}")
+    public R<List<RmStageConfirmVo>> list(@PathVariable @NotNull Long projectId) {
+        return R.ok(stageConfirmService.queryByProjectId(projectId));
+    }
+
+    @PostMapping
+    public R<Void> confirm(@RequestBody @Validated RmStageConfirmBo bo) {
+        return toAjax(stageConfirmService.confirmStage(bo));
+    }
+
+    @PostMapping("/override")
+    public R<Void> override(@RequestBody @Validated RmStageConfirmBo bo) {
+        bo.setConfirmType("override");
+        return toAjax(stageConfirmService.confirmStage(bo));
+    }
+}
--- a/fad-rolling-mill/src/main/java/com/ruoyi/rm/controller/RmStageImageController.java
+++ b/fad-rolling-mill/src/main/java/com/ruoyi/rm/controller/RmStageImageController.java
@@ -0,0 +1,61 @@
+package com.ruoyi.rm.controller;
+
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.PageQuery;
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.rm.domain.bo.RmStageImageBo;
+import com.ruoyi.rm.domain.vo.RmStageImageVo;
+import com.ruoyi.rm.service.IRmStageImageService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+import java.util.Arrays;
+import java.util.List;
+
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/rm/stageImage")
+public class RmStageImageController extends BaseController {
+
+    private final IRmStageImageService service;
+
+    @GetMapping("/list")
+    public TableDataInfo<RmStageImageVo> list(RmStageImageBo bo, PageQuery pageQuery) {
+        return service.queryPageList(bo, pageQuery);
+    }
+
+    @GetMapping("/{imageId}")
+    public R<RmStageImageVo> getInfo(@PathVariable @NotNull Long imageId) {
+        return R.ok(service.queryById(imageId));
+    }
+
+    @Log(title = "阶段图片", businessType = BusinessType.INSERT)
+    @PostMapping
+    public R<Void> add(@Validated @RequestBody RmStageImageBo bo) {
+        return toAjax(service.insertByBo(bo));
+    }
+
+    @Log(title = "阶段图片", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public R<Void> edit(@Validated @RequestBody RmStageImageBo bo) {
+        return toAjax(service.updateByBo(bo));
+    }
+
+    @Log(title = "阶段图片", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{imageIds}")
+    public R<Void> remove(@PathVariable @NotEmpty Long[] imageIds) {
+        return toAjax(service.deleteWithValidByIds(Arrays.asList(imageIds), true));
+    }
+
+    @GetMapping("/all")
+    public R<List<RmStageImageVo>> all(RmStageImageBo bo) {
+        return R.ok(service.queryList(bo));
+    }
+}
--- a/fad-rolling-mill/src/main/java/com/ruoyi/rm/controller/RmStageUserPermController.java
+++ b/fad-rolling-mill/src/main/java/com/ruoyi/rm/controller/RmStageUserPermController.java
@@ -0,0 +1,64 @@
+package com.ruoyi.rm.controller;
+
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.domain.entity.SysUser;
+import com.ruoyi.rm.domain.bo.RmStageUserPermBo;
+import com.ruoyi.rm.domain.vo.RmStageUserPermVo;
+import com.ruoyi.rm.service.IRmStageUserPermService;
+import com.ruoyi.system.domain.SysUserRole;
+import com.ruoyi.system.mapper.SysUserMapper;
+import com.ruoyi.system.mapper.SysUserRoleMapper;
+import lombok.RequiredArgsConstructor;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.*;
+import java.util.stream.Collectors;
+
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/rm/stageUserPerm")
+public class RmStageUserPermController extends BaseController {
+
+    private final IRmStageUserPermService stageUserPermService;
+    private final SysUserMapper sysUserMapper;
+    private final SysUserRoleMapper sysUserRoleMapper;
+
+    @GetMapping("/list")
+    public R<List<RmStageUserPermVo>> list(RmStageUserPermBo bo) {
+        return R.ok(stageUserPermService.queryList(bo));
+    }
+
+    @PostMapping("/batchSave")
+    public R<Void> batchSave(@RequestBody List<RmStageUserPermBo> list) {
+        stageUserPermService.batchSave(list);
+        return R.ok("保存成功");
+    }
+
+    @GetMapping("/users")
+    public R<List<Map<String, Object>>> listUsers() {
+        List<SysUser> users = sysUserMapper.selectList(
+            Wrappers.<SysUser>lambdaQuery()
+                .eq(SysUser::getStatus, "0")
+                .orderByAsc(SysUser::getUserId));
+
+        // Build userId -> roleIds map
+        List<SysUserRole> allUserRoles = sysUserRoleMapper.selectList(Wrappers.emptyWrapper());
+        Map<Long, List<Long>> userRoleMap = allUserRoles.stream()
+            .collect(Collectors.groupingBy(SysUserRole::getUserId,
+                Collectors.mapping(SysUserRole::getRoleId, Collectors.toList())));
+
+        List<Map<String, Object>> result = new ArrayList<>();
+        for (SysUser user : users) {
+            Map<String, Object> item = new LinkedHashMap<>();
+            item.put("userId", user.getUserId());
+            item.put("nickName", user.getNickName());
+            item.put("roleIds", userRoleMap.getOrDefault(user.getUserId(), Collections.emptyList()));
+            result.add(item);
+        }
+        return R.ok(result);
+    }
+}