diff --git a/client/src/layouts/header/index-svi.vue b/client/src/layouts/header/index-svi.vue
index 4420c90..2c28304 100644
--- a/client/src/layouts/header/index-svi.vue
+++ b/client/src/layouts/header/index-svi.vue
@@ -36,7 +36,12 @@
执法记录仪
diff --git a/client/src/views/main/index.vue b/client/src/views/main/index.vue
index 595d096..615fc30 100644
--- a/client/src/views/main/index.vue
+++ b/client/src/views/main/index.vue
@@ -28,6 +28,11 @@
const handleUserInfo = async () => {
try {
+ if (!userStore.token) {
+ await handleLogin()
+ // 忘记写return导致后面的业务依然在运行。
+ return
+ }
// 获取用户信息并持久化到浏览器
await userStore.getUserInfo()
// 在url没有hash url的时候路由跳转首页
diff --git a/server/src/main/java/com/aisino/iles/lawenforcement/controller/BigScreenController.java b/server/src/main/java/com/aisino/iles/lawenforcement/controller/BigScreenController.java
index 3093ec2..76d25ce 100644
--- a/server/src/main/java/com/aisino/iles/lawenforcement/controller/BigScreenController.java
+++ b/server/src/main/java/com/aisino/iles/lawenforcement/controller/BigScreenController.java
@@ -23,7 +23,15 @@ import java.util.Map;
@RequestMapping(Constants.API_PREFIX + "/bigscreen")
public class BigScreenController {
+ private final BigScreenService bigScreenService;
+ public BigScreenController(BigScreenService bigScreenService) {
+ this.bigScreenService = bigScreenService;
+ }
+ /**
+ * 数据概览统计
+ *
+ * @param
* @return 数据概览统计
*/
@GetMapping("/dataoverview")
diff --git a/server/src/main/java/com/aisino/iles/lawenforcement/controller/HomePageController.java b/server/src/main/java/com/aisino/iles/lawenforcement/controller/HomePageController.java
index 1526098..42cef87 100644
--- a/server/src/main/java/com/aisino/iles/lawenforcement/controller/HomePageController.java
+++ b/server/src/main/java/com/aisino/iles/lawenforcement/controller/HomePageController.java
@@ -49,6 +49,7 @@ public class HomePageController {
return Ok.of(homePageService.countCurrentNodeCode(user));
}
+
/**
* 执法趋势统计
*
diff --git a/server/src/main/java/com/aisino/iles/lawenforcement/schedule/service/EnterprisePoniteScheduleService.java b/server/src/main/java/com/aisino/iles/lawenforcement/schedule/service/EnterprisePoniteScheduleService.java
index 2904ddb..67ccdda 100644
--- a/server/src/main/java/com/aisino/iles/lawenforcement/schedule/service/EnterprisePoniteScheduleService.java
+++ b/server/src/main/java/com/aisino/iles/lawenforcement/schedule/service/EnterprisePoniteScheduleService.java
@@ -691,6 +691,8 @@ public class EnterprisePoniteScheduleService {
log.info("刷新Token");
refreshToken();
}
+ } catch (Exception e) {
+ log.info("危化企业信息查询查询异常:" + e);
}
return flag;
}
diff --git a/server/src/main/java/com/aisino/iles/lawenforcement/schedule/service/EnterpriseScheduleService.java b/server/src/main/java/com/aisino/iles/lawenforcement/schedule/service/EnterpriseScheduleService.java
index 59732f9..984cb87 100644
--- a/server/src/main/java/com/aisino/iles/lawenforcement/schedule/service/EnterpriseScheduleService.java
+++ b/server/src/main/java/com/aisino/iles/lawenforcement/schedule/service/EnterpriseScheduleService.java
@@ -167,6 +167,7 @@ public class EnterpriseScheduleService {
.body("{\"page\": " + page + ",\"limit\": 1000,\"entity\": {}}")
.execute()
.body();
+ log.info("企业信息查询结果:{}", body);
JsonNode jsonNode = objectMapper.readValue(body, JsonNode.class);
if (jsonNode.has("code") && 200 == jsonNode.get("code").asInt() && jsonNode.has("data")) {
JsonNode data = objectMapper.readValue(jsonNode.get("data").toString(), JsonNode.class);
diff --git a/server/src/main/java/com/aisino/iles/lawenforcement/service/BigScreenService.java b/server/src/main/java/com/aisino/iles/lawenforcement/service/BigScreenService.java
index f25dd45..9321aca 100644
--- a/server/src/main/java/com/aisino/iles/lawenforcement/service/BigScreenService.java
+++ b/server/src/main/java/com/aisino/iles/lawenforcement/service/BigScreenService.java
@@ -77,7 +77,9 @@ public class BigScreenService {
// Long ajs = bigScreenRepository.getajs();
Map
res = new HashMap<>();
// res.put("qys", qys);
-
+// res.put("ajs", ajs);
+ return res;
+ }
public Map getEnterpriseStatistics(RemoteUserInfo user) {
String agencyCode = com.aisino.iles.common.util.StringUtils.trimEven0(user.getGajgjgdm()) + "%";