job配置服务升级提交

business/base-service/src/main/java/com/yihu/jw/patient/service/BasePatientService.java

@@ -14,6 +14,7 @@ import com.yihu.jw.hospital.prescription.dao.PrescriptionDao;
import com.yihu.jw.hospital.prescription.dao.PrescriptionInfoDao;
import com.yihu.jw.hospital.prescription.dao.WlyyInspectionDao;
import com.yihu.jw.hospital.ykyy.service.YkyyService;
import com.yihu.jw.mysql.query.BaseJpaService;
import com.yihu.jw.patient.dao.BasePatientDao;
import com.yihu.jw.patient.dao.BasePatientGroupDao;
import com.yihu.jw.patient.dao.BasePatientGroupDictDao;
@@ -26,9 +27,8 @@ import com.yihu.jw.restmodel.web.PageEnvelop;
import com.yihu.jw.rm.iot.IotRequestMapping;
import com.yihu.jw.sms.dao.HospitalSysDictDao;
import com.yihu.jw.util.common.IdCardUtil;
import com.yihu.jw.utils.hibernate.HibenateUtils;
import com.yihu.jw.mysql.query.BaseJpaService;
import com.yihu.jw.util.encrypt.MD5;
import com.yihu.jw.utils.hibernate.HibenateUtils;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

business/sms-service/src/main/java/com/yihu/jw/sms/service/BaseSmsTemplateService.java

@@ -1,8 +1,8 @@
package com.yihu.jw.sms.service;
import com.yihu.jw.entity.base.sms.SmsTemplateDO;
import com.yihu.jw.sms.dao.BaseSmsTemplateDao;
import com.yihu.jw.mysql.query.BaseJpaService;
import com.yihu.jw.sms.dao.BaseSmsTemplateDao;
import org.springframework.stereotype.Service;
/**
@@ -10,6 +10,6 @@ import org.springframework.stereotype.Service;
 * Created by progr1mmer on 2018/8/23.
 */
@Service
public class BaseSmsTemplateService extends BaseJpaService<SmsTemplateDO, BaseSmsTemplateDao>{
public class BaseSmsTemplateService extends BaseJpaService<SmsTemplateDO, BaseSmsTemplateDao> {
}

common/common-entity/src/main/java/com/yihu/jw/entity/interfacemg/BaseThirdUserDO.java

@@ -12,13 +12,13 @@ import javax.persistence.Table;
@Entity
@Table(name = "base_third_user")
public class BaseThirdUserDO extends UuidIdentityEntityWithOperator {
    private String appId;
    private String appKey;
    private String url;
    private String name;
    private Integer status;
    private String appId; //appid
    private String appKey;//appkey
    private String url;//请求地址
    private String name;//第三方厂商名称
    private Integer status;//0失效1生效
    private Integer del;
    private Integer del;//0删除1正常
    public Integer getDel() {
        return del;

common/common-entity/src/main/java/com/yihu/jw/entity/interfacemg/BaseThirdUserInterfaceDO.java

@@ -13,17 +13,27 @@ import javax.persistence.Table;
@Table(name = "base_third_user_interface")
public class BaseThirdUserInterfaceDO extends UuidIdentityEntityWithOperator {
    private String userId;
    private String code;
    private String name;
    private String uri;
    private String remark;
    private Integer requestMode;
    private Integer responseType;
    private String userId; //第三方用户配置id
    private String code;//接口编码
    private String name;//接口名称
    private String uri;//接口地址
    private String remark;//备注
    private Integer requestMode;//请求方式（1、webservice，2、http）
    private Integer responseType;//请求格式（1、xml，2、json）
    private Integer status;
    private Integer status;//1生效0失效
    private Integer del;
    private Integer del;//0删除1正常
    private String adapterVersion;//适配版本
    public String getAdapterVersion() {
        return adapterVersion;
    }
    public void setAdapterVersion(String adapterVersion) {
        this.adapterVersion = adapterVersion;
    }
    public Integer getStatus() {
        return status;

common/common-entity/src/main/java/com/yihu/jw/entity/interfacemg/BaseThirdUserInterfaceLogDO.java

@@ -12,13 +12,12 @@ import javax.persistence.Table;
@Entity
@Table(name = "base_third_user_interface_log")
public class BaseThirdUserInterfaceLogDO extends UuidIdentityEntityWithOperator {
    private String userInterfaceId;
    private String appKey;
    private String url;
    private String request;
    private String response;
    private String remark;
    private Integer status;
    private String userInterfaceId;//接口id
    private String url;//请求地址
    private String request;//请求参数
    private String response;//返回参数
    private String remark; //备注
    private Integer status;//请求状态
    public String getUserInterfaceId() {
        return userInterfaceId;
@@ -28,14 +27,6 @@ public class BaseThirdUserInterfaceLogDO extends UuidIdentityEntityWithOperator
        this.userInterfaceId = userInterfaceId;
    }
    public String getAppKey() {
        return appKey;
    }
    public void setAppKey(String appKey) {
        this.appKey = appKey;
    }
    public String getUrl() {
        return url;
    }

common/common-entity/src/main/java/com/yihu/jw/entity/interfacemg/BaseThirdUserInterfaceStandardDO.java

@@ -12,16 +12,16 @@ import javax.persistence.Table;
@Entity
@Table(name = "base_third_user_interface_standard")
public class BaseThirdUserInterfaceStandardDO extends UuidIdentityEntityWithOperator {
    private String userInterfaceId;
    private String stdDatasetId;
    private String stdMetadataId;
    private String stdMetadataCode;
    private String stdMetadataName;
    private String adapterMetadataCode;
    private String adapterMetadataName;
    private Integer status;
    private Integer del;
    private String userInterfaceId;//接口id
    private String stdDatasetId;//数据集id
    private String stdMetadataId;//数据元id
    private String stdMetadataCode;//数据元编码
    private String stdMetadataName;//数据元名称
    private String adapterMetadataCode;//源数据编码
    private String adapterMetadataName;//源数据名称
    private Integer status;//0失效1生效
    private Integer del;//1正常0删除
    public Integer getDel() {
        return del;

svr/svr-base/src/main/java/com/yihu/jw/base/service/doctor/BaseDoctorService.java

@@ -39,15 +39,15 @@ import com.yihu.jw.hospital.mapping.dao.DoctorMappingDao;
import com.yihu.jw.hospital.prescription.service.entrance.EntranceService;
import com.yihu.jw.hospital.prescription.service.entrance.XzzxEntranceService;
import com.yihu.jw.hospital.prescription.service.entrance.YkyyEntranceService;
import com.yihu.jw.mysql.query.BaseJpaService;
import com.yihu.jw.org.dao.BaseOrgDao;
import com.yihu.jw.patient.service.BasePatientService;
import com.yihu.jw.restmodel.web.Envelop;
import com.yihu.jw.restmodel.web.MixEnvelop;
import com.yihu.jw.util.common.IdCardUtil;
import com.yihu.jw.util.encrypt.MD5;
import com.yihu.jw.util.http.HttpClientUtil;
import com.yihu.jw.utils.hibernate.HibenateUtils;
import com.yihu.jw.mysql.query.BaseJpaService;
import com.yihu.jw.util.encrypt.MD5;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.jdbc.core.JdbcTemplate;

svr/svr-rehabilitation/pom.xml

@@ -40,7 +40,7 @@
		</dependency>
		<dependency>
			<groupId>org.springframework.cloud</groupId>
			<artifactId>spring-cloud-starter-eureka</artifactId>
			<artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
		</dependency>
		<dependency>
			<groupId>org.springframework.cloud</groupId>