From 74bfaf2f3a8c2661e2c8a512f61f40bfd43b48f3 Mon Sep 17 00:00:00 2001
From: yxh <172933527@qq.com>
Date: 星期一, 17 二月 2025 18:54:19 +0800
Subject: [PATCH] Merge branch 'master' of http://116.62.18.175:6699/r/smartor
---
.idea/workspace.xml | 202 ++++++++++++++++++++++++++++++++++----------------
1 files changed, 138 insertions(+), 64 deletions(-)
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 98587bd..b2ec3c1 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -4,7 +4,26 @@
<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 afterPath="$PROJECT_DIR$/ruoyi-common/src/main/java/com/ruoyi/common/enums/HospTypeEnum.java" afterDir="false" />
+ <change afterPath="$PROJECT_DIR$/ruoyi-common/src/main/java/com/ruoyi/common/enums/ServiceTaskTypeEnum.java" afterDir="false" />
+ <change afterPath="$PROJECT_DIR$/ruoyi-common/src/main/java/com/ruoyi/common/enums/TaskTypeEnum.java" afterDir="false" />
+ <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/controller/smartor/ServiceExternalController.java" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceExternalController.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/java/com/ruoyi/web/test/MQTest.java" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/web/test/MQTest.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-framework/src/main/java/com/ruoyi/framework/interceptor/HospitalFilterInterceptor.java" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-framework/src/main/java/com/ruoyi/framework/interceptor/HospitalFilterInterceptor.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/domain/ServiceSubtask.java" beforeDir="false" afterPath="$PROJECT_DIR$/smartor/src/main/java/com/smartor/domain/ServiceSubtask.java" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/smartor/src/main/java/com/smartor/domain/ServiceSubtaskVO.java" beforeDir="false" afterPath="$PROJECT_DIR$/smartor/src/main/java/com/smartor/domain/ServiceSubtaskVO.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/mapper/ServiceSubtaskMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/smartor/src/main/java/com/smartor/mapper/ServiceSubtaskMapper.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$/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/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" />
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
@@ -37,7 +56,6 @@
<option name="generalSettings">
<MavenGeneralSettings>
<option name="useMavenConfig" value="true" />
- <option name="userSettingsFile" value="D:\apache-maven-3.6.1\conf\settings.xml" />
</MavenGeneralSettings>
</option>
</component>
@@ -49,24 +67,32 @@
<option name="hideEmptyMiddlePackages" value="true" />
<option name="showLibraryContents" value="true" />
</component>
- <component name="PropertiesComponent"><![CDATA[{
- "keyToString": {
- "RequestMappingsPanelOrder0": "0",
- "RequestMappingsPanelOrder1": "1",
- "RequestMappingsPanelWidth0": "75",
- "RequestMappingsPanelWidth1": "75",
- "RunOnceActivity.ShowReadmeOnStart": "true",
- "WebServerToolWindowFactoryState": "false",
- "node.js.detected.package.eslint": "true",
- "node.js.detected.package.tslint": "true",
- "node.js.selected.package.eslint": "(autodetect)",
- "node.js.selected.package.tslint": "(autodetect)",
- "nodejs_package_manager_path": "npm",
- "settings.editor.selected.configurable": "MavenSettings",
- "spring.configuration.checksum": "ed7879021ad915c81cd04d3c0132bd07",
- "vue.rearranger.settings.migration": "true"
- }
-}]]></component>
+ <component name="PropertiesComponent">
+ <property name="RequestMappingsPanelOrder0" value="0" />
+ <property name="RequestMappingsPanelOrder1" value="1" />
+ <property name="RequestMappingsPanelOrder2" value="2" />
+ <property name="RequestMappingsPanelWidth0" value="75" />
+ <property name="RequestMappingsPanelWidth1" value="75" />
+ <property name="RequestMappingsPanelWidth2" value="75" />
+ <property name="RunOnceActivity.OpenProjectViewOnStart" value="true" />
+ <property name="RunOnceActivity.ShowReadmeOnStart" value="true" />
+ <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="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" />
+ <property name="node.js.path.for.package.tslint" value="project" />
+ <property name="node.js.selected.package.eslint" value="(autodetect)" />
+ <property name="node.js.selected.package.tslint" value="(autodetect)" />
+ <property name="nodejs_package_manager_path" value="npm" />
+ <property name="project.structure.last.edited" value="SDKs" />
+ <property name="project.structure.proportion" value="0.0" />
+ <property name="project.structure.side.proportion" value="0.2" />
+ <property name="settings.editor.selected.configurable" value="preferences.pluginManager" />
+ <property name="vue.rearranger.settings.migration" value="true" />
+ </component>
<component name="ReactorSettings">
<option name="notificationShown" value="true" />
</component>
@@ -79,11 +105,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">
@@ -112,6 +138,14 @@
<option name="password" value="Smartor" />
<option name="port" value="6020" />
<option name="url" value="192.168.191.181" />
+ </ConnectionInfo>
+ <ConnectionInfo>
+ <option name="global" value="false" />
+ <option name="id" value="58aa81a0-3273-4f33-8973-55a6deb8702e" />
+ <option name="name" value="116.62.18.175" />
+ <option name="password" value="Smartor" />
+ <option name="port" value="6020" />
+ <option name="url" value="116.62.18.175" />
</ConnectionInfo>
</list>
</option>
@@ -206,9 +240,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>
@@ -309,7 +343,8 @@
<workItem from="1739323404849" duration="23795000" />
<workItem from="1739411538383" duration="21710000" />
<workItem from="1739501318573" duration="2373000" />
- <workItem from="1739506814738" duration="2148000" />
+ <workItem from="1739507523684" duration="15221000" />
+ <workItem from="1739766088739" duration="19190000" />
</task>
<task id="LOCAL-00001" summary="浠ｇ爜鎻愪氦">
<created>1730948127775</created>
@@ -360,35 +395,14 @@
<option name="project" value="LOCAL" />
<updated>1734406665810</updated>
</task>
- <task id="LOCAL-00008" summary="浠ｇ爜鎻愪氦">
- <created>1739507205045</created>
+ <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>1739507205045</updated>
+ <updated>1739766619501</updated>
</task>
- <task id="LOCAL-00009" summary="浠ｇ爜鎻愪氦">
- <created>1739507308567</created>
- <option name="number" value="00009" />
- <option name="presentableId" value="LOCAL-00009" />
- <option name="project" value="LOCAL" />
- <updated>1739507308567</updated>
- </task>
- <task id="LOCAL-00010" summary="浠ｇ爜鎻愪氦">
- <created>1739513977819</created>
- <option name="number" value="00010" />
- <option name="presentableId" value="LOCAL-00010" />
- <option name="project" value="LOCAL" />
- <updated>1739513977819</updated>
- </task>
- <task id="LOCAL-00011" summary="浠ｇ爜鎻愪氦">
- <created>1739514859952</created>
- <option name="number" value="00011" />
- <option name="presentableId" value="LOCAL-00011" />
- <option name="project" value="LOCAL" />
- <updated>1739514859952</updated>
- </task>
- <option name="localTasksCounter" value="12" />
+ <option name="localTasksCounter" value="9" />
<servers />
</component>
<component name="TypeScriptGeneratedFilesManager">
@@ -408,7 +422,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>
@@ -430,12 +445,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">
@@ -530,7 +545,7 @@
</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">
@@ -540,7 +555,7 @@
</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>
+ <line>266</line>
<option name="timeStamp" value="352" />
</line-breakpoint>
<line-breakpoint type="java-line">
@@ -645,48 +660,108 @@
</line-breakpoint>
<line-breakpoint type="java-line">
<url>file://$PROJECT_DIR$/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java</url>
- <line>522</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>661</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>633</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>1965</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>1961</line>
+ <line>1987</line>
<option name="timeStamp" value="387" />
</line-breakpoint>
- <line-breakpoint enabled="true" type="java-line">
+ <line-breakpoint type="java-line">
<url>file://$PROJECT_DIR$/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java</url>
<line>249</line>
<option name="timeStamp" value="390" />
</line-breakpoint>
- <line-breakpoint enabled="true" type="java-line">
+ <line-breakpoint type="java-line">
<url>file://$PROJECT_DIR$/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java</url>
<line>248</line>
<option name="timeStamp" value="393" />
</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/system/SysRoleController.java</url>
<line>107</line>
<option name="timeStamp" value="395" />
</line-breakpoint>
+ <line-breakpoint type="java-line">
+ <url>file://$PROJECT_DIR$/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java</url>
+ <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>256</line>
+ <option name="timeStamp" value="412" />
+ </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="415" />
+ </line-breakpoint>
+ <line-breakpoint type="java-line">
+ <url>file://$PROJECT_DIR$/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java</url>
+ <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>204</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>1447</line>
- <option name="timeStamp" value="397" />
+ <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-method">
<url>file://$PROJECT_DIR$/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskAnswerServiceImpl.java</url>
@@ -702,7 +777,6 @@
<pin-to-top-manager>
<pinned-members>
<PinnedItemInfo />
- <PinnedItemInfo parentTag="com.smartor.domain.IvrLibaTemplateScriptVO" memberName="ivrLibaScriptTargetoptionList" />
</pinned-members>
</pin-to-top-manager>
</component>
--
Gitblit v1.9.3