DeXun/fad_oa
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
jhd
2026-06-26 17:31:10 +08:00
parent 046f4c5e1b
commit 94c5e076f8
358 changed files with 19634 additions and 603 deletions
Download Patch File Download Diff File Expand all files Collapse all files

69
fad-rolling-mill/src/main/java/com/ruoyi/rm/controller/RmCommissioningController.java Normal file
View File

@@ -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));
}
}

2
fad-rolling-mill/src/main/java/com/ruoyi/rm/controller/RmDashboardController.java
View File

@@ -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));
}
}

38
fad-rolling-mill/src/main/java/com/ruoyi/rm/controller/RmStageConfirmController.java Normal file
View File

@@ -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));
}
}

61
fad-rolling-mill/src/main/java/com/ruoyi/rm/controller/RmStageImageController.java Normal file
View File

@@ -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));
}
}

64
fad-rolling-mill/src/main/java/com/ruoyi/rm/controller/RmStageUserPermController.java Normal file
View File

@@ -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);
}
}

19
fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/bo/RmCommissioningBo.java Normal file
View File

@@ -0,0 +1,19 @@
package com.ruoyi.rm.domain.bo;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.core.domain.BaseEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.util.Date;
@Data
@EqualsAndHashCode(callSuper = true)
public class RmCommissioningBo extends BaseEntity {
private Long commissioningId;
private Long projectId;
@JsonFormat(pattern = "yyyy-MM-dd")
private Date commissioningDate;
private String confirmer;
private String remark;
}

1
fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/bo/RmInstallFeedbackBo.java
View File

@@ -21,5 +21,6 @@ public class RmInstallFeedbackBo extends BaseEntity {
private String solution;
private String preventAction;
private String status;
private String attachmentUrl;
private String remark;
}

15
fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/bo/RmStageConfirmBo.java Normal file
View File

@@ -0,0 +1,15 @@
package com.ruoyi.rm.domain.bo;
import com.ruoyi.common.core.domain.BaseEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
@Data
@EqualsAndHashCode(callSuper = true)
public class RmStageConfirmBo extends BaseEntity {
private Long confirmId;
private Long projectId;
private String stageKey;
private String confirmType;
private String remark;
}

17
fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/bo/RmStageImageBo.java Normal file
View File

@@ -0,0 +1,17 @@
package com.ruoyi.rm.domain.bo;
import com.ruoyi.common.core.domain.BaseEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
@Data
@EqualsAndHashCode(callSuper = true)
public class RmStageImageBo extends BaseEntity {
private Long imageId;
private Long projectId;
private String stageKey;
private String imageUrl;
private String description;
private Integer sortOrder;
}

15
fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/bo/RmStageUserPermBo.java Normal file
View File

@@ -0,0 +1,15 @@
package com.ruoyi.rm.domain.bo;
import com.ruoyi.common.core.domain.BaseEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
@Data
@EqualsAndHashCode(callSuper = true)
public class RmStageUserPermBo extends BaseEntity {
private Long id;
private Long userId;
private String stageKey;
private String canOverride;
private String canConfirm;
}

2
fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/bo/RmTechPlanItemBo.java
View File

@@ -14,6 +14,8 @@ public class RmTechPlanItemBo extends BaseEntity {
private String status;
private String description;
private String owner;
private String completionDate;
private String endDate;
private String attachmentUrl;
private String remark;
}

29
fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/entity/RmCommissioning.java Normal file
View File

@@ -0,0 +1,29 @@
package com.ruoyi.rm.domain.entity;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.core.domain.BaseEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.io.Serializable;
import java.util.Date;
@Data
@EqualsAndHashCode(callSuper = true)
@TableName("fad_rm_commissioning")
public class RmCommissioning extends BaseEntity implements Serializable {
private static final long serialVersionUID = 1L;
@TableId
private Long commissioningId;
private Long projectId;
@JsonFormat(pattern = "yyyy-MM-dd")
private Date commissioningDate;
private String confirmer;
private String remark;
@TableLogic
private Integer delFlag;
}

1
fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/entity/RmInstallFeedback.java
View File

@@ -29,6 +29,7 @@ public class RmInstallFeedback extends BaseEntity implements Serializable {
private String solution;
private String preventAction;
private String status;
private String attachmentUrl;
private String remark;
@TableLogic
private Integer delFlag;

29
fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/entity/RmStageConfirm.java Normal file
View File

@@ -0,0 +1,29 @@
package com.ruoyi.rm.domain.entity;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableName;
import com.ruoyi.common.core.domain.BaseEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.io.Serializable;
import java.util.Date;
@Data
@EqualsAndHashCode(callSuper = true)
@TableName("fad_rm_stage_confirm")
public class RmStageConfirm extends BaseEntity implements Serializable {
private static final long serialVersionUID = 1L;
@TableId
private Long confirmId;
private Long projectId;
private String stageKey;
private String confirmType;
private Long confirmerId;
private Date confirmedAt;
private String remark;
@TableLogic
private Integer delFlag;
}

25
fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/entity/RmStageImage.java Normal file
View File

@@ -0,0 +1,25 @@
package com.ruoyi.rm.domain.entity;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableName;
import com.ruoyi.common.core.domain.BaseEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
@Data
@EqualsAndHashCode(callSuper = true)
@TableName("fad_rm_stage_image")
public class RmStageImage extends BaseEntity {
private static final long serialVersionUID = 1L;
@TableId
private Long imageId;
private Long projectId;
private String stageKey;
private String imageUrl;
private String description;
private Integer sortOrder;
@TableLogic
private Integer delFlag;
}

23
fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/entity/RmStageUserPerm.java Normal file
View File

@@ -0,0 +1,23 @@
package com.ruoyi.rm.domain.entity;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.ruoyi.common.core.domain.BaseEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.io.Serializable;
@Data
@EqualsAndHashCode(callSuper = true)
@TableName("fad_rm_stage_user_perm")
public class RmStageUserPerm extends BaseEntity implements Serializable {
private static final long serialVersionUID = 1L;
@TableId
private Long id;
private Long userId;
private String stageKey;
private String canOverride;
private String canConfirm;
}

2
fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/entity/RmTechPlanItem.java
View File

@@ -22,6 +22,8 @@ public class RmTechPlanItem extends BaseEntity implements Serializable {
private String status;
private String description;
private String owner;
private String completionDate;
private String endDate;
private String attachmentUrl;
private String remark;
@TableLogic

28
fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/vo/RmCommissioningVo.java Normal file
View File

@@ -0,0 +1,28 @@
package com.ruoyi.rm.domain.vo;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.annotation.Excel;
import lombok.Data;
import java.io.Serializable;
import java.util.Date;
@Data
public class RmCommissioningVo implements Serializable {
private static final long serialVersionUID = 1L;
private Long commissioningId;
@Excel(name = "项目ID")
private Long projectId;
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "试车日期", width = 15)
private Date commissioningDate;
@Excel(name = "确认人")
private String confirmer;
@Excel(name = "备注")
private String remark;
}

3
fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/vo/RmInstallFeedbackVo.java
View File

@@ -41,4 +41,7 @@ public class RmInstallFeedbackVo implements Serializable {
@Excel(name = "状态")
private String status;
@Excel(name = "附件")
private String attachmentUrl;
}

20
fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/vo/RmStageConfirmVo.java Normal file
View File

@@ -0,0 +1,20 @@
package com.ruoyi.rm.domain.vo;
import lombok.Data;
import java.io.Serializable;
import java.util.Date;
@Data
public class RmStageConfirmVo implements Serializable {
private static final long serialVersionUID = 1L;
private Long confirmId;
private Long projectId;
private String stageKey;
private String confirmType;
private Long confirmerId;
private String confirmerName;
private Date confirmedAt;
private String remark;
}

29
fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/vo/RmStageImageVo.java Normal file
View File

@@ -0,0 +1,29 @@
package com.ruoyi.rm.domain.vo;
import com.ruoyi.common.annotation.Excel;
import lombok.Data;
import java.io.Serializable;
@Data
public class RmStageImageVo implements Serializable {
private static final long serialVersionUID = 1L;
@Excel(name = "图片ID")
private Long imageId;
@Excel(name = "项目ID")
private Long projectId;
@Excel(name = "阶段标识")
private String stageKey;
@Excel(name = "图片地址")
private String imageUrl;
@Excel(name = "描述")
private String description;
@Excel(name = "排序号")
private Integer sortOrder;
}

16
fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/vo/RmStageUserPermVo.java Normal file
View File

@@ -0,0 +1,16 @@
package com.ruoyi.rm.domain.vo;
import lombok.Data;
import java.io.Serializable;
@Data
public class RmStageUserPermVo implements Serializable {
private static final long serialVersionUID = 1L;
private Long id;
private Long userId;
private String stageKey;
private String canOverride;
private String canConfirm;
}

8
fad-rolling-mill/src/main/java/com/ruoyi/rm/domain/vo/RmTechPlanItemVo.java
View File

@@ -27,7 +27,13 @@ public class RmTechPlanItemVo implements Serializable {
@Excel(name = "负责人")
private String owner;
@Excel(name = "附件路径")
@Excel(name = "完成时间")
private String completionDate;
@Excel(name = "结束时间")
private String endDate;
@Excel(name = "附件")
private String attachmentUrl;
@Excel(name = "备注")

8
fad-rolling-mill/src/main/java/com/ruoyi/rm/mapper/RmCommissioningMapper.java Normal file
View File

@@ -0,0 +1,8 @@
package com.ruoyi.rm.mapper;
import com.ruoyi.common.core.mapper.BaseMapperPlus;
import com.ruoyi.rm.domain.entity.RmCommissioning;
import com.ruoyi.rm.domain.vo.RmCommissioningVo;
public interface RmCommissioningMapper extends BaseMapperPlus<RmCommissioningMapper, RmCommissioning, RmCommissioningVo> {
}

8
fad-rolling-mill/src/main/java/com/ruoyi/rm/mapper/RmStageConfirmMapper.java Normal file
View File

@@ -0,0 +1,8 @@
package com.ruoyi.rm.mapper;
import com.ruoyi.common.core.mapper.BaseMapperPlus;
import com.ruoyi.rm.domain.entity.RmStageConfirm;
import com.ruoyi.rm.domain.vo.RmStageConfirmVo;
public interface RmStageConfirmMapper extends BaseMapperPlus<RmStageConfirmMapper, RmStageConfirm, RmStageConfirmVo> {
}

8
fad-rolling-mill/src/main/java/com/ruoyi/rm/mapper/RmStageImageMapper.java Normal file
View File

@@ -0,0 +1,8 @@
package com.ruoyi.rm.mapper;
import com.ruoyi.common.core.mapper.BaseMapperPlus;
import com.ruoyi.rm.domain.entity.RmStageImage;
import com.ruoyi.rm.domain.vo.RmStageImageVo;
public interface RmStageImageMapper extends BaseMapperPlus<RmStageImageMapper, RmStageImage, RmStageImageVo> {
}

8
fad-rolling-mill/src/main/java/com/ruoyi/rm/mapper/RmStageUserPermMapper.java Normal file
View File

@@ -0,0 +1,8 @@
package com.ruoyi.rm.mapper;
import com.ruoyi.common.core.mapper.BaseMapperPlus;
import com.ruoyi.rm.domain.entity.RmStageUserPerm;
import com.ruoyi.rm.domain.vo.RmStageUserPermVo;
public interface RmStageUserPermMapper extends BaseMapperPlus<RmStageUserPermMapper, RmStageUserPerm, RmStageUserPermVo> {
}

26
fad-rolling-mill/src/main/java/com/ruoyi/rm/service/IRmCommissioningService.java Normal file
View File

@@ -0,0 +1,26 @@
package com.ruoyi.rm.service;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.core.domain.PageQuery;
import com.ruoyi.rm.domain.bo.RmCommissioningBo;
import com.ruoyi.rm.domain.vo.RmCommissioningVo;
import java.util.Collection;
import java.util.List;
public interface IRmCommissioningService {
RmCommissioningVo queryById(Long commissioningId);
RmCommissioningVo queryByProjectId(Long projectId);
TableDataInfo<RmCommissioningVo> queryPageList(RmCommissioningBo bo, PageQuery pageQuery);
List<RmCommissioningVo> queryList(RmCommissioningBo bo);
Boolean insertByBo(RmCommissioningBo bo);
Boolean updateByBo(RmCommissioningBo bo);
Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
}

2
fad-rolling-mill/src/main/java/com/ruoyi/rm/service/IRmDashboardService.java
View File

@@ -3,5 +3,5 @@ package com.ruoyi.rm.service;
import java.util.Map;
public interface IRmDashboardService {
Map<String, String> getStageStatus(Long projectId);
Map<String, Object> getStageStatus(Long projectId);
}

11
fad-rolling-mill/src/main/java/com/ruoyi/rm/service/IRmStageConfirmService.java Normal file
View File

@@ -0,0 +1,11 @@
package com.ruoyi.rm.service;
import com.ruoyi.rm.domain.bo.RmStageConfirmBo;
import com.ruoyi.rm.domain.vo.RmStageConfirmVo;
import java.util.List;
public interface IRmStageConfirmService {
List<RmStageConfirmVo> queryByProjectId(Long projectId);
Boolean confirmStage(RmStageConfirmBo bo);
}

24
fad-rolling-mill/src/main/java/com/ruoyi/rm/service/IRmStageImageService.java Normal file
View File

@@ -0,0 +1,24 @@
package com.ruoyi.rm.service;
import com.ruoyi.common.core.domain.PageQuery;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.rm.domain.bo.RmStageImageBo;
import com.ruoyi.rm.domain.vo.RmStageImageVo;
import java.util.Collection;
import java.util.List;
public interface IRmStageImageService {
RmStageImageVo queryById(Long imageId);
TableDataInfo<RmStageImageVo> queryPageList(RmStageImageBo bo, PageQuery pageQuery);
List<RmStageImageVo> queryList(RmStageImageBo bo);
Boolean insertByBo(RmStageImageBo bo);
Boolean updateByBo(RmStageImageBo bo);
Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
}

13
fad-rolling-mill/src/main/java/com/ruoyi/rm/service/IRmStageUserPermService.java Normal file
View File

@@ -0,0 +1,13 @@
package com.ruoyi.rm.service;
import com.ruoyi.rm.domain.bo.RmStageUserPermBo;
import com.ruoyi.rm.domain.vo.RmStageUserPermVo;
import java.util.List;
public interface IRmStageUserPermService {
List<RmStageUserPermVo> queryList(RmStageUserPermBo bo);
void batchSave(List<RmStageUserPermBo> list);
}

72
fad-rolling-mill/src/main/java/com/ruoyi/rm/service/impl/RmCommissioningServiceImpl.java Normal file
View File

@@ -0,0 +1,72 @@
package com.ruoyi.rm.service.impl;
import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.core.domain.PageQuery;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.rm.domain.entity.RmCommissioning;
import com.ruoyi.rm.domain.bo.RmCommissioningBo;
import com.ruoyi.rm.domain.vo.RmCommissioningVo;
import com.ruoyi.rm.mapper.RmCommissioningMapper;
import com.ruoyi.rm.service.IRmCommissioningService;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.Collection;
import java.util.List;
@RequiredArgsConstructor
@Service
public class RmCommissioningServiceImpl implements IRmCommissioningService {
private final RmCommissioningMapper baseMapper;
@Override
public RmCommissioningVo queryById(Long commissioningId) { return baseMapper.selectVoById(commissioningId); }
@Override
public RmCommissioningVo queryByProjectId(Long projectId) {
LambdaQueryWrapper<RmCommissioning> lqw = Wrappers.lambdaQuery();
lqw.eq(RmCommissioning::getProjectId, projectId);
return baseMapper.selectVoOne(lqw);
}
@Override
public TableDataInfo<RmCommissioningVo> queryPageList(RmCommissioningBo bo, PageQuery pageQuery) {
Page<RmCommissioningVo> result = baseMapper.selectVoPage(pageQuery.build(), buildQueryWrapper(bo));
return TableDataInfo.build(result);
}
@Override
public List<RmCommissioningVo> queryList(RmCommissioningBo bo) {
return baseMapper.selectVoList(buildQueryWrapper(bo));
}
@Override
@Transactional(rollbackFor = Exception.class)
public Boolean insertByBo(RmCommissioningBo bo) {
return baseMapper.insert(BeanUtil.toBean(bo, RmCommissioning.class)) > 0;
}
@Override
@Transactional(rollbackFor = Exception.class)
public Boolean updateByBo(RmCommissioningBo bo) {
return baseMapper.updateById(BeanUtil.toBean(bo, RmCommissioning.class)) > 0;
}
@Override
@Transactional(rollbackFor = Exception.class)
public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
return baseMapper.deleteBatchIds(ids) > 0;
}
private LambdaQueryWrapper<RmCommissioning> buildQueryWrapper(RmCommissioningBo bo) {
LambdaQueryWrapper<RmCommissioning> lqw = Wrappers.lambdaQuery();
if (bo == null) return lqw;
lqw.eq(bo.getProjectId() != null, RmCommissioning::getProjectId, bo.getProjectId());
return lqw;
}
}

98
fad-rolling-mill/src/main/java/com/ruoyi/rm/service/impl/RmDashboardServiceImpl.java
View File

@@ -9,8 +9,8 @@ import com.ruoyi.rm.service.IRmDashboardService;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import java.util.HashMap;
import java.util.Map;
import java.util.*;
import java.util.stream.Collectors;
import static com.baomidou.mybatisplus.core.toolkit.Wrappers.lambdaQuery;
@@ -37,9 +37,24 @@ public class RmDashboardServiceImpl implements IRmDashboardService {
private final RmCommissioningChecklistMapper rmCommissioningChecklistMapper;
private final RmProjectMapper rmProjectMapper;
private final RmProjectMemberMapper rmProjectMemberMapper;
private final RmStageConfirmMapper rmStageConfirmMapper;
/** Sequential stage order: the previous stage must be confirmed before the next is unlocked. */
private static final List<String> STAGE_ORDER = Collections.unmodifiableList(Arrays.asList(
"budget", "tech_plan", "layout", "tech_review",
"drawing_design", "drawing_review",
"procurement", "manufacturing",
"shipping", "manuals", "install_prep", "install_feedback",
"acceptance", "hot_commissioning"
));
/** Auxiliary stages are never locked. */
private static final Set<String> AUX_STAGES = Collections.unmodifiableSet(new HashSet<>(Arrays.asList(
"drawing_compare", "doc_lib", "site_mod"
)));
@Override
public Map<String, String> getStageStatus(Long projectId) {
public Map<String, Object> getStageStatus(Long projectId) {
// Access check: non-admin users must be manager or member of this project
Long userId = LoginHelper.getUserId();
if (userId != null && !LoginHelper.isAdmin(userId)) {
@@ -56,27 +71,66 @@ public class RmDashboardServiceImpl implements IRmDashboardService {
throw new RuntimeException("无权访问此项目");
}
}
Map<String, String> r = new HashMap<>();
r.put("budget", eval(rmBudgetMapper, RmBudget.class, "status", "approved", projectId));
r.put("tech_plan", has(rmTechPlanItemMapper, RmTechPlanItem.class, projectId));
r.put("layout", has(rmLayoutFileMapper, RmLayoutFile.class, projectId));
r.put("tech_review", has(rmTechReviewItemMapper, RmTechReviewItem.class, projectId));
r.put("drawing_design", eval(rmDrawingDesignMapper, RmDrawingDesign.class, "status", "approved", projectId));
r.put("drawing_review", eval(rmDrawingReviewMapper, RmDrawingReview.class, "status", "approved", projectId));
r.put("procurement", has(rmProcurementProgressMapper, RmProcurementProgress.class, projectId));
r.put("manufacturing", has(rmMfgDeviceMapper, RmMfgDevice.class, projectId));
r.put("drawing_compare", has(rmDrawingCompareMapper, RmDrawingCompare.class, projectId));
r.put("doc_lib", has(rmDocLibMapper, RmDocLib.class, projectId));
r.put("site_mod", has(rmSiteModMapper, RmSiteMod.class, projectId));
r.put("shipping", eval(rmShippingChecklistMapper, RmShippingChecklist.class, "is_checked", "1", projectId));
r.put("manuals", has(rmManualMapper, RmManual.class, projectId));
r.put("install_prep", has(rmInstallToolMapper, RmInstallTool.class, projectId));
r.put("install_feedback", has(rmInstallFeedbackMapper, RmInstallFeedback.class, projectId));
r.put("acceptance", eval(rmAcceptanceChecklistMapper, RmAcceptanceChecklist.class, "is_checked", "1", projectId));
r.put("hot_commissioning", eval(rmCommissioningChecklistMapper, RmCommissioningChecklist.class, "is_checked", "1", projectId));
return r;
// Auto-detected status
Map<String, String> autoStatus = new HashMap<>();
autoStatus.put("budget", eval(rmBudgetMapper, RmBudget.class, "status", "approved", projectId));
autoStatus.put("tech_plan", has(rmTechPlanItemMapper, RmTechPlanItem.class, projectId));
autoStatus.put("layout", has(rmLayoutFileMapper, RmLayoutFile.class, projectId));
autoStatus.put("tech_review", has(rmTechReviewItemMapper, RmTechReviewItem.class, projectId));
autoStatus.put("drawing_design", eval(rmDrawingDesignMapper, RmDrawingDesign.class, "status", "approved", projectId));
autoStatus.put("drawing_review", eval(rmDrawingReviewMapper, RmDrawingReview.class, "status", "approved", projectId));
autoStatus.put("procurement", has(rmProcurementProgressMapper, RmProcurementProgress.class, projectId));
autoStatus.put("manufacturing", has(rmMfgDeviceMapper, RmMfgDevice.class, projectId));
autoStatus.put("drawing_compare", has(rmDrawingCompareMapper, RmDrawingCompare.class, projectId));
autoStatus.put("doc_lib", has(rmDocLibMapper, RmDocLib.class, projectId));
autoStatus.put("site_mod", has(rmSiteModMapper, RmSiteMod.class, projectId));
autoStatus.put("shipping", eval(rmShippingChecklistMapper, RmShippingChecklist.class, "is_checked", "1", projectId));
autoStatus.put("manuals", has(rmManualMapper, RmManual.class, projectId));
autoStatus.put("install_prep", has(rmInstallToolMapper, RmInstallTool.class, projectId));
autoStatus.put("install_feedback", has(rmInstallFeedbackMapper, RmInstallFeedback.class, projectId));
autoStatus.put("acceptance", eval(rmAcceptanceChecklistMapper, RmAcceptanceChecklist.class, "is_checked", "1", projectId));
autoStatus.put("hot_commissioning", eval(rmCommissioningChecklistMapper, RmCommissioningChecklist.class, "is_checked", "1", projectId));
// Get confirmed stages from the database (with type)
Map<String, String> confirmTypeMap = rmStageConfirmMapper.selectVoList(
Wrappers.<RmStageConfirm>lambdaQuery()
.eq(RmStageConfirm::getProjectId, projectId)
.select(RmStageConfirm::getStageKey, RmStageConfirm::getConfirmType))
.stream()
.filter(c -> c.getStageKey() != null)
.collect(Collectors.toMap(c -> c.getStageKey(), c -> c.getConfirmType() != null ? c.getConfirmType() : "confirm", (a, b) -> b));
// Build enriched result
Map<String, Object> result = new LinkedHashMap<>();
for (String key : STAGE_ORDER) {
boolean confirmed = confirmTypeMap.containsKey(key);
String confirmType = confirmTypeMap.get(key);
result.put(key, buildStageInfo(autoStatus.getOrDefault(key, "pending"), confirmed, isLocked(key, confirmTypeMap.keySet()), confirmType));
}
for (String key : AUX_STAGES) {
result.put(key, buildStageInfo(autoStatus.getOrDefault(key, "pending"), confirmTypeMap.containsKey(key), false, confirmTypeMap.get(key)));
}
return result;
}
private Map<String, Object> buildStageInfo(String status, boolean confirmed, boolean locked, String confirmType) {
Map<String, Object> info = new HashMap<>();
info.put("status", status);
info.put("confirmed", confirmed);
info.put("locked", locked);
info.put("confirmType", confirmType);
return info;
}
private boolean isLocked(String stageKey, Set<String> confirmedKeys) {
int idx = STAGE_ORDER.indexOf(stageKey);
if (idx <= 0) return false;
return !confirmedKeys.contains(STAGE_ORDER.get(idx - 1));
}
// ---- auto-detection helpers ----
private <T> String has(BaseMapperPlus<?, T, ?> mapper, Class<T> clazz, Long projectId) {
return mapper.selectCount(lambdaQuery(clazz).apply("project_id = {0}", projectId)) > 0
? "progress" : "pending";

100
fad-rolling-mill/src/main/java/com/ruoyi/rm/service/impl/RmStageConfirmServiceImpl.java Normal file
View File

@@ -0,0 +1,100 @@
package com.ruoyi.rm.service.impl;
import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.helper.LoginHelper;
import com.ruoyi.rm.domain.bo.RmStageConfirmBo;
import com.ruoyi.rm.domain.entity.RmProject;
import com.ruoyi.rm.domain.entity.RmStageConfirm;
import com.ruoyi.rm.domain.entity.RmStageUserPerm;
import com.ruoyi.rm.domain.vo.RmStageConfirmVo;
import com.ruoyi.rm.mapper.RmProjectMapper;
import com.ruoyi.rm.mapper.RmStageConfirmMapper;
import com.ruoyi.rm.mapper.RmStageUserPermMapper;
import com.ruoyi.rm.service.IRmStageConfirmService;
import com.ruoyi.system.mapper.SysUserMapper;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.Date;
import java.util.List;
import java.util.stream.Collectors;
@RequiredArgsConstructor
@Service
public class RmStageConfirmServiceImpl implements IRmStageConfirmService {
private final RmStageConfirmMapper baseMapper;
private final SysUserMapper sysUserMapper;
private final RmProjectMapper rmProjectMapper;
private final RmStageUserPermMapper rmStageUserPermMapper;
@Override
public List<RmStageConfirmVo> queryByProjectId(Long projectId) {
List<RmStageConfirmVo> list = baseMapper.selectVoList(
Wrappers.<RmStageConfirm>lambdaQuery()
.eq(RmStageConfirm::getProjectId, projectId));
for (RmStageConfirmVo vo : list) {
if (vo.getConfirmerId() != null) {
SysUser user = sysUserMapper.selectUserById(vo.getConfirmerId());
if (user != null) {
vo.setConfirmerName(user.getNickName());
}
}
}
return list;
}
@Override
@Transactional(rollbackFor = Exception.class)
public Boolean confirmStage(RmStageConfirmBo bo) {
Long userId = LoginHelper.getUserId();
if (userId == null) {
throw new RuntimeException("未登录");
}
// Override authorization: admin > project manager > role-based permission
if ("override".equals(bo.getConfirmType())) {
boolean authorized = LoginHelper.isAdmin(userId);
if (!authorized) {
// Check if user is project manager
RmProject project = rmProjectMapper.selectById(bo.getProjectId());
if (project != null && userId.equals(project.getManagerId())) {
authorized = true;
}
}
if (!authorized) {
// Check per-user permission
long count = rmStageUserPermMapper.selectCount(
Wrappers.<RmStageUserPerm>lambdaQuery()
.eq(RmStageUserPerm::getUserId, userId)
.eq(RmStageUserPerm::getStageKey, bo.getStageKey())
.eq(RmStageUserPerm::getCanOverride, "1"));
if (count > 0) {
authorized = true;
}
}
if (!authorized) {
throw new RuntimeException("没有强制放行权限，请联系管理员");
}
if (bo.getRemark() == null || bo.getRemark().trim().isEmpty()) {
throw new RuntimeException("强制放行必须填写原因");
}
}
// Upsert: delete existing then insert
baseMapper.delete(Wrappers.<RmStageConfirm>lambdaQuery()
.eq(RmStageConfirm::getProjectId, bo.getProjectId())
.eq(RmStageConfirm::getStageKey, bo.getStageKey()));
RmStageConfirm add = BeanUtil.toBean(bo, RmStageConfirm.class);
if (add.getConfirmType() == null) {
add.setConfirmType("confirm");
}
add.setConfirmerId(userId);
add.setConfirmedAt(new Date());
return baseMapper.insert(add) > 0;
}
}

78
fad-rolling-mill/src/main/java/com/ruoyi/rm/service/impl/RmStageImageServiceImpl.java Normal file
View File

@@ -0,0 +1,78 @@
package com.ruoyi.rm.service.impl;
import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.core.domain.PageQuery;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.rm.domain.entity.RmStageImage;
import com.ruoyi.rm.domain.bo.RmStageImageBo;
import com.ruoyi.rm.domain.vo.RmStageImageVo;
import com.ruoyi.rm.mapper.RmStageImageMapper;
import com.ruoyi.rm.service.IRmStageImageService;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.Collection;
import java.util.List;
@RequiredArgsConstructor
@Service
public class RmStageImageServiceImpl implements IRmStageImageService {
private final RmStageImageMapper baseMapper;
@Override
public RmStageImageVo queryById(Long imageId) {
return baseMapper.selectVoById(imageId);
}
@Override
public TableDataInfo<RmStageImageVo> queryPageList(RmStageImageBo bo, PageQuery pageQuery) {
LambdaQueryWrapper<RmStageImage> lqw = buildQueryWrapper(bo);
Page<RmStageImageVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
return TableDataInfo.build(result);
}
@Override
public List<RmStageImageVo> queryList(RmStageImageBo bo) {
LambdaQueryWrapper<RmStageImage> lqw = buildQueryWrapper(bo);
return baseMapper.selectVoList(lqw);
}
@Override
@Transactional(rollbackFor = Exception.class)
public Boolean insertByBo(RmStageImageBo bo) {
RmStageImage add = BeanUtil.toBean(bo, RmStageImage.class);
validEntityBeforeSave(add);
return baseMapper.insert(add) > 0;
}
@Override
@Transactional(rollbackFor = Exception.class)
public Boolean updateByBo(RmStageImageBo bo) {
RmStageImage update = BeanUtil.toBean(bo, RmStageImage.class);
return baseMapper.updateById(update) > 0;
}
@Override
@Transactional(rollbackFor = Exception.class)
public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
return baseMapper.deleteBatchIds(ids) > 0;
}
private void validEntityBeforeSave(RmStageImage entity) {
// 预留：业务校验
}
private LambdaQueryWrapper<RmStageImage> buildQueryWrapper(RmStageImageBo bo) {
LambdaQueryWrapper<RmStageImage> lqw = Wrappers.lambdaQuery();
if (bo == null) return lqw;
lqw.eq(bo.getProjectId() != null, RmStageImage::getProjectId, bo.getProjectId());
lqw.eq(bo.getStageKey() != null, RmStageImage::getStageKey, bo.getStageKey());
lqw.orderByAsc(RmStageImage::getSortOrder);
return lqw;
}
}

61
fad-rolling-mill/src/main/java/com/ruoyi/rm/service/impl/RmStageUserPermServiceImpl.java Normal file
View File

@@ -0,0 +1,61 @@
package com.ruoyi.rm.service.impl;
import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.ruoyi.rm.domain.bo.RmStageUserPermBo;
import com.ruoyi.rm.domain.entity.RmStageUserPerm;
import com.ruoyi.rm.domain.vo.RmStageUserPermVo;
import com.ruoyi.rm.mapper.RmStageUserPermMapper;
import com.ruoyi.rm.service.IRmStageUserPermService;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.List;
import java.util.stream.Collectors;
@RequiredArgsConstructor
@Service
public class RmStageUserPermServiceImpl implements IRmStageUserPermService {
private final RmStageUserPermMapper baseMapper;
@Override
public List<RmStageUserPermVo> queryList(RmStageUserPermBo bo) {
LambdaQueryWrapper<RmStageUserPerm> lqw = buildQueryWrapper(bo);
return baseMapper.selectVoList(lqw);
}
@Override
@Transactional(rollbackFor = Exception.class)
public void batchSave(List<RmStageUserPermBo> list) {
if (list == null || list.isEmpty()) return;
// Collect all unique user_ids
List<Long> userIds = list.stream()
.map(RmStageUserPermBo::getUserId)
.distinct()
.collect(Collectors.toList());
// Delete all existing configs for these users
if (!userIds.isEmpty()) {
baseMapper.delete(Wrappers.<RmStageUserPerm>lambdaQuery()
.in(RmStageUserPerm::getUserId, userIds));
}
// Insert new configs
for (RmStageUserPermBo bo : list) {
if (bo.getUserId() == null || bo.getStageKey() == null) continue;
RmStageUserPerm add = BeanUtil.toBean(bo, RmStageUserPerm.class);
if (add.getCanOverride() == null) add.setCanOverride("0");
if (add.getCanConfirm() == null) add.setCanConfirm("0");
baseMapper.insert(add);
}
}
private LambdaQueryWrapper<RmStageUserPerm> buildQueryWrapper(RmStageUserPermBo bo) {
LambdaQueryWrapper<RmStageUserPerm> lqw = Wrappers.lambdaQuery();
if (bo == null) return lqw;
lqw.eq(bo.getUserId() != null, RmStageUserPerm::getUserId, bo.getUserId());
lqw.eq(bo.getStageKey() != null, RmStageUserPerm::getStageKey, bo.getStageKey());
return lqw;
}
}