From c757b5189d668f21d6db053376bfb93fda3df8b4 Mon Sep 17 00:00:00 2001 From: ls Date: Mon, 24 Feb 2025 10:27:02 +0800 Subject: [PATCH] update --- .../controller/CnasTestController.java | 2 +- .../controller/ComponentController.java | 2 +- .../DocumentFavoritesController.java | 4 +- .../controller/EquipmentController.java | 2 +- .../ExperimentAnnealProcessController.java | 2 +- .../controller/ExperimentController.java | 35 ++- ...xperimentDeviationConditionController.java | 280 +++++++++--------- ...xperimentDeviationEquipmentController.java | 280 +++++++++--------- .../controller/ExperimentDocController.java | 2 +- .../ExperimentIrradiationBoardController.java | 277 ++++++++--------- .../controller/ExperimentLogController.java | 2 +- .../ExperimentRatingController.java | 2 +- .../ExperimentReviewController.java | 2 +- .../ExperimentSequenceController.java | 6 - .../HistoricalDatabaseController.java | 185 ++++++++++++ .../IrradiationStandardsController.java | 2 +- .../controller/LocalDatabaseController.java | 185 ++++++++++++ .../MigrationDataRecordController.java | 2 +- .../controller/NasaDataRecordController.java | 21 +- .../database/dto/ExperimentRatingUserDTO.java | 4 +- .../database/dto/NasaDataRecordPage.java | 10 +- .../modules/database/enhance/RateEnhance.java | 2 +- .../jeecg/modules/database/entity/Client.java | 8 +- .../modules/database/entity/CnasTest.java | 10 +- .../modules/database/entity/Component.java | 8 +- .../database/entity/DocumentFavorites.java | 8 +- .../database/entity/DocumentLibrary.java | 12 +- .../modules/database/entity/Equipment.java | 8 +- .../modules/database/entity/Experiment.java | 13 - .../database/entity/ExperimentDoc.java | 8 +- .../database/entity/ExperimentFile.java | 85 +++--- .../database/entity/ExperimentLog.java | 8 +- .../database/entity/ExperimentRating.java | 16 +- .../database/entity/ExperimentReview.java | 8 +- .../database/entity/HistoricalDatabase.java | 118 ++++++++ .../database/entity/LocalDatabase.java | 133 +++++++++ .../database/entity/MigrationDataRecord.java | 8 +- .../modules/database/entity/RadiateType.java | 8 +- .../mapper/DocumentVisitHistoryMapper.java | 7 +- .../ExperimentDeviationConditionMapper.java | 7 +- .../ExperimentDeviationEquipmentMapper.java | 7 +- .../database/mapper/ExperimentFileMapper.java | 7 +- .../ExperimentIrradiationBoardMapper.java | 7 +- .../mapper/ExperimentRatingMapper.java | 7 +- .../mapper/ExperimentSampleInfoMapper.java | 7 +- .../mapper/ExperimentSequenceMapper.java | 7 +- .../mapper/HistoricalDatabaseMapper.java | 21 ++ .../database/mapper/LocalDatabaseMapper.java | 19 ++ .../database/mapper/NasaDataRecordMapper.java | 2 +- .../mapper/xml/HistoricalDatabaseMapper.xml | 5 + .../mapper/xml/LocalDatabaseMapper.xml | 5 + .../service/IDocumentFavoritesService.java | 3 +- .../service/IDocumentVisitHistoryService.java | 4 +- .../IExperimentDeviationConditionService.java | 5 +- .../IExperimentDeviationEquipmentService.java | 5 +- .../service/IExperimentDocService.java | 5 +- .../IExperimentIrradiationBoardService.java | 5 +- .../service/IExperimentLogService.java | 1 - .../IExperimentRadiationProcessService.java | 1 - .../service/IExperimentRatingService.java | 4 +- .../service/IExperimentReviewService.java | 1 - .../service/IExperimentSampleInfoService.java | 4 +- .../service/IExperimentSequenceService.java | 4 +- .../IExperimentTestProcessService.java | 1 - .../service/IHistoricalDatabaseService.java | 16 + .../service/ILocalDatabaseService.java | 16 + .../impl/DocumentLibraryServiceImpl.java | 4 +- .../impl/ExperimentDocServiceImpl.java | 146 +++++---- ...ExperimentIrradiationBoardServiceImpl.java | 9 +- ...ExperimentRadiationProcessServiceImpl.java | 2 +- .../impl/ExperimentReviewServiceImpl.java | 3 +- .../impl/HistoricalDatabaseServiceImpl.java | 30 ++ .../impl/IrradiationStandardsServiceImpl.java | 3 +- .../impl/LocalDatabaseServiceImpl.java | 28 ++ .../impl/MigrationDataRecordServiceImpl.java | 3 +- .../database/uniapp/ExperimentFileForm.vue | 101 ------- .../database/uniapp/ExperimentFileList.vue | 44 --- .../database/vue3/ExperimentFile.api.ts | 64 ---- .../database/vue3/ExperimentFile.data.ts | 78 ----- .../database/vue3/ExperimentFileList.vue | 188 ------------ ...20241209_1__menu_insert_ExperimentFile.sql | 26 -- .../vue3/components/ExperimentFileForm.vue | 70 ----- .../vue3/components/ExperimentFileModal.vue | 68 ----- 83 files changed, 1421 insertions(+), 1397 deletions(-) create mode 100644 physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/HistoricalDatabaseController.java create mode 100644 physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/LocalDatabaseController.java create mode 100644 physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/entity/HistoricalDatabase.java create mode 100644 physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/entity/LocalDatabase.java create mode 100644 physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/mapper/HistoricalDatabaseMapper.java create mode 100644 physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/mapper/LocalDatabaseMapper.java create mode 100644 physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/mapper/xml/HistoricalDatabaseMapper.xml create mode 100644 physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/mapper/xml/LocalDatabaseMapper.xml create mode 100644 physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/IHistoricalDatabaseService.java create mode 100644 physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/ILocalDatabaseService.java create mode 100644 physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/HistoricalDatabaseServiceImpl.java create mode 100644 physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/LocalDatabaseServiceImpl.java delete mode 100644 physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/uniapp/ExperimentFileForm.vue delete mode 100644 physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/uniapp/ExperimentFileList.vue delete mode 100644 physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/vue3/ExperimentFile.api.ts delete mode 100644 physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/vue3/ExperimentFile.data.ts delete mode 100644 physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/vue3/ExperimentFileList.vue delete mode 100644 physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/vue3/V20241209_1__menu_insert_ExperimentFile.sql delete mode 100644 physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/vue3/components/ExperimentFileForm.vue delete mode 100644 physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/vue3/components/ExperimentFileModal.vue diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/CnasTestController.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/CnasTestController.java index 2274ce7..2f8ad95 100644 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/CnasTestController.java +++ b/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 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 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); - } - /** * 审核 * diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentDeviationConditionController.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentDeviationConditionController.java index f8150dd..88bd4ea 100644 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentDeviationConditionController.java +++ b/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 { - @Autowired - private IExperimentDeviationConditionService experimentDeviationConditionService; - - /** - * 分页列表查询 - * - * @param experimentDeviationCondition - * @param pageNo - * @param pageSize - * @param req - * @return - */ - //@AutoLog(value = "试验偏置条件信息-分页列表查询") - @Operation(summary="试验偏置条件信息-分页列表查询") - @GetMapping(value = "/list") - public Result> queryPageList(ExperimentDeviationCondition experimentDeviationCondition, - @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, - @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, - HttpServletRequest req) { - QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(experimentDeviationCondition, req.getParameterMap()); - Page page = new Page(pageNo, pageSize); - IPage 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 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 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 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 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 queryById(@RequestParam(name="id",required=true) String id) { - ExperimentDeviationCondition experimentDeviationCondition = experimentDeviationConditionService.getById(id); - if(experimentDeviationCondition==null) { - return Result.error("未找到对应数据"); - } - return Result.OK(experimentDeviationCondition); - } +public class ExperimentDeviationConditionController + extends JeecgController { + @Autowired + private IExperimentDeviationConditionService experimentDeviationConditionService; /** - * 导出excel - * - * @param request - * @param experimentDeviationCondition - */ - + * 分页列表查询 + * + * @param experimentDeviationCondition + * @param pageNo + * @param pageSize + * @param req + * @return + */ + //@AutoLog(value = "试验偏置条件信息-分页列表查询") + @Operation(summary = "试验偏置条件信息-分页列表查询") + @GetMapping(value = "/list") + public Result> queryPageList(ExperimentDeviationCondition experimentDeviationCondition, + @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, + @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(experimentDeviationCondition, + req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage 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 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 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 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 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 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导入数据 - * - * @param request - * @param response - * @return - */ + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ @RequiresPermissions("database:experiment_deviation_condition:add") @RequestMapping(value = "/importExcel", method = RequestMethod.POST) public Result importExcel(HttpServletRequest request, HttpServletResponse response) { diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentDeviationEquipmentController.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentDeviationEquipmentController.java index 4e7936f..54c1aa3 100644 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentDeviationEquipmentController.java +++ b/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 { - @Autowired - private IExperimentDeviationEquipmentService experimentDeviationEquipmentService; - - /** - * 分页列表查询 - * - * @param experimentDeviationEquipment - * @param pageNo - * @param pageSize - * @param req - * @return - */ - //@AutoLog(value = "试验加偏设备信息-分页列表查询") - @Operation(summary="试验加偏设备信息-分页列表查询") - @GetMapping(value = "/list") - public Result> queryPageList(ExperimentDeviationEquipment experimentDeviationEquipment, - @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, - @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, - HttpServletRequest req) { - QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(experimentDeviationEquipment, req.getParameterMap()); - Page page = new Page(pageNo, pageSize); - IPage 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 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 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 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 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 queryById(@RequestParam(name="id",required=true) String id) { - ExperimentDeviationEquipment experimentDeviationEquipment = experimentDeviationEquipmentService.getById(id); - if(experimentDeviationEquipment==null) { - return Result.error("未找到对应数据"); - } - return Result.OK(experimentDeviationEquipment); - } +public class ExperimentDeviationEquipmentController + extends JeecgController { + @Autowired + private IExperimentDeviationEquipmentService experimentDeviationEquipmentService; /** - * 导出excel - * - * @param request - * @param experimentDeviationEquipment - */ - + * 分页列表查询 + * + * @param experimentDeviationEquipment + * @param pageNo + * @param pageSize + * @param req + * @return + */ + //@AutoLog(value = "试验加偏设备信息-分页列表查询") + @Operation(summary = "试验加偏设备信息-分页列表查询") + @GetMapping(value = "/list") + public Result> queryPageList(ExperimentDeviationEquipment experimentDeviationEquipment, + @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, + @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(experimentDeviationEquipment, + req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage 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 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 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 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 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 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导入数据 - * - * @param request - * @param response - * @return - */ + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ @RequiresPermissions("database:experiment_deviation_equipment:add") @RequestMapping(value = "/importExcel", method = RequestMethod.POST) public Result importExcel(HttpServletRequest request, HttpServletResponse response) { diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentDocController.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentDocController.java index 68e10e5..287177a 100755 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentDocController.java +++ b/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 { - @Autowired - private IExperimentIrradiationBoardService experimentIrradiationBoardService; - - /** - * 分页列表查询 - * - * @param experimentIrradiationBoard - * @param pageNo - * @param pageSize - * @param req - * @return - */ - //@AutoLog(value = "试验辐照板信息-分页列表查询") - @Operation(summary="试验辐照板信息-分页列表查询") - @GetMapping(value = "/list") - public Result> queryPageList(ExperimentIrradiationBoard experimentIrradiationBoard, - @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, - @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, - HttpServletRequest req) { - QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(experimentIrradiationBoard, req.getParameterMap()); - Page page = new Page(pageNo, pageSize); - IPage 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 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 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 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 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 queryById(@RequestParam(name="id",required=true) String id) { - ExperimentIrradiationBoard experimentIrradiationBoard = experimentIrradiationBoardService.getById(id); - if(experimentIrradiationBoard==null) { - return Result.error("未找到对应数据"); - } - return Result.OK(experimentIrradiationBoard); - } + @Autowired + private IExperimentIrradiationBoardService experimentIrradiationBoardService; /** - * 导出excel - * - * @param request - * @param experimentIrradiationBoard - */ - + * 分页列表查询 + * + * @param experimentIrradiationBoard + * @param pageNo + * @param pageSize + * @param req + * @return + */ + //@AutoLog(value = "试验辐照板信息-分页列表查询") + @Operation(summary = "试验辐照板信息-分页列表查询") + @GetMapping(value = "/list") + public Result> queryPageList(ExperimentIrradiationBoard experimentIrradiationBoard, + @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, + @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(experimentIrradiationBoard, + req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage 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 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 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 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 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 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导入数据 - * - * @param request - * @param response - * @return - */ + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ @RequiresPermissions("database:experiment_irradiation_board:add") @RequestMapping(value = "/importExcel", method = RequestMethod.POST) public Result importExcel(HttpServletRequest request, HttpServletResponse response) { diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentLogController.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentLogController.java index fa20614..37160fb 100755 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentLogController.java +++ b/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 { + @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> queryPageList(HistoricalDatabase historicalDatabase, + @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, + @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(historicalDatabase, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage 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 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 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 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 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 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 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); + } +} diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/IrradiationStandardsController.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/IrradiationStandardsController.java index 2c7bf84..261d248 100755 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/IrradiationStandardsController.java +++ b/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 { + @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> queryPageList(LocalDatabase localDatabase, + @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, + @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(localDatabase, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage 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 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 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 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 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 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 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); + } +} diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/MigrationDataRecordController.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/MigrationDataRecordController.java index a774a04..c28240f 100644 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/MigrationDataRecordController.java +++ b/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 { @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 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) diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/entity/ExperimentDoc.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/entity/ExperimentDoc.java index 219512b..47ea260 100755 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/entity/ExperimentDoc.java +++ b/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.TableId; -import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.*; 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; /** * 所属部门 */ diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/entity/ExperimentFile.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/entity/ExperimentFile.java index 8497f84..edf009f 100644 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/entity/ExperimentFile.java +++ b/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 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.baomidou.mybatisplus.annotation.*; 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; } diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/entity/ExperimentLog.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/entity/ExperimentLog.java index fc906f3..dd81fab 100755 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/entity/ExperimentLog.java +++ b/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.TableId; -import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.*; 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; /** * 所属部门 */ diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/entity/ExperimentRating.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/entity/ExperimentRating.java index 7908331..6907921 100644 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/entity/ExperimentRating.java +++ b/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; /** * 总分数 */ diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/entity/ExperimentReview.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/entity/ExperimentReview.java index 6e90856..43f7036 100644 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/entity/ExperimentReview.java +++ b/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.TableId; -import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.*; 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; /** * 所属部门 */ diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/entity/HistoricalDatabase.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/entity/HistoricalDatabase.java new file mode 100644 index 0000000..3711a03 --- /dev/null +++ b/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; +} diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/entity/LocalDatabase.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/entity/LocalDatabase.java new file mode 100644 index 0000000..0ca2453 --- /dev/null +++ b/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; + +} diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/entity/MigrationDataRecord.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/entity/MigrationDataRecord.java index 7ec2511..ba60494 100644 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/entity/MigrationDataRecord.java +++ b/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.TableId; -import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.*; 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; /** * 所属部门 */ diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/entity/RadiateType.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/entity/RadiateType.java index e307345..ae22dd1 100755 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/entity/RadiateType.java +++ b/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.TableId; -import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.*; 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; /** * 所属部门 */ diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/mapper/DocumentVisitHistoryMapper.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/mapper/DocumentVisitHistoryMapper.java index fe563a6..bbdb51e 100644 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/mapper/DocumentVisitHistoryMapper.java +++ b/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 { diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/mapper/ExperimentDeviationConditionMapper.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/mapper/ExperimentDeviationConditionMapper.java index 951ebbe..d893071 100644 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/mapper/ExperimentDeviationConditionMapper.java +++ b/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 { diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/mapper/ExperimentDeviationEquipmentMapper.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/mapper/ExperimentDeviationEquipmentMapper.java index dde2386..4b2ce9a 100644 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/mapper/ExperimentDeviationEquipmentMapper.java +++ b/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 { diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/mapper/ExperimentFileMapper.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/mapper/ExperimentFileMapper.java index 7a3d066..99740ee 100644 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/mapper/ExperimentFileMapper.java +++ b/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 { diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/mapper/ExperimentIrradiationBoardMapper.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/mapper/ExperimentIrradiationBoardMapper.java index e5cae72..2da48f2 100644 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/mapper/ExperimentIrradiationBoardMapper.java +++ b/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 { diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/mapper/ExperimentRatingMapper.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/mapper/ExperimentRatingMapper.java index 0ebb0a5..0cf11e2 100644 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/mapper/ExperimentRatingMapper.java +++ b/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 { diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/mapper/ExperimentSampleInfoMapper.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/mapper/ExperimentSampleInfoMapper.java index b09644a..57114a7 100644 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/mapper/ExperimentSampleInfoMapper.java +++ b/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 { diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/mapper/ExperimentSequenceMapper.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/mapper/ExperimentSequenceMapper.java index 944c46c..1976942 100644 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/mapper/ExperimentSequenceMapper.java +++ b/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 { diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/mapper/HistoricalDatabaseMapper.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/mapper/HistoricalDatabaseMapper.java new file mode 100644 index 0000000..7f9af99 --- /dev/null +++ b/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 { + + @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(); + +} diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/mapper/LocalDatabaseMapper.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/mapper/LocalDatabaseMapper.java new file mode 100644 index 0000000..ec9e6ab --- /dev/null +++ b/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 { + @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(); +} diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/mapper/NasaDataRecordMapper.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/mapper/NasaDataRecordMapper.java index bea27a8..071874f 100644 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/mapper/NasaDataRecordMapper.java +++ b/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 { @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(); } diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/mapper/xml/HistoricalDatabaseMapper.xml b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/mapper/xml/HistoricalDatabaseMapper.xml new file mode 100644 index 0000000..4f27377 --- /dev/null +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/mapper/xml/HistoricalDatabaseMapper.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/mapper/xml/LocalDatabaseMapper.xml b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/mapper/xml/LocalDatabaseMapper.xml new file mode 100644 index 0000000..b360c27 --- /dev/null +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/mapper/xml/LocalDatabaseMapper.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/IDocumentFavoritesService.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/IDocumentFavoritesService.java index 674ca6d..64a8380 100755 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/IDocumentFavoritesService.java +++ b/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 { List getTopFavoritesByUserId(String userId); - DocumentFavorites getByDocIdAndUserId(String userId,String documentId); + + DocumentFavorites getByDocIdAndUserId(String userId, String documentId); void removeByDocId(String documentId); diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/IDocumentVisitHistoryService.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/IDocumentVisitHistoryService.java index 84c614a..6f9463b 100644 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/IDocumentVisitHistoryService.java +++ b/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 { diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/IExperimentDeviationConditionService.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/IExperimentDeviationConditionService.java index 706d8e1..3f73248 100644 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/IExperimentDeviationConditionService.java +++ b/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 { diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/IExperimentDeviationEquipmentService.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/IExperimentDeviationEquipmentService.java index 2420b05..0e86000 100644 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/IExperimentDeviationEquipmentService.java +++ b/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 { diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/IExperimentDocService.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/IExperimentDocService.java index 54b55c4..b4cc8ca 100755 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/IExperimentDocService.java +++ b/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 generate(String experimentId, String type); - List getHistoryByExperimentId(String experimentId,String type); - ExperimentDoc getByExperimentId(String experimentId,String type); + List getHistoryByExperimentId(String experimentId, String type); + + ExperimentDoc getByExperimentId(String experimentId, String type); } diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/IExperimentIrradiationBoardService.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/IExperimentIrradiationBoardService.java index 4843e70..99f7d86 100644 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/IExperimentIrradiationBoardService.java +++ b/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 { diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/IExperimentLogService.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/IExperimentLogService.java index 219c7d9..f6ecee8 100755 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/IExperimentLogService.java +++ b/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; diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/IExperimentRadiationProcessService.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/IExperimentRadiationProcessService.java index 7076ead..c1a6332 100644 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/IExperimentRadiationProcessService.java +++ b/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; diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/IExperimentRatingService.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/IExperimentRatingService.java index abad4ed..0bd84f2 100644 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/IExperimentRatingService.java +++ b/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 { diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/IExperimentReviewService.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/IExperimentReviewService.java index 949cb99..766f7e5 100644 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/IExperimentReviewService.java +++ b/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; /** diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/IExperimentSampleInfoService.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/IExperimentSampleInfoService.java index 2fb4b32..fe34466 100644 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/IExperimentSampleInfoService.java +++ b/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 { diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/IExperimentSequenceService.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/IExperimentSequenceService.java index 3c42d9e..01a594c 100644 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/IExperimentSequenceService.java +++ b/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 { diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/IExperimentTestProcessService.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/IExperimentTestProcessService.java index 09ac9d8..1c549cb 100644 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/IExperimentTestProcessService.java +++ b/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; diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/IHistoricalDatabaseService.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/IHistoricalDatabaseService.java new file mode 100644 index 0000000..392f01d --- /dev/null +++ b/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 { + Long sumLhs(); + + Long sumXhy(); +} diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/ILocalDatabaseService.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/ILocalDatabaseService.java new file mode 100644 index 0000000..beb4bec --- /dev/null +++ b/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 { + Long sumLhs(); + + Long sumXhy(); +} diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/DocumentLibraryServiceImpl.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/DocumentLibraryServiceImpl.java index b0890f5..4abbf03 100644 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/DocumentLibraryServiceImpl.java +++ b/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 getLatest() { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.eq(DocumentLibrary::getType,"DOCUMENT"); + queryWrapper.eq(DocumentLibrary::getType, "DOCUMENT"); queryWrapper.orderByDesc(DocumentLibrary::getCreateTime); Page page = new Page<>(1, 5); return list(page, queryWrapper); @@ -38,7 +38,7 @@ public class DocumentLibraryServiceImpl extends ServiceImpl 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); diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentDocServiceImpl.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentDocServiceImpl.java index 2d76cdd..7df611c 100755 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentDocServiceImpl.java +++ b/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 implements IExperimentDocService { + static Map 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 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 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 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 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 assembleSybg(String experimentId) { Experiment experiment = experimentService.getById(experimentId); experimentService.fetchExperimentDetail(experiment); diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentIrradiationBoardServiceImpl.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentIrradiationBoardServiceImpl.java index 7657834..42a7eaa 100644 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentIrradiationBoardServiceImpl.java +++ b/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 implements IExperimentIrradiationBoardService { +public class ExperimentIrradiationBoardServiceImpl extends ServiceImpl + implements IExperimentIrradiationBoardService { @Override public List getByExperimentId(String experimentId) { diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentRadiationProcessServiceImpl.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentRadiationProcessServiceImpl.java index df4a9e5..ad0990b 100644 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentRadiationProcessServiceImpl.java +++ b/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 radiationProcessList = getByExperimentId(experimentRadiationProcess.getExperimentId()); if (CollUtil.isNotEmpty(radiationProcessList)) { - List list =new ArrayList<>(); + List list = new ArrayList<>(); for (ExperimentRadiationProcess process : radiationProcessList) { String radiationDetail = process.getRadiationDetail(); if (StringUtils.isNotBlank(radiationDetail)) { diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentReviewServiceImpl.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentReviewServiceImpl.java index 8f14878..06f130c 100644 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentReviewServiceImpl.java +++ b/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().eq(ExperimentReview::getExperimentId, experimentId),false); + return getOne(new LambdaQueryWrapper().eq(ExperimentReview::getExperimentId, experimentId), false); } } diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/HistoricalDatabaseServiceImpl.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/HistoricalDatabaseServiceImpl.java new file mode 100644 index 0000000..e8bee54 --- /dev/null +++ b/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 + implements IHistoricalDatabaseService { + + @Override + public Long sumLhs() { + return Optional.ofNullable(baseMapper.sumLhs()).orElse(0L); + } + + @Override + public Long sumXhy() { + return Optional.ofNullable(baseMapper.sumLhs()).orElse(0L); + } +} diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/IrradiationStandardsServiceImpl.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/IrradiationStandardsServiceImpl.java index 41dca20..92d6a50 100755 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/IrradiationStandardsServiceImpl.java +++ b/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 implements IIrradiationStandardsService { +public class IrradiationStandardsServiceImpl extends ServiceImpl + implements IIrradiationStandardsService { } diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/LocalDatabaseServiceImpl.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/LocalDatabaseServiceImpl.java new file mode 100644 index 0000000..30bd0f1 --- /dev/null +++ b/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 implements ILocalDatabaseService { + @Override + public Long sumLhs() { + return Optional.ofNullable(baseMapper.sumLhs()).orElse(0L); + } + + @Override + public Long sumXhy() { + return Optional.ofNullable(baseMapper.sumLhs()).orElse(0L); + } +} diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/MigrationDataRecordServiceImpl.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/MigrationDataRecordServiceImpl.java index 60cb431..e558213 100644 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/MigrationDataRecordServiceImpl.java +++ b/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 implements IMigrationDataRecordService { +public class MigrationDataRecordServiceImpl extends ServiceImpl + implements IMigrationDataRecordService { } diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/uniapp/ExperimentFileForm.vue b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/uniapp/ExperimentFileForm.vue deleted file mode 100644 index 957ea7a..0000000 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/uniapp/ExperimentFileForm.vue +++ /dev/null @@ -1,101 +0,0 @@ - - - diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/uniapp/ExperimentFileList.vue b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/uniapp/ExperimentFileList.vue deleted file mode 100644 index dd92e36..0000000 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/uniapp/ExperimentFileList.vue +++ /dev/null @@ -1,44 +0,0 @@ - - - - diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/vue3/ExperimentFile.api.ts b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/vue3/ExperimentFile.api.ts deleted file mode 100644 index 7a160de..0000000 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/vue3/ExperimentFile.api.ts +++ /dev/null @@ -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}); -} diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/vue3/ExperimentFile.data.ts b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/vue3/ExperimentFile.data.ts deleted file mode 100644 index 0a7f781..0000000 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/vue3/ExperimentFile.data.ts +++ /dev/null @@ -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; -} \ No newline at end of file diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/vue3/ExperimentFileList.vue b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/vue3/ExperimentFileList.vue deleted file mode 100644 index 78904da..0000000 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/vue3/ExperimentFileList.vue +++ /dev/null @@ -1,188 +0,0 @@ - - - - - \ No newline at end of file diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/vue3/V20241209_1__menu_insert_ExperimentFile.sql b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/vue3/V20241209_1__menu_insert_ExperimentFile.sql deleted file mode 100644 index 1b7faf7..0000000 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/vue3/V20241209_1__menu_insert_ExperimentFile.sql +++ /dev/null @@ -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); \ No newline at end of file diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/vue3/components/ExperimentFileForm.vue b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/vue3/components/ExperimentFileForm.vue deleted file mode 100644 index 924beb3..0000000 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/vue3/components/ExperimentFileForm.vue +++ /dev/null @@ -1,70 +0,0 @@ - - - \ No newline at end of file diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/vue3/components/ExperimentFileModal.vue b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/vue3/components/ExperimentFileModal.vue deleted file mode 100644 index 7d12708..0000000 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/vue3/components/ExperimentFileModal.vue +++ /dev/null @@ -1,68 +0,0 @@ - - - - - \ No newline at end of file