完善发送COA发布通知功能

- 引入IDictionaryItemService以动态获取消息类型ID
- 在发送消息时校验消息类型ID是否存在，异常时抛出业务错误
- 替换固定消息类型ID为动态获取的ID，提高灵活性和可维护性
- 导入VUtil工具类用于抛出业务异常
- 添加必要的import语句和@Resource注入装配新服务

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

@@ -13,16 +13,17 @@ 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;
@@ -60,7 +61,17 @@ public class FileUpLoadController extends BaseController {
             String fileName = file.getOriginalFilename();
             String fileType = getFileType(fileName);
             String url = fileUploadService.upload(buildFilePath(fileType), file);
-            return ApiResult.success(new FileUploadVO(0L, fileName, url));
+            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));
         } catch (Exception ex) {
             log.error("上传文件失败", ex);
             throw new NflgException(STATE.BusinessError, "上传文件失败:" + ex.getMessage());
@@ -104,7 +115,7 @@ public class FileUpLoadController extends BaseController {
      */
     @PostMapping("getFileTypes")
     @ApiMark(moduleName = "文件管理", apiName = "获取文件类型列表")
-    public ApiResult<List<String>> getFileTypes(){
+    public ApiResult<List<String>> getFileTypes() {
         return ApiResult.success(fileControllerService.getFileTypes());
     }
 

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

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

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

@@ -4,7 +4,9 @@ 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;
@@ -13,6 +15,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
+import java.util.Objects;
 
 /**
  * 测试
@@ -28,15 +31,20 @@ 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(2046157760401182721L)
+                .setSourceTypeId(dictionaryItemServiceId)
                 .setSourceId(0L)
                 .setCreateUserId(UserUtil.getUserId())
                 .setCreateUserName(UserUtil.getUserName())

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

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

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

@@ -1,12 +1,18 @@
 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 待办事项
      */
-    void sendSystemMessage(QmsTodoItem item);
+   default void sendSystemMessage(QmsTodoItem item){
+       log.warn("方法未实现");
+   }
 }

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

@@ -5,19 +5,13 @@ 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.FileVO;
+import com.nflg.wms.common.pojo.vo.FileUploadVO;
 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.FileUploadRecord;
+import com.nflg.wms.repository.entity.*;
-import com.nflg.wms.repository.entity.QmsQualityNotification;
+import com.nflg.wms.repository.service.*;
-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;
@@ -49,6 +43,9 @@ public class QualityNotificationControllerService {
     @Resource
     private IFileUploadRecordService fileUploadRecordService;
 
+    @Resource
+    private IQmsQualityNotificationFileService qualityNotificationFileService;
+
     /**
      * 新增质量通知
      */
@@ -79,6 +76,16 @@ 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);
@@ -123,6 +130,19 @@ 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);
+        }
     }
 
     /**
@@ -140,6 +160,10 @@ public class QualityNotificationControllerService {
         notificationUserService.lambdaUpdate()
                 .eq(QmsQualityNotificationUser::getNotificationId, id)
                 .remove();
+
+        qualityNotificationFileService.lambdaUpdate()
+                .eq(QmsQualityNotificationFile::getNotificationId, id)
+                .remove();
     }
 
     /**
@@ -208,21 +232,21 @@ public class QualityNotificationControllerService {
         }
 
         // 查询附件列表
-        List<FileUploadRecord> files = fileUploadRecordService.lambdaQuery()
+        List<QmsQualityNotificationFile> attachments = qualityNotificationFileService.lambdaQuery()
-                .eq(FileUploadRecord::getSourceId, id)
+                .eq(QmsQualityNotificationFile::getNotificationId, id)
                 .list();
-        if (CollectionUtil.isNotEmpty(files)) {
+        if (CollectionUtil.isNotEmpty(attachments)) {
-            List<FileVO> fileVOs = files.stream().map(f -> {
+            List<FileUploadRecord> files = fileUploadRecordService.lambdaQuery()
-                FileVO fileVO = new FileVO();
+                    .in(FileUploadRecord::getId, attachments.stream().map(QmsQualityNotificationFile::getFileId).collect(Collectors.toList()))
-                fileVO.setId(f.getId());
+                    .list();
-                fileVO.setFileName(f.getFileName());
+            vo.setAttachments(files.stream()
-                fileVO.setFileType(f.getFileType());
+                    .map(file -> new FileUploadVO()
-                fileVO.setUrl(f.getUrl());
+                            .setId(file.getId())
-                fileVO.setCreateBy(f.getCreateBy());
+                            .setFileName(file.getFileName())
-                fileVO.setCreateTime(f.getCreateTime());
+                            .setUrl(file.getUrl())
-                return fileVO;
+                    )
-            }).collect(Collectors.toList());
+                    .collect(Collectors.toList())
-            vo.setAttachments(fileVOs);
+            );
         }
 
         return vo;
@@ -232,7 +256,7 @@ public class QualityNotificationControllerService {
      * 保存通知用户关联
      */
     private void saveNotificationUsers(Long notificationId, List<Long> userIds,
-                                        String operator, Long operatorId, LocalDateTime now) {
+                                       String operator, Long operatorId, LocalDateTime now) {
         List<QmsQualityNotificationUser> users = userIds.stream()
                 .map(userId -> new QmsQualityNotificationUser()
                         .setNotificationId(notificationId)

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

@@ -1,5 +1,7 @@
 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;
 
@@ -33,5 +35,7 @@ public class QmsFileMemberAddQO {
      * 权限类型：1-只读，2-读写
      */
     @NotNull(message = "权限类型不能为空")
+    @Min(value = 1, message = "权限类型仅支持1(只读)或2(读写)")
+    @Max(value = 2, message = "权限类型仅支持1(只读)或2(读写)")
     private Short permissionType;
 }

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

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

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

@@ -1,5 +1,7 @@
 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;
@@ -39,4 +41,10 @@ public class QmsQualityNotificationAddQO {
      * 通知内容（HTML格式）
      */
     private String content;
+
+    /**
+     * 附件列表
+     */
+    @Valid
+    private List<FileUploadVO> attachments;
 }

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

@@ -1,5 +1,7 @@
 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;
@@ -45,4 +47,10 @@ public class QmsQualityNotificationUpdateQO {
      * 通知内容（HTML格式）
      */
     private String content;
+
+    /**
+     * 附件列表
+     */
+    @Valid
+    private List<FileUploadVO> attachments;
 }

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

@@ -1,5 +1,7 @@
 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;
@@ -14,6 +16,8 @@ public class FileUploadVO {
     /**
      * 文件id
      */
+    @NotNull
+    @Positive
     private Long id;
 
     /**

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

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

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

@@ -0,0 +1,37 @@
+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;
+}

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

@@ -0,0 +1,11 @@
+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> {
+
+}

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

@@ -0,0 +1,11 @@
+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> {
+
+}

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

@@ -0,0 +1,15 @@
+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 {
+
+}

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

@@ -1,6 +1,7 @@
 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;