From 30cb94a4ce8372ac9cd420ee4efb28a8f40d3e83 Mon Sep 17 00:00:00 2001 From: nieziyan Date: Thu, 12 Oct 2023 15:58:37 +0800 Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A1.=E7=A7=BB=E5=8A=A8=E6=A0=B8?= =?UTF-8?q?=E7=B4=A0=E5=BA=93=E4=BD=8D=E7=BD=AE2.pom.xml=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules}/controller/GardsNuclLibController.java | 4 ++-- .../controller/SysDefaultNuclideController.java | 7 ++----- .../org/jeecg/modules}/mapper/GardsNuclLibMapper.java | 2 +- .../jeecg/modules}/mapper/GardsNuclLinesLibMapper.java | 2 +- .../jeecg/modules}/mapper/SysDefaultNuclideMapper.java | 2 +- .../jeecg/modules}/mapper/xml/GardsNuclLibMapper.xml | 2 +- .../modules}/mapper/xml/GardsNuclLinesLibMapper.xml | 2 +- .../modules}/mapper/xml/SysDefaultNuclideMapper.xml | 2 +- .../jeecg/modules}/service/IGardsNuclLibService.java | 2 +- .../modules}/service/IGardsNuclLinesLibService.java | 2 +- .../modules}/service/ISysDefaultNuclideService.java | 2 +- .../modules}/service/impl/GardsNuclLibServiceImpl.java | 8 +++----- .../service/impl/GardsNuclLinesLibServiceImpl.java | 8 ++++---- .../service/impl/SysDefaultNuclideServiceImpl.java | 10 ++++------ jeecg-server-cloud/jeecg-abnormal-alarm-start/pom.xml | 4 ++-- .../jeecg-spectrum-analysis-start/pom.xml | 4 ++-- .../jeecg-station-operation-start/pom.xml | 4 ++-- jeecg-server-cloud/jeecg-system-cloud-start/pom.xml | 4 ++-- jeecg-server-cloud/jeecg-web-statistics-start/pom.xml | 4 ++-- 19 files changed, 34 insertions(+), 41 deletions(-) rename {jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system => jeecg-module-beta-gamma-analyser/src/main/java/org/jeecg/modules}/controller/GardsNuclLibController.java (88%) rename {jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system => jeecg-module-beta-gamma-analyser/src/main/java/org/jeecg/modules}/controller/SysDefaultNuclideController.java (92%) rename {jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system => jeecg-module-beta-gamma-analyser/src/main/java/org/jeecg/modules}/mapper/GardsNuclLibMapper.java (89%) rename {jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system => jeecg-module-beta-gamma-analyser/src/main/java/org/jeecg/modules}/mapper/GardsNuclLinesLibMapper.java (87%) rename {jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system => jeecg-module-beta-gamma-analyser/src/main/java/org/jeecg/modules}/mapper/SysDefaultNuclideMapper.java (87%) rename {jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system => jeecg-module-beta-gamma-analyser/src/main/java/org/jeecg/modules}/mapper/xml/GardsNuclLibMapper.xml (91%) rename {jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system => jeecg-module-beta-gamma-analyser/src/main/java/org/jeecg/modules}/mapper/xml/GardsNuclLinesLibMapper.xml (67%) rename {jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system => jeecg-module-beta-gamma-analyser/src/main/java/org/jeecg/modules}/mapper/xml/SysDefaultNuclideMapper.xml (67%) rename {jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system => jeecg-module-beta-gamma-analyser/src/main/java/org/jeecg/modules}/service/IGardsNuclLibService.java (88%) rename {jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system => jeecg-module-beta-gamma-analyser/src/main/java/org/jeecg/modules}/service/IGardsNuclLinesLibService.java (92%) rename {jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system => jeecg-module-beta-gamma-analyser/src/main/java/org/jeecg/modules}/service/ISysDefaultNuclideService.java (94%) rename {jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system => jeecg-module-beta-gamma-analyser/src/main/java/org/jeecg/modules}/service/impl/GardsNuclLibServiceImpl.java (83%) rename {jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system => jeecg-module-beta-gamma-analyser/src/main/java/org/jeecg/modules}/service/impl/GardsNuclLinesLibServiceImpl.java (94%) rename {jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system => jeecg-module-beta-gamma-analyser/src/main/java/org/jeecg/modules}/service/impl/SysDefaultNuclideServiceImpl.java (94%) diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/GardsNuclLibController.java b/jeecg-module-beta-gamma-analyser/src/main/java/org/jeecg/modules/controller/GardsNuclLibController.java similarity index 88% rename from jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/GardsNuclLibController.java rename to jeecg-module-beta-gamma-analyser/src/main/java/org/jeecg/modules/controller/GardsNuclLibController.java index 2f7f16b2..5f323bf5 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/GardsNuclLibController.java +++ b/jeecg-module-beta-gamma-analyser/src/main/java/org/jeecg/modules/controller/GardsNuclLibController.java @@ -1,11 +1,11 @@ -package org.jeecg.modules.system.controller; +package org.jeecg.modules.controller; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.jeecg.common.api.vo.Result; import org.jeecg.common.system.base.controller.JeecgController; import org.jeecg.modules.base.entity.configuration.GardsNuclLib; -import org.jeecg.modules.system.service.IGardsNuclLibService; +import org.jeecg.modules.service.IGardsNuclLibService; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDefaultNuclideController.java b/jeecg-module-beta-gamma-analyser/src/main/java/org/jeecg/modules/controller/SysDefaultNuclideController.java similarity index 92% rename from jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDefaultNuclideController.java rename to jeecg-module-beta-gamma-analyser/src/main/java/org/jeecg/modules/controller/SysDefaultNuclideController.java index e6cca6bc..7f65492b 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDefaultNuclideController.java +++ b/jeecg-module-beta-gamma-analyser/src/main/java/org/jeecg/modules/controller/SysDefaultNuclideController.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.system.controller; +package org.jeecg.modules.controller; import cn.hutool.core.io.FileUtil; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -14,8 +14,7 @@ import org.jeecg.common.system.base.controller.JeecgController; import org.jeecg.common.util.security.JdbcSecurityUtil; import org.jeecg.modules.base.entity.postgre.SysDataSource; import org.jeecg.modules.base.entity.postgre.SysDefaultNuclide; -import org.jeecg.modules.system.service.ISysDataSourceService; -import org.jeecg.modules.system.service.ISysDefaultNuclideService; +import org.jeecg.modules.service.ISysDefaultNuclideService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -53,6 +52,4 @@ public class SysDefaultNuclideController extends JeecgController - +