update

physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/NasaDataRecordController.java

@@ -1,5 +1,7 @@
 package org.jeecg.modules.database.controller;
 
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.TypeReference;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -8,6 +10,7 @@ import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.aspect.annotation.AutoLog;
@@ -19,7 +22,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.ModelAndView;
 
-import java.util.Arrays;
+import java.util.*;
 
 /**
  * @Description: NASA数据管理
@@ -54,6 +57,13 @@ public class NasaDataRecordController extends JeecgController<NasaDataRecord, IN
         QueryWrapper<NasaDataRecord> queryWrapper = QueryGenerator.initQueryWrapper(nasaDataRecord, req.getParameterMap());
         Page<NasaDataRecord> page = new Page<NasaDataRecord>(pageNo, pageSize);
         IPage<NasaDataRecord> pageList = nasaDataRecordService.page(page, queryWrapper);
+        pageList.getRecords().forEach(nr -> {
+            String fileList = nr.getFileList();
+            if (StringUtils.isNotBlank(fileList)) {
+                Map<String, String> files = JSON.parseObject(fileList, Map.class);
+                nr.setFileMap(files);
+            }
+        });
         return Result.OK(pageList);
     }
 
@@ -72,6 +82,23 @@ public class NasaDataRecordController extends JeecgController<NasaDataRecord, IN
         return Result.OK("添加成功！");
     }
 
+    @GetMapping(value = "/fix")
+    public Result<String> fix() {
+        List<NasaDataRecord> list = nasaDataRecordService.list();
+        list.forEach(nr -> {
+            String fileList = nr.getFileList();
+            if (StringUtils.isNotBlank(fileList)) {
+                List<Map<String, String>> list1 = JSON.parseObject(fileList, new TypeReference<>() {});
+                Map<String, String> files = new HashMap<>();
+                list1.forEach(files::putAll);
+                nr.setFileMap(files);
+                nr.setFileList(JSON.toJSONString(files));
+                nasaDataRecordService.updateById(nr);
+            }
+        });
+        return Result.OK("fix成功！");
+    }
+
     /**
      * 编辑
      *
@@ -83,6 +110,10 @@ public class NasaDataRecordController extends JeecgController<NasaDataRecord, IN
     @RequiresPermissions("database:nasa_data_record:edit")
     @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
     public Result<String> edit(@RequestBody NasaDataRecord nasaDataRecord) {
+        Map<String, String> fileMap = nasaDataRecord.getFileMap();
+        if (Objects.nonNull(fileMap)) {
+            nasaDataRecord.setFileList(JSON.toJSONString(fileMap));
+        }
         nasaDataRecordService.updateById(nasaDataRecord);
         return Result.OK("编辑成功!");
     }
@@ -131,6 +162,11 @@ public class NasaDataRecordController extends JeecgController<NasaDataRecord, IN
         if (nasaDataRecord == null) {
             return Result.error("未找到对应数据");
         }
+        String fileList = nasaDataRecord.getFileList();
+        if (StringUtils.isNotBlank(fileList)) {
+            Map<String, String> files = JSON.parseObject(fileList, Map.class);
+            nasaDataRecord.setFileMap(files);
+        }
         return Result.OK(nasaDataRecord);
     }
 
@@ -140,7 +176,7 @@ public class NasaDataRecordController extends JeecgController<NasaDataRecord, IN
      * @param request
      * @param nasaDataRecord
      */
-    
+
     @RequestMapping(value = "/exportXls")
     public ModelAndView exportXls(HttpServletRequest request, NasaDataRecord nasaDataRecord) {
         return super.exportXls(request, nasaDataRecord, NasaDataRecord.class, "NASA数据管理");

physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/entity/NasaDataRecord.java

@@ -11,6 +11,7 @@ import org.springframework.format.annotation.DateTimeFormat;
 
 import java.io.Serializable;
 import java.util.Date;
+import java.util.Map;
 
 /**
  * @Description: NASA数据管理
@@ -133,10 +134,13 @@ public class NasaDataRecord implements Serializable {
     @Excel(name = "附件IDs", width = 15)
     @Schema(description = "附件IDs")
     private String fileList;
+
+    @TableField(exist = false)
+    private Map<String, String> fileMap;
     /**
      * 原始数据
      */
     @Excel(name = "原始数据", width = 15)
     @Schema(description = "原始数据")
-    private String originData;
+    private String              originData;
 }