update

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

@@ -140,7 +140,7 @@ public class CnasTestController extends JeecgController<CnasTest, ICnasTestServi
      * @param request
      * @param cnasTest
      */
-    
+
     @RequestMapping(value = "/exportXls")
     public ModelAndView exportXls(HttpServletRequest request, CnasTest cnasTest) {
         return super.exportXls(request, cnasTest, CnasTest.class, "cnas测试参数列表");

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

@@ -140,7 +140,7 @@ public class ComponentController extends JeecgController<Component, IComponentSe
      * @param request
      * @param component
      */
-    
+
     @RequestMapping(value = "/exportXls")
     public ModelAndView exportXls(HttpServletRequest request, Component component) {
         return super.exportXls(request, component, Component.class, "元器件");

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

@@ -92,7 +92,7 @@ public class DocumentFavoritesController extends JeecgController<DocumentFavorit
         DocumentFavorites old = documentFavoritesService.getByDocIdAndUserId(documentId, userByName.getId());
         if (Objects.isNull(old)) {
             documentFavorites.setId(null);
-        }else{
+        } else {
             documentFavorites.setId(old.getId());
         }
         documentFavorites.setUserId(userByName.getId());
@@ -170,7 +170,7 @@ public class DocumentFavoritesController extends JeecgController<DocumentFavorit
      * @param request
      * @param documentFavorites
      */
-    
+
     @RequestMapping(value = "/exportXls")
     public ModelAndView exportXls(HttpServletRequest request, DocumentFavorites documentFavorites) {
         return super.exportXls(request, documentFavorites, DocumentFavorites.class, "我的收藏文档");

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

@@ -147,7 +147,7 @@ public class EquipmentController extends JeecgController<Equipment, IEquipmentSe
      * @param request
      * @param equipment
      */
-    
+
     @RequestMapping(value = "/exportXls")
     public ModelAndView exportXls(HttpServletRequest request, Equipment equipment) {
         return super.exportXls(request, equipment, Equipment.class, "设备");

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

@@ -230,7 +230,7 @@ public class ExperimentAnnealProcessController extends JeecgController<Experimen
      * @param request
      * @param experimentAnnealProcess
      */
-    
+
     @RequestMapping(value = "/exportXls")
     public ModelAndView exportXls(HttpServletRequest request, ExperimentAnnealProcess experimentAnnealProcess) {
         return super.exportXls(request, experimentAnnealProcess, ExperimentAnnealProcess.class, "退火过程");

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

@@ -16,7 +16,6 @@ import org.jeecg.common.system.base.controller.JeecgController;
 import org.jeecg.common.system.util.JwtUtil;
 import org.jeecg.common.util.ReflectHelper;
 import org.jeecg.modules.database.constant.ExperimentStatus;
-import org.jeecg.modules.database.dto.NasaDataRecordPage;
 import org.jeecg.modules.database.entity.*;
 import org.jeecg.modules.database.service.*;
 import org.jeecg.modules.system.entity.SysUser;
@@ -68,6 +67,8 @@ public class ExperimentController extends JeecgController<Experiment, IExperimen
     private IExperimentFileService               experimentFileService;
     @Autowired
     private INasaDataRecordService               nasaDataRecordService;
+    @Autowired
+    private ILocalDatabaseService                localDatabaseService;
 
     /**
      * 分页列表查询
@@ -285,7 +286,22 @@ public class ExperimentController extends JeecgController<Experiment, IExperimen
     @Operation(summary = "试验管理-完成试验")
     @PostMapping(value = "/complete")
     public Result<String> complete(@RequestBody Experiment experiment) {
+        if (StringUtils.isBlank(experiment.getId())) {
+            return Result.error("试验数据不存在！");
+        }
+        Experiment dbData = experimentService.getById(experiment.getId());
+
         experimentService.changeStatus(experiment.getId(), ExperimentStatus.COMPLETED);
+        LocalDatabase localData = new LocalDatabase();
+        localData.setClientName(dbData.getClientName());
+        localData.setName(dbData.getName());
+        localData.setType(dbData.getType());
+        localData.setStartDate(dbData.getStartDate());
+        localData.setEndDate(dbData.getEndDate());
+        localData.setStatus(ExperimentStatus.COMPLETED);
+        localData.setExperimentNo(dbData.getExperimentNo());
+        localData.setExperimentId(dbData.getId());
+        localDatabaseService.save(localData);
         return Result.OK("试验已完成!");
     }
 
@@ -369,23 +385,6 @@ public class ExperimentController extends JeecgController<Experiment, IExperimen
         return super.importExcel(request, response, Experiment.class);
     }
 
-    @GetMapping(value = "/statistics")
-    public Result<NasaDataRecordPage> queryPageList(NasaDataRecord nasaDataRecord) {
-        NasaDataRecordPage result = new NasaDataRecordPage();
-        Long nasaCountLhs = nasaDataRecordService.sumLhs();
-        Long nasaCountXhy = nasaDataRecordService.sumXhy();
-
-        Long localCountLhs = experimentService.sumLhs();
-        Long localCountXhy = experimentService.sumXhy();
-
-        result.setLhsCount(localCountLhs);
-        result.setLhsTotal(nasaCountLhs + localCountLhs);
-        result.setXhyCount(localCountXhy);
-        result.setXyhTotal(nasaCountXhy + localCountXhy);
-
-        return Result.OK(result);
-    }
-
     /**
      * 审核
      *

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

@@ -1,174 +1,160 @@
 package org.jeecg.modules.database.controller;
 
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletResponse;
-import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.system.query.QueryGenerator;
-import org.jeecg.common.util.oConvertUtils;
-import org.jeecg.modules.database.entity.ExperimentDeviationCondition;
-import org.jeecg.modules.database.service.IExperimentDeviationConditionService;
-
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import lombok.extern.slf4j.Slf4j;
-
-import org.jeecgframework.poi.excel.ExcelImportUtil;
-import org.jeecgframework.poi.excel.def.NormalExcelConstants;
-import org.jeecgframework.poi.excel.entity.ExportParams;
-import org.jeecgframework.poi.excel.entity.ImportParams;
-import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
-import org.jeecg.common.system.base.controller.JeecgController;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.multipart.MultipartHttpServletRequest;
-import org.springframework.web.servlet.ModelAndView;
-import com.alibaba.fastjson.JSON;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
-import org.jeecg.common.aspect.annotation.AutoLog;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.aspect.annotation.AutoLog;
+import org.jeecg.common.system.base.controller.JeecgController;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.modules.database.entity.ExperimentDeviationCondition;
+import org.jeecg.modules.database.service.IExperimentDeviationConditionService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.servlet.ModelAndView;
 
- /**
+import java.util.Arrays;
+
+/**
  * @Description: 试验偏置条件信息
  * @Author: jeecg-boot
- * @Date:   2024-12-05
+ * @Date: 2024-12-05
  * @Version: V1.0
  */
-@Tag(name="试验偏置条件信息")
+@Tag(name = "试验偏置条件信息")
 @RestController
 @RequestMapping("/database/experimentDeviationCondition")
 @Slf4j
-public class ExperimentDeviationConditionController extends JeecgController<ExperimentDeviationCondition, IExperimentDeviationConditionService> {
+public class ExperimentDeviationConditionController
-	@Autowired
+        extends JeecgController<ExperimentDeviationCondition, IExperimentDeviationConditionService> {
-	private IExperimentDeviationConditionService experimentDeviationConditionService;
+    @Autowired
-	
+    private IExperimentDeviationConditionService experimentDeviationConditionService;
-	/**
-	 * 分页列表查询
-	 *
-	 * @param experimentDeviationCondition
-	 * @param pageNo
-	 * @param pageSize
-	 * @param req
-	 * @return
-	 */
-	//@AutoLog(value = "试验偏置条件信息-分页列表查询")
-	@Operation(summary="试验偏置条件信息-分页列表查询")
-	@GetMapping(value = "/list")
-	public Result<IPage<ExperimentDeviationCondition>> queryPageList(ExperimentDeviationCondition experimentDeviationCondition,
-								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
-								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
-								   HttpServletRequest req) {
-		QueryWrapper<ExperimentDeviationCondition> queryWrapper = QueryGenerator.initQueryWrapper(experimentDeviationCondition, req.getParameterMap());
-		Page<ExperimentDeviationCondition> page = new Page<ExperimentDeviationCondition>(pageNo, pageSize);
-		IPage<ExperimentDeviationCondition> pageList = experimentDeviationConditionService.page(page, queryWrapper);
-		return Result.OK(pageList);
-	}
-	
-	/**
-	 *   添加
-	 *
-	 * @param experimentDeviationCondition
-	 * @return
-	 */
-	@AutoLog(value = "试验偏置条件信息-添加")
-	@Operation(summary="试验偏置条件信息-添加")
-	@RequiresPermissions("database:experiment_deviation_condition:add")
-	@PostMapping(value = "/add")
-	public Result<String> add(@RequestBody ExperimentDeviationCondition experimentDeviationCondition) {
-		experimentDeviationConditionService.save(experimentDeviationCondition);
-		return Result.OK("添加成功！");
-	}
-	
-	/**
-	 *  编辑
-	 *
-	 * @param experimentDeviationCondition
-	 * @return
-	 */
-	@AutoLog(value = "试验偏置条件信息-编辑")
-	@Operation(summary="试验偏置条件信息-编辑")
-	@RequiresPermissions("database:experiment_deviation_condition:edit")
-	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
-	public Result<String> edit(@RequestBody ExperimentDeviationCondition experimentDeviationCondition) {
-		experimentDeviationConditionService.updateById(experimentDeviationCondition);
-		return Result.OK("编辑成功!");
-	}
-	
-	/**
-	 *   通过id删除
-	 *
-	 * @param id
-	 * @return
-	 */
-	@AutoLog(value = "试验偏置条件信息-通过id删除")
-	@Operation(summary="试验偏置条件信息-通过id删除")
-	@RequiresPermissions("database:experiment_deviation_condition:delete")
-	@DeleteMapping(value = "/delete")
-	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
-		experimentDeviationConditionService.removeById(id);
-		return Result.OK("删除成功!");
-	}
-	
-	/**
-	 *  批量删除
-	 *
-	 * @param ids
-	 * @return
-	 */
-	@AutoLog(value = "试验偏置条件信息-批量删除")
-	@Operation(summary="试验偏置条件信息-批量删除")
-	@RequiresPermissions("database:experiment_deviation_condition:deleteBatch")
-	@DeleteMapping(value = "/deleteBatch")
-	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
-		this.experimentDeviationConditionService.removeByIds(Arrays.asList(ids.split(",")));
-		return Result.OK("批量删除成功!");
-	}
-	
-	/**
-	 * 通过id查询
-	 *
-	 * @param id
-	 * @return
-	 */
-	//@AutoLog(value = "试验偏置条件信息-通过id查询")
-	@Operation(summary="试验偏置条件信息-通过id查询")
-	@GetMapping(value = "/queryById")
-	public Result<ExperimentDeviationCondition> queryById(@RequestParam(name="id",required=true) String id) {
-		ExperimentDeviationCondition experimentDeviationCondition = experimentDeviationConditionService.getById(id);
-		if(experimentDeviationCondition==null) {
-			return Result.error("未找到对应数据");
-		}
-		return Result.OK(experimentDeviationCondition);
-	}
 
     /**
-    * 导出excel
+     * 分页列表查询
-    *
+     *
-    * @param request
+     * @param experimentDeviationCondition
-    * @param experimentDeviationCondition
+     * @param pageNo
-    */
+     * @param pageSize
-    
+     * @param req
+     * @return
+     */
+    //@AutoLog(value = "试验偏置条件信息-分页列表查询")
+    @Operation(summary = "试验偏置条件信息-分页列表查询")
+    @GetMapping(value = "/list")
+    public Result<IPage<ExperimentDeviationCondition>> queryPageList(ExperimentDeviationCondition experimentDeviationCondition,
+                                                                     @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+                                                                     @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+                                                                     HttpServletRequest req) {
+        QueryWrapper<ExperimentDeviationCondition> queryWrapper = QueryGenerator.initQueryWrapper(experimentDeviationCondition,
+                req.getParameterMap());
+        Page<ExperimentDeviationCondition> page = new Page<ExperimentDeviationCondition>(pageNo, pageSize);
+        IPage<ExperimentDeviationCondition> pageList = experimentDeviationConditionService.page(page, queryWrapper);
+        return Result.OK(pageList);
+    }
+
+    /**
+     * 添加
+     *
+     * @param experimentDeviationCondition
+     * @return
+     */
+    @AutoLog(value = "试验偏置条件信息-添加")
+    @Operation(summary = "试验偏置条件信息-添加")
+    @RequiresPermissions("database:experiment_deviation_condition:add")
+    @PostMapping(value = "/add")
+    public Result<String> add(@RequestBody ExperimentDeviationCondition experimentDeviationCondition) {
+        experimentDeviationConditionService.save(experimentDeviationCondition);
+        return Result.OK("添加成功！");
+    }
+
+    /**
+     * 编辑
+     *
+     * @param experimentDeviationCondition
+     * @return
+     */
+    @AutoLog(value = "试验偏置条件信息-编辑")
+    @Operation(summary = "试验偏置条件信息-编辑")
+    @RequiresPermissions("database:experiment_deviation_condition:edit")
+    @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
+    public Result<String> edit(@RequestBody ExperimentDeviationCondition experimentDeviationCondition) {
+        experimentDeviationConditionService.updateById(experimentDeviationCondition);
+        return Result.OK("编辑成功!");
+    }
+
+    /**
+     * 通过id删除
+     *
+     * @param id
+     * @return
+     */
+    @AutoLog(value = "试验偏置条件信息-通过id删除")
+    @Operation(summary = "试验偏置条件信息-通过id删除")
+    @RequiresPermissions("database:experiment_deviation_condition:delete")
+    @DeleteMapping(value = "/delete")
+    public Result<String> delete(@RequestParam(name = "id", required = true) String id) {
+        experimentDeviationConditionService.removeById(id);
+        return Result.OK("删除成功!");
+    }
+
+    /**
+     * 批量删除
+     *
+     * @param ids
+     * @return
+     */
+    @AutoLog(value = "试验偏置条件信息-批量删除")
+    @Operation(summary = "试验偏置条件信息-批量删除")
+    @RequiresPermissions("database:experiment_deviation_condition:deleteBatch")
+    @DeleteMapping(value = "/deleteBatch")
+    public Result<String> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
+        this.experimentDeviationConditionService.removeByIds(Arrays.asList(ids.split(",")));
+        return Result.OK("批量删除成功!");
+    }
+
+    /**
+     * 通过id查询
+     *
+     * @param id
+     * @return
+     */
+    //@AutoLog(value = "试验偏置条件信息-通过id查询")
+    @Operation(summary = "试验偏置条件信息-通过id查询")
+    @GetMapping(value = "/queryById")
+    public Result<ExperimentDeviationCondition> queryById(@RequestParam(name = "id", required = true) String id) {
+        ExperimentDeviationCondition experimentDeviationCondition = experimentDeviationConditionService.getById(id);
+        if (experimentDeviationCondition == null) {
+            return Result.error("未找到对应数据");
+        }
+        return Result.OK(experimentDeviationCondition);
+    }
+
+    /**
+     * 导出excel
+     *
+     * @param request
+     * @param experimentDeviationCondition
+     */
+
     @RequestMapping(value = "/exportXls")
     public ModelAndView exportXls(HttpServletRequest request, ExperimentDeviationCondition experimentDeviationCondition) {
         return super.exportXls(request, experimentDeviationCondition, ExperimentDeviationCondition.class, "试验偏置条件信息");
     }
 
     /**
-      * 通过excel导入数据
+     * 通过excel导入数据
-    *
+     *
-    * @param request
+     * @param request
-    * @param response
+     * @param response
-    * @return
+     * @return
-    */
+     */
     @RequiresPermissions("database:experiment_deviation_condition:add")
     @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
     public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {

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

@@ -1,174 +1,160 @@
 package org.jeecg.modules.database.controller;
 
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletResponse;
-import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.system.query.QueryGenerator;
-import org.jeecg.common.util.oConvertUtils;
-import org.jeecg.modules.database.entity.ExperimentDeviationEquipment;
-import org.jeecg.modules.database.service.IExperimentDeviationEquipmentService;
-
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import lombok.extern.slf4j.Slf4j;
-
-import org.jeecgframework.poi.excel.ExcelImportUtil;
-import org.jeecgframework.poi.excel.def.NormalExcelConstants;
-import org.jeecgframework.poi.excel.entity.ExportParams;
-import org.jeecgframework.poi.excel.entity.ImportParams;
-import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
-import org.jeecg.common.system.base.controller.JeecgController;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.multipart.MultipartHttpServletRequest;
-import org.springframework.web.servlet.ModelAndView;
-import com.alibaba.fastjson.JSON;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
-import org.jeecg.common.aspect.annotation.AutoLog;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.aspect.annotation.AutoLog;
+import org.jeecg.common.system.base.controller.JeecgController;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.modules.database.entity.ExperimentDeviationEquipment;
+import org.jeecg.modules.database.service.IExperimentDeviationEquipmentService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.servlet.ModelAndView;
 
- /**
+import java.util.Arrays;
+
+/**
  * @Description: 试验加偏设备信息
  * @Author: jeecg-boot
- * @Date:   2024-12-05
+ * @Date: 2024-12-05
  * @Version: V1.0
  */
-@Tag(name="试验加偏设备信息")
+@Tag(name = "试验加偏设备信息")
 @RestController
 @RequestMapping("/database/experimentDeviationEquipment")
 @Slf4j
-public class ExperimentDeviationEquipmentController extends JeecgController<ExperimentDeviationEquipment, IExperimentDeviationEquipmentService> {
+public class ExperimentDeviationEquipmentController
-	@Autowired
+        extends JeecgController<ExperimentDeviationEquipment, IExperimentDeviationEquipmentService> {
-	private IExperimentDeviationEquipmentService experimentDeviationEquipmentService;
+    @Autowired
-	
+    private IExperimentDeviationEquipmentService experimentDeviationEquipmentService;
-	/**
-	 * 分页列表查询
-	 *
-	 * @param experimentDeviationEquipment
-	 * @param pageNo
-	 * @param pageSize
-	 * @param req
-	 * @return
-	 */
-	//@AutoLog(value = "试验加偏设备信息-分页列表查询")
-	@Operation(summary="试验加偏设备信息-分页列表查询")
-	@GetMapping(value = "/list")
-	public Result<IPage<ExperimentDeviationEquipment>> queryPageList(ExperimentDeviationEquipment experimentDeviationEquipment,
-								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
-								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
-								   HttpServletRequest req) {
-		QueryWrapper<ExperimentDeviationEquipment> queryWrapper = QueryGenerator.initQueryWrapper(experimentDeviationEquipment, req.getParameterMap());
-		Page<ExperimentDeviationEquipment> page = new Page<ExperimentDeviationEquipment>(pageNo, pageSize);
-		IPage<ExperimentDeviationEquipment> pageList = experimentDeviationEquipmentService.page(page, queryWrapper);
-		return Result.OK(pageList);
-	}
-	
-	/**
-	 *   添加
-	 *
-	 * @param experimentDeviationEquipment
-	 * @return
-	 */
-	@AutoLog(value = "试验加偏设备信息-添加")
-	@Operation(summary="试验加偏设备信息-添加")
-	@RequiresPermissions("database:experiment_deviation_equipment:add")
-	@PostMapping(value = "/add")
-	public Result<String> add(@RequestBody ExperimentDeviationEquipment experimentDeviationEquipment) {
-		experimentDeviationEquipmentService.save(experimentDeviationEquipment);
-		return Result.OK("添加成功！");
-	}
-	
-	/**
-	 *  编辑
-	 *
-	 * @param experimentDeviationEquipment
-	 * @return
-	 */
-	@AutoLog(value = "试验加偏设备信息-编辑")
-	@Operation(summary="试验加偏设备信息-编辑")
-	@RequiresPermissions("database:experiment_deviation_equipment:edit")
-	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
-	public Result<String> edit(@RequestBody ExperimentDeviationEquipment experimentDeviationEquipment) {
-		experimentDeviationEquipmentService.updateById(experimentDeviationEquipment);
-		return Result.OK("编辑成功!");
-	}
-	
-	/**
-	 *   通过id删除
-	 *
-	 * @param id
-	 * @return
-	 */
-	@AutoLog(value = "试验加偏设备信息-通过id删除")
-	@Operation(summary="试验加偏设备信息-通过id删除")
-	@RequiresPermissions("database:experiment_deviation_equipment:delete")
-	@DeleteMapping(value = "/delete")
-	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
-		experimentDeviationEquipmentService.removeById(id);
-		return Result.OK("删除成功!");
-	}
-	
-	/**
-	 *  批量删除
-	 *
-	 * @param ids
-	 * @return
-	 */
-	@AutoLog(value = "试验加偏设备信息-批量删除")
-	@Operation(summary="试验加偏设备信息-批量删除")
-	@RequiresPermissions("database:experiment_deviation_equipment:deleteBatch")
-	@DeleteMapping(value = "/deleteBatch")
-	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
-		this.experimentDeviationEquipmentService.removeByIds(Arrays.asList(ids.split(",")));
-		return Result.OK("批量删除成功!");
-	}
-	
-	/**
-	 * 通过id查询
-	 *
-	 * @param id
-	 * @return
-	 */
-	//@AutoLog(value = "试验加偏设备信息-通过id查询")
-	@Operation(summary="试验加偏设备信息-通过id查询")
-	@GetMapping(value = "/queryById")
-	public Result<ExperimentDeviationEquipment> queryById(@RequestParam(name="id",required=true) String id) {
-		ExperimentDeviationEquipment experimentDeviationEquipment = experimentDeviationEquipmentService.getById(id);
-		if(experimentDeviationEquipment==null) {
-			return Result.error("未找到对应数据");
-		}
-		return Result.OK(experimentDeviationEquipment);
-	}
 
     /**
-    * 导出excel
+     * 分页列表查询
-    *
+     *
-    * @param request
+     * @param experimentDeviationEquipment
-    * @param experimentDeviationEquipment
+     * @param pageNo
-    */
+     * @param pageSize
-    
+     * @param req
+     * @return
+     */
+    //@AutoLog(value = "试验加偏设备信息-分页列表查询")
+    @Operation(summary = "试验加偏设备信息-分页列表查询")
+    @GetMapping(value = "/list")
+    public Result<IPage<ExperimentDeviationEquipment>> queryPageList(ExperimentDeviationEquipment experimentDeviationEquipment,
+                                                                     @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+                                                                     @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+                                                                     HttpServletRequest req) {
+        QueryWrapper<ExperimentDeviationEquipment> queryWrapper = QueryGenerator.initQueryWrapper(experimentDeviationEquipment,
+                req.getParameterMap());
+        Page<ExperimentDeviationEquipment> page = new Page<ExperimentDeviationEquipment>(pageNo, pageSize);
+        IPage<ExperimentDeviationEquipment> pageList = experimentDeviationEquipmentService.page(page, queryWrapper);
+        return Result.OK(pageList);
+    }
+
+    /**
+     * 添加
+     *
+     * @param experimentDeviationEquipment
+     * @return
+     */
+    @AutoLog(value = "试验加偏设备信息-添加")
+    @Operation(summary = "试验加偏设备信息-添加")
+    @RequiresPermissions("database:experiment_deviation_equipment:add")
+    @PostMapping(value = "/add")
+    public Result<String> add(@RequestBody ExperimentDeviationEquipment experimentDeviationEquipment) {
+        experimentDeviationEquipmentService.save(experimentDeviationEquipment);
+        return Result.OK("添加成功！");
+    }
+
+    /**
+     * 编辑
+     *
+     * @param experimentDeviationEquipment
+     * @return
+     */
+    @AutoLog(value = "试验加偏设备信息-编辑")
+    @Operation(summary = "试验加偏设备信息-编辑")
+    @RequiresPermissions("database:experiment_deviation_equipment:edit")
+    @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
+    public Result<String> edit(@RequestBody ExperimentDeviationEquipment experimentDeviationEquipment) {
+        experimentDeviationEquipmentService.updateById(experimentDeviationEquipment);
+        return Result.OK("编辑成功!");
+    }
+
+    /**
+     * 通过id删除
+     *
+     * @param id
+     * @return
+     */
+    @AutoLog(value = "试验加偏设备信息-通过id删除")
+    @Operation(summary = "试验加偏设备信息-通过id删除")
+    @RequiresPermissions("database:experiment_deviation_equipment:delete")
+    @DeleteMapping(value = "/delete")
+    public Result<String> delete(@RequestParam(name = "id", required = true) String id) {
+        experimentDeviationEquipmentService.removeById(id);
+        return Result.OK("删除成功!");
+    }
+
+    /**
+     * 批量删除
+     *
+     * @param ids
+     * @return
+     */
+    @AutoLog(value = "试验加偏设备信息-批量删除")
+    @Operation(summary = "试验加偏设备信息-批量删除")
+    @RequiresPermissions("database:experiment_deviation_equipment:deleteBatch")
+    @DeleteMapping(value = "/deleteBatch")
+    public Result<String> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
+        this.experimentDeviationEquipmentService.removeByIds(Arrays.asList(ids.split(",")));
+        return Result.OK("批量删除成功!");
+    }
+
+    /**
+     * 通过id查询
+     *
+     * @param id
+     * @return
+     */
+    //@AutoLog(value = "试验加偏设备信息-通过id查询")
+    @Operation(summary = "试验加偏设备信息-通过id查询")
+    @GetMapping(value = "/queryById")
+    public Result<ExperimentDeviationEquipment> queryById(@RequestParam(name = "id", required = true) String id) {
+        ExperimentDeviationEquipment experimentDeviationEquipment = experimentDeviationEquipmentService.getById(id);
+        if (experimentDeviationEquipment == null) {
+            return Result.error("未找到对应数据");
+        }
+        return Result.OK(experimentDeviationEquipment);
+    }
+
+    /**
+     * 导出excel
+     *
+     * @param request
+     * @param experimentDeviationEquipment
+     */
+
     @RequestMapping(value = "/exportXls")
     public ModelAndView exportXls(HttpServletRequest request, ExperimentDeviationEquipment experimentDeviationEquipment) {
         return super.exportXls(request, experimentDeviationEquipment, ExperimentDeviationEquipment.class, "试验加偏设备信息");
     }
 
     /**
-      * 通过excel导入数据
+     * 通过excel导入数据
-    *
+     *
-    * @param request
+     * @param request
-    * @param response
+     * @param response
-    * @return
+     * @return
-    */
+     */
     @RequiresPermissions("database:experiment_deviation_equipment:add")
     @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
     public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {

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

@@ -231,7 +231,7 @@ public class ExperimentDocController extends JeecgController<ExperimentDoc, IExp
      * @param request
      * @param experimentDoc
      */
-    
+
     @RequestMapping(value = "/exportXls")
     public ModelAndView exportXls(HttpServletRequest request, ExperimentDoc experimentDoc) {
         return super.exportXls(request, experimentDoc, ExperimentDoc.class, "试验文档");

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

@@ -1,174 +1,159 @@
 package org.jeecg.modules.database.controller;
 
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletResponse;
-import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.system.query.QueryGenerator;
-import org.jeecg.common.util.oConvertUtils;
-import org.jeecg.modules.database.entity.ExperimentIrradiationBoard;
-import org.jeecg.modules.database.service.IExperimentIrradiationBoardService;
-
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import lombok.extern.slf4j.Slf4j;
-
-import org.jeecgframework.poi.excel.ExcelImportUtil;
-import org.jeecgframework.poi.excel.def.NormalExcelConstants;
-import org.jeecgframework.poi.excel.entity.ExportParams;
-import org.jeecgframework.poi.excel.entity.ImportParams;
-import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
-import org.jeecg.common.system.base.controller.JeecgController;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.multipart.MultipartHttpServletRequest;
-import org.springframework.web.servlet.ModelAndView;
-import com.alibaba.fastjson.JSON;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
-import org.jeecg.common.aspect.annotation.AutoLog;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.aspect.annotation.AutoLog;
+import org.jeecg.common.system.base.controller.JeecgController;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.modules.database.entity.ExperimentIrradiationBoard;
+import org.jeecg.modules.database.service.IExperimentIrradiationBoardService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.servlet.ModelAndView;
 
- /**
+import java.util.Arrays;
+
+/**
  * @Description: 试验辐照板信息
  * @Author: jeecg-boot
- * @Date:   2024-12-05
+ * @Date: 2024-12-05
  * @Version: V1.0
  */
-@Tag(name="试验辐照板信息")
+@Tag(name = "试验辐照板信息")
 @RestController
 @RequestMapping("/database/experimentIrradiationBoard")
 @Slf4j
 public class ExperimentIrradiationBoardController extends JeecgController<ExperimentIrradiationBoard, IExperimentIrradiationBoardService> {
-	@Autowired
+    @Autowired
-	private IExperimentIrradiationBoardService experimentIrradiationBoardService;
+    private IExperimentIrradiationBoardService experimentIrradiationBoardService;
-	
-	/**
-	 * 分页列表查询
-	 *
-	 * @param experimentIrradiationBoard
-	 * @param pageNo
-	 * @param pageSize
-	 * @param req
-	 * @return
-	 */
-	//@AutoLog(value = "试验辐照板信息-分页列表查询")
-	@Operation(summary="试验辐照板信息-分页列表查询")
-	@GetMapping(value = "/list")
-	public Result<IPage<ExperimentIrradiationBoard>> queryPageList(ExperimentIrradiationBoard experimentIrradiationBoard,
-								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
-								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
-								   HttpServletRequest req) {
-		QueryWrapper<ExperimentIrradiationBoard> queryWrapper = QueryGenerator.initQueryWrapper(experimentIrradiationBoard, req.getParameterMap());
-		Page<ExperimentIrradiationBoard> page = new Page<ExperimentIrradiationBoard>(pageNo, pageSize);
-		IPage<ExperimentIrradiationBoard> pageList = experimentIrradiationBoardService.page(page, queryWrapper);
-		return Result.OK(pageList);
-	}
-	
-	/**
-	 *   添加
-	 *
-	 * @param experimentIrradiationBoard
-	 * @return
-	 */
-	@AutoLog(value = "试验辐照板信息-添加")
-	@Operation(summary="试验辐照板信息-添加")
-	@RequiresPermissions("database:experiment_irradiation_board:add")
-	@PostMapping(value = "/add")
-	public Result<String> add(@RequestBody ExperimentIrradiationBoard experimentIrradiationBoard) {
-		experimentIrradiationBoardService.save(experimentIrradiationBoard);
-		return Result.OK("添加成功！");
-	}
-	
-	/**
-	 *  编辑
-	 *
-	 * @param experimentIrradiationBoard
-	 * @return
-	 */
-	@AutoLog(value = "试验辐照板信息-编辑")
-	@Operation(summary="试验辐照板信息-编辑")
-	@RequiresPermissions("database:experiment_irradiation_board:edit")
-	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
-	public Result<String> edit(@RequestBody ExperimentIrradiationBoard experimentIrradiationBoard) {
-		experimentIrradiationBoardService.updateById(experimentIrradiationBoard);
-		return Result.OK("编辑成功!");
-	}
-	
-	/**
-	 *   通过id删除
-	 *
-	 * @param id
-	 * @return
-	 */
-	@AutoLog(value = "试验辐照板信息-通过id删除")
-	@Operation(summary="试验辐照板信息-通过id删除")
-	@RequiresPermissions("database:experiment_irradiation_board:delete")
-	@DeleteMapping(value = "/delete")
-	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
-		experimentIrradiationBoardService.removeById(id);
-		return Result.OK("删除成功!");
-	}
-	
-	/**
-	 *  批量删除
-	 *
-	 * @param ids
-	 * @return
-	 */
-	@AutoLog(value = "试验辐照板信息-批量删除")
-	@Operation(summary="试验辐照板信息-批量删除")
-	@RequiresPermissions("database:experiment_irradiation_board:deleteBatch")
-	@DeleteMapping(value = "/deleteBatch")
-	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
-		this.experimentIrradiationBoardService.removeByIds(Arrays.asList(ids.split(",")));
-		return Result.OK("批量删除成功!");
-	}
-	
-	/**
-	 * 通过id查询
-	 *
-	 * @param id
-	 * @return
-	 */
-	//@AutoLog(value = "试验辐照板信息-通过id查询")
-	@Operation(summary="试验辐照板信息-通过id查询")
-	@GetMapping(value = "/queryById")
-	public Result<ExperimentIrradiationBoard> queryById(@RequestParam(name="id",required=true) String id) {
-		ExperimentIrradiationBoard experimentIrradiationBoard = experimentIrradiationBoardService.getById(id);
-		if(experimentIrradiationBoard==null) {
-			return Result.error("未找到对应数据");
-		}
-		return Result.OK(experimentIrradiationBoard);
-	}
 
     /**
-    * 导出excel
+     * 分页列表查询
-    *
+     *
-    * @param request
+     * @param experimentIrradiationBoard
-    * @param experimentIrradiationBoard
+     * @param pageNo
-    */
+     * @param pageSize
-    
+     * @param req
+     * @return
+     */
+    //@AutoLog(value = "试验辐照板信息-分页列表查询")
+    @Operation(summary = "试验辐照板信息-分页列表查询")
+    @GetMapping(value = "/list")
+    public Result<IPage<ExperimentIrradiationBoard>> queryPageList(ExperimentIrradiationBoard experimentIrradiationBoard,
+                                                                   @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+                                                                   @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+                                                                   HttpServletRequest req) {
+        QueryWrapper<ExperimentIrradiationBoard> queryWrapper = QueryGenerator.initQueryWrapper(experimentIrradiationBoard,
+                req.getParameterMap());
+        Page<ExperimentIrradiationBoard> page = new Page<ExperimentIrradiationBoard>(pageNo, pageSize);
+        IPage<ExperimentIrradiationBoard> pageList = experimentIrradiationBoardService.page(page, queryWrapper);
+        return Result.OK(pageList);
+    }
+
+    /**
+     * 添加
+     *
+     * @param experimentIrradiationBoard
+     * @return
+     */
+    @AutoLog(value = "试验辐照板信息-添加")
+    @Operation(summary = "试验辐照板信息-添加")
+    @RequiresPermissions("database:experiment_irradiation_board:add")
+    @PostMapping(value = "/add")
+    public Result<String> add(@RequestBody ExperimentIrradiationBoard experimentIrradiationBoard) {
+        experimentIrradiationBoardService.save(experimentIrradiationBoard);
+        return Result.OK("添加成功！");
+    }
+
+    /**
+     * 编辑
+     *
+     * @param experimentIrradiationBoard
+     * @return
+     */
+    @AutoLog(value = "试验辐照板信息-编辑")
+    @Operation(summary = "试验辐照板信息-编辑")
+    @RequiresPermissions("database:experiment_irradiation_board:edit")
+    @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
+    public Result<String> edit(@RequestBody ExperimentIrradiationBoard experimentIrradiationBoard) {
+        experimentIrradiationBoardService.updateById(experimentIrradiationBoard);
+        return Result.OK("编辑成功!");
+    }
+
+    /**
+     * 通过id删除
+     *
+     * @param id
+     * @return
+     */
+    @AutoLog(value = "试验辐照板信息-通过id删除")
+    @Operation(summary = "试验辐照板信息-通过id删除")
+    @RequiresPermissions("database:experiment_irradiation_board:delete")
+    @DeleteMapping(value = "/delete")
+    public Result<String> delete(@RequestParam(name = "id", required = true) String id) {
+        experimentIrradiationBoardService.removeById(id);
+        return Result.OK("删除成功!");
+    }
+
+    /**
+     * 批量删除
+     *
+     * @param ids
+     * @return
+     */
+    @AutoLog(value = "试验辐照板信息-批量删除")
+    @Operation(summary = "试验辐照板信息-批量删除")
+    @RequiresPermissions("database:experiment_irradiation_board:deleteBatch")
+    @DeleteMapping(value = "/deleteBatch")
+    public Result<String> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
+        this.experimentIrradiationBoardService.removeByIds(Arrays.asList(ids.split(",")));
+        return Result.OK("批量删除成功!");
+    }
+
+    /**
+     * 通过id查询
+     *
+     * @param id
+     * @return
+     */
+    //@AutoLog(value = "试验辐照板信息-通过id查询")
+    @Operation(summary = "试验辐照板信息-通过id查询")
+    @GetMapping(value = "/queryById")
+    public Result<ExperimentIrradiationBoard> queryById(@RequestParam(name = "id", required = true) String id) {
+        ExperimentIrradiationBoard experimentIrradiationBoard = experimentIrradiationBoardService.getById(id);
+        if (experimentIrradiationBoard == null) {
+            return Result.error("未找到对应数据");
+        }
+        return Result.OK(experimentIrradiationBoard);
+    }
+
+    /**
+     * 导出excel
+     *
+     * @param request
+     * @param experimentIrradiationBoard
+     */
+
     @RequestMapping(value = "/exportXls")
     public ModelAndView exportXls(HttpServletRequest request, ExperimentIrradiationBoard experimentIrradiationBoard) {
         return super.exportXls(request, experimentIrradiationBoard, ExperimentIrradiationBoard.class, "试验辐照板信息");
     }
 
     /**
-      * 通过excel导入数据
+     * 通过excel导入数据
-    *
+     *
-    * @param request
+     * @param request
-    * @param response
+     * @param response
-    * @return
+     * @return
-    */
+     */
     @RequiresPermissions("database:experiment_irradiation_board:add")
     @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
     public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {

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

@@ -140,7 +140,7 @@ public class ExperimentLogController extends JeecgController<ExperimentLog, IExp
      * @param request
      * @param experimentLog
      */
-    
+
     @RequestMapping(value = "/exportXls")
     public ModelAndView exportXls(HttpServletRequest request, ExperimentLog experimentLog) {
         return super.exportXls(request, experimentLog, ExperimentLog.class, "试验日志");

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

@@ -198,7 +198,7 @@ public class ExperimentRatingController extends JeecgController<ExperimentRating
      * @param request
      * @param experimentRating
      */
-    
+
     @RequestMapping(value = "/exportXls")
     public ModelAndView exportXls(HttpServletRequest request, ExperimentRating experimentRating) {
         return super.exportXls(request, experimentRating, ExperimentRating.class, "试验评分");

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

@@ -160,7 +160,7 @@ public class ExperimentReviewController extends JeecgController<ExperimentReview
      * @param request
      * @param experimentReview
      */
-    
+
     @RequestMapping(value = "/exportXls")
     public ModelAndView exportXls(HttpServletRequest request, ExperimentReview experimentReview) {
         return super.exportXls(request, experimentReview, ExperimentReview.class, "试验评定");

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

@@ -1,11 +1,8 @@
 package org.jeecg.modules.database.controller;
 
-import cn.hutool.core.date.DateUtil;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.base.controller.JeecgController;
 import org.jeecg.modules.database.entity.ExperimentSequence;
@@ -13,8 +10,6 @@ import org.jeecg.modules.database.service.IExperimentSequenceService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.Date;
-
 /**
  * @Description: 试验序列
  * @Author: jeecg-boot
@@ -42,7 +37,6 @@ public class ExperimentSequenceController extends JeecgController<ExperimentSequ
         return Result.OK(experimentSequenceService.next());
     }
 
-
     //
     ///**
     // * 添加

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

@@ -0,0 +1,185 @@
+package org.jeecg.modules.database.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.v3.oas.annotations.Operation;
+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.shiro.authz.annotation.RequiresPermissions;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.aspect.annotation.AutoLog;
+import org.jeecg.common.system.base.controller.JeecgController;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.modules.database.dto.NasaDataRecordPage;
+import org.jeecg.modules.database.entity.HistoricalDatabase;
+import org.jeecg.modules.database.entity.NasaDataRecord;
+import org.jeecg.modules.database.service.*;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.servlet.ModelAndView;
+
+import java.util.Arrays;
+
+/**
+ * @Description: 历史一期记录
+ * @Author: jeecg-boot
+ * @Date: 2025-02-24
+ * @Version: V1.0
+ */
+@Tag(name = "历史一期记录")
+@RestController
+@RequestMapping("/database/historicalDatabase")
+@Slf4j
+public class HistoricalDatabaseController extends JeecgController<HistoricalDatabase, IHistoricalDatabaseService> {
+    @Autowired
+    private IHistoricalDatabaseService historicalDatabaseService;
+    @Autowired
+    private ILocalDatabaseService      localDatabaseService;
+    @Autowired
+    private INasaDataRecordService     nasaDataRecordService;
+
+    /**
+     * 分页列表查询
+     *
+     * @param historicalDatabase
+     * @param pageNo
+     * @param pageSize
+     * @param req
+     * @return
+     */
+    //@AutoLog(value = "历史一期记录-分页列表查询")
+    @Operation(summary = "历史一期记录-分页列表查询")
+    @GetMapping(value = "/list")
+    public Result<IPage<HistoricalDatabase>> queryPageList(HistoricalDatabase historicalDatabase,
+                                                           @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+                                                           @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+                                                           HttpServletRequest req) {
+        QueryWrapper<HistoricalDatabase> queryWrapper = QueryGenerator.initQueryWrapper(historicalDatabase, req.getParameterMap());
+        Page<HistoricalDatabase> page = new Page<HistoricalDatabase>(pageNo, pageSize);
+        IPage<HistoricalDatabase> pageList = historicalDatabaseService.page(page, queryWrapper);
+        return Result.OK(pageList);
+    }
+
+    /**
+     * 添加
+     *
+     * @param historicalDatabase
+     * @return
+     */
+    @AutoLog(value = "历史一期记录-添加")
+    @Operation(summary = "历史一期记录-添加")
+    @RequiresPermissions("database:historical_database:add")
+    @PostMapping(value = "/add")
+    public Result<String> add(@RequestBody HistoricalDatabase historicalDatabase) {
+        historicalDatabaseService.save(historicalDatabase);
+        return Result.OK("添加成功！");
+    }
+
+    /**
+     * 编辑
+     *
+     * @param historicalDatabase
+     * @return
+     */
+    @AutoLog(value = "历史一期记录-编辑")
+    @Operation(summary = "历史一期记录-编辑")
+    @RequiresPermissions("database:historical_database:edit")
+    @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
+    public Result<String> edit(@RequestBody HistoricalDatabase historicalDatabase) {
+        historicalDatabaseService.updateById(historicalDatabase);
+        return Result.OK("编辑成功!");
+    }
+
+    /**
+     * 通过id删除
+     *
+     * @param id
+     * @return
+     */
+    @AutoLog(value = "历史一期记录-通过id删除")
+    @Operation(summary = "历史一期记录-通过id删除")
+    @RequiresPermissions("database:historical_database:delete")
+    @DeleteMapping(value = "/delete")
+    public Result<String> delete(@RequestParam(name = "id", required = true) String id) {
+        historicalDatabaseService.removeById(id);
+        return Result.OK("删除成功!");
+    }
+
+    /**
+     * 批量删除
+     *
+     * @param ids
+     * @return
+     */
+    @AutoLog(value = "历史一期记录-批量删除")
+    @Operation(summary = "历史一期记录-批量删除")
+    @RequiresPermissions("database:historical_database:deleteBatch")
+    @DeleteMapping(value = "/deleteBatch")
+    public Result<String> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
+        this.historicalDatabaseService.removeByIds(Arrays.asList(ids.split(",")));
+        return Result.OK("批量删除成功!");
+    }
+
+    /**
+     * 通过id查询
+     *
+     * @param id
+     * @return
+     */
+    //@AutoLog(value = "历史一期记录-通过id查询")
+    @Operation(summary = "历史一期记录-通过id查询")
+    @GetMapping(value = "/queryById")
+    public Result<HistoricalDatabase> queryById(@RequestParam(name = "id", required = true) String id) {
+        HistoricalDatabase historicalDatabase = historicalDatabaseService.getById(id);
+        if (historicalDatabase == null) {
+            return Result.error("未找到对应数据");
+        }
+        return Result.OK(historicalDatabase);
+    }
+
+    /**
+     * 导出excel
+     *
+     * @param request
+     * @param historicalDatabase
+     */
+    @RequiresPermissions("database:historical_database:exportXls")
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, HistoricalDatabase historicalDatabase) {
+        return super.exportXls(request, historicalDatabase, HistoricalDatabase.class, "历史一期记录");
+    }
+
+    /**
+     * 通过excel导入数据
+     *
+     * @param request
+     * @param response
+     * @return
+     */
+    @RequiresPermissions("database:historical_database:importExcel")
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        return super.importExcel(request, response, HistoricalDatabase.class);
+    }
+
+    @GetMapping(value = "/statistics")
+    public Result<NasaDataRecordPage> queryPageList(NasaDataRecord nasaDataRecord) {
+        NasaDataRecordPage result = new NasaDataRecordPage();
+        Long nasaCountLhs = nasaDataRecordService.sumLhs();
+        Long nasaCountXhy = nasaDataRecordService.sumXhy();
+        Long historicalCountLhs = historicalDatabaseService.sumLhs();
+        Long historicalCountXhy = historicalDatabaseService.sumXhy();
+        Long localCountLhs = localDatabaseService.sumLhs();
+        Long localCountXhy = localDatabaseService.sumXhy();
+
+        result.setLhsCount(historicalCountLhs);
+        result.setLhsTotal(nasaCountLhs + localCountLhs + historicalCountLhs);
+        result.setXhyCount(historicalCountXhy);
+        result.setXyhTotal(nasaCountXhy + localCountXhy + historicalCountXhy);
+
+        return Result.OK(result);
+    }
+}

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

@@ -140,7 +140,7 @@ public class IrradiationStandardsController extends JeecgController<IrradiationS
      * @param request
      * @param irradiationStandards
      */
-    
+
     @RequestMapping(value = "/exportXls")
     public ModelAndView exportXls(HttpServletRequest request, IrradiationStandards irradiationStandards) {
         return super.exportXls(request, irradiationStandards, IrradiationStandards.class, "辐照标准");

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

@@ -0,0 +1,185 @@
+package org.jeecg.modules.database.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.v3.oas.annotations.Operation;
+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.shiro.authz.annotation.RequiresPermissions;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.aspect.annotation.AutoLog;
+import org.jeecg.common.system.base.controller.JeecgController;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.modules.database.dto.NasaDataRecordPage;
+import org.jeecg.modules.database.entity.LocalDatabase;
+import org.jeecg.modules.database.entity.NasaDataRecord;
+import org.jeecg.modules.database.service.*;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.servlet.ModelAndView;
+
+import java.util.Arrays;
+
+/**
+ * @Description: 当期数据库记录
+ * @Author: jeecg-boot
+ * @Date: 2025-02-24
+ * @Version: V1.0
+ */
+@Tag(name = "当期数据库记录")
+@RestController
+@RequestMapping("/database/localDatabase")
+@Slf4j
+public class LocalDatabaseController extends JeecgController<LocalDatabase, ILocalDatabaseService> {
+    @Autowired
+    private ILocalDatabaseService      localDatabaseService;
+    @Autowired
+    private INasaDataRecordService     nasaDataRecordService;
+    @Autowired
+    private IHistoricalDatabaseService historicalDatabaseService;
+
+    /**
+     * 分页列表查询
+     *
+     * @param localDatabase
+     * @param pageNo
+     * @param pageSize
+     * @param req
+     * @return
+     */
+    //@AutoLog(value = "当期数据库记录-分页列表查询")
+    @Operation(summary = "当期数据库记录-分页列表查询")
+    @GetMapping(value = "/list")
+    public Result<IPage<LocalDatabase>> queryPageList(LocalDatabase localDatabase,
+                                                      @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+                                                      @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+                                                      HttpServletRequest req) {
+        QueryWrapper<LocalDatabase> queryWrapper = QueryGenerator.initQueryWrapper(localDatabase, req.getParameterMap());
+        Page<LocalDatabase> page = new Page<LocalDatabase>(pageNo, pageSize);
+        IPage<LocalDatabase> pageList = localDatabaseService.page(page, queryWrapper);
+        return Result.OK(pageList);
+    }
+
+    /**
+     * 添加
+     *
+     * @param localDatabase
+     * @return
+     */
+    @AutoLog(value = "当期数据库记录-添加")
+    @Operation(summary = "当期数据库记录-添加")
+    @RequiresPermissions("database:local_database:add")
+    @PostMapping(value = "/add")
+    public Result<String> add(@RequestBody LocalDatabase localDatabase) {
+        localDatabaseService.save(localDatabase);
+        return Result.OK("添加成功！");
+    }
+
+    /**
+     * 编辑
+     *
+     * @param localDatabase
+     * @return
+     */
+    @AutoLog(value = "当期数据库记录-编辑")
+    @Operation(summary = "当期数据库记录-编辑")
+    @RequiresPermissions("database:local_database:edit")
+    @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
+    public Result<String> edit(@RequestBody LocalDatabase localDatabase) {
+        localDatabaseService.updateById(localDatabase);
+        return Result.OK("编辑成功!");
+    }
+
+    /**
+     * 通过id删除
+     *
+     * @param id
+     * @return
+     */
+    @AutoLog(value = "当期数据库记录-通过id删除")
+    @Operation(summary = "当期数据库记录-通过id删除")
+    @RequiresPermissions("database:local_database:delete")
+    @DeleteMapping(value = "/delete")
+    public Result<String> delete(@RequestParam(name = "id", required = true) String id) {
+        localDatabaseService.removeById(id);
+        return Result.OK("删除成功!");
+    }
+
+    /**
+     * 批量删除
+     *
+     * @param ids
+     * @return
+     */
+    @AutoLog(value = "当期数据库记录-批量删除")
+    @Operation(summary = "当期数据库记录-批量删除")
+    @RequiresPermissions("database:local_database:deleteBatch")
+    @DeleteMapping(value = "/deleteBatch")
+    public Result<String> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
+        this.localDatabaseService.removeByIds(Arrays.asList(ids.split(",")));
+        return Result.OK("批量删除成功!");
+    }
+
+    /**
+     * 通过id查询
+     *
+     * @param id
+     * @return
+     */
+    //@AutoLog(value = "当期数据库记录-通过id查询")
+    @Operation(summary = "当期数据库记录-通过id查询")
+    @GetMapping(value = "/queryById")
+    public Result<LocalDatabase> queryById(@RequestParam(name = "id", required = true) String id) {
+        LocalDatabase localDatabase = localDatabaseService.getById(id);
+        if (localDatabase == null) {
+            return Result.error("未找到对应数据");
+        }
+        return Result.OK(localDatabase);
+    }
+
+    /**
+     * 导出excel
+     *
+     * @param request
+     * @param localDatabase
+     */
+    @RequiresPermissions("database:local_database:edit")
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, LocalDatabase localDatabase) {
+        return super.exportXls(request, localDatabase, LocalDatabase.class, "当期数据库记录");
+    }
+
+    /**
+     * 通过excel导入数据
+     *
+     * @param request
+     * @param response
+     * @return
+     */
+    @RequiresPermissions("database:local_database:edit")
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        return super.importExcel(request, response, LocalDatabase.class);
+    }
+
+    @GetMapping(value = "/statistics")
+    public Result<NasaDataRecordPage> queryPageList(NasaDataRecord nasaDataRecord) {
+        NasaDataRecordPage result = new NasaDataRecordPage();
+        Long nasaCountLhs = nasaDataRecordService.sumLhs();
+        Long nasaCountXhy = nasaDataRecordService.sumXhy();
+        Long historicalCountLhs = historicalDatabaseService.sumLhs();
+        Long historicalCountXhy = historicalDatabaseService.sumXhy();
+        Long localCountLhs = localDatabaseService.sumLhs();
+        Long localCountXhy = localDatabaseService.sumXhy();
+
+        result.setLhsCount(localCountLhs);
+        result.setLhsTotal(nasaCountLhs + localCountLhs + historicalCountLhs);
+        result.setXhyCount(localCountXhy);
+        result.setXyhTotal(nasaCountXhy + localCountXhy + historicalCountXhy);
+
+        return Result.OK(result);
+    }
+}

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

@@ -140,7 +140,7 @@ public class MigrationDataRecordController extends JeecgController<MigrationData
      * @param request
      * @param migrationDataRecord
      */
-    
+
     @RequestMapping(value = "/exportXls")
     public ModelAndView exportXls(HttpServletRequest request, MigrationDataRecord migrationDataRecord) {
         return super.exportXls(request, migrationDataRecord, MigrationDataRecord.class, "迁移数据管理");

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

@@ -18,8 +18,7 @@ import org.jeecg.common.system.base.controller.JeecgController;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.modules.database.dto.NasaDataRecordPage;
 import org.jeecg.modules.database.entity.NasaDataRecord;
-import org.jeecg.modules.database.service.IExperimentService;
+import org.jeecg.modules.database.service.*;
-import org.jeecg.modules.database.service.INasaDataRecordService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.ModelAndView;
@@ -38,9 +37,11 @@ import java.util.*;
 @Slf4j
 public class NasaDataRecordController extends JeecgController<NasaDataRecord, INasaDataRecordService> {
     @Autowired
-    private INasaDataRecordService nasaDataRecordService;
+    private INasaDataRecordService     nasaDataRecordService;
     @Autowired
-    private IExperimentService     experimentService;
+    private IHistoricalDatabaseService historicalDatabaseService;
+    @Autowired
+    private ILocalDatabaseService      localDatabaseService;
 
     /**
      * 分页列表查询
@@ -79,14 +80,16 @@ public class NasaDataRecordController extends JeecgController<NasaDataRecord, IN
         NasaDataRecordPage result = new NasaDataRecordPage();
         Long nasaCountLhs = nasaDataRecordService.sumLhs();
         Long nasaCountXhy = nasaDataRecordService.sumXhy();
-
+        Long historicalCountLhs = historicalDatabaseService.sumLhs();
-        Long localCountLhs = experimentService.sumLhs();
+        Long historicalCountXhy = historicalDatabaseService.sumXhy();
-        Long localCountXhy = experimentService.sumXhy();
+        Long localCountLhs = localDatabaseService.sumLhs();
+        Long localCountXhy = localDatabaseService.sumXhy();
 
         result.setLhsCount(nasaCountLhs);
-        result.setLhsTotal(nasaCountLhs + localCountLhs);
+        result.setLhsTotal(nasaCountLhs + localCountLhs + historicalCountLhs);
         result.setXhyCount(nasaCountXhy);
-        result.setXyhTotal(nasaCountXhy + localCountXhy);
+        result.setXyhTotal(nasaCountXhy + localCountXhy + historicalCountXhy);
+
         return Result.OK(result);
     }
 

physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/dto/ExperimentRatingUserDTO.java

@@ -14,14 +14,14 @@ import lombok.Setter;
  */
 @Getter
 @Setter
-@Schema(description="试验评分")
+@Schema(description = "试验评分")
 public class ExperimentRatingUserDTO {
 
     /**
      * 评分人
      */
     @Schema(description = "评分人")
-    private String  rateUserId;
+    private String rateUserId;
     /**
      * 总分数
      */

physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/dto/NasaDataRecordPage.java

@@ -4,9 +4,7 @@
  */
 package org.jeecg.modules.database.dto;
 
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import lombok.Data;
-import org.jeecg.modules.database.entity.NasaDataRecord;
 
 /**
  * @author lise
@@ -15,8 +13,8 @@ import org.jeecg.modules.database.entity.NasaDataRecord;
 
 @Data
 public class NasaDataRecordPage {
-    private Long                  lhsCount;
+    private Long lhsCount;
-    private Long                  lhsTotal;
+    private Long lhsTotal;
-    private Long                  xhyCount;
+    private Long xhyCount;
-    private Long                  xyhTotal;
+    private Long xyhTotal;
 }

physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/enhance/RateEnhance.java

@@ -1,4 +1,4 @@
-///*
+/// *
 // * Ant Group
 // * Copyright (c) 2004-2024 All Rights Reserved.
 // */

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

@@ -1,8 +1,6 @@
 package org.jeecg.modules.database.entity;
 
-import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.*;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
@@ -45,7 +43,7 @@ public class Client implements Serializable {
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
     @Schema(description = "创建日期")
-    private Date createTime;
+    private Date   createTime;
     /**
      * 更新人
      */
@@ -57,7 +55,7 @@ public class Client implements Serializable {
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
     @Schema(description = "更新日期")
-    private Date updateTime;
+    private Date   updateTime;
     /**
      * 所属部门
      */

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

@@ -1,8 +1,6 @@
 package org.jeecg.modules.database.entity;
 
-import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.*;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
@@ -45,7 +43,7 @@ public class CnasTest implements Serializable {
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
     @Schema(description = "创建日期")
-    private Date createTime;
+    private Date   createTime;
     /**
      * 更新人
      */
@@ -57,7 +55,7 @@ public class CnasTest implements Serializable {
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
     @Schema(description = "更新日期")
-    private Date updateTime;
+    private Date   updateTime;
     /**
      * 所属部门
      */
@@ -88,5 +86,5 @@ public class CnasTest implements Serializable {
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     @Schema(description = "创建时间")
-    private Date time;
+    private Date   time;
 }

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

@@ -1,8 +1,6 @@
 package org.jeecg.modules.database.entity;
 
-import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.*;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
@@ -45,7 +43,7 @@ public class Component implements Serializable {
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
     @Schema(description = "创建日期")
-    private Date createTime;
+    private Date   createTime;
     /**
      * 更新人
      */
@@ -57,7 +55,7 @@ public class Component implements Serializable {
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
     @Schema(description = "更新日期")
-    private Date updateTime;
+    private Date   updateTime;
     /**
      * 所属部门
      */

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

@@ -1,8 +1,6 @@
 package org.jeecg.modules.database.entity;
 
-import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.*;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
@@ -45,7 +43,7 @@ public class DocumentFavorites implements Serializable {
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
     @Schema(description = "创建日期")
-    private Date createTime;
+    private Date   createTime;
     /**
      * 更新人
      */
@@ -57,7 +55,7 @@ public class DocumentFavorites implements Serializable {
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
     @Schema(description = "更新日期")
-    private Date updateTime;
+    private Date   updateTime;
     /**
      * 所属部门
      */

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

@@ -1,8 +1,6 @@
 package org.jeecg.modules.database.entity;
 
-import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.*;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
@@ -44,7 +42,7 @@ public class DocumentLibrary implements Serializable {
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
     @Schema(description = "创建日期")
-    private java.util.Date createTime;
+    private java.util.Date   createTime;
     /**
      * 更新人
      */
@@ -56,7 +54,7 @@ public class DocumentLibrary implements Serializable {
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
     @Schema(description = "更新日期")
-    private java.util.Date updateTime;
+    private java.util.Date   updateTime;
     /**
      * 所属部门
      */
@@ -94,7 +92,9 @@ public class DocumentLibrary implements Serializable {
     @Schema(description = "类型(DOCUMENT/FOLDER)")
     private java.lang.String type;
 
-    /**附件*/
+    /**
+     * 附件
+     */
     @Excel(name = "附件", width = 15)
     @Schema(description = "附件")
     private java.lang.String fileList;

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

@@ -1,8 +1,6 @@
 package org.jeecg.modules.database.entity;
 
-import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.*;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
@@ -45,7 +43,7 @@ public class Equipment implements Serializable {
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
     @Schema(description = "创建日期")
-    private Date createTime;
+    private Date   createTime;
     /**
      * 更新人
      */
@@ -57,7 +55,7 @@ public class Equipment implements Serializable {
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
     @Schema(description = "更新日期")
-    private Date updateTime;
+    private Date   updateTime;
     /**
      * 所属部门
      */

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

@@ -196,19 +196,6 @@ public class Experiment implements Serializable {
     @TableField(exist = false)
     private List<ExperimentUser>               experimentUserList;
 
-    /**
-     * 西核院统计
-     */
-    @Excel(name = "西核院统计", width = 15)
-    @Schema(description = "西核院统计")
-    private Long totalCountXhy;
-    /**
-     * 理化所统计
-     */
-    @Excel(name = "理化所统计", width = 15)
-    @Schema(description = "理化所统计")
-    private Long totalCountLhs;
-
     @TableField(exist = false)
     private String sampleType;
     @TableField(exist = false)

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

@@ -1,8 +1,6 @@
 package org.jeecg.modules.database.entity;
 
-import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.*;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
@@ -45,7 +43,7 @@ public class ExperimentDoc implements Serializable {
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
     @Schema(description = "创建日期")
-    private Date createTime;
+    private Date   createTime;
     /**
      * 更新人
      */
@@ -57,7 +55,7 @@ public class ExperimentDoc implements Serializable {
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
     @Schema(description = "更新日期")
-    private Date updateTime;
+    private Date   updateTime;
     /**
      * 所属部门
      */

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

@@ -1,73 +1,88 @@
 package org.jeecg.modules.database.entity;
 
-import java.io.Serializable;
+import com.baomidou.mybatisplus.annotation.*;
-import java.io.UnsupportedEncodingException;
-import java.util.Date;
-import java.math.BigDecimal;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import lombok.Data;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import org.springframework.format.annotation.DateTimeFormat;
-import org.jeecgframework.poi.excel.annotation.Excel;
-import org.jeecg.common.aspect.annotation.Dict;
 import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
 
 /**
  * @Description: 试验文件
  * @Author: jeecg-boot
- * @Date:   2024-12-09
+ * @Date: 2024-12-09
  * @Version: V1.0
  */
 @Data
 @TableName("experiment_file")
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = false)
-@Schema(description="试验文件")
+@Schema(description = "试验文件")
 public class ExperimentFile implements Serializable {
     private static final long serialVersionUID = 1L;
 
-	/**主键*/
+    /**
-	@TableId(type = IdType.ASSIGN_ID)
+     * 主键
+     */
+    @TableId(type = IdType.ASSIGN_ID)
     @Schema(description = "主键")
     private String id;
-	/**创建人*/
+    /**
+     * 创建人
+     */
     @Schema(description = "创建人")
     private String createBy;
-	/**创建日期*/
+    /**
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm")
+     * 创建日期
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
+     */
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
     @Schema(description = "创建日期")
-    private Date createTime;
+    private Date   createTime;
-	/**更新人*/
+    /**
+     * 更新人
+     */
     @Schema(description = "更新人")
     private String updateBy;
-	/**更新日期*/
+    /**
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm")
+     * 更新日期
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
+     */
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
     @Schema(description = "更新日期")
-    private Date updateTime;
+    private Date   updateTime;
-	/**所属部门*/
+    /**
+     * 所属部门
+     */
     @Schema(description = "所属部门")
     private String sysOrgCode;
-	/**试验ID*/
+    /**
-	@Excel(name = "试验ID", width = 15)
+     * 试验ID
+     */
+    @Excel(name = "试验ID", width = 15)
     @Schema(description = "试验ID")
     private String experimentId;
-	/**文件名称*/
+    /**
-	@Excel(name = "文件名称", width = 15)
+     * 文件名称
+     */
+    @Excel(name = "文件名称", width = 15)
     @Schema(description = "文件名称")
     private String fileName;
-	/**类型*/
+    /**
-	@Excel(name = "类型", width = 15)
+     * 类型
+     */
+    @Excel(name = "类型", width = 15)
     @Schema(description = "类型")
     private String fileType;
-	/**文件链接*/
+    /**
-	@Excel(name = "文件链接", width = 15)
+     * 文件链接
+     */
+    @Excel(name = "文件链接", width = 15)
     @Schema(description = "文件链接")
     private String fileUrl;
 }

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

@@ -1,8 +1,6 @@
 package org.jeecg.modules.database.entity;
 
-import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.*;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
@@ -45,7 +43,7 @@ public class ExperimentLog implements Serializable {
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
     @Schema(description = "创建日期")
-    private Date createTime;
+    private Date   createTime;
     /**
      * 更新人
      */
@@ -57,7 +55,7 @@ public class ExperimentLog implements Serializable {
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
     @Schema(description = "更新日期")
-    private Date updateTime;
+    private Date   updateTime;
     /**
      * 所属部门
      */

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

@@ -33,48 +33,48 @@ public class ExperimentRating implements Serializable {
      */
     @TableId(type = IdType.ASSIGN_ID)
     @Schema(description = "主键")
-    private String  id;
+    private String id;
     /**
      * 创建人
      */
     @Schema(description = "创建人")
-    private String  createBy;
+    private String createBy;
     /**
      * 创建日期
      */
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
     @Schema(description = "创建日期")
-    private Date    createTime;
+    private Date   createTime;
     /**
      * 更新人
      */
     @Schema(description = "更新人")
-    private String  updateBy;
+    private String updateBy;
     /**
      * 更新日期
      */
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
     @Schema(description = "更新日期")
-    private Date    updateTime;
+    private Date   updateTime;
     /**
      * 所属部门
      */
     @Schema(description = "所属部门")
-    private String  sysOrgCode;
+    private String sysOrgCode;
     /**
      * 实验ID
      */
     @Excel(name = "实验ID", width = 15)
     @Schema(description = "实验ID")
-    private String  experimentId;
+    private String experimentId;
     /**
      * 评分人
      */
     @Excel(name = "评分人", width = 15)
     @Schema(description = "评分人")
-    private String  rateUserId;
+    private String rateUserId;
     /**
      * 总分数
      */

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

@@ -1,8 +1,6 @@
 package org.jeecg.modules.database.entity;
 
-import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.*;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
@@ -45,7 +43,7 @@ public class ExperimentReview implements Serializable {
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
     @Schema(description = "创建日期")
-    private Date createTime;
+    private Date   createTime;
     /**
      * 更新人
      */
@@ -57,7 +55,7 @@ public class ExperimentReview implements Serializable {
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
     @Schema(description = "更新日期")
-    private Date updateTime;
+    private Date   updateTime;
     /**
      * 所属部门
      */

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

@@ -0,0 +1,118 @@
+package org.jeecg.modules.database.entity;
+
+import com.baomidou.mybatisplus.annotation.*;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @Description: 历史一期记录
+ * @Author: jeecg-boot
+ * @Date: 2025-02-24
+ * @Version: V1.0
+ */
+@Data
+@TableName("historical_database")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@Schema(description = "历史一期记录")
+public class HistoricalDatabase implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(type = IdType.ASSIGN_ID)
+    @Schema(description = "主键")
+    private String  id;
+    /**
+     * 创建人
+     */
+    @Schema(description = "创建人")
+    private String  createBy;
+    /**
+     * 创建日期
+     */
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
+    @Schema(description = "创建日期")
+    private Date    createTime;
+    /**
+     * 更新人
+     */
+    @Schema(description = "更新人")
+    private String  updateBy;
+    /**
+     * 更新日期
+     */
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
+    @Schema(description = "更新日期")
+    private Date    updateTime;
+    /**
+     * 所属部门
+     */
+    @Schema(description = "所属部门")
+    private String  sysOrgCode;
+    /**
+     * 类型
+     */
+    @Excel(name = "类型", width = 15)
+    @Schema(description = "类型")
+    private String  type;
+    /**
+     * 名称
+     */
+    @Excel(name = "名称", width = 15)
+    @Schema(description = "名称")
+    private String  name;
+    /**
+     * 委托方
+     */
+    @Excel(name = "委托方", width = 15)
+    @Schema(description = "委托方")
+    private String  clientName;
+    /**
+     * 生产厂家
+     */
+    @Excel(name = "生产厂家", width = 15)
+    @Schema(description = "生产厂家")
+    private String  manufacturer;
+    /**
+     * 试验时间
+     */
+    @Excel(name = "试验时间", width = 15)
+    @Schema(description = "试验时间")
+    private String  experimentDate;
+    /**
+     * 数据来源
+     */
+    @Excel(name = "数据来源", width = 15)
+    @Schema(description = "数据来源")
+    private String  dataSource;
+    /**
+     * 试验人员
+     */
+    @Excel(name = "试验人员", width = 15)
+    @Schema(description = "试验人员")
+    private String  experimentUser;
+    /**
+     * 西核院统计
+     */
+    @Excel(name = "西核院统计", width = 15)
+    @Schema(description = "西核院统计")
+    private Integer totalCountXhy;
+    /**
+     * 理化所统计
+     */
+    @Excel(name = "理化所统计", width = 15)
+    @Schema(description = "理化所统计")
+    private Integer totalCountLhs;
+}

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

@@ -0,0 +1,133 @@
+package org.jeecg.modules.database.entity;
+
+import com.baomidou.mybatisplus.annotation.*;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @Description: 当期数据库记录
+ * @Author: jeecg-boot
+ * @Date: 2025-02-24
+ * @Version: V1.0
+ */
+@Data
+@TableName("local_database")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@Schema(description = "当期数据库记录")
+public class LocalDatabase implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(type = IdType.ASSIGN_ID)
+    @Schema(description = "主键")
+    private String id;
+    /**
+     * 创建人
+     */
+    @Schema(description = "创建人")
+    private String createBy;
+    /**
+     * 创建日期
+     */
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
+    @Schema(description = "创建日期")
+    private Date   createTime;
+    /**
+     * 更新人
+     */
+    @Schema(description = "更新人")
+    private String updateBy;
+    /**
+     * 更新日期
+     */
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
+    @Schema(description = "更新日期")
+    private Date   updateTime;
+    /**
+     * 所属部门
+     */
+    @Schema(description = "所属部门")
+    private String sysOrgCode;
+
+    @Schema(description = "试验ID")
+    private String experimentId;
+
+    @Excel(name = "试验编号", width = 15)
+    @Schema(description = "试验编号")
+    private String experimentNo;
+
+    /**
+     * 类型
+     */
+    @Excel(name = "类型", width = 15)
+    @Schema(description = "类型")
+    private String  type;
+    /**
+     * 名称
+     */
+    @Excel(name = "名称", width = 15)
+    @Schema(description = "名称")
+    private String  name;
+    /**
+     * 委托方
+     */
+    @Excel(name = "委托方", width = 15)
+    @Schema(description = "委托方")
+    private String  clientName;
+    /**
+     * 试验开始时间
+     */
+    @Excel(name = "试验开始时间", width = 15)
+    @Schema(description = "试验开始时间")
+    private String  startDate;
+    /**
+     * 试验结束时间
+     */
+    @Excel(name = "试验结束时间", width = 15)
+    @Schema(description = "试验结束时间")
+    private String  endDate;
+    /**
+     * 数据来源
+     */
+    @Excel(name = "数据来源", width = 15)
+    @Schema(description = "数据来源")
+    private String  dataSource;
+    /**
+     * 试验人员
+     */
+    @Excel(name = "试验人员", width = 15)
+    @Schema(description = "试验人员")
+    private String  experimentUser;
+    /**
+     * 西核院统计
+     */
+    @Excel(name = "西核院统计", width = 15)
+    @Schema(description = "西核院统计")
+    private Integer totalCountXhy;
+    /**
+     * 理化所统计
+     */
+    @Excel(name = "理化所统计", width = 15)
+    @Schema(description = "理化所统计")
+    private Integer totalCountLhs;
+    /**
+     * 状态
+     */
+    @Excel(name = "状态", width = 15)
+    @Schema(description = "状态")
+    private String  status;
+
+}

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

@@ -1,8 +1,6 @@
 package org.jeecg.modules.database.entity;
 
-import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.*;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
@@ -45,7 +43,7 @@ public class MigrationDataRecord implements Serializable {
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
     @Schema(description = "创建日期")
-    private Date createTime;
+    private Date   createTime;
     /**
      * 更新人
      */
@@ -57,7 +55,7 @@ public class MigrationDataRecord implements Serializable {
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
     @Schema(description = "更新日期")
-    private Date updateTime;
+    private Date   updateTime;
     /**
      * 所属部门
      */

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

@@ -1,8 +1,6 @@
 package org.jeecg.modules.database.entity;
 
-import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.*;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
@@ -45,7 +43,7 @@ public class RadiateType implements Serializable {
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
     @Schema(description = "创建日期")
-    private Date createTime;
+    private Date   createTime;
     /**
      * 更新人
      */
@@ -57,7 +55,7 @@ public class RadiateType implements Serializable {
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
     @Schema(description = "更新日期")
-    private Date updateTime;
+    private Date   updateTime;
     /**
      * 所属部门
      */

physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/mapper/DocumentVisitHistoryMapper.java

@@ -1,15 +1,12 @@
 package org.jeecg.modules.database.mapper;
 
-import java.util.List;
-
-import org.apache.ibatis.annotations.Param;
-import org.jeecg.modules.database.entity.DocumentVisitHistory;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.jeecg.modules.database.entity.DocumentVisitHistory;
 
 /**
  * @Description: 文档访问历史
  * @Author: jeecg-boot
- * @Date:   2024-11-14
+ * @Date: 2024-11-14
  * @Version: V1.0
  */
 public interface DocumentVisitHistoryMapper extends BaseMapper<DocumentVisitHistory> {

physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/mapper/ExperimentDeviationConditionMapper.java

@@ -1,15 +1,12 @@
 package org.jeecg.modules.database.mapper;
 
-import java.util.List;
-
-import org.apache.ibatis.annotations.Param;
-import org.jeecg.modules.database.entity.ExperimentDeviationCondition;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.jeecg.modules.database.entity.ExperimentDeviationCondition;
 
 /**
  * @Description: 试验偏置条件信息
  * @Author: jeecg-boot
- * @Date:   2024-12-05
+ * @Date: 2024-12-05
  * @Version: V1.0
  */
 public interface ExperimentDeviationConditionMapper extends BaseMapper<ExperimentDeviationCondition> {

physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/mapper/ExperimentDeviationEquipmentMapper.java

@@ -1,15 +1,12 @@
 package org.jeecg.modules.database.mapper;
 
-import java.util.List;
-
-import org.apache.ibatis.annotations.Param;
-import org.jeecg.modules.database.entity.ExperimentDeviationEquipment;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.jeecg.modules.database.entity.ExperimentDeviationEquipment;
 
 /**
  * @Description: 试验加偏设备信息
  * @Author: jeecg-boot
- * @Date:   2024-12-05
+ * @Date: 2024-12-05
  * @Version: V1.0
  */
 public interface ExperimentDeviationEquipmentMapper extends BaseMapper<ExperimentDeviationEquipment> {

physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/mapper/ExperimentFileMapper.java

@@ -1,15 +1,12 @@
 package org.jeecg.modules.database.mapper;
 
-import java.util.List;
-
-import org.apache.ibatis.annotations.Param;
-import org.jeecg.modules.database.entity.ExperimentFile;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.jeecg.modules.database.entity.ExperimentFile;
 
 /**
  * @Description: 试验文件
  * @Author: jeecg-boot
- * @Date:   2024-12-09
+ * @Date: 2024-12-09
  * @Version: V1.0
  */
 public interface ExperimentFileMapper extends BaseMapper<ExperimentFile> {

physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/mapper/ExperimentIrradiationBoardMapper.java

@@ -1,15 +1,12 @@
 package org.jeecg.modules.database.mapper;
 
-import java.util.List;
-
-import org.apache.ibatis.annotations.Param;
-import org.jeecg.modules.database.entity.ExperimentIrradiationBoard;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.jeecg.modules.database.entity.ExperimentIrradiationBoard;
 
 /**
  * @Description: 试验辐照板信息
  * @Author: jeecg-boot
- * @Date:   2024-12-05
+ * @Date: 2024-12-05
  * @Version: V1.0
  */
 public interface ExperimentIrradiationBoardMapper extends BaseMapper<ExperimentIrradiationBoard> {

physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/mapper/ExperimentRatingMapper.java

@@ -1,15 +1,12 @@
 package org.jeecg.modules.database.mapper;
 
-import java.util.List;
-
-import org.apache.ibatis.annotations.Param;
-import org.jeecg.modules.database.entity.ExperimentRating;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.jeecg.modules.database.entity.ExperimentRating;
 
 /**
  * @Description: 试验评分
  * @Author: jeecg-boot
- * @Date:   2024-11-16
+ * @Date: 2024-11-16
  * @Version: V1.0
  */
 public interface ExperimentRatingMapper extends BaseMapper<ExperimentRating> {

physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/mapper/ExperimentSampleInfoMapper.java

@@ -1,15 +1,12 @@
 package org.jeecg.modules.database.mapper;
 
-import java.util.List;
-
-import org.apache.ibatis.annotations.Param;
-import org.jeecg.modules.database.entity.ExperimentSampleInfo;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.jeecg.modules.database.entity.ExperimentSampleInfo;
 
 /**
  * @Description: 试验样品信息
  * @Author: jeecg-boot
- * @Date:   2024-12-04
+ * @Date: 2024-12-04
  * @Version: V1.0
  */
 public interface ExperimentSampleInfoMapper extends BaseMapper<ExperimentSampleInfo> {

physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/mapper/ExperimentSequenceMapper.java

@@ -1,15 +1,12 @@
 package org.jeecg.modules.database.mapper;
 
-import java.util.List;
-
-import org.apache.ibatis.annotations.Param;
-import org.jeecg.modules.database.entity.ExperimentSequence;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.jeecg.modules.database.entity.ExperimentSequence;
 
 /**
  * @Description: 试验序列
  * @Author: jeecg-boot
- * @Date:   2024-12-04
+ * @Date: 2024-12-04
  * @Version: V1.0
  */
 public interface ExperimentSequenceMapper extends BaseMapper<ExperimentSequence> {

physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/mapper/HistoricalDatabaseMapper.java

@@ -0,0 +1,21 @@
+package org.jeecg.modules.database.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Select;
+import org.jeecg.modules.database.entity.HistoricalDatabase;
+
+/**
+ * @Description: 历史一期记录
+ * @Author: jeecg-boot
+ * @Date: 2025-02-24
+ * @Version: V1.0
+ */
+public interface HistoricalDatabaseMapper extends BaseMapper<HistoricalDatabase> {
+
+    @Select("SELECT SUM(total_count_lhs) FROM local_database where total_count_lhs is not null")
+    Long sumLhs();
+
+    @Select("SELECT SUM(total_count_xhy) FROM local_database where total_count_xhy is not null")
+    Long sumXhy();
+
+}

physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/mapper/LocalDatabaseMapper.java

@@ -0,0 +1,19 @@
+package org.jeecg.modules.database.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Select;
+import org.jeecg.modules.database.entity.LocalDatabase;
+
+/**
+ * @Description: 当期数据库记录
+ * @Author: jeecg-boot
+ * @Date: 2025-02-24
+ * @Version: V1.0
+ */
+public interface LocalDatabaseMapper extends BaseMapper<LocalDatabase> {
+    @Select("SELECT SUM(total_count_lhs) FROM historical_database where total_count_lhs is not null")
+    Long sumLhs();
+
+    @Select("SELECT SUM(total_count_xhy) FROM historical_database where total_count_xhy is not null")
+    Long sumXhy();
+}

physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/mapper/NasaDataRecordMapper.java

@@ -15,6 +15,6 @@ public interface NasaDataRecordMapper extends BaseMapper<NasaDataRecord> {
     @Select("SELECT SUM(total_count_lhs) FROM nasa_data_record where total_count_lhs is not null")
     Long sumLhs();
 
-    @Select("SELECT SUM(total_count_nasa) FROM nasa_data_record where total_count_lhs is not null")
+    @Select("SELECT SUM(total_count_nasa) FROM nasa_data_record where total_count_nasa is not null")
     Long sumXhy();
 }

physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/mapper/xml/HistoricalDatabaseMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.jeecg.modules.database.mapper.HistoricalDatabaseMapper">
+
+</mapper>

physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/mapper/xml/LocalDatabaseMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.jeecg.modules.database.mapper.LocalDatabaseMapper">
+
+</mapper>

physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/IDocumentFavoritesService.java

@@ -13,7 +13,8 @@ import java.util.List;
  */
 public interface IDocumentFavoritesService extends IService<DocumentFavorites> {
     List<DocumentFavorites> getTopFavoritesByUserId(String userId);
-    DocumentFavorites getByDocIdAndUserId(String userId,String documentId);
+
+    DocumentFavorites getByDocIdAndUserId(String userId, String documentId);
 
     void removeByDocId(String documentId);
 

physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/IDocumentVisitHistoryService.java

@@ -1,15 +1,15 @@
 package org.jeecg.modules.database.service;
 
+import com.baomidou.mybatisplus.extension.service.IService;
 import org.jeecg.modules.database.entity.DocumentLibrary;
 import org.jeecg.modules.database.entity.DocumentVisitHistory;
-import com.baomidou.mybatisplus.extension.service.IService;
 
 import java.util.List;
 
 /**
  * @Description: 文档访问历史
  * @Author: jeecg-boot
- * @Date:   2024-11-14
+ * @Date: 2024-11-14
  * @Version: V1.0
  */
 public interface IDocumentVisitHistoryService extends IService<DocumentVisitHistory> {

physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/IExperimentDeviationConditionService.java

@@ -1,15 +1,14 @@
 package org.jeecg.modules.database.service;
 
-import org.jeecg.modules.database.entity.ExperimentDeviationCondition;
 import com.baomidou.mybatisplus.extension.service.IService;
-import org.jeecg.modules.database.entity.ExperimentSampleInfo;
+import org.jeecg.modules.database.entity.ExperimentDeviationCondition;
 
 import java.util.List;
 
 /**
  * @Description: 试验偏置条件信息
  * @Author: jeecg-boot
- * @Date:   2024-12-05
+ * @Date: 2024-12-05
  * @Version: V1.0
  */
 public interface IExperimentDeviationConditionService extends IService<ExperimentDeviationCondition> {

physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/IExperimentDeviationEquipmentService.java

@@ -1,15 +1,14 @@
 package org.jeecg.modules.database.service;
 
-import org.jeecg.modules.database.entity.ExperimentDeviationCondition;
-import org.jeecg.modules.database.entity.ExperimentDeviationEquipment;
 import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.database.entity.ExperimentDeviationEquipment;
 
 import java.util.List;
 
 /**
  * @Description: 试验加偏设备信息
  * @Author: jeecg-boot
- * @Date:   2024-12-05
+ * @Date: 2024-12-05
  * @Version: V1.0
  */
 public interface IExperimentDeviationEquipmentService extends IService<ExperimentDeviationEquipment> {

physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/IExperimentDocService.java

@@ -15,7 +15,8 @@ public interface IExperimentDocService extends IService<ExperimentDoc> {
 
     ExperimentDoc generate(String experimentId, String type);
 
-    List<ExperimentDoc> getHistoryByExperimentId(String experimentId,String type);
+    List<ExperimentDoc> getHistoryByExperimentId(String experimentId, String type);
-    ExperimentDoc getByExperimentId(String experimentId,String type);
+
+    ExperimentDoc getByExperimentId(String experimentId, String type);
 
 }

physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/IExperimentIrradiationBoardService.java

@@ -1,15 +1,14 @@
 package org.jeecg.modules.database.service;
 
-import org.jeecg.modules.database.entity.ExperimentDeviationEquipment;
-import org.jeecg.modules.database.entity.ExperimentIrradiationBoard;
 import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.database.entity.ExperimentIrradiationBoard;
 
 import java.util.List;
 
 /**
  * @Description: 试验辐照板信息
  * @Author: jeecg-boot
- * @Date:   2024-12-05
+ * @Date: 2024-12-05
  * @Version: V1.0
  */
 public interface IExperimentIrradiationBoardService extends IService<ExperimentIrradiationBoard> {

physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/IExperimentLogService.java

@@ -2,7 +2,6 @@ package org.jeecg.modules.database.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import org.jeecg.modules.database.entity.ExperimentLog;
-import org.jeecg.modules.database.entity.ExperimentTestProcess;
 
 import java.util.List;
 

physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/IExperimentRadiationProcessService.java

@@ -1,7 +1,6 @@
 package org.jeecg.modules.database.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import org.jeecg.modules.database.entity.ExperimentAnnealProcess;
 import org.jeecg.modules.database.entity.ExperimentRadiationProcess;
 
 import java.util.List;

physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/IExperimentRatingService.java

@@ -1,12 +1,12 @@
 package org.jeecg.modules.database.service;
 
-import org.jeecg.modules.database.entity.ExperimentRating;
 import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.database.entity.ExperimentRating;
 
 /**
  * @Description: 试验评分
  * @Author: jeecg-boot
- * @Date:   2024-11-16
+ * @Date: 2024-11-16
  * @Version: V1.0
  */
 public interface IExperimentRatingService extends IService<ExperimentRating> {

physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/IExperimentReviewService.java

@@ -1,7 +1,6 @@
 package org.jeecg.modules.database.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import org.jeecg.modules.database.entity.ExperimentReport;
 import org.jeecg.modules.database.entity.ExperimentReview;
 
 /**

physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/IExperimentSampleInfoService.java

@@ -1,14 +1,14 @@
 package org.jeecg.modules.database.service;
 
-import org.jeecg.modules.database.entity.ExperimentSampleInfo;
 import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.database.entity.ExperimentSampleInfo;
 
 import java.util.List;
 
 /**
  * @Description: 试验样品信息
  * @Author: jeecg-boot
- * @Date:   2024-12-04
+ * @Date: 2024-12-04
  * @Version: V1.0
  */
 public interface IExperimentSampleInfoService extends IService<ExperimentSampleInfo> {

physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/IExperimentSequenceService.java

@@ -1,12 +1,12 @@
 package org.jeecg.modules.database.service;
 
-import org.jeecg.modules.database.entity.ExperimentSequence;
 import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.database.entity.ExperimentSequence;
 
 /**
  * @Description: 试验序列
  * @Author: jeecg-boot
- * @Date:   2024-12-04
+ * @Date: 2024-12-04
  * @Version: V1.0
  */
 public interface IExperimentSequenceService extends IService<ExperimentSequence> {

physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/IExperimentTestProcessService.java

@@ -1,7 +1,6 @@
 package org.jeecg.modules.database.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import org.jeecg.modules.database.entity.ExperimentRadiationProcess;
 import org.jeecg.modules.database.entity.ExperimentTestProcess;
 
 import java.util.List;

physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/IHistoricalDatabaseService.java

@@ -0,0 +1,16 @@
+package org.jeecg.modules.database.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.database.entity.HistoricalDatabase;
+
+/**
+ * @Description: 历史一期记录
+ * @Author: jeecg-boot
+ * @Date: 2025-02-24
+ * @Version: V1.0
+ */
+public interface IHistoricalDatabaseService extends IService<HistoricalDatabase> {
+    Long sumLhs();
+
+    Long sumXhy();
+}

physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/ILocalDatabaseService.java

@@ -0,0 +1,16 @@
+package org.jeecg.modules.database.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.database.entity.LocalDatabase;
+
+/**
+ * @Description: 当期数据库记录
+ * @Author: jeecg-boot
+ * @Date: 2025-02-24
+ * @Version: V1.0
+ */
+public interface ILocalDatabaseService extends IService<LocalDatabase> {
+    Long sumLhs();
+
+    Long sumXhy();
+}

physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/DocumentLibraryServiceImpl.java

@@ -24,7 +24,7 @@ public class DocumentLibraryServiceImpl extends ServiceImpl<DocumentLibraryMappe
     @Override
     public List<DocumentLibrary> getLatest() {
         LambdaQueryWrapper<DocumentLibrary> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.eq(DocumentLibrary::getType,"DOCUMENT");
+        queryWrapper.eq(DocumentLibrary::getType, "DOCUMENT");
         queryWrapper.orderByDesc(DocumentLibrary::getCreateTime);
         Page<DocumentLibrary> page = new Page<>(1, 5);
         return list(page, queryWrapper);
@@ -38,7 +38,7 @@ public class DocumentLibraryServiceImpl extends ServiceImpl<DocumentLibraryMappe
     @Override
     public Long getToday() {
         QueryWrapper<DocumentLibrary> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("type","DOCUMENT");
+        queryWrapper.eq("type", "DOCUMENT");
         queryWrapper.eq("DATE_FORMAT (create_time,'%Y-%m-%d')",
                 DateUtils.formatDate(new Date(), "yyyy-MM-dd"));
         return count(queryWrapper);

physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentDocServiceImpl.java

@@ -45,6 +45,17 @@ import java.util.stream.Collectors;
 @Slf4j
 public class ExperimentDocServiceImpl extends ServiceImpl<ExperimentDocMapper, ExperimentDoc> implements IExperimentDocService {
 
+    static Map<String, String> docTempalteMap = new HashMap<>();
+
+    static {
+        //辐照试验计划表
+        docTempalteMap.put("辐照试验计划表", "fzsyjhb.docx");
+        docTempalteMap.put("试验报告评审表", "sybgpsb.docx");
+        docTempalteMap.put("设备使用记录表", "sbsyjlb.docx");
+        docTempalteMap.put("试验报告", "sybg.docx");
+        docTempalteMap.put("辐照试验总结单", "fzsyzjd.docx");
+    }
+
     @Value("${jeecg.template.path}")
     private String                               templatePath;
     @Value("${server.ip}")
@@ -57,10 +68,8 @@ public class ExperimentDocServiceImpl extends ServiceImpl<ExperimentDocMapper, E
     private IExperimentDeviationEquipmentService experimentDeviationEquipmentService;
     @Autowired
     private ISysUserService                      sysUserService;
-
     @Autowired
     private IClientService clientService;
-
     @Autowired
     private IExperimentTestProcessService      experimentTestProcessService;
     @Autowired
@@ -68,17 +77,6 @@ public class ExperimentDocServiceImpl extends ServiceImpl<ExperimentDocMapper, E
     @Autowired
     private ITestStandardsService              testStandardsService;
 
-    static Map<String, String> docTempalteMap = new HashMap<>();
-
-    static {
-        //辐照试验计划表
-        docTempalteMap.put("辐照试验计划表", "fzsyjhb.docx");
-        docTempalteMap.put("试验报告评审表", "sybgpsb.docx");
-        docTempalteMap.put("设备使用记录表", "sbsyjlb.docx");
-        docTempalteMap.put("试验报告", "sybg.docx");
-        docTempalteMap.put("辐照试验总结单", "fzsyzjd.docx");
-    }
-
     public static void main(String[] args) throws IOException {
         //The core API uses a minimalist design, only one line of code is required
         TestStandards testStandards = new TestStandards();
@@ -89,53 +87,6 @@ public class ExperimentDocServiceImpl extends ServiceImpl<ExperimentDocMapper, E
         //generateExperimentDoc("20241028号实验", "辐照试验计划表", maps);
     }
 
-    public String generateExperimentDoc(String experimentId, String fileName, String version) {
-        String absolutePath = templatePath + File.separator + docTempalteMap.get(fileName);
-        log.info("doc template path: " + absolutePath);
-        if (!FileUtil.exist(absolutePath)) {
-            throw new RuntimeException("模板文件不存在！");
-        }
-        try {
-            Experiment experiment = experimentService.getById(experimentId);
-            if (Objects.isNull(experiment)) {
-                throw new RuntimeException("实验数据不存在！");
-            }
-            String tmpDirPath = FileUtil.getTmpDirPath();
-            String outputFile = tmpDirPath + File.separator + fileName + "-" + experimentId + "-" + version + ".docx";
-            if (FileUtil.exist(outputFile)) {
-                FileUtil.del(outputFile);
-            }
-            log.info("output file path: " + outputFile);
-            assembleParams(experimentId, fileName, outputFile);
-            //XWPFTemplate render = XWPFTemplate.compile(absolutePath).render(params);
-            //render.writeToFile(outputFile);
-           /* NiceXWPFDocument document = render.getXWPFDocument();
-            //render
-            //.writeToFile(outputFile);
-            //XWPFDocument document = WordExportUtil.exportWord07(absolutePath, params);
-
-            List<XWPFHeader> headers = document.getHeaderList();
-
-            // 遍历所有节，确保每个节的页眉都添加了页码
-            for (XWPFHeader h : headers) {
-                // 添加页码到每个节的页眉
-                //addPageNumberToHeader("报告编号：" + experiment.getExperimentNo(), h);
-            }
-
-            try (FileOutputStream out = new FileOutputStream(outputFile)) {
-                document.write(out);
-            }
-            document.close();*/
-            String path = MinioUtil.upload(FileUtil.getInputStream(outputFile),
-                    "experiment_doc/" + experimentId + "/" + version + "/" + experiment.getName() + "-" + fileName + ".docx");
-            return path;
-        } catch (Exception e) {
-            log.error(e.getMessage());
-            e.printStackTrace();
-            return null;
-        }
-    }
-
     private static void addPageNumberToHeader(String left, XWPFHeader header) {
 
         // 创建一个新的段落用于页码
@@ -185,6 +136,67 @@ public class ExperimentDocServiceImpl extends ServiceImpl<ExperimentDocMapper, E
 
     }
 
+    private static String formatDate(String date) {
+        if (StringUtils.isBlank(date)) {
+            return "";
+        }
+        return StringUtils.contains(date, " ") ? StringUtils.substringBefore(date, " ") : date;
+    }
+
+    private static String formatDate(Date date) {
+        if (Objects.isNull(date)) {
+            return "";
+        }
+        return DateUtils.formatDate(date, "yyyy-MM-dd");
+    }
+
+    public String generateExperimentDoc(String experimentId, String fileName, String version) {
+        String absolutePath = templatePath + File.separator + docTempalteMap.get(fileName);
+        log.info("doc template path: " + absolutePath);
+        if (!FileUtil.exist(absolutePath)) {
+            throw new RuntimeException("模板文件不存在！");
+        }
+        try {
+            Experiment experiment = experimentService.getById(experimentId);
+            if (Objects.isNull(experiment)) {
+                throw new RuntimeException("实验数据不存在！");
+            }
+            String tmpDirPath = FileUtil.getTmpDirPath();
+            String outputFile = tmpDirPath + File.separator + fileName + "-" + experimentId + "-" + version + ".docx";
+            if (FileUtil.exist(outputFile)) {
+                FileUtil.del(outputFile);
+            }
+            log.info("output file path: " + outputFile);
+            assembleParams(experimentId, fileName, outputFile);
+            //XWPFTemplate render = XWPFTemplate.compile(absolutePath).render(params);
+            //render.writeToFile(outputFile);
+           /* NiceXWPFDocument document = render.getXWPFDocument();
+            //render
+            //.writeToFile(outputFile);
+            //XWPFDocument document = WordExportUtil.exportWord07(absolutePath, params);
+
+            List<XWPFHeader> headers = document.getHeaderList();
+
+            // 遍历所有节，确保每个节的页眉都添加了页码
+            for (XWPFHeader h : headers) {
+                // 添加页码到每个节的页眉
+                //addPageNumberToHeader("报告编号：" + experiment.getExperimentNo(), h);
+            }
+
+            try (FileOutputStream out = new FileOutputStream(outputFile)) {
+                document.write(out);
+            }
+            document.close();*/
+            String path = MinioUtil.upload(FileUtil.getInputStream(outputFile),
+                    "experiment_doc/" + experimentId + "/" + version + "/" + experiment.getName() + "-" + fileName + ".docx");
+            return path;
+        } catch (Exception e) {
+            log.error(e.getMessage());
+            e.printStackTrace();
+            return null;
+        }
+    }
+
     private Map<String, Object> assembleParams(String experimentId, String type, String outputFile) throws IOException {
         String absolutePath = templatePath + File.separator + docTempalteMap.get(type);
         switch (type) {
@@ -264,20 +276,6 @@ public class ExperimentDocServiceImpl extends ServiceImpl<ExperimentDocMapper, E
         return root;
     }
 
-    private static String formatDate(String date) {
-        if (StringUtils.isBlank(date)) {
-            return "";
-        }
-        return StringUtils.contains(date, " ") ? StringUtils.substringBefore(date, " ") : date;
-    }
-
-    private static String formatDate(Date date) {
-        if (Objects.isNull(date)) {
-            return "";
-        }
-        return DateUtils.formatDate(date, "yyyy-MM-dd");
-    }
-
     private Map<String, Object> assembleSybg(String experimentId) {
         Experiment experiment = experimentService.getById(experimentId);
         experimentService.fetchExperimentDetail(experiment);

physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentIrradiationBoardServiceImpl.java

@@ -1,24 +1,23 @@
 package org.jeecg.modules.database.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.jeecg.modules.database.entity.ExperimentIrradiationBoard;
-import org.jeecg.modules.database.entity.ExperimentSampleInfo;
 import org.jeecg.modules.database.mapper.ExperimentIrradiationBoardMapper;
 import org.jeecg.modules.database.service.IExperimentIrradiationBoardService;
 import org.springframework.stereotype.Service;
 
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-
 import java.util.List;
 
 /**
  * @Description: 试验辐照板信息
  * @Author: jeecg-boot
- * @Date:   2024-12-05
+ * @Date: 2024-12-05
  * @Version: V1.0
  */
 @Service
-public class ExperimentIrradiationBoardServiceImpl extends ServiceImpl<ExperimentIrradiationBoardMapper, ExperimentIrradiationBoard> implements IExperimentIrradiationBoardService {
+public class ExperimentIrradiationBoardServiceImpl extends ServiceImpl<ExperimentIrradiationBoardMapper, ExperimentIrradiationBoard>
+        implements IExperimentIrradiationBoardService {
 
     @Override
     public List<ExperimentIrradiationBoard> getByExperimentId(String experimentId) {

physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentRadiationProcessServiceImpl.java

@@ -75,7 +75,7 @@ public class ExperimentRadiationProcessServiceImpl extends ServiceImpl<Experimen
         }
         List<ExperimentRadiationProcess> radiationProcessList = getByExperimentId(experimentRadiationProcess.getExperimentId());
         if (CollUtil.isNotEmpty(radiationProcessList)) {
-            List<TimeRange> list =new ArrayList<>();
+            List<TimeRange> list = new ArrayList<>();
             for (ExperimentRadiationProcess process : radiationProcessList) {
                 String radiationDetail = process.getRadiationDetail();
                 if (StringUtils.isNotBlank(radiationDetail)) {

physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentReviewServiceImpl.java

@@ -2,7 +2,6 @@ package org.jeecg.modules.database.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.jeecg.modules.database.entity.ExperimentReport;
 import org.jeecg.modules.database.entity.ExperimentReview;
 import org.jeecg.modules.database.mapper.ExperimentReviewMapper;
 import org.jeecg.modules.database.service.IExperimentReviewService;
@@ -19,6 +18,6 @@ public class ExperimentReviewServiceImpl extends ServiceImpl<ExperimentReviewMap
 
     @Override
     public ExperimentReview getByExperimentId(String experimentId) {
-        return getOne(new LambdaQueryWrapper<ExperimentReview>().eq(ExperimentReview::getExperimentId, experimentId),false);
+        return getOne(new LambdaQueryWrapper<ExperimentReview>().eq(ExperimentReview::getExperimentId, experimentId), false);
     }
 }

physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/HistoricalDatabaseServiceImpl.java

@@ -0,0 +1,30 @@
+package org.jeecg.modules.database.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.jeecg.modules.database.entity.HistoricalDatabase;
+import org.jeecg.modules.database.mapper.HistoricalDatabaseMapper;
+import org.jeecg.modules.database.service.IHistoricalDatabaseService;
+import org.springframework.stereotype.Service;
+
+import java.util.Optional;
+
+/**
+ * @Description: 历史一期记录
+ * @Author: jeecg-boot
+ * @Date: 2025-02-24
+ * @Version: V1.0
+ */
+@Service
+public class HistoricalDatabaseServiceImpl extends ServiceImpl<HistoricalDatabaseMapper, HistoricalDatabase>
+        implements IHistoricalDatabaseService {
+
+    @Override
+    public Long sumLhs() {
+        return Optional.ofNullable(baseMapper.sumLhs()).orElse(0L);
+    }
+
+    @Override
+    public Long sumXhy() {
+        return Optional.ofNullable(baseMapper.sumLhs()).orElse(0L);
+    }
+}

physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/IrradiationStandardsServiceImpl.java

@@ -13,6 +13,7 @@ import org.springframework.stereotype.Service;
  * @Version: V1.0
  */
 @Service
-public class IrradiationStandardsServiceImpl extends ServiceImpl<IrradiationStandardsMapper, IrradiationStandards> implements IIrradiationStandardsService {
+public class IrradiationStandardsServiceImpl extends ServiceImpl<IrradiationStandardsMapper, IrradiationStandards>
+        implements IIrradiationStandardsService {
 
 }

physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/LocalDatabaseServiceImpl.java

@@ -0,0 +1,28 @@
+package org.jeecg.modules.database.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.jeecg.modules.database.entity.LocalDatabase;
+import org.jeecg.modules.database.mapper.LocalDatabaseMapper;
+import org.jeecg.modules.database.service.ILocalDatabaseService;
+import org.springframework.stereotype.Service;
+
+import java.util.Optional;
+
+/**
+ * @Description: 当期数据库记录
+ * @Author: jeecg-boot
+ * @Date: 2025-02-24
+ * @Version: V1.0
+ */
+@Service
+public class LocalDatabaseServiceImpl extends ServiceImpl<LocalDatabaseMapper, LocalDatabase> implements ILocalDatabaseService {
+    @Override
+    public Long sumLhs() {
+        return Optional.ofNullable(baseMapper.sumLhs()).orElse(0L);
+    }
+
+    @Override
+    public Long sumXhy() {
+        return Optional.ofNullable(baseMapper.sumLhs()).orElse(0L);
+    }
+}

physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/MigrationDataRecordServiceImpl.java

@@ -13,6 +13,7 @@ import org.springframework.stereotype.Service;
  * @Version: V1.0
  */
 @Service
-public class MigrationDataRecordServiceImpl extends ServiceImpl<MigrationDataRecordMapper, MigrationDataRecord> implements IMigrationDataRecordService {
+public class MigrationDataRecordServiceImpl extends ServiceImpl<MigrationDataRecordMapper, MigrationDataRecord>
+        implements IMigrationDataRecordService {
 
 }

physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/uniapp/ExperimentFileForm.vue

@@ -1,101 +0,0 @@
-<template>
-    <view>
-        <!--标题和返回-->
-		<cu-custom :bgColor="NavBarColor" isBack :backRouterName="backRouteName">
-			<block slot="backText">返回</block>
-			<block slot="content">试验文件</block>
-		</cu-custom>
-		 <!--表单区域-->
-		<view>
-			<form>
-              <view class="cu-form-group">
-                <view class="flex align-center">
-                  <view class="title"><text space="ensp">试验ID：</text></view>
-                  <input  placeholder="请输入试验ID" v-model="model.experimentId"/>
-                </view>
-              </view>
-              <view class="cu-form-group">
-                <view class="flex align-center">
-                  <view class="title"><text space="ensp">文件名称：</text></view>
-                  <input  placeholder="请输入文件名称" v-model="model.fileName"/>
-                </view>
-              </view>
-              <view class="cu-form-group">
-                <view class="flex align-center">
-                  <view class="title"><text space="ensp">类型：</text></view>
-                  <input  placeholder="请输入类型" v-model="model.fileType"/>
-                </view>
-              </view>
-              <view class="cu-form-group">
-                <view class="flex align-center">
-                  <view class="title"><text space="ensp">文件链接：</text></view>
-                  <input  placeholder="请输入文件链接" v-model="model.fileUrl"/>
-                </view>
-              </view>
-				<view class="padding">
-					<button class="cu-btn block bg-blue margin-tb-sm lg" @click="onSubmit">
-						<text v-if="loading" class="cuIcon-loading2 cuIconfont-spin"></text>提交
-					</button>
-				</view>
-			</form>
-		</view>
-    </view>
-</template>
-
-<script>
-    import myDate from '@/components/my-componets/my-date.vue'
-
-    export default {
-        name: "ExperimentFileForm",
-        components:{ myDate },
-        props:{
-          formData:{
-              type:Object,
-              default:()=>{},
-              required:false
-          }
-        },
-        data(){
-            return {
-				CustomBar: this.CustomBar,
-				NavBarColor: this.NavBarColor,
-				loading:false,
-                model: {},
-                backRouteName:'index',
-                url: {
-                  queryById: "/database/experimentFile/queryById",
-                  add: "/database/experimentFile/add",
-                  edit: "/database/experimentFile/edit",
-                },
-            }
-        },
-        created(){
-             this.initFormData();
-        },
-        methods:{
-           initFormData(){
-               if(this.formData){
-                    let dataId = this.formData.dataId;
-                    this.$http.get(this.url.queryById,{params:{id:dataId}}).then((res)=>{
-                        if(res.data.success){
-                            console.log("表单数据",res);
-                            this.model = res.data.result;
-                        }
-                    })
-                }
-            },
-            onSubmit() {
-                let myForm = {...this.model};
-                this.loading = true;
-                let url = myForm.id?this.url.edit:this.url.add;
-				this.$http.post(url,myForm).then(res=>{
-				   console.log("res",res)
-				   this.loading = false
-				   this.$Router.push({name:this.backRouteName})
-				}).catch(()=>{
-					this.loading = false
-				});
-            }
-        }
-    }
-</script>

physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/uniapp/ExperimentFileList.vue

@@ -1,44 +0,0 @@
-<template>
-	<view>
-	   <!--标题和返回-->
-		<cu-custom :bgColor="NavBarColor" isBack>
-			<block slot="backText">返回</block>
-			<block slot="content">试验文件</block>
-		</cu-custom>
-		<!--滚动加载列表-->
-		<mescroll-body ref="mescrollRef" bottom="88"  @init="mescrollInit" :up="upOption" :down="downOption" @down="downCallback" @up="upCallback">
-		    <view class="cu-list menu">
-				<view class="cu-item" v-for="(item,index) in list" :key="index" @click="goHome">
-					<view class="flex" style="width:100%">
-                        <text class="text-lg" style="color: #000;">
-                             {{ item.createBy}}
-                        </text>
-					</view>
-				</view>
-			</view>
-		</mescroll-body>
-	</view>
-</template>
-
-<script>
-	import MescrollMixin from "@/components/mescroll-uni/mescroll-mixins.js";
-	import Mixin from "@/common/mixin/Mixin.js";
-
-	export default {
-		name: '试验文件',
-		mixins: [MescrollMixin,Mixin],
-		data() {
-			return {
-				CustomBar:this.CustomBar,
-				NavBarColor:this.NavBarColor,
-				url: "/database/experimentFile/list",
-			};
-		},
-		methods: {
-			goHome(){
-                this.$Router.push({name: "index"})
-			}
-		}
-	}
-</script>
-

physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/vue3/ExperimentFile.api.ts

@@ -1,64 +0,0 @@
-import {defHttp} from '/@/utils/http/axios';
-import { useMessage } from "/@/hooks/web/useMessage";
-
-const { createConfirm } = useMessage();
-
-enum Api {
-  list = '/database/experimentFile/list',
-  save='/database/experimentFile/add',
-  edit='/database/experimentFile/edit',
-  deleteOne = '/database/experimentFile/delete',
-  deleteBatch = '/database/experimentFile/deleteBatch',
-  importExcel = '/database/experimentFile/importExcel',
-  exportXls = '/database/experimentFile/exportXls',
-}
-/**
- * 导出api
- * @param params
- */
-export const getExportUrl = Api.exportXls;
-/**
- * 导入api
- */
-export const getImportUrl = Api.importExcel;
-/**
- * 列表接口
- * @param params
- */
-export const list = (params) =>
-  defHttp.get({url: Api.list, params});
-
-/**
- * 删除单个
- */
-export const deleteOne = (params,handleSuccess) => {
-  return defHttp.delete({url: Api.deleteOne, params}, {joinParamsToUrl: true}).then(() => {
-    handleSuccess();
-  });
-}
-/**
- * 批量删除
- * @param params
- */
-export const batchDelete = (params, handleSuccess) => {
-  createConfirm({
-    iconType: 'warning',
-    title: '确认删除',
-    content: '是否删除选中数据',
-    okText: '确认',
-    cancelText: '取消',
-    onOk: () => {
-      return defHttp.delete({url: Api.deleteBatch, data: params}, {joinParamsToUrl: true}).then(() => {
-        handleSuccess();
-      });
-    }
-  });
-}
-/**
- * 保存或者更新
- * @param params
- */
-export const saveOrUpdate = (params, isUpdate) => {
-  let url = isUpdate ? Api.edit : Api.save;
-  return defHttp.post({url: url, params});
-}

physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/vue3/ExperimentFile.data.ts

@@ -1,78 +0,0 @@
-import {BasicColumn} from '/@/components/Table';
-import {FormSchema} from '/@/components/Table';
-import { rules} from '/@/utils/helper/validator';
-import { render } from '/@/utils/common/renderUtils';
-import { getWeekMonthQuarterYear } from '/@/utils';
-//列表数据
-export const columns: BasicColumn[] = [
-   {
-    title: '试验ID',
-    align:"center",
-    dataIndex: 'experimentId'
-   },
-   {
-    title: '文件名称',
-    align:"center",
-    dataIndex: 'fileName'
-   },
-   {
-    title: '类型',
-    align:"center",
-    dataIndex: 'fileType'
-   },
-   {
-    title: '文件链接',
-    align:"center",
-    dataIndex: 'fileUrl'
-   },
-];
-//查询数据
-export const searchFormSchema: FormSchema[] = [
-];
-//表单数据
-export const formSchema: FormSchema[] = [
-  {
-    label: '试验ID',
-    field: 'experimentId',
-    component: 'Input',
-  },
-  {
-    label: '文件名称',
-    field: 'fileName',
-    component: 'Input',
-  },
-  {
-    label: '类型',
-    field: 'fileType',
-    component: 'Input',
-  },
-  {
-    label: '文件链接',
-    field: 'fileUrl',
-    component: 'Input',
-  },
-	// TODO 主键隐藏字段，目前写死为ID
-	{
-	  label: '',
-	  field: 'id',
-	  component: 'Input',
-	  show: false
-	},
-];
-
-// 高级查询数据
-export const superQuerySchema = {
-  experimentId: {title: '试验ID',order: 0,view: 'text', type: 'string',},
-  fileName: {title: '文件名称',order: 1,view: 'text', type: 'string',},
-  fileType: {title: '类型',order: 2,view: 'text', type: 'string',},
-  fileUrl: {title: '文件链接',order: 3,view: 'text', type: 'string',},
-};
-
-/**
-* 流程表单调用这个方法获取formSchema
-* @param param
-*/
-export function getBpmFormSchema(_formData): FormSchema[]{
-  // 默认和原始表单保持一致 如果流程中配置了权限数据，这里需要单独处理formSchema
-  return formSchema;
-}

physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/vue3/ExperimentFileList.vue

@@ -1,188 +0,0 @@
-<template>
-  <div>
-    <!--引用表格-->
-   <BasicTable @register="registerTable" :rowSelection="rowSelection">
-     <!--插槽:table标题-->
-      <template #tableTitle>
-          <a-button type="primary" @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增</a-button>
-          <a-button  type="primary" preIcon="ant-design:export-outlined" @click="onExportXls"> 导出</a-button>
-          <j-upload-button  type="primary" preIcon="ant-design:import-outlined" @click="onImportXls">导入</j-upload-button>
-          <a-dropdown v-if="selectedRowKeys.length > 0">
-              <template #overlay>
-                <a-menu>
-                  <a-menu-item key="1" @click="batchHandleDelete">
-                    <Icon icon="ant-design:delete-outlined"></Icon>
-                    删除
-                  </a-menu-item>
-                </a-menu>
-              </template>
-              <a-button>批量操作
-                <Icon icon="mdi:chevron-down"></Icon>
-              </a-button>
-        </a-dropdown>
-        <!-- 高级查询 -->
-        <super-query :config="superQueryConfig" @search="handleSuperQuery" />
-      </template>
-       <!--操作栏-->
-      <template #action="{ record }">
-        <TableAction :actions="getTableAction(record)" :dropDownActions="getDropDownAction(record)"/>
-      </template>
-      <!--字段回显插槽-->
-      <template v-slot:bodyCell="{ column, record, index, text }">
-      </template>
-    </BasicTable>
-    <!-- 表单区域 -->
-    <ExperimentFileModal @register="registerModal" @success="handleSuccess"></ExperimentFileModal>
-  </div>
-</template>
-
-<script lang="ts" name="database-experimentFile" setup>
-  import {ref, reactive, computed, unref} from 'vue';
-  import {BasicTable, useTable, TableAction} from '/@/components/Table';
-  import {useModal} from '/@/components/Modal';
-  import { useListPage } from '/@/hooks/system/useListPage'
-  import ExperimentFileModal from './components/ExperimentFileModal.vue'
-  import {columns, searchFormSchema, superQuerySchema} from './ExperimentFile.data';
-  import {list, deleteOne, batchDelete, getImportUrl,getExportUrl} from './ExperimentFile.api';
-  import { downloadFile } from '/@/utils/common/renderUtils';
-  import { useUserStore } from '/@/store/modules/user';
-  const queryParam = reactive<any>({});
-  const checkedKeys = ref<Array<string | number>>([]);
-  const userStore = useUserStore();
-  //注册model
-  const [registerModal, {openModal}] = useModal();
-  //注册table数据
-  const { prefixCls,tableContext,onExportXls,onImportXls } = useListPage({
-      tableProps:{
-           title: '试验文件',
-           api: list,
-           columns,
-           canResize:false,
-           formConfig: {
-              //labelWidth: 120,
-              schemas: searchFormSchema,
-              autoSubmitOnEnter:true,
-              showAdvancedButton:true,
-              fieldMapToNumber: [
-              ],
-              fieldMapToTime: [
-              ],
-            },
-           actionColumn: {
-               width: 120,
-               fixed:'right'
-            },
-            beforeFetch: (params) => {
-              return Object.assign(params, queryParam);
-            },
-      },
-       exportConfig: {
-            name:"试验文件",
-            url: getExportUrl,
-            params: queryParam,
-          },
-          importConfig: {
-            url: getImportUrl,
-            success: handleSuccess
-          },
-  })
-
-  const [registerTable, {reload},{ rowSelection, selectedRowKeys }] = tableContext
-
-  // 高级查询配置
-  const superQueryConfig = reactive(superQuerySchema);
-
-  /**
-   * 高级查询事件
-   */
-  function handleSuperQuery(params) {
-    Object.keys(params).map((k) => {
-      queryParam[k] = params[k];
-    });
-    reload();
-  }
-   /**
-    * 新增事件
-    */
-  function handleAdd() {
-     openModal(true, {
-       isUpdate: false,
-       showFooter: true,
-     });
-  }
-   /**
-    * 编辑事件
-    */
-  function handleEdit(record: Recordable) {
-     openModal(true, {
-       record,
-       isUpdate: true,
-       showFooter: true,
-     });
-   }
-   /**
-    * 详情
-   */
-  function handleDetail(record: Recordable) {
-     openModal(true, {
-       record,
-       isUpdate: true,
-       showFooter: false,
-     });
-   }
-   /**
-    * 删除事件
-    */
-  async function handleDelete(record) {
-     await deleteOne({id: record.id}, handleSuccess);
-   }
-   /**
-    * 批量删除事件
-    */
-  async function batchHandleDelete() {
-     await batchDelete({ids: selectedRowKeys.value}, handleSuccess);
-   }
-   /**
-    * 成功回调
-    */
-  function handleSuccess() {
-      (selectedRowKeys.value = []) && reload();
-   }
-   /**
-      * 操作栏
-      */
-  function getTableAction(record){
-       return [
-         {
-           label: '编辑',
-           onClick: handleEdit.bind(null, record),
-         }
-       ]
-   }
-     /**
-        * 下拉操作栏
-        */
-  function getDropDownAction(record){
-       return [
-         {
-           label: '详情',
-           onClick: handleDetail.bind(null, record),
-         }, {
-           label: '删除',
-           popConfirm: {
-             title: '是否确认删除',
-             confirm: handleDelete.bind(null, record),
-             placement: 'topLeft',
-           }
-         }
-       ]
-   }
-
-
-</script>
-
-<style scoped>
-  :deep(.ant-picker),:deep(.ant-input-number){
-    width: 100%;
-  }
-</style>

physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/vue3/V20241209_1__menu_insert_ExperimentFile.sql

@@ -1,26 +0,0 @@
--- 注意：该页面对应的前台目录为views/database文件夹下
--- 如果你想更改到其他目录，请修改sql中component字段对应的值
-
-
-INSERT INTO sys_permission(id, parent_id, name, url, component, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_route, is_leaf, keep_alive, hidden, hide_tab, description, status, del_flag, rule_flag, create_by, create_time, update_by, update_time, internal_or_external) 
-VALUES ('2024120903338100040', NULL, '试验文件', '/database/experimentFileList', 'database/ExperimentFileList', NULL, NULL, 0, NULL, '1', 0.00, 0, NULL, 1, 0, 0, 0, 0, NULL, '1', 0, 0, 'admin', '2024-12-09 15:33:04', NULL, NULL, 0);
-
--- 权限控制sql
--- 新增
-INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
-VALUES ('2024120903338100041', '2024120903338100040', '添加试验文件', NULL, NULL, 0, NULL, NULL, 2, 'database:experiment_file:add', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2024-12-09 15:33:04', NULL, NULL, 0, 0, '1', 0);
--- 编辑
-INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
-VALUES ('2024120903338100042', '2024120903338100040', '编辑试验文件', NULL, NULL, 0, NULL, NULL, 2, 'database:experiment_file:edit', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2024-12-09 15:33:04', NULL, NULL, 0, 0, '1', 0);
--- 删除
-INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
-VALUES ('2024120903338100043', '2024120903338100040', '删除试验文件', NULL, NULL, 0, NULL, NULL, 2, 'database:experiment_file:delete', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2024-12-09 15:33:04', NULL, NULL, 0, 0, '1', 0);
--- 批量删除
-INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
-VALUES ('2024120903338100044', '2024120903338100040', '批量删除试验文件', NULL, NULL, 0, NULL, NULL, 2, 'database:experiment_file:deleteBatch', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2024-12-09 15:33:04', NULL, NULL, 0, 0, '1', 0);
--- 导出excel
-INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
-VALUES ('2024120903338100045', '2024120903338100040', '导出excel_试验文件', NULL, NULL, 0, NULL, NULL, 2, 'database:experiment_file:exportXls', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2024-12-09 15:33:04', NULL, NULL, 0, 0, '1', 0);
--- 导入excel
-INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
-VALUES ('2024120903338100046', '2024120903338100040', '导入excel_试验文件', NULL, NULL, 0, NULL, NULL, 2, 'database:experiment_file:importExcel', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2024-12-09 15:33:04', NULL, NULL, 0, 0, '1', 0);

physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/vue3/components/ExperimentFileForm.vue

@@ -1,70 +0,0 @@
-<template>
-    <div style="min-height: 400px">
-        <BasicForm @register="registerForm"></BasicForm>
-        <div style="width: 100%;text-align: center" v-if="!formDisabled">
-            <a-button @click="submitForm" pre-icon="ant-design:check" type="primary">提 交</a-button>
-        </div>
-    </div>
-</template>
-
-<script lang="ts">
-    import {BasicForm, useForm} from '/@/components/Form/index';
-    import {computed, defineComponent} from 'vue';
-    import {defHttp} from '/@/utils/http/axios';
-    import { propTypes } from '/@/utils/propTypes';
-    import {getBpmFormSchema} from '../ExperimentFile.data';
-    import {saveOrUpdate} from '../ExperimentFile.api';
-    
-    export default defineComponent({
-        name: "ExperimentFileForm",
-        components:{
-            BasicForm
-        },
-        props:{
-            formData: propTypes.object.def({}),
-            formBpm: propTypes.bool.def(true),
-        },
-        setup(props){
-            const [registerForm, { setFieldsValue, setProps, getFieldsValue }] = useForm({
-                labelWidth: 150,
-                schemas: getBpmFormSchema(props.formData),
-                showActionButtonGroup: false,
-                baseColProps: {span: 24}
-            });
-
-            const formDisabled = computed(()=>{
-                if(props.formData.disabled === false){
-                    return false;
-                }
-                return true;
-            });
-
-            let formData = {};
-            const queryByIdUrl = '/database/experimentFile/queryById';
-            async function initFormData(){
-                let params = {id: props.formData.dataId};
-                const data = await defHttp.get({url: queryByIdUrl, params});
-                formData = {...data}
-                //设置表单的值
-                await setFieldsValue(formData);
-                //默认是禁用
-                await setProps({disabled: formDisabled.value})
-            }
-
-            async function submitForm() {
-                let data = getFieldsValue();
-                let params = Object.assign({}, formData, data);
-                console.log('表单数据', params)
-                await saveOrUpdate(params, true)
-            }
-
-            initFormData();
-            
-            return {
-                registerForm,
-                formDisabled,
-                submitForm,
-            }
-        }
-    });
-</script>

physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/vue3/components/ExperimentFileModal.vue

@@ -1,68 +0,0 @@
-<template>
-  <BasicModal v-bind="$attrs" @register="registerModal" destroyOnClose :title="title" :width="800" @ok="handleSubmit">
-      <BasicForm @register="registerForm"/>
-  </BasicModal>
-</template>
-
-<script lang="ts" setup>
-    import {ref, computed, unref} from 'vue';
-    import {BasicModal, useModalInner} from '/@/components/Modal';
-    import {BasicForm, useForm} from '/@/components/Form/index';
-    import {formSchema} from '../ExperimentFile.data';
-    import {saveOrUpdate} from '../ExperimentFile.api';
-    // Emits声明
-    const emit = defineEmits(['register','success']);
-    const isUpdate = ref(true);
-    const isDetail = ref(false);
-    //表单配置
-    const [registerForm, {setProps,resetFields, setFieldsValue, validate}] = useForm({
-        //labelWidth: 150,
-        schemas: formSchema,
-        showActionButtonGroup: false,
-        baseColProps: {span: 24}
-    });
-    //表单赋值
-    const [registerModal, {setModalProps, closeModal}] = useModalInner(async (data) => {
-        //重置表单
-        await resetFields();
-        setModalProps({confirmLoading: false,showCancelBtn:!!data?.showFooter,showOkBtn:!!data?.showFooter});
-        isUpdate.value = !!data?.isUpdate;
-        isDetail.value = !!data?.showFooter;
-        if (unref(isUpdate)) {
-            //表单赋值
-            await setFieldsValue({
-                ...data.record,
-            });
-        }
-        // 隐藏底部时禁用整个表单
-       setProps({ disabled: !data?.showFooter })
-    });
-    //设置标题
-    const title = computed(() => (!unref(isUpdate) ? '新增' : !unref(isDetail) ? '详情' : '编辑'));
-    //表单提交事件
-    async function handleSubmit(v) {
-        try {
-            let values = await validate();
-            setModalProps({confirmLoading: true});
-            //提交表单
-            await saveOrUpdate(values, isUpdate.value);
-            //关闭弹窗
-            closeModal();
-            //刷新列表
-            emit('success');
-        } finally {
-            setModalProps({confirmLoading: false});
-        }
-    }
-</script>
-
-<style lang="less" scoped>
-	/** 时间和数字输入框样式 */
-  :deep(.ant-input-number) {
-    width: 100%;
-  }
-
-  :deep(.ant-calendar-picker) {
-    width: 100%;
-  }
-</style>