#2598 合并请求

Sapludināts
wangzhinan sapludināja 1 revīzijas no chenjiasheng/dev uz Amoy2/medicare 3 gadi atpakaļ

+ 5 - 1
svr/svr-base/src/main/java/com/yihu/jw/base/service/a3service/MedicineWarrayService.java

@ -751,7 +751,11 @@ public class MedicineWarrayService extends BaseJpaService<Mediicinewarray, Medii
            Float humidityLow = Float.parseFloat(mediicinedevice.getWaringHumidityLow());
            if (mediicinedevice.getHumiditycontrol().equalsIgnoreCase("1")){
                if (humidity!=null&&(humidity>humidityHeight||humidity<humidityLow)){
                    type += "湿度异常";
                    if (StringUtils.isEmpty(type)){
                        type += "湿度异常";
                    }else {
                        type +="/湿度异常";
                    }
                }
            }
        }

+ 48 - 0
svr/svr-base/src/main/resources/application.yml

@ -733,5 +733,53 @@ wechat:
testPattern: #文件服务器上传配置 0本地,1.I健康,2.内网调用
  sign: 0
  remote_inner_url: 172.16.100.240:10023/open/fileUpload/upload_stream
im:
  im_list_get: http://127.0.0.1:3000/
---
spring:
  profiles: jwZnygProd
  datasource:
    url: jdbc:mysql://59.61.92.90:9409/medicine?useUnicode:true&characterEncoding=utf-8&autoReconnect=true
    username: wlyy
    password: qY#j2n5O
  elasticsearch:
    cluster-name: jkzl #集群名 默认elasticsearch
    cluster-nodes: 192.168.120.103:6005 #配置es节点信息,逗号分隔,如果没有指定,则启动ClientNode
    client-transport-sniff: false
    jest:
      uris: http://192.168.120.103:6006
      connection-timeout: 60000 # Connection timeout in milliseconds.
      multi-threaded: true # Enable connection requests from multiple execution threads.
  activemq:
    broker-url: tcp://59.61.92.90:9103
    user: jkzl
    password: jkzlehr
  redis:
    host: 59.61.92.90 # Redis server host.
    port: 9054 # Redis server port.
    password: jkzlehr
fastDFS:
  fastdfs_file_url: http://172.26.0.222:8888/
demo:
  flag: true
hospital:
  url: https://wx.xmzsh.com
  mqUser: JKZL
  mqPwd: 123456
  SourceSysCode: S60
  TargetSysCode: S01
pay:
  flag: false
wlyy:
  url: http://ehr.yihu.com/wlyy/
wechat:
  id: xm_hcyy_wx
  url: https://zhyzh.gongshu.gov.cn/
  flag: false
testPattern: #文件服务器上传配置 0本地,1.I健康,2.内网调用
  sign: 1
  remote_inner_url: 172.16.100.240:10023/open/fileUpload/upload_stream
im:
  im_list_get: http://127.0.0.1:3000/

+ 8 - 0
svr/svr-base/src/main/resources/bootstrap.yml

@ -125,4 +125,12 @@ spring:
  cloud:
    config:
      uri: ${wlyy.pring.config.uri:http://192.168.250.39:1221}
      label: ${wlyy.spring.config.label:master}
---
spring:
  profiles: jwZnygProd
  cloud:
    config:
      uri: ${wlyy.spring.config.uri:http://127.0.0.1:1221}
      label: ${wlyy.spring.config.label:master}