From 8eea428a25eaa67342e5058362f1e232c3d132a3 Mon Sep 17 00:00:00 2001
From: wenwj <‘1106994300@qq.com>
Date: 星期二, 08 四月 2025 14:53:40 +0800
Subject: [PATCH] 零件计划管理基础功能实现
---
aps-modules/aps-core/src/main/java/com/aps/core/controller/ApsPartPlanController.java | 14 +++++++-------
aps-modules/aps-core/pom.xml | 21 ++++++++++++++++++++-
aps-modules/aps-core/src/main/java/com/aps/core/APSCoreApplication.java | 9 +++++++--
aps-modules/aps-core/src/main/resources/bootstrap.yml | 2 ++
aps-modules/aps-system/src/main/resources/bootstrap.yml | 4 ++--
5 files changed, 38 insertions(+), 12 deletions(-)
diff --git a/aps-modules/aps-core/pom.xml b/aps-modules/aps-core/pom.xml
index 92e3490..3714d40 100644
--- a/aps-modules/aps-core/pom.xml
+++ b/aps-modules/aps-core/pom.xml
@@ -17,7 +17,7 @@
<dependencies>
- <!-- SpringCloud Alibaba Nacos -->
+ <!-- SpringCloud Alibaba Nacos -->
<dependency>
<groupId>com.alibaba.cloud</groupId>
<artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
@@ -41,6 +41,25 @@
<artifactId>spring-boot-starter-actuator</artifactId>
</dependency>
+ <!-- SpringBoot Web -->
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-web</artifactId>
+ </dependency>
+
+ <!-- Minio -->
+ <dependency>
+ <groupId>io.minio</groupId>
+ <artifactId>minio</artifactId>
+ <version>${minio.version}</version>
+ </dependency>
+
+ <!-- RuoYi Api System -->
+ <dependency>
+ <groupId>com.aps</groupId>
+ <artifactId>aps-api-system</artifactId>
+ </dependency>
+
<!-- Mysql Connector -->
<dependency>
<groupId>com.mysql</groupId>
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/APSCoreApplication.java b/aps-modules/aps-core/src/main/java/com/aps/core/APSCoreApplication.java
index 138d440..599b35f 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/APSCoreApplication.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/APSCoreApplication.java
@@ -1,15 +1,20 @@
package com.aps.core;
+import com.aps.common.security.annotation.EnableCustomConfig;
+import com.aps.common.security.annotation.EnableRyFeignClients;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
/**
- * 鏂囦欢鏈嶅姟
+ * 涓氬姟鏈嶅姟
*
* @author ruoyi
*/
-@SpringBootApplication(exclude = {DataSourceAutoConfiguration.class })
+//@SpringBootApplication(exclude = {DataSourceAutoConfiguration.class })
+@EnableCustomConfig
+@EnableRyFeignClients
+@SpringBootApplication
public class APSCoreApplication
{
public static void main(String[] args)
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/ApsPartPlanController.java
index e1b0a65..4cb7abd 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/ApsPartPlanController.java
@@ -30,7 +30,7 @@
* @date 2025-04-08
*/
@RestController
-@RequestMapping("/plan")
+@RequestMapping("/partPlan")
public class ApsPartPlanController extends BaseController
{
@Autowired
@@ -39,7 +39,7 @@
/**
* 鏌ヨ闆朵欢璁″垝绠＄悊鍒楄〃
*/
- @RequiresPermissions("partPlan:plan:list")
+ @RequiresPermissions("partPlan:list")
@GetMapping("/list")
public TableDataInfo list(ApsPartPlan apsPartPlan)
{
@@ -51,7 +51,7 @@
/**
* 瀵煎嚭闆朵欢璁″垝绠＄悊鍒楄〃
*/
- @RequiresPermissions("partPlan:plan:export")
+ @RequiresPermissions("partPlan:export")
@Log(title = "闆朵欢璁″垝绠＄悊", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, ApsPartPlan apsPartPlan)
@@ -64,7 +64,7 @@
/**
* 鑾峰彇闆朵欢璁″垝绠＄悊璇︾粏淇℃伅
*/
- @RequiresPermissions("partPlan:plan:query")
+ @RequiresPermissions("partPlan:query")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") String id)
{
@@ -74,7 +74,7 @@
/**
* 鏂板闆朵欢璁″垝绠＄悊
*/
- @RequiresPermissions("partPlan:plan:add")
+ @RequiresPermissions("partPlan:add")
@Log(title = "闆朵欢璁″垝绠＄悊", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody ApsPartPlan apsPartPlan)
@@ -85,7 +85,7 @@
/**
* 淇敼闆朵欢璁″垝绠＄悊
*/
- @RequiresPermissions("partPlan:plan:edit")
+ @RequiresPermissions("partPlan:edit")
@Log(title = "闆朵欢璁″垝绠＄悊", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody ApsPartPlan apsPartPlan)
@@ -96,7 +96,7 @@
/**
* 鍒犻櫎闆朵欢璁″垝绠＄悊
*/
- @RequiresPermissions("partPlan:plan:remove")
+ @RequiresPermissions("partPlan:remove")
@Log(title = "闆朵欢璁″垝绠＄悊", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable String[] ids)
diff --git a/aps-modules/aps-core/src/main/resources/bootstrap.yml b/aps-modules/aps-core/src/main/resources/bootstrap.yml
index 04568ef..4b06397 100644
--- a/aps-modules/aps-core/src/main/resources/bootstrap.yml
+++ b/aps-modules/aps-core/src/main/resources/bootstrap.yml
@@ -15,6 +15,8 @@
discovery:
# 鏈嶅姟娉ㄥ唽鍦板潃
server-addr: 192.168.50.160:8848
+ metadata:
+ local: wwj
config:
# 閰嶇疆涓績鍦板潃
server-addr: 192.168.50.160:8848
diff --git a/aps-modules/aps-system/src/main/resources/bootstrap.yml b/aps-modules/aps-system/src/main/resources/bootstrap.yml
index f2dddc8..a5652fd 100644
--- a/aps-modules/aps-system/src/main/resources/bootstrap.yml
+++ b/aps-modules/aps-system/src/main/resources/bootstrap.yml
@@ -16,8 +16,8 @@
# 鏈嶅姟娉ㄥ唽鍦板潃
server-addr: 192.168.50.160:8848
# ip: 192.168.50.13
-# metadata:
-# local: zhl
+ metadata:
+ local: wwj
config:
# 閰嶇疆涓績鍦板潃
server-addr: 192.168.50.160:8848
--
Gitblit v1.9.3