rakor
/
wms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: rakor:514080a0f905399e68a10567c2ddabbcb606ba57
Branches Tags
rakor:develop
rakor:qms/develop
rakor:qms/yf
rakor:qms/zhangke
rakor:dev_zhangke
rakor:demo
rakor:feature/rustfs
rakor:sit
rakor:feature/bug-884
rakor:feature/bug-883
rakor:feature/bug-890
rakor:feature/bug-776
rakor:feature/bug-784
rakor:feature/bug-788
rakor:feature/bug-787
rakor:rakor
rakor:template
..
compare: rakor:f322b18b8c7e3ca502402c8d4620901c4ca2993b
Branches Tags
rakor:qms/develop
rakor:qms/yf
rakor:develop
rakor:qms/zhangke
rakor:dev_zhangke
rakor:demo
rakor:feature/rustfs
rakor:sit
rakor:feature/bug-884
rakor:feature/bug-883
rakor:feature/bug-890
rakor:feature/bug-776
rakor:feature/bug-784
rakor:feature/bug-788
rakor:feature/bug-787
rakor:rakor
rakor:template

No commits in common. "514080a0f905399e68a10567c2ddabbcb606ba57" and "f322b18b8c7e3ca502402c8d4620901c4ca2993b" have entirely different histories.
514080a0f9 ... f322b18b8c

17 changed files with 45 additions and 214 deletions
Show Stats Expand all files Collapse all files

15
nflg-qms-admin/src/main/java/com/nflg/qms/admin/controller/FileUpLoadController.java
View File

@ -13,17 +13,16 @@ import com.nflg.wms.common.pojo.qo.ZipDownloadQO;
import com.nflg.wms.common.pojo.vo.FileUploadVO;
import com.nflg.wms.common.pojo.vo.FileVO;
import com.nflg.wms.common.util.UserUtil;
import com.nflg.wms.repository.entity.FileUploadRecord;
import com.nflg.wms.starter.BaseController;
import com.nflg.wms.starter.annotation.ApiMark;
import com.nflg.wms.starter.service.FileUploadService;
import jakarta.annotation.Resource;
import org.springframework.beans.factory.annotation.Qualifier;
import jakarta.validation.Valid;
import jakarta.validation.constraints.NotEmpty;
import jakarta.validation.constraints.NotNull;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.io.FilenameUtils;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
@ -61,17 +60,7 @@ public class FileUpLoadController extends BaseController {
String fileName = file.getOriginalFilename();
String fileType = getFileType(fileName);
String url = fileUploadService.upload(buildFilePath(fileType), file);
FileUploadRecord record = new FileUploadRecord()
.setFileName(fileName)
.setFileType(fileType)
.setUrl(url)
.setFrom("admin")
.setSource((short) 0)
.setSourceId(0L)
.setCreateBy(UserUtil.getUserName())
.setCreateTime(LocalDateTime.now());
fileControllerService.add(record);
return ApiResult.success(new FileUploadVO(record.getId(), fileName, url));
return ApiResult.success(new FileUploadVO(0L, fileName, url));
} catch (Exception ex) {
log.error("上传文件失败", ex);
throw new NflgException(STATE.BusinessError, "上传文件失败:" + ex.getMessage());

40
nflg-qms-admin/src/main/java/com/nflg/qms/admin/controller/QmsCoaTaskController.java
View File

@ -12,12 +12,9 @@ import com.nflg.wms.common.pojo.vo.QmsCoaTaskDetailVO;
import com.nflg.wms.common.pojo.vo.QmsCoaTaskMaterialVO;
import com.nflg.wms.common.pojo.vo.QmsCoaTaskVO;
import com.nflg.wms.common.util.UserUtil;
import com.nflg.wms.common.util.VUtil;
import com.nflg.wms.repository.entity.QmsCoaTask;
import com.nflg.wms.repository.entity.QmsTodoItem;
import com.nflg.wms.repository.service.IDictionaryItemService;
import com.nflg.wms.repository.service.IQmsCoaTaskService;
import com.nflg.wms.repository.service.IQmsTodoItemService;
import com.nflg.wms.starter.BaseController;
import jakarta.annotation.Resource;
import jakarta.validation.Valid;
@ -26,7 +23,6 @@ import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
import java.util.List;
import java.util.Objects;
/**
* COA通知管理
@ -41,15 +37,9 @@ public class QmsCoaTaskController extends BaseController {
@Resource
private List<ISendMessageService> sendMessageServices;
@Resource
private IQmsTodoItemService todoItemService;
@Resource
private BasdeSerialNumberControllerService basdeSerialNumberControllerService;
@Resource
private IDictionaryItemService dictionaryItemService;
/**
* 新增COA通知任务
* 状态默认为0（待发送）
@ -90,23 +80,22 @@ public class QmsCoaTaskController extends BaseController {
@PostMapping("publish")
public ApiResult<Void> publish(@Valid @RequestBody QmsCoaTaskAddQO qo) {
coaTaskService.publish(qo);
Long dictionaryItemServiceId = dictionaryItemService.getId("消息类型", "COANotificationSent");
VUtil.trueThrowBusinessError(Objects.isNull(dictionaryItemServiceId)).throwMessage("消息类型不存在");
// 推送COA通知
QmsTodoItem qmsTodoItem = new QmsTodoItem()
.setCode(basdeSerialNumberControllerService.generateSerialNumber(32))
.setIsRead(false)
.setSourceTypeId(dictionaryItemServiceId)
.setSourceTypeId(2046157760401182721L)
.setSourceId(coaTaskService.lambdaQuery().eq(QmsCoaTask::getMaterialId,qo.getMaterialNo()).one().getId())
.setCreateUserId(UserUtil.getUserId())
.setCreateUserName(UserUtil.getUserName())
.setCreateTime(java.time.LocalDateTime.now());
todoItemService.save(qmsTodoItem);
sendMessageServices.forEach(service -> service.sendSystemMessage(qmsTodoItem));
return ApiResult.success();
}
/**
* 批量发送（状态改为1（已发送），填入发送时间，每条任务单独推送一条待办消息）
* 批量发送（状态改为1（已发送），填入发送时间）
*
* @param ids 任务ID列表
*/
@ -114,23 +103,16 @@ public class QmsCoaTaskController extends BaseController {
@PostMapping("send")
public ApiResult<Void> send(@RequestBody List<Long> ids) {
coaTaskService.send(ids);
Long dictionaryItemServiceId = dictionaryItemService.getId("消息类型", "COANotificationSent");
VUtil.trueThrowBusinessError(Objects.isNull(dictionaryItemServiceId)).throwMessage("消息类型不存在");
Long currentUserId = UserUtil.getUserId();
String currentUserName = UserUtil.getUserName();
java.time.LocalDateTime now = java.time.LocalDateTime.now();
// 每个任务ID单独推送一条待办消息
for (Long taskId : ids) {
// 推送COA通知
QmsTodoItem qmsTodoItem = new QmsTodoItem()
.setCode(basdeSerialNumberControllerService.generateSerialNumber(32))
.setIsRead(false)
.setSourceTypeId(dictionaryItemServiceId)
.setSourceId(taskId)
.setCreateUserId(currentUserId)
.setCreateUserName(currentUserName)
.setCreateTime(now);
todoItemService.save(qmsTodoItem);
}
.setSourceTypeId(2046157760401182721L)
.setSourceId(0L)
.setCreateUserId(UserUtil.getUserId())
.setCreateUserName(UserUtil.getUserName())
.setCreateTime(java.time.LocalDateTime.now());
sendMessageServices.forEach(service -> service.sendSystemMessage(qmsTodoItem));
return ApiResult.success();
}

10
nflg-qms-admin/src/main/java/com/nflg/qms/admin/controller/TestController.java
View File

@ -4,9 +4,7 @@ import com.nflg.qms.admin.service.BasdeSerialNumberControllerService;
import com.nflg.qms.admin.service.ISendMessageService;
import com.nflg.wms.common.pojo.ApiResult;
import com.nflg.wms.common.util.UserUtil;
import com.nflg.wms.common.util.VUtil;
import com.nflg.wms.repository.entity.QmsTodoItem;
import com.nflg.wms.repository.service.IDictionaryItemService;
import com.nflg.wms.starter.BaseController;
import jakarta.annotation.Resource;
import lombok.extern.slf4j.Slf4j;
@ -15,7 +13,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.util.List;
import java.util.Objects;
/**
* 测试
@ -31,20 +28,15 @@ public class TestController extends BaseController {
@Resource
private BasdeSerialNumberControllerService basdeSerialNumberControllerService;
@Resource
private IDictionaryItemService dictionaryItemService;
/**
* 发送消息
*/
@GetMapping("/sendMessage")
public ApiResult<Void> sendMessage() {
Long dictionaryItemServiceId = dictionaryItemService.getId("消息类型", "COANotificationSent");
VUtil.trueThrowBusinessError(Objects.isNull(dictionaryItemServiceId)).throwMessage("消息类型不存在");
QmsTodoItem qmsTodoItem = new QmsTodoItem()
.setCode(basdeSerialNumberControllerService.generateSerialNumber(32))
.setIsRead(false)
.setSourceTypeId(dictionaryItemServiceId)
.setSourceTypeId(2046157760401182721L)
.setSourceId(0L)
.setCreateUserId(UserUtil.getUserId())
.setCreateUserName(UserUtil.getUserName())

4
nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/FileControllerService.java
View File

@ -105,8 +105,4 @@ public class FileControllerService {
.contentType(MediaType.APPLICATION_OCTET_STREAM)
.body(zipContent);
}
public void add(FileUploadRecord record) {
fileUploadRecordService.save(record);
}
}

8
nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/ISendMessageService.java
View File

@ -1,18 +1,12 @@
package com.nflg.qms.admin.service;
import com.nflg.wms.repository.entity.QmsTodoItem;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public interface ISendMessageService {
Logger log = LoggerFactory.getLogger(ISendMessageService.class);
/**
* 发送待办消息
* @param item 待办事项
*/
default void sendSystemMessage(QmsTodoItem item){
log.warn("方法未实现");
}
void sendSystemMessage(QmsTodoItem item);
}

68
nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QualityNotificationControllerService.java
View File

@ -5,13 +5,19 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.nflg.wms.common.pojo.qo.QmsQualityNotificationAddQO;
import com.nflg.wms.common.pojo.qo.QmsQualityNotificationSearchQO;
import com.nflg.wms.common.pojo.qo.QmsQualityNotificationUpdateQO;
import com.nflg.wms.common.pojo.vo.FileUploadVO;
import com.nflg.wms.common.pojo.vo.FileVO;
import com.nflg.wms.common.pojo.vo.QmsQualityNotificationUserVO;
import com.nflg.wms.common.pojo.vo.QmsQualityNotificationVO;
import com.nflg.wms.common.util.UserUtil;
import com.nflg.wms.common.util.VUtil;
import com.nflg.wms.repository.entity.*;
import com.nflg.wms.repository.service.*;
import com.nflg.wms.repository.entity.FileUploadRecord;
import com.nflg.wms.repository.entity.QmsQualityNotification;
import com.nflg.wms.repository.entity.QmsQualityNotificationUser;
import com.nflg.wms.repository.entity.User;
import com.nflg.wms.repository.service.IFileUploadRecordService;
import com.nflg.wms.repository.service.IQmsQualityNotificationService;
import com.nflg.wms.repository.service.IQmsQualityNotificationUserService;
import com.nflg.wms.repository.service.IUserService;
import jakarta.annotation.Resource;
import jakarta.validation.Valid;
import lombok.extern.slf4j.Slf4j;
@ -43,9 +49,6 @@ public class QualityNotificationControllerService {
@Resource
private IFileUploadRecordService fileUploadRecordService;
@Resource
private IQmsQualityNotificationFileService qualityNotificationFileService;
/**
* 新增质量通知
*/
@ -76,16 +79,6 @@ public class QualityNotificationControllerService {
qualityNotificationService.save(entity);
if (CollectionUtil.isNotEmpty(request.getAttachments())) {
List<QmsQualityNotificationFile> attachments = request.getAttachments().stream()
.map(attachment -> new QmsQualityNotificationFile()
.setNotificationId(entity.getId())
.setFileId(attachment.getId())
)
.collect(Collectors.toList());
qualityNotificationFileService.saveBatch(attachments);
}
// 如果是手动选择用户，保存用户关联
if (request.getTargetType() == 2 && CollectionUtil.isNotEmpty(request.getUserIds())) {
saveNotificationUsers(entity.getId(), request.getUserIds(), operator, operatorId, now);
@ -130,19 +123,6 @@ public class QualityNotificationControllerService {
if (request.getTargetType() == 2 && CollectionUtil.isNotEmpty(request.getUserIds())) {
saveNotificationUsers(request.getId(), request.getUserIds(), operator, operatorId, now);
}
if (CollectionUtil.isNotEmpty(request.getAttachments())) {
qualityNotificationFileService.lambdaUpdate()
.eq(QmsQualityNotificationFile::getNotificationId, request.getId())
.remove();
List<QmsQualityNotificationFile> attachments = request.getAttachments().stream()
.map(attachment -> new QmsQualityNotificationFile()
.setNotificationId(request.getId())
.setFileId(attachment.getId())
)
.collect(Collectors.toList());
qualityNotificationFileService.saveBatch(attachments);
}
}
/**
@ -160,10 +140,6 @@ public class QualityNotificationControllerService {
notificationUserService.lambdaUpdate()
.eq(QmsQualityNotificationUser::getNotificationId, id)
.remove();
qualityNotificationFileService.lambdaUpdate()
.eq(QmsQualityNotificationFile::getNotificationId, id)
.remove();
}
/**
@ -232,21 +208,21 @@ public class QualityNotificationControllerService {
}
// 查询附件列表
List<QmsQualityNotificationFile> attachments = qualityNotificationFileService.lambdaQuery()
.eq(QmsQualityNotificationFile::getNotificationId, id)
.list();
if (CollectionUtil.isNotEmpty(attachments)) {
List<FileUploadRecord> files = fileUploadRecordService.lambdaQuery()
.in(FileUploadRecord::getId, attachments.stream().map(QmsQualityNotificationFile::getFileId).collect(Collectors.toList()))
.eq(FileUploadRecord::getSourceId, id)
.list();
vo.setAttachments(files.stream()
.map(file -> new FileUploadVO()
.setId(file.getId())
.setFileName(file.getFileName())
.setUrl(file.getUrl())
)
.collect(Collectors.toList())
);
if (CollectionUtil.isNotEmpty(files)) {
List<FileVO> fileVOs = files.stream().map(f -> {
FileVO fileVO = new FileVO();
fileVO.setId(f.getId());
fileVO.setFileName(f.getFileName());
fileVO.setFileType(f.getFileType());
fileVO.setUrl(f.getUrl());
fileVO.setCreateBy(f.getCreateBy());
fileVO.setCreateTime(f.getCreateTime());
return fileVO;
}).collect(Collectors.toList());
vo.setAttachments(fileVOs);
}
return vo;

4
nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsFileMemberAddQO.java
View File

@ -1,7 +1,5 @@
package com.nflg.wms.common.pojo.qo;
import jakarta.validation.constraints.Max;
import jakarta.validation.constraints.Min;
import jakarta.validation.constraints.NotNull;
import lombok.Data;
@ -35,7 +33,5 @@ public class QmsFileMemberAddQO {
* 权限类型：1-只读，2-读写
*/
@NotNull(message = "权限类型不能为空")
@Min(value = 1, message = "权限类型仅支持1(只读)或2(读写)")
@Max(value = 2, message = "权限类型仅支持1(只读)或2(读写)")
private Short permissionType;
}

1
nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsInspectionStandardSaveQO.java
View File

@ -116,6 +116,7 @@ public class QmsInspectionStandardSaveQO {
/**
* 检测项名称
*/
@NotBlank(message = "检测项内容不能为空")
private String name;
/**

8
nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsQualityNotificationAddQO.java
View File

@ -1,7 +1,5 @@
package com.nflg.wms.common.pojo.qo;
import com.nflg.wms.common.pojo.vo.FileUploadVO;
import jakarta.validation.Valid;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull;
import lombok.Data;
@ -41,10 +39,4 @@ public class QmsQualityNotificationAddQO {
* 通知内容（HTML格式）
*/
private String content;
/**
* 附件列表
*/
@Valid
private List<FileUploadVO> attachments;
}

8
nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsQualityNotificationUpdateQO.java
View File

@ -1,7 +1,5 @@
package com.nflg.wms.common.pojo.qo;
import com.nflg.wms.common.pojo.vo.FileUploadVO;
import jakarta.validation.Valid;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull;
import lombok.Data;
@ -47,10 +45,4 @@ public class QmsQualityNotificationUpdateQO {
* 通知内容（HTML格式）
*/
private String content;
/**
* 附件列表
*/
@Valid
private List<FileUploadVO> attachments;
}

4
nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/FileUploadVO.java
View File

@ -1,7 +1,5 @@
package com.nflg.wms.common.pojo.vo;
import jakarta.validation.constraints.NotNull;
import jakarta.validation.constraints.Positive;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
@ -16,8 +14,6 @@ public class FileUploadVO {
/**
* 文件id
*/
@NotNull
@Positive
private Long id;
/**

2
nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsQualityNotificationVO.java
View File

@ -91,5 +91,5 @@ public class QmsQualityNotificationVO {
/**
* 附件列表
*/
private List<FileUploadVO> attachments;
private List<FileVO> attachments;
}

37
nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/QmsQualityNotificationFile.java
View File

@ -1,37 +0,0 @@
package com.nflg.wms.repository.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Getter;
import lombok.Setter;
import lombok.ToString;
import lombok.experimental.Accessors;
import java.io.Serializable;
/**
* 质量通知附件表
*/
@Getter
@Setter
@ToString
@Accessors(chain = true)
@TableName("qms_quality_notification_file")
public class QmsQualityNotificationFile implements Serializable {
private static final long serialVersionUID = 1L;
@TableId(value = "id", type = IdType.ASSIGN_ID)
private Long id;
/**
* 通知ID
*/
private Long notificationId;
/**
* 文件ID
*/
private Long fileId;
}

11
nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/QmsQualityNotificationFileMapper.java
View File

@ -1,11 +0,0 @@
package com.nflg.wms.repository.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.nflg.wms.repository.entity.QmsQualityNotificationFile;
/**
* 质量通知附件 Mapper 接口
*/
public interface QmsQualityNotificationFileMapper extends BaseMapper<QmsQualityNotificationFile> {
}

11
nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IQmsQualityNotificationFileService.java
View File

@ -1,11 +0,0 @@
package com.nflg.wms.repository.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.nflg.wms.repository.entity.QmsQualityNotificationFile;
/**
* 质量通知附件 服务类
*/
public interface IQmsQualityNotificationFileService extends IService<QmsQualityNotificationFile> {
}

15
nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/QmsQualityNotificationFileServiceImpl.java
View File

@ -1,15 +0,0 @@
package com.nflg.wms.repository.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.nflg.wms.repository.entity.QmsQualityNotificationFile;
import com.nflg.wms.repository.mapper.QmsQualityNotificationFileMapper;
import com.nflg.wms.repository.service.IQmsQualityNotificationFileService;
import org.springframework.stereotype.Service;
/**
* 质量通知附件 服务实现类
*/
@Service
public class QmsQualityNotificationFileServiceImpl extends ServiceImpl<QmsQualityNotificationFileMapper, QmsQualityNotificationFile> implements IQmsQualityNotificationFileService {
}

1
nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/QmsSupplierSqeMapServiceImpl.java
View File

@ -1,7 +1,6 @@
package com.nflg.wms.repository.service.impl;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.nflg.wms.common.constant.STATE;