From adaaeac9fa3688ce80f5abc97f7de4e6fab11229 Mon Sep 17 00:00:00 2001
From: hao <1836460075@qq.com>
Date: 星期一, 22 十二月 2025 09:59:29 +0800
Subject: [PATCH] 11
---
HM-pda/.idea/workspace.xml | 62 +++++++++++++++++++++---------
HM-pda/src/main/java/com/web/pda/lyt/ftp/service/FileCheckLytService.java | 2
HM-pda/usr/local/spring/spring.log.2025-04-29.0.gz | 0
HM-pda/src/main/java/com/web/pda/lyt/ftp/controller/FileCheckLytController.java | 6 ++-
HM-pda/src/main/resources/application.properties | 2
HM-pda/src/main/java/com/web/pda/lyt/ftp/service/internal/FileCheckLytImpl.java | 2
HM-pda/.idea/vcs.xml | 1
HM-pda/usr/local/spring/spring.log.2025-04-03.0.gz | 0
8 files changed, 51 insertions(+), 24 deletions(-)
diff --git a/HM-pda/.idea/vcs.xml b/HM-pda/.idea/vcs.xml
index 35eb1dd..62bd7a0 100644
--- a/HM-pda/.idea/vcs.xml
+++ b/HM-pda/.idea/vcs.xml
@@ -2,5 +2,6 @@
<project version="4">
<component name="VcsDirectoryMappings">
<mapping directory="" vcs="Git" />
+ <mapping directory="$PROJECT_DIR$/.." vcs="Git" />
</component>
</project>
\ No newline at end of file
diff --git a/HM-pda/.idea/workspace.xml b/HM-pda/.idea/workspace.xml
index 240685e..ab0d21d 100644
--- a/HM-pda/.idea/workspace.xml
+++ b/HM-pda/.idea/workspace.xml
@@ -9,14 +9,21 @@
<option name="autoReloadType" value="SELECTIVE" />
</component>
<component name="ChangeListManager">
- <list default="true" id="2f6e17fa-d23f-4954-9294-0ab7d74e701f" name="鏇存敼" comment="" />
+ <list default="true" id="2f6e17fa-d23f-4954-9294-0ab7d74e701f" name="鏇存敼" comment="">
+ <change beforePath="$PROJECT_DIR$/.idea/vcs.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/vcs.xml" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/src/main/java/com/web/pda/lyt/ftp/controller/FileCheckLytController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/web/pda/lyt/ftp/controller/FileCheckLytController.java" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/src/main/java/com/web/pda/lyt/ftp/service/FileCheckLytService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/web/pda/lyt/ftp/service/FileCheckLytService.java" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/src/main/java/com/web/pda/lyt/ftp/service/internal/FileCheckLytImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/web/pda/lyt/ftp/service/internal/FileCheckLytImpl.java" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/src/main/resources/application.properties" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/application.properties" afterDir="false" />
+ </list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
<option name="LAST_RESOLUTION" value="IGNORE" />
</component>
<component name="Git.Settings">
- <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
+ <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$/.." />
</component>
<component name="LogFilters">
<option name="FILTER_ERRORS" value="false" />
@@ -47,24 +54,24 @@
<option name="hideEmptyMiddlePackages" value="true" />
<option name="showLibraryContents" value="true" />
</component>
- <component name="PropertiesComponent"><![CDATA[{
- "keyToString": {
- "RunOnceActivity.OpenProjectViewOnStart": "true",
- "RunOnceActivity.ShowReadmeOnStart": "true",
- "WebServerToolWindowFactoryState": "false",
- "git-widget-placeholder": "main",
- "last_opened_file_path": "E:/妗岄潰/鐒曞獎/鎺ュ彛/鍚庣/HM-pda/pom.xml",
- "node.js.detected.package.eslint": "true",
- "node.js.detected.package.tslint": "true",
- "node.js.selected.package.eslint": "(autodetect)",
- "node.js.selected.package.tslint": "(autodetect)",
- "project.structure.last.edited": "搴�",
- "project.structure.proportion": "0.0",
- "project.structure.side.proportion": "0.2",
- "settings.editor.selected.configurable": "MavenSettings",
- "vue.rearranger.settings.migration": "true"
+ <component name="PropertiesComponent">{
+ "keyToString": {
+ "RunOnceActivity.OpenProjectViewOnStart": "true",
+ "RunOnceActivity.ShowReadmeOnStart": "true",
+ "WebServerToolWindowFactoryState": "false",
+ "git-widget-placeholder": "master",
+ "last_opened_file_path": "E:/妗岄潰/鐒曞獎/鎺ュ彛/鍚庣/HM-pda/pom.xml",
+ "node.js.detected.package.eslint": "true",
+ "node.js.detected.package.tslint": "true",
+ "node.js.selected.package.eslint": "(autodetect)",
+ "node.js.selected.package.tslint": "(autodetect)",
+ "project.structure.last.edited": "搴�",
+ "project.structure.proportion": "0.0",
+ "project.structure.side.proportion": "0.2",
+ "settings.editor.selected.configurable": "preferences.pluginManager",
+ "vue.rearranger.settings.migration": "true"
}
-}]]></component>
+}</component>
<component name="RecentsManager">
<key name="CopyClassDialog.RECENTS_KEY">
<recent name="com.web.pda.lyt.lytPda.controller" />
@@ -246,6 +253,23 @@
<workItem from="1744192085414" duration="607000" />
<workItem from="1744766806354" duration="1621000" />
<workItem from="1744787363666" duration="68000" />
+ <workItem from="1744787802909" duration="3985000" />
+ <workItem from="1744849130490" duration="1961000" />
+ <workItem from="1745898460570" duration="2340000" />
+ <workItem from="1746508375091" duration="1644000" />
+ <workItem from="1746580717275" duration="600000" />
+ <workItem from="1747132695386" duration="23000" />
+ <workItem from="1747733341346" duration="233000" />
+ <workItem from="1747804268455" duration="2087000" />
+ <workItem from="1747816531926" duration="801000" />
+ <workItem from="1747874610148" duration="2050000" />
+ <workItem from="1748498802234" duration="12000" />
+ <workItem from="1749524615186" duration="1444000" />
+ <workItem from="1753772958463" duration="1412000" />
+ <workItem from="1754895777547" duration="5000" />
+ <workItem from="1758850517369" duration="321000" />
+ <workItem from="1758936262130" duration="510000" />
+ <workItem from="1765529554035" duration="769000" />
</task>
<servers />
</component>
diff --git a/HM-pda/src/main/java/com/web/pda/lyt/ftp/controller/FileCheckLytController.java b/HM-pda/src/main/java/com/web/pda/lyt/ftp/controller/FileCheckLytController.java
index ccd31a6..a394623 100644
--- a/HM-pda/src/main/java/com/web/pda/lyt/ftp/controller/FileCheckLytController.java
+++ b/HM-pda/src/main/java/com/web/pda/lyt/ftp/controller/FileCheckLytController.java
@@ -30,7 +30,9 @@
public ApiResponseResult uploadFilepqc(@RequestParam(value = "type1") String type,
@RequestParam(value = "company") String company,@RequestParam(value = "factory") String factory,
@RequestParam(value = "mid") String mid,@RequestParam(value = "username") String username,
- @RequestParam(value = "note") String note, @RequestParam("file0") MultipartFile[] files0,
+ @RequestParam(value = "note") String note,
+ @RequestParam("pid") String pid, // 鉁� 鏂板
+ @RequestParam("file0") MultipartFile[] files0,
@RequestParam("file1") MultipartFile[] files1,@RequestParam("file2") MultipartFile[] files2,
@RequestParam("file3") MultipartFile[] files3,@RequestParam("file4") MultipartFile[] files4,
@RequestParam("file5") MultipartFile[] files5,@RequestParam("file6") MultipartFile[] files6,
@@ -65,7 +67,7 @@
if(files8.length > 0){
files[8] = files8[0];
}
- return fileCheckLytService.uploadFilepqc(factory,company,username,Integer.parseInt(mid),Integer.parseInt(type),note,files);
+ return fileCheckLytService.uploadFilepqc(factory,company,username,Integer.parseInt(mid),Integer.parseInt(type),note,files,pid);
} catch (Exception e) {
System.out.println(e.toString());
return ApiResponseResult.failure("鑾峰彇ftp鐨勫熀纭�鏁版嵁澶辫触锛�");
diff --git a/HM-pda/src/main/java/com/web/pda/lyt/ftp/service/FileCheckLytService.java b/HM-pda/src/main/java/com/web/pda/lyt/ftp/service/FileCheckLytService.java
index 59d0943..b7118ed 100644
--- a/HM-pda/src/main/java/com/web/pda/lyt/ftp/service/FileCheckLytService.java
+++ b/HM-pda/src/main/java/com/web/pda/lyt/ftp/service/FileCheckLytService.java
@@ -7,7 +7,7 @@
public interface FileCheckLytService {
- public ApiResponseResult uploadFilepqc(String factory,String company,String username,int mid,int type,String note, MultipartFile[] file) throws Exception;
+ public ApiResponseResult uploadFilepqc(String factory,String company,String username,int mid,int type,String note, MultipartFile[] file,String pid) throws Exception;
public ApiResponseResult uploadFileIpqc(String factory,String company,String username,int mid,int type,String note, MultipartFile[] file) throws Exception;
diff --git a/HM-pda/src/main/java/com/web/pda/lyt/ftp/service/internal/FileCheckLytImpl.java b/HM-pda/src/main/java/com/web/pda/lyt/ftp/service/internal/FileCheckLytImpl.java
index dcd06cb..72abfa6 100644
--- a/HM-pda/src/main/java/com/web/pda/lyt/ftp/service/internal/FileCheckLytImpl.java
+++ b/HM-pda/src/main/java/com/web/pda/lyt/ftp/service/internal/FileCheckLytImpl.java
@@ -42,7 +42,7 @@
@Override
public ApiResponseResult uploadFilepqc(String factory, String company, String username, int mid, int type,
- String note, MultipartFile[] files) throws Exception {
+ String note, MultipartFile[] files,String pid) throws Exception {
// TODO Auto-generated method stub
List<String> a = getInfo(factory, company, username, mid, type);
System.out.println(a); // 杩斿洖鏁版嵁 [鏄惁鍑洪敊鏍囪瘑锛�0娌￠敊 1鍑洪敊, 0瀵瑰簲null 1灏卞搴旀湁淇℃伅, fs.ftp.url, fs.ftp.username, fs.ftp.password, fs.ftp.port, 鏂囦欢璺緞]
diff --git a/HM-pda/src/main/resources/application.properties b/HM-pda/src/main/resources/application.properties
index 08b77bc..7cee2c7 100644
--- a/HM-pda/src/main/resources/application.properties
+++ b/HM-pda/src/main/resources/application.properties
@@ -123,7 +123,7 @@
server.session.timeout=1800
-server.port = 9991
+server.port = 8180
spring.jmx.enabled=false
diff --git a/HM-pda/usr/local/spring/spring.log.2025-04-03.0.gz b/HM-pda/usr/local/spring/spring.log.2025-04-03.0.gz
new file mode 100644
index 0000000..b34eb5d
--- /dev/null
+++ b/HM-pda/usr/local/spring/spring.log.2025-04-03.0.gz
Binary files differ
diff --git a/HM-pda/usr/local/spring/spring.log.2025-04-29.0.gz b/HM-pda/usr/local/spring/spring.log.2025-04-29.0.gz
new file mode 100644
index 0000000..1edad06
--- /dev/null
+++ b/HM-pda/usr/local/spring/spring.log.2025-04-29.0.gz
Binary files differ
--
Gitblit v1.9.3