From 4722a5abc5bfd5c275096c9f024c0fe27db2eefd Mon Sep 17 00:00:00 2001
From: “zhuo” <“zhuo@itcast.cn”>
Date: 星期四, 10 八月 2023 13:13:30 +0800
Subject: [PATCH] 8-10提交代码
---
/dev/null | 6 ------
cnas-server/src/main/java/com/yuanchu/limslaboratory/controller/CnasAnnualPlanController.java | 12 ++++++++++++
2 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/.idea/.gitignore b/.idea/.gitignore
deleted file mode 100644
index 35410ca..0000000
--- a/.idea/.gitignore
+++ /dev/null
@@ -1,8 +0,0 @@
-# 榛樿蹇界暐鐨勬枃浠�
-/shelf/
-/workspace.xml
-# 鍩轰簬缂栬緫鍣ㄧ殑 HTTP 瀹㈡埛绔姹�
-/httpRequests/
-# Datasource local storage ignored files
-/dataSources/
-/dataSources.local.xml
diff --git a/.idea/aws.xml b/.idea/aws.xml
deleted file mode 100644
index b63b642..0000000
--- a/.idea/aws.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
- <component name="accountSettings">
- <option name="activeRegion" value="us-east-1" />
- <option name="recentlyUsedRegions">
- <list>
- <option value="us-east-1" />
- </list>
- </option>
- </component>
-</project>
\ No newline at end of file
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
deleted file mode 100644
index 87180da..0000000
--- a/.idea/compiler.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
- <component name="CompilerConfiguration">
- <annotationProcessing>
- <profile default="true" name="Default" enabled="true" />
- <profile name="Maven default annotation processors profile" enabled="true">
- <sourceOutputDir name="target/generated-sources/annotations" />
- <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
- <outputRelativeToContentRoot value="true" />
- <module name="inspection-server" />
- <module name="framework" />
- <module name="sys" />
- <module name="standard-server" />
- <module name="laboratory-server" />
- <module name="user-server" />
- </profile>
- </annotationProcessing>
- </component>
- <component name="JavacSettings">
- <option name="ADDITIONAL_OPTIONS_OVERRIDE">
- <module name="framework" options="-parameters" />
- <module name="inspection-server" options="-parameters" />
- <module name="laboratory-server" options="-parameters" />
- <module name="standard-server" options="-parameters" />
- <module name="sys" options="-parameters" />
- <module name="user-server" options="-parameters" />
- </option>
- </component>
-</project>
\ No newline at end of file
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
deleted file mode 100644
index 343cd9b..0000000
--- a/.idea/encodings.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
- <component name="Encoding" defaultCharsetForPropertiesFiles="UTF-8">
- <file url="file://$PROJECT_DIR$/framework/src/main/java" charset="UTF-8" />
- <file url="file://$PROJECT_DIR$/inspection-server/src/main/java" charset="UTF-8" />
- <file url="file://$PROJECT_DIR$/laboratory-server/src/main/java" charset="UTF-8" />
- <file url="file://$PROJECT_DIR$/src/main/java" charset="UTF-8" />
- <file url="file://$PROJECT_DIR$/standard-server/src/main/java" charset="UTF-8" />
- <file url="file://$PROJECT_DIR$/sys/src/main/java" charset="UTF-8" />
- <file url="file://$PROJECT_DIR$/user-server/src/main/java" charset="UTF-8" />
- <file url="PROJECT" charset="UTF-8" />
- </component>
-</project>
\ No newline at end of file
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
deleted file mode 100644
index 980588c..0000000
--- a/.idea/jarRepositories.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
- <component name="RemoteRepositoriesConfiguration">
- <remote-repository>
- <option name="id" value="central" />
- <option name="name" value="Maven Central repository" />
- <option name="url" value="https://repo1.maven.org/maven2" />
- </remote-repository>
- <remote-repository>
- <option name="id" value="jboss.community" />
- <option name="name" value="JBoss Community repository" />
- <option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
- </remote-repository>
- <remote-repository>
- <option name="id" value="central" />
- <option name="name" value="Central Repository" />
- <option name="url" value="http://maven.aliyun.com/nexus/content/groups/public" />
- </remote-repository>
- </component>
-</project>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
deleted file mode 100644
index 132404b..0000000
--- a/.idea/misc.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
- <component name="ExternalStorageConfigurationManager" enabled="true" />
- <component name="MavenProjectsManager">
- <option name="originalFiles">
- <list>
- <option value="$PROJECT_DIR$/pom.xml" />
- </list>
- </option>
- </component>
- <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
- <output url="file://$PROJECT_DIR$/out" />
- </component>
-</project>
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
deleted file mode 100644
index 35eb1dd..0000000
--- a/.idea/vcs.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
- <component name="VcsDirectoryMappings">
- <mapping directory="" vcs="Git" />
- </component>
-</project>
\ No newline at end of file
diff --git a/cnas-server/src/main/java/com/yuanchu/limslaboratory/controller/CnasAnnualPlanController.java b/cnas-server/src/main/java/com/yuanchu/limslaboratory/controller/CnasAnnualPlanController.java
index 27b1a89..0095dcc 100644
--- a/cnas-server/src/main/java/com/yuanchu/limslaboratory/controller/CnasAnnualPlanController.java
+++ b/cnas-server/src/main/java/com/yuanchu/limslaboratory/controller/CnasAnnualPlanController.java
@@ -1,7 +1,11 @@
package com.yuanchu.limslaboratory.controller;
+import com.yuanchu.limslaboratory.service.CnasAnnualPlanService;
+import com.yuanchu.limslaboratory.vo.Result;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.stereotype.Controller;
+
+import javax.annotation.Resource;
/**
* <p>
@@ -15,4 +19,12 @@
@RequestMapping("/cnasAnnualPlan")
public class CnasAnnualPlanController {
+ @Resource
+ private CnasAnnualPlanService cnasAnnualPlanService;
+
+
+// public Result selectAll() {
+//
+// }
+
}
--
Gitblit v1.9.3