lmstack 3 years ago
parent
commit
a5dd1695b7

+ 2 - 2
Dockerfile

@@ -1,7 +1,7 @@
 FROM ff-registry:5000/java:8-jre-alpine as didi
 
-ENV TZ="Asia/Shanghai"
+ENV TZ="Asia/Shanghai" PRO_ENV=pro
 
 ADD ./target/didi-0.0.1-SNAPSHOT.jar /home/App.jar
 
-CMD ["/bin/sh","-c","/usr/bin/java -server -jar /home/App.jar"]
+CMD ["/bin/sh","-c","/usr/bin/java -server -jar /home/App.jar --spring.profiles.active=${PRO_ENV} "]

+ 47 - 3
src/main/java/com/qx/didi/controller/ShowDataController.java

@@ -47,9 +47,9 @@ public class ShowDataController {
     @Autowired
     SohResultMapper sohResultMapper;
 
-    @ApiOperation(value = "获取数据")
-    @PostMapping("/get")
-    public ApiDTO setStatus(@RequestBody QueryParam param) {
+    @ApiOperation(value = "获取右侧数据")
+    @PostMapping("/getRight")
+    public ApiDTO getRight(@RequestBody QueryParam param) {
 
         try {
             Response response = new Response();
@@ -96,7 +96,18 @@ public class ShowDataController {
             response.setMinVolt(Collections.min(voltages));
             response.setMinVoltIndex("单体电芯" + voltages.indexOf(Collections.min(voltages)));
             response.setCellTemp(resultOriginData.getCelltemp());
+            log.info(param.getSn() + "结果返回");
+            return ApiDTO.ok(response);
+        } catch (Exception e) {
+            throw new ApiRuntimeException(500, e.toString());
+        }
+    }
+    @ApiOperation(value = "获取内短路数据")
+    @PostMapping("/getInner")
+    public ApiDTO getInner(@RequestBody QueryParam param) {
 
+        try {
+            Response response = new Response();
             // 绘图信息
             ResultInfo byId = resultInfoService.getById(1);
             // 内短路绘图数据
@@ -123,7 +134,18 @@ public class ShowDataController {
             }
             response.setInnershortTime(innerShortDate);
             response.setInnershortY(innerShortDatas);
+            log.info(param.getSn() + "结果返回");
+            return ApiDTO.ok(response);
+        } catch (Exception e) {
+            throw new ApiRuntimeException(500, e.toString());
+        }
+    }
+    @ApiOperation(value = "获取电压离群数据")
+    @PostMapping("/getVolt")
+    public ApiDTO getVolt(@RequestBody QueryParam param) {
 
+        try {
+            Response response = new Response();
             // 电压离群指数
             List<ResultVoltOutlier> resultVoltOutliers = resultVoltOutlierService.list(new QueryWrapper<ResultVoltOutlier>().eq("sn", param.getSn()));
             List<String> voltOutlierDate = new ArrayList<>();
@@ -148,7 +170,18 @@ public class ShowDataController {
             }
             response.setVoltoutlierTime(voltOutlierDate);
             response.setVoltoutlierY(voltOutlierDatas);
+            log.info(param.getSn() + "结果返回");
+            return ApiDTO.ok(response);
+        } catch (Exception e) {
+            throw new ApiRuntimeException(500, e.toString());
+        }
+    }
+    @ApiOperation(value = "获取压差离群数据")
+    @PostMapping("/getVoltdiff")
+    public ApiDTO getVoltdiff(@RequestBody QueryParam param) {
 
+        try {
+            Response response = new Response();
             // 压差离群指数
             List<ResultVoltdiffOutlier> resultVoltdiffOutliers = resultVoltdiffOutlierService.list(new QueryWrapper<ResultVoltdiffOutlier>().eq("sn", param.getSn()));
             List<String> voltdiffOutlierDate = new ArrayList<>();
@@ -173,7 +206,18 @@ public class ShowDataController {
             }
             response.setVoltdiffoutlierTime(voltdiffOutlierDate);
             response.setVoltdiffoutlierY(voltdiffOutlierDatas);
+            log.info(param.getSn() + "结果返回");
+            return ApiDTO.ok(response);
+        } catch (Exception e) {
+            throw new ApiRuntimeException(500, e.toString());
+        }
+    }
+    @ApiOperation(value = "获取soh数据")
+    @PostMapping("/getSoh")
+    public ApiDTO getSoh(@RequestBody QueryParam param) {
 
+        try {
+            Response response = new Response();
             // soh 数据
 //            List<ResultVoltdiffOutlier> resultVoltdiffOutliers = resultVoltdiffOutlierService.list(new QueryWrapper<ResultVoltdiffOutlier>().eq("sn", param.getSn()));
             List<SohResultDto> sohResults = sohResultMapper.getSohResult(param.getSn());

+ 51 - 0
src/main/resources/application-pro.yml

@@ -0,0 +1,51 @@
+server:
+  port: 9090
+  address: 0.0.0.0
+
+
+spring:
+
+  datasource:
+    url: jdbc:mysql://localhost:3306/didi?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=Asia/Shanghai
+    username: root
+    password: qx123456
+    type: com.alibaba.druid.pool.DruidDataSource
+    druid:
+      # 下面为连接池的补充设置,应用到上面所有数据源中
+      # 初始化大小,最小,最大
+      initial-size: 1
+      min-idle: 1
+      max-active: 50
+      # 配置获取连接等待超时的时间
+      max-wait: 60000
+      # 配置间隔多久才进行一次检测,检测需要关闭的空闲连接,单位是毫秒
+      time-between-eviction-runs-millis: 60000
+      # 配置一个连接在池中最小生存的时间,单位是毫秒
+      min-evictable-idle-time-millis: 300000
+      validation-query: SELECT 1 FROM DUAL
+      test-while-idle: true
+      test-on-borrow: false
+      test-on-return: false
+      # 打开PSCache,并且指定每个连接上PSCache的大小
+      pool-prepared-statements: true
+      #   配置监控统计拦截的filters,去掉后监控界面sql无法统计,'wall'用于防火墙
+      max-pool-prepared-statement-per-connection-size: 20
+      filters: stat,wall
+      use-global-data-source-stat: true
+      # 通过connectProperties属性来打开mergeSql功能;慢SQL记录
+      connect-properties: druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000
+      # 配置监控服务器
+      stat-view-servlet:
+        login-username: admin
+        login-password: 123456
+        reset-enable: false
+        url-pattern: /druid/*
+        # 添加IP白名单
+        #allow:
+        # 添加IP黑名单,当白名单和黑名单重复时,黑名单优先级更高
+        #deny:
+      web-stat-filter:
+        # 添加过滤规则
+        url-pattern: /*
+        # 忽略过滤格式
+        exclusions: "*.js,*.gif,*.jpg,*.png,*.css,*.ico,/druid/*"

+ 1 - 1
src/main/resources/application.yml

@@ -4,7 +4,7 @@ server:
 
 spring:
   profiles:
-    active: dev
+    active: ${PRO_ENV:dev}
 #  datasource:
 ##    type: com.alibaba.druid.pool.DruidDataSource
 #    driver-class-name: com.mysql.cj.jdbc.Driver