Browse Source

代码修改

LAPTOP-KB9HII50\70708 2 years ago
parent
commit
08fe75ee16
45 changed files with 56 additions and 48 deletions
  1. 5 0
      svr/svr-basic/pom.xml
  2. 2 0
      svr/svr-basic/src/main/java/jw/SvrEhrBasic.java
  3. 0 0
      svr/svr-basic/src/main/java/com/yihu/jw/basic/hibernate/HibenateDemo.java
  4. 0 0
      svr/svr-basic/src/main/java/com/yihu/jw/basic/hibernate/HibenateUtils.java
  5. 1 1
      svr/svr-basic/src/main/java/jw/basic/quota/controller/TjDataSaveEndPoint.java
  6. 1 1
      svr/svr-basic/src/main/java/jw/basic/quota/controller/TjDataSourceEndPoint.java
  7. 1 1
      svr/svr-basic/src/main/java/jw/basic/quota/controller/TjDimensionMainEndPoint.java
  8. 1 1
      svr/svr-basic/src/main/java/jw/basic/quota/controller/TjDimensionSlaveEndPoint.java
  9. 1 1
      svr/svr-basic/src/main/java/jw/basic/quota/controller/TjQuotaCategoryEndPoint.java
  10. 1 1
      svr/svr-basic/src/main/java/jw/basic/quota/controller/TjQuotaChartEndPoint.java
  11. 1 1
      svr/svr-basic/src/main/java/jw/basic/quota/controller/TjQuotaDataSaveEndPoint.java
  12. 1 1
      svr/svr-basic/src/main/java/jw/basic/quota/controller/TjQuotaDataSourceEndPoint.java
  13. 1 1
      svr/svr-basic/src/main/java/jw/basic/quota/controller/TjQuotaDimensionMainEndPoint.java
  14. 1 1
      svr/svr-basic/src/main/java/jw/basic/quota/controller/TjQuotaDimensionSlaveEndPoint.java
  15. 1 1
      svr/svr-basic/src/main/java/jw/basic/quota/controller/TjQuotaEndPoint.java
  16. 1 1
      svr/svr-basic/src/main/java/jw/basic/quota/controller/TjQuotaLogEndPoint.java
  17. 4 4
      svr/svr-basic/src/main/java/jw/basic/quota/controller/TjQuotaSynthesizeQueryEndPoint.java
  18. 2 2
      svr/svr-basic/src/main/java/jw/basic/quota/controller/TjQuotaWarnEndPoint.java
  19. 1 1
      svr/svr-basic/src/main/java/jw/basic/quota/dao/XTjDataSaveRepository.java
  20. 1 1
      svr/svr-basic/src/main/java/jw/basic/quota/dao/XTjDataSourceRepository.java
  21. 1 1
      svr/svr-basic/src/main/java/jw/basic/quota/dao/XTjDimensionMainRepository.java
  22. 1 1
      svr/svr-basic/src/main/java/jw/basic/quota/dao/XTjDimensionSlaveRepository.java
  23. 1 1
      svr/svr-basic/src/main/java/jw/basic/quota/dao/XTjQuotaCategoryRepository.java
  24. 1 1
      svr/svr-basic/src/main/java/jw/basic/quota/dao/XTjQuotaChartRepository.java
  25. 1 1
      svr/svr-basic/src/main/java/jw/basic/quota/dao/XTjQuotaDataSaveRepository.java
  26. 1 1
      svr/svr-basic/src/main/java/jw/basic/quota/dao/XTjQuotaDataSourceRepository.java
  27. 1 1
      svr/svr-basic/src/main/java/jw/basic/quota/dao/XTjQuotaDimensionMainRepository.java
  28. 1 1
      svr/svr-basic/src/main/java/jw/basic/quota/dao/XTjQuotaDimensionSlaveRepository.java
  29. 1 1
      svr/svr-basic/src/main/java/jw/basic/quota/dao/XTjQuotaLogRepository.java
  30. 1 1
      svr/svr-basic/src/main/java/jw/basic/quota/dao/XTjQuotaRepository.java
  31. 1 1
      svr/svr-basic/src/main/java/jw/basic/quota/dao/XTjQuotaWarnRepository.java
  32. 1 1
      svr/svr-basic/src/main/java/jw/basic/quota/service/TjDataSaveService.java
  33. 1 1
      svr/svr-basic/src/main/java/jw/basic/quota/service/TjDataSourceService.java
  34. 1 1
      svr/svr-basic/src/main/java/jw/basic/quota/service/TjDimensionMainService.java
  35. 1 1
      svr/svr-basic/src/main/java/jw/basic/quota/service/TjDimensionSlaveService.java
  36. 1 1
      svr/svr-basic/src/main/java/jw/basic/quota/service/TjQuotaCategoryService.java
  37. 1 1
      svr/svr-basic/src/main/java/jw/basic/quota/service/TjQuotaChartService.java
  38. 1 1
      svr/svr-basic/src/main/java/jw/basic/quota/service/TjQuotaDataSaveService.java
  39. 1 1
      svr/svr-basic/src/main/java/jw/basic/quota/service/TjQuotaDataSourceService.java
  40. 1 1
      svr/svr-basic/src/main/java/jw/basic/quota/service/TjQuotaDimensionMainService.java
  41. 1 1
      svr/svr-basic/src/main/java/jw/basic/quota/service/TjQuotaDimensionSlaveService.java
  42. 1 1
      svr/svr-basic/src/main/java/jw/basic/quota/service/TjQuotaLogService.java
  43. 3 3
      svr/svr-basic/src/main/java/jw/basic/quota/service/TjQuotaService.java
  44. 1 1
      svr/svr-basic/src/main/java/jw/basic/quota/service/TjQuotaWarnService.java
  45. 3 2
      svr/svr-basic/src/main/resources/application.yml

+ 5 - 0
svr/svr-basic/pom.xml

@ -69,6 +69,11 @@
            <groupId>com.yihu.jw</groupId>
            <artifactId>common-request-mapping</artifactId>
        </dependency>
        <dependency>
            <groupId>com.yihu</groupId>
            <artifactId>fastdfs-starter</artifactId>
            <version>${version.yihu-common}</version>
        </dependency>
        <dependency>
            <groupId>com.yihu.jw</groupId>
            <artifactId>common-util</artifactId>

+ 2 - 0
svr/svr-basic/src/main/java/jw/SvrEhrBasic.java

@ -4,12 +4,14 @@ 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("com.yihu")
public class SvrEhrBasic extends SpringBootServletInitializer {
	public static void main(String[] args) {

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


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


+ 1 - 1
svr/svr-basic/src/main/java/jw/basic/quota/controller/TjDataSaveEndPoint.java

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

+ 1 - 1
svr/svr-basic/src/main/java/jw/basic/quota/controller/TjDataSourceEndPoint.java

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

+ 1 - 1
svr/svr-basic/src/main/java/jw/basic/quota/controller/TjDimensionMainEndPoint.java

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

+ 1 - 1
svr/svr-basic/src/main/java/jw/basic/quota/controller/TjDimensionSlaveEndPoint.java

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

+ 1 - 1
svr/svr-basic/src/main/java/jw/basic/quota/controller/TjQuotaCategoryEndPoint.java

@ -2,7 +2,7 @@ package com.yihu.jw.basic.quota.controller;
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.entity.ehr.quota.TjQuotaCategory;
import com.yihu.jw.restmodel.tj.MQuotaCategory;
import com.yihu.jw.restmodel.web.Envelop;
import com.yihu.jw.restmodel.web.PageEnvelop;

+ 1 - 1
svr/svr-basic/src/main/java/jw/basic/quota/controller/TjQuotaChartEndPoint.java

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

+ 1 - 1
svr/svr-basic/src/main/java/jw/basic/quota/controller/TjQuotaDataSaveEndPoint.java

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

+ 1 - 1
svr/svr-basic/src/main/java/jw/basic/quota/controller/TjQuotaDataSourceEndPoint.java

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

+ 1 - 1
svr/svr-basic/src/main/java/jw/basic/quota/controller/TjQuotaDimensionMainEndPoint.java

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

+ 1 - 1
svr/svr-basic/src/main/java/jw/basic/quota/controller/TjQuotaDimensionSlaveEndPoint.java

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

+ 1 - 1
svr/svr-basic/src/main/java/jw/basic/quota/controller/TjQuotaEndPoint.java

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

+ 1 - 1
svr/svr-basic/src/main/java/jw/basic/quota/controller/TjQuotaLogEndPoint.java

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

+ 4 - 4
svr/svr-basic/src/main/java/jw/basic/quota/controller/TjQuotaSynthesizeQueryEndPoint.java

@ -4,10 +4,10 @@ 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;
import com.yihu.jw.entity.quota.TjQuotaDimensionSlave;
import com.yihu.jw.entity.ehr.quota.TjDimensionMain;
import com.yihu.jw.entity.ehr.quota.TjDimensionSlave;
import com.yihu.jw.entity.ehr.quota.TjQuotaDimensionMain;
import com.yihu.jw.entity.ehr.quota.TjQuotaDimensionSlave;
import com.yihu.jw.restmodel.tj.DictModel;
import com.yihu.jw.restmodel.tj.SaveModel;
import com.yihu.jw.restmodel.web.endpoint.EnvelopRestEndpoint;

+ 2 - 2
svr/svr-basic/src/main/java/jw/basic/quota/controller/TjQuotaWarnEndPoint.java

@ -3,8 +3,8 @@ package com.yihu.jw.basic.quota.controller;
import com.fasterxml.jackson.databind.ObjectMapper;
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.entity.ehr.quota.TjQuota;
import com.yihu.jw.entity.ehr.quota.TjQuotaWarn;
import com.yihu.jw.restmodel.tj.MTjQuotaWarn;
import com.yihu.jw.restmodel.web.endpoint.EnvelopRestEndpoint;
import com.yihu.jw.rm.svrBasic.ApiVersion;

+ 1 - 1
svr/svr-basic/src/main/java/jw/basic/quota/dao/XTjDataSaveRepository.java

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

+ 1 - 1
svr/svr-basic/src/main/java/jw/basic/quota/dao/XTjDataSourceRepository.java

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

+ 1 - 1
svr/svr-basic/src/main/java/jw/basic/quota/dao/XTjDimensionMainRepository.java

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

+ 1 - 1
svr/svr-basic/src/main/java/jw/basic/quota/dao/XTjDimensionSlaveRepository.java

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

+ 1 - 1
svr/svr-basic/src/main/java/jw/basic/quota/dao/XTjQuotaCategoryRepository.java

@ -1,7 +1,7 @@
package com.yihu.jw.basic.quota.dao;
import com.yihu.jw.entity.quota.TjQuotaCategory;
import com.yihu.jw.entity.ehr.quota.TjQuotaCategory;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Query;

+ 1 - 1
svr/svr-basic/src/main/java/jw/basic/quota/dao/XTjQuotaChartRepository.java

@ -1,7 +1,7 @@
package com.yihu.jw.basic.quota.dao;
import com.yihu.jw.entity.quota.TjQuotaChart;
import com.yihu.jw.entity.ehr.quota.TjQuotaChart;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.Modifying;
import org.springframework.data.jpa.repository.Query;

+ 1 - 1
svr/svr-basic/src/main/java/jw/basic/quota/dao/XTjQuotaDataSaveRepository.java

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

+ 1 - 1
svr/svr-basic/src/main/java/jw/basic/quota/dao/XTjQuotaDataSourceRepository.java

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

+ 1 - 1
svr/svr-basic/src/main/java/jw/basic/quota/dao/XTjQuotaDimensionMainRepository.java

@ -1,7 +1,7 @@
package com.yihu.jw.basic.quota.dao;
import com.yihu.jw.entity.quota.TjQuotaDimensionMain;
import com.yihu.jw.entity.ehr.quota.TjQuotaDimensionMain;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.Modifying;
import org.springframework.data.jpa.repository.Query;

+ 1 - 1
svr/svr-basic/src/main/java/jw/basic/quota/dao/XTjQuotaDimensionSlaveRepository.java

@ -1,7 +1,7 @@
package com.yihu.jw.basic.quota.dao;
import com.yihu.jw.entity.quota.TjQuotaDimensionSlave;
import com.yihu.jw.entity.ehr.quota.TjQuotaDimensionSlave;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.Modifying;
import org.springframework.data.jpa.repository.Query;

+ 1 - 1
svr/svr-basic/src/main/java/jw/basic/quota/dao/XTjQuotaLogRepository.java

@ -1,7 +1,7 @@
package com.yihu.jw.basic.quota.dao;
import com.yihu.jw.entity.quota.TjQuotaLog;
import com.yihu.jw.entity.ehr.quota.TjQuotaLog;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.query.Param;

+ 1 - 1
svr/svr-basic/src/main/java/jw/basic/quota/dao/XTjQuotaRepository.java

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

+ 1 - 1
svr/svr-basic/src/main/java/jw/basic/quota/dao/XTjQuotaWarnRepository.java

@ -1,7 +1,7 @@
package com.yihu.jw.basic.quota.dao;
import com.yihu.jw.entity.quota.TjQuotaWarn;
import com.yihu.jw.entity.ehr.quota.TjQuotaWarn;
import org.springframework.data.jpa.repository.JpaRepository;
import java.util.List;

+ 1 - 1
svr/svr-basic/src/main/java/jw/basic/quota/service/TjDataSaveService.java

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

+ 1 - 1
svr/svr-basic/src/main/java/jw/basic/quota/service/TjDataSourceService.java

@ -2,7 +2,7 @@ package com.yihu.jw.basic.quota.service;
import com.yihu.jw.basic.quota.dao.XTjDataSourceRepository;
import com.yihu.jw.entity.quota.TjDataSource;
import com.yihu.jw.entity.ehr.quota.TjDataSource;
import com.yihu.mysql.query.BaseJpaService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

+ 1 - 1
svr/svr-basic/src/main/java/jw/basic/quota/service/TjDimensionMainService.java

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

+ 1 - 1
svr/svr-basic/src/main/java/jw/basic/quota/service/TjDimensionSlaveService.java

@ -1,7 +1,7 @@
package com.yihu.jw.basic.quota.service;
import com.yihu.jw.basic.quota.dao.XTjDimensionSlaveRepository;
import com.yihu.jw.entity.quota.TjDimensionSlave;
import com.yihu.jw.entity.ehr.quota.TjDimensionSlave;
import com.yihu.mysql.query.BaseJpaService;
import org.hibernate.SQLQuery;
import org.springframework.beans.factory.annotation.Autowired;

+ 1 - 1
svr/svr-basic/src/main/java/jw/basic/quota/service/TjQuotaCategoryService.java

@ -1,7 +1,7 @@
package com.yihu.jw.basic.quota.service;
import com.yihu.jw.basic.quota.dao.XTjQuotaCategoryRepository;
import com.yihu.jw.entity.quota.TjQuotaCategory;
import com.yihu.jw.entity.ehr.quota.TjQuotaCategory;
import com.yihu.mysql.query.BaseJpaService;
import org.hibernate.SQLQuery;
import org.springframework.beans.factory.annotation.Autowired;

+ 1 - 1
svr/svr-basic/src/main/java/jw/basic/quota/service/TjQuotaChartService.java

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

+ 1 - 1
svr/svr-basic/src/main/java/jw/basic/quota/service/TjQuotaDataSaveService.java

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

+ 1 - 1
svr/svr-basic/src/main/java/jw/basic/quota/service/TjQuotaDataSourceService.java

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

+ 1 - 1
svr/svr-basic/src/main/java/jw/basic/quota/service/TjQuotaDimensionMainService.java

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

+ 1 - 1
svr/svr-basic/src/main/java/jw/basic/quota/service/TjQuotaDimensionSlaveService.java

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

+ 1 - 1
svr/svr-basic/src/main/java/jw/basic/quota/service/TjQuotaLogService.java

@ -2,7 +2,7 @@ package com.yihu.jw.basic.quota.service;
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.jw.entity.ehr.quota.TjQuotaLog;
import com.yihu.mysql.query.BaseJpaService;
import com.yihu.utils.date.DateUtil;
import org.hibernate.Query;

+ 3 - 3
svr/svr-basic/src/main/java/jw/basic/quota/service/TjQuotaService.java

@ -1,9 +1,9 @@
package com.yihu.jw.basic.quota.service;
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;
import com.yihu.jw.entity.ehr.quota.TjQuota;
import com.yihu.jw.entity.ehr.quota.TjQuotaDataSave;
import com.yihu.jw.entity.ehr.quota.TjQuotaDataSource;
import com.yihu.mysql.query.BaseJpaService;
import com.yihu.utils.date.DateUtil;
import org.hibernate.Query;

+ 1 - 1
svr/svr-basic/src/main/java/jw/basic/quota/service/TjQuotaWarnService.java

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

+ 3 - 2
svr/svr-basic/src/main/resources/application.yml

@ -143,9 +143,10 @@ spring:
  elasticsearch:
    jest:
      uris: http://172.19.103.68:9200
fastDFS:
  fastdfs_file_url: http://127.0.0.1:8888/
fast-dfs:
  tracker-server: 172.19.103.13:22122
  public-server: http://172.19.103.52:80
  tracker-server: 127.0.0.1:22122 #服务器地址
es:
  index: wlyy_quota_test
  type: wlyy_quota_test