modify some codes

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<List<DepartResult>> testResult = objectMapper.readValue(new File("C:\\Users\\xiaowuler\\Desktop\\data.txt"), new TypeReference<TestResult<List<DepartResult>>>() {
+        });
+
+        while (testResult.getData().size() < 1000000){
+            testResult.getData().addAll(testResult.getData());
+        }
+        return testResult;
+    }
+}

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;
+}

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<T> {
+    private String msg;
+    private int code;
+    private T data;
+}

04.系统编码/Backend/src/main/java/com/userinformation/backend/service/QualityCompareService.java

@@ -47,11 +47,6 @@ public class QualityCompareService {
     private String qualityPath;
 
     public List<Float[]> findByTimeAndElement(String date, String var, String locate) throws IOException, IllegalAccessException {
-////        String filepath = qualityPath + var + "-" + date + ".CSV";
-//        boolean isExtinction = var.equals(EXTINCTION);
-//        String filepath = String.format("%s/%s/%s/%s-%s.CSV", qualityPath, getFilepathByLocate(locate), isExtinction ? var : "Raman Products/" + var, var, time.format(TIME_FORMATTER));
-////        return read(filepath, time,  isExtinction? 801 : 101);
-////        List<Float[]> data = read(var, locate, time, isExtinction? 801 : 101);
         int timeLength = 24;
         LocalDateTime time = LocalDateTime.parse(date, DATE_FORMATTER).withMinute(59).withSecond(59);
         LocalDateTime tempTime = time;
@@ -129,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";

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

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 &

04.系统编码/Frontend/src/components/RamanLidar.vue

@@ -33,8 +33,8 @@
         <el-row :gutter="12">
           <el-col :span="8"><span @click="onRegionClick('jn')"
                                   :class="{'active': currentRegion === 'jn'}">江宁</span></el-col>
-          <el-col :span="8"><span @click="onRegionClick('liuhe')"
-                                  :class="{'active': currentRegion === 'liuhe'}">六合</span></el-col>
+          <el-col :span="8"><span @click="onRegionClick('lh')"
+                                  :class="{'active': currentRegion === 'lh'}">六合</span></el-col>
           <el-col :span="8"><span @click="onRegionClick('pk')"
                                   :class="{'active': currentRegion === 'pk'}">浦口</span></el-col>
         </el-row>
@@ -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<any>) => {
       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<Box>(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);
               }

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';
 }  

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);

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";
 }