guoyuepeng
/
qa-prevention-gwj
1
0
Fork 3
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/czks1.0' into czks1.0

pull/14/head
liulixin 2024-01-18 15:50:10 +08:00
parent 9986f6e3ea 77830f3e83
commit bc92e6b594
4 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/zcloud/controller/czksmap/CzksMapEightController.java
View File

@ -99,6 +99,12 @@ public class CzksMapEightController extends BaseController {
} else { } else {
varList = mapEightService.listAllHighRiskWorkLocationOrder(pd); 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("varList", varList);
map.put("result", errInfo); map.put("result", errInfo);
return map; return map;

5
src/main/java/com/zcloud/controller/czksmap/CzksObtainDisplayDataController.java
View File

@ -4,6 +4,7 @@ import com.zcloud.controller.base.BaseController;
import com.zcloud.entity.PageData; import com.zcloud.entity.PageData;
import com.zcloud.service.bus.RiskUnitService; import com.zcloud.service.bus.RiskUnitService;
import com.zcloud.service.keyProjects.PlatformvideomanagementService; import com.zcloud.service.keyProjects.PlatformvideomanagementService;
import com.zcloud.util.ReturnMap;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
@ -29,7 +30,9 @@ public class CzksObtainDisplayDataController extends BaseController {
@ResponseBody @ResponseBody
public Object listAllCameraForMap() throws Exception{ public Object listAllCameraForMap() throws Exception{
PageData pd = this.getPageData(); PageData pd = this.getPageData();
return platformvideomanagementService.listAllForMap(pd); ReturnMap returnMap = new ReturnMap();
returnMap.put("data", platformvideomanagementService.listAllForMap(pd));
return returnMap;
} }

4
src/main/java/com/zcloud/util/Const.java
View File

@ -47,8 +47,8 @@ public class Const {
public static final String ISSUPERVISE = "ISSUPERVISE"; //是否监管部门 public static final String ISSUPERVISE = "ISSUPERVISE"; //是否监管部门
public static final String DEFAULT_PASSWORD = "Aa@123456789"; //系统默认密码 public static final String DEFAULT_PASSWORD = "Aa@123456789"; //系统默认密码
public static final String FILEURL = "/mnt/qask/file/"; //文件服务器地址 public static final String FILEURL = "/mnt/qask/file/"; //文件服务器地址
public static final String HTTPFILEURL = "https://skqhdg.porthebei.com:9004/file/"; //文件服务器地址 // TODO 体系文件下载地址
// public static final String HTTPFILEURL = "https://qgqy.qhdsafety.com/file/"; public static final String HTTPFILEURL = "https://wwag.qhdsafety.com/file/"; //文件服务器地址
public final static String APPID = "wx9199de454d31b016"; public final static String APPID = "wx9199de454d31b016";
public final static String SECRET = "183cdcac380e1f98f00c793491e27d88"; public final static String SECRET = "183cdcac380e1f98f00c793491e27d88";
public static final String XCX_MCH_ID = "1607757714"; public static final String XCX_MCH_ID = "1607757714";

6
src/main/resources/application-dev.properties
View File

@ -92,10 +92,10 @@ mq.group.docking=scheduled_tasks_docking
perLoc.url=http://172.16.130.86/gateway-service perLoc.url=http://172.16.130.86/gateway-service
perLoc.userName=qaaqadmin perLoc.userName=qaaqadmin
perLoc.pwd=Cfd2023@ perLoc.pwd=Cfd2023@
corp.default.pic-path=https://qgqy.qhdsafety.com/ corp.default.pic-path=https://wwag.qhdsafety.com/file/
corp.default.back-end-path=https://qgqy.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/ baseimgpath =https://wwag.qhdsafety.com/file/
cfd.prevention.api.url=http://192.168.0.31:7021/qa-regulatory-cfd cfd.prevention.api.url=http://192.168.0.31:7021/qa-regulatory-cfd