From 61131ab20eeee340298735be64fc4343e233be65 Mon Sep 17 00:00:00 2001 From: xiaowuler Date: Mon, 23 May 2022 09:16:31 +0800 Subject: [PATCH] modify some codes --- .../backend/controller/TestController.java | 35 +++++++++++++++++++ .../backend/model/dto/DepartResult.java | 23 ++++++++++++ .../backend/model/dto/TestResult.java | 15 ++++++++ .../service/QualityCompareService.java | 2 +- .../src/main/resources/application.yml | 22 ++++++------ 04.系统编码/Backend/部署.md | 2 +- .../Frontend/src/components/RamanLidar.vue | 19 ++++++---- .../Frontend/src/model/constant.ts | 4 +-- .../Frontend/src/model/heat-map-drawer.ts | 23 +++++++++--- 04.系统编码/Frontend/src/uilts/Config.ts | 8 ++--- 10 files changed, 123 insertions(+), 30 deletions(-) create mode 100644 04.系统编码/Backend/src/main/java/com/userinformation/backend/controller/TestController.java create mode 100644 04.系统编码/Backend/src/main/java/com/userinformation/backend/model/dto/DepartResult.java create mode 100644 04.系统编码/Backend/src/main/java/com/userinformation/backend/model/dto/TestResult.java diff --git a/04.系统编码/Backend/src/main/java/com/userinformation/backend/controller/TestController.java b/04.系统编码/Backend/src/main/java/com/userinformation/backend/controller/TestController.java new file mode 100644 index 0000000..e61e038 --- /dev/null +++ b/04.系统编码/Backend/src/main/java/com/userinformation/backend/controller/TestController.java @@ -0,0 +1,35 @@ +package com.userinformation.backend.controller; + +import com.fasterxml.jackson.core.type.TypeReference; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.userinformation.backend.model.dto.DepartResult; +import com.userinformation.backend.model.dto.TestResult; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.io.File; +import java.io.IOException; +import java.util.List; + +/** + * @author: xiaowuler + * @createTime: 2022-05-17 17:00 + * @describe: 测试控制层 + */ +@RestController +@RequestMapping("test") +public class TestController { + + private ObjectMapper objectMapper = new ObjectMapper(); + + @RequestMapping("test") + public Object test() throws IOException { + TestResult> testResult = objectMapper.readValue(new File("C:\\Users\\xiaowuler\\Desktop\\data.txt"), new TypeReference>>() { + }); + + while (testResult.getData().size() < 1000000){ + testResult.getData().addAll(testResult.getData()); + } + return testResult; + } +} diff --git a/04.系统编码/Backend/src/main/java/com/userinformation/backend/model/dto/DepartResult.java b/04.系统编码/Backend/src/main/java/com/userinformation/backend/model/dto/DepartResult.java new file mode 100644 index 0000000..73378a3 --- /dev/null +++ b/04.系统编码/Backend/src/main/java/com/userinformation/backend/model/dto/DepartResult.java @@ -0,0 +1,23 @@ +package com.userinformation.backend.model.dto; + +import lombok.Data; + +/** + * @author: xiaowuler + * @createTime: 2022-05-17 17:08 + * @describe: 是 + */ +@Data +public class DepartResult { + private String id; + private String gslx; + private String name; + private String title; + private String bjid; + private String type; + private String open; + private String iconSkin; + private String para; + private String nocheck; + private String pid; +} diff --git a/04.系统编码/Backend/src/main/java/com/userinformation/backend/model/dto/TestResult.java b/04.系统编码/Backend/src/main/java/com/userinformation/backend/model/dto/TestResult.java new file mode 100644 index 0000000..573df7d --- /dev/null +++ b/04.系统编码/Backend/src/main/java/com/userinformation/backend/model/dto/TestResult.java @@ -0,0 +1,15 @@ +package com.userinformation.backend.model.dto; + +import lombok.Data; + +/** + * @author: xiaowuler + * @createTime: 2022-05-17 17:07 + * @describe: 测试 结果 + */ +@Data +public class TestResult { + private String msg; + private int code; + private T data; +} diff --git a/04.系统编码/Backend/src/main/java/com/userinformation/backend/service/QualityCompareService.java b/04.系统编码/Backend/src/main/java/com/userinformation/backend/service/QualityCompareService.java index 152384e..cd88e79 100644 --- a/04.系统编码/Backend/src/main/java/com/userinformation/backend/service/QualityCompareService.java +++ b/04.系统编码/Backend/src/main/java/com/userinformation/backend/service/QualityCompareService.java @@ -124,7 +124,7 @@ public class QualityCompareService { switch (locate){ case "pk": return "CloudOutPut2_PUKOU/R1W4201224002"; - case "liuhe": + case "lh": return "CloudOutPut1_LIUHE/R1W4201224001"; case "jn": return "CloudOutPut_JIANGNING/R1W4210113003"; diff --git a/04.系统编码/Backend/src/main/resources/application.yml b/04.系统编码/Backend/src/main/resources/application.yml index e5ce902..f3213b7 100644 --- a/04.系统编码/Backend/src/main/resources/application.yml +++ b/04.系统编码/Backend/src/main/resources/application.yml @@ -6,12 +6,12 @@ spring: date-format: yyyy-MM-dd HH:mm:ss time-zone: GMT+8 datasource: - url: jdbc:mysql://112.124.40.88:33306/user_information?useUnicode=true&characteEncoding=utf-8 - username: root - password: 3cqscbr@only1 -# url: jdbc:mysql://10.124.102.10:3306/user_information?useUnicode=true&characteEncoding=utf-8 +# url: jdbc:mysql://112.124.40.88:33306/user_information?useUnicode=true&characteEncoding=utf-8 # username: root -# password: Njsqxj_sthj@2021 +# password: 3cqscbr@only1 + url: jdbc:mysql://10.124.102.10:3306/user_information?useUnicode=true&characteEncoding=utf-8 + username: root + password: Njsqxj_sthj@2021 # url: jdbc:mysql://192.168.6.6:3306/njsthj?useUnicode=true&characteEncoding=utf-8 # username: njsthj # password: Njsqxj_sthj@2021 @@ -20,11 +20,11 @@ custom: image: url: ${custom.parent-url}:${server.port}/product gifPath: ${custom.image.path}/gif - path: D:/Deployments/LamanRadar/product - parent-url: http://localhost - quality-path: E:/Memorandum/VPN配置/南京/多曼雷达项目/AllData -# path: /home/project/NJEnvironmentPlatform/html/product -# parent-url: http://10.124.102.10 -# quality-path: /share/win +# path: D:/Deployments/LamanRadar/product +# parent-url: http://localhost +# quality-path: E:/Memorandum/VPN配置/南京/多曼雷达项目/AllData + path: /home/project/NJEnvironmentPlatform/html/product + parent-url: http://10.124.102.10 + quality-path: /share/win # path: /home/develop/product # parent-url: http://rdp.nagr.com.cn diff --git a/04.系统编码/Backend/部署.md b/04.系统编码/Backend/部署.md index c08b5bd..3aaee1e 100644 --- a/04.系统编码/Backend/部署.md +++ b/04.系统编码/Backend/部署.md @@ -1,7 +1,7 @@ 部署 ``` -nohup /usr/local/java/jdk-15/bin/java -jar UserInformation-0.0.1-SNAPSHOT.jar & +nohup /usr/local/java/jdk-15/bin/java -jar UserInformation-0.0.1-SNAPSHOT.jar > log.txt 2>&1 & ``` ``` nohup /home/develop/jdk-15/bin/java -jar UserInformation-0.0.1-SNAPSHOT.jar & diff --git a/04.系统编码/Frontend/src/components/RamanLidar.vue b/04.系统编码/Frontend/src/components/RamanLidar.vue index 8f4799d..7463d44 100644 --- a/04.系统编码/Frontend/src/components/RamanLidar.vue +++ b/04.系统编码/Frontend/src/components/RamanLidar.vue @@ -33,8 +33,8 @@ 江宁 - 六合 + 六合 浦口 @@ -433,8 +433,9 @@ export default { const LidarRatioInit = () => { creates.LidarRatio = new HighChartCreate('LidarRatio'); creates.LidarRatio.setChart(false,'line', 1000); - creates.LidarRatio.setSpecialXAxis('sr', 120, 0, 20); - creates.LidarRatio.setSpecialYAxis('高度(m)'); + creates.LidarRatio.setSpecialXAxis('激光雷达比(单位立体角)', 120, 0, 20); + // creates.LidarRatio.setSpecialYAxis('高度(m)'); + creates.LidarRatio.setYAxis('高度(m)', 3000, 0); creates.LidarRatio.setLegend(); creates.LidarRatio.setTooltip('高度: {point.y}'); creates.LidarRatio.setSeries('激光雷达比', 0, null, null, '#3636FF') @@ -787,7 +788,7 @@ export default { } let matrix = converCloudRecognition(801, result, 'backscatter'); - creates.backscatterDrawer = new HeatMapDrawer(1200, 650, matrix, "backscatter_chart",'/km/sr'); + creates.backscatterDrawer = new HeatMapDrawer(1200, 650, matrix, "backscatter_chart",'km/sr'); creates.backscatterDrawer.setAxis(new CoordinateScale(options.timeArray), new CoordinateScale([0, 2000, 4000, 6000, 8000, 10000, 12000], true, true)); creates.backscatterDrawer.setColorChart(prepareBackscatterColors()); creates.backscatterDrawer.draw(); @@ -841,6 +842,7 @@ export default { const drawLidarRatioCharts = (result: CustomeArray) => { if (result.length <= 0) return; const data = LidarRatioPrepareChartData(result); + console.log(data); creates.LidarRatio.updateSeries(0, data); options.loadingLidarRatioStatus = false } @@ -1112,7 +1114,12 @@ export default { matrix[tempIndex] = new Array(capacity); } - let value = r.data[h][i] + if (h < 4){ + matrix[tempIndex][h] = new Box(tempIndex, h, 0, 0, NaN, h * 15, time, "米"); + continue; + } + + let value = r.data[h - 2][i] if (name == 'backscatter') { value = value == null ? NaN : Math.log10(value); } diff --git a/04.系统编码/Frontend/src/model/constant.ts b/04.系统编码/Frontend/src/model/constant.ts index 3f9b68c..90184dd 100644 --- a/04.系统编码/Frontend/src/model/constant.ts +++ b/04.系统编码/Frontend/src/model/constant.ts @@ -2,6 +2,6 @@ export class Constant{ public static readonly baseUrl: string = 'http://rdp.nagr.com.cn:18080'; } export class ConstantRamanLidar{ - public static readonly baseUrl: string = 'http://112.124.40.88:5511'; - // public static readonly baseUrl: string = 'http://10.124.102.10:9998'; + // public static readonly baseUrl: string = 'http://112.124.40.88:5511'; + public static readonly baseUrl: string = 'http://10.124.102.10:9998'; } \ No newline at end of file diff --git a/04.系统编码/Frontend/src/model/heat-map-drawer.ts b/04.系统编码/Frontend/src/model/heat-map-drawer.ts index 2c01122..dc9fae5 100644 --- a/04.系统编码/Frontend/src/model/heat-map-drawer.ts +++ b/04.系统编码/Frontend/src/model/heat-map-drawer.ts @@ -166,6 +166,8 @@ export class HeatMapDrawer{ this.values[dataIndex] = this.values[dataIndex].reverse(); } + + this.createCalc(this.values); } @@ -232,9 +234,10 @@ export class HeatMapDrawer{ } public close(): void{ + this.values.length = 0; + if (this.targetCanvas == null) return; this.targetCanvas.removeEventListener('mousemove', this._onMouseMove); this.targetCanvas.removeEventListener('mouseout', this._onMouseOut); - this.values.length = 0; } private fillBackground(): void{ @@ -311,6 +314,9 @@ export class HeatMapDrawer{ let startX = this.paddingLeft + this.horizontalScaleLine; let startY = this.paddingTop + this.verticalScaleLine; + + this.canvasContext.font = "normal 16px 微软雅黑"; + this.canvasContext.fillStyle = "#000000"; for(let index = 0, len = scaleCount, lastLen = scaleCount - 1; index < len; index++){ if ((index == 0 && !this.xAxis.showStartValue) || (index == lastLen && !this.xAxis.showEndValue)) continue; this.setScaleStyle(true); @@ -323,14 +329,21 @@ export class HeatMapDrawer{ this.canvasContext.lineTo(_x,startY + this.verticalScaleLine + this.borderHeight); this.canvasContext.stroke(); - if (true){ - this.canvasContext.font = "normal 16px 微软雅黑"; - this.canvasContext.fillStyle = "#000000"; - this.canvasContext.fillText(this.xAxis.scales[index], _x - this.canvasContext.measureText(this.xAxis.scales[index]).width / 2, startY + this.verticalScaleLine + this.borderHeight + 20); + const currentText = this.xAxis.scales[index]; + if (index == 1 || ((currentText == '00' || currentText == '0') && index > 3)){ + this.setTimeDetail(_x, startY, this.values[index * 11 + 2][5].time.slice(0, 6)); } + this.canvasContext.fillText(currentText, _x - this.canvasContext.measureText(currentText).width / 2, startY + this.verticalScaleLine + this.borderHeight + 20); } } + private setTimeDetail(_x: number, startY: number, text: string): void{ + // const text = this.values[15][0].time.slice(0, 6); + this.canvasContext.font = "normal 14px 微软雅黑"; + this.canvasContext.fillText(text, _x - this.canvasContext.measureText(text).width / 2, startY + this.verticalScaleLine + this.borderHeight + 38); + this.canvasContext.font = "normal 16px 微软雅黑"; + } + private drawHorizontalScale(): void{ let scaleCount = this.yAxis.scales.length; let horizontalScaleIntervalLength = this.borderHeight / (scaleCount - 1); diff --git a/04.系统编码/Frontend/src/uilts/Config.ts b/04.系统编码/Frontend/src/uilts/Config.ts index 6662a4e..115f322 100644 --- a/04.系统编码/Frontend/src/uilts/Config.ts +++ b/04.系统编码/Frontend/src/uilts/Config.ts @@ -2,10 +2,10 @@ import { Moment } from "moment"; import { format } from "./String"; export class Config { - // public static url: string = ""; - // public static parentUrl: string = "http://10.124.102.10:8002/product/picture"; - public static url: string = "http://localhost:8002"; - public static parentUrl: string = "http://112.124.40.88:8999/product/picture"; + public static url: string = ""; + public static parentUrl: string = "http://10.124.102.10:8002/product/picture"; + // public static url: string = "http://localhost:8002"; + // public static parentUrl: string = "http://112.124.40.88:8999/product/picture"; // public static parentUrl: string = "http://rdp.nagr.com.cn:8082/product/picture"; }