diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/configuration/GardsSummationPeak.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/configuration/GardsNuclideDecay.java similarity index 79% rename from jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/configuration/GardsSummationPeak.java rename to jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/configuration/GardsNuclideDecay.java index 9d9aa07..c3cdb9e 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/configuration/GardsSummationPeak.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/configuration/GardsNuclideDecay.java @@ -8,12 +8,12 @@ import java.io.Serializable; import java.util.Date; /** - * 加合峰信息实体类 - * 对应表名：CONFIGURATION.GARDS_SUMMATION_PEAK + * 衰变息实体类 + * 对应表名：CONFIGURATION.GARDS_NUCLIDE_DECAY */ @Data -@TableName("CONFIGURATION.GARDS_SUMMATION_PEAK") -public class GardsSummationPeak implements Serializable { +@TableName("CONFIGURATION.GARDS_NUCLIDE_DECAY") +public class GardsNuclideDecay implements Serializable { private static final long serialVersionUID = 1L; diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/mapper/GardsNuclideDecayMapper.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/mapper/GardsNuclideDecayMapper.java new file mode 100644 index 0000000..cf1a2c1 --- /dev/null +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/mapper/GardsNuclideDecayMapper.java @@ -0,0 +1,9 @@ +package org.jeecg.modules.base.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; +import org.jeecg.modules.base.entity.configuration.GardsNuclideDecay; + +@Mapper +public interface GardsNuclideDecayMapper extends BaseMapper { +} diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/mapper/GardsSummationPeakMapper.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/mapper/GardsSummationPeakMapper.java deleted file mode 100644 index 76a7cd1..0000000 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/mapper/GardsSummationPeakMapper.java +++ /dev/null @@ -1,9 +0,0 @@ -package org.jeecg.modules.base.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.apache.ibatis.annotations.Mapper; -import org.jeecg.modules.base.entity.configuration.GardsSummationPeak; - -@Mapper -public interface GardsSummationPeakMapper extends BaseMapper { -} diff --git a/jeecg-module-monitor-info-database/src/main/java/org/jeecg/controller/GardsSummationPeakController.java b/jeecg-module-monitor-info-database/src/main/java/org/jeecg/controller/GardsNuclideDecayController.java similarity index 74% rename from jeecg-module-monitor-info-database/src/main/java/org/jeecg/controller/GardsSummationPeakController.java rename to jeecg-module-monitor-info-database/src/main/java/org/jeecg/controller/GardsNuclideDecayController.java index 7c1cba2..52a0137 100644 --- a/jeecg-module-monitor-info-database/src/main/java/org/jeecg/controller/GardsSummationPeakController.java +++ b/jeecg-module-monitor-info-database/src/main/java/org/jeecg/controller/GardsNuclideDecayController.java @@ -7,8 +7,8 @@ import jakarta.servlet.http.HttpServletResponse; import lombok.extern.slf4j.Slf4j; import org.jeecg.common.api.vo.Result; import org.jeecg.common.aspect.annotation.AutoLog; -import org.jeecg.modules.base.entity.configuration.GardsSummationPeak; -import org.jeecg.service.GardsSummationPeakService; +import org.jeecg.modules.base.entity.configuration.GardsNuclideDecay; +import org.jeecg.service.GardsNuclideDecayService; import org.jeecgframework.poi.excel.ExcelExportUtil; import org.jeecgframework.poi.excel.ExcelImportUtil; import org.jeecgframework.poi.excel.entity.ExportParams; @@ -25,19 +25,19 @@ import java.util.List; import java.util.Map; @RestController -@RequestMapping("/getGardsSummationPeak") +@RequestMapping("/getGardsNuclideDecay") @Slf4j -public class GardsSummationPeakController { +public class GardsNuclideDecayController { @Autowired - private GardsSummationPeakService gardsSummationPeakService; + private GardsNuclideDecayService gardsNuclideDecayService; /** * 新增信息 */ @PostMapping("/create") @Operation(summary = "新增信息") - public Result create(@RequestBody GardsSummationPeak gardsSummationPeak) { - return gardsSummationPeakService.create(gardsSummationPeak); + public Result create(@RequestBody GardsNuclideDecay gardsNuclideDecay) { + return gardsNuclideDecayService.create(gardsNuclideDecay); } /** @@ -46,7 +46,7 @@ public class GardsSummationPeakController { @DeleteMapping("/delete") @Operation(summary = "删除信息") public Result deleteById(@RequestParam Integer Id) { - return gardsSummationPeakService.deleteById(Id); + return gardsNuclideDecayService.deleteById(Id); } /** @@ -54,8 +54,8 @@ public class GardsSummationPeakController { */ @PutMapping("/update") @Operation(summary = "更新信息") - public Result update(@RequestBody GardsSummationPeak gardsSummationPeak) { - return gardsSummationPeakService.update(gardsSummationPeak); + public Result update(@RequestBody GardsNuclideDecay gardsNuclideDecay) { + return gardsNuclideDecayService.update(gardsNuclideDecay); } /** @@ -63,8 +63,8 @@ public class GardsSummationPeakController { */ @GetMapping("/queryById") @Operation(summary = "查询信息") - public Result getById(@RequestParam Integer Id) { - return gardsSummationPeakService.queryById(Id); + public Result getById(@RequestParam Integer Id) { + return gardsNuclideDecayService.queryById(Id); } /** @@ -77,12 +77,12 @@ public class GardsSummationPeakController { */ @GetMapping("/page") @Operation(summary = "分页查询") - public Result> page( + public Result> page( @RequestParam(defaultValue = "1") Integer pageNum, @RequestParam(defaultValue = "10") Integer pageSize, @RequestParam(required = false) String nuclide) { - return gardsSummationPeakService.page(pageNum, pageSize, nuclide); + return gardsNuclideDecayService.page(pageNum, pageSize, nuclide); } /** @@ -93,10 +93,10 @@ public class GardsSummationPeakController { */ @GetMapping("/search") @Operation(summary = "组合条件查询") - public Result> search(@RequestParam(required = false) String nuclide ) { + public Result> search(@RequestParam(required = false) String nuclide ) { try { - List list = gardsSummationPeakService.getByConditions(nuclide); + List list = gardsNuclideDecayService.getByConditions(nuclide); return Result.OK(list); } catch (Exception e) { log.error("search: " + e.getMessage()); @@ -114,7 +114,7 @@ public class GardsSummationPeakController { params.setFixedTitle(true); params.setTitleHeight((short) 8); params.setType(ExcelType.XSSF); - ExcelExportUtil.exportExcel(params, GardsSummationPeak.class, new ArrayList<>()).write(response.getOutputStream()); + ExcelExportUtil.exportExcel(params, GardsNuclideDecay.class, new ArrayList<>()).write(response.getOutputStream()); } @AutoLog(value = "导出Excel") @@ -127,8 +127,8 @@ public class GardsSummationPeakController { params.setFixedTitle(true); params.setTitleHeight((short) 8); params.setType(ExcelType.XSSF); - List list = gardsSummationPeakService.getByConditions(nuclide); - ExcelExportUtil.exportExcel(params, GardsSummationPeak.class, list).write(response.getOutputStream()); + List list = gardsNuclideDecayService.getByConditions(nuclide); + ExcelExportUtil.exportExcel(params, GardsNuclideDecay.class, list).write(response.getOutputStream()); } /** @@ -137,7 +137,7 @@ public class GardsSummationPeakController { * @param request * @return */ - @AutoLog(value = "GardsSummationPeak") + @AutoLog(value = "GardsNuclideDecay") @Operation(summary = "导入数据") @PostMapping(value = "/importExcel") public Result importExcel(HttpServletRequest request) { @@ -158,10 +158,10 @@ public class GardsSummationPeakController { try { // 3. 使用 AutoPoi 工具类解析 Excel - List list = ExcelImportUtil.importExcel(file.getInputStream(), GardsSummationPeak.class, params); + List list = ExcelImportUtil.importExcel(file.getInputStream(), GardsNuclideDecay.class, params); // 4. 批量保存数据到数据库 - gardsSummationPeakService.saveBatch(list); + gardsNuclideDecayService.saveBatch(list); return Result.OK("文件导入成功！数据行数：" + list.size()); } catch (Exception e) { diff --git a/jeecg-module-monitor-info-database/src/main/java/org/jeecg/service/GardsSummationPeakService.java b/jeecg-module-monitor-info-database/src/main/java/org/jeecg/service/GardsNuclideDecayService.java similarity index 64% rename from jeecg-module-monitor-info-database/src/main/java/org/jeecg/service/GardsSummationPeakService.java rename to jeecg-module-monitor-info-database/src/main/java/org/jeecg/service/GardsNuclideDecayService.java index e8c9c9a..cd2be2d 100644 --- a/jeecg-module-monitor-info-database/src/main/java/org/jeecg/service/GardsSummationPeakService.java +++ b/jeecg-module-monitor-info-database/src/main/java/org/jeecg/service/GardsNuclideDecayService.java @@ -4,17 +4,17 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; import org.jeecg.common.api.vo.Result; import org.jeecg.modules.base.entity.configuration.GardsStations; -import org.jeecg.modules.base.entity.configuration.GardsSummationPeak; +import org.jeecg.modules.base.entity.configuration.GardsNuclideDecay; import java.util.List; -public interface GardsSummationPeakService extends IService { +public interface GardsNuclideDecayService extends IService { /** * 新增信息 */ - Result create(GardsSummationPeak gardsSummationPeak); + Result create(GardsNuclideDecay gardsNuclideDecay); /** * 删除信息 @@ -24,12 +24,12 @@ public interface GardsSummationPeakService extends IService /** * 更新信息 */ - Result update(GardsSummationPeak gardsSummationPeak); + Result update(GardsNuclideDecay gardsNuclideDecay); /** * 查询信息 */ - Result queryById(Integer Id); + Result queryById(Integer Id); /** * 分页查询 @@ -39,7 +39,7 @@ public interface GardsSummationPeakService extends IService * @param nuclide * @return */ - Result> page( + Result> page( Integer pageNum, Integer pageSize, String nuclide); @@ -50,7 +50,7 @@ public interface GardsSummationPeakService extends IService * @param nuclide 名称 * @return List */ - List getByConditions(String nuclide); + List getByConditions(String nuclide); } diff --git a/jeecg-module-monitor-info-database/src/main/java/org/jeecg/service/impl/GardsSummationPeakServiceImpl.java b/jeecg-module-monitor-info-database/src/main/java/org/jeecg/service/impl/GardsNuclideDecayServiceImpl.java similarity index 61% rename from jeecg-module-monitor-info-database/src/main/java/org/jeecg/service/impl/GardsSummationPeakServiceImpl.java rename to jeecg-module-monitor-info-database/src/main/java/org/jeecg/service/impl/GardsNuclideDecayServiceImpl.java index 2b748b3..2f4a7ae 100644 --- a/jeecg-module-monitor-info-database/src/main/java/org/jeecg/service/impl/GardsSummationPeakServiceImpl.java +++ b/jeecg-module-monitor-info-database/src/main/java/org/jeecg/service/impl/GardsNuclideDecayServiceImpl.java @@ -6,29 +6,31 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.jeecg.common.api.vo.Result; +import org.jeecg.modules.base.entity.configuration.GardsNuclideDecay; import org.jeecg.modules.base.entity.configuration.GardsStations; -import org.jeecg.modules.base.entity.configuration.GardsSummationPeak; -import org.jeecg.modules.base.mapper.GardsSummationPeakMapper; -import org.jeecg.service.GardsSummationPeakService; +import org.jeecg.modules.base.entity.configuration.GardsNuclideDecay; +import org.jeecg.modules.base.mapper.GardsNuclideDecayMapper; +import org.jeecg.modules.base.mapper.GardsNuclideDecayMapper; +import org.jeecg.service.GardsNuclideDecayService; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.util.List; @Service @DS("ora") -public class GardsSummationPeakServiceImpl extends ServiceImpl implements GardsSummationPeakService { +public class GardsNuclideDecayServiceImpl extends ServiceImpl implements GardsNuclideDecayService { /** * 新增信息 */ @Override @Transactional(rollbackFor = RuntimeException.class) - public Result create(GardsSummationPeak gardsSummationPeak) { + public Result create(GardsNuclideDecay gardsNuclideDecay) { try { - boolean success = this.save(gardsSummationPeak); + boolean success = this.save(gardsNuclideDecay); if (success) { - return Result.OK("添加成功", gardsSummationPeak); + return Result.OK("添加成功", gardsNuclideDecay); } else { return Result.error("添加失败"); } @@ -63,11 +65,11 @@ public class GardsSummationPeakServiceImpl extends ServiceImpl update(GardsSummationPeak gardsSummationPeak) { + public Result update(GardsNuclideDecay gardsNuclideDecay) { try { - boolean success = this.updateById(gardsSummationPeak); + boolean success = this.updateById(gardsNuclideDecay); if (success) { - return Result.OK("数据更新成功", gardsSummationPeak); + return Result.OK("数据更新成功", gardsNuclideDecay); } else { return Result.error("数据更新失败"); @@ -82,9 +84,9 @@ public class GardsSummationPeakServiceImpl extends ServiceImpl queryById(Integer Id) { + public Result queryById(Integer Id) { try { - GardsSummationPeak nuclearReactors = this.getById(Id); + GardsNuclideDecay nuclearReactors = this.getById(Id); if (nuclearReactors != null) { return Result.OK(nuclearReactors); } else { @@ -97,17 +99,17 @@ public class GardsSummationPeakServiceImpl extends ServiceImpl> page(Integer pageNum, Integer pageSize, String nuclide) { + public Result> page(Integer pageNum, Integer pageSize, String nuclide) { try { - Page page = new Page<>(pageNum, pageSize); + Page page = new Page<>(pageNum, pageSize); - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); if (nuclide != null && !nuclide.trim().isEmpty()) { - wrapper.like(GardsSummationPeak::getNuclide, nuclide); + wrapper.like(GardsNuclideDecay::getNuclide, nuclide); } - wrapper.orderByDesc(GardsSummationPeak::getId); - IPage pageResult = this.page(page, wrapper); + wrapper.orderByDesc(GardsNuclideDecay::getId); + IPage pageResult = this.page(page, wrapper); return Result.OK(pageResult); } catch (Exception e) { @@ -117,14 +119,14 @@ public class GardsSummationPeakServiceImpl extends ServiceImpl getByConditions(String nuclide) { - LambdaQueryWrapper query = new LambdaQueryWrapper<>(); + public List getByConditions(String nuclide) { + LambdaQueryWrapper query = new LambdaQueryWrapper<>(); if (nuclide != null && !nuclide.trim().isEmpty()) { - query.like(GardsSummationPeak::getNuclide, nuclide); + query.like(GardsNuclideDecay::getNuclide, nuclide); } - query.orderByDesc(GardsSummationPeak::getId); + query.orderByDesc(GardsNuclideDecay::getId); return this.list(query); } }