f

src/main/java/com/cm/inspection/service/count/impl/CountServiceImpl.java

@@ -40,6 +40,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.*;
+import java.util.concurrent.CountDownLatch;
 
 /**
  * When you feel like quitting. Think about why you started
@@ -148,6 +149,7 @@ public class CountServiceImpl extends BaseService implements ICountService {
         LOG.debug("获取行业分类");
         List<DataDictionaryDTO> dataDictionaryDTOs = dataDictionaryService.listDictionaryByParentId("b97630ab-45b7-45bc-a624-507d4df952ff");
         List<Map<String, Object>> resultList = new ArrayList<>();
+        CountDownLatch countDownLatch = new CountDownLatch(areaDTOs.size());
         areaDTOs.parallelStream().forEach(areaDTO -> {
             Map<String, Object> params = getHashMap(5);
             params.put("isLogOff", 0);
@@ -165,7 +167,13 @@ public class CountServiceImpl extends BaseService implements ICountService {
             });
             resultListMap.put("industryTypeCountList", industryTypeCountList);
             resultList.add(resultListMap);
+            countDownLatch.countDown();
         });
+        try {
+            countDownLatch.await();
+        } catch (InterruptedException e) {
+            throw new RuntimeException(e);
+        }
         /**
          for (DataDictionaryDTO areaDTO : areaDTOs) {
          Map<String, Object> resultListMap = getHashMap(3);

src/main/resources/application-btyjwg.yml

@@ -0,0 +1,142 @@
+server:
+  port: 7012
+  url: http://127.0.0.1:7021/inspection
+  title: 隐患上报系统
+  servlet:
+    context-path: /inspection
+
+spring:
+  thymeleaf:
+    prefix: classpath:/templates/
+    suffix: .html
+    mode: HTML5
+    encoding: UTF-8
+    cache: false
+  main:
+    allow-bean-definition-overriding: true
+  servlet:
+    multipart:
+      max-file-size: 1GB
+      max-request-size: 1GB
+  datasource:
+    druid:
+      url: jdbc:mysql://192.168.0.151:3306/db_cloud_inspection_v2?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&autoReconnect=true&failOverReadOnly=false&useSSL=false
+      db-type: mysql
+      driver-class-name: com.mysql.jdbc.Driver
+      username: root
+      password: root
+      initial-size: 2
+      min-idle: 2
+      max-active: 5
+      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
+      pool-prepared-statements: true
+      max-pool-prepared-statement-per-connection-size: 10
+      filter:
+        commons-log:
+          connection-logger-name: stat,wall,log4j
+        stat:
+          log-slow-sql: true
+          slow-sql-millis: 2000
+      connection-properties: druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000
+      use-global-data-source-stat: true
+  activiti:
+    database-schema-update: true
+    db-history-used: true
+    history-level: full
+    check-process-definitions: false
+    rest-api-enabled: true
+    rest-api-servlet-name: activiti-swagger-document
+    SpringProcessEngineConfiguration:
+      activityFontName: 宋体
+      labelFontName: 宋体
+      dataSource: datasource
+
+# 数据库
+mybatis:
+  config-location: classpath:mybatis/mybatis-config.xml
+  mapper-locations: classpath*:mybatis/mapper/**/*.xml
+
+# 文档
+swagger:
+  title: 接口文档
+  description: 隐患排查系统接口文档
+  service-url: http://127.0.0.1:7021/inspection
+  version: 1.0
+  swagger-base-package: com.cm
+
+# 文件
+file:
+  uploadPath: /root/projects/uploadFiles/
+  imageTypes: png,jpg,jpeg,gif,blob
+  videoTypes: mp4,rmvb
+  audioTypes: mp3,wmv
+  fileTypes: doc,docx,xls,xlsx,ppt,pptx,txt,zip,rar,apk,pdf
+  maxFileCount: 6
+
+# 安全
+security:
+  oauth2:
+    oauth-server: http://127.0.0.1:7021/usercenter
+    oauth-logout: ${security.oauth2.oauth-server}/logout?redirect_uri=${server.url}
+    client:
+      client-id: 32ec344a5fd04fd9911586df5d1dc36b
+      client-secret: a2NORTAyZmthdTNtVHNwLytGVVo0ckFhNktHQU9JWVFmUks0TGw5L2hQRW1ac2wwZTJHWk5NbXh3L3h3U2c4Rg==
+      user-authorization-uri: ${security.oauth2.oauth-server}/oauth_client/authorize
+      access-token-uri: ${security.oauth2.oauth-server}/oauth_client/token
+      grant-type: authorization_code
+    resource:
+      jwt:
+        key-uri: ${security.oauth2.oauth-server}/oauth_client/token_key
+      token-info-uri: ${security.oauth2.oauth-server}/oauth_client/check_token
+      user-info-uri: ${security.oauth2.oauth-server}/user
+    authorization:
+      check-token-access: ${security.oauth2.oauth-server}/oauth_client/token_key
+
+api-path:
+  user-center: ${security.oauth2.oauth-server}
+  notice-url: ${security.oauth2.oauth-server}
+version: 1
+report-form:
+  check-detail: true
+
+# 访问控制
+access-control:
+  pass-paths:
+    - /index.html
+    - /logout.html
+    - /default.html
+    - /assets/**
+    - /route/file/downloadfile/**
+  save-paths:
+    - /**/save*/**
+    - /**/add*/**
+  delete-paths:
+    - /**/delete*/**
+    - /**/remove*/**
+  update-paths:
+    - /**/update*/**
+    - /**/edit*/**
+  query-paths:
+    - /**/get*/**
+    - /**/query*/**
+    - /**/find*/**
+    - /**/list*/**
+    - /**/count*/**
+
+# 日志
+logging:
+  file: /root/projects/logs/inspection/inspection-v2-logs.log
+  level:
+    root: error
+    com.cm: debug
+
+#大数据统计参数
+count-big-data:
+  jiniqu-dept-id: 0
+  shengtaiwei-dept-id: 0

src/main/resources/static/route/check/get-map-check.html

@@ -105,7 +105,7 @@
         </div>
     </div>
 </div>
-<script type="text/javascript" src="http://api.map.baidu.com/api?v=3.0&ak=f6GW67DsG2Q8neoailgV7aGObleUGX1N"></script>
+<script type="text/javascript" src="http://api.map.baidu.com/api?v=3.0&ak=pFMM3KjMlPlpzEGTXwB5vdj6cDCfB6Py"></script>
 <script type="text/javascript" src="http://api.map.baidu.com/library/TextIconOverlay/1.2/src/TextIconOverlay_min.js"></script>
 <script type="text/javascript" src="http://api.map.baidu.com/library/MarkerClusterer/1.2/src/MarkerClusterer_min.js"></script>
 <script src="assets/layuiadmin/layui/layui.js"></script>

src/main/resources/static/route/check/get-map-location.html

@@ -16,7 +16,7 @@
         <div id="mapContainer" class="layui-card-body" style="padding: 15px;"></div>
     </div>
 </div>
-<script type="text/javascript" src="http://api.map.baidu.com/api?v=3.0&ak=f6GW67DsG2Q8neoailgV7aGObleUGX1N"></script>
+<script type="text/javascript" src="http://api.map.baidu.com/api?v=3.0&ak=pFMM3KjMlPlpzEGTXwB5vdj6cDCfB6Py"></script>
 <script src="assets/layuiadmin/layui/layui.js"></script>
 <script>
     layui.config({

src/main/resources/static/route/check2/get-map-check.html

@@ -105,7 +105,7 @@
         </div>
     </div>
 </div>
-<script type="text/javascript" src="http://api.map.baidu.com/api?v=3.0&ak=f6GW67DsG2Q8neoailgV7aGObleUGX1N"></script>
+<script type="text/javascript" src="http://api.map.baidu.com/api?v=3.0&ak=pFMM3KjMlPlpzEGTXwB5vdj6cDCfB6Py"></script>
 <script type="text/javascript" src="http://api.map.baidu.com/library/TextIconOverlay/1.2/src/TextIconOverlay_min.js"></script>
 <script type="text/javascript" src="http://api.map.baidu.com/library/MarkerClusterer/1.2/src/MarkerClusterer_min.js"></script>
 <script src="assets/layuiadmin/layui/layui.js"></script>

src/main/resources/static/route/check2/get-map-location.html

@@ -16,7 +16,7 @@
         <div id="mapContainer" class="layui-card-body" style="padding: 15px;"></div>
     </div>
 </div>
-<script type="text/javascript" src="http://api.map.baidu.com/api?v=3.0&ak=f6GW67DsG2Q8neoailgV7aGObleUGX1N"></script>
+<script type="text/javascript" src="http://api.map.baidu.com/api?v=3.0&ak=pFMM3KjMlPlpzEGTXwB5vdj6cDCfB6Py"></script>
 <script src="assets/layuiadmin/layui/layui.js"></script>
 <script>
     layui.config({

src/main/resources/static/route/enterprise/get-enterprise-location.html

@@ -18,7 +18,7 @@
         </div>
     </div>
 </div>
-<script type="text/javascript" src="http://api.map.baidu.com/api?v=3.0&ak=f6GW67DsG2Q8neoailgV7aGObleUGX1N"></script>
+<script type="text/javascript" src="http://api.map.baidu.com/api?v=3.0&ak=pFMM3KjMlPlpzEGTXwB5vdj6cDCfB6Py"></script>
 <script src="assets/layuiadmin/layui/layui.js"></script>
 <script>
     layui.config({

src/main/resources/static/route/gridpersonnel/get-enterprise-location.html

@@ -16,7 +16,7 @@
         <div id="mapContainer" class="layui-card-body" style="padding: 15px;"></div>
     </div>
 </div>
-<script type="text/javascript" src="http://api.map.baidu.com/api?v=3.0&ak=f6GW67DsG2Q8neoailgV7aGObleUGX1N"></script>
+<script type="text/javascript" src="http://api.map.baidu.com/api?v=3.0&ak=pFMM3KjMlPlpzEGTXwB5vdj6cDCfB6Py"></script>
 <script src="assets/layuiadmin/layui/layui.js"></script>
 <script>
     layui.config({

src/main/resources/static/route/publicareareport/get-map-location.html

@@ -16,7 +16,7 @@
         <div id="mapContainer" class="layui-card-body" style="padding: 15px;"></div>
     </div>
 </div>
-<script type="text/javascript" src="http://api.map.baidu.com/api?v=3.0&ak=f6GW67DsG2Q8neoailgV7aGObleUGX1N"></script>
+<script type="text/javascript" src="http://api.map.baidu.com/api?v=3.0&ak=pFMM3KjMlPlpzEGTXwB5vdj6cDCfB6Py"></script>
 <script src="assets/layuiadmin/layui/layui.js"></script>
 <script>
     layui.config({