Merge branch 'dev' of liubing/wlyy2.0 into dev

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/config/AqgConfig.java

@@ -44,6 +44,14 @@ public class AqgConfig {
     */
    public static final String X1_locations = baseUrl+"/api/locationdata/";
    /**
     * X1设备修改
     * 计步1小时 心率30分钟 定位15分钟
     * 计步数据开关、 睡眠开关、轨迹开关、 心率、血氧、血压定时测量开关
     */
    public static final String X1_deviceModify = baseUrl+"/api/device/{0}/4g/edit?frequency_location=15&frequency_step=60" +
            "&frequency_heartrate=30&pedometer_enable=1&sleep_enable=1&track_enable=1&heartrate_enable=1";
    /**
     * 睡眠带 修改心率呼吸率报警阈值
     */

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/endpoint/device/PadDeviceController.java

@@ -34,6 +34,7 @@ import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.time.DateUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Page;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
@@ -42,6 +43,8 @@ import java.io.InputStream;
import java.io.InputStreamReader;
import java.util.*;
import static java.lang.Thread.sleep;
/***
 * @ClassName: PadDeviceController
 * @Description:
@@ -66,6 +69,8 @@ public class PadDeviceController extends BaseController {
    private ContactsService contactsService;
    @Autowired
    private DeviceDetailDao deviceDetailDao;
    @Autowired
    private JdbcTemplate jdbcTemplate;
    /**
     * 设备列表获取
@@ -253,4 +258,32 @@ public class PadDeviceController extends BaseController {
        }
    }
    @RequestMapping(value ="open/updateX1Device",method = RequestMethod.GET)
    @ApiOperation(value = "批量修改爱牵挂手表设备信息")
    public String updateX1Device() {
        try {
            String sql = " select device_code from wlyy_devices wd where wd.category_code=4 ";
            List<String> deviceSns = jdbcTemplate.queryForList(sql,String.class);
            for (String deviceSn:deviceSns) {
                patientDeviceService.updateX1Device(deviceSn);
                sleep(2000);
            }
            System.out.println("MODIFY FINISH");
            return write(200, "获取成功", "data", "success");
        } catch (Exception e) {
            return errorResult(e);
        }
    }
    @RequestMapping(value ="open/updateX1DeviceBySn",method = RequestMethod.GET)
    @ApiOperation(value = "修改爱牵挂手表设备信息")
    public String updateX1DeviceBySn(@ApiParam(name = "deviceSn", value = "deviceSn", defaultValue = "deviceSn")
                                 @RequestParam(value = "deviceSn", required = true) String deviceSn) {
        try {
            patientDeviceService.updateX1Device(deviceSn);
            return write(200, "获取成功", "data", "success");
        } catch (Exception e) {
            return errorResult(e);
        }
    }
}

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

@@ -55,6 +55,8 @@ public class DeviceDetailService extends BaseJpaService<DeviceDetail, DeviceDeta
	private String cloudDeviceUrl;
	@Autowired
	private YsDeviceService ysDeviceService;
	@Autowired
	private	 PatientDeviceService patientDeviceService;
	/**
@@ -225,7 +227,14 @@ public class DeviceDetailService extends BaseJpaService<DeviceDetail, DeviceDeta
			params.add(new BasicNameValuePair("deviceSN", device.getDeviceSn()));
			params.add(new BasicNameValuePair("pushAddress", cloudDeviceUrl+deviceDO.getNeedRegister()));
			String response = httpClientUtil.post(url, params,"UTF-8");
			System.out.println("注册结果："+response);
			//注册日志
		}
		/**
		 * 手表信息修改
		 */
		if ("4".equals(device.getCategoryCode())){
			patientDeviceService.updateX1Device(device.getDeviceSn());
		}
	}
}

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

@@ -1954,6 +1954,27 @@ public class PatientDeviceService extends BaseJpaService<DevicePatientDevice, Pa
        return response.getBody();
    }
    /**
     * X1设备修改
     * 计步1小时 心率30分钟 定位15分钟
     * 计步数据开关、 睡眠开关、轨迹开关、 心率、血氧、血压定时测量开关
     */
    public  String updateX1Device(String deviceSn){
        String url =MessageFormat.format(AqgConfig.X1_deviceModify, deviceSn) ;
        Map<String,Object> headers = new HashMap<>();
        headers.put("Accept", MediaType.APPLICATION_JSON.toString());
        headers.put("Cookie", getCookie());
        String  responseStr = httpClientUtil.get(url,"utf-8",headers);
        com.alibaba.fastjson.JSONObject resObj = JSON.parseObject(responseStr);
        if (resObj.getBooleanValue("success")){
            System.out.println(deviceSn+":success");
        }else {
            System.out.println(deviceSn+":false--response"+responseStr);
        }
        return "success";
    }
    /******************************************* 爱牵挂设备end *****************************************************/
}