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

svr/svr-iot/src/main/java/com/yihu/iot/controller/third/ThirdDataInputController.java

@@ -74,6 +74,7 @@ public class ThirdDataInputController {
        } catch (ServiceException e){
            return Envelop.getError(e.getMessage());
        } catch (Exception e){
            System.out.println("deviceRegistration="+jsonData);
            e.printStackTrace();
            return Envelop.getError("设备注册失败");
        }
@@ -98,8 +99,9 @@ public class ThirdDataInputController {
        } catch (ServiceException e){
            return Envelop.getError(e.getMessage());
        } catch (Exception e){
            System.out.println("uploadDeviceData="+jsonData);
            e.printStackTrace();
            return Envelop.getError("上传设备失败");
            return Envelop.getError("上传设备失败,请检查data是否过长。");
        }
    }
@@ -122,6 +124,7 @@ public class ThirdDataInputController {
        } catch (ServiceException e){
            return Envelop.getError(e.getMessage());
        } catch (Exception e){
            System.out.println("uploadDeviceInfo="+jsonData);
            e.printStackTrace();
            return Envelop.getError("设备状态信息上传失败");
        }

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

@@ -183,13 +183,13 @@ public class DataInputService {
        if(StringUtils.isBlank(data)){
            throw new ServiceException("设备数据data不能为空");
        }
        if(data.length()>60000){
            throw new ServiceException("设备数据data超过最大允许字符");
        }
        String categoryCode = jsonObject.getString("categoryCode");
        if(StringUtils.isBlank(hospital)){
            throw new ServiceException("设备类型不能为空");
        }
//        if(data.length()>60000){
//            throw new ServiceException("设备数据data超过最大允许字符");
//        }
//        String categoryCode = jsonObject.getString("categoryCode");
//        if(StringUtils.isBlank(categoryCode)){
//            throw new ServiceException("设备类型不能为空");
//        }
        IotDeviceDO iotDeviceDO = iotDeviceService.findByDeviceSn(deviceSn);
        if(iotDeviceDO==null){
            throw new ServiceException("请先注册设备后在上传");
@@ -199,7 +199,7 @@ public class DataInputService {
            recordDO.setDeviceSn(deviceSn);
            recordDO.setHospital(hospital);
            recordDO.setJsonData(data);
            recordDO.setCategoryCode(categoryCode);
            recordDO.setCategoryCode("uploadDeviceData");
            recordDO.setStatus(0);
            recordDO.setCreateTime(new Date());
            iotDeviceUploadRecordDao.save(recordDO);

svr/svr-iot/src/main/java/com/yihu/iot/interceptor/GateWayInterceptor.java

@@ -59,6 +59,7 @@ public class GateWayInterceptor implements HandlerInterceptor {
                BaseResultModel baseResultModel = new BaseResultModel(BaseResultModel.statusEm.token_null.getCode(), BaseResultModel.statusEm.token_null.getMessage());
                response.getOutputStream().write(JSONObject.toJSONString(baseResultModel).getBytes());
                flag = false;
                return false;
            }
            GcToken gcToken = gcTokenDaoDao.findByToken(accesstoken);
            if (gcToken == null) {
@@ -67,6 +68,7 @@ public class GateWayInterceptor implements HandlerInterceptor {
                BaseResultModel baseResultModel = new BaseResultModel(BaseResultModel.statusEm.token_no_power.getCode(), BaseResultModel.statusEm.token_no_power.getMessage());
                response.getOutputStream().write(JSONObject.toJSONString(baseResultModel).getBytes());
                flag = false;
                return false;
            }
            if (gcToken.getDel() == null || gcToken.getDel() == 0) {
                saveHttpLog(ip, JSONObject.toJSONString(request.getParameterMap()), null, accesstoken, request.getRequestURI(), GcHttpLog.flagEm.error.getCode(), BaseResultModel.statusEm.token_out_effect.getMessage());
@@ -74,6 +76,7 @@ public class GateWayInterceptor implements HandlerInterceptor {
                BaseResultModel baseResultModel = new BaseResultModel(BaseResultModel.statusEm.token_out_effect.getCode(), BaseResultModel.statusEm.token_out_effect.getMessage());
                response.getOutputStream().write(JSONObject.toJSONString(baseResultModel).getBytes());
                flag = false;
                return false;
            }
            if (System.currentTimeMillis() > gcToken.getOutTime().getTime()) {
                saveHttpLog(ip, JSONObject.toJSONString(request.getParameterMap()), null, accesstoken, request.getRequestURI(), GcHttpLog.flagEm.error.getCode(), BaseResultModel.statusEm.token_out_time.getMessage());
@@ -81,6 +84,7 @@ public class GateWayInterceptor implements HandlerInterceptor {
                BaseResultModel baseResultModel = new BaseResultModel(BaseResultModel.statusEm.token_out_time.getCode(), BaseResultModel.statusEm.token_out_time.getMessage());
                response.getOutputStream().write(JSONObject.toJSONString(baseResultModel).getBytes());
                flag = false;
                return false;
            }
        } catch (Exception e) {
            saveHttpLog(ip, JSONObject.toJSONString(request.getParameterMap()), null, accesstoken, request.getRequestURI(), GcHttpLog.flagEm.error.getCode(), e.getMessage());