Merge branch 'dev' of http://192.168.1.220:10080/Amoy2/wlyy2.0 into dev

# Conflicts:
#	svr/svr-cloud-care/src/main/java/com/yihu/jw/care/service/label/PatientLableService.java

common/common-entity/sql记录

@@ -1346,9 +1346,6 @@ CREATE TABLE `base_hvdevice_sos_log` (
  PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='烟感气感设备报警日志记录表';
ALTER table `base`.`wlyy_devices` add column `device_type` tinyint(2) DEFAULT NULL COMMENT '设备种类 0健康设备 1安防设备'
-- 20210819
alter table wlyy_devices add COLUMN device_type TINYINT(2) default null COMMENT '设备种类 0健康设备 1安防设备';
alter table wlyy_patient_device add COLUMN device_type TINYINT(2) default null COMMENT '设备种类 0健康设备 1安防设备';

svr/svr-cloud-device/src/main/java/com/yihu/jw/care/util/ArtemisPostTest.java

@@ -121,8 +121,8 @@ public class ArtemisPostTest {
		//回调URL	postUrl	String	是
		JSONObject jsonBody = new JSONObject();
		jsonBody.put("msgType", msgType);
		jsonBody.put("postUrl", "http://ehr.yihu.com/wlyy/aqg/hvdevice/messageNotification");
		//http://ehr.yihu.com/wlyy/aqg/device/byOnlineStatus
		jsonBody.put("postUrl", "https://zhyzh.gongshu.gov.cn/device/hvdevice/messageNotification");
		//https://zhyzh.gongshu.gov.cn/device
		//http://ehr.yihu.com/wlyy/aqg
		String body = jsonBody.toJSONString();
		String StringeResult = callPostStringApi(url,body);
@@ -132,11 +132,11 @@ public class ArtemisPostTest {
	/**
	 * 修改订阅
	 */
	public void subscription_update(){
	public static void subscription_update(String msgType){
		String url = "/api/firepro/v1/subscription/update";
		JSONObject jsonBody = new JSONObject();
		jsonBody.put("pageNo", 1);
		jsonBody.put("pageSize", 3);
		jsonBody.put("msgType", msgType);
		jsonBody.put("postUrl", "https://zhyzh.gongshu.gov.cn/device/hvdevice/messageNotification");
		String body = jsonBody.toJSONString();
		String StringeResult = callPostStringApi(url,body);
		System.out.println("StringeResult结果示例: "+StringeResult);
@@ -252,24 +252,24 @@ public class ArtemisPostTest {
//		getDevice();
//		getMonitor();
//		subscription_info("980001");
//		subscription_info("980002");
//		subscription_info("980003");
//		subscription_info("980004");
//		subscription_info("980005");
//		subscription_info("980006");
//		subscription_info("980007");
//		subscription_info("980008");
		addDevice("可燃气体探测器","867070036127251",2);
		addDevice("可燃气体探测器","867070036223175",2);
		addDevice("可燃气体探测器","867070036131121",2);
		addDevice("可燃气体探测器","867070036312564",2);
//		subscription_update("980001");
		subscription_update("980002");
		subscription_update("980003");
		subscription_update("980004");
		subscription_update("980005");
		subscription_update("980006");
		subscription_update("980007");
		subscription_update("980008");
		addDevice("火灾探测报警器","863409057775073",1);
		addDevice("火灾探测报警器","863409057781162",1);
		addDevice("火灾探测报警器","863409057781261",1);
		addDevice("火灾探测报警器","863409057781113",1);
//		addDevice("可燃气体探测器","867070036127251",2);
//		addDevice("可燃气体探测器","867070036223175",2);
//		addDevice("可燃气体探测器","867070036131121",2);
//		addDevice("可燃气体探测器","867070036312564",2);
//
//		addDevice("火灾探测报警器","863409057775073",1);
//		addDevice("火灾探测报警器","863409057781162",1);
//		addDevice("火灾探测报警器","863409057781261",1);
//		addDevice("火灾探测报警器","863409057781113",1);
	}
}

svr/svr-cloud-device/src/main/resources/application.yml

@@ -325,7 +325,7 @@ wechat:
  flag: false #演示环境  true走Mysql数据库  false走Oracle
im:
  im_list_get: http://127.0.0.0:3000/
  im_list_get: http://127.0.0.1:3000/
  data_base_name: im_internet_hospital
es:
  pwflag: 1 # 1需要密码，2不需要密码