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

svr/svr-iot/src/main/java/com/yihu/iot/controller/monitorPlatform/MonitorPlatformController.java

@@ -676,17 +676,14 @@ public class MonitorPlatformController extends EnvelopRestEndpoint {
        return success( iotPatientDeviceService.getNameAndCode(idCard,snCode));
    }
    @RequestMapping(value="/getEquipmentDetail",method = RequestMethod.GET)
    @GetMapping(value="/getEquipmentDetail")
    @ApiOperation("健康小屋详情")
    public String getjkxwxqy(@RequestParam(value = "deviceSn",required = true)
    public Envelop getEquipmentDetail(@RequestParam(value = "deviceSn",required = true)
                             @ApiParam(name="deviceSn",value ="设备SN码",required = true)String deviceSn){
        try {
            return monitorPlatformService.getEquipmentDetail(deviceSn);
        }catch (Exception e){
            e.printStackTrace();
            return error(-1,"查询失败");
        }
        return success(monitorPlatformService.getEquipmentDetail(deviceSn));
    }
}

svr/svr-iot/src/main/java/com/yihu/iot/service/monitorPlatform/MonitorPlatformService.java

@@ -965,10 +965,17 @@ public class MonitorPlatformService  {
    /**
     * 返回健康小屋详情信息
     */
    public String getEquipmentDetail(String deviceSn){
        IotEquipmentDetailDO iotEquipmentDetailDO= iotEquipmentDetailDao.findByDeviceCode(deviceSn);
        JSONObject obj = (JSONObject)JSONObject.toJSON(iotEquipmentDetailDO);
        obj.put("deviceSn",iotEquipmentDetailDO.getDeviceCode());
        return obj.toString();
    public JSONObject getEquipmentDetail(String deviceSn){
        try {
            IotEquipmentDetailDO iotEquipmentDetailDO= iotEquipmentDetailDao.findByDeviceCode(deviceSn);
            JSONObject obj = (JSONObject)JSONObject.toJSON(iotEquipmentDetailDO);
            obj.put("deviceSn",iotEquipmentDetailDO.getDeviceCode());
            return obj;
        }catch (Exception e){
            e.printStackTrace();
            return null;
        }
    }
}