Merge branch 'master' of http://192.168.1.220:10080/CoSharp/eip

hos-arbiter/src/main/java/com/yihu/hos/arbiter/configuration/ArbiterServerConfiguration.java

@@ -18,9 +18,16 @@ public class ArbiterServerConfiguration {
    @Value("${arbiter.tenant.name}")
    private String tenant;
    @Value("${arbiter.mycat.name}")
    private String mycatName;
    private ZbusBroker zbusBroker;
    public String getMycatName() {
        return mycatName;
    }
    public String getCentralUrl() {
        return centralUrl;

hos-arbiter/src/main/java/com/yihu/hos/arbiter/services/ProxyService.java

@@ -7,7 +7,6 @@ import com.yihu.hos.web.framework.constant.EndPointConstant;
import com.yihu.hos.web.framework.constant.MycatConstant;
import com.yihu.hos.web.framework.constant.SSHConstant;
import com.yihu.hos.web.framework.constant.ServiceFlowConstant;
import com.yihu.hos.web.framework.util.HostUtil;
import org.apache.camel.CamelContext;
import org.apache.camel.ProducerTemplate;
import org.springframework.beans.factory.annotation.Autowired;
@@ -108,8 +107,7 @@ public class ProxyService {
            }
            try {
                String ip = HostUtil.getAddress();
                consumer = new Consumer(zbusBroker, MycatConstant.ZBUS_MQ + "@" + configuration.getTenant()+ip);
                consumer = new Consumer(zbusBroker, MycatConstant.ZBUS_MQ + "@" + configuration.getMycatName());
                consumer.start(this::handle);
            } catch (IOException e) {
                e.printStackTrace();

hos-arbiter/src/main/resources/application.yml

@@ -25,7 +25,8 @@ arbiter:
    url: 172.19.103.57:9020
  tenant:
    name: jkzl
  mycat:
    name: mycat172.19.103.42
---
spring:
  profiles: test
@@ -48,6 +49,8 @@ arbiter:
    url: 172.19.103.37:9020
  tenant:
    name: jkzl
  mycat:
    name: mycat172.19.103.42
---
spring:
  profiles: prod
@@ -69,4 +72,6 @@ arbiter:
  central:
    url: 172.19.103.57:9020
  tenant:
    name: yichang
    name: yichang
  mycat:
    name: mycat172.19.103.42

hos-broker/pom.xml

@@ -107,6 +107,11 @@
            <groupId>org.apache.camel</groupId>
            <artifactId>camel-cxf</artifactId>
        </dependency>
        <dependency>
            <groupId>org.apache.cxf</groupId>
            <artifactId>cxf-rt-transports-http-jetty</artifactId>
            <version>3.1.10</version>
        </dependency>
        <dependency>
            <groupId>org.apache.camel</groupId>
            <artifactId>camel-quartz</artifactId>
@@ -132,7 +137,10 @@
            <artifactId>camel-restlet</artifactId>
        </dependency>
        <!-- camel end -->
        <dependency>
            <groupId>com.fasterxml.jackson.dataformat</groupId>
            <artifactId>jackson-dataformat-xml</artifactId>
        </dependency>
        <dependency>
            <groupId>com.yihu.hos</groupId>
            <artifactId>hos-core</artifactId>

hos-broker/src/main/java/com/yihu/hos/broker/services/camel/CamelStartBoot.java

@@ -39,24 +39,8 @@ public class CamelStartBoot {
        try {
            context.setUseMDCLogging(true);
            Tracer tracer = new Tracer();
            tracer.setTraceOutExchanges(true);
            DefaultTraceFormatter formatter = new TracerFormatter();
            formatter.setShowHeaders(true);
            formatter.setShowBody(true);
            formatter.setShowBodyType(true);
            formatter.setShowOutHeaders(true);
            formatter.setShowOutBody(true);
            formatter.setShowOutBodyType(true);
            tracer.setFormatter(formatter);
            context.addInterceptStrategy(tracer);
            context.setTracing(true);
            context.getProperties().put(Exchange.LOG_DEBUG_BODY_STREAMS, "true");
            context.start();
            List<URL> URLs = new ArrayList<>();

hos-broker/src/main/resources/application.yml

@@ -43,9 +43,9 @@ hos:
    url: http://172.19.103.57:9010/dfs/file
  arbiter:
    enable: true
    url: http://localhost:10135
    url: http://172.19.103.57:10135
  rest:
    url: http://localhost:8088
    url: http://172.19.103.57:8088
  timer:
      period: 10000
  tenant:
@@ -58,14 +58,15 @@ hos:
    port: 22
    user: root
    password: ceshi
  https:
    enable: false
---
spring:
  profiles: test
  activemq:
      broker-url: tcp://172.19.103.42:61616
      user: admin
      password: admin
    broker-url: tcp://172.19.103.42:61616
    user: admin
    password: admin
  data:
    mongodb:
      host: 172.19.103.42
@@ -98,8 +99,9 @@ hos:
    path: /usr/local/mycat/   ##mycat的安装目录
  #jcraft shell操作
  jcraft:
    host: 172.19.103.37
    host: 172.19.103.42
    port: 22
    user: root
    password: ceshi
  https:
    enable: false

hos-broker/src/main/resources/logback-spring.xml

@@ -18,9 +18,9 @@
    </appender>
    <appender name="file" class="ch.qos.logback.core.rolling.RollingFileAppender">　　　　
        <file>{LOG_HOME:-/usr/local/esb}/output.log</file>　　　　　　　　
        <file>{LOG_HOME}</file>　　　　　　　　
        <rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
            <fileNamePattern>{LOG_HOME:-/usr/local/esb}/%d{yyyy-MM-dd_HH_mm}.%i.log.zip</fileNamePattern>
            <fileNamePattern>{LOG_HOME}/%d{yyyy-MM-dd_HH_mm}.%i.log.zip</fileNamePattern>
            <minIndex>1</minIndex>
            <maxIndex>3</maxIndex>
        </rollingPolicy>

hos-camel2/pom.xml

@@ -109,6 +109,10 @@
            <groupId>org.apache.camel</groupId>
            <artifactId>camel-cxf</artifactId>
        </dependency>
        <dependency>
            <groupId>org.apache.camel</groupId>
            <artifactId>camel-http4</artifactId>
        </dependency>
        <dependency>
            <groupId>org.apache.cxf</groupId>
            <artifactId>cxf-rt-transports-http-jetty</artifactId>

hos-camel2/src/main/java/camel/central/archives/processor/ArchivesService.java

@@ -2,15 +2,13 @@ package camel.central.archives.processor;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ObjectNode;
import com.yihu.hos.core.encrypt.MD5;
import com.yihu.hos.core.log.Logger;
import com.yihu.hos.core.log.LoggerFactory;
import org.apache.camel.Exchange;
import org.apache.camel.Message;
import org.springframework.stereotype.Service;
import org.springframework.stereotype.Component;
import org.springframework.util.StringUtils;
import java.io.File;
import java.io.IOException;
/**
@@ -19,7 +17,7 @@ import java.io.IOException;
 * @vsrsion 1.0
 * Created at 2017/06/26.
 */
@Service("archivesService")
@Component
public class ArchivesService {
    private static final Logger logger = LoggerFactory.getLogger(ArchivesService.class);
    private ObjectMapper objectMapper = new ObjectMapper();
@@ -28,7 +26,7 @@ public class ArchivesService {
        Message in = exchange.getIn();
        String body = in.getBody(String.class);
        System.out.println("入库解析结果："+body);
        exchange.getOut().setBody(body);
//        exchange.getOut().setBody(body);
    }
@@ -54,9 +52,9 @@ public class ArchivesService {
    }
    public static void main(String[] args) throws Exception {
        String value= MD5.getMd5ByFile(new File("E:\\test\\可使用包\\dc3ec66729fef8f1311f247a34fa7e_4.zip"));
        System.out.println(value);
    }
//    public static void main(String[] args) throws Exception {
//        String value= MD5.getMd5ByFile(new File("E:\\test\\可使用包\\dc3ec66729fef8f1311f247a34fa7e_4.zip"));
//        System.out.println(value);
//    }
}

hos-camel2/src/main/java/camel/central/archives/route/ArchivesRouterBuilder.java

@@ -2,8 +2,6 @@ package camel.central.archives.route;
import com.yihu.hos.web.framework.constant.ArchivesConstant;
import org.apache.activemq.ActiveMQConnectionFactory;
import org.apache.camel.Exchange;
import org.apache.camel.ExchangePattern;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.jms.JmsComponent;
import org.apache.camel.model.ModelCamelContext;
@@ -31,21 +29,19 @@ public class ArchivesRouterBuilder extends RouteBuilder {
    public void configure() throws Exception {
        ModelCamelContext context = this.getContext();
        ConnectionFactory connectionFactory = new ActiveMQConnectionFactory(
                user, password, brokerURL);
                "user", "admin", "tcp://172.19.103.42:61616");
        // Note we can explicit name the component
        context.addComponent(ArchivesConstant.CAMEL_COMPONENT, JmsComponent.jmsComponentAutoAcknowledge(connectionFactory));
        // 档案上传接口代理 (兼容非病人维度上传）
        from("jetty:http://0.0.0.0:9912/api/datasetPackages?bridgeEndpoint=true&enableMultipartFilter=false").routeId("datasetUpload1")
                .removeHeaders("CamelHttp*")
                .setHeader("User-Agent", header("UserAgent"))//使用postman测试时，无法设置User-Agent，使用UserAgent来获取
//                .setHeader("User-Agent", header("UserAgent"))//使用postman测试时，无法设置User-Agent，使用UserAgent来获取
                .to("jetty:http://192.168.1.221:10140/api/v1.0/datasetPackages")//上传档案
//                .to("jetty:http://192.168.131.106:10140/api/v1.0/datasetPackages")//上传档案
                .choice()
                .when(header(Exchange.HTTP_RESPONSE_CODE).isEqualTo("200")).to(ExchangePattern.InOnly, ArchivesConstant.CAMEL_ENDPOINT)//成功：发送入库消息
                .otherwise().log("上传失败").to("stream:out")
                .endChoice();
        from("jetty:http://0.0.0.0:9999/api/datasetPackages?enableMultipartFilter=false").routeId("datasetUpload2")
//                .bean(ArchivesService.class,"bodyValue")
//                .removeHeaders("CamelHttp*")
                .to("http4://192.168.131.106:10140/api/v1.0/datasetPackages?bridgeEndpoint=true&throwExceptionOnFailure=false")//上传档案
//                .to("jetty:http://192.168.1.221:10140/api/v1.0/datasetPackages?bridgeEndpoint=true&disableStreamCache=true&throwExceptionOnFailure=false")//上传档案
//                .choice()
//                .when(header(Exchange.HTTP_RESPONSE_CODE).isEqualTo("200")).to(ExchangePattern.InOnly, ArchivesConstant.CAMEL_ENDPOINT)//成功：发送入库消息
//                .otherwise().log("上传失败").to("stream:out")
//                .endChoice()
        ;
        //入库请求（消费MQ消息，发送入库接口请求）
@@ -54,7 +50,6 @@ public class ArchivesRouterBuilder extends RouteBuilder {
                .to("restlet:http://192.168.1.221:10170/api/v1.0/datasetPackages/resolve?restletMethod=PUT")
//                .to("bean:archivesService?method=bodyValue")//返回值
        ;
        ;
    }

hos-camel2/src/main/java/camel/central/gateway/processor/GatewayProcessor.java

@@ -29,7 +29,7 @@ import java.util.stream.Stream;
public class GatewayProcessor implements Processor {
    static Map<String, AppApi> apiMap = new HashMap<>();
    static final String agUrl = "http://192.168.1.221:10000";
    static final String brokerUrl = "http://172.19.103.37:8099";
    static final String brokerUrl = "http://172.19.103.42:8099";
    @Autowired
    private DiscoveryClient discoveryClient;

hos-camel2/src/main/java/camel/central/gateway/route/GatewayRouterBuilder.java

@@ -2,15 +2,9 @@ package camel.central.gateway.route;
import camel.central.gateway.processor.ErrorHandle;
import camel.central.gateway.processor.GatewayProcessor;
import camel.central.gateway.processor.WsProcessor;
import com.yihu.hos.web.framework.constant.ArchivesConstant;
import camel.central.gateway.processor.SignProcessor;
import org.apache.camel.Exchange;
import org.apache.camel.ExchangePattern;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.jetty.JettyHttpComponent;
import org.apache.camel.util.jsse.KeyManagersParameters;
import org.apache.camel.util.jsse.KeyStoreParameters;
import org.apache.camel.util.jsse.SSLContextParameters;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Component;
@@ -33,41 +27,45 @@ public class GatewayRouterBuilder extends RouteBuilder {
    @Override
    public void configure() throws Exception {
        if (httpsEnable) {
            //全局ssl设置
            KeyStoreParameters ksparams = new KeyStoreParameters();
            ksparams.setResource("tomcat.keystore");
            ksparams.setPassword("123456");
            KeyManagersParameters kmp = new KeyManagersParameters();
            kmp.setKeyStore(ksparams);
            kmp.setKeyPassword("123456");
            SSLContextParameters scp = new SSLContextParameters();
            scp.setKeyManagers(kmp);
            JettyHttpComponent jettyComponent = getContext().getComponent("jetty", JettyHttpComponent.class);
            jettyComponent.setSslContextParameters(scp);
        }
//        if (httpsEnable) {
//            //全局ssl设置
//            KeyStoreParameters ksparams = new KeyStoreParameters();
//            ksparams.setResource("tomcat.keystore");
//            ksparams.setPassword("123456");
//
//            KeyManagersParameters kmp = new KeyManagersParameters();
//            kmp.setKeyStore(ksparams);
//            kmp.setKeyPassword("123456");
//
//            SSLContextParameters scp = new SSLContextParameters();
//            scp.setKeyManagers(kmp);
//
//            JettyHttpComponent jettyComponent = getContext().getComponent("jetty", JettyHttpComponent.class);
//            jettyComponent.setSslContextParameters(scp);
//        }
        //EHR ag-admin网关代理
        from("jetty:http://0.0.0.0:9998?matchOnUriPrefix=true").routeId("proxy")
                .to("jetty:http://192.168.1.221:10000?bridgeEndpoint=true&throwExceptionOnFailure=false");
        //EHR 公钥获取
        from("jetty:http://0.0.0.0:9999/api/v1.0/organizations/{org_code}/key").routeId("publicKey")
                .to("jetty:http://192.168.1.221:10400?bridgeEndpoint=true&throwExceptionOnFailure=false");
        // 档案上传接口代理
        from("jetty:http://0.0.0.0:9999/api/packages?bridgeEndpoint=true&enableMultipartFilter=false").routeId("proxyUploadPack")
                .removeHeaders("CamelHttp*")
                .to("jetty:http://192.168.1.221:10140/api/v1.0/packages");
        // 档案上传-非病人档案维度代理接口(锐软上传）
        from("jetty:http://0.0.0.0:9999/api/datasetPackages?bridgeEndpoint=true&enableMultipartFilter=false").routeId("datasetUpload2")
                .removeHeaders("CamelHttp*")
//                .to("jetty:http://192.168.1.221:10140/api/v1.0/dataset_package")
                .to("jetty:http://192.168.1.221:10140/api/v1.0/datasetPackages")//上传档案
                .choice()
                .when(header(Exchange.HTTP_RESPONSE_CODE).isEqualTo("200")).to(ExchangePattern.InOnly, ArchivesConstant.CAMEL_ENDPOINT)//成功：发送入库消息
                .otherwise().log("上传失败").to("stream:out")
                .endChoice();
//        // 档案上传-非病人档案维度代理接口(锐软上传）
//        from("jetty:http://0.0.0.0:9999/api/datasetPackages?bridgeEndpoint=true&enableMultipartFilter=false").routeId("datasetUpload2")
//                .removeHeaders("CamelHttp*")
////                .to("jetty:http://192.168.1.221:10140/api/v1.0/dataset_package")
//                .to("jetty:http://192.168.1.221:10140/api/v1.0/datasetPackages")//上传档案
//                .choice()
//                .when(header(Exchange.HTTP_RESPONSE_CODE).isEqualTo("200")).to(ExchangePattern.InOnly, ArchivesConstant.CAMEL_ENDPOINT)//成功：发送入库消息
//                .otherwise().log("上传失败").to("stream:out")
//                .endChoice();
        //统一网关入口（restful）
        from("jetty:http://0.0.0.0:9999/api?bridgeEndpoint=true&enableMultipartFilter=false").routeId("api")
@@ -76,15 +74,15 @@ public class GatewayRouterBuilder extends RouteBuilder {
                .process(new GatewayProcessor())
                .routingSlip(method(GatewayProcessor.class, "route"));
        //统一网关入口（web-service）
        from(SIMPLE_ENDPOINT_URI)
                .setHeader(Exchange.BEAN_MULTI_PARAMETER_ARRAY, constant(true))
                .process(new WsProcessor())
                .routingSlip(method(GatewayProcessor.class, "route"))
                .to("bean:wsProcessor?method=responseWs");
//        //统一网关入口（web-service）
//        from(SIMPLE_ENDPOINT_URI)
//                .setHeader(Exchange.BEAN_MULTI_PARAMETER_ARRAY, constant(true))
//                .process(new WsProcessor())
//                .routingSlip(method(GatewayProcessor.class, "route"))
//                .to("bean:wsProcessor?method=responseWs");
        //统一网关错误代码返回
        from("direct:errorHandle")
        from("direct:errorHandle").routeId("errorHandle")
                .choice()
                .when(header(Exchange.HTTP_URI).contains("paramError")).bean(new ErrorHandle(), "paramError")
                .when(header(Exchange.HTTP_URI).contains("outdateError")).bean(new ErrorHandle(), "outdateError")
@@ -96,6 +94,10 @@ public class GatewayRouterBuilder extends RouteBuilder {
        from("jetty:http://0.0.0.0:9999/healthy").routeId("healthy")
                .log("=========================心跳测试=====================");
        //网关辅助工具路由，用于生成签名等内容。不要要发布到生产环境中。
        from("jetty:http://0.0.0.0:9999/sign").routeId("sign")
                .process(new SignProcessor());
    }

hos-camel2/src/main/java/camel/central/gateway/route/GatewayToolBuilder.java

@@ -1,6 +1,5 @@
package camel.central.gateway.route;
import camel.central.gateway.processor.SignProcessor;
import org.apache.camel.builder.RouteBuilder;
import org.springframework.stereotype.Component;
@@ -12,7 +11,7 @@ import org.springframework.stereotype.Component;
public class GatewayToolBuilder extends RouteBuilder {
    @Override
    public void configure() throws Exception {
        from("jetty:http://0.0.0.0:9999/sign").routeId("sign")
                .process(new SignProcessor());
//        from("jetty:http://0.0.0.0:9999/sign").routeId("sign")
//                .process(new SignProcessor());
    }
}

hos-rest/src/main/resources/config/dbhelper.properties

@@ -1,7 +1,7 @@
defaultName = hos-mysql
defaultUri = jdbc:mysql://172.19.103.57:3306/esb?useUnicode=true&characterEncoding=UTF-8
defaultUri = jdbc:mysql://172.19.103.42:3306/esb?useUnicode=true&characterEncoding=UTF-8
defaultUser = esb
defaultPassword = esb
mongodbUri=mongodb://esb:esb@172.19.103.57:27017/?authSource=admin
mongodbUri=mongodb://esb:esb@172.19.103.42:27017/?authSource=admin
mongodbName=hos

hos-rest/src/main/resources/config/http.properties

@@ -1,14 +1,14 @@
httpUrl = http://192.168.1.221:10140/api/v1.0
httpCouldUrl = http://192.168.1.221:10400/api/v1.0
httpAdminUrl = http://192.168.131.134:10000/api/v1.0
httpUrl = http://172.19.103.73:10140/api/v1.0
httpCouldUrl = http://172.19.103.73:10400/api/v1.0
httpAdminUrl = http://172.19.103.73:10000/api/v1.0
#  http://172.19.103.73:1443/api/v1.0
#\uFFFD\uFFFDhttps://192.168.131.15:4432/api/v1.0
  #https://172.19.103.73:443/api/v1.0
sslKeystore = D:/tomcat.keystore
sslKeystore = /usr/local/esb/tomcat.keystore
sslPassword = 123456
clientId = zkGuSIm2Fg
clientKey = emtHdVNJbTJGZzpnUGR2VFJBWVVoc2tjaHht

pom.xml

@@ -162,7 +162,7 @@
        <dependency>
            <groupId>com.yihu.ehr</groupId>
            <artifactId>commons-admin-gateway-model</artifactId>
            <version>1.1.2</version>
            <version>1.1.0</version>
        </dependency>
        <!-- test start -->
        <dependency>
@@ -205,12 +205,6 @@
            <artifactId>ojdbc6</artifactId>
            <version>11.2.0.3.0</version>
        </dependency>
        <!-- https://mvnrepository.com/artifact/joda-time/joda-time -->
        <dependency>
            <groupId>joda-time</groupId>
            <artifactId>joda-time</artifactId>
            <version>2.9.9</version>
        </dependency>
        <dependency>
            <groupId>com.yihu.core</groupId>
            <artifactId>ehr-dbhelper</artifactId>

src/main/java/com/yihu/hos/datacollect/controller/DataCollectController.java

@@ -4,6 +4,7 @@ import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ArrayNode;
import com.yihu.hos.common.Services;
import com.yihu.hos.core.datatype.CollectionUtil;
import com.yihu.hos.core.datatype.DateUtil;
import com.yihu.hos.core.datatype.StringUtil;
import com.yihu.hos.datacollect.model.RsJobConfig;
import com.yihu.hos.datacollect.service.DatacollectManager;
@@ -15,9 +16,6 @@ import com.yihu.hos.web.framework.model.ActionResult;
import com.yihu.hos.web.framework.model.Result;
import com.yihu.hos.web.framework.util.controller.BaseController;
import org.apache.commons.beanutils.BeanUtils;
import org.joda.time.DateTime;
import org.joda.time.format.DateTimeFormat;
import org.joda.time.format.DateTimeFormatter;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
@@ -201,16 +199,22 @@ public class DataCollectController extends BaseController {
            String startTime = request.getParameter("repeatStartTime");
            String endTime = request.getParameter("repeatEndTime");
            DateTimeFormatter dateTimeFormat = DateTimeFormat.forPattern("yyyy-MM-dd HH:mm:ss");
            if (StringUtil.isBlank(endTime)) {
                endTime = DateTime.now().toString(dateTimeFormat);
            }
            DateTime beginDate = DateTime.parse(startTime, dateTimeFormat);
            DateTime endDate = DateTime.parse(endTime, dateTimeFormat);
            beginDate = beginDate.plusDays(Integer.valueOf(delayTime));//开始时间+延迟时间
            if (beginDate.isAfter(endDate)) {
                return Result.error("任务开始时间加延迟时间不能大于结束时间");
            if ("1".equals(obj.getJobType()) && !StringUtil.isBlank(startTime)) {//开时时间为空则为采集
                if (StringUtil.isBlank(endTime)) {
                    endTime = DateUtil.getCurrentString(DateUtil.DEFAULT_YMDHMSDATE_FORMAT);
                }
                Date beginDate = DateUtil.parseDate(startTime, DateUtil.DEFAULT_YMDHMSDATE_FORMAT);
                Date endDate = DateUtil.parseDate(endTime, DateUtil.DEFAULT_YMDHMSDATE_FORMAT);
                Calendar   calendar   =   new   GregorianCalendar();
                calendar.setTime(beginDate);
                calendar.add(calendar.DATE, Integer.valueOf(delayTime));//把日期往后增加一天.整数往后推,负数往前移动
                beginDate=calendar.getTime();
                if (beginDate.after(endDate)) {
                    return Result.error("任务开始时间加延迟时间不能大于结束时间");
                }
            }
            return datacollect.updateJob(obj, cron, jobDataset);
        } catch (Exception ex) {
            ex.printStackTrace();

src/main/java/com/yihu/hos/tenant/model/TenantModel.java

@@ -18,7 +18,7 @@ import java.util.Date;
public class TenantModel extends IdModel {
    private String code;
    private String name;
    private String name;//Tenant名称
    private String loginName;
    private String password;
    private String schema;
@@ -29,6 +29,7 @@ public class TenantModel extends IdModel {
    private Integer valid;
    private Long dataSourceId;
    private String cnName;//中文名称
    @Column(name="datasource_id")
    public Long getDataSourceId() {
@@ -48,6 +49,15 @@ public class TenantModel extends IdModel {
        this.code = code;
    }
    @Column(name="cn_name")
    public String getCnName() {
        return cnName;
    }
    public void setCnName(String cnName) {
        this.cnName = cnName;
    }
    @Column(name="name")
    public String getName() {
        return name;

src/main/java/com/yihu/hos/tenant/service/TenantService.java

@@ -101,7 +101,7 @@ public class TenantService {
                serrviceMycat.setTenant(MycatConstant.ZBUS_MQ+db.getHost());
                serrviceMycat.setLoginName(obj.getLoginName());
                serrviceMycat.setPassword(obj.getPassword());
                serviceMycatEventService.executeMycatConfig(serrviceMycat, MycatConstant.ZBUS_MQ + obj.getSchema() + dbInfo.getHost());
                serviceMycatEventService.executeMycatConfig(serrviceMycat, MycatConstant.ZBUS_MQ + dbInfo.getHost());
                tenantDao.saveEntity(obj);
                return Result.success("保存成功");
            }else {

src/main/webapp/WEB-INF/ehr/jsp/datacollect/editorJobJs.jsp

@@ -439,8 +439,7 @@
                repeatEndTime: $("#repeatEndTime").ligerDateEditor('getValue'),
                delayTime: $('#txtDelayTime').val(),
                jobCron:$('#txtCronExpression').val(),
                dataKey:$('#jobDatasetKeyvalue').val(),
                delayTime:$('#txtDelayTime').val()
                dataKey:$('#jobDatasetKeyvalue').val()
            };
            return model;
@@ -585,6 +584,7 @@
                }
                case 4:
                {
                    debugger
                    //任务类型不能为空
                    if(data.jobType == null)
                    {
@@ -615,12 +615,9 @@
                    //档案上传接口值校验
                    if($('input[name="jobContentType"]').ligerComboBox("getValue")==me.crawlerFlowUpload)
                    {
                        if(data.jobType == "0") {
                            if($("#repeatStartTime").ligerDateEditor("getValue")==""&&$("#repeatEndTime").ligerDateEditor("getValue")=="")
                            {
                                $.ligerDialog.error("请输采集上传时间！");
                                return false;
                            }
                        if(data.jobType == "1" && $("#repeatStartTime").ligerDateEditor("getValue")=="") {
                            $.ligerDialog.error("请输采集上传开始时间！");
                            return false;
                        }
                    }
                }

src/main/webapp/WEB-INF/ehr/jsp/tenant/editorTenant.jsp

@@ -9,7 +9,16 @@
        <div class="m-form-control ">
            <div class="l-text">
                <input type="text" class="l-text-field required" placeholder="请输入租户名称" name="name"/>
                <input type="text" class="l-text-field required" placeholder="请输入租户名称" name="cnName"/>
            </div>
        </div>
    </div>
    <div class="m-form-group">
        <label><span class="red">*&nbsp;</span>租户代码：</label>
        <div class="m-form-control ">
            <div class="l-text">
                <input type="text" class="l-text-field required" placeholder="请输入租户代码" name="name"/>
            </div>
        </div>
    </div>
@@ -34,7 +43,7 @@
    </div>
    <div class="m-form-group">
        <label><span class="red">*&nbsp;</span>数据库名：</label>
        <label><span class="red">*&nbsp;</span>分配数据库：</label>
        <div class="m-form-control">
            <div class="l-text">

src/main/webapp/WEB-INF/ehr/jsp/tenant/editorTenantJs.jsp

@@ -5,8 +5,8 @@
    /* *************************** 模块初始化 ***************************** */
    var editorParam = {
        //form
        dbListUrl:"${contextRoot}/tenant/dataBase/getDataBaseValues",
        actionUrl:"${contextRoot}/tenant/addTenant",
        dbListUrl: "${contextRoot}/tenant/dataBase/getDataBaseValues",
        actionUrl: "${contextRoot}/tenant/addTenant",
        init: function () {
            var me = this;
@@ -17,9 +17,10 @@
        },
        toDisable: function () {
            if ($("#flag").val()=='disabled') {
            if ($("#flag").val() == 'disabled') {
                $("#btnEditor").show();
                $("#btnSave").hide();
                $("input[name='cnName']").attr("disabled", "disabled");
                $("input[name='name']").attr("disabled", "disabled");
                $("input[name='loginName']").attr("disabled", "disabled");
                $("input[name='passward']").attr("disabled", "disabled");
@@ -31,40 +32,40 @@
        },
        initForm: function () {
            var me = this;
           var data;
            var data;
            var modelString = "${model.id}";
            if(modelString!=undefined && modelString!=null && modelString.length>0)
            {
            if (modelString != undefined && modelString != null && modelString.length > 0) {
                var valid = "${model.valid}";
                var dataSourceId = "${model.dataSourceId}";
                liger.get("valid").selectValue(valid);
                liger.get("dataSourceId").selectValue(dataSourceId);
                data={
                data = {
                    id: "${model.id}",
                    name: "${model.name}",
                   loginName: "${model.loginName}",
                   valid: valid,
                   password: "${model.password}",
                   schema: "${model.schema}",
                   dataSourceId: dataSourceId,
                    cnName: "${model.cnName}",
                    loginName: "${model.loginName}",
                    valid: valid,
                    password: "${model.password}",
                    schema: "${model.schema}",
                    dataSourceId: dataSourceId,
                };
                me.actionUrl = "${contextRoot}/tenant/updateTenant";
            }else{
            } else {
                liger.get("valid").selectValue("1");//默认有效
                liger.get("dataSourceId").selectValue("1");//默认有效
            }
            $("#div_info_form").ligerAutoForm({
                data:data,
                validate:{
                    name:"required",
                    loginName:"required",
                    password:"required",
                    scheme:"required",
                data: data,
                validate: {
                    name: "required",
                    loginName: "required",
                    password: "required",
                    scheme: "required",
                    valid: {
                        required:true
                        required: true
                    }
                },
@@ -74,78 +75,81 @@
            var me = this;
            $.ajax({ //ajax处理
                type: "GET",
                url : me.dbListUrl,
                dataType : "json",
                url: me.dbListUrl,
                dataType: "json",
                async: false,
                data:{"q":q},
                cache:false,
                success :function(data){
                    if(data.successFlg) {
                data: {"q": q},
                cache: false,
                success: function (data) {
                    if (data.successFlg) {
                        debugger
                        $("#dataSourceId").ligerComboBox({data : data.detailModelList,
                            cancelable:false,
                            onSuccess:function(data){
                        $("#dataSourceId").ligerComboBox({
                            data: data.detailModelList,
                            cancelable: false,
                            onSuccess: function (data) {
                                alert(1111);
                            }});
                            }
                        });
                    }
                    else{
                    else {
                        $.ligerDialog.error(data.message);
                    }
                },
                error :function(data){
                    $.ligerDialog.error("Status:"+data.status +"(" +data.statusText+")");
                error: function (data) {
                    $.ligerDialog.error("Status:" + data.status + "(" + data.statusText + ")");
                }
            });
        },
        bindEvents: function () {
            var me = this;
            $(".m-form-bottom").on("click","#btnSave",function () {
                $("#btnSave").css("pointer-events","none");
            $(".m-form-bottom").on("click", "#btnSave", function () {
                $("#btnSave").css("pointer-events", "none");
                $("#name_icon").removeClass("required");
                if($("#name_icon").val()=="") {
                if ($("#name_icon").val() == "") {
                    $("#name_icon").addClass("required");
                    if(!$("#div_info_form").ligerAutoForm("validate")){
                    if (!$("#div_info_form").ligerAutoForm("validate")) {
                        return;
                    }
                    return;
                }
                if(!$("#div_info_form").ligerAutoForm("validate")){
                if (!$("#div_info_form").ligerAutoForm("validate")) {
                    return;
                }
                var data = $("#div_info_form").ligerAutoForm("getData");
                $.ajax({ //ajax处理
                    type: "POST",
                    url : me.actionUrl,
                    dataType : "json",
                    data:data,
                    cache:false,
                    success :function(data){
                        if(data.successFlg) {
                    url: me.actionUrl,
                    dataType: "json",
                    data: data,
                    cache: false,
                    success: function (data) {
                        if (data.successFlg) {
                            parent.tenant.dialogSuccess(data.message);
                        }
                        else{
                        else {
                            $.ligerDialog.error(data.message);
                        }
                        $("#btnSave").css("pointer-events","");
                        $("#btnSave").css("pointer-events", "");
                    },
                    error :function(data){
                        $.ligerDialog.error("Status:"+data.status +"(" +data.statusText+")");
                        $("#btnSave").css("pointer-events","");
                    error: function (data) {
                        $.ligerDialog.error("Status:" + data.status + "(" + data.statusText + ")");
                        $("#btnSave").css("pointer-events", "");
                    }
                });
            });
            $(".m-form-bottom").on("click","#btnEditor",function () {
                        $("#btnEditor").hide();
                        $("#btnSave").show();
                        $("input[name='name']").removeAttr("disabled");
                        $("input[name='loginName']").removeAttr("disabled");
                        $("input[name='password']").removeAttr("disabled");
                        $("input[name='schema']").removeAttr("disabled");
                        $("input[name='valid']").removeAttr("disabled");
                        $("input[name='datasourceId']").removeAttr("disabled");
                        $("#flag").val("");
            $(".m-form-bottom").on("click", "#btnEditor", function () {
                $("#btnEditor").hide();
                $("#btnSave").show();
                $("input[name='name']").removeAttr("disabled");
                $("input[name='cnName']").removeAttr("disabled");
                $("input[name='loginName']").removeAttr("disabled");
                $("input[name='password']").removeAttr("disabled");
                $("input[name='schema']").removeAttr("disabled");
                $("input[name='valid']").removeAttr("disabled");
                $("input[name='datasourceId']").removeAttr("disabled");
                $("#flag").val("");
            });
            $(".m-form-bottom").on("click","#btnCancel",function () {
            $(".m-form-bottom").on("click", "#btnCancel", function () {
                parent.tenant.dialog.close();
            });
@@ -153,16 +157,17 @@
//                var q = $(this).val();
//               me.selectDBs(q);
//            });
            $("#valid").ligerComboBox({data : [{"value":"有效","code":"1"},{"value":"无效","code":"0"}],
                cancelable:false,
                onSuccess:function(data){
                }});
            $("#valid").ligerComboBox({
                data: [{"value": "有效", "code": "1"}, {"value": "无效", "code": "0"}],
                cancelable: false,
                onSuccess: function (data) {
                }
            });
        }
    };
    $(function () {
        editorParam.init();