Browse Source

KERNEL-1117 再次进行修改

master
Kalven 5 years ago
parent
commit
3497c80e25
  1. 10
      src/main/java/com/fanruan/api/cal/CalculatorKit.java
  2. 13
      src/main/java/com/fanruan/api/cal/namespace/SimpleCellValueNameSpaceKit.java
  3. 10
      src/main/java/com/fanruan/api/function/AVERAGE.java
  4. 10
      src/main/java/com/fanruan/api/function/CHAR.java
  5. 10
      src/main/java/com/fanruan/api/function/COUNT.java
  6. 10
      src/main/java/com/fanruan/api/function/DATE.java
  7. 10
      src/main/java/com/fanruan/api/function/MAX.java
  8. 10
      src/main/java/com/fanruan/api/function/MIN.java
  9. 10
      src/main/java/com/fanruan/api/function/RANGE.java
  10. 10
      src/main/java/com/fanruan/api/function/SUM.java
  11. 10
      src/main/java/com/fanruan/api/function/TIME.java
  12. 1
      src/main/java/com/fanruan/api/log/LogKit.java
  13. 18
      src/main/java/com/fanruan/api/plugin/ExtraClassManagerKit.java

10
src/main/java/com/fanruan/api/cal/CalculatorKit.java

@ -5,6 +5,7 @@ import com.fanruan.api.session.SessionKit;
import com.fr.base.ParameterMapNameSpace; import com.fr.base.ParameterMapNameSpace;
import com.fr.base.TableDataNameSpace; import com.fr.base.TableDataNameSpace;
import com.fr.data.TableDataSource; import com.fr.data.TableDataSource;
import com.fr.report.core.namespace.SimpleCellValueNameSpace;
import com.fr.report.report.Report; import com.fr.report.report.Report;
import com.fr.script.Calculator; import com.fr.script.Calculator;
import com.fr.stable.StringUtils; import com.fr.stable.StringUtils;
@ -77,6 +78,7 @@ public class CalculatorKit {
return calculator; return calculator;
} }
/** /**
* 返回服务器数据集的算子空间可以通过调用calculator.pushNameSpace()将算子空间塞进算子实例从而支持服务器数据集相关的函数计算 * 返回服务器数据集的算子空间可以通过调用calculator.pushNameSpace()将算子空间塞进算子实例从而支持服务器数据集相关的函数计算
* @return 算子空间对象 * @return 算子空间对象
@ -84,4 +86,12 @@ public class CalculatorKit {
public static NameSpace getServerTableDataNameSpace(){ public static NameSpace getServerTableDataNameSpace(){
return TableDataNameSpace.getInstance(); return TableDataNameSpace.getInstance();
} }
/**
* 单例模式SimpleCellValueNameSpace
* @return SimpleCellValueNameSpace实例对象
*/
public static NameSpace createSimpleCellValueNameSpace() {
return SimpleCellValueNameSpace.getInstance();
}
} }

13
src/main/java/com/fanruan/api/cal/namespace/SimpleCellValueNameSpaceKit.java

@ -1,13 +0,0 @@
package com.fanruan.api.cal.namespace;
import com.fr.report.core.namespace.SimpleCellValueNameSpace;
public class SimpleCellValueNameSpaceKit {
/**
* 单例模式SimpleCellValueNameSpace
* @return SimpleCellValueNameSpace实例对象
*/
public static SimpleCellValueNameSpace getInstance() {
return SimpleCellValueNameSpace.getInstance();
}
}

10
src/main/java/com/fanruan/api/function/AVERAGE.java

@ -1,10 +0,0 @@
package com.fanruan.api.function;
/**
* 基本函数求平均值
* @author Kalven
* @version 10.0
* Created by Kalven on 2019/8/31
*/
public class AVERAGE extends com.fr.function.AVERAGE {
}

10
src/main/java/com/fanruan/api/function/CHAR.java

@ -1,10 +0,0 @@
package com.fanruan.api.function;
/**
* 基本函数求ASCII码对应的字符
* @author Kalven
* @version 10.0
* Created by Kalven on 2019/8/31
*/
public class CHAR extends com.fr.function.CHAR {
}

10
src/main/java/com/fanruan/api/function/COUNT.java

@ -1,10 +0,0 @@
package com.fanruan.api.function;
/**
* 基本函数计算区域内所含项的个数
* @author Kalven
* @version 10.0
* Created by Kalven on 2019/8/31
*/
public class COUNT extends com.fr.function.COUNT {
}

10
src/main/java/com/fanruan/api/function/DATE.java

@ -1,10 +0,0 @@
package com.fanruan.api.function;
/**
* 基本函数获取一个表示某一特定日期的系列数
* @author Kalven
* @version 10.0
* Created by Kalven on 2019/8/31
*/
public class DATE extends com.fr.function.DATE {
}

10
src/main/java/com/fanruan/api/function/MAX.java

@ -1,10 +0,0 @@
package com.fanruan.api.function;
/**
* 基本函数求最大值
* @author Kalven
* @version 10.0
* Created by Kalven on 2019/8/31
*/
public class MAX extends com.fr.function.MAX {
}

10
src/main/java/com/fanruan/api/function/MIN.java

@ -1,10 +0,0 @@
package com.fanruan.api.function;
/**
* 基本函数求最小值
* @author Kalven
* @version 10.0
* Created by Kalven on 2019/8/31
*/
public class MIN extends com.fr.function.MIN {
}

10
src/main/java/com/fanruan/api/function/RANGE.java

@ -1,10 +0,0 @@
package com.fanruan.api.function;
/**
* 基本函数取范围内满足条件的数据序列
* @author Kalven
* @version 10.0
* Created by Kalven on 2019/8/31
*/
public class RANGE extends com.fr.function.RANGE {
}

10
src/main/java/com/fanruan/api/function/SUM.java

@ -1,10 +0,0 @@
package com.fanruan.api.function;
/**
* 基本函数求和
* @author Kalven
* @version 10.0
* Created by Kalven on 2019/8/31
*/
public class SUM extends com.fr.function.SUM {
}

10
src/main/java/com/fanruan/api/function/TIME.java

@ -1,10 +0,0 @@
package com.fanruan.api.function;
/**
* 基本函数求代表指定时间的小数
* @author Kalven
* @version 10.0
* Created by Kalven on 2019/8/31
*/
public class TIME extends com.fr.function.TIME {
}

1
src/main/java/com/fanruan/api/log/LogKit.java

@ -1,6 +1,5 @@
package com.fanruan.api.log; package com.fanruan.api.log;
import com.fr.general.FRLogger;
import com.fr.log.FineLoggerFactory; import com.fr.log.FineLoggerFactory;
/** /**

18
src/main/java/com/fanruan/api/plugin/ExtraClassManagerKit.java

@ -1,18 +0,0 @@
package com.fanruan.api.plugin;
import com.fr.plugin.ExtraClassManager;
/**
* @author Kalven
* @version 10.0
* Created by Kalven on 2019/8/31
*/
public class ExtraClassManagerKit {
/**
* 获取ExtraClassManager实例
* @return ExtraClassManager实例
*/
public static ExtraClassManager getInstance() {
return ExtraClassManager.getInstance();
}
}
Loading…
Cancel
Save