xiexiang 12/2

PCS/src/main/java/cn/cslg/permission/common/model/dto/QueryVersionListDTO.java

@@ -21,12 +21,12 @@ public class QueryVersionListDTO {
     /**
      * 每页条数
      */
-    private Long pageSize;
+    private Long current;
 
     /**
      * 当前页数
      */
-    private Long pageNum;
+    private Long size;
 
     /**
      * 数据总数

PCS/src/main/java/cn/cslg/permission/common/model/dto/VersionDTO.java

@@ -10,7 +10,14 @@ import java.util.List;
  */
 @Data
 public class VersionDTO {
+
     private Integer id;
+
+    /**
+     * 应用唯一标识符
+     */
+    private String applicationCode;
+
     /**
      * 版本名称
      */

PCS/src/main/java/cn/cslg/permission/common/model/vo/VersionVO.java

@@ -1,8 +1,10 @@
 package cn.cslg.permission.common.model.vo;
 
+import cn.cslg.permission.domain.SystemFile;
 import lombok.Data;
 
 import java.util.Date;
+import java.util.List;
 
 /**
  * @Author xiexiang
@@ -19,17 +21,18 @@ public class VersionVO {
      * 版本名称
      */
     private String versionName;
-    private Integer versionId;
+
     /**
      * 版本号
      */
-    private String version;
+    private String versionNum;
 
     /**
      * 版本文件
      */
     private String fileGuid;
 
+    private List<SystemFile> systemFileList;
     /**
      * 备注
      */

PCS/src/main/java/cn/cslg/permission/controller/qiaobi/VersionController.java

@@ -12,6 +12,9 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.io.IOException;
+import java.util.List;
+
 /**
  * @Author xiexiang
  * @Date 2024/11/19
@@ -53,7 +56,7 @@ public class VersionController {
 
     @Operation(summary = "根据id查询版本信息")
     @GetMapping("/queryById")
-    public String queryById(Integer id){
+    public String queryById(Integer id) throws IOException {
         Records records = new Records();
         if (id != null) {
             records = versionService.queryById(id);
@@ -61,14 +64,13 @@ public class VersionController {
         return Response.success(records);
     }
 
-//    @Operation(summary = "根据ids删除后续事项数据信息")
-//    @PostMapping("/delete")
-//    public Response delete(@RequestBody List<Integer> ids) {
-//        log.info("开始处理【删除后续事项】的请求，请求参数为：{}", ids);
-//        if (ids != null) {
-//            followUpService.delete(ids);
-//            return Response.success("删除后续事项完成");
-//        }
-//        return Response.error("请求参数为null");
-//    }
+    @Operation(summary = "根据ids删除")
+    @PostMapping("/delete")
+    public String delete(@RequestBody List<Integer> ids) {
+        if (ids != null) {
+            versionService.delete(ids);
+            return Response.success("删除完成");
+        }
+        return Response.error("请求参数为null");
+    }
 }

PCS/src/main/java/cn/cslg/permission/domain/Version.java

@@ -39,4 +39,8 @@ public class Version extends Model {
      */
     private String remark;
 
+    /**
+     * 应用唯一标识符
+     */
+    private String applicationCode;
 }

PCS/src/main/java/cn/cslg/permission/service/VersionService.java

@@ -16,6 +16,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 
+import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -28,6 +29,7 @@ import java.util.List;
 @RequiredArgsConstructor
 public class VersionService extends ServiceImpl<VersionMapper, Version> {
     private final AssoFunctionModuleService assoFunctionModuleService;
+//    private final FileManagerService fileManagerService;
 
     /**
      * 新增
@@ -41,7 +43,7 @@ public class VersionService extends ServiceImpl<VersionMapper, Version> {
         String versionNum = version.getVersionNum();
         List<AssoFunctionModuleDTO> assoFunctionModuleDTOS = new ArrayList<>();
         List<AssoFunctionCodeDTO> codeDTOS = versionDTO.getAssoFunctionCodeDTOS();
-        if (!codeDTOS.isEmpty()) {
+        if (codeDTOS != null && !codeDTOS.isEmpty()) {
             for (AssoFunctionCodeDTO codeDTO : codeDTOS) {
                 AssoFunctionModuleDTO assoFunctionModuleDTO = new AssoFunctionModuleDTO();
                 // 代码和功能赋值
@@ -78,20 +80,25 @@ public class VersionService extends ServiceImpl<VersionMapper, Version> {
 
     public Records queryVersionList(QueryVersionListDTO queryVersionListDTO){
         Records records = new Records();
-        Long current = queryVersionListDTO.getPageNum();
-        Long size = queryVersionListDTO.getPageSize();
+        Long current = queryVersionListDTO.getCurrent();
+        Long size = queryVersionListDTO.getSize();
         String versionName = queryVersionListDTO.getVersionName();
         String versionNum = queryVersionListDTO.getVersionNum();
 
         LambdaQueryWrapper<Version> queryWrapper = new LambdaQueryWrapper<>();
+        if (versionName != null) {
+            queryWrapper.like(Version::getVersionName, versionName);
+        }
+        if (versionNum != null) {
+            queryWrapper.like(Version::getVersionNum, versionNum);
+        }
         IPage<Version> versions = this.page(new Page<>(current, size), queryWrapper);
-        List<Version> retrieveRecordList = versions.getRecords();
+        List<Version> versionList = versions.getRecords();
 
         records.setCurrent(current);
         records.setSize(current);
         records.setTotal(versions.getTotal());
-
-        records.setRecords(retrieveRecordList);
+        records.setRecords(versionList);
         return records;
     }
 
@@ -101,8 +108,8 @@ public class VersionService extends ServiceImpl<VersionMapper, Version> {
         Integer versionId = queryVersionInfoDTO.getId();
         Version version = this.getById(versionId);
         if (version != null) {
-            versionVO.setVersion(version.getVersionNum());
-            versionVO.setVersionId(version.getId());
+            versionVO.setVersionNum(version.getVersionNum());
+            versionVO.setId(version.getId());
             versionVO.setVersionName(version.getVersionName());
             versionVO.setRemark(version.getRemark());
             versionVO.setFileGuid(version.getFileGuid());
@@ -121,17 +128,51 @@ public class VersionService extends ServiceImpl<VersionMapper, Version> {
         return records;
     }
 
-    public Records queryById(Integer id){
+    public Records queryById(Integer id) throws IOException {
         Records records = new Records();
         VersionVO versionVO = new VersionVO();
         Version version = this.getById(id);
-        BeanUtils.copyProperties(version, versionVO);
+        if (version != null) {
+            versionVO.setVersionNum(version.getVersionNum());
+            versionVO.setId(version.getId());
+            versionVO.setVersionName(version.getVersionName());
+            versionVO.setRemark(version.getRemark());
+            versionVO.setFileGuid(version.getFileGuid());
+//            List<String> fileGuids = new ArrayList<>();
+//            fileGuids.add(version.getFileGuid());
+//            List<SystemFile> systemFiles = new ArrayList<>();
+//            if (fileGuids.size() != 0) {
+//                String res = fileManagerService.getSystemFileFromFMS(fileGuids);
+//                systemFiles = JSONObject.parseArray(res, SystemFile.class);
+//            }
+//            if (!systemFiles.isEmpty()) {
+//                versionVO.setSystemFileList(systemFiles);
+//            }
+
+            LambdaQueryWrapper<AssoFunctionModule> queryWrapper = new LambdaQueryWrapper<>();
+            queryWrapper.eq(AssoFunctionModule::getVersionId, id);
+            AssoFunctionModule assoFunctionModule = assoFunctionModuleService.getOne(queryWrapper, false);
+            if (assoFunctionModule != null) {
+                versionVO.setAuthType(assoFunctionModule.getAuthType());
+                versionVO.setFunctionId(assoFunctionModule.getFunctionId());
+                versionVO.setCode(assoFunctionModule.getCode());
+                versionVO.setCreateUser(assoFunctionModule.getCreateUser());
+                versionVO.setCreateTime(assoFunctionModule.getCreateTime());
+            }
+        }
         records.setRecords(versionVO);
         return records;
     }
 
-    public Records delete(List<Integer> ids){
-        Records records = new Records();
-        return records;
+    public void delete(List<Integer> ids){
+       for (Integer id : ids) {
+            Version version = this.getById(id);
+            if (version != null) {
+                LambdaQueryWrapper<AssoFunctionModule> queryWrapper = new LambdaQueryWrapper<>();
+                queryWrapper.eq(AssoFunctionModule::getVersionId, id);
+                assoFunctionModuleService.remove(queryWrapper);
+                this.removeById(id);
+            }
+       }
     }
 }