From 6ff5bfe44de8c3cfba86053e8fed43f6f97584fc Mon Sep 17 00:00:00 2001 From: wenwj <‘1106994300@qq.com> Date: 星期六, 12 四月 2025 17:28:07 +0800 Subject: [PATCH] 结构调整 --- aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsGasPipingPlanController.java | 37 +++++++----------- aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsPartPlanController.java | 4 - aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsWeldSeamTempController.java | 3 - aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsWeldSeamStatisticsController.java | 3 - aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsWeldSeamController.java | 2 aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsGasPipingPlanTempController.java | 28 +++++--------- aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsPartPlanTempController.java | 28 +++++--------- 7 files changed, 38 insertions(+), 67 deletions(-) diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/controller/ApsGasPipingPlanController.java b/aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsGasPipingPlanController.java similarity index 94% rename from aps-modules/aps-core/src/main/java/com/aps/core/controller/ApsGasPipingPlanController.java rename to aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsGasPipingPlanController.java index 343911d..921ea13 100644 --- a/aps-modules/aps-core/src/main/java/com/aps/core/controller/ApsGasPipingPlanController.java +++ b/aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsGasPipingPlanController.java @@ -1,36 +1,27 @@ -package com.aps.core.controller; +package com.aps.core.controller.mainPlan; -import java.util.List; -import java.io.IOException; -import java.util.Optional; - +import com.aps.common.core.utils.poi.ExcelUtil; import com.aps.common.core.utils.uuid.IdUtils; +import com.aps.common.core.web.controller.BaseController; +import com.aps.common.core.web.domain.AjaxResult; +import com.aps.common.core.web.page.TableDataInfo; +import com.aps.common.log.annotation.Log; +import com.aps.common.log.enums.BusinessType; +import com.aps.common.security.annotation.RequiresPermissions; import com.aps.common.security.utils.DictUtils; +import com.aps.core.domain.ApsGasPipingPlan; import com.aps.core.domain.ApsGasPipingPlanTemp; -import com.aps.core.domain.ApsPartPlanTemp; +import com.aps.core.service.IApsGasPipingPlanService; import com.aps.core.service.IApsGasPipingPlanTempService; import com.aps.system.api.domain.SysDictData; import jakarta.servlet.http.HttpServletResponse; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; -import com.aps.common.log.annotation.Log; -import com.aps.common.log.enums.BusinessType; -import com.aps.common.security.annotation.RequiresPermissions; -import com.aps.core.domain.ApsGasPipingPlan; -import com.aps.core.service.IApsGasPipingPlanService; -import com.aps.common.core.web.controller.BaseController; -import com.aps.common.core.web.domain.AjaxResult; -import com.aps.common.core.utils.poi.ExcelUtil; -import com.aps.common.core.web.page.TableDataInfo; +import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; +import java.util.List; +import java.util.Optional; + /** * 姘斾綋绠¤矾璁″垝绠＄悊Controller * diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/controller/ApsGasPipingPlanTempController.java b/aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsGasPipingPlanTempController.java similarity index 86% rename from aps-modules/aps-core/src/main/java/com/aps/core/controller/ApsGasPipingPlanTempController.java rename to aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsGasPipingPlanTempController.java index ace3f71..04fd3c7 100644 --- a/aps-modules/aps-core/src/main/java/com/aps/core/controller/ApsGasPipingPlanTempController.java +++ b/aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsGasPipingPlanTempController.java @@ -1,27 +1,19 @@ -package com.aps.core.controller; +package com.aps.core.controller.mainPlan; -import java.util.List; -import java.io.IOException; - -import jakarta.servlet.http.HttpServletResponse; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import com.aps.common.core.utils.poi.ExcelUtil; +import com.aps.common.core.web.controller.BaseController; +import com.aps.common.core.web.domain.AjaxResult; +import com.aps.common.core.web.page.TableDataInfo; import com.aps.common.log.annotation.Log; import com.aps.common.log.enums.BusinessType; import com.aps.common.security.annotation.RequiresPermissions; import com.aps.core.domain.ApsGasPipingPlanTemp; import com.aps.core.service.IApsGasPipingPlanTempService; -import com.aps.common.core.web.controller.BaseController; -import com.aps.common.core.web.domain.AjaxResult; -import com.aps.common.core.utils.poi.ExcelUtil; -import com.aps.common.core.web.page.TableDataInfo; +import jakarta.servlet.http.HttpServletResponse; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.List; /** * 姘斾綋绠¤矾璁″垝绠＄悊-涓存椂Controller diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/controller/ApsPartPlanController.java b/aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsPartPlanController.java similarity index 98% rename from aps-modules/aps-core/src/main/java/com/aps/core/controller/ApsPartPlanController.java rename to aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsPartPlanController.java index 6d2a4ae..9598204 100644 --- a/aps-modules/aps-core/src/main/java/com/aps/core/controller/ApsPartPlanController.java +++ b/aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsPartPlanController.java @@ -1,4 +1,4 @@ -package com.aps.core.controller; +package com.aps.core.controller.mainPlan; import com.aps.common.core.utils.poi.ExcelUtil; import com.aps.common.core.utils.uuid.IdUtils; @@ -9,8 +9,6 @@ import com.aps.common.log.enums.BusinessType; import com.aps.common.security.annotation.RequiresPermissions; import com.aps.common.security.utils.DictUtils; -import com.aps.core.domain.ApsGasPipingPlan; -import com.aps.core.domain.ApsGasPipingPlanTemp; import com.aps.core.domain.ApsPartPlan; import com.aps.core.domain.ApsPartPlanTemp; import com.aps.core.service.IApsPartPlanService; diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/controller/ApsPartPlanTempController.java b/aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsPartPlanTempController.java similarity index 85% rename from aps-modules/aps-core/src/main/java/com/aps/core/controller/ApsPartPlanTempController.java rename to aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsPartPlanTempController.java index a49d54b..2ef5f51 100644 --- a/aps-modules/aps-core/src/main/java/com/aps/core/controller/ApsPartPlanTempController.java +++ b/aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsPartPlanTempController.java @@ -1,27 +1,19 @@ -package com.aps.core.controller; +package com.aps.core.controller.mainPlan; -import java.util.List; -import java.io.IOException; - -import jakarta.servlet.http.HttpServletResponse; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import com.aps.common.core.utils.poi.ExcelUtil; +import com.aps.common.core.web.controller.BaseController; +import com.aps.common.core.web.domain.AjaxResult; +import com.aps.common.core.web.page.TableDataInfo; import com.aps.common.log.annotation.Log; import com.aps.common.log.enums.BusinessType; import com.aps.common.security.annotation.RequiresPermissions; import com.aps.core.domain.ApsPartPlanTemp; import com.aps.core.service.IApsPartPlanTempService; -import com.aps.common.core.web.controller.BaseController; -import com.aps.common.core.web.domain.AjaxResult; -import com.aps.common.core.utils.poi.ExcelUtil; -import com.aps.common.core.web.page.TableDataInfo; +import jakarta.servlet.http.HttpServletResponse; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.List; /** * 闆朵欢璁″垝绠＄悊涓存椂Controller diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/controller/ApsWeldSeamController.java b/aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsWeldSeamController.java similarity index 99% rename from aps-modules/aps-core/src/main/java/com/aps/core/controller/ApsWeldSeamController.java rename to aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsWeldSeamController.java index 029627c..e38cfd9 100644 --- a/aps-modules/aps-core/src/main/java/com/aps/core/controller/ApsWeldSeamController.java +++ b/aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsWeldSeamController.java @@ -1,4 +1,4 @@ -package com.aps.core.controller; +package com.aps.core.controller.mainPlan; import com.aps.common.core.utils.poi.ExcelUtil; import com.aps.common.core.utils.uuid.IdUtils; diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/controller/ApsWeldSeamStatisticsController.java b/aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsWeldSeamStatisticsController.java similarity index 98% rename from aps-modules/aps-core/src/main/java/com/aps/core/controller/ApsWeldSeamStatisticsController.java rename to aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsWeldSeamStatisticsController.java index 6e905da..7df3c5f 100644 --- a/aps-modules/aps-core/src/main/java/com/aps/core/controller/ApsWeldSeamStatisticsController.java +++ b/aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsWeldSeamStatisticsController.java @@ -1,7 +1,6 @@ -package com.aps.core.controller; +package com.aps.core.controller.mainPlan; import java.util.List; -import java.io.IOException; import jakarta.servlet.http.HttpServletResponse; import org.springframework.beans.factory.annotation.Autowired; diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/controller/ApsWeldSeamTempController.java b/aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsWeldSeamTempController.java similarity index 98% rename from aps-modules/aps-core/src/main/java/com/aps/core/controller/ApsWeldSeamTempController.java rename to aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsWeldSeamTempController.java index 3610e87..ff1fb46 100644 --- a/aps-modules/aps-core/src/main/java/com/aps/core/controller/ApsWeldSeamTempController.java +++ b/aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsWeldSeamTempController.java @@ -1,7 +1,6 @@ -package com.aps.core.controller; +package com.aps.core.controller.mainPlan; import java.util.List; -import java.io.IOException; import jakarta.servlet.http.HttpServletResponse; import org.springframework.beans.factory.annotation.Autowired; -- Gitblit v1.9.3