diff --git a/src/main/java/com/zcloud/controller/keyProjects/app/AppKeyprojectCheckController.java b/src/main/java/com/zcloud/controller/keyProjects/app/AppKeyprojectCheckController.java index 4c50ff62..d6d0e281 100644 --- a/src/main/java/com/zcloud/controller/keyProjects/app/AppKeyprojectCheckController.java +++ b/src/main/java/com/zcloud/controller/keyProjects/app/AppKeyprojectCheckController.java @@ -99,7 +99,7 @@ public class AppKeyprojectCheckController extends BaseController { hidden.put("HIDDENPART", json.getString("HIDDENPART")); //隐患部位 hidden.put("HIDDENLEVEL", json.getString("HIDDENLEVEL")); //隐患级别 hidden.put("HIDDENTYPE", json.getString("HIDDENTYPE")); //隐患类型1 - hidden.put("HIDDENTYPE2", json.getString("HIDDENTYPE2")); //隐患类型2 + hidden.put("HIDDENTYPE2", json.getString("HIDDENTYPE2_NAME")); //隐患类型2 hidden.put("LONGITUDE", json.getString("LONGITUDE")); //隐患位置经度 hidden.put("LATITUDE", json.getString("LATITUDE")); //隐患位置纬度 hidden.put("DISCOVERYTIME", json.getString("DISCOVERYTIME")); //隐患发现时间 diff --git a/src/main/resources/application-dev.properties b/src/main/resources/application-dev.properties index df22d1dc..17b3cfa2 100644 --- a/src/main/resources/application-dev.properties +++ b/src/main/resources/application-dev.properties @@ -60,6 +60,7 @@ spring.main.banner-mode=off #qa-regulatory-gwj.api.url=http://192.168.0.79:8008 preventionxgf.api.url=http://39.100.115.58:8082/qa-prevention-xgf/ qa-regulatory-gwj.api.url=http://39.100.115.58:8081/qa-regulatory-gwj/ +dw.url=http://192.168.192.201:8888/qa-dingWei-gwj/ #????? smb.host=39.101.130.96 smb.port=22 diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 8df26410..53b8d5ba 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -2,9 +2,9 @@ spring.application.name=qa-prevention-gwj server.port=8091 #?? -spring.profiles.active=me +#spring.profiles.active=me #����31ʱʹ�� -#spring.profiles.active=dev +spring.profiles.active=dev #?? #spring.profiles.active=master