From 8883f58af705d3144453f7e6484129b6d85c00b5 Mon Sep 17 00:00:00 2001 From: dearlin <1261008090@qq.com> Date: Thu, 18 Jan 2024 14:36:21 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BD=93=E7=B3=BB=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E4=B8=8B=E8=BD=BD=E5=9C=B0=E5=9D=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/zcloud/util/Const.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/zcloud/util/Const.java b/src/main/java/com/zcloud/util/Const.java index 3cd7334f..2121cf7b 100644 --- a/src/main/java/com/zcloud/util/Const.java +++ b/src/main/java/com/zcloud/util/Const.java @@ -47,8 +47,8 @@ public class Const { public static final String ISSUPERVISE = "ISSUPERVISE"; //是否监管部门 public static final String DEFAULT_PASSWORD = "Aa@123456789"; //系统默认密码 public static final String FILEURL = "/mnt/qask/file/"; //文件服务器地址 - public static final String HTTPFILEURL = "https://skqhdg.porthebei.com:9004/file/"; //文件服务器地址 -// public static final String HTTPFILEURL = "https://qgqy.qhdsafety.com/file/"; + // TODO 体系文件下载地址 + public static final String HTTPFILEURL = "https://wwag.qhdsafety.com/file/"; //文件服务器地址 public final static String APPID = "wx9199de454d31b016"; public final static String SECRET = "183cdcac380e1f98f00c793491e27d88"; public static final String XCX_MCH_ID = "1607757714"; From 5678f4451dc1be3e986e81597fadc910ffabafff Mon Sep 17 00:00:00 2001 From: dearlin <1261008090@qq.com> Date: Thu, 18 Jan 2024 15:11:33 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=85=AB=E9=A1=B9=E4=BD=9C=E4=B8=9A?= =?UTF-8?q?=E4=B8=8D=E6=98=BE=E7=A4=BA=E6=89=8E=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../zcloud/controller/czksmap/CzksMapEightController.java | 8 +++++++- src/main/resources/application-dev.properties | 6 +++--- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/zcloud/controller/czksmap/CzksMapEightController.java b/src/main/java/com/zcloud/controller/czksmap/CzksMapEightController.java index 380055cf..7b42cd69 100644 --- a/src/main/java/com/zcloud/controller/czksmap/CzksMapEightController.java +++ b/src/main/java/com/zcloud/controller/czksmap/CzksMapEightController.java @@ -51,7 +51,7 @@ public class CzksMapEightController extends BaseController { public Object findFormCount() throws Exception { Map map = new HashMap(); String errInfo = "success"; - PageData pd = this.getPageData(); + PageData pd = this.getPageData(); pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); // 企业 PageData data = mapEightService.statisticsHighRiskWorkByStateOrder(pd); @@ -99,6 +99,12 @@ public class CzksMapEightController extends BaseController { } else { varList = mapEightService.listAllHighRiskWorkLocationOrder(pd); } + // 处理一下 name 的问题 + if (varList != null) { + varList.forEach(item -> { + item.put("MAP_POINT_NAME", item.getString("NAME")); + }); + } map.put("varList", varList); map.put("result", errInfo); return map; diff --git a/src/main/resources/application-dev.properties b/src/main/resources/application-dev.properties index a1e4e247..b22d959d 100644 --- a/src/main/resources/application-dev.properties +++ b/src/main/resources/application-dev.properties @@ -92,10 +92,10 @@ mq.group.docking=scheduled_tasks_docking perLoc.url=http://172.16.130.86/gateway-service perLoc.userName=qaaqadmin perLoc.pwd=Cfd2023@ -corp.default.pic-path=https://qgqy.qhdsafety.com/ -corp.default.back-end-path=https://qgqy.qhdsafety.com/file/ +corp.default.pic-path=https://wwag.qhdsafety.com/file/ +corp.default.back-end-path=https://wwag.qhdsafety.com/file/ -http.file.url=https://qgqy.qhdsafety.com/file/ +http.file.url=https://wwag.qhdsafety.com/file/ #???????????? baseimgpath =https://wwag.qhdsafety.com/file/ cfd.prevention.api.url=http://192.168.0.31:7021/qa-regulatory-cfd From 77830f3e8379df863fbb5c316c9bb90a740cb045 Mon Sep 17 00:00:00 2001 From: dearlin <1261008090@qq.com> Date: Thu, 18 Jan 2024 15:21:11 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=85=AB=E9=A1=B9=E4=BD=9C=E4=B8=9A?= =?UTF-8?q?=EF=BC=8C=E6=91=84=E5=83=8F=E5=A4=B4=EF=BC=8C=E4=BD=93=E7=B3=BB?= =?UTF-8?q?=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/czksmap/CzksObtainDisplayDataController.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/zcloud/controller/czksmap/CzksObtainDisplayDataController.java b/src/main/java/com/zcloud/controller/czksmap/CzksObtainDisplayDataController.java index ec858b3d..7f9b4cdd 100644 --- a/src/main/java/com/zcloud/controller/czksmap/CzksObtainDisplayDataController.java +++ b/src/main/java/com/zcloud/controller/czksmap/CzksObtainDisplayDataController.java @@ -4,6 +4,7 @@ import com.zcloud.controller.base.BaseController; import com.zcloud.entity.PageData; import com.zcloud.service.bus.RiskUnitService; import com.zcloud.service.keyProjects.PlatformvideomanagementService; +import com.zcloud.util.ReturnMap; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; @@ -29,7 +30,9 @@ public class CzksObtainDisplayDataController extends BaseController { @ResponseBody public Object listAllCameraForMap() throws Exception{ PageData pd = this.getPageData(); - return platformvideomanagementService.listAllForMap(pd); + ReturnMap returnMap = new ReturnMap(); + returnMap.put("data", platformvideomanagementService.listAllForMap(pd)); + return returnMap; }