1

src/main/java/com/fdkankan/fusion/entity/TmProject.java

@@ -131,6 +131,7 @@ public class TmProject implements Serializable {
      */
     @TableField("create_time")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
     private Date createTime;
 
     /**
@@ -156,6 +157,7 @@ public class TmProject implements Serializable {
      */
     @TableField("update_time")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
     private Date updateTime;
 
     /**

src/main/java/com/fdkankan/fusion/generate/AutoGenerate.java

@@ -18,7 +18,7 @@ public class AutoGenerate {
         String path =System.getProperty("user.dir") ;
 
         generate(path,"fusion", getTables(new String[]{
-               "mq_send_log"
+               "t_scene_pro"
         }));
 
 //        generate(path,"goods", getTables(new String[]{

src/main/java/com/fdkankan/fusion/service/impl/DataService.java

@@ -59,7 +59,7 @@ public class DataService implements IDataService {
             cameraIdMap.put(Long.valueOf(dataGroupVo.getGroupKey()),dataGroupVo.getDataCount());
         }
 
-        List<TmDepartment> deptList = getDeptVoList();
+        List<TmDepartment> deptList = getDeptVoList(deptId);
 
         List<DataGroupVo> dataGroupVos = new ArrayList<>();
         for (TmDepartment department : deptList) {
@@ -113,8 +113,8 @@ public class DataService implements IDataService {
         return count;
     }
 
-    private List<TmDepartment>  getDeptVoList(){
-        List<TmDepartment> deptList = tmDepartmentService.getDeptList();
+    private List<TmDepartment>  getDeptVoList(String deptId){
+        List<TmDepartment> deptList = tmDepartmentService.getDeptList(deptId);
         TmDepartment department1 = deptList.get(0);
         if(department1.getParentId() == null){  //超管
             List<TmDepartment> departments = department1.getChildren();
@@ -140,8 +140,8 @@ public class DataService implements IDataService {
         List<DataGroupVo> groupVoList = tmProjectService.groupByDeptId(param);
         HashMap<String,Long> map = new HashMap<>();
         groupVoList.forEach(e -> map.put(e.getGroupKey(),e.getDataCount()));
-
-        List<TmDepartment> deptVoList = getDeptVoList();
+        String deptId = tmDepartmentService.getDeptId();
+        List<TmDepartment> deptVoList = getDeptVoList(deptId);
 
         List<DataGroupVo> dataGroupVos = new ArrayList<>();
         for (TmDepartment department : deptVoList) {

src/main/resources/application-localprod.yaml

@@ -0,0 +1,60 @@
+spring:
+  datasource:
+    type: com.alibaba.druid.pool.DruidDataSource
+    #120.25.146.52
+    dynamic:
+      primary: db1
+      strict: false
+      datasource:
+        db1:
+          driver-class-name: com.mysql.jdbc.Driver
+          #url: jdbc:mysql://172.20.0.5:3306/fd_fusion?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=Asia/Shanghai&allowMultiQueries=true
+          url: jdbc:mysql://120.79.248.148:3306/fd_fusion?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=Asia/Shanghai&allowMultiQueries=true
+          username: fusion
+          password: 3oo19bgh0cae2406
+        db2:
+          driver-class-name: com.mysql.jdbc.Driver
+          #url: jdbc:mysql://rm-wz90w10465iiwwv09.mysql.rds.aliyuncs.com:3306/4dkankan_v4_prod?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=Asia/Shanghai&allowMultiQueries=true
+          url: jdbc:mysql://rm-wz90w10465iiwwv098o.mysql.rds.aliyuncs.com:3306/4dkankan_v4_prod?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=Asia/Shanghai&allowMultiQueries=true
+          username: root
+          password: D2719bd0cae1a005
+  redis:
+    #host: r-wz9owsphxqwi4ztqlf.redis.rds.aliyuncs.com   #官网正式环境
+    host: r-wz9owsphxqwi4ztqlfpd.redis.rds.aliyuncs.com   #官网正式环境
+    port: 6379
+    timeout: 6000ms
+    password: 3oo19bgh0cae2406&
+    jedis:
+      pool:
+        max-active: 10  #连接池最大连接数（使用负值表示没有限制）
+        max-idle: 10 # 连接池中的最大空闲连接
+        min-idle: 5 # 连接池中的最小空闲连接
+        max-wait: -1 # 连接池最大阻塞等待时间（使用负值表示没有限制）
+    lettuce:
+      shutdown-timeout: 0ms
+
+
+4dkk:
+  laserService:
+    #深时（激光）地址 生产环境：https://laser.4dkankan.com/
+    basePath: http://laser.4dkankan.com/backend
+    port: 80
+    #basePath: http://192.168.0.152:8080
+    #port: 8080
+  fdService:
+    #官网生产环境：https://www.4dkankan.com      http://test.4dkankan.com
+    basePath: http://www.4dkankan.com
+    port: 80
+    #basePath: http://192.168.0.38/4dkankan_v2
+    #port: 8080
+  newFdService:
+    #官网生产环境：https://www.4dkankan.com
+    basePath: http://www.4dkankan.com
+    port: 80
+  overallService:
+    #全景看看生产环境 host: https://www.4dkankan.com/qjkankan
+    basePath: http://test.4dkankan.com/qjkankan
+    port: 80
+  takeLookService:
+    basePath: https://www.4dkankan.com
+    port: 80

src/main/resources/application.yaml

@@ -1,6 +1,6 @@
 spring:
   profiles:
-    active: ${activeProfile:local}
+    active: ${activeProfile:localprod}
   servlet:
     multipart:
       max-file-size: 1000MB