Merge branch 'master' of http://dlindusit.com:53929/r/iailab-plat

 iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mdk/sample/SampleInfoConstructor.java

@@ -81,7 +81,7 @@
                dateTime = calculateTime(originalTime, true, columnItem.getDataLength(), columnItem.getGranularity());
                break;
            case PLAN:
                dateTime = calculateTime(originalTime, true, columnItem.getDataLength() + 1, columnItem.getGranularity());
                dateTime = originalTime;
                break;
            case IND:
            case IND_ASCII:
@@ -114,7 +114,7 @@
                dateTime = calculateTime(originalTime, true, 1, columnItem.getGranularity());
                break;
            case PLAN:
                dateTime = calculateTime(originalTime, true, 1, columnItem.getGranularity());
                dateTime = calculateTime(originalTime, false, columnItem.getDataLength()-1, columnItem.getGranularity());
                break;
            case IND:
            case IND_ASCII:

 iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mpk/controller/admin/MdkController.java

@@ -137,7 +137,10 @@
                return error(GlobalErrorCodeConstants.BAD_REQUEST.getCode(),"模型设置错误，请检查！");
            }

            log.info("#######################测试运行模型 " + dto.getPyName() + " ##########################");
            log.info("参数： " + JSON.toJSONString(paramsValueArray));
            HashMap result = (HashMap) clazz.getDeclaredMethod(dto.getMethodName(), paramsArray).invoke(clazz.newInstance(), paramsValueArray);
            log.info("model test run result:" + result);
            return success(JSON.toJSONString(result));
        } catch (Exception ex) {
            ex.printStackTrace();