From a5661dee86ebb48c2ee282b7e0621bb313eab296 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期三, 19 二月 2025 10:53:11 +0800
Subject: [PATCH] BUG修改
---
.idea/workspace.xml | 148 ++++++++++++++++++++++++++++++++++++-------------
1 files changed, 108 insertions(+), 40 deletions(-)
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index fb57478..94b336a 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -4,13 +4,17 @@
<option name="autoReloadType" value="SELECTIVE" />
</component>
<component name="ChangeListManager">
- <list default="true" id="d7325e97-ef1a-4946-a53e-fea72f2992f8" name="Changes" comment="浠ｇ爜鎻愪氦">
+ <list default="true" id="d7325e97-ef1a-4946-a53e-fea72f2992f8" name="Changes" comment="">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/web/component/RedisMqReceiver.java" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/web/component/RedisMqReceiver.java" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/ruoyi-common/src/main/java/com/ruoyi/common/core/redis/RedisCache.java" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-common/src/main/java/com/ruoyi/common/core/redis/RedisCache.java" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskAnswerServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskAnswerServiceImpl.java" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskController.java" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskController.java" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/application-druid.yml" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/application-druid.yml" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/application.yml" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/application.yml" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/smartor/src/main/java/com/smartor/domain/ServiceTaskInfo.java" beforeDir="false" afterPath="$PROJECT_DIR$/smartor/src/main/java/com/smartor/domain/ServiceTaskInfo.java" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/smartor/src/main/java/com/smartor/service/impl/ServiceExternalServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/smartor/src/main/java/com/smartor/service/impl/ServiceExternalServiceImpl.java" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/smartor/src/main/java/com/smartor/service/impl/SvyTaskSingleServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/smartor/src/main/java/com/smartor/service/impl/SvyTaskSingleServiceImpl.java" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/smartor/src/main/resources/mapper/smartor/PatArchiveMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/smartor/src/main/resources/mapper/smartor/PatArchiveMapper.xml" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -67,7 +71,7 @@
<property name="ToolWindow闂.ShowToolbar" value="false" />
<property name="WebServerToolWindowFactoryState" value="false" />
<property name="aspect.path.notification.shown" value="true" />
- <property name="last_opened_file_path" value="$PROJECT_DIR$/../smartor-wuxi" />
+ <property name="last_opened_file_path" value="$PROJECT_DIR$/../smartor-old" />
<property name="node.js.detected.package.eslint" value="true" />
<property name="node.js.detected.package.tslint" value="true" />
<property name="node.js.path.for.package.eslint" value="project" />
@@ -93,11 +97,11 @@
<recent name="D:\daima\smartor\smartor-lisui\smartor\src\main\java\com\smartor\mapper" />
</key>
<key name="CopyClassDialog.RECENTS_KEY">
+ <recent name="com.ruoyi.common.enums" />
<recent name="com.smartor.domain" />
<recent name="com.ruoyi.web.controller.smartor" />
<recent name="com.smartor.service" />
<recent name="com.smartor.service.impl" />
- <recent name="com.smartor.mapper" />
</key>
</component>
<component name="RedisHelper">
@@ -228,9 +232,9 @@
</configuration>
<recent_temporary>
<list>
+ <item itemvalue="JUnit.MQTest.bb" />
<item itemvalue="JUnit.FtpService.aa" />
<item itemvalue="JUnit.FtpService" />
- <item itemvalue="JUnit.MQTest.bb" />
<item itemvalue="JUnit.MQTest" />
</list>
</recent_temporary>
@@ -332,7 +336,11 @@
<workItem from="1739411538383" duration="21710000" />
<workItem from="1739501318573" duration="2373000" />
<workItem from="1739507523684" duration="15221000" />
- <workItem from="1739766088739" duration="469000" />
+ <workItem from="1739766088739" duration="19833000" />
+ <workItem from="1739853347397" duration="14985000" />
+ <workItem from="1739883449850" duration="1411000" />
+ <workItem from="1739925717690" duration="1204000" />
+ <workItem from="1739929607529" duration="1684000" />
</task>
<task id="LOCAL-00001" summary="浠ｇ爜鎻愪氦">
<created>1730948127775</created>
@@ -383,7 +391,21 @@
<option name="project" value="LOCAL" />
<updated>1734406665810</updated>
</task>
- <option name="localTasksCounter" value="8" />
+ <task id="LOCAL-00008" summary="寰�闃熷垪鏂板鏄紝鍒ゆ柇鏄線澶撮儴鏂板杩樻槸寰�灏鹃儴鏂板">
+ <created>1739766619501</created>
+ <option name="number" value="00008" />
+ <option name="presentableId" value="LOCAL-00008" />
+ <option name="project" value="LOCAL" />
+ <updated>1739766619501</updated>
+ </task>
+ <task id="LOCAL-00009" summary="寰�闃熷垪鏂板鏄紝鍒ゆ柇鏄線澶撮儴鏂板杩樻槸寰�灏鹃儴鏂板">
+ <created>1739789537550</created>
+ <option name="number" value="00009" />
+ <option name="presentableId" value="LOCAL-00009" />
+ <option name="project" value="LOCAL" />
+ <updated>1739789537550</updated>
+ </task>
+ <option name="localTasksCounter" value="10" />
<servers />
</component>
<component name="TypeScriptGeneratedFilesManager">
@@ -403,7 +425,8 @@
<component name="VcsManagerConfiguration">
<MESSAGE value="浠ｇ爜鎻愪氦(闀挎湡浠诲姟鐢佃瘽瀹屾垚)" />
<MESSAGE value="浠ｇ爜鎻愪氦" />
- <option name="LAST_COMMIT_MESSAGE" value="浠ｇ爜鎻愪氦" />
+ <MESSAGE value="寰�闃熷垪鏂板鏄紝鍒ゆ柇鏄線澶撮儴鏂板杩樻槸寰�灏鹃儴鏂板" />
+ <option name="LAST_COMMIT_MESSAGE" value="寰�闃熷垪鏂板鏄紝鍒ゆ柇鏄線澶撮儴鏂板杩樻槸寰�灏鹃儴鏂板" />
</component>
<component name="XDebuggerManager">
<breakpoint-manager>
@@ -425,12 +448,12 @@
</line-breakpoint>
<line-breakpoint type="java-line">
<url>file://$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceExternalController.java</url>
- <line>116</line>
+ <line>115</line>
<option name="timeStamp" value="281" />
</line-breakpoint>
<line-breakpoint type="java-line">
<url>file://$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceExternalController.java</url>
- <line>133</line>
+ <line>132</line>
<option name="timeStamp" value="285" />
</line-breakpoint>
<line-breakpoint type="java-line">
@@ -525,18 +548,13 @@
</line-breakpoint>
<line-breakpoint type="java-line">
<url>file://$PROJECT_DIR$/smartor/src/main/java/com/smartor/service/impl/SvyTaskSingleServiceImpl.java</url>
- <line>206</line>
+ <line>209</line>
<option name="timeStamp" value="349" />
</line-breakpoint>
<line-breakpoint type="java-line">
<url>file://$PROJECT_DIR$/smartor/src/main/java/com/smartor/service/impl/SvyTaskSingleServiceImpl.java</url>
<line>214</line>
<option name="timeStamp" value="351" />
- </line-breakpoint>
- <line-breakpoint type="java-line">
- <url>file://$PROJECT_DIR$/smartor/src/main/java/com/smartor/service/impl/SvyTaskSingleServiceImpl.java</url>
- <line>311</line>
- <option name="timeStamp" value="352" />
</line-breakpoint>
<line-breakpoint type="java-line">
<url>file://$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceExternalController.java</url>
@@ -565,7 +583,7 @@
</line-breakpoint>
<line-breakpoint type="java-line">
<url>file://$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskController.java</url>
- <line>148</line>
+ <line>149</line>
<option name="timeStamp" value="359" />
</line-breakpoint>
<line-breakpoint type="java-line">
@@ -640,27 +658,27 @@
</line-breakpoint>
<line-breakpoint type="java-line">
<url>file://$PROJECT_DIR$/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java</url>
- <line>523</line>
+ <line>530</line>
<option name="timeStamp" value="383" />
</line-breakpoint>
<line-breakpoint type="java-line">
<url>file://$PROJECT_DIR$/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java</url>
- <line>662</line>
+ <line>669</line>
<option name="timeStamp" value="384" />
</line-breakpoint>
<line-breakpoint type="java-line">
<url>file://$PROJECT_DIR$/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java</url>
- <line>634</line>
+ <line>641</line>
<option name="timeStamp" value="385" />
</line-breakpoint>
<line-breakpoint type="java-line">
<url>file://$PROJECT_DIR$/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java</url>
- <line>1983</line>
+ <line>1991</line>
<option name="timeStamp" value="386" />
</line-breakpoint>
<line-breakpoint type="java-line">
<url>file://$PROJECT_DIR$/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java</url>
- <line>1979</line>
+ <line>1987</line>
<option name="timeStamp" value="387" />
</line-breakpoint>
<line-breakpoint type="java-line">
@@ -680,33 +698,83 @@
</line-breakpoint>
<line-breakpoint type="java-line">
<url>file://$PROJECT_DIR$/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java</url>
- <line>298</line>
- <option name="timeStamp" value="404" />
+ <line>320</line>
+ <option name="timeStamp" value="405" />
</line-breakpoint>
<line-breakpoint type="java-line">
<url>file://$PROJECT_DIR$/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java</url>
- <line>313</line>
- <option name="timeStamp" value="405" />
- </line-breakpoint>
- <line-breakpoint enabled="true" type="java-line">
- <url>file://$PROJECT_DIR$/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java</url>
- <line>255</line>
+ <line>256</line>
<option name="timeStamp" value="412" />
</line-breakpoint>
- <line-breakpoint enabled="true" type="java-line">
+ <line-breakpoint type="java-line">
<url>file://$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskController.java</url>
- <line>205</line>
+ <line>206</line>
<option name="timeStamp" value="415" />
</line-breakpoint>
- <line-breakpoint enabled="true" type="java-line">
+ <line-breakpoint type="java-line">
<url>file://$PROJECT_DIR$/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java</url>
- <line>1440</line>
+ <line>1442</line>
<option name="timeStamp" value="416" />
+ </line-breakpoint>
+ <line-breakpoint type="java-line">
+ <url>file://$PROJECT_DIR$/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java</url>
+ <line>1493</line>
+ <option name="timeStamp" value="417" />
+ </line-breakpoint>
+ <line-breakpoint type="java-line">
+ <url>file://$PROJECT_DIR$/smartor/src/main/java/com/smartor/service/impl/PatMedInhospServiceImpl.java</url>
+ <line>339</line>
+ <option name="timeStamp" value="420" />
+ </line-breakpoint>
+ <line-breakpoint type="java-line">
+ <url>file://$PROJECT_DIR$/smartor/src/main/java/com/smartor/service/impl/PatMedInhospServiceImpl.java</url>
+ <line>206</line>
+ <option name="timeStamp" value="421" />
+ </line-breakpoint>
+ <line-breakpoint type="java-line">
+ <url>file://$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/web/test/MQTest.java</url>
+ <line>51</line>
+ <option name="timeStamp" value="425" />
+ </line-breakpoint>
+ <line-breakpoint type="java-line">
+ <url>file://$PROJECT_DIR$/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java</url>
+ <line>2093</line>
+ <option name="timeStamp" value="426" />
+ </line-breakpoint>
+ <line-breakpoint type="java-line">
+ <url>file://$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskController.java</url>
+ <line>205</line>
+ <option name="timeStamp" value="427" />
+ </line-breakpoint>
+ <line-breakpoint type="java-line">
+ <url>file://$PROJECT_DIR$/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java</url>
+ <line>2102</line>
+ <option name="timeStamp" value="428" />
</line-breakpoint>
<line-breakpoint enabled="true" type="java-line">
<url>file://$PROJECT_DIR$/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java</url>
- <line>1489</line>
- <option name="timeStamp" value="417" />
+ <line>1510</line>
+ <option name="timeStamp" value="429" />
+ </line-breakpoint>
+ <line-breakpoint enabled="true" type="java-line">
+ <url>file://$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java</url>
+ <line>107</line>
+ <option name="timeStamp" value="431" />
+ </line-breakpoint>
+ <line-breakpoint enabled="true" type="java-line">
+ <url>file://$PROJECT_DIR$/smartor/src/main/java/com/smartor/service/impl/SvyTaskSingleServiceImpl.java</url>
+ <line>265</line>
+ <option name="timeStamp" value="432" />
+ </line-breakpoint>
+ <line-breakpoint enabled="true" type="java-line">
+ <url>file://$PROJECT_DIR$/smartor/src/main/java/com/smartor/service/impl/SvyTaskSingleServiceImpl.java</url>
+ <line>263</line>
+ <option name="timeStamp" value="433" />
+ </line-breakpoint>
+ <line-breakpoint enabled="true" type="java-line">
+ <url>file://$PROJECT_DIR$/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java</url>
+ <line>366</line>
+ <option name="timeStamp" value="434" />
</line-breakpoint>
<line-breakpoint enabled="true" type="java-method">
<url>file://$PROJECT_DIR$/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskAnswerServiceImpl.java</url>
--
Gitblit v1.9.3