Merge branch 'master' of http://116.62.18.175:6699/r/smartor

yxh

2025-02-17 74bfaf2f3a8c2661e2c8a512f61f40bfd43b48f3

Merge branch 'master' of http://116.62.18.175:6699/r/smartor

# Conflicts:
#	.idea/workspace.xml

 .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>

 ruoyi-admin/src/main/java/com/ruoyi/web/component/RedisMqReceiver.java

@@ -211,7 +211,7 @@
                                    list.add(serviceSubtask2.getId().toString());
                                }
                                log.error("缓存中cache-0的值为：{}", list);
                                redisCache.setCacheList("cache-0", list);
                                redisCache.setCacheListLeft("cache-0", list);
                            } else {
                                //非立即发送
                                ServiceSubtaskVO serviceSubtask1 = new ServiceSubtaskVO();
@@ -221,7 +221,7 @@
                                for (ServiceSubtask serviceSubtask2 : selectServiceSubtaskList1) {
                                    list.add(serviceSubtask2.getId().toString());
                                }
                                redisCache.setCacheList(key, list);
                                redisCache.setCacheListLeft(key, list);
                            }
                        } catch (Exception exception) {
                            ServiceSubtaskRecord serviceSubtaskRecord = new ServiceSubtaskRecord();

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceExternalController.java

@@ -61,12 +61,11 @@
     */
    @ApiOperation("新增任务")
    @PostMapping("/generalInterfaceAddTask")
    public AjaxResult generalInterfaceAddTask(@RequestBody ServiceTaskInfo serviceSubtask) {
        ServiceTaskInfo serviceTaskVO = null;
    public AjaxResult generalInterfaceAddTask(@RequestBody ServiceTaskInfo serviceTaskInfo) {
        log.error("------serviceTaskInfo的值为：{}", serviceTaskInfo);
        Integer res = 0;
        try {
            serviceTaskVO = DtoConversionUtils.sourceToTarget(serviceSubtask, ServiceTaskInfo.class);
            res = svyTaskSingleService.insertTaskInfo(serviceTaskVO);
            res = svyTaskSingleService.insertTaskInfo(serviceTaskInfo);
        } catch (Exception e) {
            e.printStackTrace();
            log.error("serviceExternal---generalInterfaceAddTask出异常了：{}", e.getMessage());

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskController.java

@@ -190,8 +190,8 @@
    @PostMapping("/phoneCallBackYQ")
    public PhoneCallBackYQVO phoneCallBackYQ(@RequestBody PhoneCallReqYQVO phoneCallReqYQVO) {
        log.error("电话ASR通话回调(雨绮) ï¼Ÿ{}", phoneCallReqYQVO);
        SysUser user = getLoginUser().getUser();
        phoneCallReqYQVO.setOrgid(user.getOrgid());
//        SysUser user = getLoginUser().getUser();
//        phoneCallReqYQVO.setOrgid(user.getOrgid());
        PhoneCallBackYQVO phoneCallBackYQVO = serviceSubtaskService.phoneCallBackYQ(phoneCallReqYQVO);
        return phoneCallBackYQVO;
    }
@@ -204,6 +204,8 @@
    public List<PullTaskVO> taskPull() {
        log.error("电话任务拉取(雨绮)");
        List<PullTaskVO> pullTaskVOList = serviceSubtaskService.taskPull();
//        List<PullTaskVO> pullTaskVOList = new ArrayList<>();

        log.error("电话任务拉取(雨绮):{}", pullTaskVOList);
        return pullTaskVOList;
    }
@@ -214,8 +216,8 @@
    @ApiOperation("患者问题结果记录（电话）")
    @PostMapping("/saveQuestionAnswerPhone")
    public AjaxResult saveQuestionAnswerPhone(@RequestBody ServiceSubTaskDetailReq serviceSubTaskDetailReq) {
        SysUser user = getLoginUser().getUser();
        serviceSubTaskDetailReq.setOrgid(user.getOrgid());
//        SysUser user = getLoginUser().getUser();
//        serviceSubTaskDetailReq.setOrgid(user.getOrgid());
        return toAjax(serviceSubtaskService.saveQuestionAnswerPhone(serviceSubTaskDetailReq));
    }

@@ -236,8 +238,8 @@
    public AjaxResult recordAccept(@RequestBody PhoneCallRecordVO phoneCallRecordVO) {
        log.error("通话记录回调(雨绮):{}", phoneCallRecordVO);
//        return toAjax(serviceSubtaskService.saveQuestionAnswerPhone(serviceSubTaskDetailReq));
        SysUser user = getLoginUser().getUser();
        phoneCallRecordVO.setOrgid(user.getOrgid());
//        SysUser user = getLoginUser().getUser();
//        phoneCallRecordVO.setOrgid(user.getOrgid());
        serviceSubtaskService.recordAccept(phoneCallRecordVO);
        return success();
    }

 ruoyi-admin/src/main/java/com/ruoyi/web/test/MQTest.java

@@ -48,7 +48,8 @@

    @Test
    public void bb() {

        int i = 61 /60;
        System.out.println(i);
    }

    public void aa(MultipartFile file) throws IOException {

 ruoyi-admin/src/main/resources/application-druid.yml

@@ -11,12 +11,12 @@
        #        username: root
        #        password: 123456
        #        å…¬å¸
        # url: jdbc:mysql://192.168.2.9:3308/smartor?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
        url: jdbc:mysql://192.168.2.9:3308/smartor?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
        #        ä¸½æ°´
        #        url: jdbc:mysql://127.0.0.1:3308/smartor-lisui?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
        #        username: smartor
        #        password: Smartor.2023
        #        driverClassName: com.mysql.cj.jdbc.Driver
        username: smartor
        password: Smartor.2023
        driverClassName: com.mysql.cj.jdbc.Driver
        # æ–°åŽ
        # url: jdbc:mysql://192.168.191.181:3308/smartor?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
        # username: smartor
@@ -24,10 +24,10 @@
        # driverClassName: com.mysql.cj.jdbc.Driver

        #        å…¬å¸äº‘
        url: jdbc:mysql://116.62.18.175:6002/smartor?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
        username: hxsoft
        password: Hxerp2000
        driverClassName: com.mysql.cj.jdbc.Driver
      #        url: jdbc:mysql://116.62.18.175:6002/smartor_lisui?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
      #        username: hxsoft
      #        password: Hxerp2000
      #        driverClassName: com.mysql.cj.jdbc.Driver

      # ä»Žåº“数据源
      slave:
@@ -207,5 +207,7 @@
#允许自动生成任务
createTaskServiceType: 2

#每天电话立即执行的上限
phoneUpEveryHour: 120
#第个小时电话拨打的上限
phoneUpEveryHour: 12
#电话每天结束时间
phoneEndHour: 20

 ruoyi-admin/src/main/resources/application.yml

 ruoyi-common/src/main/java/com/ruoyi/common/core/redis/RedisCache.java

@@ -8,10 +8,7 @@
import java.util.concurrent.TimeUnit;

import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.core.BoundSetOperations;
import org.springframework.data.redis.core.HashOperations;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.data.redis.core.ValueOperations;
import org.springframework.data.redis.core.*;
import org.springframework.stereotype.Component;

/**
@@ -127,8 +124,20 @@
     * @param dataList å¾…缓存的List数据
     * @return ç¼“存的对象
     */
    public <T> long setCacheList(final String key, final List<T> dataList) {
    public <T> long setCacheListRight(final String key, final List<T> dataList) {
        Long count = redisTemplate.opsForList().rightPushAll(key, dataList);
        return count == null ? 0 : count;
    }

    /**
     * ç¼“å­˜List数据
     *
     * @param key      ç¼“存的键值
     * @param dataList å¾…缓存的List数据(这里如果新增的话，是往头部新增)
     * @return ç¼“存的对象
     */
    public <T> long setCacheListLeft(final String key, final List<T> dataList) {
        Long count = redisTemplate.opsForList().leftPushAll(key, dataList);
        return count == null ? 0 : count;
    }

@@ -245,6 +254,19 @@
    }

    /**
     * åˆ é™¤ç¼“å­˜LIST中的某个数据
     *
     * @param key           Redis键
     * @param valueToRemove éœ€è¦åˆ é™¤çš„值
     * @return Long å¤§äºŽ0表示删除了几个，等于0表示没有删除，小于0表示在执行删除操作时发生了错误
     */
    public Long removeElementFromList(String key, String valueToRemove) {
        ListOperations<String, String> listOps = redisTemplate.opsForList();
        Long remove = listOps.remove(key, 0, valueToRemove);
        return remove;
    }

    /**
     * èŽ·å¾—缓存的基本对象列表
     *
     * @param pattern å­—符串前缀

 ruoyi-common/src/main/java/com/ruoyi/common/enums/HospTypeEnum.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,45 @@
package com.ruoyi.common.enums;

/**
 * å‘送类型枚举
 */
public enum HospTypeEnum {
    é—¨è¯Š("1", "门诊"), å‡ºé™¢("2", "、出院"), ä¸“ç—…("3", "专病"), å¤–部导入("4", "外部导入"), æ€¥è¯Š("5", "、急诊"), ä½é™¢("6", "住院"), ä½“检("7", "体检");


    private String code;
    private String desc;

    HospTypeEnum(String code, String desc) {
        this.code = code;
        this.desc = desc;
    }

    public static String getDescByCode(String desc) {
        HospTypeEnum[] organEnums = values();
        for (int i = 0; i < organEnums.length; i++) {
            HospTypeEnum organEnum = organEnums[i];
            if (organEnum.getDesc().equals(desc)) {
                return organEnum.getCode();
            }
        }
        return "0";
    }


    public String getCode() {
        return code;
    }

    public void setCode(String code) {
        this.code = code;
    }

    public String getDesc() {
        return desc;
    }

    public void setDesc(String desc) {
        this.desc = desc;
    }
}

 ruoyi-common/src/main/java/com/ruoyi/common/enums/ServiceTaskTypeEnum.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,45 @@
package com.ruoyi.common.enums;

/**
 * å‘送类型枚举
 */
public enum ServiceTaskTypeEnum {
    ä½“检随访("9", "体检随访 "), åŒ»æŠ€éšè®¿("10", "医技随访");


    private String code;
    private String desc;

    ServiceTaskTypeEnum(String code, String desc) {
        this.code = code;
        this.desc = desc;
    }

    public static String getDescByCode(String desc) {
        ServiceTaskTypeEnum[] organEnums = values();
        for (int i = 0; i < organEnums.length; i++) {
            ServiceTaskTypeEnum organEnum = organEnums[i];
            if (organEnum.getDesc().equals(desc)) {
                return organEnum.getCode();
            }
        }
        return "0";
    }


    public String getCode() {
        return code;
    }

    public void setCode(String code) {
        this.code = code;
    }

    public String getDesc() {
        return desc;
    }

    public void setDesc(String desc) {
        this.desc = desc;
    }
}

 ruoyi-common/src/main/java/com/ruoyi/common/enums/TaskTypeEnum.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,45 @@
package com.ruoyi.common.enums;

/**
 * å‘送类型枚举
 */
public enum TaskTypeEnum {
    ä½“检随访("8", "体检随访"),  å¿ƒç”µä¸“科随访("9", "、心电专科随访"), å½±åƒä¸“科随访("10", "影像专科随访");


    private String code;
    private String desc;

    TaskTypeEnum(String code, String desc) {
        this.code = code;
        this.desc = desc;
    }

    public static String getDescByCode(String desc) {
        TaskTypeEnum[] organEnums = values();
        for (int i = 0; i < organEnums.length; i++) {
            TaskTypeEnum organEnum = organEnums[i];
            if (organEnum.getDesc().equals(desc)) {
                return organEnum.getCode();
            }
        }
        return "0";
    }


    public String getCode() {
        return code;
    }

    public void setCode(String code) {
        this.code = code;
    }

    public String getDesc() {
        return desc;
    }

    public void setDesc(String desc) {
        this.desc = desc;
    }
}

 ruoyi-framework/src/main/java/com/ruoyi/framework/interceptor/HospitalFilterInterceptor.java

@@ -72,7 +72,7 @@
     * @return ä¿®æ”¹åŽçš„ SQL
     */
    private String modifySqlWithorgidId(String originalSql, String orgid) {
        if (originalSql.contains("insert into") || originalSql.contains("INSERT INTO") || originalSql.contains("from sys_menu"))
        if (originalSql.contains("insert into") || originalSql.contains("INSERT INTO") || originalSql.contains("from sys_menu") || originalSql.contains("update sys_menu"))
            return originalSql;
        // æå– orgid çš„ WHERE å­å¥
        String whereClause = " orgid = '" + orgid + "'";

 ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java

@@ -48,6 +48,7 @@
import java.time.ZoneId;
import java.time.format.DateTimeFormatter;
import java.util.*;
import java.util.stream.Collectors;

/**
 * å®šæ—¶ä»»åŠ¡è°ƒåº¦æµ‹è¯•
@@ -308,7 +309,13 @@
                ServiceSubtaskVO ivrTaskcall = new ServiceSubtaskVO();
                ivrTaskcall.setTaskid(commonTaskcallMQ.getTaskid());
                ivrTaskcall.setSendstate(2L);
                List<ServiceSubtask> selectServiceSubtaskList = iServiceSubtaskService.selectServiceSubtaskList(ivrTaskcall);
                List<ServiceSubtask> subtaskList = iServiceSubtaskService.selectServiceSubtaskList(ivrTaskcall);

                // æŒ‰ç…§ endtime ç¦»å½“前时间最近的排序
                List<ServiceSubtask> selectServiceSubtaskList = subtaskList.stream()
                        .sorted(Comparator.comparing(subtask -> Math.abs(subtask.getEndtime().getTime() - new Date().getTime())))
                        .collect(Collectors.toList());

                if (descByCode.equals("电话")) {
                    String value = "";
                    List<String> list = new ArrayList<>();
@@ -343,8 +350,9 @@
                        }
                    }
                    //将要执行的放到缓存中
                    redisCache.setCacheList("cache-0", list);

                    if (list.size() > 0) {
                        redisCache.setCacheListLeft("cache-0", list);
                    }
                } else if (descByCode.equals("多媒体")) {
                    //多媒体
                } else if (descByCode.equals("纸质")) {

 smartor/src/main/java/com/smartor/domain/ServiceSubtask.java

@@ -35,6 +35,12 @@
    private Long taskid;

    /**
     * ç¬¬ä¸‰æ–¹ä»»åŠ¡ID
     */
    @ApiModelProperty(value = "第三方任务ID")
    private String taskGuid;

    /**
     * å‡ºé™¢ç—…人记录ID
     */
    @ApiModelProperty(value = "出院病人记录ID")
@@ -144,14 +150,14 @@
     * ä»»åŠ¡ç±»åž‹(门诊，住院，复诊…)
     */
    @Excel(name = "任务类型(0通知、1宣教、2门诊、3出院、4复诊、5体检、6问卷、7医技……)")
    @ApiModelProperty(value = "任务类型(0通知、1宣教、2门诊、3出院、4复诊、5体检、6问卷、7医技……)")
    @ApiModelProperty(value = "任务类型(0通知、1宣教、2门诊、3出院、4复诊、5体检、6问卷、7医技、8体检随访、9影像专科随访、10心电专科随访……)")
    private String type;

    /**
     * æœåŠ¡ç±»åž‹(1、监测评估；2、出院随访；3、门诊随访；4、宣教关怀；5、复诊通知；6、满意度调查；7、患者报告； 8、其他通知)
     */
    @Excel(name = "服务类型(1、监测评估；2、出院随访；3、门诊随访；4、宣教关怀；5、复诊通知；6、满意度调查；7、患者报告； 8、其他通知)")
    @ApiModelProperty(value = "服务类型(1、监测评估；2、出院随访；3、门诊随访；4、宣教关怀；5、复诊通知；6、满意度调查；7、患者报告； 8、其他通知)")
    @ApiModelProperty(value = "服务类型(1、监测评估；2、出院随访；3、门诊随访；4、宣教关怀；5、复诊通知；6、满意度调查；7、患者报告； 8、其他通知 9体检随访 10医技随访")
    private String serviceType;

    /**
@@ -420,7 +426,7 @@
     * å°±è¯Šç±»åž‹ï¼ˆ1门诊  2出院）
     */
    @Excel(name = "  å°±è¯Šç±»åž‹ï¼ˆ1门诊  2出院）")
    @ApiModelProperty(value = "就诊类型（1门诊  2出院 3.专病 4.外部导入）")
    @ApiModelProperty(value = "就诊类型（1门诊  2出院 3.专病 4.外部导入 5急诊、5住院、7体检）")
    private String hospType;



 smartor/src/main/java/com/smartor/domain/ServiceSubtaskVO.java

@@ -28,6 +28,13 @@
    @ApiModelProperty(value = "主键id")
    private Long subId;


    /**
     * ç¬¬ä¸‰æ–¹ä»»åŠ¡ID
     */
    @ApiModelProperty(value = "第三方任务ID")
    private String taskGuid;

    /**
     * å‘送人
     */

 smartor/src/main/java/com/smartor/domain/ServiceTaskInfo.java

@@ -33,7 +33,7 @@
    private long taskstate;

    @ApiModelProperty(value = "任务ID")
    private long taskguid;
    private String taskguid;

    @ApiModelProperty(value = "任务名称")
    private String taskname;

 smartor/src/main/java/com/smartor/mapper/ServiceSubtaskMapper.java

@@ -51,6 +51,8 @@
    public Boolean updateServiceSubtaskByPatId(ServiceSubtask ServiceSubtask);

    public Boolean updateServiceSubtaskByCondition(ServiceSubtask ServiceSubtask);
    
    public Boolean updateServiceSubtaskByTaskGuid(ServiceSubtask ServiceSubtask);

    /**
     * åˆ é™¤å•ä¸€ä»»åŠ¡ï¼ˆéšè®¿ï¼‰

 smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskAnswerServiceImpl.java

@@ -276,7 +276,7 @@
            if (serviceSubTaskCacheReq.getType() != null && serviceSubTaskCacheReq.getType() == 2) {
                //问卷
                redisCache.deleteObject(pid + "-" + tid + "-WJscriptCache");
                redisCache.setCacheList(pid + "-" + tid + "-WJscriptCache", serviceSubTaskCacheReq.getSvyLibTemplateScriptVOS());
                redisCache.setCacheListRight(pid + "-" + tid + "-WJscriptCache", serviceSubTaskCacheReq.getSvyLibTemplateScriptVOS());
                //设置过期时间 3天
                Long tims = Long.valueOf(3 * 24 * 3600);
                boolean expire = redisCache.expire(pid + "-" + tid + "-WJscriptCache", tims);
@@ -284,7 +284,7 @@
            } else if (serviceSubTaskCacheReq.getType() != null && serviceSubTaskCacheReq.getType() == 1) {
                //问卷
                redisCache.deleteObject(pid + "-" + tid + "-SFscriptCache");
                redisCache.setCacheList(pid + "-" + tid + "-SFscriptCache", serviceSubTaskCacheReq.getIvrLibaTemplateScriptVOList());
                redisCache.setCacheListRight(pid + "-" + tid + "-SFscriptCache", serviceSubTaskCacheReq.getIvrLibaTemplateScriptVOList());
                //设置过期时间 3天
                Long tims = Long.valueOf(3 * 24 * 3600);
                redisCache.expire(pid + "-" + tid + "-SFscriptCache", tims);

 smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java

@@ -124,6 +124,8 @@

    @Value("${phoneUpEveryHour}")
    private Integer phoneUpEveryHour;
    @Value("${phoneEndHour}")
    private Integer phoneEndHour;

    /**
     * æŸ¥è¯¢å•ä¸€ä»»åŠ¡ï¼ˆéšè®¿ï¼‰
@@ -819,6 +821,9 @@
     */
    @Override
    public PhoneCallBackYQVO phoneCallBackYQ(PhoneCallReqYQVO phoneCallReqYQVO) {
        //先把该subId从cache_exist中剔除，只要有回调就剔除（目的是，尽快让cache-exist为空，去缓存下一批要打的电话;这里剔除不影响电话的正常业务）
        redisCache.removeElementFromList("cache-exist", phoneCallReqYQVO.getTaskid());

        //判断是否挂机
        String hangupState = redisCache.getCacheObject(phoneCallReqYQVO.getUuid() + "- hangup");
        Object cacheObject1 = redisCache.getCacheObject(phoneCallReqYQVO.getTaskid() + "recordAccept-hungup");
@@ -833,6 +838,12 @@
                if (ObjectUtils.isNotEmpty(cacheObject) && String.valueOf(cacheObject).equals("1")) {
                    return new PhoneCallBackYQVO();
                }
                //如果发送状态为6，就说明已经打完了，也没有必要继续往下走了
                if (StringUtils.isNotEmpty(phoneCallReqYQVO.getTaskid())) {
                    ServiceSubtask serviceSubtask = serviceSubtaskMapper.selectServiceSubtaskById(Long.valueOf(phoneCallReqYQVO.getTaskid()));
                    if (serviceSubtask.getSendstate() == 6L) return new PhoneCallBackYQVO();
                }

                ServiceSubtask serviceSubtask2 = new ServiceSubtask();
                serviceSubtask2.setRemark("电话发送成功（患者挂断）");
                serviceSubtask2.setSenduuid(phoneCallReqYQVO.getUuid());
@@ -1429,9 +1440,13 @@
    @Override
    public List<PullTaskVO> taskPull() {
        //pullTaskVOList用于数据返回
        List<PullTaskVO> pullTaskVOList = null;
        List<PullTaskVO> pullTaskVOList = new ArrayList<>();
        List<String> cacheList = new ArrayList<>();
        ListOperations<String, String> listOps = redisTemplate.opsForList();
        //必须等ache-exist全部打完才能拉取下一批（主要是怕所有的数据都堆在电话的缓存里，在规定的时间打不完）
        long existSize = listOps.size("cache-exist");
        if (existSize > 0) return pullTaskVOList;

        long size = listOps.size("cache-0");
        log.error("---------打电话之前缓存中的数据量：{}", size);
        int count = 0;
@@ -1439,7 +1454,9 @@
            //phoneCount()  é€šè¿‡ç»™å‡ºçš„每个小时需要打出的电话量，算出到晚上8点一点能打出多少个电话，获取到总量
            //如果需要立即执行的数据量大于一天要执行的上限，则只取上限的数量，其它的则放回redis中
            count = Math.min(phoneCount(), (int) size);
            if (count != 0) {
            cacheList = listOps.range("cache-0", 0, count - 1);
            }
        }

        log.error("任务拉取cache-0的值是多少：{}", cacheList);
@@ -1465,12 +1482,16 @@
                listOps.trim("cache-0" + i, count1, -1);
            }
        }
        //existList用来记录接下来需要执行的子任务ID
        List<String> existList = new ArrayList<>();
        if (CollectionUtils.isNotEmpty(pullTaskVOList)) {
            //给回调参数赋值
            for (PullTaskVO pullTaskVO : pullTaskVOList) {
                existList.add(pullTaskVO.getTaskid());
                pullTaskVO.setAsrcallback(ASRCallBackPath);
            }
        }
        if (existList.size() != 0) redisCache.setCacheListRight("cache-exist", existList);
        log.error("-----------实际拉取的电话数据量：{}", pullTaskVOList.size());
        return pullTaskVOList;
    }
@@ -1490,6 +1511,10 @@
                PullTaskVO pullTaskVO = new PullTaskVO();
                String subId = subIds.get(i).trim();
                ServiceSubtask serviceSubtask = serviceSubtaskMapper.selectServiceSubtaskById(Long.valueOf(subId));
                if (ObjectUtils.isEmpty(serviceSubtask)) {
                    log.error("该subId有问题，在表中查询不到：{}", subId);
                    continue;
                }
                ServiceTask serviceTask = serviceTaskService.selectServiceTaskByTaskid(serviceSubtask.getTaskid());
                IvrTaskTemplate ivrTaskTemplate = ivrTaskTemplateService.selectIvrTaskTemplateByID(serviceSubtask.getTemplateid());
                if (ObjectUtils.isEmpty(ivrTaskTemplate)) continue;
@@ -1524,7 +1549,7 @@
                redisCache.setCacheObject(subId.trim() + "-" + serviceSubtask.getPhone().trim(), ivrTaskTemplateScript.getId().toString(), 120, TimeUnit.MINUTES);
            } else {
                newValue0.add(subIds.get(i));
                redisCache.setCacheList(cacheName, newValue0);
                redisCache.setCacheListRight(cacheName, newValue0);
            }
        }

@@ -1853,6 +1878,7 @@
            ServiceSubtask serviceSubtask = new ServiceSubtask();
            serviceSubtask.setRemark("电话接通成功，患者拒绝随访");
            serviceSubtask.setId(Long.valueOf(phoneCallRecordVO.getTaskid()));
            serviceSubtask.setSendstate(6L);
            serviceSubtaskMapper.updateServiceSubtask(serviceSubtask);
            int startIndex = phoneCallRecordVO.getRecord_path().indexOf("voice") + "voice".length() + 1;  // åŠ 1是跳过/符号
            int endIndex = phoneCallRecordVO.getRecord_path().lastIndexOf("/");
@@ -2051,7 +2077,9 @@
        redisCache.setCacheObject(subTaskId + "recordAccept-hungup", "1", 10, TimeUnit.MINUTES);
        if (StringUtils.isNotEmpty(serviceSubtask.getRemark())) serviceSubtask.setRemark("电话发送拒接,短信补偿发送成功");
        else serviceSubtask.setRemark("短信补偿发送成功");
        serviceSubtask.setSendstate(3L);
        serviceSubtaskMapper.updateServiceSubtask(serviceSubtask);

    }

    //通过当前时间，拉取电话总数
@@ -2059,13 +2087,17 @@
        // å½“前时间
        LocalTime currentTime = LocalTime.now();
        // ç›®æ ‡æ—¶é—´ï¼ˆæ™šä¸Š 8 ç‚¹ï¼‰
        LocalTime targetTime = LocalTime.of(20, 0);
        LocalTime targetTime = LocalTime.of(phoneEndHour, 0);
        // è®¡ç®—当前时间到目标时间的时长
        Duration duration = Duration.between(currentTime, targetTime);
        // èŽ·å–剩余时间的小时数
        long remainingHours = duration.toHours();
        long remainingHours = 0;
        long remainingMinutes = duration.toMinutes();
        //如果超过8点,就设置为0
        if (remainingHours < 0) remainingHours = 0;
        //距离结束时间小于20分钟，就不拉取了
        if (remainingMinutes < 20) remainingHours = 0;
        else if (remainingMinutes < 60 && remainingMinutes > 20) remainingHours = 1;
        else if (remainingMinutes > 60) remainingHours = remainingMinutes / 60;
        // è®¡ç®—剩余可以打的电话数
        int remainingCalls = (int) (remainingHours * phoneUpEveryHour);
        return remainingCalls;

 smartor/src/main/java/com/smartor/service/impl/SvyTaskSingleServiceImpl.java

@@ -6,6 +6,9 @@
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.gson.Gson;
import com.ruoyi.common.enums.HospTypeEnum;
import com.ruoyi.common.enums.ServiceTaskTypeEnum;
import com.ruoyi.common.enums.TaskTypeEnum;
import com.ruoyi.common.exception.base.BaseException;
import com.ruoyi.common.utils.*;
import com.ruoyi.common.utils.http.HttpEntity;
@@ -16,6 +19,7 @@
import com.smartor.mapper.ServiceSubtaskMapper;
import com.smartor.service.IServiceTaskService;
import com.smartor.service.ISvyTaskSingleService;
import com.sun.org.apache.bcel.internal.generic.NEW;
import lombok.extern.slf4j.Slf4j;
import okhttp3.OkHttpClient;
import okhttp3.Request;
@@ -201,69 +205,27 @@
        else if (isoperation == 3) serviceSubtaskMapper.deleteServiceSubtaskByCondition(taskId, patid);
    }


    @Override
    public int insertTaskInfo(ServiceTaskInfo serviceTaskVO) {
        if (ObjectUtils.isEmpty(serviceTaskVO)) {
            log.info("新增任务入参为空，请检查入参");
            throw new BaseException("新增任务入参为空，请检查入参");
        }
        Integer integer = 1;
        //ServiceSubtask serviceTask = DtoConversionUtils.sourceToTarget(serviceTaskVO, ServiceSubtask.class);
        //serviceTask.setTextParam(JSON.toJSONString(serviceTaskVO.getTextParam()));
        //将任务信息放到服务表中
        ServiceSubtask serviceSubtask = DtoConversionUtils.sourceToTarget(serviceTaskVO, ServiceSubtask.class);
        serviceSubtask.setTaskid(serviceTaskVO.getTaskguid());
        ServiceSubtask serviceSubtask = new ServiceSubtask();
        serviceSubtask.setTaskGuid(serviceTaskVO.getTaskguid());
        String type = "0";
        if (serviceTaskVO.getServicetype().equals("监测评估")) {
            type = "1";
        } else if (serviceTaskVO.getServicetype().equals("出院随访")) {
            type = "2";
        } else if (serviceTaskVO.getServicetype().equals("门诊随访")) {
            type = "3";
        } else if (serviceTaskVO.getServicetype().equals("宣教关怀")) {
            type = "4";
        } else if (serviceTaskVO.getServicetype().equals("复诊通知")) {
            type = "5";
        } else if (serviceTaskVO.getServicetype().equals("满意度调查")) {
            type = "6";
        } else if (serviceTaskVO.getServicetype().equals("患者报告")) {
            type = "7";
        } else if (serviceTaskVO.getServicetype().equals("其他通知")) {
            type = "8";
        }
        if (type.equals("0")) {
            type = serviceTaskVO.getServicetype();
        }
        if (StringUtils.isNotEmpty(serviceTaskVO.getServicetype()))
            type = ServiceTaskTypeEnum.getDescByCode(serviceTaskVO.getServicetype());
        serviceSubtask.setServiceType(type);
        //0、1宣教、2门诊、3出院、4复诊、5体检、6问卷、7医技
        String tasktype = "-1";
        if (serviceTaskVO.getTasktype().equals("通知")) {
            tasktype = "0";
        } else if (serviceTaskVO.getTasktype().equals("宣教")) {
            tasktype = "1";
        } else if (serviceTaskVO.getTasktype().equals("门诊")) {
            tasktype = "2";
        } else if (serviceTaskVO.getTasktype().equals("出院")) {
            tasktype = "3";
        } else if (serviceTaskVO.getTasktype().equals("复诊")) {
            tasktype = "4";
        } else if (serviceTaskVO.getTasktype().equals("体检")) {
            tasktype = "5";
        } else if (serviceTaskVO.getTasktype().equals("问卷")) {
            tasktype = "6";
        } else if (serviceTaskVO.getTasktype().equals("医技")) {
            tasktype = "7";
        }
        if (tasktype.equals("-1")) {
            tasktype = serviceTaskVO.getTasktype();
        }
        if (StringUtils.isNotEmpty(serviceTaskVO.getTasktype()))
            tasktype = TaskTypeEnum.getDescByCode(serviceTaskVO.getTasktype());
        serviceSubtask.setType(tasktype);
        serviceSubtask.setLabelstatus(serviceTaskVO.getTaskstate());
        serviceSubtask.setTaskName(serviceTaskVO.getTaskname());
        serviceSubtask.setTaskDesc(serviceTaskVO.getTaskdesc());
        serviceSubtask.setPreachform(serviceTaskVO.getExemode());
        //serviceSubtask.setUploadTime(serviceTaskVO.setUploadTime());
        serviceSubtask.setCreateBy(serviceTaskVO.getCreateBy());
        serviceSubtask.setCreateTime(serviceTaskVO.getCreateTime());
        serviceSubtask.setOperatorNo(serviceTaskVO.getOperatorno());
@@ -286,31 +248,25 @@
        serviceSubtask.setWechat(serviceTaskVO.getPatopenid());
        serviceSubtask.setInhospno(serviceTaskVO.getInhosno());
        String hosptype = "-1";
        if (serviceTaskVO.getVisittype().equals("门诊")) {
            hosptype = "1";
        } else if (serviceTaskVO.getVisittype().equals("出院")) {
            hosptype = "2";
        } else if (serviceTaskVO.getVisittype().equals("专病")) {
            hosptype = "3";
        } else if (serviceTaskVO.getVisittype().equals("外部导入")) {
            hosptype = "4";
        }
        if (hosptype.equals("-1")) {
            hosptype = serviceTaskVO.getVisittype();
        }
        hosptype = HospTypeEnum.getDescByCode(serviceTaskVO.getVisittype());
        serviceSubtask.setHospType(hosptype);
        serviceSubtask.setHospno(serviceTaskVO.getVisitno());
        serviceSubtask.setAdmindate(serviceTaskVO.getVisittime());
        serviceSubtask.setRoomno(serviceTaskVO.getRoomno());
        serviceSubtask.setBedNo(serviceTaskVO.getBedno());
        serviceSubtask.setDeptname(serviceTaskVO.getDeptname());
        //serviceSubtask.setSendname(serviceTaskVO.gets());
        //serviceSubtask.setPatid(serviceTaskVO.getPid());
        serviceSubtask.setSendstate(1L);
        //serviceSubtask.setHospType(serviceTask.getHospType());
        serviceSubtask.setCreateTime(new Date());
        //先查询一遍，该taskGuid是否存在
        ServiceSubtaskVO serviceSubtaskVO = new ServiceSubtaskVO();
        serviceSubtaskVO.setTaskGuid(serviceTaskVO.getGuid());
        List<ServiceSubtask> serviceSubtaskList = serviceSubtaskMapper.selectServiceSubtaskList(serviceSubtaskVO);
        if (CollectionUtils.isNotEmpty(serviceSubtaskList)) {
            serviceSubtaskMapper.updateServiceSubtaskByTaskGuid(serviceSubtask);
        } else {
        serviceSubtaskMapper.insertServiceSubtask(serviceSubtask);
        integer = serviceSubtask.getId().intValue();
        }
        Integer integer = serviceSubtask.getId().intValue();
        log.error("插入的ID是：{}", integer);
        return integer;
    }

 smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml

@@ -38,6 +38,7 @@
        <result property="orgid" column="orgid"/>
        <result property="pid" column="pid"/>
        <result property="guid" column="guid"/>
        <result property="taskGuid" column="task_guid"/>
        <result property="textParam" column="text_param"/>
        <result property="preachform" column="preachform"/>
        <result property="bedNo" column="bed_no"/>
@@ -85,6 +86,7 @@
    <sql id="selectServiceSubtaskVo">
        select id,
               hosp_type,
               task_guid,
               patfrom,
               inhospid,
               suggest,
@@ -248,13 +250,14 @@
            <if test="remark != null">and remark = #{remark}</if>
            <if test="suggest != null">and suggest = #{suggest}</if>
            <if test="createBy != null">and create_by = #{createBy}</if>
            <if test="taskGuid != null">and task_guid = #{taskGuid}</if>
        </where>
        <if test="serviceType != null  and serviceType != ''and serviceType != '2'and serviceType != '3'">order by
            long_send_time desc
        </if>
        <if test="serviceType != null  and serviceType != ''and serviceType == '2'">order by endtime desc</if>
        <if test="serviceType != null  and serviceType != ''and serviceType == '3'">order by admindate desc</if>
        -- order by update_time desc,id desc
        <!-- order by update_time desc,id desc -->
    </select>

    <select id="selectServiceSubtaskById" parameterType="Long" resultMap="ServiceSubtaskResult">
@@ -336,6 +339,7 @@
            <if test="sendstate != null ">sendstate,</if>
            <if test="inhospid != null ">inhospid,</if>
            <if test="patfrom != null ">patfrom,</if>
            <if test="taskGuid != null ">task_guid,</if>
        </trim>
        <trim prefix="values (" suffix=")" suffixOverrides=",">
            <if test="sendname != null">#{sendname},</if>
@@ -408,6 +412,7 @@
            <if test="sendstate != null ">#{sendstate},</if>
            <if test="inhospid != null ">#{inhospid},</if>
            <if test="patfrom != null ">#{patfrom},</if>
            <if test="taskGuid != null ">#{taskGuid},</if>
        </trim>
    </insert>

@@ -484,6 +489,7 @@
            <if test="suggest != null ">suggest=#{suggest},</if>
            <if test="inhospid != null ">inhospid=#{inhospid},</if>
            <if test="patfrom != null ">patfrom=#{patfrom},</if>
            <if test="taskGuid != null ">task_guid=#{taskGuid},</if>
        </trim>
        where id = #{id}
    </update>
@@ -561,6 +567,7 @@
            <if test="suggest != null ">suggest=#{suggest},</if>
            <if test="inhospid != null ">inhospid=#{inhospid},</if>
            <if test="patfrom != null ">patfrom=#{patfrom},</if>
            <if test="taskGuid != null ">taskGuid=#{taskGuid},</if>
        </trim>
        where patid = #{patid} and taskid = #{taskid}
    </update>
@@ -638,9 +645,90 @@
            <if test="suggest != null ">suggest=#{suggest},</if>
            <if test="inhospid != null ">inhospid=#{inhospid},</if>
            <if test="patfrom != null ">patfrom=#{patfrom},</if>
            <if test="taskGuid != null ">task_guid=#{taskGuid},</if>
        </trim>
        where patid = #{patid} and taskid = #{taskid}
    </update>

    <update id="updateServiceSubtaskByTaskGuid" parameterType="com.smartor.domain.ServiceSubtask">
        update service_subtask
        <trim prefix="SET" suffixOverrides=",">
            <if test="sendname != null">sendname = #{sendname},</if>
            <if test="phone != null">phone = #{phone},</if>
            <if test="sex != null">sex = #{sex},</if>
            <if test="sendstate != null ">sendstate = #{sendstate},</if>
            <if test="age != null">age = #{age},</if>
            <if test="sfzh != null">sfzh = #{sfzh},</if>
            <if test="addr != null">addr = #{addr},</if>
            <if test="senderdetail != null">senderdetail = #{senderdetail},</if>
            <if test="type != null">type = #{type},</if>
            <if test="taskid != null">taskid = #{taskid},</if>
            <if test="templateid != null">templateid = #{templateid},</if>
            <if test="templatename != null">templatename = #{templatename},</if>
            <if test="senddate != null">senddate = #{senddate},</if>
            <if test="senduuid != null">senduuid = #{senduuid},</if>
            <if test="result != null">result = #{result},</if>
            <if test="finishtime != null">finishtime = #{finishtime},</if>
            <if test="recordid != null">recordid = #{recordid},</if>
            <if test="exrecallcount != null">exrecallcount = #{exrecallcount},</if>
            <if test="pulltime != null">pulltime = #{pulltime},</if>
            <if test="deptcode != null">deptcode = #{deptcode},</if>
            <if test="labelstatus != null">labelstatus = #{labelstatus},</if>
            <if test="updateBy != null">update_by = #{updateBy},</if>
            <if test="updateTime != null">update_time = #{updateTime},</if>
            <if test="createBy != null">create_by = #{createBy},</if>
            <if test="createTime != null">create_time = #{createTime},</if>
            <if test="isupload != null">isupload = #{isupload},</if>
            <if test="uploadTime != null">upload_time = #{uploadTime},</if>
            <if test="orgid != null">orgid = #{orgid},</if>
            <if test="pid != null">pid = #{pid},</if>
            <if test="guid != null">guid = #{guid},</if>
            <if test="textParam != null">text_param = #{textParam},</if>
            <if test="preachform != null">preachform = #{preachform},</if>
            <if test="bedNo != null">bed_no = #{bedNo},</if>
            <if test="sendType != null  and sendType != ''">send_type = #{sendType},</if>
            <if test="taskName != null  and taskName != ''">task_name = #{taskName},</if>
            <if test="taskDesc != null  and taskDesc != ''">task_desc = #{taskDesc},</if>
            <if test="operatorNo != null  and operatorNo != ''">operator_no = #{operatorNo},</if>
            <if test="operator != null  and operator != ''">operator = #{operator},</if>
            <if test="hospType != null  and hospType != ''">hosp_type = #{hospType},</if>
            <if test="hospno != null  and hospno != ''">hospno = #{hospno},</if>
            <if test="wechat != null  and wechat != ''">wechat = #{wechat},</if>
            <if test="roomno != null  and roomno != ''">roomno = #{roomno},</if>
            <if test="admindate != null  and admindate != ''">admindate = #{admindate},</if>
            <if test="deptname != null  and deptname != ''">deptname = #{deptname},</if>
            <if test="diagname != null  and diagname != ''">diagname = #{diagname},</if>
            <if test="libtemplateid != null ">libtemplateid = #{libtemplateid},</if>
            <if test="libtemplatename != null ">libtemplatename = #{libtemplatename},</if>
            <if test="patid != null ">patid = #{patid},</if>
            <if test="openid != null ">openid = #{openid},</if>
            <if test="longSendTime != null ">long_send_time = #{longSendTime},</if>
            <if test="serviceType != null ">service_type = #{serviceType},</if>
            <if test="score != null ">score = #{score},</if>
            <if test="submit != null ">submit = #{submit},</if>
            <if test="leavehospitaldistrictcode != null  and leavehospitaldistrictcode != ''">leavehospitaldistrictcode
                = #{leavehospitaldistrictcode},
            </if>
            <if test="leavehospitaldistrictname != null  and leavehospitaldistrictname != ''">leavehospitaldistrictname
                = #{leavehospitaldistrictname},
            </if>
            <if test="drname != null ">drname = #{drname},</if>
            <if test="drcode != null ">drcode = #{drcode},</if>
            <if test="endtime != null ">endtime = #{endtime},</if>
            <if test="starttime != null ">starttime = #{starttime},</if>
            <if test="excep != null ">excep = #{excep},</if>
            <if test="nurseName != null ">nurse_name=#{nurseName},</if>
            <if test="nurseId != null ">nurse_id=#{nurseId},</if>
            <if test="remark != null ">remark=#{remark},</if>
            <if test="suggest != null ">suggest=#{suggest},</if>
            <if test="inhospid != null ">inhospid=#{inhospid},</if>
            <if test="patfrom != null ">patfrom=#{patfrom},</if>
            <if test="taskGuid != null ">task_guid=#{taskGuid},</if>
        </trim>
        where task_guid = #{taskGuid}
    </update>



    <update id="deleteServiceSubtaskById" parameterType="Long">
        update service_subtask
@@ -749,6 +837,7 @@
               remark,
               inhospid,
               patfrom,
               task_guid,
               diagname
        FROM service_subtask,
             JSON_TABLE(send_time_slot, '$[*]' COLUMNS (