lcj/xinnengyuan
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

合并

Browse Source
This commit is contained in:
罗成
2025-08-14 16:49:54 +08:00
parent 9173e02471
commit 55090acb64
40 changed files with 1345 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/controller/BusTotalsupplyplanController.java → xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/controller/BusTotalsupplyplanController.java
View File

@ -1,11 +1,18 @@
package org.dromara.design.controller;
package org.dromara.cailiaoshebei.controller;
import java.util.List;
import cn.hutool.core.bean.BeanUtil;
import lombok.RequiredArgsConstructor;
import jakarta.servlet.http.HttpServletResponse;
import jakarta.validation.constraints.*;
import cn.dev33.satoken.annotation.SaCheckPermission;
import org.dromara.cailiaoshebei.domain.bo.BusTotalsupplyplanAuditBo;
import org.dromara.cailiaoshebei.domain.bo.MasterDataReq;
import org.dromara.cailiaoshebei.domain.bo.TotalsupplyplanQueryListReq;
import org.dromara.cailiaoshebei.domain.dto.MasterDataReqDto;
import org.dromara.cailiaoshebei.domain.vo.BusTotalsupplyplanAuditVo;
import org.dromara.cailiaoshebei.service.IBusTotalsupplyplanAuditService;
import org.springframework.web.bind.annotation.*;
import org.springframework.validation.annotation.Validated;
import org.dromara.common.idempotent.annotation.RepeatSubmit;
@ -13,13 +20,12 @@ import org.dromara.common.log.annotation.Log;
import org.dromara.common.web.core.BaseController;
import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.core.domain.R;
import org.dromara.common.core.validate.AddGroup;
import org.dromara.common.core.validate.EditGroup;
import org.dromara.common.log.enums.BusinessType;
import org.dromara.common.excel.utils.ExcelUtil;
import org.dromara.design.domain.vo.BusTotalsupplyplanVo;
import org.dromara.design.domain.bo.BusTotalsupplyplanBo;
import org.dromara.design.service.IBusTotalsupplyplanService;
import org.dromara.cailiaoshebei.domain.vo.BusTotalsupplyplanVo;
import org.dromara.cailiaoshebei.domain.bo.BusTotalsupplyplanBo;
import org.dromara.cailiaoshebei.service.IBusTotalsupplyplanService;
import org.dromara.common.mybatis.core.page.TableDataInfo;
/**
@ -35,6 +41,26 @@ import org.dromara.common.mybatis.core.page.TableDataInfo;
public class BusTotalsupplyplanController extends BaseController {
private final IBusTotalsupplyplanService busTotalsupplyplanService;
private final IBusTotalsupplyplanAuditService busTotalsupplyplanAuditService;
/**
* 获取主数据列表
*/
@SaCheckPermission("design:totalsupplyplan:queryList")
@GetMapping("/queryList")
public R<List<BusTotalsupplyplanAuditVo>> queryList(TotalsupplyplanQueryListReq bo) {
BusTotalsupplyplanAuditBo busTotalsupplyplanAuditBo = BeanUtil.copyProperties(bo, BusTotalsupplyplanAuditBo.class);
return R.ok(busTotalsupplyplanAuditService.queryList(busTotalsupplyplanAuditBo));
}
/**
* 根据主数据获取到详情
*/
@SaCheckPermission("design:totalsupplyplan:masterData")
@GetMapping("/masterData")
public R<MasterDataReqDto> masterData(MasterDataReq bo) {
return R.ok(busTotalsupplyplanService.masterData(bo));
}
/**
* 查询物资-总供应计划列表

3
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/domain/BusTotalsupplyplan.java → xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/domain/BusTotalsupplyplan.java
View File

@ -1,11 +1,10 @@
package org.dromara.design.domain;
package org.dromara.cailiaoshebei.domain;
import org.dromara.common.mybatis.core.domain.BaseEntity;
import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import java.io.Serial;

2
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/domain/BusTotalsupplyplanAudit.java → xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/domain/BusTotalsupplyplanAudit.java
View File

@ -1,4 +1,4 @@
package org.dromara.design.domain;
package org.dromara.cailiaoshebei.domain;
import org.dromara.common.mybatis.core.domain.BaseEntity;
import com.baomidou.mybatisplus.annotation.*;

4
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/domain/bo/BusTotalsupplyplanAuditBo.java → xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/domain/bo/BusTotalsupplyplanAuditBo.java
View File

@ -1,6 +1,6 @@
package org.dromara.design.domain.bo;
package org.dromara.cailiaoshebei.domain.bo;
import org.dromara.design.domain.BusTotalsupplyplanAudit;
import org.dromara.cailiaoshebei.domain.BusTotalsupplyplanAudit;
import org.dromara.common.mybatis.core.domain.BaseEntity;
import org.dromara.common.core.validate.AddGroup;
import org.dromara.common.core.validate.EditGroup;

6
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/domain/bo/BusTotalsupplyplanBo.java → xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/domain/bo/BusTotalsupplyplanBo.java
View File

@ -1,15 +1,13 @@
package org.dromara.design.domain.bo;
package org.dromara.cailiaoshebei.domain.bo;
import org.dromara.design.domain.BusTotalsupplyplan;
import org.dromara.cailiaoshebei.domain.BusTotalsupplyplan;
import org.dromara.common.mybatis.core.domain.BaseEntity;
import org.dromara.common.core.validate.AddGroup;
import org.dromara.common.core.validate.EditGroup;
import io.github.linpeilie.annotations.AutoMapper;
import lombok.Data;
import lombok.EqualsAndHashCode;
import jakarta.validation.constraints.*;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
/**
* 物资-总供应计划业务对象 bus_totalsupplyplan

28
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/domain/bo/MasterDataReq.java Normal file
View File

@ -0,0 +1,28 @@
package org.dromara.cailiaoshebei.domain.bo;
import jakarta.validation.constraints.NotNull;
import lombok.Data;
import lombok.experimental.Accessors;
import org.dromara.common.core.validate.AddGroup;
import org.dromara.common.core.validate.EditGroup;
import java.io.Serializable;
/**
* @Author 铁憨憨
* @Date 2025/8/14 11:21
* @Version 1.0
*/
@Data
@Accessors(chain = true)
public class MasterDataReq implements Serializable {
/**
* 主键ID
*/
@NotNull(message = "主键ID不能为空", groups = { EditGroup.class })
private Long id;
}

27
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/domain/bo/TotalsupplyplanQueryListReq.java Normal file
View File

@ -0,0 +1,27 @@
package org.dromara.cailiaoshebei.domain.bo;
import jakarta.validation.constraints.NotNull;
import lombok.Data;
import lombok.experimental.Accessors;
import org.dromara.common.core.validate.AddGroup;
import org.dromara.common.core.validate.EditGroup;
import java.io.Serializable;
/**
* @Author 铁憨憨
* @Date 2025/8/14 11:32
* @Version 1.0
*/
@Data
@Accessors(chain = true)
public class TotalsupplyplanQueryListReq implements Serializable {
/**
* 项目Id
*/
@NotNull(message = "项目Id不能为空", groups = { AddGroup.class, EditGroup.class })
private Long projectId;
}

50
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/domain/dto/MasterDataReqDto.java Normal file
View File

@ -0,0 +1,50 @@
package org.dromara.cailiaoshebei.domain.dto;
import com.alibaba.excel.annotation.ExcelProperty;
import lombok.Data;
import lombok.experimental.Accessors;
import org.dromara.cailiaoshebei.domain.BusTotalsupplyplan;
import java.io.Serializable;
import java.util.List;
/**
* @Author 铁憨憨
* @Date 2025/8/14 11:24
* @Version 1.0
*/
@Data
@Accessors(chain = true)
public class MasterDataReqDto implements Serializable {
/**
* 主键ID
*/
@ExcelProperty(value = "主键ID")
private Long id;
/**
* 项目Id
*/
@ExcelProperty(value = "项目Id")
private Long projectId;
/**
* 批次号
*/
@ExcelProperty(value = "批次号")
private String batchNumber;
/**
* 审核状态
*/
@ExcelProperty(value = "审核状态")
private String status;
/**
* 子数据
*/
private List<BusTotalsupplyplan> subData;
}

8
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/domain/vo/BusTotalsupplyplanAuditVo.java → xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/domain/vo/BusTotalsupplyplanAuditVo.java
View File

@ -1,17 +1,13 @@
package org.dromara.design.domain.vo;
package org.dromara.cailiaoshebei.domain.vo;
import org.dromara.design.domain.BusTotalsupplyplanAudit;
import org.dromara.cailiaoshebei.domain.BusTotalsupplyplanAudit;
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty;
import org.dromara.common.excel.annotation.ExcelDictFormat;
import org.dromara.common.excel.convert.ExcelDictConvert;
import io.github.linpeilie.annotations.AutoMapper;
import lombok.Data;
import java.io.Serial;
import java.io.Serializable;
import java.util.Date;
/**

10
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/domain/vo/BusTotalsupplyplanVo.java → xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/domain/vo/BusTotalsupplyplanVo.java
View File

@ -1,19 +1,15 @@
package org.dromara.design.domain.vo;
package org.dromara.cailiaoshebei.domain.vo;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.dromara.design.domain.BusTotalsupplyplan;
import org.dromara.cailiaoshebei.domain.BusTotalsupplyplan;
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty;
import org.dromara.common.excel.annotation.ExcelDictFormat;
import org.dromara.common.excel.convert.ExcelDictConvert;
import io.github.linpeilie.annotations.AutoMapper;
import lombok.Data;
import java.io.Serial;
import java.io.Serializable;
import java.util.Date;
/**

6
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/mapper/BusTotalsupplyplanAuditMapper.java → xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/mapper/BusTotalsupplyplanAuditMapper.java
View File

@ -1,7 +1,7 @@
package org.dromara.design.mapper;
package org.dromara.cailiaoshebei.mapper;
import org.dromara.design.domain.BusTotalsupplyplanAudit;
import org.dromara.design.domain.vo.BusTotalsupplyplanAuditVo;
import org.dromara.cailiaoshebei.domain.BusTotalsupplyplanAudit;
import org.dromara.cailiaoshebei.domain.vo.BusTotalsupplyplanAuditVo;
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
/**

6
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/mapper/BusTotalsupplyplanMapper.java → xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/mapper/BusTotalsupplyplanMapper.java
View File

@ -1,7 +1,7 @@
package org.dromara.design.mapper;
package org.dromara.cailiaoshebei.mapper;
import org.dromara.design.domain.BusTotalsupplyplan;
import org.dromara.design.domain.vo.BusTotalsupplyplanVo;
import org.dromara.cailiaoshebei.domain.BusTotalsupplyplan;
import org.dromara.cailiaoshebei.domain.vo.BusTotalsupplyplanVo;
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
/**

8
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/service/IBusTotalsupplyplanAuditService.java → xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/service/IBusTotalsupplyplanAuditService.java
View File

@ -1,8 +1,8 @@
package org.dromara.design.service;
package org.dromara.cailiaoshebei.service;
import org.dromara.design.domain.vo.BusTotalsupplyplanAuditVo;
import org.dromara.design.domain.bo.BusTotalsupplyplanAuditBo;
import org.dromara.design.domain.BusTotalsupplyplanAudit;
import org.dromara.cailiaoshebei.domain.vo.BusTotalsupplyplanAuditVo;
import org.dromara.cailiaoshebei.domain.bo.BusTotalsupplyplanAuditBo;
import org.dromara.cailiaoshebei.domain.BusTotalsupplyplanAudit;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.mybatis.core.page.PageQuery;

19
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/service/IBusTotalsupplyplanService.java → xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/service/IBusTotalsupplyplanService.java
View File

@ -1,8 +1,10 @@
package org.dromara.design.service;
package org.dromara.cailiaoshebei.service;
import org.dromara.design.domain.vo.BusTotalsupplyplanVo;
import org.dromara.design.domain.bo.BusTotalsupplyplanBo;
import org.dromara.design.domain.BusTotalsupplyplan;
import org.dromara.cailiaoshebei.domain.bo.MasterDataReq;
import org.dromara.cailiaoshebei.domain.dto.MasterDataReqDto;
import org.dromara.cailiaoshebei.domain.vo.BusTotalsupplyplanVo;
import org.dromara.cailiaoshebei.domain.bo.BusTotalsupplyplanBo;
import org.dromara.cailiaoshebei.domain.BusTotalsupplyplan;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.mybatis.core.page.PageQuery;
@ -67,4 +69,13 @@ public interface IBusTotalsupplyplanService extends IService<BusTotalsupplyplan>
* @return 是否删除成功
*/
Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
/**
* 物资-总供应计划-主数据
*
* @param bo 主数据查询条件
* @return 主数据列表
*/
MasterDataReqDto masterData(MasterDataReq bo);
}

15
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/service/impl/BusTotalsupplyplanAuditServiceImpl.java → xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/service/impl/BusTotalsupplyplanAuditServiceImpl.java
View File

@ -1,4 +1,4 @@
package org.dromara.design.service.impl;
package org.dromara.cailiaoshebei.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.dromara.common.core.utils.MapstructUtils;
@ -10,11 +10,11 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import org.dromara.design.domain.bo.BusTotalsupplyplanAuditBo;
import org.dromara.design.domain.vo.BusTotalsupplyplanAuditVo;
import org.dromara.design.domain.BusTotalsupplyplanAudit;
import org.dromara.design.mapper.BusTotalsupplyplanAuditMapper;
import org.dromara.design.service.IBusTotalsupplyplanAuditService;
import org.dromara.cailiaoshebei.domain.bo.BusTotalsupplyplanAuditBo;
import org.dromara.cailiaoshebei.domain.vo.BusTotalsupplyplanAuditVo;
import org.dromara.cailiaoshebei.domain.BusTotalsupplyplanAudit;
import org.dromara.cailiaoshebei.mapper.BusTotalsupplyplanAuditMapper;
import org.dromara.cailiaoshebei.service.IBusTotalsupplyplanAuditService;
import java.util.List;
import java.util.Map;
@ -66,7 +66,8 @@ public class BusTotalsupplyplanAuditServiceImpl extends ServiceImpl<BusTotalsupp
@Override
public List<BusTotalsupplyplanAuditVo> queryList(BusTotalsupplyplanAuditBo bo) {
LambdaQueryWrapper<BusTotalsupplyplanAudit> lqw = buildQueryWrapper(bo);
return baseMapper.selectVoList(lqw);
List<BusTotalsupplyplanAuditVo> busTotalsupplyplanAuditVos = baseMapper.selectVoList(lqw);
return busTotalsupplyplanAuditVos;
}
private LambdaQueryWrapper<BusTotalsupplyplanAudit> buildQueryWrapper(BusTotalsupplyplanAuditBo bo) {

41
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/service/impl/BusTotalsupplyplanServiceImpl.java → xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/service/impl/BusTotalsupplyplanServiceImpl.java
View File

@ -1,8 +1,10 @@
package org.dromara.design.service.impl;
package org.dromara.cailiaoshebei.service.impl;
import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import lombok.extern.slf4j.Slf4j;
import org.dromara.cailiaoshebei.domain.bo.MasterDataReq;
import org.dromara.cailiaoshebei.domain.dto.MasterDataReqDto;
import org.dromara.common.core.domain.event.ProcessDeleteEvent;
import org.dromara.common.core.domain.event.ProcessEvent;
import org.dromara.common.core.domain.event.ProcessTaskEvent;
@ -14,15 +16,15 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import lombok.RequiredArgsConstructor;
import org.dromara.design.domain.BusBillofquantities;
import org.dromara.design.domain.BusBillofquantitiesVersions;
import org.dromara.cailiaoshebei.domain.BusTotalsupplyplanAudit;
import org.dromara.cailiaoshebei.service.IBusTotalsupplyplanAuditService;
import org.springframework.context.event.EventListener;
import org.springframework.stereotype.Service;
import org.dromara.design.domain.bo.BusTotalsupplyplanBo;
import org.dromara.design.domain.vo.BusTotalsupplyplanVo;
import org.dromara.design.domain.BusTotalsupplyplan;
import org.dromara.design.mapper.BusTotalsupplyplanMapper;
import org.dromara.design.service.IBusTotalsupplyplanService;
import org.dromara.cailiaoshebei.domain.bo.BusTotalsupplyplanBo;
import org.dromara.cailiaoshebei.domain.vo.BusTotalsupplyplanVo;
import org.dromara.cailiaoshebei.domain.BusTotalsupplyplan;
import org.dromara.cailiaoshebei.mapper.BusTotalsupplyplanMapper;
import org.dromara.cailiaoshebei.service.IBusTotalsupplyplanService;
import java.util.List;
import java.util.Map;
@ -41,6 +43,10 @@ public class BusTotalsupplyplanServiceImpl extends ServiceImpl<BusTotalsupplypla
private final BusTotalsupplyplanMapper baseMapper;
private final IBusTotalsupplyplanAuditService busTotalsupplyplanAuditService;
/**
* 查询物资-总供应计划
*
@ -143,6 +149,19 @@ public class BusTotalsupplyplanServiceImpl extends ServiceImpl<BusTotalsupplypla
return baseMapper.deleteByIds(ids) > 0;
}
@Override
public MasterDataReqDto masterData(MasterDataReq bo) {
//1、获取主数据
BusTotalsupplyplanAudit byId = busTotalsupplyplanAuditService.getById(bo.getId());
MasterDataReqDto masterDataReqDto = BeanUtil.copyProperties(byId, MasterDataReqDto.class);
//2、获取所有主数据
LambdaQueryWrapper<BusTotalsupplyplan> busTotalsupplyplanLambdaQueryWrapper = new LambdaQueryWrapper<>();
busTotalsupplyplanLambdaQueryWrapper.eq(BusTotalsupplyplan::getBatchNumber, byId.getBatchNumber());
List<BusTotalsupplyplan> busTotalsupplyplans = baseMapper.selectList(busTotalsupplyplanLambdaQueryWrapper);
masterDataReqDto.setSubData(busTotalsupplyplans);
return masterDataReqDto;
}
/**
* 总体流程监听(例如: 草稿，撤销，退回，作废，终止，已完成，单任务完成等)
* 正常使用只需#processEvent.flowCode=='leave1'
@ -154,7 +173,11 @@ public class BusTotalsupplyplanServiceImpl extends ServiceImpl<BusTotalsupplypla
public void processPlansHandler(ProcessEvent processEvent) {
log.info("物资总供应计划审核任务执行了{}", processEvent.toString());
String id = processEvent.getBusinessId();
//修改审核状态
BusTotalsupplyplanAudit busTotalsupplyplanAudit = new BusTotalsupplyplanAudit();
busTotalsupplyplanAudit.setId(Long.valueOf(id));
busTotalsupplyplanAudit.setStatus(processEvent.getStatus());
busTotalsupplyplanAuditService.updateById(busTotalsupplyplanAudit);
}
/**

8
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/service/impl/BusBillofquantitiesVersionsServiceImpl.java
View File

@ -2,12 +2,12 @@ package org.dromara.design.service.impl;
import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import lombok.extern.log4j.Log4j;
import lombok.extern.slf4j.Slf4j;
import org.dromara.cailiaoshebei.domain.BusTotalsupplyplan;
import org.dromara.cailiaoshebei.domain.BusTotalsupplyplanAudit;
import org.dromara.common.core.domain.event.ProcessDeleteEvent;
import org.dromara.common.core.domain.event.ProcessEvent;
import org.dromara.common.core.domain.event.ProcessTaskEvent;
import org.dromara.common.core.enums.BusinessStatusEnum;
import org.dromara.common.core.exception.ServiceException;
import org.dromara.common.core.utils.MapstructUtils;
import org.dromara.common.core.utils.StringUtils;
@ -26,8 +26,8 @@ import org.dromara.design.domain.dto.MaterialsAndEquipmentExcelDto;
import org.dromara.design.domain.vo.DetailsMaterialAndEquipmentApprovalRes;
import org.dromara.design.domain.vo.ObtainTheListRes;
import org.dromara.design.service.IBusBillofquantitiesService;
import org.dromara.design.service.IBusTotalsupplyplanAuditService;
import org.dromara.design.service.IBusTotalsupplyplanService;
import org.dromara.cailiaoshebei.service.IBusTotalsupplyplanAuditService;
import org.dromara.cailiaoshebei.service.IBusTotalsupplyplanService;
import org.dromara.system.domain.vo.SysOssUploadVo;
import org.dromara.system.service.ISysOssService;
import org.springframework.beans.factory.annotation.Autowired;

115
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/vo/MatMaterialsInventoryListReq.java Normal file
View File

@ -0,0 +1,115 @@
package org.dromara.materials.domain.vo;
import com.alibaba.excel.annotation.ExcelProperty;
import lombok.Data;
import lombok.experimental.Accessors;
import java.io.Serializable;
import java.util.Date;
/**
* @Author 铁憨憨
* @Date 2025/8/14 15:06
* @Version 1.0
*/
@Data
@Accessors(chain = true)
public class MatMaterialsInventoryListReq implements Serializable {
/**
* 主键id
*/
@ExcelProperty(value = "主键id")
private Long id;
/**
* 材料id
*/
@ExcelProperty(value = "材料id")
private Long materialsId;
/**
* 材料名称
*/
private String materialsName;
/**
* 项目id
*/
@ExcelProperty(value = "项目id")
private Long projectId;
/**
* 出入库状态
*/
@ExcelProperty(value = "出入库状态")
private String outPut;
/**
* 出/入库的数量
*/
@ExcelProperty(value = "出入库的数量")
private Long number;
/**
* 出/入库操作时间
*/
@ExcelProperty(value = "出入库操作时间")
private Date outPutTime;
/**
* 剩余库存数量（记录最后一次操作留下的库存数）
*/
@ExcelProperty(value = "剩余库存数量")
private Long residue;
/**
* 操作人（入库人、领料人）
*/
@ExcelProperty(value = "操作人")
private String operator;
/**
* 材料出入证明
*/
@ExcelProperty(value = "材料出入证明")
private String path;
/**
* 处理方式
*/
@ExcelProperty(value = "处理方式")
private String disposition;
/**
* 交接单位（班组）
*/
@ExcelProperty(value = "交接单位")
private String recipient;
/**
* 领用人
*/
@ExcelProperty(value = "领用人")
private String shipper;
/**
* 备注
*/
@ExcelProperty(value = "备注")
private String remark;
/**
* 创建时间
*/
@ExcelProperty(value = "创建时间")
private Date createTime;
/**
* 计划数量
*/
@ExcelProperty(value = "计划数量")
private int quantityCount;
}

6
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/vo/materialsinventory/MatMaterialsInventoryVo.java
View File

@ -42,6 +42,12 @@ public class MatMaterialsInventoryVo implements Serializable {
*/
private String materialsName;
/**
* 计划数量
*/
@ExcelProperty(value = "计划数量")
private int quantityCount;
/**
* 项目id
*/

11
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/mapper/MatMaterialsInventoryMapper.java
View File

@ -1,6 +1,11 @@
package org.dromara.materials.mapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.apache.ibatis.annotations.Param;
import org.dromara.cailiaoshebei.domain.bo.RepertoryDetailsListReq;
import org.dromara.cailiaoshebei.domain.vo.RepertoryDetailsListRes;
import org.dromara.materials.domain.MatMaterialsInventory;
import org.dromara.materials.domain.dto.materialsinventory.MatMaterialsInventoryQueryReq;
import org.dromara.materials.domain.vo.materialsinventory.MatMaterialsInventoryVo;
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
@ -12,4 +17,10 @@ import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
*/
public interface MatMaterialsInventoryMapper extends BaseMapperPlus<MatMaterialsInventory, MatMaterialsInventoryVo> {
// /**
// * 获取出入库数据
// */
// Page<MatMaterialsInventoryVo> getInventoryList(@Param("bo") MatMaterialsInventoryQueryReq req, @Param("page") Page<RepertoryDetailsListReq> page);
}

3
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/service/impl/MatMaterialsInventoryServiceImpl.java
View File

@ -313,10 +313,13 @@ public class MatMaterialsInventoryServiceImpl extends ServiceImpl<MatMaterialsIn
// 关联查询材料信息
Long materialsId = materialsInventory.getMaterialsId();
String materialsName = null;
int quantityCount = 0;
if (materialsIdBusMaterialsMap.containsKey(materialsId)) {
materialsName = materialsIdBusMaterialsMap.get(materialsId).get(0).getMaterialsName();
quantityCount = Integer.parseInt(materialsIdBusMaterialsMap.get(materialsId).get(0).getQuantityCount());
}
materialsInventoryVo.setMaterialsName(materialsName);
materialsInventoryVo.setQuantityCount(quantityCount);
return materialsInventoryVo;
}).toList();
materialsInventoryVoPage.setRecords(materialsInventoryVoList);

47
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/message/controller/MsgConfigController.java
View File

@ -1,11 +1,21 @@
package org.dromara.message.controller;
import java.util.List;
import java.util.Objects;
import cn.hutool.core.bean.BeanUtil;
import lombok.RequiredArgsConstructor;
import jakarta.servlet.http.HttpServletResponse;
import jakarta.validation.constraints.*;
import cn.dev33.satoken.annotation.SaCheckPermission;
import org.dromara.common.satoken.utils.LoginHelper;
import org.dromara.message.domain.bo.MsgConfigAddReq;
import org.dromara.message.domain.bo.MsgConfigEditReq;
import org.dromara.system.domain.vo.SysDeptVo;
import org.dromara.system.domain.vo.SysUserVo;
import org.dromara.system.service.ISysDeptService;
import org.dromara.system.service.ISysUserService;
import org.springframework.boot.actuate.beans.BeansEndpoint;
import org.springframework.web.bind.annotation.*;
import org.springframework.validation.annotation.Validated;
import org.dromara.common.idempotent.annotation.RepeatSubmit;
@ -35,6 +45,22 @@ import org.dromara.common.mybatis.core.page.TableDataInfo;
public class MsgConfigController extends BaseController {
private final IMsgConfigService msgConfigService;
private final ISysUserService userService;
private final ISysDeptService deptService;
/**
* 获取当前用户所在上级部门ID
*/
@SaCheckPermission("message:config:allUsersOfTheDepartment")
@GetMapping("/allUsersOfTheDepartment")
public R<SysDeptVo> allUsersOfTheDepartment() {
Long deptId = Objects.requireNonNull(LoginHelper.getLoginUser()).getDeptId();
System.out.println("1!!!! "+deptId);
//获取当前用户的上级部门
SysDeptVo sysDeptVo = deptService.selectDeptById(deptId);
System.out.println("2!!!! "+sysDeptVo.toString());
return R.ok(sysDeptVo);
}
/**
* 查询消息配置列表
@ -45,17 +71,6 @@ public class MsgConfigController extends BaseController {
return msgConfigService.queryPageList(bo, pageQuery);
}
/**
* 导出消息配置列表
*/
@SaCheckPermission("message:config:export")
@Log(title = "消息配置", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(MsgConfigBo bo, HttpServletResponse response) {
List<MsgConfigVo> list = msgConfigService.queryList(bo);
ExcelUtil.exportExcel(list, "消息配置", MsgConfigVo.class, response);
}
/**
* 获取消息配置详细信息
*
@ -75,8 +90,9 @@ public class MsgConfigController extends BaseController {
@Log(title = "消息配置", businessType = BusinessType.INSERT)
@RepeatSubmit()
@PostMapping()
public R<Void> add(@Validated(AddGroup.class) @RequestBody MsgConfigBo bo) {
return toAjax(msgConfigService.insertByBo(bo));
public R<Void> add(@Validated(AddGroup.class) @RequestBody MsgConfigAddReq bo) {
MsgConfigBo msgConfigBo = BeanUtil.copyProperties(bo, MsgConfigBo.class);
return toAjax(msgConfigService.insertByBo(msgConfigBo));
}
/**
@ -86,8 +102,9 @@ public class MsgConfigController extends BaseController {
@Log(title = "消息配置", businessType = BusinessType.UPDATE)
@RepeatSubmit()
@PutMapping()
public R<Void> edit(@Validated(EditGroup.class) @RequestBody MsgConfigBo bo) {
return toAjax(msgConfigService.updateByBo(bo));
public R<Void> edit(@Validated(EditGroup.class) @RequestBody MsgConfigEditReq bo) {
MsgConfigBo msgConfigBo = BeanUtil.copyProperties(bo, MsgConfigBo.class);
return toAjax(msgConfigService.updateByBo(msgConfigBo));
}
/**

132
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/message/controller/MsgNoticeController.java Normal file
View File

@ -0,0 +1,132 @@
package org.dromara.message.controller;
import java.util.List;
import java.util.Objects;
import lombok.RequiredArgsConstructor;
import jakarta.servlet.http.HttpServletResponse;
import jakarta.validation.constraints.*;
import cn.dev33.satoken.annotation.SaCheckPermission;
import org.dromara.common.satoken.utils.LoginHelper;
import org.dromara.message.domain.bo.TheCurrentUserMessageListReq;
import org.springframework.web.bind.annotation.*;
import org.springframework.validation.annotation.Validated;
import org.dromara.common.idempotent.annotation.RepeatSubmit;
import org.dromara.common.log.annotation.Log;
import org.dromara.common.web.core.BaseController;
import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.core.domain.R;
import org.dromara.common.core.validate.AddGroup;
import org.dromara.common.core.validate.EditGroup;
import org.dromara.common.log.enums.BusinessType;
import org.dromara.common.excel.utils.ExcelUtil;
import org.dromara.message.domain.vo.MsgNoticeVo;
import org.dromara.message.domain.bo.MsgNoticeBo;
import org.dromara.message.service.IMsgNoticeService;
import org.dromara.common.mybatis.core.page.TableDataInfo;
/**
* 消息
*
* @author Lion Li
* @date 2025-08-13
*/
@Validated
@RequiredArgsConstructor
@RestController
@RequestMapping("/message/notice")
public class MsgNoticeController extends BaseController {
private final IMsgNoticeService msgNoticeService;
/**
* 获取当前用户的消息列表
*/
@SaCheckPermission("message:notice:theCurrentUserMessageList")
@GetMapping("/theCurrentUserMessageList")
public TableDataInfo<MsgNoticeVo> theCurrentUserMessageList(TheCurrentUserMessageListReq bo, PageQuery pageQuery) {
if (bo.getUserId() == null) {
Long userId = Objects.requireNonNull(LoginHelper.getLoginUser()).getUserId();
bo.setUserId(userId);
}
return msgNoticeService.theCurrentUserMessageList(bo, pageQuery);
}
/**
* 变更消息为已读
*/
@SaCheckPermission("message:notice:readUpdate")
@Log(title = "消息", businessType = BusinessType.UPDATE)
@RepeatSubmit()
@PutMapping("/readUpdate")
public R<Void> readUpdate(@Validated @RequestBody MsgNoticeBo bo) {
return toAjax(msgNoticeService.readUpdate(bo));
}
/**
* 查询消息列表
*/
@SaCheckPermission("message:notice:list")
@GetMapping("/list")
public TableDataInfo<MsgNoticeVo> list(MsgNoticeBo bo, PageQuery pageQuery) {
return msgNoticeService.queryPageList(bo, pageQuery);
}
/**
* 导出消息列表
*/
@SaCheckPermission("message:notice:export")
@Log(title = "消息", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(MsgNoticeBo bo, HttpServletResponse response) {
List<MsgNoticeVo> list = msgNoticeService.queryList(bo);
ExcelUtil.exportExcel(list, "消息", MsgNoticeVo.class, response);
}
/**
* 获取消息详细信息
*
* @param id 主键
*/
@SaCheckPermission("message:notice:query")
@GetMapping("/{id}")
public R<MsgNoticeVo> getInfo(@NotNull(message = "主键不能为空")
@PathVariable Long id) {
return R.ok(msgNoticeService.queryById(id));
}
/**
* 新增消息
*/
@SaCheckPermission("message:notice:add")
@Log(title = "消息", businessType = BusinessType.INSERT)
@RepeatSubmit()
@PostMapping()
public R<Void> add(@Validated(AddGroup.class) @RequestBody MsgNoticeBo bo) {
return toAjax(msgNoticeService.insertByBo(bo));
}
/**
* 修改消息
*/
@SaCheckPermission("message:notice:edit")
@Log(title = "消息", businessType = BusinessType.UPDATE)
@RepeatSubmit()
@PutMapping()
public R<Void> edit(@Validated(EditGroup.class) @RequestBody MsgNoticeBo bo) {
return toAjax(msgNoticeService.updateByBo(bo));
}
/**
* 删除消息
*
* @param ids 主键串
*/
@SaCheckPermission("message:notice:remove")
@Log(title = "消息", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public R<Void> remove(@NotEmpty(message = "主键不能为空")
@PathVariable Long[] ids) {
return toAjax(msgNoticeService.deleteWithValidByIds(List.of(ids), true));
}
}

78
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/message/domain/MsgNotice.java Normal file
View File

@ -0,0 +1,78 @@
package org.dromara.message.domain;
import org.dromara.common.mybatis.core.domain.BaseEntity;
import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import java.io.Serial;
/**
* 消息对象 msg_notice
*
* @author Lion Li
* @date 2025-08-13
*/
@Data
@EqualsAndHashCode(callSuper = true)
@TableName("msg_notice")
public class MsgNotice extends BaseEntity {
@Serial
private static final long serialVersionUID = 1L;
/**
* 主键ID
*/
@TableId(value = "id")
private Long id;
/**
* 项目ID
*/
private Long projectId;
/**
* 接收通知的用户ID
*/
private Long recipientId;
/**
* 发送通知的用户ID（系统通知 0）
*/
private Long senderId;
/**
* 配置id
*/
private Long configId;
/**
* 详情id
*/
private String detailId;
/**
* 通知内容
*/
private String content;
/**
* 查看状态(0未读 1已读)
*/
private String viewStatus;
/**
* 查看时间
*/
private Date viewTime;
/**
* 备注
*/
private String remark;
}

50
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/message/domain/bo/MsgConfigAddReq.java Normal file
View File

@ -0,0 +1,50 @@
package org.dromara.message.domain.bo;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull;
import lombok.Data;
import lombok.experimental.Accessors;
import org.dromara.common.core.validate.AddGroup;
import org.dromara.common.core.validate.EditGroup;
import java.io.Serializable;
/**
* @Author 铁憨憨
* @Date 2025/8/13 21:40
* @Version 1.0
*/
@Data
@Accessors(chain = true)
public class MsgConfigAddReq implements Serializable {
/**
* 项目ID
*/
@NotNull(message = "项目ID不能为空")
private Long projectId;
/**
* 消息名称
*/
@NotNull(message = "消息名称不能为空")
private Long msgName;
/**
* 消息模板
*/
@NotBlank(message = "消息模板不能为空")
private String msgContent;
/**
* 消息标识
*/
@NotBlank(message = "消息标识不能为空")
private String msgKey;
/**
* 跳转路由
*/
@NotBlank(message = "跳转路由不能为空")
private String route;
}

55
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/message/domain/bo/MsgConfigEditReq.java Normal file
View File

@ -0,0 +1,55 @@
package org.dromara.message.domain.bo;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull;
import lombok.Data;
import lombok.experimental.Accessors;
import org.dromara.common.core.validate.AddGroup;
import org.dromara.common.core.validate.EditGroup;
import java.io.Serializable;
/**
* @Author 铁憨憨
* @Date 2025/8/13 21:42
* @Version 1.0
*/
@Data
@Accessors(chain = true)
public class MsgConfigEditReq implements Serializable {
/**
* 主键ID
*/
@NotNull(message = "主键ID不能为空")
private Long id;
/**
* 消息名称
*/
@NotNull(message = "消息名称不能为空")
private Long msgName;
/**
* 消息模板
*/
@NotBlank(message = "消息模板不能为空")
private String msgContent;
/**
* 消息标识
*/
@NotBlank(message = "消息标识不能为空")
private String msgKey;
/**
* 跳转路由
*/
@NotBlank(message = "跳转路由不能为空")
private String route;
/**
* 通知人
*/
private String userId;
}

84
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/message/domain/bo/MsgNoticeBo.java Normal file
View File

@ -0,0 +1,84 @@
package org.dromara.message.domain.bo;
import org.dromara.message.domain.MsgNotice;
import org.dromara.common.mybatis.core.domain.BaseEntity;
import org.dromara.common.core.validate.AddGroup;
import org.dromara.common.core.validate.EditGroup;
import io.github.linpeilie.annotations.AutoMapper;
import lombok.Data;
import lombok.EqualsAndHashCode;
import jakarta.validation.constraints.*;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
/**
* 消息业务对象 msg_notice
*
* @author Lion Li
* @date 2025-08-13
*/
@Data
@EqualsAndHashCode(callSuper = true)
@AutoMapper(target = MsgNotice.class, reverseConvertGenerate = false)
public class MsgNoticeBo extends BaseEntity {
/**
* 主键ID
*/
@NotNull(message = "主键ID不能为空", groups = { EditGroup.class })
private Long id;
/**
* 项目ID
*/
@NotNull(message = "项目ID不能为空", groups = { AddGroup.class, EditGroup.class })
private Long projectId;
/**
* 接收通知的用户ID
*/
@NotNull(message = "接收通知的用户ID不能为空", groups = { AddGroup.class, EditGroup.class })
private Long recipientId;
/**
* 发送通知的用户ID（系统通知 0）
*/
@NotNull(message = "发送通知的用户ID（系统通知 0）不能为空", groups = { AddGroup.class, EditGroup.class })
private Long senderId;
/**
* 配置id
*/
@NotNull(message = "配置id不能为空", groups = { AddGroup.class, EditGroup.class })
private Long configId;
/**
* 详情id
*/
@NotNull(message = "详情id不能为空", groups = { AddGroup.class, EditGroup.class })
private String detailId;
/**
* 通知内容
*/
@NotBlank(message = "通知内容不能为空", groups = { AddGroup.class, EditGroup.class })
private String content;
/**
* 查看状态(0未读 1已读)
*/
@NotBlank(message = "查看状态(0未读 1已读)不能为空", groups = { AddGroup.class, EditGroup.class })
private String viewStatus;
/**
* 查看时间
*/
private Date viewTime;
/**
* 备注
*/
private String remark;
}

26
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/message/domain/bo/ReadUpdateReq.java Normal file
View File

@ -0,0 +1,26 @@
package org.dromara.message.domain.bo;
import jakarta.validation.constraints.NotNull;
import lombok.Data;
import lombok.experimental.Accessors;
import org.dromara.common.core.validate.EditGroup;
import java.io.Serializable;
/**
* @Author 铁憨憨
* @Date 2025/8/13 22:39
* @Version 1.0
*/
@Data
@Accessors(chain = true)
public class ReadUpdateReq implements Serializable {
/**
* 主键ID
*/
@NotNull(message = "主键ID不能为空", groups = { EditGroup.class })
private Long id;
}

34
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/message/domain/bo/TheCurrentUserMessageListReq.java Normal file
View File

@ -0,0 +1,34 @@
package org.dromara.message.domain.bo;
import lombok.Data;
import lombok.experimental.Accessors;
import java.io.Serializable;
/**
* @Author 铁憨憨
* @Date 2025/8/13 22:14
* @Version 1.0
*/
@Data
@Accessors(chain = true)
public class TheCurrentUserMessageListReq implements Serializable {
/**
* 查看状态(0未读 1已读 2全部)
*/
private String viewStatus;
/**
* 项目ID
*/
private Long projectId;
/**
* 用户ID （不传递默认当前用户）
*/
private Long userId;
}

75
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/message/domain/dto/SendMsgDto.java Normal file
View File

@ -0,0 +1,75 @@
package org.dromara.message.domain.dto;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull;
import lombok.Data;
import lombok.experimental.Accessors;
import org.dromara.common.core.validate.AddGroup;
import org.dromara.common.core.validate.EditGroup;
import java.io.Serializable;
import java.util.Date;
import java.util.List;
/**
* @Author 铁憨憨
* @Date 2025/8/13 22:57
* @Version 1.0
*/
@Data
@Accessors(chain = true)
public class SendMsgDto implements Serializable {
/**
* 主键ID
*/
@NotNull(message = "主键ID不能为空", groups = { EditGroup.class })
private Long id;
/**
* 项目ID
*/
@NotNull(message = "项目ID不能为空", groups = { AddGroup.class, EditGroup.class })
private Long projectId;
/**
* 接收通知的用户ID
*/
@NotNull(message = "接收通知的用户ID不能为空", groups = { AddGroup.class, EditGroup.class })
private List<Long> recipientIds;
/**
* 发送通知的用户ID（系统通知 0）
*/
@NotNull(message = "发送通知的用户ID（系统通知 0）不能为空", groups = { AddGroup.class, EditGroup.class })
private Long senderId;
/**
* 配置id
*/
@NotNull(message = "配置id不能为空", groups = { AddGroup.class, EditGroup.class })
private Long configId;
/**
* 详情id
*/
@NotNull(message = "详情id不能为空", groups = { AddGroup.class, EditGroup.class })
private String detailId;
/**
* 通知内容
*/
@NotBlank(message = "通知内容不能为空", groups = { AddGroup.class, EditGroup.class })
private String content;
/**
* 查看时间
*/
private Date viewTime;
/**
* 备注
*/
private String remark;
}

95
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/message/domain/vo/MsgNoticeVo.java Normal file
View File

@ -0,0 +1,95 @@
package org.dromara.message.domain.vo;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.dromara.message.domain.MsgNotice;
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty;
import org.dromara.common.excel.annotation.ExcelDictFormat;
import org.dromara.common.excel.convert.ExcelDictConvert;
import io.github.linpeilie.annotations.AutoMapper;
import lombok.Data;
import java.io.Serial;
import java.io.Serializable;
import java.util.Date;
/**
* 消息视图对象 msg_notice
*
* @author Lion Li
* @date 2025-08-13
*/
@Data
@ExcelIgnoreUnannotated
@AutoMapper(target = MsgNotice.class)
public class MsgNoticeVo implements Serializable {
@Serial
private static final long serialVersionUID = 1L;
/**
* 主键ID
*/
@ExcelProperty(value = "主键ID")
private Long id;
/**
* 项目ID
*/
@ExcelProperty(value = "项目ID")
private Long projectId;
/**
* 接收通知的用户ID
*/
@ExcelProperty(value = "接收通知的用户ID")
private Long recipientId;
/**
* 发送通知的用户ID（系统通知 0）
*/
@ExcelProperty(value = "发送通知的用户ID", converter = ExcelDictConvert.class)
@ExcelDictFormat(readConverterExp = "系=统通知,0=")
private Long senderId;
/**
* 配置id
*/
@ExcelProperty(value = "配置id")
private Long configId;
/**
* 详情id
*/
@ExcelProperty(value = "详情id")
private String detailId;
/**
* 通知内容
*/
@ExcelProperty(value = "通知内容")
private String content;
/**
* 查看状态(0未读 1已读)
*/
@ExcelProperty(value = "查看状态(0未读 1已读)")
private String viewStatus;
/**
* 查看时间
*/
@ExcelProperty(value = "查看时间")
private Date viewTime;
/**
* 备注
*/
@ExcelProperty(value = "备注")
private String remark;
}

15
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/message/mapper/MsgNoticeMapper.java Normal file
View File

@ -0,0 +1,15 @@
package org.dromara.message.mapper;
import org.dromara.message.domain.MsgNotice;
import org.dromara.message.domain.vo.MsgNoticeVo;
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
/**
* 消息Mapper接口
*
* @author Lion Li
* @date 2025-08-13
*/
public interface MsgNoticeMapper extends BaseMapperPlus<MsgNotice, MsgNoticeVo> {
}

92
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/message/service/IMsgNoticeService.java Normal file
View File

@ -0,0 +1,92 @@
package org.dromara.message.service;
import org.dromara.message.domain.bo.TheCurrentUserMessageListReq;
import org.dromara.message.domain.dto.SendMsgDto;
import org.dromara.message.domain.vo.MsgNoticeVo;
import org.dromara.message.domain.bo.MsgNoticeBo;
import org.dromara.message.domain.MsgNotice;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.mybatis.core.page.PageQuery;
import com.baomidou.mybatisplus.extension.service.IService;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.RequestBody;
import java.util.Collection;
import java.util.List;
/**
* 消息Service接口
*
* @author Lion Li
* @date 2025-08-13
*/
public interface IMsgNoticeService extends IService<MsgNotice>{
/**
* 查询消息
*
* @param id 主键
* @return 消息
*/
MsgNoticeVo queryById(Long id);
/**
* 分页查询消息列表
*
* @param bo 查询条件
* @param pageQuery 分页参数
* @return 消息分页列表
*/
TableDataInfo<MsgNoticeVo> queryPageList(MsgNoticeBo bo, PageQuery pageQuery);
/**
* 查询符合条件的消息列表
*
* @param bo 查询条件
* @return 消息列表
*/
List<MsgNoticeVo> queryList(MsgNoticeBo bo);
/**
* 新增消息
*
* @param bo 消息
* @return 是否新增成功
*/
Boolean insertByBo(MsgNoticeBo bo);
/**
* 修改消息
*
* @param bo 消息
* @return 是否修改成功
*/
Boolean updateByBo(MsgNoticeBo bo);
/**
* 校验并批量删除消息信息
*
* @param ids 待删除的主键集合
* @param isValid 是否进行有效性校验
* @return 是否删除成功
*/
Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
/**
* 获取当前用户的消息列表
*/
TableDataInfo<MsgNoticeVo> theCurrentUserMessageList(TheCurrentUserMessageListReq bo, PageQuery pageQuery);
/**
* 变更消息为已读
*/
Boolean readUpdate(MsgNoticeBo bo);
/**
* 指定用户向指定用户发送消息
*/
Boolean sendMsg(SendMsgDto bo);
}

18
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/message/service/impl/MsgConfigServiceImpl.java
View File

@ -1,6 +1,7 @@
package org.dromara.message.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.dromara.common.core.exception.ServiceException;
import org.dromara.common.core.utils.MapstructUtils;
import org.dromara.common.core.utils.StringUtils;
import org.dromara.common.mybatis.core.page.TableDataInfo;
@ -90,6 +91,14 @@ public class MsgConfigServiceImpl extends ServiceImpl<MsgConfigMapper, MsgConfig
*/
@Override
public Boolean insertByBo(MsgConfigBo bo) {
//1、查询是否有相同的消息标识
LambdaQueryWrapper<MsgConfig> lqw = Wrappers.lambdaQuery();
lqw.eq(MsgConfig::getMsgKey, bo.getMsgKey());
MsgConfig msgConfig = baseMapper.selectOne(lqw);
if (msgConfig != null) {
throw new ServiceException(bo.getMsgKey()+" 消息标识已存在");
}
//2、新增
MsgConfig add = MapstructUtils.convert(bo, MsgConfig.class);
validEntityBeforeSave(add);
boolean flag = baseMapper.insert(add) > 0;
@ -107,6 +116,15 @@ public class MsgConfigServiceImpl extends ServiceImpl<MsgConfigMapper, MsgConfig
*/
@Override
public Boolean updateByBo(MsgConfigBo bo) {
//1、查询是否有相同的消息标识，排除自己
LambdaQueryWrapper<MsgConfig> lqw = Wrappers.lambdaQuery();
lqw.eq(MsgConfig::getMsgKey, bo.getMsgKey());
lqw.ne(MsgConfig::getId, bo.getId());
MsgConfig msgConfig = baseMapper.selectOne(lqw);
if (msgConfig != null) {
throw new ServiceException(bo.getMsgKey()+" 消息标识已存在");
}
//2、修改
MsgConfig update = MapstructUtils.convert(bo, MsgConfig.class);
validEntityBeforeSave(update);
return baseMapper.updateById(update) > 0;

195
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/message/service/impl/MsgNoticeServiceImpl.java Normal file
View File

@ -0,0 +1,195 @@
package org.dromara.message.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.dromara.common.core.exception.ServiceException;
import org.dromara.common.core.utils.MapstructUtils;
import org.dromara.common.core.utils.StringUtils;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.mybatis.core.page.PageQuery;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import lombok.RequiredArgsConstructor;
import org.dromara.common.sse.dto.SseMessageDto;
import org.dromara.common.sse.utils.SseMessageUtils;
import org.dromara.message.domain.bo.TheCurrentUserMessageListReq;
import org.dromara.message.domain.dto.SendMsgDto;
import org.springframework.stereotype.Service;
import org.dromara.message.domain.bo.MsgNoticeBo;
import org.dromara.message.domain.vo.MsgNoticeVo;
import org.dromara.message.domain.MsgNotice;
import org.dromara.message.mapper.MsgNoticeMapper;
import org.dromara.message.service.IMsgNoticeService;
import java.util.*;
/**
* 消息Service业务层处理
*
* @author Lion Li
* @date 2025-08-13
*/
@RequiredArgsConstructor
@Service
public class MsgNoticeServiceImpl extends ServiceImpl<MsgNoticeMapper, MsgNotice> implements IMsgNoticeService {
private final MsgNoticeMapper baseMapper;
/**
* 查询消息
*
* @param id 主键
* @return 消息
*/
@Override
public MsgNoticeVo queryById(Long id){
return baseMapper.selectVoById(id);
}
/**
* 分页查询消息列表
*
* @param bo 查询条件
* @param pageQuery 分页参数
* @return 消息分页列表
*/
@Override
public TableDataInfo<MsgNoticeVo> queryPageList(MsgNoticeBo bo, PageQuery pageQuery) {
LambdaQueryWrapper<MsgNotice> lqw = buildQueryWrapper(bo);
Page<MsgNoticeVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
return TableDataInfo.build(result);
}
/**
* 查询符合条件的消息列表
*
* @param bo 查询条件
* @return 消息列表
*/
@Override
public List<MsgNoticeVo> queryList(MsgNoticeBo bo) {
LambdaQueryWrapper<MsgNotice> lqw = buildQueryWrapper(bo);
return baseMapper.selectVoList(lqw);
}
private LambdaQueryWrapper<MsgNotice> buildQueryWrapper(MsgNoticeBo bo) {
Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<MsgNotice> lqw = Wrappers.lambdaQuery();
lqw.orderByDesc(MsgNotice::getId);
lqw.eq(bo.getProjectId() != null, MsgNotice::getProjectId, bo.getProjectId());
lqw.eq(bo.getRecipientId() != null, MsgNotice::getRecipientId, bo.getRecipientId());
lqw.eq(bo.getSenderId() != null, MsgNotice::getSenderId, bo.getSenderId());
lqw.eq(bo.getConfigId() != null, MsgNotice::getConfigId, bo.getConfigId());
lqw.eq(bo.getDetailId() != null, MsgNotice::getDetailId, bo.getDetailId());
lqw.eq(StringUtils.isNotBlank(bo.getContent()), MsgNotice::getContent, bo.getContent());
lqw.eq(StringUtils.isNotBlank(bo.getViewStatus()), MsgNotice::getViewStatus, bo.getViewStatus());
lqw.eq(bo.getViewTime() != null, MsgNotice::getViewTime, bo.getViewTime());
return lqw;
}
/**
* 新增消息
*
* @param bo 消息
* @return 是否新增成功
*/
@Override
public Boolean insertByBo(MsgNoticeBo bo) {
MsgNotice add = MapstructUtils.convert(bo, MsgNotice.class);
validEntityBeforeSave(add);
boolean flag = baseMapper.insert(add) > 0;
if (flag) {
bo.setId(add.getId());
}
return flag;
}
/**
* 修改消息
*
* @param bo 消息
* @return 是否修改成功
*/
@Override
public Boolean updateByBo(MsgNoticeBo bo) {
MsgNotice update = MapstructUtils.convert(bo, MsgNotice.class);
validEntityBeforeSave(update);
return baseMapper.updateById(update) > 0;
}
/**
* 保存前的数据校验
*/
private void validEntityBeforeSave(MsgNotice entity){
//TODO 做一些数据校验,如唯一约束
}
/**
* 校验并批量删除消息信息
*
* @param ids 待删除的主键集合
* @param isValid 是否进行有效性校验
* @return 是否删除成功
*/
@Override
public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
if(isValid){
//TODO 做一些业务上的校验,判断是否需要校验
}
return baseMapper.deleteByIds(ids) > 0;
}
@Override
public TableDataInfo<MsgNoticeVo> theCurrentUserMessageList(TheCurrentUserMessageListReq bo, PageQuery pageQuery) {
MsgNoticeBo msgNotice = new MsgNoticeBo();
//消息类型不为2 viewStatus 就查询指定类型
if (!Objects.equals(bo.getViewStatus(), "2")) {
msgNotice.setViewStatus(bo.getViewStatus());
}
msgNotice.setProjectId(bo.getProjectId());
msgNotice.setRecipientId(bo.getUserId());
LambdaQueryWrapper<MsgNotice> lqw = buildQueryWrapper(msgNotice);
Page<MsgNoticeVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
return TableDataInfo.build(result);
}
@Override
public Boolean readUpdate(MsgNoticeBo bo) {
MsgNotice me = new MsgNotice();
me.setId(bo.getId());
me.setViewStatus("1");
return this.save(me);
}
/**
* 指定用户向指定（一个或多个）用户发送消息
*/
@Override
public Boolean sendMsg(SendMsgDto bo) {
List<MsgNotice> msgNotices = new ArrayList<>();
List<Long> recipientIds = bo.getRecipientIds();
for (Long recipientId : recipientIds) {
MsgNotice me = new MsgNotice();
me.setProjectId(bo.getProjectId());
me.setRecipientId(recipientId);
me.setSenderId(bo.getSenderId());
me.setConfigId(bo.getConfigId());
me.setDetailId(bo.getDetailId());
me.setContent(bo.getContent());
msgNotices.add(me);
}
//批量保存数据
boolean b = this.saveBatch(msgNotices);
if(b){
SseMessageDto messageDto = new SseMessageDto();
messageDto.setUserIds(recipientIds);
messageDto.setMessage(bo.getContent());
SseMessageUtils.publishMessage(messageDto);
}else{
throw new RuntimeException("消息发送失败");
}
return b;
}
}

2
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysUserService.java
View File

@ -235,4 +235,6 @@ public interface ISysUserService {
* @return 结果
*/
List<SysUserVo> selectUserListByPostList(List<Long> postIds);
}

2
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/resources/mapper/design/BusTotalsupplyplanAuditMapper.xml
View File

@ -2,6 +2,6 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.dromara.design.mapper.BusTotalsupplyplanAuditMapper">
<mapper namespace="org.dromara.cailiaoshebei.mapper.BusTotalsupplyplanAuditMapper">
</mapper>

2
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/resources/mapper/design/BusTotalsupplyplanMapper.xml
View File

@ -2,6 +2,6 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.dromara.design.mapper.BusTotalsupplyplanMapper">
<mapper namespace="org.dromara.cailiaoshebei.mapper.BusTotalsupplyplanMapper">
</mapper>

7
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/resources/mapper/message/MsgNoticeMapper.xml Normal file
View File

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.dromara.message.mapper.MsgNoticeMapper">
</mapper>