From e20d7373595960ad6be9bd6373a3c6f186e76e5c Mon Sep 17 00:00:00 2001
From: 懒羊羊 <15939171744@163.com>
Date: 星期六, 23 三月 2024 15:05:49 +0800
Subject: [PATCH] -
---
jcdm-main/src/main/java/com/jcdm/main/em/inspectionPlanTask/controller/EmInspectionPlanTaskController.java | 10 ++++++++++
jcdm-quartz/src/main/java/com/jcdm/quartz/task/RyTask.java | 4 ++++
jcdm-framework/src/main/java/com/jcdm/framework/config/SecurityConfig.java | 2 +-
jcdm-main/src/main/java/com/jcdm/main/em/inspectionPlanItemsProject/controller/EmInspectionPlanItemsProjectController.java | 19 +++++++++++--------
4 files changed, 26 insertions(+), 9 deletions(-)
diff --git a/jcdm-framework/src/main/java/com/jcdm/framework/config/SecurityConfig.java b/jcdm-framework/src/main/java/com/jcdm/framework/config/SecurityConfig.java
index b562f88..2adc5c6 100644
--- a/jcdm-framework/src/main/java/com/jcdm/framework/config/SecurityConfig.java
+++ b/jcdm-framework/src/main/java/com/jcdm/framework/config/SecurityConfig.java
@@ -111,7 +111,7 @@
// 杩囨护璇锋眰
.authorizeRequests()
// 瀵逛簬鐧诲綍login 娉ㄥ唽register 楠岃瘉鐮乧aptchaImage 鍏佽鍖垮悕璁块棶
- .antMatchers("/login", "/register", "/captchaImage","/websocket/**","/postWebsocket/**").permitAll()
+ .antMatchers("/login", "/register", "/captchaImage","/websocket/**","/postWebsocket/**","/em/inspectionPlanTask/noPageList","/em/inspectionPlanItemsProject/findPlanItemsProjectByPlanId").permitAll()
// 闈欐�佽祫婧愶紝鍙尶鍚嶈闂�
.antMatchers(HttpMethod.GET, "/", "/*.html", "/**/*.html", "/**/*.css", "/**/*.js", "/profile/**").permitAll()
.antMatchers("/swagger-ui.html", "/swagger-resources/**", "/webjars/**", "/*/api-docs", "/druid/**").permitAll()
diff --git a/jcdm-main/src/main/java/com/jcdm/main/em/inspectionPlanItemsProject/controller/EmInspectionPlanItemsProjectController.java b/jcdm-main/src/main/java/com/jcdm/main/em/inspectionPlanItemsProject/controller/EmInspectionPlanItemsProjectController.java
index 524da4c..d6d2384 100644
--- a/jcdm-main/src/main/java/com/jcdm/main/em/inspectionPlanItemsProject/controller/EmInspectionPlanItemsProjectController.java
+++ b/jcdm-main/src/main/java/com/jcdm/main/em/inspectionPlanItemsProject/controller/EmInspectionPlanItemsProjectController.java
@@ -2,16 +2,12 @@
import java.util.List;
import javax.servlet.http.HttpServletResponse;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import org.aspectj.weaver.loadtime.Aj;
import org.springframework.security.access.prepost.PreAuthorize;
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 org.springframework.web.bind.annotation.*;
import com.jcdm.common.annotation.Log;
import com.jcdm.common.core.controller.BaseController;
import com.jcdm.common.core.domain.AjaxResult;
@@ -34,6 +30,13 @@
@Autowired
private IEmInspectionPlanItemsProjectService emInspectionPlanItemsProjectService;
+ @RequestMapping("/findPlanItemsProjectByPlanId")
+ public AjaxResult list(@RequestParam String planId)
+ {
+ List<EmInspectionPlanItemsProject> planTaskIdList = emInspectionPlanItemsProjectService.list(new QueryWrapper<EmInspectionPlanItemsProject>().eq("plan_task_id", planId));
+ return AjaxResult.success(planTaskIdList);
+ }
+
/**
* 鏌ヨ鐐规浠诲姟-椤圭洰鍒楄〃
*/
diff --git a/jcdm-main/src/main/java/com/jcdm/main/em/inspectionPlanTask/controller/EmInspectionPlanTaskController.java b/jcdm-main/src/main/java/com/jcdm/main/em/inspectionPlanTask/controller/EmInspectionPlanTaskController.java
index 3e3ca6f..5975615 100644
--- a/jcdm-main/src/main/java/com/jcdm/main/em/inspectionPlanTask/controller/EmInspectionPlanTaskController.java
+++ b/jcdm-main/src/main/java/com/jcdm/main/em/inspectionPlanTask/controller/EmInspectionPlanTaskController.java
@@ -35,6 +35,16 @@
private IEmInspectionPlanTaskService emInspectionPlanTaskService;
/**
+ * 鏌ヨ鐐规浠诲姟鍒楄〃涓嶅垎椤�
+ */
+ @PostMapping("/noPageList")
+ public AjaxResult noPageList()
+ {
+ List<EmInspectionPlanTask> list = emInspectionPlanTaskService.list();
+ return AjaxResult.success(list);
+ }
+
+ /**
* 鏌ヨ鐐规浠诲姟鍒楄〃
*/
@PreAuthorize("@ss.hasPermi('em:inspectionPlanTask:list')")
diff --git a/jcdm-quartz/src/main/java/com/jcdm/quartz/task/RyTask.java b/jcdm-quartz/src/main/java/com/jcdm/quartz/task/RyTask.java
index d0f1e89..72e680d 100644
--- a/jcdm-quartz/src/main/java/com/jcdm/quartz/task/RyTask.java
+++ b/jcdm-quartz/src/main/java/com/jcdm/quartz/task/RyTask.java
@@ -25,4 +25,8 @@
{
System.out.println("鎵ц鏃犲弬鏂规硶");
}
+
+ public void inspectionPlanInfoHour(){
+
+ }
}
--
Gitblit v1.9.3