配置各个所是否需要给daping发请求

gdg

2020-11-04 6bb65ce4dfa895aade2172a1813d7e1298fd781a

配置各个所是否需要给daping发请求

 src/main/java/com/nanometer/smartlab/service/InterfaceServiceImpl.java

@@ -1419,7 +1419,8 @@
                    content += "柜门未关";
                }
                //给daping系统发送信息
                if("1".equals(warningId) || "2".equals(warningId)|| "6".equals(warningId)) {

                if("".equals(alarmUrl) && ("1".equals(warningId) || "2".equals(warningId)|| "6".equals(warningId)) ) {
                    JSONObject json = new JSONObject();
                    json.put("barCode", location.get("barCode"));
                    json.put("type", alarmType);

 src/main/java/com/nanometer/smartlab/service/SysWarningServiceImpl.java

@@ -84,7 +84,7 @@
            params.put("id", selectedWarning.getId());
            //给大屏信息发送处理信息
            //页面只允许修改完成转台
            if (StringUtils.isNotBlank(selectedWarning.getAlarmId())){
            if (StringUtils.isNotBlank(selectedWarning.getAlarmId()) && StringUtils.isNotBlank(alarmUrl)){
                JSONObject json=new JSONObject();
                json.put("dataType", "data");
                    json.put("id", selectedWarning.getAlarmId());

 src/main/webapp/WEB-INF/config.properties

@@ -46,8 +46,9 @@

#\uFFFD\uFFFD\uFFFD\uFFFD\u0524\uFFFD\uFFFD
#\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u00F2\uFFFD\uFFFD\uFFFD
alarm.url = ${institute.url}/daping/sendWarnInfo.json
#alarm.url = ${institute.url}/daping/sendWarnInfo.json
alarm.type = smartlab
alarm.url = ${alarm.url}


institute.id = ${institute.id}

 src/main/webapp/WEB-INF/gcs/gcs.properties

@@ -1,9 +1,10 @@
jdbc.url=jdbc:mysql://localhost:3306/smartlabdb?useUnicode=true&characterEncoding=utf-8&autoReconnect=true
jdbc.username=root
jdbc.password=Sinanoaq#415
#Öйú¿ÆѧԺ±±¾©¹ý³Ì¹¤³ÌÑо¿Ëù
#\uFFFD\u0439\uFFFD\uFFFD\uFFFD\u0467\u053A\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u0339\uFFFD\uFFFD\uFFFD\uFFFD\u043E\uFFFD\uFFFD\uFFFD
institute.id = 11
institute.name = \u4e2d\u56fd\u79d1\u5b66\u9662\u5317\u4eac\u8fc7\u7a0b\u5de5\u7a0b\u7814\u7a76\u6240
institute.name = \u4E2D\u56FD\u79D1\u5B66\u9662\u5317\u4EAC\u8FC7\u7A0B\u5DE5\u7A0B\u7814\u7A76\u6240
institute.url  = http://gcs.sinanoaq.com
institute.app.id = wx7ab4d938ce5ce618
institute.app.secret = c66b740b60220698570767c807361d3a
alarm.url =

 src/main/webapp/WEB-INF/hws/hws.properties

@@ -1,9 +1,10 @@
jdbc.url=jdbc:mysql://localhost:3306/smartlabdb?useUnicode=true&characterEncoding=utf-8&autoReconnect=true
jdbc.username=root
jdbc.password=Sinanoaq#415
#Öйú¿ÆѧԺ´óÁ¬»¯Ñ§ÎïÀíÑо¿Ëùtest.properties
#\uFFFD\u0439\uFFFD\uFFFD\uFFFD\u0467\u053A\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u0467\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u043E\uFFFD\uFFFD\uFFFDtest.properties
institute.id = 9
institute.name = \u4e2d\u56fd\u79d1\u5b66\u9662\u5927\u8fde\u5316\u5b66\u7269\u7406\u7814\u7a76\u6240
institute.name = \u4E2D\u56FD\u79D1\u5B66\u9662\u5927\u8FDE\u5316\u5B66\u7269\u7406\u7814\u7A76\u6240
institute.url  = http://hws.sinanoaq.com
institute.app.id = wx7ab4d938ce5ce618
institute.app.secret = c66b740b60220698570767c807361d3a
institute.app.secret = c66b740b60220698570767c807361d3a
alarm.url =

 src/main/webapp/WEB-INF/lhs/lhs.properties

@@ -1,9 +1,10 @@
jdbc.url=jdbc:mysql://localhost:3306/smartlabdb?useUnicode=true&characterEncoding=utf-8&autoReconnect=true
jdbc.username=root
jdbc.password=Sinanoaq#415
#Öйú¿ÆѧԺн®Àí»¯¼¼ÊõÑо¿Ëù
#\uFFFD\u0439\uFFFD\uFFFD\uFFFD\u0467\u053A\uFFFD\u00BD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u043E\uFFFD\uFFFD\uFFFD
institute.id = 12
institute.name = \u4e2d\u56fd\u79d1\u5b66\u9662\u65b0\u7586\u7406\u5316\u6280\u672f\u7814\u7a76\u6240
institute.name = \u4E2D\u56FD\u79D1\u5B66\u9662\u65B0\u7586\u7406\u5316\u6280\u672F\u7814\u7A76\u6240
institute.url  = http://lhs.sinanoaq.com
institute.app.id = wxc1c97c50f32a13f9
institute.app.secret = fc932330d22c3bc8e94b9f9b790fec98
alarm.url = http://lhs.sinanoaq.com/daping/sendWarnInfo.json

 src/main/webapp/WEB-INF/sds/sds.properties

@@ -1,9 +1,10 @@
jdbc.url=jdbc:mysql://localhost:3306/smartlabdb?useUnicode=true&characterEncoding=utf-8&autoReconnect=true
jdbc.username=root
jdbc.password=Sinanoaq#415
#Öйú¿ÆѧԺн®Éú̬ÓëµØÀíÑо¿Ëù
#\uFFFD\u0439\uFFFD\uFFFD\uFFFD\u0467\u053A\uFFFD\u00BD\uFFFD\uFFFD\uFFFD\u032C\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u043E\uFFFD\uFFFD\uFFFD
institute.id = 9
institute.name = \u4e2d\u56fd\u79d1\u5b66\u9662\u65b0\u7586\u751f\u6001\u4e0e\u5730\u7406\u7814\u7a76\u6240
institute.name = \u4E2D\u56FD\u79D1\u5B66\u9662\u65B0\u7586\u751F\u6001\u4E0E\u5730\u7406\u7814\u7A76\u6240
institute.url  = http://sds.sinanoaq.com
institute.app.id = wx33de06d906c68d43
institute.app.secret = 0170d9126bcd16bda4f171bc4a33251f
institute.app.secret = 0170d9126bcd16bda4f171bc4a33251f
alarm.url = http://sds.sinanoaq.com/daping/sendWarnInfo.json

 src/main/webapp/WEB-INF/sin/sin.properties

@@ -1,9 +1,10 @@
jdbc.url=jdbc:mysql://120.77.153.67:3306/smartlabdb?useUnicode=true&characterEncoding=utf-8&autoReconnect=true
jdbc.username=wzjy
jdbc.password=!wzjy#01
#ÄÉÃ×Ëù
#\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD
institute.id = 2
institute.name = \u4e2d\u56fd\u79d1\u5b66\u9662\u82cf\u5dde\u7eb3\u7c73\u6280\u672f\u4e0e\u7eb3\u7c73\u4eff\u751f\u7814\u7a76\u6240
institute.name = \u4E2D\u56FD\u79D1\u5B66\u9662\u82CF\u5DDE\u7EB3\u7C73\u6280\u672F\u4E0E\u7EB3\u7C73\u4EFF\u751F\u7814\u7A76\u6240
institute.url  = http://sinanoaq.com
institute.app.id = wx81a00e3350861b25
institute.app.secret = c307d394875af2cbbe25e01b9e43dcb2
alarm.url = http://sinanoaq.com/daping/sendWarnInfo.json

 src/main/webapp/WEB-INF/test/test.properties

@@ -1,9 +1,10 @@
jdbc.url=jdbc:mysql://localhost:3306/smartlabdb?useUnicode=true&characterEncoding=utf-8&autoReconnect=true
jdbc.username=root
jdbc.password=123456
#ÄÉÃ×Ëù
#\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD
institute.id = 2
institute.name = \u4e2d\u56fd\u79d1\u5b66\u9662\u82cf\u5dde\u7eb3\u7c73\u6280\u672f\u4e0e\u7eb3\u7c73\u4eff\u751f\u7814\u7a76\u6240
institute.name = \u4E2D\u56FD\u79D1\u5B66\u9662\u82CF\u5DDE\u7EB3\u7C73\u6280\u672F\u4E0E\u7EB3\u7C73\u4EFF\u751F\u7814\u7A76\u6240
institute.url  = http://sinanoaq.com
institute.app.id = wx81a00e3350861b25
institute.app.secret = c307d394875af2cbbe25e01b9e43dcb2
alarm.url =