Merge branch 'dev' of LiTaohong/jw2.0 into dev

common/common-rest-model/src/main/java/com/yihu/jw/restmodel/iot/datainput/DataBodySignsVO.java

@@ -15,21 +15,24 @@ import java.util.List;
@ApiModel
public class DataBodySignsVO {
    @ApiModelProperty(value = "访问token",example = "",hidden = true)
    private String access_token; //访问token
    @ApiModelProperty(value = "数据来源",example = "iHealth",hidden = true)
    private String data_source; //数据来源
    @ApiModelProperty(value = "设备序列码",example = "65746176875",hidden = true)
    private String sn;          //设备序列码
    @ApiModelProperty(value = "设备数据识别代码",hidden = true)
    @ApiModelProperty(value = "设备数据识别代码",example = "1/0",hidden = true)
    private String ext_code;    //设备A，B键，取值为0,1，代表绑定不同的用户，
    @ApiModelProperty(value = "设备名称",hidden = true)
    @ApiModelProperty(value = "设备名称",example = "血压计",hidden = true)
    private String device_name; //设备名称
    @ApiModelProperty(value = "设备型号",hidden = true)
    @ApiModelProperty(value = "设备型号",example = "",hidden = true)
    private String device_model;//设备型号
    private List<DataVO> data;    //设备所测量的数据内容
    @ApiModelProperty(value = "身份证号",hidden = true)
    @ApiModelProperty(value = "身份证号",example = "350122198601145513",hidden = true)
    private String idCard;      //设备绑定的用户身份证号
    @ApiModelProperty(value = "用户名",hidden = true)
    @ApiModelProperty(value = "用户名",example = "谢挺盛",hidden = true)
    private String username;    //用户名
    @ApiModelProperty(value = "用户code",hidden = true)
    @ApiModelProperty(value = "用户code",example = "443a196ef8744536a531260eb26c05d7",hidden = true)
    private String usercode;    //用户在系统中的code，唯一识别
    public String getAccess_token() {

common/common-rest-model/src/main/java/com/yihu/jw/restmodel/iot/datainput/StepInfoVO.java

@@ -9,9 +9,9 @@ import java.util.List;
@JsonInclude(JsonInclude.Include.NON_NULL)
public class StepInfoVO {
    @ApiModelProperty(value = "时间戳",hidden = true)
    @ApiModelProperty(value = "时间戳",example = "yyyy-MM-dd HH:mm:ss",hidden = true)
    private String timestamp;
    @ApiModelProperty(value = "运动步数",hidden = true)
    @ApiModelProperty(value = "运动步数",example = "到某一时刻走了多少步",hidden = true)
    private Integer step;
    public String getTimestamp() {

svr/svr-iot/src/main/java/com/yihu/iot/datainput/controller/DataInputController.java

@@ -17,7 +17,7 @@ import org.springframework.web.bind.annotation.RestController;
@RestController
@RequestMapping(DataRequestMapping.api_iot_common)
@Api(value = "数据上传操作", description = "数据上传操作")
@Api(tags = "数据上传操作", description = "数据上传操作")
public class DataInputController {
    @Autowired

svr/svr-iot/src/main/java/com/yihu/iot/datainput/controller/DataSearchController.java

@@ -17,7 +17,7 @@ import org.springframework.web.bind.annotation.*;
@RestController
@RequestMapping(DataRequestMapping.api_iot_common)
@Api(value = "数据查询操作", description = "数据查询操作")
@Api(tags = "数据查询操作", description = "数据查询操作")
public class DataSearchController {
    @Autowired

svr/svr-iot/src/main/java/com/yihu/iot/datainput/controller/DataStandardConvertController.java

@@ -16,7 +16,7 @@ import org.springframework.web.bind.annotation.RestController;
@RestController
@RequestMapping(DataRequestMapping.api_iot_common)
@Api(value = "数据标准转换操作", description = "数据标准转换接口")
@Api(tags = "数据标准转换操作", description = "数据标准转换接口")
public class DataStandardConvertController {
    @Autowired

svr/svr-iot/src/main/java/com/yihu/iot/datainput/service/DataInputService.java

@@ -231,11 +231,11 @@ public class DataInputService {
        String extCode = dataBodySignsDO.getExt_code();
        //包含居民身份的数据，对设备数据进行校验绑定，此处包含的信息只有身份证号和用户名以及设备序列号，如果设备库中存在该序号的设备，则对绑定居民进行修改，改为当前居民，如果没有则跳过
        if(jsonObject.containsKey("idcard") && jsonObject.containsKey("username")){
        /*if(jsonObject.containsKey("idcard") && jsonObject.containsKey("username")){
            String idcard = jsonObject.getString("idcard");
            String username = jsonObject.getString("username");
            updateBindUser(dataSource,deviceSn,idcard,username);
        }
        }*/
        JSONArray jsonArray = jsonObject.getJSONArray("data");
        if(null == jsonArray || jsonArray.size() == 0){