系统bug修复

src/main/java/com/singularity/pojo/dto/kc/CarDataDTO.java

@@ -127,4 +127,7 @@ public class CarDataDTO {
 
     @ApiModelProperty(value = "后制动形式", dataType = "Integer")
     private Integer rearRetardation;
+
+    @ApiModelProperty(value = "形式性能轮胎", dataType = "Integer")
+    private Integer springUploadStat;
 }

src/main/java/com/singularity/pojo/vo/hading/QueryTableDataVO.java

@@ -27,7 +27,7 @@ public class QueryTableDataVO {
         private Integer id;
 
         @ApiModelProperty(value = "数据表数据集合")
-        private Map<Integer,String> tableDataMap;
+        private Map<Object,String> tableDataMap;
 
     }
 }

src/main/java/com/singularity/service/impl/HandingServiceImpl.java

@@ -451,7 +451,7 @@ public class HandingServiceImpl implements HandingService {
             for (TableData tableData : tableDataList2) {
                 QueryTableDataVO.QueryTableDataSon queryTableDataSon
                         = new QueryTableDataVO.QueryTableDataSon();
-                Map dataMap = JSONObject.parseObject(tableData.getRowInfo(), Map.class);
+                Map<Object,String> dataMap = JSONObject.parseObject(tableData.getRowInfo(), Map.class);
                 queryTableDataSon.setTableDataMap(dataMap);
                 queryTableDataSon.setId(tableData.getId());
                 sonList.add(queryTableDataSon);

src/main/java/com/singularity/service/impl/SubjectiveEvaluationServiceImpl.java

@@ -336,19 +336,19 @@ public class SubjectiveEvaluationServiceImpl extends ServiceImpl<SubjectiveEvalu
         // 定义主观评价试验类别
         int business_type;
         switch (subjectiveEvaluationReportsParam.getReviewType()){
-            case 1:
+            case 0:
                 business_type = 45;
                 break;
-            case 2:
+            case 1:
                 business_type = 46;
                 break;
-            case 3:
+            case 2:
                 business_type = 47;
                 break;
-            case 4:
+            case 3:
                 business_type = 48;
                 break;
-            case 5:
+            case 4:
                 business_type = 49;
                 break;
             default:

src/main/java/com/singularity/util/FileConvertUtil.java

@@ -32,7 +32,7 @@ public class FileConvertUtil {
     /**
      * openoffice的host:你部署openoffice的服务器ip
      */
-    private static final String OPENOFFICE_HOST = "10.148.111.13";
+    private static final String OPENOFFICE_HOST = "10.148.111.171";
     /**
      * openoffice的port
      */

src/main/resources/application-pro.yml

@@ -1,6 +1,6 @@
 spring:
   datasource:
-    url: jdbc:mysql://localhost:3306/car_test?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=UTC&allowPublicKeyRetrieval=true
+    url: jdbc:mysql://10.148.111.171:3306/car_test?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=UTC&allowPublicKeyRetrieval=true
     username: root
     password: Su28092015__
     driver-class-name: com.mysql.cj.jdbc.Driver
@@ -24,6 +24,22 @@ spring:
       max-request-size: 1000MB
   jmx:
     enabled: true
+  redis:
+    port: 6379
+    database: 1
+    host: 10.148.111.171
+    timeout: 3s
+    lettuce:
+      pool:
+        # 连接池最大连接数
+        max-active: 20
+        # 连接池最大阻塞等待时间（使用负值表示没有限制）
+        max-wait: -1ms
+        # 连接池中的最大空闲连接
+        max-idle: 10
+        # 连接池中的最小空闲连接
+        min-idle: 3
+        time-between-eviction-runs: 100
 
 mybatis-plus:
   mapper-locations: classpath:mapper/*.xml
@@ -52,7 +68,7 @@ sa-token:
   alone-redis:
     port: 6379
     database: 0
-    host: localhost
+    host: 10.148.111.171
     lettuce:
       pool:
         # 连接池最大连接数
@@ -70,9 +86,9 @@ file:
 
 detection:
   minio:
-    endpoint: http://localhost:9000
+    endpoint: http://10.148.111.171:9000
     accessKey: admin
     secretKey: 12345678
     bucketName: car
     pathPrefix: common
-    virtualUrl: http://localhost:9000
+    virtualUrl: http://10.148.111.171:9000

src/main/resources/application-test.yml

@@ -1,8 +1,8 @@
 spring:
   datasource:
-    url: jdbc:mysql://120.79.182.152:3230/car_test?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=UTC&allowPublicKeyRetrieval=true
+    url: jdbc:mysql://localhost:3306/car_test?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=UTC&allowPublicKeyRetrieval=true
     username: root
-    password: Su28092015__
+    password: 123456
     driver-class-name: com.mysql.cj.jdbc.Driver
     hikari:
       minimum-idle: 3

src/main/resources/mapper/CarDataMapper.xml

@@ -238,7 +238,8 @@
             base.coast_upload_stat,
             base.handing_upload_stat,
             base.steering_upload_stat,
-            base.braking_upload_stat
+            base.braking_upload_stat,
+            base.spring_upload_stat
         from car_basic_param base
         left join car_body_param cbp on base.id = cbp.car_id
         left join car_test.car_chassis_structure ccs on base.id = ccs.car_id