From da8261e345bebfeaa0813545ee264cd519b2a0dd Mon Sep 17 00:00:00 2001 From: yuyan02 Date: Fri, 18 Jul 2025 18:44:42 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=89=A7=E6=B3=95=E4=B8=80?= =?UTF-8?q?=E5=BC=A0=E5=9B=BE=E4=BD=8D=E7=BD=AE=E6=9B=B4=E6=96=B0=E4=B8=8D?= =?UTF-8?q?=E5=8F=8A=E6=97=B6=E3=80=81=E4=BC=81=E4=B8=9A=E5=88=86=E7=B1=BB?= =?UTF-8?q?=E4=B8=8D=E6=98=BE=E7=A4=BA=E7=AD=89bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- client/src/layouts/header/index-svi.vue | 7 ++++++- client/src/stores/json/topMenu.json | 7 ++++++- client/src/views/big-screen/bigdata.vue | 1 + client/src/views/main/index.vue | 5 +++++ .../lawenforcement/controller/BigScreenController.java | 8 ++++++++ .../lawenforcement/controller/HomePageController.java | 1 + .../schedule/service/EnterprisePoniteScheduleService.java | 2 ++ .../schedule/service/EnterpriseScheduleService.java | 1 + .../iles/lawenforcement/service/BigScreenService.java | 4 +++- 9 files changed, 33 insertions(+), 3 deletions(-) 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 @@
-onfont icon-zngzt_tcdl" @click="handleLogout" title="退出"> + 综合执法一张图 + + + + +
diff --git a/client/src/stores/json/topMenu.json b/client/src/stores/json/topMenu.json index ba65557..3bfd22f 100644 --- a/client/src/stores/json/topMenu.json +++ b/client/src/stores/json/topMenu.json @@ -8,7 +8,12 @@ "path": "/svi/index", "router": true }, - + { + "gncdbh": 2, + "name": "执法对象管理", + "icon": "zyyy_rzzx", + "path": "/dtsjygl/dtsjk", + "router": true }, { "gncdbh": 12, diff --git a/client/src/views/big-screen/bigdata.vue b/client/src/views/big-screen/bigdata.vue index 0502160..758d87e 100644 --- a/client/src/views/big-screen/bigdata.vue +++ b/client/src/views/big-screen/bigdata.vue @@ -12,6 +12,7 @@
返回首页
+
执法记录仪
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()) + "%";