代码修改

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

@@ -99,7 +99,7 @@ public class ThirdDataInputController {
            return Envelop.getError(e.getMessage());
        } catch (Exception e){
            e.printStackTrace();
            return Envelop.getError("上传设备失败");
            return Envelop.getError("上传设备失败,请检查data是否过长。");
        }
    }

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

@@ -183,9 +183,9 @@ public class DataInputService {
        if(StringUtils.isBlank(data)){
            throw new ServiceException("设备数据data不能为空");
        }
        if(data.length()>60000){
            throw new ServiceException("设备数据data超过最大允许字符");
        }
//        if(data.length()>60000){
//            throw new ServiceException("设备数据data超过最大允许字符");
//        }
//        String categoryCode = jsonObject.getString("categoryCode");
//        if(StringUtils.isBlank(categoryCode)){
//            throw new ServiceException("设备类型不能为空");

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());