ruoyi-admin/src/main/java/com/ruoyi/web/component/RedisMqReceiver.java
@@ -4,6 +4,7 @@ import com.alibaba.fastjson2.JSONObject; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.gson.Gson; import com.google.gson.GsonBuilder; import com.ruoyi.common.core.redis.RedisCache; import com.ruoyi.common.enums.MsgLSEnum; import com.ruoyi.common.enums.ServiceFromEnum; @@ -23,6 +24,7 @@ import com.sun.org.apache.bcel.internal.generic.NEW; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.ObjectUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.data.redis.connection.Message; @@ -370,6 +372,7 @@ serviceSubtaskMapper.updateServiceSubtask(ss); continue; } log.error("---------mq丽水短信发送入参address：{}, sendMagParam:{}, orgid:{}-------", address, sendMagParam, serviceSubtask.getOrgid()); String dxCode = getDXCode(address, sendMagParam.getPhone(), sendMagParam.getContent(), "", "", MsgLSEnum.getHeaderByCode(serviceSubtask.getOrgid())); log.error("---------丽水短信发送结果：{}-------", dxCode); ObjectMapper objectMapper = new ObjectMapper(); @@ -448,24 +451,6 @@ try { SendMagParam sendMagParam = new SendMagParam(); sendMagParam.setType("5"); // sendMagParam.setUrl(ip + ":" + req_path + "/outsideChain?param1=" + taskId + "¶m2=" + patid + "¶m3=" + ivrTask1.getTaskName() + "¶m5=false"); // log.info("链接完整路径：{}", ip + ":" + req_path + "/outsideChain?param1=" + taskId + "¶m2=" + patid + "¶m3=" + ivrTask1.getTaskName() + "¶m5=false"); // //这个模板ID先写死，后面做成可选 // sendMagParam.setTmpCode("oG3pJHPVWpE81DmZsua_2tKwgJ97r0qz37z56ns7NB4"); // Map map = new HashMap(); // map.put("first", ivrTask1.getTaskName()); // sendMagParam.setContent(JSON.toJSONString(map)); // sendMagParam.setOpenid(serviceSubtask.getOpenid()); // Boolean aBoolean = sendService.sendMsg(sendMagParam); // // if (type == 1) { // url = ip + ":" + req_path + "/outsideChain?param1=" + taskId + "¶m2=" + patid + "¶m3=" + URLEncoder.encode(ivrTask1.getTaskName(), StandardCharsets.UTF_8.toString()) + "¶m5=false"; // } else if (type == 2) { // url = ip + ":" + req_path + "/outsideChainwt?param1=" + taskId + "¶m2=" + patid + "¶m3=" + URLEncoder.encode(ivrTask1.getTaskName(), StandardCharsets.UTF_8.toString()) + "¶m5=false"; // } else if (type == 3) { // url = ip + ":" + req_path + "/outsideChainxj?param1=" + taskId + "¶m2=" + patid + "¶m3=" + URLEncoder.encode(ivrTask1.getTaskName(), StandardCharsets.UTF_8.toString()) + "¶m5=false"; // } String url = null; Boolean aBoolean = false; if (type == 1) { @@ -521,6 +506,7 @@ } //获取微信公众号请求信息根据机构ID log.error("获取微信公众号请求信息根据机构ID：{}", patArchive.getOrgid()); List<String> wxqqxx = WxGZHEnum.getDescByCode(patArchive.getOrgid()); if (CollectionUtils.isEmpty(wxqqxx) || wxqqxx.size() < 4) { ServiceSubtask ss = new ServiceSubtask(); @@ -534,11 +520,17 @@ } String wxCode = getWXCode(serviceSubtask.getSfzh(), url, serviceSubtask.getTaskName(), serviceSubtask.getTaskDesc(), patArchive.getTelcode(), patArchive.getName(), patArchive.getPatidHis(), wxqqxx); String wxCode = getWXCode(serviceSubtask.getSfzh(), url, serviceSubtask.getTaskName(), serviceSubtask.getTaskName(), patArchive.getTelcode(), patArchive.getName(), patArchive.getPatidHis(), wxqqxx); log.error("wxCode的值为:{}", wxCode); Map<String, Object> map = JSONObject.parseObject(wxCode, Map.class); log.error("map的值为:{}", map); if (!map.isEmpty()) { serviceSubtask.setResult("success"); serviceSubtask.setSendstate(3L); log.error("aBoolean的值为:{}", aBoolean); if (map.get("succ").toString().equals("true")) { aBoolean = true; } if (aBoolean == false) { ServiceSubtaskRecord serviceSubtaskRecord = new ServiceSubtaskRecord(); serviceSubtaskRecord.setTaskid(serviceSubtask.getTaskid().toString()); @@ -547,7 +539,7 @@ serviceSubtaskRecord.setTasktype(serviceSubtask.getType()); serviceSubtaskRecord.setPreachform("5"); serviceSubtaskRecord.setStartTime(System.currentTimeMillis()); serviceSubtaskRecord.setRemark(map.get("msg").toString()); serviceSubtaskRecord.setRemark(ObjectUtils.isNotEmpty(map.get("msg")) ? map.get("msg").toString() : null); lssubIds.add(serviceSubtask.getId()); serviceSubtaskRecordService.insertServiceSubtaskRecord(serviceSubtaskRecord); continue; @@ -689,8 +681,13 @@ xinHuaWXReq.setTitlename(taskName); xinHuaWXReq.setContent(taskDesc); xinHuaWXReq.setAppid(wxqqxx.get(1)); log.error("-----微信公众号的出差为----：{}", xinHuaWXReq); String body = new Gson().toJson(xinHuaWXReq); log.error("-----微信公众号的出参为----：{}", xinHuaWXReq); // new Gson().toJson(xinHuaWXReq); GsonBuilder gb = new GsonBuilder(); gb.disableHtmlEscaping(); String body = gb.create().toJson(xinHuaWXReq); log.error("encode的入参为wxqqxx ：{}, body:{}", wxqqxx.get(2), body); String encode = encode(wxqqxx.get(2).concat(body)); log.error("--------encode的值为：{}-----", encode); Map<String, String> headerMap = new HashMap<>(); ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceOutPathController.java
@@ -53,10 +53,12 @@ ServiceOutPath serviceOutPath=new ServiceOutPath(); serviceOutPath.setRadix(param); List<ServiceOutPath> list = serviceOutPathService.selectServiceOutPathList(serviceOutPath); if (CollectionUtils.isNotEmpty(list)) { ServiceOutPath serviceOutPath1 = list.get(0); serviceOutPath1.setId(null); serviceOutPath1.setRadix(null); if (CollectionUtils.isNotEmpty(list)) return success(serviceOutPath1); return success(serviceOutPath1); } return success(null); }
@@ -150,7 +150,9 @@ #新华医院外链请求IP和端口号 req_path: 8093 localIP: https://wx.lihusmart.com #localIP: https://wx.lihusmart.com #丽水外链请求IP和端口号 localIP: http://221.12.19.26 #获取患者信息URL(华卓提供) hosp_info_url: http://esb-core-rest.wowjoy.cn/esb/exchange ruoyi-admin/src/main/resources/application.yml
@@ -131,7 +131,7 @@ # Swagger配置 swagger: # 是否开启swagger enabled: true enabled: false # 请求前缀 pathMapping: /dev-api
@@ -1,165 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <module external.system.module.type="SINGLE_MODULE" org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4"> <module version="4"> <component name="FacetManager"> <facet type="web" name="Web"> <configuration> <webroots /> <sourceRoots> <root url="file://$MODULE_DIR$/src/main/java" /> <root url="file://$MODULE_DIR$/src/main/resources" /> </sourceRoots> </configuration> </facet> <facet type="Spring" name="Spring"> <configuration /> </facet> </component> <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8"> <output url="file://$MODULE_DIR$/target/classes" /> <output-test url="file://$MODULE_DIR$/target/test-classes" /> <content url="file://$MODULE_DIR$"> <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" /> <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" /> <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" /> <excludeFolder url="file://$MODULE_DIR$/target" /> </content> <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="library" name="Maven: org.jsoup:jsoup:1.15.3" level="project" /> <orderEntry type="library" name="Maven: io.minio:minio:7.1.0" level="project" /> <orderEntry type="library" name="Maven: com.carrotsearch.thirdparty:simple-xml-safe:2.7.1" level="project" /> <orderEntry type="library" name="Maven: com.google.guava:guava:25.1-jre" level="project" /> <orderEntry type="library" name="Maven: org.checkerframework:checker-qual:2.0.0" level="project" /> <orderEntry type="library" name="Maven: com.google.errorprone:error_prone_annotations:2.1.3" level="project" /> <orderEntry type="library" name="Maven: com.google.j2objc:j2objc-annotations:1.1" level="project" /> <orderEntry type="library" name="Maven: org.codehaus.mojo:animal-sniffer-annotations:1.14" level="project" /> <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.12.6" level="project" /> <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.12.6" level="project" /> <orderEntry type="library" name="Maven: com.github.spotbugs:spotbugs-annotations:4.0.0" level="project" /> <orderEntry type="library" name="Maven: net.jcip:jcip-annotations:1.0" level="project" /> <orderEntry type="library" name="Maven: com.google.code.findbugs:jsr305:3.0.2" level="project" /> <orderEntry type="library" name="Maven: org.springframework:spring-context-support:5.3.20" level="project" /> <orderEntry type="library" name="Maven: org.springframework:spring-beans:5.3.20" level="project" /> <orderEntry type="library" name="Maven: org.springframework:spring-context:5.3.20" level="project" /> <orderEntry type="library" name="Maven: org.springframework:spring-expression:5.3.20" level="project" /> <orderEntry type="library" name="Maven: org.springframework:spring-core:5.3.20" level="project" /> <orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.3.20" level="project" /> <orderEntry type="library" name="Maven: org.freemarker:freemarker:2.3.31" level="project" /> <orderEntry type="library" name="Maven: org.springframework:spring-web:5.3.20" level="project" /> <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-security:2.5.14" level="project" /> <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:2.5.14" level="project" /> <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:2.5.14" level="project" /> <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:2.5.14" level="project" /> <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-logging:2.5.14" level="project" /> <orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.2.11" level="project" /> <orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.2.11" level="project" /> <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-to-slf4j:2.17.2" level="project" /> <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-api:2.17.2" level="project" /> <orderEntry type="library" name="Maven: org.slf4j:jul-to-slf4j:1.7.36" level="project" /> <orderEntry type="library" name="Maven: jakarta.annotation:jakarta.annotation-api:1.3.5" level="project" /> <orderEntry type="library" name="Maven: org.springframework:spring-aop:5.3.20" level="project" /> <orderEntry type="library" name="Maven: org.springframework.security:spring-security-config:5.5.8" level="project" /> <orderEntry type="library" name="Maven: org.springframework.security:spring-security-core:5.5.8" level="project" /> <orderEntry type="library" name="Maven: org.springframework.security:spring-security-crypto:5.5.8" level="project" /> <orderEntry type="library" name="Maven: org.springframework.security:spring-security-web:5.5.8" level="project" /> <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper-spring-boot-starter:1.4.6" level="project" /> <orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-starter:2.2.2" level="project" /> <orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-autoconfigure:2.2.2" level="project" /> <orderEntry type="library" name="Maven: org.mybatis:mybatis:3.5.9" level="project" /> <orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:2.0.7" level="project" /> <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper-spring-boot-autoconfigure:1.4.6" level="project" /> <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper:5.3.2" level="project" /> <orderEntry type="library" name="Maven: com.github.jsqlparser:jsqlparser:4.5" level="project" /> <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-validation:2.5.14" level="project" /> <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-el:9.0.63" level="project" /> <orderEntry type="library" name="Maven: org.hibernate.validator:hibernate-validator:6.2.3.Final" level="project" /> <orderEntry type="library" name="Maven: jakarta.validation:jakarta.validation-api:2.0.2" level="project" /> <orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging:3.4.3.Final" level="project" /> <orderEntry type="library" name="Maven: com.fasterxml:classmate:1.5.1" level="project" /> <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.12.0" level="project" /> <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.12.6.1" level="project" /> <orderEntry type="library" name="Maven: com.baomidou:dynamic-datasource-spring-boot-starter:3.5.2" level="project" /> <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-jdbc:2.5.14" level="project" /> <orderEntry type="library" name="Maven: com.zaxxer:HikariCP:4.0.3" level="project" /> <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:5.3.20" level="project" /> <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-aop:2.5.14" level="project" /> <orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.9.7" level="project" /> <orderEntry type="library" name="Maven: com.alibaba.fastjson2:fastjson2:2.0.23" level="project" /> <orderEntry type="library" name="Maven: cn.hutool:hutool-all:5.4.0" level="project" /> <orderEntry type="library" name="Maven: com.github.binarywang:weixin-java-mp:3.0.0" level="project" /> <orderEntry type="library" name="Maven: com.github.binarywang:weixin-java-common:3.0.0" level="project" /> <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.36" level="project" /> <orderEntry type="library" name="Maven: com.thoughtworks.xstream:xstream:1.4.9" level="project" /> <orderEntry type="library" name="Maven: xmlpull:xmlpull:1.1.3.1" level="project" /> <orderEntry type="library" name="Maven: xpp3:xpp3_min:1.1.4c" level="project" /> <orderEntry type="library" name="Maven: org.slf4j:jcl-over-slf4j:1.7.36" level="project" /> <orderEntry type="library" name="Maven: com.google.code.gson:gson:2.8.9" level="project" /> <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.15" level="project" /> <orderEntry type="library" name="Maven: commons-io:commons-io:2.11.0" level="project" /> <orderEntry type="library" name="Maven: commons-fileupload:commons-fileupload:1.4" level="project" /> <orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml:4.1.2" level="project" /> <orderEntry type="library" name="Maven: org.apache.poi:poi:4.1.2" level="project" /> <orderEntry type="library" name="Maven: org.apache.commons:commons-collections4:4.4" level="project" /> <orderEntry type="library" name="Maven: org.apache.commons:commons-math3:3.6.1" level="project" /> <orderEntry type="library" name="Maven: com.zaxxer:SparseBitSet:1.2" level="project" /> <orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml-schemas:4.1.2" level="project" /> <orderEntry type="library" name="Maven: org.apache.xmlbeans:xmlbeans:3.1.0" level="project" /> <orderEntry type="library" name="Maven: org.apache.commons:commons-compress:1.19" level="project" /> <orderEntry type="library" name="Maven: com.github.virtuald:curvesapi:1.06" level="project" /> <orderEntry type="library" name="Maven: org.yaml:snakeyaml:1.28" level="project" /> <orderEntry type="library" name="Maven: io.jsonwebtoken:jjwt:0.9.1" level="project" /> <orderEntry type="library" name="Maven: javax.xml.bind:jaxb-api:2.3.1" level="project" /> <orderEntry type="library" name="Maven: javax.activation:javax.activation-api:1.2.0" level="project" /> <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-data-redis:2.5.14" level="project" /> <orderEntry type="library" name="Maven: org.springframework.data:spring-data-redis:2.5.11" level="project" /> <orderEntry type="library" name="Maven: org.springframework.data:spring-data-keyvalue:2.5.11" level="project" /> <orderEntry type="library" name="Maven: org.springframework.data:spring-data-commons:2.5.11" level="project" /> <orderEntry type="library" name="Maven: org.springframework:spring-tx:5.3.20" level="project" /> <orderEntry type="library" name="Maven: org.springframework:spring-oxm:5.3.20" level="project" /> <orderEntry type="library" name="Maven: io.lettuce:lettuce-core:6.1.8.RELEASE" level="project" /> <orderEntry type="library" name="Maven: io.netty:netty-common:4.1.77.Final" level="project" /> <orderEntry type="library" name="Maven: io.netty:netty-handler:4.1.77.Final" level="project" /> <orderEntry type="library" name="Maven: io.netty:netty-resolver:4.1.77.Final" level="project" /> <orderEntry type="library" name="Maven: io.netty:netty-buffer:4.1.77.Final" level="project" /> <orderEntry type="library" name="Maven: io.netty:netty-codec:4.1.77.Final" level="project" /> <orderEntry type="library" name="Maven: io.netty:netty-transport:4.1.77.Final" level="project" /> <orderEntry type="library" name="Maven: io.projectreactor:reactor-core:3.4.18" level="project" /> <orderEntry type="library" name="Maven: org.reactivestreams:reactive-streams:1.0.3" level="project" /> <orderEntry type="library" name="Maven: org.apache.commons:commons-pool2:2.9.0" level="project" /> <orderEntry type="library" name="Maven: eu.bitwalker:UserAgentUtils:1.21" level="project" /> <orderEntry type="library" name="Maven: io.swagger:swagger-annotations:1.6.2" level="project" /> <orderEntry type="library" name="Maven: javax.servlet:javax.servlet-api:4.0.1" level="project" /> <orderEntry type="library" name="Maven: org.projectlombok:lombok:1.18.26" level="project" /> <orderEntry type="library" name="Maven: com.squareup.okhttp3:okhttp:4.10.0" level="project" /> <orderEntry type="library" name="Maven: com.squareup.okio:okio-jvm:3.0.0" level="project" /> <orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.5.32" level="project" /> <orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.5.32" level="project" /> <orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-stdlib-common:1.5.32" level="project" /> <orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-stdlib:1.5.32" level="project" /> <orderEntry type="library" name="Maven: org.jetbrains:annotations:13.0" level="project" /> <orderEntry type="library" name="Maven: com.aliyun:alibaba-dingtalk-service-sdk:2.0.0" level="project" /> <orderEntry type="library" name="Maven: log4j:log4j:1.2.15" level="project" /> <orderEntry type="library" name="Maven: javax.mail:mail:1.4" level="project" /> <orderEntry type="library" name="Maven: javax.activation:activation:1.1" level="project" /> <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.1.1" level="project" /> <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-websocket:2.5.14" level="project" /> <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-web:2.5.14" level="project" /> <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-json:2.5.14" level="project" /> <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.12.6" level="project" /> <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.12.6" level="project" /> <orderEntry type="library" name="Maven: com.fasterxml.jackson.module:jackson-module-parameter-names:2.12.6" level="project" /> <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-tomcat:2.5.14" level="project" /> <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-core:9.0.63" level="project" /> <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-websocket:9.0.63" level="project" /> <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:5.3.20" level="project" /> <orderEntry type="library" name="Maven: org.springframework:spring-messaging:5.3.20" level="project" /> <orderEntry type="library" name="Maven: org.springframework:spring-websocket:5.3.20" level="project" /> <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.10" level="project" /> <orderEntry type="library" name="Maven: commons-httpclient:commons-httpclient:3.1" level="project" /> <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpmime:4.5" level="project" /> <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.13" level="project" /> <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.41" level="project" /> <orderEntry type="library" name="Maven: org.springframework:spring-test:5.3.20" level="project" /> </component> </module> ruoyi-common/src/main/java/com/ruoyi/common/enums/MsgLSEnum.java
@@ -15,7 +15,8 @@ * XiaoXiMC 短信发送 */ public enum MsgLSEnum { ZYY("47231022633110211A2101", "https://9.0.124.104:13011/mediinfo-grus-fuwuzxwg/api/esb/lyraAsyncRun", "1400360867068907520", "丽水市中医院"), JN("47255004333112711A1001", null, "1400361376454545408", "景宁畲族自治县人民医院"); ZYY("47231022633110211A2101", "https://9.0.124.104:13011/mediinfo-grus-fuwuzxwg/api/esb/lyraAsyncRun", "1400360867068907520", "丽水市中医院"), JN("47255004333112711A1001", null, "1400361376454545408", "景宁畲族自治县人民医院"); private String orgid; private String address; ruoyi-common/src/main/java/com/ruoyi/common/enums/WxGZHEnum.java
@@ -31,10 +31,10 @@ for (int i = 0; i < organEnums.length; i++) { WxGZHEnum organEnum = organEnums[i]; if (organEnum.getOrgid().equals(orgid)) { if (StringUtils.isEmpty(organEnum.getOrgid())) list.add(organEnum.getOrgid()); if (StringUtils.isEmpty(organEnum.getAppid())) list.add(organEnum.getAppid()); if (StringUtils.isEmpty(organEnum.getAppSecret())) list.add(organEnum.getAppSecret()); if (StringUtils.isEmpty(organEnum.getAddress())) list.add(organEnum.getAddress()); if (StringUtils.isNotEmpty(organEnum.getOrgid())) list.add(organEnum.getOrgid()); if (StringUtils.isNotEmpty(organEnum.getAppid())) list.add(organEnum.getAppid()); if (StringUtils.isNotEmpty(organEnum.getAppSecret())) list.add(organEnum.getAppSecret()); if (StringUtils.isNotEmpty(organEnum.getAddress())) list.add(organEnum.getAddress()); } } return list; ruoyi-common/src/main/java/com/ruoyi/common/utils/HttpUtil.java
@@ -15,32 +15,17 @@ import org.apache.commons.httpclient.methods.RequestEntity; import org.apache.commons.httpclient.methods.StringRequestEntity; import org.apache.commons.httpclient.params.HttpClientParams; import org.apache.http.NameValuePair; import org.apache.http.client.ClientProtocolException; import org.apache.http.client.config.RequestConfig; import org.apache.http.client.entity.UrlEncodedFormEntity; import org.apache.http.client.methods.CloseableHttpResponse; import org.apache.http.client.methods.HttpPost; import org.apache.http.client.utils.URIBuilder; import org.apache.http.impl.client.CloseableHttpClient; import org.apache.http.impl.client.HttpClients; import org.apache.http.message.BasicNameValuePair; import org.apache.http.util.EntityUtils; import org.springframework.util.Assert; import org.springframework.web.context.request.RequestContextHolder; import org.springframework.web.context.request.ServletRequestAttributes; import javax.net.ssl.SSLContext; import javax.net.ssl.SSLSocketFactory; import javax.net.ssl.TrustManager; import javax.net.ssl.X509TrustManager; import java.io.*; import java.nio.charset.Charset; import java.nio.charset.StandardCharsets; import java.security.NoSuchAlgorithmException; import java.security.cert.X509Certificate; import java.text.SimpleDateFormat; import java.util.*; import java.util.HashMap; import java.util.Locale; import java.util.Map; @Slf4j public class HttpUtil { ruoyi-common/src/main/java/com/ruoyi/common/utils/http/HttpUtils.java
@@ -1,10 +1,7 @@ package com.ruoyi.common.utils.http; import java.io.*; import java.net.ConnectException; import java.net.SocketTimeoutException; import java.net.URL; import java.net.URLConnection; import java.net.*; import java.nio.charset.StandardCharsets; import java.security.cert.X509Certificate; import java.util.Map; @@ -150,7 +147,7 @@ return result.toString(); } public static String sendPostByHeader(String url, String param, Map<String, String> headers) { public static String sendPostByHeaderOld(String url, String param, Map<String, String> headers) { PrintWriter out = null; BufferedReader in = null; StringBuilder result = new StringBuilder(); @@ -162,7 +159,7 @@ conn.setRequestProperty("connection", "Keep-Alive"); conn.setRequestProperty("user-agent", "Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1;SV1)"); conn.setRequestProperty("Accept-Charset", "utf-8"); conn.setRequestProperty("contentType", "utf-8"); conn.setRequestProperty("Content-Type", "application/json;charset=UTF-8"); conn.setDoOutput(true); conn.setDoInput(true); if (!Objects.isNull(headers)) { @@ -171,6 +168,7 @@ } } out = new PrintWriter(new OutputStreamWriter(conn.getOutputStream(), StandardCharsets.UTF_8)); log.error("---------param发送的数据为:{}",param); out.print(param); out.flush(); in = new BufferedReader(new InputStreamReader(conn.getInputStream(), StandardCharsets.UTF_8)); @@ -201,6 +199,51 @@ return result.toString(); } public static String sendPostByHeader(String url, String param, Map<String, String> headers) { StringBuilder result = new StringBuilder(); HttpURLConnection conn = null; try { log.info("sendPost - {}", url); URL realUrl = new URL(url); conn = (HttpURLConnection) realUrl.openConnection(); conn.setRequestMethod("POST"); conn.setRequestProperty("Accept", "*/*"); conn.setRequestProperty("Connection", "Keep-Alive"); conn.setRequestProperty("User-Agent", "Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1;SV1)"); conn.setRequestProperty("Content-Type", "application/json; charset=UTF-8"); conn.setDoOutput(true); conn.setDoInput(true); if (headers != null) { for (Map.Entry<String, String> entry : headers.entrySet()) { conn.setRequestProperty(entry.getKey(), entry.getValue()); } } log.error("发送参数：{}", param); try (OutputStream os = conn.getOutputStream()) { byte[] input = param.getBytes(StandardCharsets.UTF_8); os.write(input, 0, input.length); } try (BufferedReader in = new BufferedReader(new InputStreamReader(conn.getInputStream(), StandardCharsets.UTF_8))) { String line; while ((line = in.readLine()) != null) { result.append(line); } } } catch (Exception e) { log.error("调用 sendPostByHeader 异常，url={}, param={}", url, param, e); } finally { if (conn != null) { conn.disconnect(); } } return result.toString(); } public static String sendSSLPost(String url, String param) { StringBuilder result = new StringBuilder(); String urlNameString = url + "?" + param; ruoyi-framework/ruoyi-framework.iml
@@ -1,250 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <module external.system.module.type="SINGLE_MODULE" org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4"> <module version="4"> <component name="FacetManager"> <facet type="web" name="Web"> <configuration> <webroots /> <sourceRoots> <root url="file://$MODULE_DIR$/src/main/java" /> <root url="file://$MODULE_DIR$/src/main/resources" /> </sourceRoots> </configuration> </facet> <facet type="Spring" name="Spring"> <configuration /> </facet> </component> <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8"> <output url="file://$MODULE_DIR$/target/classes" /> <output-test url="file://$MODULE_DIR$/target/test-classes" /> <content url="file://$MODULE_DIR$"> <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" /> <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" /> <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" /> <excludeFolder url="file://$MODULE_DIR$/target" /> </content> <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-web:2.5.14" level="project" /> <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:2.5.14" level="project" /> <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:2.5.14" level="project" /> <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-logging:2.5.14" level="project" /> <orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.2.11" level="project" /> <orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.2.11" level="project" /> <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-to-slf4j:2.17.2" level="project" /> <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-api:2.17.2" level="project" /> <orderEntry type="library" name="Maven: org.slf4j:jul-to-slf4j:1.7.36" level="project" /> <orderEntry type="library" name="Maven: jakarta.annotation:jakarta.annotation-api:1.3.5" level="project" /> <orderEntry type="library" name="Maven: org.springframework:spring-core:5.3.20" level="project" /> <orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.3.20" level="project" /> <orderEntry type="library" name="Maven: org.yaml:snakeyaml:1.28" level="project" /> <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-json:2.5.14" level="project" /> <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.12.6.1" level="project" /> <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.12.6" level="project" /> <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.12.6" level="project" /> <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.12.6" level="project" /> <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.12.6" level="project" /> <orderEntry type="library" name="Maven: com.fasterxml.jackson.module:jackson-module-parameter-names:2.12.6" level="project" /> <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-tomcat:2.5.14" level="project" /> <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-core:9.0.63" level="project" /> <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-el:9.0.63" level="project" /> <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-websocket:9.0.63" level="project" /> <orderEntry type="library" name="Maven: org.springframework:spring-web:5.3.20" level="project" /> <orderEntry type="library" name="Maven: org.springframework:spring-beans:5.3.20" level="project" /> <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:5.3.20" level="project" /> <orderEntry type="library" name="Maven: org.springframework:spring-context:5.3.20" level="project" /> <orderEntry type="library" name="Maven: org.springframework:spring-expression:5.3.20" level="project" /> <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-aop:2.5.14" level="project" /> <orderEntry type="library" name="Maven: org.springframework:spring-aop:5.3.20" level="project" /> <orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.9.7" level="project" /> <orderEntry type="library" name="Maven: com.alibaba:druid-spring-boot-starter:1.2.15" level="project" /> <orderEntry type="library" name="Maven: com.alibaba:druid:1.2.15" level="project" /> <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.36" level="project" /> <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:2.5.14" level="project" /> <orderEntry type="library" name="Maven: pro.fessional:kaptcha:2.3.3" level="project" /> <orderEntry type="library" name="Maven: com.jhlabs:filters:2.0.235-1" level="project" /> <orderEntry type="library" name="Maven: javax.servlet:servlet-api:2.5" level="project" /> <orderEntry type="library" name="Maven: com.github.oshi:oshi-core:6.4.0" level="project" /> <orderEntry type="library" name="Maven: net.java.dev.jna:jna:5.12.1" level="project" /> <orderEntry type="library" name="Maven: net.java.dev.jna:jna-platform:5.12.1" level="project" /> <orderEntry type="module" module-name="ruoyi-system" /> <orderEntry type="module" module-name="ruoyi-common" /> <orderEntry type="library" name="Maven: org.jsoup:jsoup:1.15.3" level="project" /> <orderEntry type="library" name="Maven: io.minio:minio:7.1.0" level="project" /> <orderEntry type="library" name="Maven: com.carrotsearch.thirdparty:simple-xml-safe:2.7.1" level="project" /> <orderEntry type="library" name="Maven: com.google.guava:guava:25.1-jre" level="project" /> <orderEntry type="library" name="Maven: org.checkerframework:checker-qual:2.0.0" level="project" /> <orderEntry type="library" name="Maven: com.google.errorprone:error_prone_annotations:2.1.3" level="project" /> <orderEntry type="library" name="Maven: com.google.j2objc:j2objc-annotations:1.1" level="project" /> <orderEntry type="library" name="Maven: org.codehaus.mojo:animal-sniffer-annotations:1.14" level="project" /> <orderEntry type="library" name="Maven: com.github.spotbugs:spotbugs-annotations:4.0.0" level="project" /> <orderEntry type="library" name="Maven: net.jcip:jcip-annotations:1.0" level="project" /> <orderEntry type="library" name="Maven: com.google.code.findbugs:jsr305:3.0.2" level="project" /> <orderEntry type="library" name="Maven: org.springframework:spring-context-support:5.3.20" level="project" /> <orderEntry type="library" name="Maven: org.freemarker:freemarker:2.3.31" level="project" /> <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-security:2.5.14" level="project" /> <orderEntry type="library" name="Maven: org.springframework.security:spring-security-config:5.5.8" level="project" /> <orderEntry type="library" name="Maven: org.springframework.security:spring-security-core:5.5.8" level="project" /> <orderEntry type="library" name="Maven: org.springframework.security:spring-security-crypto:5.5.8" level="project" /> <orderEntry type="library" name="Maven: org.springframework.security:spring-security-web:5.5.8" level="project" /> <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper-spring-boot-starter:1.4.6" level="project" /> <orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-starter:2.2.2" level="project" /> <orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-autoconfigure:2.2.2" level="project" /> <orderEntry type="library" name="Maven: org.mybatis:mybatis:3.5.9" level="project" /> <orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:2.0.7" level="project" /> <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper-spring-boot-autoconfigure:1.4.6" level="project" /> <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper:5.3.2" level="project" /> <orderEntry type="library" name="Maven: com.github.jsqlparser:jsqlparser:4.5" level="project" /> <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-validation:2.5.14" level="project" /> <orderEntry type="library" name="Maven: org.hibernate.validator:hibernate-validator:6.2.3.Final" level="project" /> <orderEntry type="library" name="Maven: jakarta.validation:jakarta.validation-api:2.0.2" level="project" /> <orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging:3.4.3.Final" level="project" /> <orderEntry type="library" name="Maven: com.fasterxml:classmate:1.5.1" level="project" /> <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.12.0" level="project" /> <orderEntry type="library" name="Maven: com.baomidou:dynamic-datasource-spring-boot-starter:3.5.2" level="project" /> <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-jdbc:2.5.14" level="project" /> <orderEntry type="library" name="Maven: com.zaxxer:HikariCP:4.0.3" level="project" /> <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:5.3.20" level="project" /> <orderEntry type="library" name="Maven: com.alibaba.fastjson2:fastjson2:2.0.23" level="project" /> <orderEntry type="library" name="Maven: cn.hutool:hutool-all:5.4.0" level="project" /> <orderEntry type="library" name="Maven: com.github.binarywang:weixin-java-mp:3.0.0" level="project" /> <orderEntry type="library" name="Maven: com.github.binarywang:weixin-java-common:3.0.0" level="project" /> <orderEntry type="library" name="Maven: com.thoughtworks.xstream:xstream:1.4.9" level="project" /> <orderEntry type="library" name="Maven: xmlpull:xmlpull:1.1.3.1" level="project" /> <orderEntry type="library" name="Maven: xpp3:xpp3_min:1.1.4c" level="project" /> <orderEntry type="library" name="Maven: org.slf4j:jcl-over-slf4j:1.7.36" level="project" /> <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.15" level="project" /> <orderEntry type="library" name="Maven: commons-io:commons-io:2.11.0" level="project" /> <orderEntry type="library" name="Maven: commons-fileupload:commons-fileupload:1.4" level="project" /> <orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml:4.1.2" level="project" /> <orderEntry type="library" name="Maven: org.apache.poi:poi:4.1.2" level="project" /> <orderEntry type="library" name="Maven: org.apache.commons:commons-collections4:4.4" level="project" /> <orderEntry type="library" name="Maven: org.apache.commons:commons-math3:3.6.1" level="project" /> <orderEntry type="library" name="Maven: com.zaxxer:SparseBitSet:1.2" level="project" /> <orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml-schemas:4.1.2" level="project" /> <orderEntry type="library" name="Maven: org.apache.xmlbeans:xmlbeans:3.1.0" level="project" /> <orderEntry type="library" name="Maven: org.apache.commons:commons-compress:1.19" level="project" /> <orderEntry type="library" name="Maven: com.github.virtuald:curvesapi:1.06" level="project" /> <orderEntry type="library" name="Maven: io.jsonwebtoken:jjwt:0.9.1" level="project" /> <orderEntry type="library" name="Maven: javax.xml.bind:jaxb-api:2.3.1" level="project" /> <orderEntry type="library" name="Maven: javax.activation:javax.activation-api:1.2.0" level="project" /> <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-data-redis:2.5.14" level="project" /> <orderEntry type="library" name="Maven: org.springframework.data:spring-data-redis:2.5.11" level="project" /> <orderEntry type="library" name="Maven: org.springframework.data:spring-data-keyvalue:2.5.11" level="project" /> <orderEntry type="library" name="Maven: org.springframework.data:spring-data-commons:2.5.11" level="project" /> <orderEntry type="library" name="Maven: org.springframework:spring-tx:5.3.20" level="project" /> <orderEntry type="library" name="Maven: org.springframework:spring-oxm:5.3.20" level="project" /> <orderEntry type="library" name="Maven: io.lettuce:lettuce-core:6.1.8.RELEASE" level="project" /> <orderEntry type="library" name="Maven: io.netty:netty-common:4.1.77.Final" level="project" /> <orderEntry type="library" name="Maven: io.netty:netty-handler:4.1.77.Final" level="project" /> <orderEntry type="library" name="Maven: io.netty:netty-resolver:4.1.77.Final" level="project" /> <orderEntry type="library" name="Maven: io.netty:netty-transport:4.1.77.Final" level="project" /> <orderEntry type="library" name="Maven: io.projectreactor:reactor-core:3.4.18" level="project" /> <orderEntry type="library" name="Maven: org.reactivestreams:reactive-streams:1.0.3" level="project" /> <orderEntry type="library" name="Maven: org.apache.commons:commons-pool2:2.9.0" level="project" /> <orderEntry type="library" name="Maven: eu.bitwalker:UserAgentUtils:1.21" level="project" /> <orderEntry type="library" name="Maven: io.swagger:swagger-annotations:1.6.2" level="project" /> <orderEntry type="library" name="Maven: javax.servlet:javax.servlet-api:4.0.1" level="project" /> <orderEntry type="library" name="Maven: org.projectlombok:lombok:1.18.24" level="project" /> <orderEntry type="library" name="Maven: com.squareup.okhttp3:okhttp:3.14.9" level="project" /> <orderEntry type="library" name="Maven: com.squareup.okio:okio:1.17.2" level="project" /> <orderEntry type="library" name="Maven: com.aliyun:alibaba-dingtalk-service-sdk:2.0.0" level="project" /> <orderEntry type="library" name="Maven: log4j:log4j:1.2.15" level="project" /> <orderEntry type="library" name="Maven: javax.mail:mail:1.4" level="project" /> <orderEntry type="library" name="Maven: javax.activation:activation:1.1" level="project" /> <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.1.1" level="project" /> <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-websocket:2.5.14" level="project" /> <orderEntry type="library" name="Maven: org.springframework:spring-messaging:5.3.20" level="project" /> <orderEntry type="library" name="Maven: org.springframework:spring-websocket:5.3.20" level="project" /> <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.15" level="project" /> <orderEntry type="library" name="Maven: commons-httpclient:commons-httpclient:3.1" level="project" /> <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpmime:4.5.13" level="project" /> <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.13" level="project" /> <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.41" level="project" /> <orderEntry type="library" name="Maven: org.springframework:spring-test:5.3.20" level="project" /> <orderEntry type="module" module-name="smartor" /> <orderEntry type="library" name="Maven: com.aliyun:ecs20140526:3.1.12" level="project" /> <orderEntry type="library" name="Maven: com.aliyun:tea-util:0.2.16" level="project" /> <orderEntry type="library" name="Maven: com.aliyun:tea-rpc:0.1.2" level="project" /> <orderEntry type="library" name="Maven: com.aliyun:credentials-java:0.2.4" level="project" /> <orderEntry type="library" name="Maven: com.aliyun:endpoint-util:0.0.7" level="project" /> <orderEntry type="library" name="Maven: com.aliyun:tea:1.2.0" level="project" /> <orderEntry type="library" name="Maven: com.aliyun:tea-rpc-util:0.1.2" level="project" /> <orderEntry type="library" name="Maven: dom4j:dom4j:1.6.1" level="project" /> <orderEntry type="library" name="Maven: com.sun.xml.bind:jaxb-core:2.3.0" level="project" /> <orderEntry type="library" name="Maven: com.sun.xml.bind:jaxb-impl:2.3.0" level="project" /> <orderEntry type="library" name="Maven: com.aliyun:tea-openapi:0.2.8" level="project" /> <orderEntry type="library" name="Maven: com.aliyun:alibabacloud-gateway-spi:0.0.1" level="project" /> <orderEntry type="library" name="Maven: com.aliyun:tea-xml:0.1.5" level="project" /> <orderEntry type="library" name="Maven: org.dom4j:dom4j:2.0.3" level="project" /> <orderEntry type="library" name="Maven: com.aliyun:openapiutil:0.2.1" level="project" /> <orderEntry type="library" name="Maven: org.bouncycastle:bcpkix-jdk15on:1.70" level="project" /> <orderEntry type="library" name="Maven: org.bouncycastle:bcutil-jdk15on:1.70" level="project" /> <orderEntry type="library" name="Maven: com.aliyun:dysmsapi20170525:2.0.24" level="project" /> <orderEntry type="library" name="Maven: com.aliyun:aliyun-java-sdk-core:4.6.3" level="project" /> <orderEntry type="library" name="Maven: com.google.code.gson:gson:2.8.9" level="project" /> <orderEntry type="library" name="Maven: org.glassfish.jaxb:jaxb-runtime:2.3.6" level="project" /> <orderEntry type="library" name="Maven: jakarta.xml.bind:jakarta.xml.bind-api:2.3.3" level="project" /> <orderEntry type="library" name="Maven: org.glassfish.jaxb:txw2:2.3.6" level="project" /> <orderEntry type="library" name="Maven: com.sun.istack:istack-commons-runtime:3.0.12" level="project" /> <orderEntry type="library" scope="RUNTIME" name="Maven: com.sun.activation:jakarta.activation:1.2.2" level="project" /> <orderEntry type="library" name="Maven: org.bouncycastle:bcprov-jdk15on:1.70" level="project" /> <orderEntry type="library" name="Maven: org.jacoco:org.jacoco.agent:runtime:0.8.8" level="project" /> <orderEntry type="library" name="Maven: org.ini4j:ini4j:0.5.4" level="project" /> <orderEntry type="library" name="Maven: io.opentracing:opentracing-api:0.33.0" level="project" /> <orderEntry type="library" name="Maven: io.opentracing:opentracing-util:0.33.0" level="project" /> <orderEntry type="library" name="Maven: io.opentracing:opentracing-noop:0.33.0" level="project" /> <orderEntry type="library" name="Maven: com.aliyun:aliyun-java-sdk-ecs:4.24.59" level="project" /> <orderEntry type="library" name="Maven: cn.afterturn:easypoi-spring-boot-starter:4.4.0" level="project" /> <orderEntry type="library" name="Maven: cn.afterturn:easypoi-web:4.4.0" level="project" /> <orderEntry type="library" name="Maven: cn.afterturn:easypoi-base:4.4.0" level="project" /> <orderEntry type="library" name="Maven: ognl:ognl:3.2.6" level="project" /> <orderEntry type="library" name="Maven: org.javassist:javassist:3.20.0-GA" level="project" /> <orderEntry type="library" name="Maven: javax.validation:validation-api:2.0.1.Final" level="project" /> <orderEntry type="library" name="Maven: cn.afterturn:easypoi-annotation:4.4.0" level="project" /> <orderEntry type="library" name="Maven: cn.afterturn:easypoi-wps:4.4.0" level="project" /> <orderEntry type="library" name="Maven: com.sparkjava:spark-core:2.9.4" level="project" /> <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-server:9.4.46.v20220331" level="project" /> <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-http:9.4.46.v20220331" level="project" /> <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-util:9.4.46.v20220331" level="project" /> <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-io:9.4.46.v20220331" level="project" /> <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-webapp:9.4.46.v20220331" level="project" /> <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-xml:9.4.46.v20220331" level="project" /> <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-servlet:9.4.46.v20220331" level="project" /> <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-security:9.4.46.v20220331" level="project" /> <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-util-ajax:9.4.46.v20220331" level="project" /> <orderEntry type="library" name="Maven: org.eclipse.jetty.websocket:websocket-server:9.4.46.v20220331" level="project" /> <orderEntry type="library" name="Maven: org.eclipse.jetty.websocket:websocket-common:9.4.46.v20220331" level="project" /> <orderEntry type="library" name="Maven: org.eclipse.jetty.websocket:websocket-client:9.4.46.v20220331" level="project" /> <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-client:9.4.46.v20220331" level="project" /> <orderEntry type="library" name="Maven: org.eclipse.jetty.websocket:websocket-servlet:9.4.46.v20220331" level="project" /> <orderEntry type="library" name="Maven: org.eclipse.jetty.websocket:websocket-api:9.4.46.v20220331" level="project" /> <orderEntry type="library" name="Maven: com.sparkjava:spark-template-freemarker:2.7.1" level="project" /> <orderEntry type="library" name="Maven: com.google.zxing:core:3.5.1" level="project" /> <orderEntry type="library" name="Maven: com.google.zxing:javase:3.5.1" level="project" /> <orderEntry type="library" name="Maven: com.beust:jcommander:1.82" level="project" /> <orderEntry type="library" scope="RUNTIME" name="Maven: com.github.jai-imageio:jai-imageio-core:1.4.0" level="project" /> <orderEntry type="library" name="Maven: com.alibaba.nls:nls-sdk-recognizer:2.2.1" level="project" /> <orderEntry type="library" name="Maven: com.alibaba.nls:nls-sdk-common:2.2.1" level="project" /> <orderEntry type="library" name="Maven: io.netty:netty-codec-http:4.1.77.Final" level="project" /> <orderEntry type="library" name="Maven: io.netty:netty-codec:4.1.77.Final" level="project" /> <orderEntry type="library" name="Maven: io.netty:netty-buffer:4.1.77.Final" level="project" /> <orderEntry type="library" name="Maven: com.alibaba.nls:nls-sdk-tts:2.2.1" level="project" /> <orderEntry type="library" name="Maven: ca.uhn.hapi:hapi-base:2.3" level="project" /> <orderEntry type="library" name="Maven: joda-time:joda-time:2.1" level="project" /> <orderEntry type="library" name="Maven: ca.uhn.hapi:hapi-structures-v24:2.3" level="project" /> <orderEntry type="library" name="Maven: com.googlecode.json-simple:json-simple:1.1.1" level="project" /> <orderEntry type="library" name="Maven: junit:junit:4.13.2" level="project" /> <orderEntry type="library" name="Maven: org.hamcrest:hamcrest-core:2.2" level="project" /> <orderEntry type="library" name="Maven: org.hamcrest:hamcrest:2.2" level="project" /> <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-amqp:2.5.14" level="project" /> <orderEntry type="library" name="Maven: org.springframework.amqp:spring-rabbit:2.3.16" level="project" /> <orderEntry type="library" name="Maven: org.springframework.amqp:spring-amqp:2.3.16" level="project" /> <orderEntry type="library" name="Maven: org.springframework.retry:spring-retry:1.3.3" level="project" /> <orderEntry type="library" name="Maven: com.rabbitmq:amqp-client:5.12.0" level="project" /> <orderEntry type="library" name="Maven: org.apache.axis:axis:1.4" level="project" /> <orderEntry type="library" name="Maven: org.apache.axis:axis-jaxrpc:1.4" level="project" /> <orderEntry type="library" name="Maven: com.jcraft:jsch:0.1.54" level="project" /> </component> </module> ruoyi-framework/src/main/java/com/ruoyi/framework/interceptor/HospitalFilterInterceptor.java
@@ -47,7 +47,7 @@ orgid = loginUser.getUser().getOrgid(); } } catch (Exception e) { e.printStackTrace(); } if (StringUtils.isEmpty(orgid)) { return invocation.proceed(); @@ -71,7 +71,7 @@ * @return 修改后的 SQL */ private String modifySqlWithorgidId(String originalSql, String orgid) { if (originalSql.contains("insert into") || originalSql.contains("INSERT INTO") || originalSql.contains("from sys_menu") || originalSql.contains("update sys_menu") || originalSql.contains("information_schema.tables") || originalSql.contains("information_schema.columns") || originalSql.contains("gen_table")) { if (originalSql.contains("insert into") || originalSql.contains("INSERT INTO") || originalSql.contains("from sys_menu") || originalSql.contains("update sys_menu") || originalSql.contains("information_schema.tables") || originalSql.contains("information_schema.columns") || originalSql.contains("gen_table") || originalSql.toUpperCase().contains("ORGID IS NULL")) { return originalSql; } // 提取 orgid 的 WHERE 子句 ruoyi-generator/ruoyi-generator.iml
@@ -1,163 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <module external.system.module.type="SINGLE_MODULE" org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4"> <module version="4"> <component name="FacetManager"> <facet type="web" name="Web"> <configuration> <webroots /> <sourceRoots> <root url="file://$MODULE_DIR$/src/main/java" /> <root url="file://$MODULE_DIR$/src/main/resources" /> </sourceRoots> </configuration> </facet> <facet type="Spring" name="Spring"> <configuration /> </facet> </component> <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8"> <output url="file://$MODULE_DIR$/target/classes" /> <output-test url="file://$MODULE_DIR$/target/test-classes" /> <content url="file://$MODULE_DIR$"> <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" /> <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" /> <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" /> <excludeFolder url="file://$MODULE_DIR$/target" /> </content> <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="library" name="Maven: org.apache.velocity:velocity-engine-core:2.3" level="project" /> <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.12.0" level="project" /> <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.36" level="project" /> <orderEntry type="library" name="Maven: commons-collections:commons-collections:3.2.2" level="project" /> <orderEntry type="module" module-name="ruoyi-common" /> <orderEntry type="library" name="Maven: org.jsoup:jsoup:1.15.3" level="project" /> <orderEntry type="library" name="Maven: io.minio:minio:7.1.0" level="project" /> <orderEntry type="library" name="Maven: com.carrotsearch.thirdparty:simple-xml-safe:2.7.1" level="project" /> <orderEntry type="library" name="Maven: com.google.guava:guava:25.1-jre" level="project" /> <orderEntry type="library" name="Maven: org.checkerframework:checker-qual:2.0.0" level="project" /> <orderEntry type="library" name="Maven: com.google.errorprone:error_prone_annotations:2.1.3" level="project" /> <orderEntry type="library" name="Maven: com.google.j2objc:j2objc-annotations:1.1" level="project" /> <orderEntry type="library" name="Maven: org.codehaus.mojo:animal-sniffer-annotations:1.14" level="project" /> <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.12.6" level="project" /> <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.12.6" level="project" /> <orderEntry type="library" name="Maven: com.github.spotbugs:spotbugs-annotations:4.0.0" level="project" /> <orderEntry type="library" name="Maven: net.jcip:jcip-annotations:1.0" level="project" /> <orderEntry type="library" name="Maven: com.google.code.findbugs:jsr305:3.0.2" level="project" /> <orderEntry type="library" name="Maven: org.springframework:spring-context-support:5.3.20" level="project" /> <orderEntry type="library" name="Maven: org.springframework:spring-beans:5.3.20" level="project" /> <orderEntry type="library" name="Maven: org.springframework:spring-context:5.3.20" level="project" /> <orderEntry type="library" name="Maven: org.springframework:spring-expression:5.3.20" level="project" /> <orderEntry type="library" name="Maven: org.springframework:spring-core:5.3.20" level="project" /> <orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.3.20" level="project" /> <orderEntry type="library" name="Maven: org.freemarker:freemarker:2.3.31" level="project" /> <orderEntry type="library" name="Maven: org.springframework:spring-web:5.3.20" level="project" /> <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-security:2.5.14" level="project" /> <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:2.5.14" level="project" /> <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:2.5.14" level="project" /> <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:2.5.14" level="project" /> <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-logging:2.5.14" level="project" /> <orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.2.11" level="project" /> <orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.2.11" level="project" /> <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-to-slf4j:2.17.2" level="project" /> <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-api:2.17.2" level="project" /> <orderEntry type="library" name="Maven: org.slf4j:jul-to-slf4j:1.7.36" level="project" /> <orderEntry type="library" name="Maven: jakarta.annotation:jakarta.annotation-api:1.3.5" level="project" /> <orderEntry type="library" name="Maven: org.springframework:spring-aop:5.3.20" level="project" /> <orderEntry type="library" name="Maven: org.springframework.security:spring-security-config:5.5.8" level="project" /> <orderEntry type="library" name="Maven: org.springframework.security:spring-security-core:5.5.8" level="project" /> <orderEntry type="library" name="Maven: org.springframework.security:spring-security-crypto:5.5.8" level="project" /> <orderEntry type="library" name="Maven: org.springframework.security:spring-security-web:5.5.8" level="project" /> <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper-spring-boot-starter:1.4.6" level="project" /> <orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-starter:2.2.2" level="project" /> <orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-autoconfigure:2.2.2" level="project" /> <orderEntry type="library" name="Maven: org.mybatis:mybatis:3.5.9" level="project" /> <orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:2.0.7" level="project" /> <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper-spring-boot-autoconfigure:1.4.6" level="project" /> <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper:5.3.2" level="project" /> <orderEntry type="library" name="Maven: com.github.jsqlparser:jsqlparser:4.5" level="project" /> <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-validation:2.5.14" level="project" /> <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-el:9.0.63" level="project" /> <orderEntry type="library" name="Maven: org.hibernate.validator:hibernate-validator:6.2.3.Final" level="project" /> <orderEntry type="library" name="Maven: jakarta.validation:jakarta.validation-api:2.0.2" level="project" /> <orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging:3.4.3.Final" level="project" /> <orderEntry type="library" name="Maven: com.fasterxml:classmate:1.5.1" level="project" /> <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.12.6.1" level="project" /> <orderEntry type="library" name="Maven: com.baomidou:dynamic-datasource-spring-boot-starter:3.5.2" level="project" /> <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-jdbc:2.5.14" level="project" /> <orderEntry type="library" name="Maven: com.zaxxer:HikariCP:4.0.3" level="project" /> <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:5.3.20" level="project" /> <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-aop:2.5.14" level="project" /> <orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.9.7" level="project" /> <orderEntry type="library" name="Maven: com.alibaba.fastjson2:fastjson2:2.0.23" level="project" /> <orderEntry type="library" name="Maven: cn.hutool:hutool-all:5.4.0" level="project" /> <orderEntry type="library" name="Maven: com.github.binarywang:weixin-java-mp:3.0.0" level="project" /> <orderEntry type="library" name="Maven: com.github.binarywang:weixin-java-common:3.0.0" level="project" /> <orderEntry type="library" name="Maven: com.thoughtworks.xstream:xstream:1.4.9" level="project" /> <orderEntry type="library" name="Maven: xmlpull:xmlpull:1.1.3.1" level="project" /> <orderEntry type="library" name="Maven: xpp3:xpp3_min:1.1.4c" level="project" /> <orderEntry type="library" name="Maven: org.slf4j:jcl-over-slf4j:1.7.36" level="project" /> <orderEntry type="library" name="Maven: com.google.code.gson:gson:2.8.9" level="project" /> <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.15" level="project" /> <orderEntry type="library" name="Maven: commons-io:commons-io:2.11.0" level="project" /> <orderEntry type="library" name="Maven: commons-fileupload:commons-fileupload:1.4" level="project" /> <orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml:4.1.2" level="project" /> <orderEntry type="library" name="Maven: org.apache.poi:poi:4.1.2" level="project" /> <orderEntry type="library" name="Maven: org.apache.commons:commons-collections4:4.4" level="project" /> <orderEntry type="library" name="Maven: org.apache.commons:commons-math3:3.6.1" level="project" /> <orderEntry type="library" name="Maven: com.zaxxer:SparseBitSet:1.2" level="project" /> <orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml-schemas:4.1.2" level="project" /> <orderEntry type="library" name="Maven: org.apache.xmlbeans:xmlbeans:3.1.0" level="project" /> <orderEntry type="library" name="Maven: org.apache.commons:commons-compress:1.19" level="project" /> <orderEntry type="library" name="Maven: com.github.virtuald:curvesapi:1.06" level="project" /> <orderEntry type="library" name="Maven: org.yaml:snakeyaml:1.28" level="project" /> <orderEntry type="library" name="Maven: io.jsonwebtoken:jjwt:0.9.1" level="project" /> <orderEntry type="library" name="Maven: javax.xml.bind:jaxb-api:2.3.1" level="project" /> <orderEntry type="library" name="Maven: javax.activation:javax.activation-api:1.2.0" level="project" /> <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-data-redis:2.5.14" level="project" /> <orderEntry type="library" name="Maven: org.springframework.data:spring-data-redis:2.5.11" level="project" /> <orderEntry type="library" name="Maven: org.springframework.data:spring-data-keyvalue:2.5.11" level="project" /> <orderEntry type="library" name="Maven: org.springframework.data:spring-data-commons:2.5.11" level="project" /> <orderEntry type="library" name="Maven: org.springframework:spring-tx:5.3.20" level="project" /> <orderEntry type="library" name="Maven: org.springframework:spring-oxm:5.3.20" level="project" /> <orderEntry type="library" name="Maven: io.lettuce:lettuce-core:6.1.8.RELEASE" level="project" /> <orderEntry type="library" name="Maven: io.netty:netty-common:4.1.77.Final" level="project" /> <orderEntry type="library" name="Maven: io.netty:netty-handler:4.1.77.Final" level="project" /> <orderEntry type="library" name="Maven: io.netty:netty-resolver:4.1.77.Final" level="project" /> <orderEntry type="library" name="Maven: io.netty:netty-buffer:4.1.77.Final" level="project" /> <orderEntry type="library" name="Maven: io.netty:netty-codec:4.1.77.Final" level="project" /> <orderEntry type="library" name="Maven: io.netty:netty-transport:4.1.77.Final" level="project" /> <orderEntry type="library" name="Maven: io.projectreactor:reactor-core:3.4.18" level="project" /> <orderEntry type="library" name="Maven: org.reactivestreams:reactive-streams:1.0.3" level="project" /> <orderEntry type="library" name="Maven: org.apache.commons:commons-pool2:2.9.0" level="project" /> <orderEntry type="library" name="Maven: eu.bitwalker:UserAgentUtils:1.21" level="project" /> <orderEntry type="library" name="Maven: io.swagger:swagger-annotations:1.6.2" level="project" /> <orderEntry type="library" name="Maven: javax.servlet:javax.servlet-api:4.0.1" level="project" /> <orderEntry type="library" name="Maven: org.projectlombok:lombok:1.18.24" level="project" /> <orderEntry type="library" name="Maven: com.squareup.okhttp3:okhttp:3.14.9" level="project" /> <orderEntry type="library" name="Maven: com.squareup.okio:okio:1.17.2" level="project" /> <orderEntry type="library" name="Maven: com.aliyun:alibaba-dingtalk-service-sdk:2.0.0" level="project" /> <orderEntry type="library" name="Maven: log4j:log4j:1.2.15" level="project" /> <orderEntry type="library" name="Maven: javax.mail:mail:1.4" level="project" /> <orderEntry type="library" name="Maven: javax.activation:activation:1.1" level="project" /> <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.1.1" level="project" /> <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-websocket:2.5.14" level="project" /> <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-web:2.5.14" level="project" /> <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-json:2.5.14" level="project" /> <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.12.6" level="project" /> <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.12.6" level="project" /> <orderEntry type="library" name="Maven: com.fasterxml.jackson.module:jackson-module-parameter-names:2.12.6" level="project" /> <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-tomcat:2.5.14" level="project" /> <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-core:9.0.63" level="project" /> <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-websocket:9.0.63" level="project" /> <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:5.3.20" level="project" /> <orderEntry type="library" name="Maven: org.springframework:spring-messaging:5.3.20" level="project" /> <orderEntry type="library" name="Maven: org.springframework:spring-websocket:5.3.20" level="project" /> <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.15" level="project" /> <orderEntry type="library" name="Maven: commons-httpclient:commons-httpclient:3.1" level="project" /> <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpmime:4.5.13" level="project" /> <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.13" level="project" /> <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.41" level="project" /> <orderEntry type="library" name="Maven: org.springframework:spring-test:5.3.20" level="project" /> </component> </module> ruoyi-quartz/ruoyi-quartz.iml
@@ -1,244 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <module external.system.module.type="SINGLE_MODULE" org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4"> <module version="4"> <component name="FacetManager"> <facet type="web" name="Web"> <configuration> <webroots /> <sourceRoots> <root url="file://$MODULE_DIR$/src/main/java" /> <root url="file://$MODULE_DIR$/src/main/resources" /> </sourceRoots> </configuration> </facet> <facet type="Spring" name="Spring"> <configuration /> </facet> </component> <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8"> <output url="file://$MODULE_DIR$/target/classes" /> <output-test url="file://$MODULE_DIR$/target/test-classes" /> <content url="file://$MODULE_DIR$"> <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" /> <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" /> <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" /> <excludeFolder url="file://$MODULE_DIR$/target" /> </content> <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="library" name="Maven: org.quartz-scheduler:quartz:2.3.2" level="project" /> <orderEntry type="library" name="Maven: com.mchange:mchange-commons-java:0.2.15" level="project" /> <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.36" level="project" /> <orderEntry type="module" module-name="ruoyi-common" /> <orderEntry type="library" name="Maven: org.jsoup:jsoup:1.15.3" level="project" /> <orderEntry type="library" name="Maven: io.minio:minio:7.1.0" level="project" /> <orderEntry type="library" name="Maven: com.carrotsearch.thirdparty:simple-xml-safe:2.7.1" level="project" /> <orderEntry type="library" name="Maven: com.google.guava:guava:25.1-jre" level="project" /> <orderEntry type="library" name="Maven: org.checkerframework:checker-qual:2.0.0" level="project" /> <orderEntry type="library" name="Maven: com.google.errorprone:error_prone_annotations:2.1.3" level="project" /> <orderEntry type="library" name="Maven: com.google.j2objc:j2objc-annotations:1.1" level="project" /> <orderEntry type="library" name="Maven: org.codehaus.mojo:animal-sniffer-annotations:1.14" level="project" /> <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.12.6" level="project" /> <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.12.6" level="project" /> <orderEntry type="library" name="Maven: com.github.spotbugs:spotbugs-annotations:4.0.0" level="project" /> <orderEntry type="library" name="Maven: net.jcip:jcip-annotations:1.0" level="project" /> <orderEntry type="library" name="Maven: com.google.code.findbugs:jsr305:3.0.2" level="project" /> <orderEntry type="library" name="Maven: org.springframework:spring-context-support:5.3.20" level="project" /> <orderEntry type="library" name="Maven: org.springframework:spring-beans:5.3.20" level="project" /> <orderEntry type="library" name="Maven: org.springframework:spring-context:5.3.20" level="project" /> <orderEntry type="library" name="Maven: org.springframework:spring-expression:5.3.20" level="project" /> <orderEntry type="library" name="Maven: org.springframework:spring-core:5.3.20" level="project" /> <orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.3.20" level="project" /> <orderEntry type="library" name="Maven: org.freemarker:freemarker:2.3.31" level="project" /> <orderEntry type="library" name="Maven: org.springframework:spring-web:5.3.20" level="project" /> <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-security:2.5.14" level="project" /> <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:2.5.14" level="project" /> <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:2.5.14" level="project" /> <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-logging:2.5.14" level="project" /> <orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.2.11" level="project" /> <orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.2.11" level="project" /> <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-to-slf4j:2.17.2" level="project" /> <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-api:2.17.2" level="project" /> <orderEntry type="library" name="Maven: org.slf4j:jul-to-slf4j:1.7.36" level="project" /> <orderEntry type="library" name="Maven: jakarta.annotation:jakarta.annotation-api:1.3.5" level="project" /> <orderEntry type="library" name="Maven: org.springframework:spring-aop:5.3.20" level="project" /> <orderEntry type="library" name="Maven: org.springframework.security:spring-security-config:5.5.8" level="project" /> <orderEntry type="library" name="Maven: org.springframework.security:spring-security-core:5.5.8" level="project" /> <orderEntry type="library" name="Maven: org.springframework.security:spring-security-crypto:5.5.8" level="project" /> <orderEntry type="library" name="Maven: org.springframework.security:spring-security-web:5.5.8" level="project" /> <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper-spring-boot-starter:1.4.6" level="project" /> <orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-starter:2.2.2" level="project" /> <orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-autoconfigure:2.2.2" level="project" /> <orderEntry type="library" name="Maven: org.mybatis:mybatis:3.5.9" level="project" /> <orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:2.0.7" level="project" /> <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper-spring-boot-autoconfigure:1.4.6" level="project" /> <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper:5.3.2" level="project" /> <orderEntry type="library" name="Maven: com.github.jsqlparser:jsqlparser:4.5" level="project" /> <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-validation:2.5.14" level="project" /> <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-el:9.0.63" level="project" /> <orderEntry type="library" name="Maven: org.hibernate.validator:hibernate-validator:6.2.3.Final" level="project" /> <orderEntry type="library" name="Maven: jakarta.validation:jakarta.validation-api:2.0.2" level="project" /> <orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging:3.4.3.Final" level="project" /> <orderEntry type="library" name="Maven: com.fasterxml:classmate:1.5.1" level="project" /> <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.12.0" level="project" /> <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.12.6.1" level="project" /> <orderEntry type="library" name="Maven: com.baomidou:dynamic-datasource-spring-boot-starter:3.5.2" level="project" /> <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-jdbc:2.5.14" level="project" /> <orderEntry type="library" name="Maven: com.zaxxer:HikariCP:4.0.3" level="project" /> <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:5.3.20" level="project" /> <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-aop:2.5.14" level="project" /> <orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.9.7" level="project" /> <orderEntry type="library" name="Maven: com.alibaba.fastjson2:fastjson2:2.0.23" level="project" /> <orderEntry type="library" name="Maven: cn.hutool:hutool-all:5.4.0" level="project" /> <orderEntry type="library" name="Maven: com.github.binarywang:weixin-java-mp:3.0.0" level="project" /> <orderEntry type="library" name="Maven: com.github.binarywang:weixin-java-common:3.0.0" level="project" /> <orderEntry type="library" name="Maven: com.thoughtworks.xstream:xstream:1.4.9" level="project" /> <orderEntry type="library" name="Maven: xmlpull:xmlpull:1.1.3.1" level="project" /> <orderEntry type="library" name="Maven: xpp3:xpp3_min:1.1.4c" level="project" /> <orderEntry type="library" name="Maven: org.slf4j:jcl-over-slf4j:1.7.36" level="project" /> <orderEntry type="library" name="Maven: commons-io:commons-io:2.11.0" level="project" /> <orderEntry type="library" name="Maven: commons-fileupload:commons-fileupload:1.4" level="project" /> <orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml:4.1.2" level="project" /> <orderEntry type="library" name="Maven: org.apache.poi:poi:4.1.2" level="project" /> <orderEntry type="library" name="Maven: org.apache.commons:commons-collections4:4.4" level="project" /> <orderEntry type="library" name="Maven: org.apache.commons:commons-math3:3.6.1" level="project" /> <orderEntry type="library" name="Maven: com.zaxxer:SparseBitSet:1.2" level="project" /> <orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml-schemas:4.1.2" level="project" /> <orderEntry type="library" name="Maven: org.apache.xmlbeans:xmlbeans:3.1.0" level="project" /> <orderEntry type="library" name="Maven: org.apache.commons:commons-compress:1.19" level="project" /> <orderEntry type="library" name="Maven: com.github.virtuald:curvesapi:1.06" level="project" /> <orderEntry type="library" name="Maven: org.yaml:snakeyaml:1.28" level="project" /> <orderEntry type="library" name="Maven: io.jsonwebtoken:jjwt:0.9.1" level="project" /> <orderEntry type="library" name="Maven: javax.xml.bind:jaxb-api:2.3.1" level="project" /> <orderEntry type="library" name="Maven: javax.activation:javax.activation-api:1.2.0" level="project" /> <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-data-redis:2.5.14" level="project" /> <orderEntry type="library" name="Maven: org.springframework.data:spring-data-redis:2.5.11" level="project" /> <orderEntry type="library" name="Maven: org.springframework.data:spring-data-keyvalue:2.5.11" level="project" /> <orderEntry type="library" name="Maven: org.springframework.data:spring-data-commons:2.5.11" level="project" /> <orderEntry type="library" name="Maven: org.springframework:spring-tx:5.3.20" level="project" /> <orderEntry type="library" name="Maven: org.springframework:spring-oxm:5.3.20" level="project" /> <orderEntry type="library" name="Maven: io.lettuce:lettuce-core:6.1.8.RELEASE" level="project" /> <orderEntry type="library" name="Maven: io.netty:netty-common:4.1.77.Final" level="project" /> <orderEntry type="library" name="Maven: io.netty:netty-handler:4.1.77.Final" level="project" /> <orderEntry type="library" name="Maven: io.netty:netty-resolver:4.1.77.Final" level="project" /> <orderEntry type="library" name="Maven: io.netty:netty-transport:4.1.77.Final" level="project" /> <orderEntry type="library" name="Maven: io.projectreactor:reactor-core:3.4.18" level="project" /> <orderEntry type="library" name="Maven: org.reactivestreams:reactive-streams:1.0.3" level="project" /> <orderEntry type="library" name="Maven: org.apache.commons:commons-pool2:2.9.0" level="project" /> <orderEntry type="library" name="Maven: eu.bitwalker:UserAgentUtils:1.21" level="project" /> <orderEntry type="library" name="Maven: io.swagger:swagger-annotations:1.6.2" level="project" /> <orderEntry type="library" name="Maven: javax.servlet:javax.servlet-api:4.0.1" level="project" /> <orderEntry type="library" name="Maven: org.projectlombok:lombok:1.18.24" level="project" /> <orderEntry type="library" name="Maven: com.squareup.okhttp3:okhttp:3.14.9" level="project" /> <orderEntry type="library" name="Maven: com.squareup.okio:okio:1.17.2" level="project" /> <orderEntry type="library" name="Maven: com.aliyun:alibaba-dingtalk-service-sdk:2.0.0" level="project" /> <orderEntry type="library" name="Maven: log4j:log4j:1.2.15" level="project" /> <orderEntry type="library" name="Maven: javax.mail:mail:1.4" level="project" /> <orderEntry type="library" name="Maven: javax.activation:activation:1.1" level="project" /> <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.1.1" level="project" /> <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-websocket:2.5.14" level="project" /> <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-web:2.5.14" level="project" /> <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-json:2.5.14" level="project" /> <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.12.6" level="project" /> <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.12.6" level="project" /> <orderEntry type="library" name="Maven: com.fasterxml.jackson.module:jackson-module-parameter-names:2.12.6" level="project" /> <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-tomcat:2.5.14" level="project" /> <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-core:9.0.63" level="project" /> <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-websocket:9.0.63" level="project" /> <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:5.3.20" level="project" /> <orderEntry type="library" name="Maven: org.springframework:spring-messaging:5.3.20" level="project" /> <orderEntry type="library" name="Maven: org.springframework:spring-websocket:5.3.20" level="project" /> <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.15" level="project" /> <orderEntry type="library" name="Maven: commons-httpclient:commons-httpclient:3.1" level="project" /> <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.15" level="project" /> <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpmime:4.5.13" level="project" /> <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.13" level="project" /> <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.41" level="project" /> <orderEntry type="library" name="Maven: org.springframework:spring-test:5.3.20" level="project" /> <orderEntry type="module" module-name="smartor" /> <orderEntry type="library" name="Maven: com.aliyun:ecs20140526:3.1.12" level="project" /> <orderEntry type="library" name="Maven: com.aliyun:tea-util:0.2.16" level="project" /> <orderEntry type="library" name="Maven: com.aliyun:tea-rpc:0.1.2" level="project" /> <orderEntry type="library" name="Maven: com.aliyun:credentials-java:0.2.4" level="project" /> <orderEntry type="library" name="Maven: com.aliyun:endpoint-util:0.0.7" level="project" /> <orderEntry type="library" name="Maven: com.aliyun:tea:1.2.0" level="project" /> <orderEntry type="library" name="Maven: com.aliyun:tea-rpc-util:0.1.2" level="project" /> <orderEntry type="library" name="Maven: dom4j:dom4j:1.6.1" level="project" /> <orderEntry type="library" name="Maven: xml-apis:xml-apis:1.0.b2" level="project" /> <orderEntry type="library" name="Maven: com.sun.xml.bind:jaxb-core:2.3.0" level="project" /> <orderEntry type="library" name="Maven: com.sun.xml.bind:jaxb-impl:2.3.0" level="project" /> <orderEntry type="library" name="Maven: com.aliyun:tea-openapi:0.2.8" level="project" /> <orderEntry type="library" name="Maven: com.aliyun:alibabacloud-gateway-spi:0.0.1" level="project" /> <orderEntry type="library" name="Maven: com.aliyun:tea-xml:0.1.5" level="project" /> <orderEntry type="library" name="Maven: org.dom4j:dom4j:2.0.3" level="project" /> <orderEntry type="library" name="Maven: com.aliyun:openapiutil:0.2.1" level="project" /> <orderEntry type="library" name="Maven: org.bouncycastle:bcpkix-jdk15on:1.70" level="project" /> <orderEntry type="library" name="Maven: org.bouncycastle:bcutil-jdk15on:1.70" level="project" /> <orderEntry type="library" name="Maven: com.aliyun:dysmsapi20170525:2.0.24" level="project" /> <orderEntry type="library" name="Maven: com.aliyun:aliyun-java-sdk-core:4.6.3" level="project" /> <orderEntry type="library" name="Maven: com.google.code.gson:gson:2.8.9" level="project" /> <orderEntry type="library" name="Maven: org.glassfish.jaxb:jaxb-runtime:2.3.6" level="project" /> <orderEntry type="library" name="Maven: jakarta.xml.bind:jakarta.xml.bind-api:2.3.3" level="project" /> <orderEntry type="library" name="Maven: org.glassfish.jaxb:txw2:2.3.6" level="project" /> <orderEntry type="library" name="Maven: com.sun.istack:istack-commons-runtime:3.0.12" level="project" /> <orderEntry type="library" scope="RUNTIME" name="Maven: com.sun.activation:jakarta.activation:1.2.2" level="project" /> <orderEntry type="library" name="Maven: org.bouncycastle:bcprov-jdk15on:1.70" level="project" /> <orderEntry type="library" name="Maven: org.jacoco:org.jacoco.agent:runtime:0.8.8" level="project" /> <orderEntry type="library" name="Maven: org.ini4j:ini4j:0.5.4" level="project" /> <orderEntry type="library" name="Maven: io.opentracing:opentracing-api:0.33.0" level="project" /> <orderEntry type="library" name="Maven: io.opentracing:opentracing-util:0.33.0" level="project" /> <orderEntry type="library" name="Maven: io.opentracing:opentracing-noop:0.33.0" level="project" /> <orderEntry type="library" name="Maven: com.aliyun:aliyun-java-sdk-ecs:4.24.59" level="project" /> <orderEntry type="library" name="Maven: cn.afterturn:easypoi-spring-boot-starter:4.4.0" level="project" /> <orderEntry type="library" name="Maven: cn.afterturn:easypoi-web:4.4.0" level="project" /> <orderEntry type="library" name="Maven: cn.afterturn:easypoi-base:4.4.0" level="project" /> <orderEntry type="library" name="Maven: ognl:ognl:3.2.6" level="project" /> <orderEntry type="library" name="Maven: org.javassist:javassist:3.20.0-GA" level="project" /> <orderEntry type="library" name="Maven: javax.validation:validation-api:2.0.1.Final" level="project" /> <orderEntry type="library" name="Maven: cn.afterturn:easypoi-annotation:4.4.0" level="project" /> <orderEntry type="library" name="Maven: cn.afterturn:easypoi-wps:4.4.0" level="project" /> <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:2.5.14" level="project" /> <orderEntry type="library" name="Maven: com.sparkjava:spark-core:2.9.4" level="project" /> <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-server:9.4.46.v20220331" level="project" /> <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-http:9.4.46.v20220331" level="project" /> <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-util:9.4.46.v20220331" level="project" /> <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-io:9.4.46.v20220331" level="project" /> <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-webapp:9.4.46.v20220331" level="project" /> <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-xml:9.4.46.v20220331" level="project" /> <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-servlet:9.4.46.v20220331" level="project" /> <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-security:9.4.46.v20220331" level="project" /> <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-util-ajax:9.4.46.v20220331" level="project" /> <orderEntry type="library" name="Maven: org.eclipse.jetty.websocket:websocket-server:9.4.46.v20220331" level="project" /> <orderEntry type="library" name="Maven: org.eclipse.jetty.websocket:websocket-common:9.4.46.v20220331" level="project" /> <orderEntry type="library" name="Maven: org.eclipse.jetty.websocket:websocket-client:9.4.46.v20220331" level="project" /> <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-client:9.4.46.v20220331" level="project" /> <orderEntry type="library" name="Maven: org.eclipse.jetty.websocket:websocket-servlet:9.4.46.v20220331" level="project" /> <orderEntry type="library" name="Maven: org.eclipse.jetty.websocket:websocket-api:9.4.46.v20220331" level="project" /> <orderEntry type="library" name="Maven: com.sparkjava:spark-template-freemarker:2.7.1" level="project" /> <orderEntry type="library" name="Maven: com.google.zxing:core:3.5.1" level="project" /> <orderEntry type="library" name="Maven: com.google.zxing:javase:3.5.1" level="project" /> <orderEntry type="library" name="Maven: com.beust:jcommander:1.82" level="project" /> <orderEntry type="library" scope="RUNTIME" name="Maven: com.github.jai-imageio:jai-imageio-core:1.4.0" level="project" /> <orderEntry type="library" name="Maven: com.alibaba.nls:nls-sdk-recognizer:2.2.1" level="project" /> <orderEntry type="library" name="Maven: com.alibaba.nls:nls-sdk-common:2.2.1" level="project" /> <orderEntry type="library" name="Maven: io.netty:netty-codec-http:4.1.77.Final" level="project" /> <orderEntry type="library" name="Maven: io.netty:netty-codec:4.1.77.Final" level="project" /> <orderEntry type="library" name="Maven: io.netty:netty-buffer:4.1.77.Final" level="project" /> <orderEntry type="library" name="Maven: com.alibaba.nls:nls-sdk-tts:2.2.1" level="project" /> <orderEntry type="library" name="Maven: ca.uhn.hapi:hapi-base:2.3" level="project" /> <orderEntry type="library" name="Maven: joda-time:joda-time:2.1" level="project" /> <orderEntry type="library" name="Maven: ca.uhn.hapi:hapi-structures-v24:2.3" level="project" /> <orderEntry type="library" name="Maven: com.googlecode.json-simple:json-simple:1.1.1" level="project" /> <orderEntry type="library" name="Maven: junit:junit:4.13.2" level="project" /> <orderEntry type="library" name="Maven: org.hamcrest:hamcrest-core:2.2" level="project" /> <orderEntry type="library" name="Maven: org.hamcrest:hamcrest:2.2" level="project" /> <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-amqp:2.5.14" level="project" /> <orderEntry type="library" name="Maven: org.springframework.amqp:spring-rabbit:2.3.16" level="project" /> <orderEntry type="library" name="Maven: org.springframework.amqp:spring-amqp:2.3.16" level="project" /> <orderEntry type="library" name="Maven: org.springframework.retry:spring-retry:1.3.3" level="project" /> <orderEntry type="library" name="Maven: com.rabbitmq:amqp-client:5.12.0" level="project" /> <orderEntry type="library" name="Maven: org.apache.axis:axis:1.4" level="project" /> <orderEntry type="library" name="Maven: org.apache.axis:axis-jaxrpc:1.4" level="project" /> <orderEntry type="library" name="Maven: com.jcraft:jsch:0.1.54" level="project" /> </component> </module> ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java
@@ -493,6 +493,7 @@ serviceSubtaskMapper.updateServiceSubtask(ss); continue; } log.error("---------丽水短信发送入参address：{}, sendMagParam:{}, orgid:{}-------", address,sendMagParam,serviceSubtask.getOrgid()); String dxCode = getDXCode(address, sendMagParam.getPhone(), sendMagParam.getContent(), "", "", MsgLSEnum.getHeaderByCode(serviceSubtask.getOrgid())); log.error("---------丽水短信发送结果：{}-------", dxCode); ObjectMapper objectMapper = new ObjectMapper(); smartor/src/main/java/com/smartor/domain/ServiceOutPath.java
@@ -68,6 +68,5 @@ @ApiModelProperty(value = "进制") private String radix; }
@@ -578,5 +578,11 @@ @ApiModelProperty(value = "是否在次随访：1是 2否") private Integer isVisitAgain; /** * 患者上次随访的subId */ @ApiModelProperty(value = "患者上次随访的subId") private Integer upid; } smartor/src/main/java/com/smartor/domain/ServiceSubtaskVO.java
@@ -673,4 +673,12 @@ */ @ApiModelProperty(value = "排序：0 出院时间(正序) 1 出院时间(倒序) 2 发送时间(正序) 3 发送时间(倒序) ") private Integer sort; /** * 患者上次随访的subId */ @ApiModelProperty(value = "患者上次随访的subId") private Integer upid; } smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskAnswerServiceImpl.java
@@ -156,7 +156,7 @@ String[] split = key.split("-"); //先判断，是不是当前提交人的，不是当前提交人的，跳过 try { if (ObjectUtils.isNotEmpty(split[0]) && ObjectUtils.isNotEmpty(split[1]) && Long.valueOf(split[0]) != pid && Long.valueOf(split[1]) != tid) { if (ObjectUtils.isNotEmpty(split[0]) && ObjectUtils.isNotEmpty(split[1]) && !Long.valueOf(split[0]).equals(pid) && !Long.valueOf(split[1]).equals(tid)) { continue; } } catch (Exception e) { @@ -193,7 +193,7 @@ List<SvyTaskTemplateTargetoption> svyTaskTemplateTargetoptions = DtoConversionUtils.sourceToTarget(cacheList.get(i).getSvyLibTemplateTargetoptions(), SvyTaskTemplateTargetoption.class); svyTaskTemplateScriptVO.setSvyTaskTemplateTargetoptions(svyTaskTemplateTargetoptions); if (svyTaskTemplateScriptVO.getSort() != null && svyTaskTemplateScriptVO.getSort() == nextScriptno) { if (svyTaskTemplateScriptVO.getSort() != null && svyTaskTemplateScriptVO.getSort().equals(nextScriptno)) { log.error("svyTaskTemplateScriptVO的值为：{}", svyTaskTemplateScriptVO); Map<String, String> map = setWJInfo(svyTaskTemplateScriptVO, Long.valueOf(split[1]), Long.valueOf(split[0])); log.error("map的信息为：{}", map); @@ -235,7 +235,7 @@ List<IvrTaskTemplateTargetoption> ivrTaskTemplateTargetoptions = DtoConversionUtils.sourceToTarget(cacheList.get(i).getIvrLibaScriptTargetoptionList(), IvrTaskTemplateTargetoption.class); ivrTaskTemplateScriptVO.setIvrTaskScriptTargetoptionList(ivrTaskTemplateTargetoptions); if (ivrTaskTemplateScriptVO.getSort() != null && Long.valueOf(ivrTaskTemplateScriptVO.getSort()) == nextScriptno) { if (ivrTaskTemplateScriptVO.getSort() != null && Long.valueOf(ivrTaskTemplateScriptVO.getSort()).equals(nextScriptno)) { Map<String, String> map = setSFInfo(ivrTaskTemplateScriptVO, Long.valueOf(split[1]), Long.valueOf(split[0])); log.error("map的信息为：{}", map); nextScriptno = Long.valueOf(map.get("nextScriptNo")); smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java
@@ -347,6 +347,7 @@ //新增再次随访任务 ServiceSubtask serviceSubtask2 = DtoConversionUtils.sourceToTarget(serviceSubtask, ServiceSubtask.class); serviceSubtask2.setId(null); serviceSubtask2.setUpid(serviceSubtask1.getUpid()); serviceSubtask2.setVisitCount(serviceSubtask1.getVisitCount() + 1); serviceSubtask2.setSendstate(2L); serviceSubtask2.setCreateTime(new Date()); smartor/src/main/resources/mapper/smartor/ServiceOutPathMapper.xml
@@ -37,6 +37,8 @@ resultMap="ServiceOutPathResult"> <include refid="selectServiceOutPathVo"/> <where> del_flag=0 and orgid is null <if test="param1 != null "> and param1 = #{param1} </if> @@ -51,9 +53,6 @@ </if> <if test="createTime != null"> and create_time = #{createTime} </if> <if test="param5 != null and param5 != ''"> and param5 = #{param5} </if> <if test="radix != null and radix != ''"> and radix=#{radix} smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
@@ -78,6 +78,7 @@ <result property="patguid" column="patguid"/> <result property="visitCount" column="visit_count"/> <result property="isVisitAgain" column="is_visit_again"/> <result property="upid" column="upid"/> </resultMap> <resultMap type="com.smartor.domain.ServiceSubtaskCount" id="ServiceSubtaskResult2"> @@ -92,6 +93,7 @@ hosp_type, task_guid, patfrom, upid, inhospid, visit_count, is_visit_again, @@ -184,6 +186,7 @@ <if test="subId != null ">and id = #{subId}</if> <if test="inhospid != null ">and inhospid = #{inhospid}</if> <if test="submit != null ">and submit = #{submit}</if> <if test="upid != null ">and upid = #{upid}</if> <if test="patfrom != null ">and patfrom = #{patfrom}</if> <if test="serviceType != null ">and service_type = #{serviceType}</if> <if test="patid != null ">and patid = #{patid}</if> @@ -313,6 +316,7 @@ <if test="sendname != null ">and sendname = #{sendname}</if> <if test="sfzh != null ">and sfzh = #{sfzh}</if> <if test="patguid != null ">and patguid = #{patguid}</if> <if test="upid != null ">and upid = #{upid}</if> <if test="visitCount != null ">and visit_count = #{visitCount}</if> <if test="isVisitAgain != null ">and is_visit_again = #{isVisitAgain}</if> </where> @@ -411,6 +415,7 @@ <if test="patguid != null ">patguid,</if> <if test="visitCount != null ">visit_count,</if> <if test="isVisitAgain != null ">is_visit_again,</if> <if test="upid != null ">upid,</if> </trim> <trim prefix="values (" suffix=")" suffixOverrides=","> <if test="sendname != null">#{sendname},</if> @@ -488,6 +493,7 @@ <if test="patguid != null ">#{patguid},</if> <if test="visitCount != null ">#{visitCount},</if> <if test="isVisitAgain != null ">#{isVisitAgain},</if> <if test="upid != null ">#{upid},</if> </trim> </insert> @@ -570,6 +576,7 @@ <if test="patguid != null ">patguid=#{patguid},</if> <if test="visitCount != null ">visit_count=#{visitCount},</if> <if test="isVisitAgain != null ">is_visit_again=#{isVisitAgain},</if> <if test="upid != null ">upid=#{upid},</if> </trim> where id = #{id} </update> @@ -653,6 +660,7 @@ <if test="taskGuid != null ">taskGuid=#{taskGuid},</if> <if test="patguid != null ">patguid=#{patguid},</if> <if test="isVisitAgain != null ">is_visit_again=#{isVisitAgain},</if> <if test="upid != null ">upid=#{upid},</if> </trim> <where> <if test="patid != null ">and patid = #{patid}</if> @@ -738,6 +746,7 @@ <if test="patfrom != null ">patfrom=#{patfrom},</if> <if test="taskGuid != null ">task_guid=#{taskGuid},</if> <if test="patguid != null ">patguid=#{patguid},</if> <if test="upid != null ">upid=#{upid},</if> </trim> where patid = #{patid} and taskid = #{taskid} </update> @@ -820,6 +829,7 @@ <if test="patfrom != null ">patfrom=#{patfrom},</if> <if test="taskGuid != null ">task_guid=#{taskGuid},</if> <if test="patguid != null ">patguid=#{patguid},</if> <if test="upid != null ">upid=#{upid},</if> </trim> where task_guid = #{taskGuid} and task_name = #{taskName} </update> @@ -894,6 +904,7 @@ deptcode, labelstatus, del_flag, upid, update_by, update_time, create_by,
