job配置服务升级提交

app/app-iot-server/src/main/java/com/yihu/iot/controller/common/BaseController.java

@@ -1,7 +1,7 @@
package com.yihu.iot.controller.common;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.yihu.ehr.util.rest.Envelop;
import com.yihu.jw.util.rest.Envelop;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;

app/app-iot-server/src/main/java/com/yihu/iot/controller/common/LoginController.java

@@ -2,7 +2,7 @@ package com.yihu.iot.controller.common;
import com.yihu.iot.model.Result;
import com.yihu.iot.service.common.LoginService;
import com.yihu.ehr.util.rest.Envelop;
import com.yihu.jw.util.rest.Envelop;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;

app/app-iot-server/src/main/java/com/yihu/iot/security/core/EhrWebAuthenticationFailureHandler.java

@@ -1,7 +1,7 @@
package com.yihu.iot.security.core;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.yihu.ehr.util.rest.Envelop;
import com.yihu.jw.util.rest.Envelop;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.MediaType;
import org.springframework.security.core.AuthenticationException;

app/app-iot-server/src/main/java/com/yihu/iot/security/core/EhrWebAuthenticationSuccessHandler.java

@@ -1,8 +1,8 @@
package com.yihu.iot.security.core;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.yihu.ehr.agModel.user.UserDetailModel;
import com.yihu.ehr.util.rest.Envelop;
import com.yihu.jw.agModel.user.UserDetailModel;
import com.yihu.jw.util.rest.Envelop;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.MediaType;
import org.springframework.security.core.Authentication;

app/app-iot-server/src/main/java/com/yihu/iot/security/core/EhrWebUserDetailsService.java

@@ -1,10 +1,10 @@
package com.yihu.iot.security.core;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.yihu.ehr.agModel.user.UserDetailModel;
import com.yihu.jw.agModel.user.UserDetailModel;
import com.yihu.iot.util.http.HttpHelper;
import com.yihu.iot.util.http.HttpResponse;
import com.yihu.ehr.util.rest.Envelop;
import com.yihu.jw.util.rest.Envelop;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.security.core.GrantedAuthority;

app/app-iot-server/src/main/java/com/yihu/iot/security/core/EhrWebUsernamePasswordAuthenticationFilter.java

@@ -1,10 +1,10 @@
package com.yihu.iot.security.core;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.yihu.ehr.agModel.user.UserDetailModel;
import com.yihu.jw.agModel.user.UserDetailModel;
import com.yihu.iot.util.http.HttpHelper;
import com.yihu.iot.util.http.HttpResponse;
import com.yihu.ehr.util.rest.Envelop;
import com.yihu.jw.util.rest.Envelop;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.security.authentication.AuthenticationServiceException;

app/app-iot-server/src/main/java/com/yihu/iot/service/common/BaseService.java

@@ -3,7 +3,7 @@ package com.yihu.iot.service.common;
import com.alibaba.fastjson.JSONObject;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.yihu.ehr.agModel.user.UserDetailModel;
import com.yihu.jw.agModel.user.UserDetailModel;
import com.yihu.iot.model.AccessToken;
import com.yihu.iot.model.ListResult;
import com.yihu.iot.model.ObjectResult;
@@ -13,7 +13,7 @@ import com.yihu.iot.util.encode.Base64;
import com.yihu.iot.util.http.HttpHelper;
import com.yihu.iot.util.http.HttpResponse;
import com.yihu.iot.util.operator.StringUtil;
import com.yihu.ehr.util.rest.Envelop;
import com.yihu.jw.util.rest.Envelop;
import org.apache.commons.lang.ArrayUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;

app/app-iot-server/src/main/java/com/yihu/iot/service/common/LoginService.java

@@ -1,21 +1,21 @@
package com.yihu.iot.service.common;
import com.yihu.ehr.agModel.user.RoleOrgModel;
import com.yihu.ehr.agModel.user.UserDetailModel;
import com.yihu.ehr.constants.ServiceApi;
import com.yihu.ehr.constants.SessionAttributeKeys;
import com.yihu.ehr.model.geography.MGeographyDict;
import com.yihu.ehr.model.org.MOrganization;
import com.yihu.ehr.model.resource.MRsRolesResource;
import com.yihu.ehr.model.user.MRoles;
import com.yihu.jw.agModel.user.RoleOrgModel;
import com.yihu.jw.agModel.user.UserDetailModel;
import com.yihu.jw.constants.ServiceApi;
import com.yihu.jw.constants.SessionAttributeKeys;
import com.yihu.jw.model.geography.MGeographyDict;
import com.yihu.jw.model.org.MOrganization;
import com.yihu.jw.model.resource.MRsRolesResource;
import com.yihu.jw.model.user.MRoles;
import com.yihu.iot.constant.AuthorityKey;
import com.yihu.iot.util.http.HttpHelper;
import com.yihu.iot.util.http.HttpResponse;
import com.yihu.iot.model.AccessToken;
import com.yihu.iot.model.ObjectResult;
import com.yihu.iot.model.Result;
import com.yihu.ehr.util.log.LogService;
import com.yihu.ehr.util.rest.Envelop;
import com.yihu.jw.util.log.LogService;
import com.yihu.jw.util.rest.Envelop;
import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
import org.springframework.security.core.Authentication;
import org.springframework.security.core.GrantedAuthority;

app/app-iot-server/src/main/java/com/yihu/iot/service/common/SystemDictService.java

@@ -1,6 +1,6 @@
package com.yihu.iot.service.common;
import com.yihu.ehr.constants.ErrorCode;
import com.yihu.jw.constants.ErrorCode;
import com.yihu.iot.constant.ServiceApi;
import com.yihu.iot.model.ObjectResult;
import com.yihu.iot.util.http.HttpHelper;

app/app-iot-server/src/main/java/com/yihu/iot/service/company/CompanyService.java

@@ -1,6 +1,6 @@
package com.yihu.iot.service.company;
import com.yihu.ehr.constants.ErrorCode;
import com.yihu.jw.constants.ErrorCode;
import com.yihu.iot.constant.ServiceApi;
import com.yihu.iot.model.ObjectResult;
import com.yihu.iot.model.Result;

app/app-iot-server/src/main/java/com/yihu/iot/service/product/ProductService.java

@@ -1,6 +1,6 @@
package com.yihu.iot.service.product;
import com.yihu.ehr.constants.ErrorCode;
import com.yihu.jw.constants.ErrorCode;
import com.yihu.iot.constant.ServiceApi;
import com.yihu.iot.model.ObjectResult;
import com.yihu.iot.model.ehr.MStdDataSet;

app/app-iot-server/src/main/java/com/yihu/iot/service/third/wlyy/MonitoringHealthService.java

@@ -3,7 +3,7 @@ package com.yihu.iot.service.third.wlyy;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.yihu.ehr.util.datetime.DateUtil;
import com.yihu.jw.util.datetime.DateUtil;
import com.yihu.iot.constant.ServiceApi;
import com.yihu.iot.service.common.BaseService;
import com.yihu.iot.util.http.HttpHelper;

app/app-iot-server/src/main/java/com/yihu/iot/util/ControllerTools.java

@@ -1,7 +1,7 @@
package com.yihu.iot.util;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.yihu.ehr.util.rest.Envelop;
import com.yihu.jw.util.rest.Envelop;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;

app/app-iot-server/src/main/java/com/yihu/iot/util/CurrentRequest.java

@@ -1,6 +1,6 @@
package com.yihu.iot.util;
import com.yihu.ehr.agModel.user.UserDetailModel;
import com.yihu.jw.agModel.user.UserDetailModel;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.core.session.SessionInformation;
import org.springframework.security.core.session.SessionRegistry;

app/public-health-server/src/main/java/com/yihu/health/controller/common/BaseController.java

@@ -1,6 +1,6 @@
package com.yihu.health.controller.common;
import com.yihu.ehr.util.rest.Envelop;
import com.yihu.jw.util.rest.Envelop;
import org.springframework.beans.factory.annotation.Value;
import java.util.List;

app/public-health-server/src/main/java/com/yihu/health/security/core/EhrWebAuthenticationFailureHandler.java

@@ -1,7 +1,7 @@
package com.yihu.health.security.core;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.yihu.ehr.util.rest.Envelop;
import com.yihu.jw.util.rest.Envelop;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.MediaType;
import org.springframework.security.core.AuthenticationException;

app/public-health-server/src/main/java/com/yihu/health/security/core/EhrWebUserDetailsService.java

@@ -1,10 +1,10 @@
package com.yihu.health.security.core;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.yihu.ehr.agModel.user.UserDetailModel;
import com.yihu.jw.agModel.user.UserDetailModel;
import com.yihu.health.util.http.HttpHelper;
import com.yihu.health.util.http.HttpResponse;
import com.yihu.ehr.util.rest.Envelop;
import com.yihu.jw.util.rest.Envelop;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.security.core.GrantedAuthority;

app/public-health-server/src/main/java/com/yihu/health/security/core/EhrWebUsernamePasswordAuthenticationFilter.java

@@ -1,10 +1,10 @@
package com.yihu.health.security.core;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.yihu.ehr.agModel.user.UserDetailModel;
import com.yihu.jw.agModel.user.UserDetailModel;
import com.yihu.health.util.http.HttpHelper;
import com.yihu.health.util.http.HttpResponse;
import com.yihu.ehr.util.rest.Envelop;
import com.yihu.jw.util.rest.Envelop;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.security.authentication.AuthenticationServiceException;

app/public-health-server/src/main/java/com/yihu/health/service/common/BaseService.java

@@ -12,7 +12,7 @@ import com.yihu.health.util.encode.Base64;
import com.yihu.health.util.http.HttpHelper;
import com.yihu.health.util.http.HttpResponse;
import com.yihu.health.util.operator.StringUtil;
import com.yihu.ehr.util.rest.Envelop;
import com.yihu.jw.util.rest.Envelop;
import org.apache.commons.lang.ArrayUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;

app/public-health-server/src/main/java/com/yihu/health/util/ControllerTools.java

@@ -1,7 +1,7 @@
package com.yihu.health.util;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.yihu.ehr.util.rest.Envelop;
import com.yihu.jw.util.rest.Envelop;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;

common/common-ehr-constants/src/main/java/com/yihu/ehr/constants/AgAdminConstants.java

@@ -1,4 +1,4 @@
package com.yihu.ehr.constants;
package com.yihu.jw.constants;
/**
 * Created by AndyCai on 2016/2/22.

common/common-ehr-constants/src/main/java/com/yihu/ehr/constants/ApiVersion.java

@@ -1,4 +1,4 @@
package com.yihu.ehr.constants;
package com.yihu.jw.constants;
/**
 * API版本前缀。用于适配Rest控制器的版本。定义好适用的版本之后，可以方便API版本编写。

common/common-ehr-constants/src/main/java/com/yihu/ehr/constants/Channel.java

@@ -1,4 +1,4 @@
package com.yihu.ehr.constants;
package com.yihu.jw.constants;
/**
 * @author Sand

common/common-ehr-constants/src/main/java/com/yihu/ehr/constants/ErrorCode.java

@@ -1,4 +1,4 @@
package com.yihu.ehr.constants;
package com.yihu.jw.constants;
/**
 *

common/common-ehr-constants/src/main/java/com/yihu/ehr/constants/HBConstants.java

@@ -1,4 +1,4 @@
package com.yihu.ehr.constants;
package com.yihu.jw.constants;
public class HBConstants {
	final static public String T_HFILES = "H_Files";

common/common-ehr-constants/src/main/java/com/yihu/ehr/constants/HttpHeader.java

@@ -1,4 +1,4 @@
package com.yihu.ehr.constants;
package com.yihu.jw.constants;
/**
 * Created by Sand Wen on 2016.2.27.

common/common-ehr-constants/src/main/java/com/yihu/ehr/constants/LisEntry.java

@@ -1,4 +1,4 @@
package com.yihu.ehr.constants;
package com.yihu.jw.constants;
/**
 * 检验名称枚举列表（用于赛诺菲接口）

common/common-ehr-constants/src/main/java/com/yihu/ehr/constants/MicroServices.java

@@ -1,4 +1,4 @@
package com.yihu.ehr.constants;
package com.yihu.jw.constants;
/**
 * 全局微服务名称枚举。用于Feign及Thrift客户端。

common/common-ehr-constants/src/main/java/com/yihu/ehr/constants/PageArg.java

@@ -1,4 +1,4 @@
package com.yihu.ehr.constants;
package com.yihu.jw.constants;
/**
 * @author Sand

common/common-ehr-constants/src/main/java/com/yihu/ehr/constants/ServiceApi.java

@@ -1,4 +1,4 @@
package com.yihu.ehr.constants;
package com.yihu.jw.constants;
/**
 * 微服务REST API. 此处定义的URL可用于服务对外提供的地址及HTTP客户端请求地址.

common/common-ehr-constants/src/main/java/com/yihu/ehr/constants/SessionAttributeKeys.java

@@ -1,4 +1,4 @@
package com.yihu.ehr.constants;
package com.yihu.jw.constants;
/**
 * Spring MVC 的Web会话常用会话属性常量。

common/common-ehr-constants/src/main/java/com/yihu/ehr/constants/SystemDictId.java

@@ -1,4 +1,4 @@
package com.yihu.ehr.constants;
package com.yihu.jw.constants;
/**
 * 通用字典ID。

common/common-ehr-constants/src/main/java/com/yihu/ehr/constants/UrlScope.java

@@ -1,4 +1,4 @@
package com.yihu.ehr.constants;
package com.yihu.jw.constants;
/**
 * @author linaz

svr/svr-basic/pom.xml

@@ -120,7 +120,7 @@
            <version>4.2.3-GA</version>
        </dependency>
    <!--    <dependency>
            <groupId>com.yihu.ehr</groupId>
            <groupId>com.yihu.jw</groupId>
            <artifactId>commons-data-query</artifactId>
            <scope>compile</scope>
        </dependency>-->
@@ -141,7 +141,7 @@
                            <addClasspath>true</addClasspath>
                            <!-- 外部依赖jar包的最终位置 -->
                            <classpathPrefix>lib/</classpathPrefix>
                            <mainClass>com.yihu.ehr.SvrEhrBasic</mainClass>
                            <mainClass>com.yihu.jw.SvrEhrBasic</mainClass>
                        </manifest>
                    </archive>
                </configuration>

svr/svr-basic/src/main/java/com.yihu.ehr/SvrEhrBasic.java

@@ -1,17 +1,15 @@
package com.yihu.ehr;
package com.yihu.jw;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.builder.SpringApplicationBuilder;
import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
import org.springframework.context.annotation.ComponentScan;
import org.springframework.data.jpa.repository.config.EnableJpaAuditing;
import org.springframework.scheduling.annotation.EnableAsync;
@SpringBootApplication
@EnableJpaAuditing
@EnableAsync
@ComponentScan(basePackages = "com")
public class SvrEhrBasic extends SpringBootServletInitializer {
	public static void main(String[] args) {

svr/svr-basic/src/main/java/com.yihu.ehr/basic/hibernate/HibenateDemo.java

@@ -1,4 +1,4 @@
package com.yihu.ehr.basic.hibernate;
package com.yihu.jw.basic.hibernate;
import com.yihu.jw.restmodel.web.Envelop;
import com.yihu.jw.restmodel.web.MixEnvelop;

svr/svr-basic/src/main/java/com.yihu.ehr/basic/hibernate/HibenateUtils.java

@@ -1,4 +1,4 @@
package com.yihu.ehr.basic.hibernate;
package com.yihu.jw.basic.hibernate;
import com.yihu.jw.entity.hospital.prescription.HlwCf01DO;
import org.hibernate.SQLQuery;

svr/svr-basic/src/main/java/com.yihu.ehr/basic/quota/controller/TjDataSaveEndPoint.java

@@ -1,7 +1,7 @@
package com.yihu.ehr.basic.quota.controller;
package com.yihu.jw.basic.quota.controller;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.yihu.ehr.basic.quota.service.TjDataSaveService;
import com.yihu.jw.basic.quota.service.TjDataSaveService;
import com.yihu.jw.entity.quota.TjDataSave;
import com.yihu.jw.restmodel.web.Envelop;
import com.yihu.jw.restmodel.web.ObjEnvelop;

svr/svr-basic/src/main/java/com.yihu.ehr/basic/quota/controller/TjDataSourceEndPoint.java

@@ -1,7 +1,7 @@
package com.yihu.ehr.basic.quota.controller;
package com.yihu.jw.basic.quota.controller;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.yihu.ehr.basic.quota.service.TjDataSourceService;
import com.yihu.jw.basic.quota.service.TjDataSourceService;
import com.yihu.jw.entity.quota.TjDataSource;
import com.yihu.jw.restmodel.web.Envelop;
import com.yihu.jw.restmodel.web.ObjEnvelop;

svr/svr-basic/src/main/java/com.yihu.ehr/basic/quota/controller/TjDimensionMainEndPoint.java

@@ -1,7 +1,7 @@
package com.yihu.ehr.basic.quota.controller;
package com.yihu.jw.basic.quota.controller;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.yihu.ehr.basic.quota.service.TjDimensionMainService;
import com.yihu.jw.basic.quota.service.TjDimensionMainService;
import com.yihu.jw.entity.quota.TjDimensionMain;
import com.yihu.jw.restmodel.web.Envelop;
import com.yihu.jw.restmodel.web.PageEnvelop;

svr/svr-basic/src/main/java/com.yihu.ehr/basic/quota/controller/TjDimensionSlaveEndPoint.java

@@ -1,7 +1,7 @@
package com.yihu.ehr.basic.quota.controller;
package com.yihu.jw.basic.quota.controller;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.yihu.ehr.basic.quota.service.TjDimensionSlaveService;
import com.yihu.jw.basic.quota.service.TjDimensionSlaveService;
import com.yihu.jw.entity.quota.TjDimensionSlave;
import com.yihu.jw.restmodel.web.Envelop;
import com.yihu.jw.restmodel.web.ObjEnvelop;

svr/svr-basic/src/main/java/com.yihu.ehr/basic/quota/controller/TjQuotaCategoryEndPoint.java

@@ -1,7 +1,7 @@
package com.yihu.ehr.basic.quota.controller;
package com.yihu.jw.basic.quota.controller;
import com.yihu.ehr.basic.quota.service.TjQuotaCategoryService;
import com.yihu.ehr.basic.quota.service.TjQuotaService;
import com.yihu.jw.basic.quota.service.TjQuotaCategoryService;
import com.yihu.jw.basic.quota.service.TjQuotaService;
import com.yihu.jw.entity.quota.TjQuotaCategory;
import com.yihu.jw.restmodel.tj.MQuotaCategory;
import com.yihu.jw.restmodel.web.Envelop;

svr/svr-basic/src/main/java/com.yihu.ehr/basic/quota/controller/TjQuotaChartEndPoint.java

@@ -1,8 +1,8 @@
package com.yihu.ehr.basic.quota.controller;
package com.yihu.jw.basic.quota.controller;
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.yihu.ehr.basic.quota.service.TjQuotaChartService;
import com.yihu.jw.basic.quota.service.TjQuotaChartService;
import com.yihu.jw.entity.quota.TjQuotaChart;
import com.yihu.jw.restmodel.web.Envelop;
import com.yihu.jw.restmodel.web.ObjEnvelop;

svr/svr-basic/src/main/java/com.yihu.ehr/basic/quota/controller/TjQuotaDataSaveEndPoint.java

@@ -1,7 +1,7 @@
package com.yihu.ehr.basic.quota.controller;
package com.yihu.jw.basic.quota.controller;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.yihu.ehr.basic.quota.service.TjQuotaDataSaveService;
import com.yihu.jw.basic.quota.service.TjQuotaDataSaveService;
import com.yihu.jw.entity.quota.TjQuotaDataSave;
import com.yihu.jw.restmodel.web.Envelop;
import com.yihu.jw.restmodel.web.ObjEnvelop;

svr/svr-basic/src/main/java/com.yihu.ehr/basic/quota/controller/TjQuotaDataSourceEndPoint.java

@@ -1,7 +1,7 @@
package com.yihu.ehr.basic.quota.controller;
package com.yihu.jw.basic.quota.controller;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.yihu.ehr.basic.quota.service.TjQuotaDataSourceService;
import com.yihu.jw.basic.quota.service.TjQuotaDataSourceService;
import com.yihu.jw.entity.quota.TjQuotaDataSource;
import com.yihu.jw.restmodel.web.Envelop;
import com.yihu.jw.restmodel.web.ObjEnvelop;

svr/svr-basic/src/main/java/com.yihu.ehr/basic/quota/controller/TjQuotaDimensionMainEndPoint.java

@@ -1,8 +1,8 @@
package com.yihu.ehr.basic.quota.controller;
package com.yihu.jw.basic.quota.controller;
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.yihu.ehr.basic.quota.service.TjQuotaDimensionMainService;
import com.yihu.jw.basic.quota.service.TjQuotaDimensionMainService;
import com.yihu.jw.entity.quota.TjQuotaDimensionMain;
import com.yihu.jw.restmodel.web.Envelop;
import com.yihu.jw.restmodel.web.ObjEnvelop;

svr/svr-basic/src/main/java/com.yihu.ehr/basic/quota/controller/TjQuotaDimensionSlaveEndPoint.java

@@ -1,8 +1,8 @@
package com.yihu.ehr.basic.quota.controller;
package com.yihu.jw.basic.quota.controller;
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.yihu.ehr.basic.quota.service.TjQuotaDimensionSlaveService;
import com.yihu.jw.basic.quota.service.TjQuotaDimensionSlaveService;
import com.yihu.jw.entity.quota.TjQuotaDimensionSlave;
import com.yihu.jw.restmodel.web.Envelop;
import com.yihu.jw.restmodel.web.ObjEnvelop;

svr/svr-basic/src/main/java/com.yihu.ehr/basic/quota/controller/TjQuotaEndPoint.java

@@ -1,8 +1,8 @@
package com.yihu.ehr.basic.quota.controller;
package com.yihu.jw.basic.quota.controller;
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.yihu.ehr.basic.quota.service.*;
import com.yihu.jw.basic.quota.service.*;
import com.yihu.jw.entity.quota.*;
import com.yihu.jw.restmodel.tj.MTjQuotaDataSaveModel;
import com.yihu.jw.restmodel.tj.MTjQuotaDataSourceModel;

svr/svr-basic/src/main/java/com.yihu.ehr/basic/quota/controller/TjQuotaLogEndPoint.java

@@ -1,7 +1,7 @@
package com.yihu.ehr.basic.quota.controller;
package com.yihu.jw.basic.quota.controller;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.yihu.ehr.basic.quota.service.TjQuotaLogService;
import com.yihu.jw.basic.quota.service.TjQuotaLogService;
import com.yihu.jw.entity.quota.TjQuotaLog;
import com.yihu.jw.restmodel.tj.MTjQuotaLog;
import com.yihu.jw.restmodel.web.endpoint.EnvelopRestEndpoint;

svr/svr-basic/src/main/java/com.yihu.ehr/basic/quota/controller/TjQuotaSynthesizeQueryEndPoint.java

@@ -1,9 +1,9 @@
package com.yihu.ehr.basic.quota.controller;
package com.yihu.jw.basic.quota.controller;
import com.yihu.ehr.basic.quota.service.TjDimensionMainService;
import com.yihu.ehr.basic.quota.service.TjDimensionSlaveService;
import com.yihu.ehr.basic.quota.service.TjQuotaDimensionMainService;
import com.yihu.ehr.basic.quota.service.TjQuotaDimensionSlaveService;
import com.yihu.jw.basic.quota.service.TjDimensionMainService;
import com.yihu.jw.basic.quota.service.TjDimensionSlaveService;
import com.yihu.jw.basic.quota.service.TjQuotaDimensionMainService;
import com.yihu.jw.basic.quota.service.TjQuotaDimensionSlaveService;
import com.yihu.jw.entity.quota.TjDimensionMain;
import com.yihu.jw.entity.quota.TjDimensionSlave;
import com.yihu.jw.entity.quota.TjQuotaDimensionMain;

svr/svr-basic/src/main/java/com.yihu.ehr/basic/quota/controller/TjQuotaWarnEndPoint.java

@@ -1,8 +1,8 @@
package com.yihu.ehr.basic.quota.controller;
package com.yihu.jw.basic.quota.controller;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.yihu.ehr.basic.quota.service.TjQuotaService;
import com.yihu.ehr.basic.quota.service.TjQuotaWarnService;
import com.yihu.jw.basic.quota.service.TjQuotaService;
import com.yihu.jw.basic.quota.service.TjQuotaWarnService;
import com.yihu.jw.entity.quota.TjQuota;
import com.yihu.jw.entity.quota.TjQuotaWarn;
import com.yihu.jw.restmodel.tj.MTjQuotaWarn;

svr/svr-basic/src/main/java/com.yihu.ehr/basic/quota/dao/XTjDataSaveRepository.java

@@ -1,4 +1,4 @@
package com.yihu.ehr.basic.quota.dao;
package com.yihu.jw.basic.quota.dao;
import com.yihu.jw.entity.quota.TjDataSave;
import org.springframework.data.jpa.repository.JpaRepository;

svr/svr-basic/src/main/java/com.yihu.ehr/basic/quota/dao/XTjDataSourceRepository.java

@@ -1,4 +1,4 @@
package com.yihu.ehr.basic.quota.dao;
package com.yihu.jw.basic.quota.dao;
import com.yihu.jw.entity.quota.TjDataSource;
import org.springframework.data.jpa.repository.JpaRepository;

svr/svr-basic/src/main/java/com.yihu.ehr/basic/quota/dao/XTjDimensionMainRepository.java

@@ -1,4 +1,4 @@
package com.yihu.ehr.basic.quota.dao;
package com.yihu.jw.basic.quota.dao;
import com.yihu.jw.entity.quota.TjDimensionMain;
import org.springframework.data.jpa.repository.JpaRepository;

svr/svr-basic/src/main/java/com.yihu.ehr/basic/quota/dao/XTjDimensionSlaveRepository.java

@@ -1,4 +1,4 @@
package com.yihu.ehr.basic.quota.dao;
package com.yihu.jw.basic.quota.dao;
import com.yihu.jw.entity.quota.TjDimensionSlave;
import org.springframework.data.jpa.repository.JpaRepository;

svr/svr-basic/src/main/java/com.yihu.ehr/basic/quota/dao/XTjQuotaCategoryRepository.java

@@ -1,4 +1,4 @@
package com.yihu.ehr.basic.quota.dao;
package com.yihu.jw.basic.quota.dao;
import com.yihu.jw.entity.quota.TjQuotaCategory;

svr/svr-basic/src/main/java/com.yihu.ehr/basic/quota/dao/XTjQuotaChartRepository.java

@@ -1,4 +1,4 @@
package com.yihu.ehr.basic.quota.dao;
package com.yihu.jw.basic.quota.dao;
import com.yihu.jw.entity.quota.TjQuotaChart;

svr/svr-basic/src/main/java/com.yihu.ehr/basic/quota/dao/XTjQuotaDataSaveRepository.java

@@ -1,4 +1,4 @@
package com.yihu.ehr.basic.quota.dao;
package com.yihu.jw.basic.quota.dao;
import com.yihu.jw.entity.quota.TjQuotaDataSave;
import org.springframework.data.jpa.repository.JpaRepository;

svr/svr-basic/src/main/java/com.yihu.ehr/basic/quota/dao/XTjQuotaDataSourceRepository.java

@@ -1,4 +1,4 @@
package com.yihu.ehr.basic.quota.dao;
package com.yihu.jw.basic.quota.dao;
import com.yihu.jw.entity.quota.TjQuotaDataSource;
import org.springframework.data.jpa.repository.JpaRepository;

svr/svr-basic/src/main/java/com.yihu.ehr/basic/quota/dao/XTjQuotaDimensionMainRepository.java

@@ -1,4 +1,4 @@
package com.yihu.ehr.basic.quota.dao;
package com.yihu.jw.basic.quota.dao;
import com.yihu.jw.entity.quota.TjQuotaDimensionMain;

svr/svr-basic/src/main/java/com.yihu.ehr/basic/quota/dao/XTjQuotaDimensionSlaveRepository.java

@@ -1,4 +1,4 @@
package com.yihu.ehr.basic.quota.dao;
package com.yihu.jw.basic.quota.dao;
import com.yihu.jw.entity.quota.TjQuotaDimensionSlave;

svr/svr-basic/src/main/java/com.yihu.ehr/basic/quota/dao/XTjQuotaLogRepository.java

@@ -1,4 +1,4 @@
package com.yihu.ehr.basic.quota.dao;
package com.yihu.jw.basic.quota.dao;
import com.yihu.jw.entity.quota.TjQuotaLog;

svr/svr-basic/src/main/java/com.yihu.ehr/basic/quota/dao/XTjQuotaRepository.java

@@ -1,4 +1,4 @@
package com.yihu.ehr.basic.quota.dao;
package com.yihu.jw.basic.quota.dao;
import com.yihu.jw.entity.quota.TjQuota;
import org.springframework.data.jpa.repository.JpaRepository;

svr/svr-basic/src/main/java/com.yihu.ehr/basic/quota/dao/XTjQuotaWarnRepository.java

@@ -1,4 +1,4 @@
package com.yihu.ehr.basic.quota.dao;
package com.yihu.jw.basic.quota.dao;
import com.yihu.jw.entity.quota.TjQuotaWarn;

svr/svr-basic/src/main/java/com.yihu.ehr/basic/quota/service/TjDataSaveService.java

@@ -1,6 +1,6 @@
package com.yihu.ehr.basic.quota.service;
package com.yihu.jw.basic.quota.service;
import com.yihu.ehr.basic.quota.dao.XTjDataSaveRepository;
import com.yihu.jw.basic.quota.dao.XTjDataSaveRepository;
import com.yihu.jw.entity.quota.TjDataSave;
import com.yihu.mysql.query.BaseJpaService;
import org.springframework.beans.factory.annotation.Autowired;

svr/svr-basic/src/main/java/com.yihu.ehr/basic/quota/service/TjDataSourceService.java

@@ -1,6 +1,6 @@
package com.yihu.ehr.basic.quota.service;
package com.yihu.jw.basic.quota.service;
import com.yihu.ehr.basic.quota.dao.XTjDataSourceRepository;
import com.yihu.jw.basic.quota.dao.XTjDataSourceRepository;
import com.yihu.jw.entity.quota.TjDataSource;
import com.yihu.mysql.query.BaseJpaService;

svr/svr-basic/src/main/java/com.yihu.ehr/basic/quota/service/TjDimensionMainService.java

@@ -1,7 +1,7 @@
package com.yihu.ehr.basic.quota.service;
package com.yihu.jw.basic.quota.service;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.yihu.ehr.basic.quota.dao.XTjDimensionMainRepository;
import com.yihu.jw.basic.quota.dao.XTjDimensionMainRepository;
import com.yihu.jw.entity.quota.TjDimensionMain;
import com.yihu.mysql.query.BaseJpaService;
import org.hibernate.SQLQuery;

svr/svr-basic/src/main/java/com.yihu.ehr/basic/quota/service/TjDimensionSlaveService.java

@@ -1,6 +1,6 @@
package com.yihu.ehr.basic.quota.service;
package com.yihu.jw.basic.quota.service;
import com.yihu.ehr.basic.quota.dao.XTjDimensionSlaveRepository;
import com.yihu.jw.basic.quota.dao.XTjDimensionSlaveRepository;
import com.yihu.jw.entity.quota.TjDimensionSlave;
import com.yihu.mysql.query.BaseJpaService;
import org.hibernate.SQLQuery;

svr/svr-basic/src/main/java/com.yihu.ehr/basic/quota/service/TjQuotaCategoryService.java

@@ -1,6 +1,6 @@
package com.yihu.ehr.basic.quota.service;
package com.yihu.jw.basic.quota.service;
import com.yihu.ehr.basic.quota.dao.XTjQuotaCategoryRepository;
import com.yihu.jw.basic.quota.dao.XTjQuotaCategoryRepository;
import com.yihu.jw.entity.quota.TjQuotaCategory;
import com.yihu.mysql.query.BaseJpaService;
import org.hibernate.SQLQuery;

svr/svr-basic/src/main/java/com.yihu.ehr/basic/quota/service/TjQuotaChartService.java

@@ -1,7 +1,7 @@
package com.yihu.ehr.basic.quota.service;
package com.yihu.jw.basic.quota.service;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.yihu.ehr.basic.quota.dao.XTjQuotaChartRepository;
import com.yihu.jw.basic.quota.dao.XTjQuotaChartRepository;
import com.yihu.jw.entity.quota.TjQuotaChart;
import com.yihu.mysql.query.BaseJpaService;
import org.springframework.beans.factory.annotation.Autowired;

svr/svr-basic/src/main/java/com.yihu.ehr/basic/quota/service/TjQuotaDataSaveService.java

@@ -1,6 +1,6 @@
package com.yihu.ehr.basic.quota.service;
package com.yihu.jw.basic.quota.service;
import com.yihu.ehr.basic.quota.dao.XTjQuotaDataSaveRepository;
import com.yihu.jw.basic.quota.dao.XTjQuotaDataSaveRepository;
import com.yihu.jw.entity.quota.TjQuotaDataSave;
import com.yihu.mysql.query.BaseJpaService;
import org.springframework.beans.factory.annotation.Autowired;

svr/svr-basic/src/main/java/com.yihu.ehr/basic/quota/service/TjQuotaDataSourceService.java

@@ -1,6 +1,6 @@
package com.yihu.ehr.basic.quota.service;
package com.yihu.jw.basic.quota.service;
import com.yihu.ehr.basic.quota.dao.XTjQuotaDataSourceRepository;
import com.yihu.jw.basic.quota.dao.XTjQuotaDataSourceRepository;
import com.yihu.jw.entity.quota.TjQuotaDataSource;
import com.yihu.mysql.query.BaseJpaService;
import org.springframework.beans.factory.annotation.Autowired;

svr/svr-basic/src/main/java/com.yihu.ehr/basic/quota/service/TjQuotaDimensionMainService.java

@@ -1,6 +1,6 @@
package com.yihu.ehr.basic.quota.service;
package com.yihu.jw.basic.quota.service;
import com.yihu.ehr.basic.quota.dao.XTjQuotaDimensionMainRepository;
import com.yihu.jw.basic.quota.dao.XTjQuotaDimensionMainRepository;
import com.yihu.jw.entity.quota.TjQuotaDimensionMain;
import com.yihu.mysql.query.BaseJpaService;
import org.springframework.beans.factory.annotation.Autowired;

svr/svr-basic/src/main/java/com.yihu.ehr/basic/quota/service/TjQuotaDimensionSlaveService.java

@@ -1,6 +1,6 @@
package com.yihu.ehr.basic.quota.service;
package com.yihu.jw.basic.quota.service;
import com.yihu.ehr.basic.quota.dao.XTjQuotaDimensionSlaveRepository;
import com.yihu.jw.basic.quota.dao.XTjQuotaDimensionSlaveRepository;
import com.yihu.jw.entity.quota.TjQuotaDimensionSlave;
import com.yihu.mysql.query.BaseJpaService;
import org.springframework.beans.factory.annotation.Autowired;

svr/svr-basic/src/main/java/com.yihu.ehr/basic/quota/service/TjQuotaLogService.java

@@ -1,7 +1,7 @@
package com.yihu.ehr.basic.quota.service;
package com.yihu.jw.basic.quota.service;
import com.yihu.ehr.basic.hibernate.HibenateUtils;
import com.yihu.ehr.basic.quota.dao.XTjQuotaLogRepository;
import com.yihu.jw.basic.hibernate.HibenateUtils;
import com.yihu.jw.basic.quota.dao.XTjQuotaLogRepository;
import com.yihu.jw.entity.quota.TjQuotaLog;
import com.yihu.mysql.query.BaseJpaService;
import com.yihu.utils.date.DateUtil;

svr/svr-basic/src/main/java/com.yihu.ehr/basic/quota/service/TjQuotaService.java

@@ -1,6 +1,6 @@
package com.yihu.ehr.basic.quota.service;
package com.yihu.jw.basic.quota.service;
import com.yihu.ehr.basic.quota.dao.XTjQuotaRepository;
import com.yihu.jw.basic.quota.dao.XTjQuotaRepository;
import com.yihu.jw.entity.quota.TjQuota;
import com.yihu.jw.entity.quota.TjQuotaDataSave;
import com.yihu.jw.entity.quota.TjQuotaDataSource;

svr/svr-basic/src/main/java/com.yihu.ehr/basic/quota/service/TjQuotaWarnService.java

@@ -1,6 +1,6 @@
package com.yihu.ehr.basic.quota.service;
package com.yihu.jw.basic.quota.service;
import com.yihu.ehr.basic.quota.dao.XTjQuotaWarnRepository;
import com.yihu.jw.basic.quota.dao.XTjQuotaWarnRepository;
import com.yihu.jw.entity.quota.TjQuotaWarn;
import com.yihu.mysql.query.BaseJpaService;
import org.springframework.beans.factory.annotation.Autowired;