代码修改

common/common-entity/sql记录

@@ -1089,4 +1089,7 @@ ALTER table base.base_business_order_pay add column last_pay_time BIGINT(13) COM
ALTER table base.base_business_order_pay add INDEX index_status_last_pay(status,last_pay_time)
-- 2021-07-12
ALTER table base.dm_device add column need_register tinyint(2) DEFAULT '0' COMMENT '是否需要注册 0否 1是'
ALTER table base.dm_device add column need_register tinyint(2) DEFAULT '0' COMMENT '是否需要注册 0否 1是'
-- 2021-07-12 lb
ALTER table base.dm_device modify column need_register varchar(255) DEFAULT NULL COMMENT '注册至iot接口，为空表示不注册'

common/common-entity/src/main/java/com/yihu/jw/entity/care/device/Device.java

@@ -27,7 +27,7 @@ public class Device extends IdEntity {
	private Date czrq;
	private String del;
	private String serviceTopic;//设备所属专题 防走失 preventLost
	private Integer needRegister;//设备是否注册iot(脉搏波血压计)
	private String needRegister;//设备是否注册iot(脉搏波血压计)
	@Column(name="category_code")
	public String getCategoryCode() {
@@ -119,11 +119,11 @@ public class Device extends IdEntity {
		this.serviceTopic = serviceTopic;
	}
	public Integer getNeedRegister() {
	public String getNeedRegister() {
		return needRegister;
	}
	public void setNeedRegister(Integer needRegister) {
	public void setNeedRegister(String needRegister) {
		this.needRegister = needRegister;
	}
}

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/service/device/DeviceDetailService.java

@@ -199,12 +199,12 @@ public class DeviceDetailService extends BaseJpaService<DeviceDetail, DeviceDeta
	public void registerToWlyy(DevicePatientDevice device){
		//判断设备类型
		Device deviceDO = deviceDao.findOne(device.getDeviceId());
		if (1==deviceDO.getNeedRegister()){
		if (StringUtils.isNotBlank(deviceDO.getNeedRegister())){
			// 设备注册至iot后 通过iot将设备数据转发
			String url = "http://www.cityihealth.com:43210/deviceManage/register";
			List<NameValuePair> params = new ArrayList<>();
			params.add(new BasicNameValuePair("deviceSN", device.getDeviceSn()));
			params.add(new BasicNameValuePair("pushAddress", cloudDeviceUrl));
			params.add(new BasicNameValuePair("pushAddress", cloudDeviceUrl+"/"+deviceDO.getNeedRegister()));
			String response = httpClientUtil.post(url, params,"UTF-8");
			//注册日志
		}