From 56c5e37370471131cf778080e72d8093ba64c283 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=90=B4=E9=9C=9E?= <2521530874@qq.com>
Date: Tue, 26 Nov 2019 13:58:46 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=8B=B1=E6=96=87=E5=8C=BB?=
=?UTF-8?q?=E8=81=94=E4=BD=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
data-plat/pom.xml | 21 ++++
.../com/sict/data/DataPlatApplication.java | 2 +
.../sict/data/config/CorsFilterConfig.java | 8 +-
.../data/controller/DataPlatController.java | 19 ++-
.../com/sict/data/mapper/DataPlatMapper.java | 8 ++
.../sict/data/service/IDataPlatService.java | 7 ++
.../service/impl/DataPlatServiceImpl.java | 12 ++
data-plat/src/main/resources/application.yml | 2 +-
data-plat/src/main/resources/ehcache.xml | 13 ++
.../main/resources/mapper/DataPlatMapper.xml | 112 ++++++++++++++++++
.../maven/dataplat/dataplat/pom.properties | 2 +-
.../META-INF/maven/dataplat/dataplat/pom.xml | 21 ++++
data-plat/target/classes/application.yml | 2 +-
.../com/sict/data/DataPlatApplication.class | Bin 893 -> 973 bytes
.../sict/data/config/CorsFilterConfig.class | Bin 2541 -> 2349 bytes
.../data/controller/DataPlatController.class | Bin 5251 -> 5463 bytes
.../com/sict/data/mapper/DataPlatMapper.class | Bin 1185 -> 1226 bytes
.../sict/data/service/IDataPlatService.class | Bin 1033 -> 1070 bytes
.../service/impl/DataPlatServiceImpl.class | Bin 10193 -> 10401 bytes
data-plat/target/classes/ehcache.xml | 13 ++
.../target/classes/mapper/DataPlatMapper.xml | 112 ++++++++++++++++++
.../target/dataplat-1.0-SNAPSHOT.jar.original | Bin 0 -> 46870 bytes
.../target/maven-archiver/pom.properties | 4 +
.../compile/default-compile/createdFiles.lst | 0
.../compile/default-compile/inputFiles.lst | 22 ++++
.../default-testCompile/inputFiles.lst | 0
26 files changed, 371 insertions(+), 9 deletions(-)
create mode 100644 data-plat/target/dataplat-1.0-SNAPSHOT.jar.original
create mode 100644 data-plat/target/maven-archiver/pom.properties
create mode 100644 data-plat/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
create mode 100644 data-plat/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
create mode 100644 data-plat/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst
diff --git a/data-plat/pom.xml b/data-plat/pom.xml
index 6053605..84d2340 100644
--- a/data-plat/pom.xml
+++ b/data-plat/pom.xml
@@ -24,6 +24,12 @@
LATEST
LATEST
LATEST
+
+ UTF-8
+ 2.3.47
+ 1.8
+ 1.8
+ com.sict.data.DataPlatApplication
@@ -136,6 +142,21 @@
+
+
+ org.apache.maven.plugins
+ maven-compiler-plugin
+
+ 1.8
+ 1.8
+
+
+
+
+ org.springframework.boot
+ spring-boot-maven-plugin
+
+
\ No newline at end of file
diff --git a/data-plat/src/main/java/com/sict/data/DataPlatApplication.java b/data-plat/src/main/java/com/sict/data/DataPlatApplication.java
index e780798..b2739ea 100644
--- a/data-plat/src/main/java/com/sict/data/DataPlatApplication.java
+++ b/data-plat/src/main/java/com/sict/data/DataPlatApplication.java
@@ -4,6 +4,7 @@ import org.mybatis.spring.annotation.MapperScan;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.cache.annotation.EnableCaching;
+import org.springframework.web.bind.annotation.CrossOrigin;
/**
* @description
@@ -15,6 +16,7 @@ import org.springframework.cache.annotation.EnableCaching;
@EnableCaching
@SpringBootApplication
@MapperScan(basePackages = "com.sict.data.mapper")
+@CrossOrigin("*")
public class DataPlatApplication {
public static void main(String[] args) {
diff --git a/data-plat/src/main/java/com/sict/data/config/CorsFilterConfig.java b/data-plat/src/main/java/com/sict/data/config/CorsFilterConfig.java
index 0f4d63d..c9bd6dd 100644
--- a/data-plat/src/main/java/com/sict/data/config/CorsFilterConfig.java
+++ b/data-plat/src/main/java/com/sict/data/config/CorsFilterConfig.java
@@ -25,11 +25,9 @@ public class CorsFilterConfig {
UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource();
CorsConfiguration config = new CorsConfiguration();
config.setAllowCredentials(true);
- ArrayList objects = new ArrayList<>();
- objects.add("*");
- config.setAllowedOrigins(objects);
- config.setAllowedHeaders(objects);
- config.setAllowedMethods(objects);
+ config.addAllowedOrigin("*"); // 1允许任何域名使用
+ config.addAllowedHeader("*"); // 2允许任何头
+ config.addAllowedMethod("*"); // 3允许任何方法（po
// source.registerCorsConfiguration("/**", config);
Map corsConfigurations = new HashMap<>(1);
corsConfigurations.put("/**", config);
diff --git a/data-plat/src/main/java/com/sict/data/controller/DataPlatController.java b/data-plat/src/main/java/com/sict/data/controller/DataPlatController.java
index c24bb1c..86320bb 100644
--- a/data-plat/src/main/java/com/sict/data/controller/DataPlatController.java
+++ b/data-plat/src/main/java/com/sict/data/controller/DataPlatController.java
@@ -24,6 +24,23 @@ public class DataPlatController {
private final IDataPlatService dataPlatService;
+ /**
+ * @description 获取各医联体下筛查人数排行榜（取前30个医联体英文）
+ *
+ * @author Jxy
+ * @date 13:55 2019/10/17
+ * @return com.sict.data.dto.ScreeningDTO
+ */
+ @GetMapping("/screening/rank/en")
+ public MsgEnum getScreeningRankEn() {
+ try {
+ return ResponseUtil.success(dataPlatService.getScreeningRankEn());
+ } catch (Exception e) {
+ log.error("获取各医联体下筛查人数排行榜失败。错误信息：【{}】，错误详情：【{}】", e.toString(), e.getMessage());
+ return ResponseUtil.error(e.toString(), "获取各医联体下筛查人数排行榜失败！");
+ }
+ }
+
/**
* @description 获取各医联体下筛查人数排行榜（取前30个医联体）
*
@@ -40,7 +57,7 @@ public class DataPlatController {
return ResponseUtil.error(e.toString(), "获取各医联体下筛查人数排行榜失败！");
}
}
-
+
/**
* @description 获取血清检测人次统计结果（省份）
*
diff --git a/data-plat/src/main/java/com/sict/data/mapper/DataPlatMapper.java b/data-plat/src/main/java/com/sict/data/mapper/DataPlatMapper.java
index ee9e048..5dcb829 100644
--- a/data-plat/src/main/java/com/sict/data/mapper/DataPlatMapper.java
+++ b/data-plat/src/main/java/com/sict/data/mapper/DataPlatMapper.java
@@ -23,6 +23,14 @@ public interface DataPlatMapper extends BaseMapper {
*/
List getHospScreeningRank();
+
+ /**
+ * 获取各医联体下筛查人数排行榜（取前30个医联体english）
+ * @author Jxy
+ * @return java.util.List
+ */
+ List getHospScreeningRankEn();
+
/**
* 获取各省份血清检测人次统计结果
* @author Jxy
diff --git a/data-plat/src/main/java/com/sict/data/service/IDataPlatService.java b/data-plat/src/main/java/com/sict/data/service/IDataPlatService.java
index 6e802a3..9ec5887 100644
--- a/data-plat/src/main/java/com/sict/data/service/IDataPlatService.java
+++ b/data-plat/src/main/java/com/sict/data/service/IDataPlatService.java
@@ -21,6 +21,13 @@ public interface IDataPlatService extends IService {
*/
List getScreeningRank();
+ /**
+ * 获取各医联体下筛查人数排行榜（取前30个医联体） 接口
+ * @author Jxy
+ * @return java.util.List
+ */
+ List getScreeningRankEn();
+
/**
* 获取血清检测人次统计结果（省份） 接口
* @author Jxy
diff --git a/data-plat/src/main/java/com/sict/data/service/impl/DataPlatServiceImpl.java b/data-plat/src/main/java/com/sict/data/service/impl/DataPlatServiceImpl.java
index 590fd84..475729c 100644
--- a/data-plat/src/main/java/com/sict/data/service/impl/DataPlatServiceImpl.java
+++ b/data-plat/src/main/java/com/sict/data/service/impl/DataPlatServiceImpl.java
@@ -48,6 +48,18 @@ public class DataPlatServiceImpl extends ServiceImpl i
return dtoList.stream().limit(30).collect(Collectors.toList());
}
+
+ /**
+ * 获取各医联体下筛查人数排行榜（取前30个医联体english） 实现
+ * @author Jxy
+ */
+ @Cacheable(cacheNames = {"getScreeningRankEn"})
+ @Override
+ public List getScreeningRankEn() {
+ List dtoList = dataPlatMapper.getHospScreeningRankEn();
+ return dtoList.stream().limit(30).collect(Collectors.toList());
+ }
+
/**
* 获取血清检测人次统计结果（省份） 实现
* @author Jxy
diff --git a/data-plat/src/main/resources/application.yml b/data-plat/src/main/resources/application.yml
index 08a6bba..a0106e4 100644
--- a/data-plat/src/main/resources/application.yml
+++ b/data-plat/src/main/resources/application.yml
@@ -5,7 +5,7 @@ server:
#mysql
spring:
datasource:
- url: jdbc:mysql://gicc-db:3306/shchyy?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8
+ url: jdbc:mysql://gicc-db:3306/shchyy_dw?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8
username: chyy_demo
password: Waw8DXh3fJJ-
driver-class-name: com.mysql.cj.jdbc.Driver
diff --git a/data-plat/src/main/resources/ehcache.xml b/data-plat/src/main/resources/ehcache.xml
index 400d3f2..32155cc 100644
--- a/data-plat/src/main/resources/ehcache.xml
+++ b/data-plat/src/main/resources/ehcache.xml
@@ -18,6 +18,19 @@
timeToIdleSeconds="300"
timeToLiveSeconds="86400"
memoryStoreEvictionPolicy="LRU" />
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+