From 4efd37516a0723c67a2644ab0ddcf86013af6a4b Mon Sep 17 00:00:00 2001
From: 吴羡 <16976746+Xian-TT3@user.noreply.gitee.com>
Date: 星期三, 28 十月 2026 17:57:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 basic-server/src/main/java/com/ruoyi/basic/controller/CertificationController.java    |   21 +++++++
 basic-server/src/main/java/com/ruoyi/basic/service/CertificationService.java          |    8 ++
 basic-server/src/main/java/com/ruoyi/basic/dto/CertificationUpdateDto.java            |   42 ++++++++++++++
 basic-server/src/main/java/com/ruoyi/basic/dto/CertificationImageUpdateDto.java       |   16 +++++
 basic-server/src/main/java/com/ruoyi/basic/service/impl/CertificationServiceImpl.java |   88 ++++++++++++++++++++++++++++
 5 files changed, 173 insertions(+), 2 deletions(-)

diff --git a/basic-server/src/main/java/com/ruoyi/basic/controller/CertificationController.java b/basic-server/src/main/java/com/ruoyi/basic/controller/CertificationController.java
index 28b4f51..abc7346 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/controller/CertificationController.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/controller/CertificationController.java
@@ -1,6 +1,8 @@
 package com.ruoyi.basic.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.basic.dto.CertificationImageUpdateDto;
+import com.ruoyi.basic.dto.CertificationUpdateDto;
 import com.ruoyi.common.core.domain.Result;
 import com.ruoyi.basic.pojo.Certification;
 import com.ruoyi.basic.service.CertificationService;
@@ -25,11 +27,30 @@
         return Result.success(certificationService.getCertificationDetail(page, certification));
     }
 
+    @Operation(summary = "鎸塈D鏌ヨ璧勮川璇︽儏")
+    @GetMapping("/getCertificationById")
+    public Result<Certification> getCertificationById(Integer id) {
+        return Result.success(certificationService.getCertificationById(id));
+    }
+
     @Operation(summary = "娣诲姞璧勮川鏄庣粏鍒楄〃")
     @PostMapping("/addCertificationDetail")
     public Result addCertificationDetail(@RequestBody Certification certification) {
         return Result.success(certificationService.addCertificationDetail(certification));
     }
+
+    @Operation(summary = "鏇存柊璧勮川璧勬枡")
+    @PutMapping("/updateCertificationDetail")
+    public Result<Integer> updateCertificationDetail(@RequestBody CertificationUpdateDto certification) {
+        return Result.success(certificationService.updateCertificationDetail(certification));
+    }
+
+    @Operation(summary = "鏇存柊璧勮川鍥剧墖")
+    @PutMapping("/updateCertificationImage")
+    public Result<Integer> updateCertificationImage(@RequestBody CertificationImageUpdateDto certification) {
+        return Result.success(certificationService.updateCertificationImage(certification));
+    }
+
     @Operation(summary = "鍒犻櫎璧勮川鏄庣粏鍒楄〃")
     @DeleteMapping("/delCertificationDetail")
     public Result<?> delCertificationDetail(String ids) {
diff --git a/basic-server/src/main/java/com/ruoyi/basic/dto/CertificationImageUpdateDto.java b/basic-server/src/main/java/com/ruoyi/basic/dto/CertificationImageUpdateDto.java
new file mode 100644
index 0000000..37089ef
--- /dev/null
+++ b/basic-server/src/main/java/com/ruoyi/basic/dto/CertificationImageUpdateDto.java
@@ -0,0 +1,16 @@
+package com.ruoyi.basic.dto;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+/** 璧勮川鍥剧墖鏇存柊鍙傛暟銆� */
+@Data
+@Schema(description = "璧勮川鍥剧墖鏇存柊鍙傛暟")
+public class CertificationImageUpdateDto {
+
+    @Schema(description = "璧勮川ID")
+    private Integer id;
+
+    @Schema(description = "璧勮川鍥剧墖鍦板潃")
+    private String imageUrl;
+}
diff --git a/basic-server/src/main/java/com/ruoyi/basic/dto/CertificationUpdateDto.java b/basic-server/src/main/java/com/ruoyi/basic/dto/CertificationUpdateDto.java
new file mode 100644
index 0000000..3656987
--- /dev/null
+++ b/basic-server/src/main/java/com/ruoyi/basic/dto/CertificationUpdateDto.java
@@ -0,0 +1,42 @@
+package com.ruoyi.basic.dto;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+/** 璧勮川璧勬枡鏇存柊鍙傛暟銆� */
+@Data
+@Schema(description = "璧勮川璧勬枡鏇存柊鍙傛暟")
+public class CertificationUpdateDto {
+
+    @Schema(description = "璧勮川ID")
+    private Integer id;
+
+    @Schema(description = "璧勮川鍚嶇О")
+    private String name;
+
+    @Schema(description = "璧勮川缂栫爜")
+    private String code;
+
+    @Schema(description = "棰佸彂鏈烘瀯")
+    private String organization;
+
+    @Schema(description = "璧勮川璇存槑")
+    private String explanation;
+
+    @Schema(description = "棰佸彂鏃堕棿")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime dateOfIssuance;
+
+    @Schema(description = "鍒版湡鏃堕棿")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime expireTime;
+
+    @Schema(description = "璧勮川鍥剧墖鍦板潃")
+    private String imageUrl;
+
+    @Schema(description = "璧勮川闄勪欢鍦板潃")
+    private String fileUrl;
+}
diff --git a/basic-server/src/main/java/com/ruoyi/basic/service/CertificationService.java b/basic-server/src/main/java/com/ruoyi/basic/service/CertificationService.java
index 7ecac80..1bf861b 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/service/CertificationService.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/service/CertificationService.java
@@ -3,15 +3,23 @@
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.basic.dto.CertificationImageUpdateDto;
+import com.ruoyi.basic.dto.CertificationUpdateDto;
 import com.ruoyi.basic.pojo.Certification;
 
 public interface CertificationService extends IService<Certification> {
     //鏌ヨ璧勮川鏄庣粏鍒楄〃
     IPage<Certification> getCertificationDetail(Page page, Certification certification);
 
+    Certification getCertificationById(Integer id);
+
     //娣诲姞璧勮川鏄庣粏鍒楄〃
     int addCertificationDetail(Certification certification);
 
+    int updateCertificationDetail(CertificationUpdateDto certification);
+
+    int updateCertificationImage(CertificationImageUpdateDto certification);
+
     //鍒犻櫎璧勮川鏄庣粏鍒楄〃
     int delCertificationDetail(String ids);
 }
diff --git a/basic-server/src/main/java/com/ruoyi/basic/service/impl/CertificationServiceImpl.java b/basic-server/src/main/java/com/ruoyi/basic/service/impl/CertificationServiceImpl.java
index 43eb9d2..b02de81 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/service/impl/CertificationServiceImpl.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/service/impl/CertificationServiceImpl.java
@@ -1,13 +1,16 @@
 package com.ruoyi.basic.service.impl;
 
-import com.alibaba.fastjson2.JSON;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ruoyi.common.utils.QueryWrappers;
+import com.ruoyi.basic.dto.CertificationImageUpdateDto;
+import com.ruoyi.basic.dto.CertificationUpdateDto;
 import com.ruoyi.basic.mapper.CertificationMapper;
 import com.ruoyi.basic.pojo.Certification;
 import com.ruoyi.basic.service.CertificationService;
+import com.ruoyi.common.exception.base.BaseException;
+import com.ruoyi.common.utils.StringUtils;
 import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -31,10 +34,71 @@
         return  certificationMapper.getCertificationDetail(page, certification);
     }
 
+    @Override
+    public Certification getCertificationById(Integer id) {
+        if (id == null) {
+            throw new BaseException("璧勮川ID涓嶈兘涓虹┖");
+        }
+        Certification certification = certificationMapper.selectById(id);
+        if (certification == null) {
+            throw new BaseException("璧勮川璁板綍涓嶅瓨鍦�");
+        }
+        return certification;
+    }
+
     //娣诲姞璧勮川鏄庣粏鍒楄〃
     @Override
     public int addCertificationDetail(Certification certification) {
+        validateRequiredFields(certification.getName(), certification.getCode(), certification.getOrganization(),
+                certification.getDateOfIssuance(), certification.getExpireTime());
         return certificationMapper.insert(certification);
+    }
+
+    @Override
+    public int updateCertificationDetail(CertificationUpdateDto certification) {
+        if (certification == null || certification.getId() == null) {
+            throw new BaseException("璧勮川ID涓嶈兘涓虹┖");
+        }
+        Certification existing = getCertificationById(certification.getId());
+        validateRequiredFields(certification.getName(), certification.getCode(), certification.getOrganization(),
+                certification.getDateOfIssuance(), certification.getExpireTime());
+
+        String imageUrl = StringUtils.isNotBlank(certification.getImageUrl())
+                ? certification.getImageUrl() : existing.getImageUrl();
+        String fileUrl = StringUtils.isNotBlank(certification.getFileUrl())
+                ? certification.getFileUrl() : existing.getFileUrl();
+        int updated = certificationMapper.update(new Certification(), Wrappers.<Certification>lambdaUpdate()
+                .eq(Certification::getId, certification.getId())
+                .set(Certification::getName, certification.getName())
+                .set(Certification::getCode, certification.getCode())
+                .set(Certification::getOrganization, certification.getOrganization())
+                .set(Certification::getExplanation, certification.getExplanation())
+                .set(Certification::getDateOfIssuance, certification.getDateOfIssuance())
+                .set(Certification::getExpireTime, certification.getExpireTime())
+                .set(Certification::getImageUrl, imageUrl)
+                .set(Certification::getFileUrl, fileUrl));
+        if (updated < 1) {
+            throw new BaseException("璧勮川鏇存柊澶辫触");
+        }
+        return updated;
+    }
+
+    @Override
+    public int updateCertificationImage(CertificationImageUpdateDto certification) {
+        if (certification == null || certification.getId() == null) {
+            throw new BaseException("璧勮川ID涓嶈兘涓虹┖");
+        }
+        if (StringUtils.isBlank(certification.getImageUrl())) {
+            throw new BaseException("璧勮川鍥剧墖涓嶈兘涓虹┖");
+        }
+        getCertificationById(certification.getId());
+        int updated = certificationMapper.update(new Certification(), Wrappers.<Certification>lambdaUpdate()
+                .eq(Certification::getId, certification.getId())
+                .set(Certification::getImageUrl, certification.getImageUrl()));
+        if (updated < 1) {
+            throw new BaseException("璧勮川鍥剧墖鏇存柊澶辫触");
+        }
+        return updated;
     }
 
     //鍒犻櫎璧勮川鏄庣粏鍒楄〃
@@ -44,4 +108,24 @@
         return certificationMapper.deleteBatchIds(list);
     }
 
+    private void validateRequiredFields(String name, String code, String organization,
+                                        java.time.LocalDateTime dateOfIssuance,
+                                        java.time.LocalDateTime expireTime) {
+        if (StringUtils.isBlank(name)) {
+            throw new BaseException("璧勮川鍚嶇О涓嶈兘涓虹┖");
+        }
+        if (StringUtils.isBlank(code)) {
+            throw new BaseException("璧勮川缂栫爜涓嶈兘涓虹┖");
+        }
+        if (StringUtils.isBlank(organization)) {
+            throw new BaseException("棰佸彂鏈烘瀯涓嶈兘涓虹┖");
+        }
+        if (dateOfIssuance == null) {
+            throw new BaseException("棰佸彂鏃堕棿涓嶈兘涓虹┖");
+        }
+        if (expireTime == null) {
+            throw new BaseException("鍒版湡鏃堕棿涓嶈兘涓虹┖");
+        }
+    }
+
 }

--
Gitblit v1.9.3