From 1ab42424ac6aa35af78787ba989819791b60c855 Mon Sep 17 00:00:00 2001
From: Rosie <3392418386@qq.com>
Date: Fri, 5 Mar 2021 16:26:46 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=AF=E5=88=A0=E8=87=AA=E5=AE=9A=E4=B9=89?=
 =?UTF-8?q?=E5=87=BD=E6=95=B0=EF=BC=8C=E6=81=A2=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/fr/function/CellSum.class   | Bin 0 -> 1118 bytes
 src/main/java/com/fr/function/CellSum.java    |  14 ++
 src/main/java/com/fr/function/DateDiff.class  | Bin 0 -> 2990 bytes
 src/main/java/com/fr/function/DateDiff.java   |  67 ++++++++
 .../java/com/fr/function/FlagHtmlColor.class  | Bin 0 -> 2365 bytes
 .../java/com/fr/function/FlagHtmlColor.java   |  67 ++++++++
 src/main/java/com/fr/function/IRR.class       | Bin 0 -> 4440 bytes
 src/main/java/com/fr/function/IRR.java        | 152 ++++++++++++++++++
 .../java/com/fr/function/ReportCheck.class    | Bin 0 -> 4591 bytes
 .../java/com/fr/function/ReportCheck.java     | 127 +++++++++++++++
 src/main/java/com/fr/function/StringCat.class | Bin 0 -> 840 bytes
 src/main/java/com/fr/function/StringCat.java  |  15 ++
 .../java/com/fr/function/StringImage.class    | Bin 0 -> 2436 bytes
 .../java/com/fr/function/StringImage.java     |  59 +++++++
 src/main/java/com/fr/function/Ubm.class       | Bin 0 -> 1336 bytes
 src/main/java/com/fr/function/Ubm.java        |  25 +++
 16 files changed, 526 insertions(+)
 create mode 100644 src/main/java/com/fr/function/CellSum.class
 create mode 100644 src/main/java/com/fr/function/CellSum.java
 create mode 100644 src/main/java/com/fr/function/DateDiff.class
 create mode 100644 src/main/java/com/fr/function/DateDiff.java
 create mode 100644 src/main/java/com/fr/function/FlagHtmlColor.class
 create mode 100644 src/main/java/com/fr/function/FlagHtmlColor.java
 create mode 100644 src/main/java/com/fr/function/IRR.class
 create mode 100644 src/main/java/com/fr/function/IRR.java
 create mode 100644 src/main/java/com/fr/function/ReportCheck.class
 create mode 100644 src/main/java/com/fr/function/ReportCheck.java
 create mode 100644 src/main/java/com/fr/function/StringCat.class
 create mode 100644 src/main/java/com/fr/function/StringCat.java
 create mode 100644 src/main/java/com/fr/function/StringImage.class
 create mode 100644 src/main/java/com/fr/function/StringImage.java
 create mode 100644 src/main/java/com/fr/function/Ubm.class
 create mode 100644 src/main/java/com/fr/function/Ubm.java

diff --git a/src/main/java/com/fr/function/CellSum.class b/src/main/java/com/fr/function/CellSum.class
new file mode 100644
index 0000000000000000000000000000000000000000..7f13b3cde76fa1ef7a0f5b4e16239a31f37b101a
GIT binary patch
literal 1118
zcmZ`(OH<QO7(KTwO^M;vf;>gR2c<mX6VW1woncjQ#sV|yDh;8ANfRc$(JeEM3ukcS
zj2m^~(xq+!1B^ew-(lJE4;;VSL|Yy%a=(19bH00WZ+`yX`vKrK=4EtXSi)r)5e$pv
zij1qcCSwF?38OM33@4Bgc1%V)#$`-kQn+dY*M+6B8xn3Z#Ai&~<g*OX^yn%>Ea$8l
z3~hPSHkQ0{(QucwqD7Hp-qAH{RdY?@hrt+sVOAJ=^SV=3*IjkpvvqDdwwg06tKgNh
z1nYV>!$|shenWeysg`D!)W^jQL+9Di(;*r_b4vu7I-{PzDqdNPQim#V*R)H-6L*b@
zXK@C(;CQZXESO?yB^+c@bSOw7MbIaQEvzgm=tZA|TMDUrN5YhXyO?I^K1uY*Gp#kl
zW#~G5yH)-CwfgQu_08+UF9*MN_l^!eD!7OH3bL4y@Ib*V=0xNn>3MYU>2Pbm`hGho
zB<Pb<gp)E1hM9`)nwwmmFIKp#>3kv7mZ2joC~6f$UE!uhdbK(=O_!bEqY1?uR0;)u
z)~I+;NXoU>HyPA1B)Ag@%g~u_Y^uwxZEhO&8pA{*PnbU45$Z;4EhU5JG)wm^jXNad
z0O23sa6L=qJ^#zmcN9pT>l!xCIhI$ppE$1=`Wx`LII8NuB*7h<_Kaf~Y~b&-7^1t=
zL01lR#pv82MQbN{Dp^LhDYFCiy_W8xHC_wGah~3lpa9+IA&>3|`e+r++XNOPJH3y{
z(;Y;|e8i%=Xz~$X+=oP=M6%h3obhqahvK6p*-Gv>JwDo&CcaT`1cEPF!%3hG%`}>f
lDPk4enE*fJCMNV_fY?*?lemCE>Yk$KBE3Z^dZ~st^amdk9?t*(

literal 0
HcmV?d00001

diff --git a/src/main/java/com/fr/function/CellSum.java b/src/main/java/com/fr/function/CellSum.java
new file mode 100644
index 0000000..e0b860d
--- /dev/null
+++ b/src/main/java/com/fr/function/CellSum.java
@@ -0,0 +1,14 @@
+package com.fr.function;
+
+import com.fr.base.Utils;
+import com.fr.script.AbstractFunction;
+
+public class CellSum extends AbstractFunction {
+    public Object run(Object[] args) {
+        String sum = Utils.objectToNumber(new SUM().run(args), false)
+                .toString(); // 直接调用FR内部的SUM方法
+        String result = "所在单元格为：" + this.getCalculator().getCurrentColumnRow()
+                + "；总和为：" + sum; // 获取当前单元格拼出最终结果
+        return result;
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/com/fr/function/DateDiff.class b/src/main/java/com/fr/function/DateDiff.class
new file mode 100644
index 0000000000000000000000000000000000000000..b9219065f73974b7f2aec93126e0041d6c55daa8
GIT binary patch
literal 2990
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
Gu>BwS0@zdl

literal 0
HcmV?d00001

diff --git a/src/main/java/com/fr/function/DateDiff.java b/src/main/java/com/fr/function/DateDiff.java
new file mode 100644
index 0000000..3066667
--- /dev/null
+++ b/src/main/java/com/fr/function/DateDiff.java
@@ -0,0 +1,67 @@
+package com.fr.function;
+
+import com.fr.script.AbstractFunction;
+import com.fr.stable.Primitive;
+import java.util.Date;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+public class DateDiff extends AbstractFunction
+{
+    private static final long serialVersionUID = -2863679010825725885L;
+    public String format = null;
+    private Long dif = Long.valueOf(0L);
+
+    public Object run(Object[] paramArrayOfObject)
+    {
+        try
+        {
+            Long localLong1 = Long.valueOf(((Date)paramArrayOfObject[0]).getTime());
+            Long localLong2 = Long.valueOf(((Date)paramArrayOfObject[1]).getTime());
+            this.dif = Long.valueOf(localLong2.longValue() - localLong1.longValue());
+            this.format = ((String)paramArrayOfObject[2]);
+            replace("((?i)y)", Long.valueOf(31536000000L));
+            replace("((?i)q)", Long.valueOf(7776000000L));
+            replace("M", Long.valueOf(2592000000L));
+            replace("((?i)w)", Long.valueOf(604800000L));
+            replace("((?i)d)", Long.valueOf(86400000L));
+            replace("((?i)h)", Long.valueOf(3600000L));
+            replace("m", Long.valueOf(60000L));
+            replace("((?i)s)", Long.valueOf(1000L));
+            try
+            {
+                return Long.valueOf(Long.parseLong(this.format));
+            }
+            catch (Exception localException2)
+            {
+                return this.format;
+            }
+        }
+        catch (Exception localException1)
+        {
+        }
+        return Primitive.ERROR_VALUE;
+    }
+
+    public void replace(String paramString, Long paramLong)
+    {
+        Pattern localPattern = Pattern.compile(paramString + "\\{\\d*?\\}");
+        Matcher localMatcher = localPattern.matcher(this.format);
+        int i = (int)(this.dif.longValue() / paramLong.longValue());
+        int j = 1;
+        while (localMatcher.find())
+        {
+            String str1 = localMatcher.group();
+            str1 = str1.replaceAll(paramString + "\\{", "");
+            str1 = str1.replaceAll("\\}", "");
+            int k = Integer.parseInt(str1);
+            String str2 = String.format("%0" + k + "d", new Object[] { Integer.valueOf(i) });
+            if (j != 0)
+            {
+                j = 0;
+                this.dif = Long.valueOf(this.dif.longValue() - i * paramLong.longValue());
+            }
+            this.format = this.format.replaceFirst(paramString + "\\{\\d*?\\}", str2);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/com/fr/function/FlagHtmlColor.class b/src/main/java/com/fr/function/FlagHtmlColor.class
new file mode 100644
index 0000000000000000000000000000000000000000..c65900c96e81beb9c89d042f63eaf317095845e9
GIT binary patch
literal 2365
zcmbVOOHfl+82(OjUkO3rN{}F;eOQ74;{#Cxs1T)qBq~@`u<9k;gwT*+a^tj}E<4?I
z+Zns5wmP`zLS4j}I>V}~uDkEDGhKFR9qo5+0*X+l<4o><{`<cl-#wGxUi`8OpcjjN
zwBw|KQ$7q~*pE0)8#rTN#E+f$SjVUzhSZPAbKJmLdD3J;N5YQ=ob)4!bCR5w<bqUB
zO2w2U7Y!UX@QD}r;l6x7tz%lpB>`<9o6kBY1iay{X#pi(n70KQCbD@uSzem6ix;iA
z93|#NA!X&JtzuTb*My3*kSz)9o=6pzqUmBZUCyVRY#|>V$yu3EXDJsi<O;=p1}~QL
z0-fR6iAC#{70p@sO!VB`qMdU3yEcnhhE>ck@b)e28O-_Ikp;a9HRTku`3&=@DVdP|
zX%@idigu}-qjCL|W2HVzSj%qVIxY+NGqxj3q_4nucyqM>BYC~}^&-3_8B(P9#Q9|T
zj0yNkj#YFPm{CBt^Yc~CQ<@WK-IQv$oKD;B;Bt1}T~&e=PZi3=ls%Gl_pxEb`{gVG
z*o6)O=(rNV3}$s)4d7E;ljFDNSw%8{C=Lkhcyn^Y<!o-=X3_Nn=|bMw<4$p~Gl1*3
zA>ipGJoJI6RFP}h>@ADsPy?_q7eEU00oX`O_lzV9lE^X42<&<*R0KL|`ckTxU3Q{F
za~!6Xaz<*%5@>ugJ^NYnaU?dQ=Zo2;tdqS()cVg%PM({*o*YV?5eTipl$+RKN8r2`
zwTept!zol(D$pF>a?zT#yv$7s^lSm2%^tNWGn>Y(W}F50qa!pL?VDvQR~pOY3q?C_
zl~{OitB4$*mRhiiLqxO^9_u2y+Qad;CF<TP%zvY8=ho3&EaE-hL+!k(057;lbdc`m
zTa+hJ2X)^Qh(}~R*h8whLWOQXplX2k@d4iiKEz&9I*YwfXbCKto`mU1nx2><BKKiL
zR=<b-7~Y4GRpkzvBi=(5C<#+dnp#X*L2qPLy@S@8IHE{xO%>WGjHpr<Q}%WDgp>;O
zm>N<aGNIQkavUakjc+=s0Y7|bCT&F>`wOtldW5l!JvQJ78Zm$-Ud$%OX>|cXTt*9S
z(0UOex6u>TW@?SHEqsJdw(6xt7+oBVh79(R^D;{c5poK3UUZXF(Zgy?s4vj0V}JGM
zZD|WK0zcg9$asZ&SRKUtQy5pCz-Rg^sO#oq21qKXk16K1nEDhA)HcSnNCi!Ox~cV4
zVBW@zx6cR~LH$Q0B0-~q?R~zWukpZL9N=;MCv?@K%3;+7eHAo^)LK}7NDDDn@X`wE
zLYmaIT>9D&D=#0f;CFLJHU7eS{MpyyTX*4S{4ejJiN{bi+swOVySIY0*;>suyPhri
zDqB+$ZUQs(ZV4W(K#e>MX%)1+LdrMpe%sOJBEN%M-OX+7K_BI(xbIOydz!$$Nz8n~
zt$#&}uc`Z%+y0JwzQYYapvSM+k3YE0Ke^Apa1eh}_YZo7f+J!Z`a}zk@}oE=PT{y1
zMNFJUznG%#Do%=P{AVCPr=N+!n?&nDV#d$R12}}kMDB57vX?kDm|;!(fLN_+Z}Sp%
zwTxZUGTUHPD|AfOe2J_z{F0NX6%uVOYCSF|QR_vU7-#nqza3%(N6D$^6oWX%IyCf%
zqlmE<-Np0-%$F4Vbo8$SdyN?ojQ<?N;u-X3P(9C4C!V8S)bHIOh_C78Z8OLzcyQuh
Di1_ik

literal 0
HcmV?d00001

diff --git a/src/main/java/com/fr/function/FlagHtmlColor.java b/src/main/java/com/fr/function/FlagHtmlColor.java
new file mode 100644
index 0000000..76da40b
--- /dev/null
+++ b/src/main/java/com/fr/function/FlagHtmlColor.java
@@ -0,0 +1,67 @@
+package com.fr.function;
+import com.fr.script.AbstractFunction;
+import com.fr.stable.Primitive;
+public class FlagHtmlColor extends AbstractFunction {
+    public Object run(Object[] args) {
+        String  txt="";
+        String color="";
+        String flag="";
+        if(null==args||args.length==0){
+            return Primitive.ERROR_NAME;
+        }else if(args.length==1){
+            txt=args[0].toString();
+            color="red";
+            flag="N";
+        }else if(args.length==2){
+            txt=args[0].toString();
+            color=args[1].toString();
+            flag="N";
+        }else{
+            txt=args[0].toString();
+            color=args[1].toString();
+            flag=args[2].toString();
+        }
+        String result=getHtmlStr(txt, color, flag);
+        return result;
+    }
+    public String getHtmlStr(String txt,String  color,String flag){
+        String starthtml="<font color='"+color+"'>";
+        String endhtml="</font>";
+        StringBuffer sb=new StringBuffer();
+        int len=txt.length();
+        if("N".equalsIgnoreCase(flag)){//数字
+            for(int i=0;i<len;i++){
+                char c=txt.charAt(i);
+                if(c>='0'&&c<='9'){
+                    String str=starthtml+c+endhtml;
+                    sb.append(str);
+                }else{
+                    sb.append(c);
+                }
+            }
+        }else if("C".equalsIgnoreCase(flag)){//字母
+            for(int i=0;i<len;i++){
+                char c=txt.charAt(i);
+                if((c>='a'&&c<='z')||(c>='A'&&c<='Z')){
+                    String str=starthtml+c+endhtml;
+                    sb.append(str);
+                }else{
+                    sb.append(c);
+                }
+            }
+        } else if("Z".equalsIgnoreCase(flag)){//中文
+            for(int i=0;i<len;i++){
+                char c=txt.charAt(i);
+                if(c >= 0x4E00 &&  c <= 0x9FA5){
+                    String str=starthtml+c+endhtml;
+                    sb.append(str);
+                }else{
+                    sb.append(c);
+                }
+            }
+        }else{
+            return txt;
+        }
+        return sb.toString();
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/com/fr/function/IRR.class b/src/main/java/com/fr/function/IRR.class
new file mode 100644
index 0000000000000000000000000000000000000000..86a951ce3b999aebfebd6dbd1004420f3b130f63
GIT binary patch
literal 4440
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
DJ-xqs

literal 0
HcmV?d00001

diff --git a/src/main/java/com/fr/function/IRR.java b/src/main/java/com/fr/function/IRR.java
new file mode 100644
index 0000000..46bdb96
--- /dev/null
+++ b/src/main/java/com/fr/function/IRR.java
@@ -0,0 +1,152 @@
+package com.fr.function;
+
+import java.math.BigDecimal;
+
+import com.fr.general.FArray;
+import com.fr.general.GeneralUtils;
+import com.fr.script.AbstractFunction;
+
+public class IRR extends AbstractFunction {
+
+    private static final long serialVersionUID = 7634415917398642321L;
+    private static final String ERROR_VALUE = "#NUM!";
+
+
+    @Override
+    public Object run(Object[] args) {
+        try{
+            if(1 == args.length){
+                return run( transArr( (FArray) args[0] ) );
+            }else if(2 == args.length){
+                return run( transArr( (FArray) args[0] ), trans( args[1] ) );
+            }
+        }catch(Exception e){
+            System.out.println(e);
+        }
+        return ERROR_VALUE;
+    }
+
+    /**
+     * 将其他类型的数字转换为大数（保证精度）
+     * @param ele
+     * @return
+     */
+    private static BigDecimal trans(Object ele){
+        try{
+            String val = GeneralUtils.objectToString(ele);
+            return new BigDecimal(val);
+        }catch(Exception e){
+
+        }
+        return (BigDecimal) ele;
+    }
+
+    /**
+     * 将数组转换为大数数组
+     * @param in
+     * @return
+     */
+    private static FArray<BigDecimal> transArr(FArray in){
+        FArray<BigDecimal> rt = new FArray<BigDecimal>();
+        for(int i=0;i<in.length();i++){
+            Object ele = in.elementAt(i);
+            rt.add(trans(ele));
+        }
+        return rt;
+    }
+
+
+    private static BigDecimal run(FArray<BigDecimal> cashflow){
+        return run( cashflow, new BigDecimal(0.1d) );
+    }
+
+    private static BigDecimal run(FArray<BigDecimal> cashflow,BigDecimal guess){
+        BigDecimal maxrate = initRateMax(cashflow,guess);
+        BigDecimal minrate = initRateMin(cashflow,guess);
+        for( int i=0; i<Init_Max_Loop; i++ ){
+            BigDecimal testrate = minrate.add(maxrate).divide( new BigDecimal(2d) );
+            BigDecimal npv = NPV( cashflow, testrate );
+            if( npv.abs().compareTo(Accuracy) == LESS ){
+                guess = testrate;
+                break;
+            }else if( npv.compareTo(ZERO) == LESS ){
+                minrate = testrate;
+            }else{
+                maxrate = testrate;
+            }
+        }
+        //保留16位小数（足够精度）
+        return guess.setScale(16,BigDecimal.ROUND_HALF_UP);
+    }
+
+    //最小精度
+    private static final BigDecimal Accuracy = new BigDecimal(0.00000001d);
+    //最大循环次数，excel用的是20次，不过精度只到小数点后两位，而且不一定一定能算出值，为了尽可能保证算出结果，我增加到100次，
+    private static final int Init_Max_Loop = 100;
+
+    private static final BigDecimal ZERO = new BigDecimal(0);
+    private static final BigDecimal ONE = new BigDecimal(1);
+    private static final BigDecimal Z005 = new BigDecimal(0.005d);
+    private static final BigDecimal Z2 = new BigDecimal(0.2d);
+
+    private static final int GREATER = 1;
+    private static final int LESS = -1;
+
+    /**
+     * 生成一个使NPV为负数的R作为内部收益率下限值
+     * @param cashflow
+     * @param guess
+     * @return
+     */
+    private static BigDecimal initRateMin(FArray<BigDecimal> cashflow,BigDecimal guess){
+        for( int i=0; i<Init_Max_Loop; i++ ){
+            BigDecimal npv = NPV( cashflow, guess );
+
+            if( npv.compareTo(ZERO) == LESS ){
+                return guess;
+            }
+            BigDecimal step = guess.abs().multiply( Z2 );
+            guess = guess.add( step.compareTo( Z005 ) == LESS ? Z005 : step );
+        }
+        return guess;
+    }
+
+    /**
+     * 生成一个使NPV为正数的R作为内部收益率的上限制
+     * @param cashflow
+     * @param guess
+     * @return
+     */
+    private static BigDecimal initRateMax(FArray<BigDecimal> cashflow,BigDecimal guess){
+        for( int i=0; i<Init_Max_Loop; i++ ){
+            BigDecimal npv = NPV( cashflow, guess );
+
+            if( npv.compareTo(ZERO) == GREATER ){
+                return guess;
+            }
+            BigDecimal step = guess.abs().multiply( Z2 );
+            guess = guess.subtract( step.compareTo( Z005 ) == LESS ? Z005 : step );
+        }
+        return guess;
+    }
+
+    /**
+     * 算NPV
+     * @param cashflow
+     * @param rate
+     * @return
+     */
+    private static BigDecimal NPV(FArray<BigDecimal> cashflow,BigDecimal rate){
+        BigDecimal npv = ZERO;
+        BigDecimal rpowj = ONE;//(1+r)^0
+        BigDecimal radd1 = rate.add(ONE);//1+r
+        for( int j=0; j<cashflow.length(); j++ ){
+            BigDecimal valuej = cashflow.elementAt(j);
+            npv = npv.add( valuej.divide( rpowj, 10, BigDecimal.ROUND_HALF_DOWN ) );// vj / (1+r)^j
+            rpowj = rpowj.multiply(radd1); // (1+r)^j
+            //npv += cashflow.elementAt(j) / Math.pow( 1+rate, j );
+        }
+        return npv;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/fr/function/ReportCheck.class b/src/main/java/com/fr/function/ReportCheck.class
new file mode 100644
index 0000000000000000000000000000000000000000..da7e80d8966700d7b39207a30aeff799ec04d7e4
GIT binary patch
literal 4591
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
Hnr`6#)?ynO

literal 0
HcmV?d00001

diff --git a/src/main/java/com/fr/function/ReportCheck.java b/src/main/java/com/fr/function/ReportCheck.java
new file mode 100644
index 0000000..21d57da
--- /dev/null
+++ b/src/main/java/com/fr/function/ReportCheck.java
@@ -0,0 +1,127 @@
+// 自定义函数实现表间校验  
+package com.fr.function;
+
+import java.util.HashMap;
+import com.fr.base.ResultFormula;
+import com.fr.base.operator.common.CommonOperator;
+import com.fr.chart.activator.ChartBaseActivator;
+import com.fr.config.activator.BaseDBActivator;
+import com.fr.config.activator.ConfigurationActivator;
+import com.fr.data.impl.config.activator.RestrictionActivator;
+import com.fr.env.operator.CommonOperatorImpl;
+import com.fr.io.TemplateWorkBookIO;
+import com.fr.json.JSONArray;
+import com.fr.json.JSONObject;
+import com.fr.main.impl.WorkBook;
+import com.fr.main.workbook.ResultWorkBook;
+import com.fr.module.Module;
+import com.fr.module.tool.ActivatorToolBox;
+import com.fr.report.ReportActivator;
+import com.fr.report.cell.CellElement;
+import com.fr.report.module.ReportBaseActivator;
+import com.fr.report.report.ResultReport;
+import com.fr.script.AbstractFunction;
+import com.fr.stable.WriteActor;
+import com.fr.store.StateServerActivator;
+import com.fr.workspace.simple.SimpleWork;
+import com.fr.write.cal.WB;
+
+public class ReportCheck extends AbstractFunction {
+    private static HashMap wMap = new HashMap();
+
+    public Object run(Object[] args) {
+        // 获取公式中的参数  
+        String cptname = args[0].toString(); // 获取报表名称  
+        int colnumber = Integer.parseInt(args[2].toString()); // 所取单元格所在列  
+        int rownumber = Integer.parseInt(args[3].toString()); // 所取单元格所在行  
+        // 定义返回的值  
+        Object returnValue = null;
+        // 定义报表运行环境,用于执行报表
+        Module module = ActivatorToolBox.simpleLink(new BaseDBActivator(),
+                new ConfigurationActivator(),
+                new StateServerActivator(),
+                new ReportBaseActivator(),
+                new RestrictionActivator(),
+                new ReportActivator(),
+                new ChartBaseActivator());
+        SimpleWork.supply(CommonOperator.class, new CommonOperatorImpl());
+        String envpath= "//Applications//FineReport10_325//webapps//webroot//WEB-INF"; //工程路径
+        SimpleWork.checkIn(envpath);
+        module.start();
+        try {
+            ResultWorkBook rworkbook = null;
+            // 读取模板
+            WorkBook workbook = (WorkBook)TemplateWorkBookIO
+                    .readTemplateWorkBook(cptname);
+            // 获取需要传递给报表的参数名与参数值，格式如[{"name":para1name,"value":para1value},{"name":para2name,"value":para2value},......]  
+            JSONArray parasArray = new JSONArray(args[1].toString());
+            // 需要判断是否是5秒内执行过的  
+            // 取出保存的resultworkbook;  
+            Object tempWObj = wMap.get(cptname + parasArray.toString());
+            if (tempWObj != null) {
+                // 取出hashmap里面保存的TpObj;  
+                TpObj curTpObj = (TpObj) tempWObj;
+
+                if ((System.currentTimeMillis() - curTpObj.getExeTime()) < 8000) {
+                    rworkbook = curTpObj.getRworkbook();
+                } else {
+                    wMap.remove(cptname + parasArray.toString());
+                }
+            }
+            // 如果没有设置，需要生成  
+            if (rworkbook == null) {
+                JSONObject jo = new JSONObject();
+                // 定义报表执行时使用的paraMap,保存参数名与值  
+                java.util.Map parameterMap = new java.util.HashMap();
+                if (parasArray.length() > 0) {
+                    for (int i = 0; i < parasArray.length(); i++) {
+                        jo = parasArray.getJSONObject(i);
+                        parameterMap.put(jo.get("name"), jo.get("value"));
+                    }
+                }
+                // 执行报表  
+                rworkbook = workbook.execute(parameterMap, new WriteActor());
+                // 保存下来  
+                wMap.put(cptname + parasArray.toString(), new TpObj(rworkbook,
+                        System.currentTimeMillis()));
+            }
+            // 获取报表结果中对应Cell的值  
+            ResultReport report = rworkbook.getResultReport(0);
+            CellElement cellElement = ((WB) report).getCellElement(colnumber, rownumber);
+            returnValue = cellElement.getValue().toString();
+            if(cellElement.getValue() instanceof ResultFormula) {
+                returnValue = ((ResultFormula)cellElement.getValue()).getResult().toString();
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return returnValue;
+    }
+
+    class TpObj {
+        private ResultWorkBook rworkbook = null;
+        private long exeTime = System.currentTimeMillis();
+
+        public TpObj(ResultWorkBook rworkbook, long exeTime) {
+            this.setRworkbook(rworkbook);
+            this.setExeTime(exeTime);
+        }
+
+        public ResultWorkBook getRworkbook() {
+            return rworkbook;
+        }
+
+        public void setRworkbook(ResultWorkBook rworkbook) {
+            this.rworkbook = rworkbook;
+        }
+
+        public long getExeTime() {
+            return exeTime;
+        }
+
+        public void setExeTime(long exeTime) {
+            this.exeTime = exeTime;
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/fr/function/StringCat.class b/src/main/java/com/fr/function/StringCat.class
new file mode 100644
index 0000000000000000000000000000000000000000..56028335fe94d418ca852e67fb04684a894ece08
GIT binary patch
literal 840
zcmZ`%-EI;=6#iy+VPU(pl@@EQwpLM~K({fCHy9Ib(!>PX3rrK^)v#=F>UNh5vp#`O
z;*If6Z)l=PAHY}eNxZ3^=@O-)B%C?F-}%0i{dV!?9KbG`4)WN@;f{?>2PQVOx$EE_
z%GxX2xNqYDL-w(VgnGhYR%=HL)?VBX7#7+h3J#LfULaraUPzf@JN9{a#HG;jBx$MF
zV#Ki4_Ty9USbE1v<SP+JUROyG4feQd5wJ`mhD!BS`-H#cUdW??ci1}#eATMWrij9j
zORg8rv@<Y4|L4@h<$xA1{R5LE$zYU(>MBIai0Bl$iu-Rme0ZtBMuoxY#)<TUeW8WU
z|K`4}3Ak`D#{h<vKYY@bXNd^=fpk$t&Bm6CIvNbC|Gfpn`lL4Ur5GyjX>X(?_tpO7
zYz&Kk?;tgNI1HjbL$f+{k%^q?170CTLZ`6Ob2H>roOUrRS7&Ei*hG##8~rm#F)1hO
zQsmJ~M?hxl4D9n|xj;6XCNWRGJMkB=ND;#|6v^u0j|7&Xcc*A{%tuzqs-M3{xn8m!
z9(;xQ@(fmEj7)QkEInh`op%=d@bi1)6U~^=dv4Muz@{iqu|vpnbo4y7Dbl-l3BQP2
xSi&;(WT{rdby!r{LCQyaE4V?7Of<1dhz8cEUVw3dtWC4*2P#y)O-TdmzW|MBx;g*=

literal 0
HcmV?d00001

diff --git a/src/main/java/com/fr/function/StringCat.java b/src/main/java/com/fr/function/StringCat.java
new file mode 100644
index 0000000..00cbf16
--- /dev/null
+++ b/src/main/java/com/fr/function/StringCat.java
@@ -0,0 +1,15 @@
+package com.fr.function;
+
+import com.fr.script.AbstractFunction;
+
+public class StringCat extends AbstractFunction {
+    public Object run(Object[] args) {
+        String result = "";
+        Object para;
+        for (int i = 0; i < args.length; i++) {
+            para = args[i];
+            result += para.toString();
+        }
+        return result;
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/com/fr/function/StringImage.class b/src/main/java/com/fr/function/StringImage.class
new file mode 100644
index 0000000000000000000000000000000000000000..f620b5093acf72552d5ae23f76f922d65dc7c175
GIT binary patch
literal 2436
zcmaJ?U2_vv7=BK(o2AP_3nkD%3n?GcPZmo-X%V3fE!DI|3Kc|=O|nfF((Jm~Q0m7W
z7ybptEA^t|IL_crs5&xw<&3|<U&4j;*^i_NL^6}zv+sG|=ly!ld;b3S*XIDn@Rf>#
zNGrIaU|PY9iWsh{n8kZ4l6YT1M#T=yDVSHWfNKgqP@y5c1K0icqKY=$@K-ne$I?!G
zh+8Ud<0BP!@NxXodHUc_#V5F{;8O+n1mYL0lI2|#i1iOF2}o0R-W2G_SS545vYIvB
z8%DNB$=-~eGm1-wYx&=iQ1Vu+vOsSpXRqqZuD)C;<vhzS>5HCgl?t<~M!}pQv|A|&
zob11oxo<o)^rBHJ=nL8VX3m=!cvU1IEdFQtr{6@VVA=ZY!j(rk)A8|%sb#H_;jV`;
z0!M2h<PFczbGB>h`K&(KphFwUa0?8#t3@0vglm>7MNgnJ^k}SkdMyFr2(;N*fnAH9
zk$W&_I6(n|8V<1=LANq2n_tU@+y%z^8xjn6CSJymYS8FVDjBOm(YFg084JjkUsi!V
zWv6JAS0*dV%Vs`^RN(M7cA%vPyKc14610a#Go$%>X??#luHmd$x$<b5I!ewgd8T`d
z4M^9&ZVRZ3cE!z^)0WSN&W1Ek`B7>(gdWPbBd+x(6|v)gThn9};%YFERglw=hpFKl
z-eTVZ=w>EpSoXc{4z}tQR8Y{c0@CQfb~qvMWW_4xO;=#w%~HAIIJWDV`INWrm??WX
zrQtpvXeeUUUzIf2a1?x|!9`htr=fy}3f43{!n%UbHGF|D1rEK2{_IJ#Th6(b<LQ^P
zWzRKo-gI<U7<|F>W=l@RXO3yCGU)z@5`M1R8*EL&Pv?;y^w!_>nJ~LRX48-zJsYv@
zCA$WKwPr<!!{bW#<n|55#`g9^K^N_UKFwK>u?q#$oo3v&yG|N0<WMBg$7ow>Uvuq;
z7HiG8<A&pyB}O>X;yg6YfTkwVa0eYtk>>uftyLwMAAyhxO@J+i$}51L9g4_+Ccsci
z#NO8?!&<KyF2`A-RVJLEHS@CP4@!NCqbN9CSIwg1^RC0Qn+~PG=?JM#-`Z641+5#_
zQ|Eh&eKIOXK6s&Dp6Uihy>i$OMA>GIvKfwnTA*s)HP&ji8f=KMHY}n+7PKR(UOGLn
zgg)L?2ZNg?1|AOd@Y&06oo~UnJopUaXD-@sn9q11?7|VQwNL>mf`IFzIL0T9#ZQo+
zQ1+vki(Qm|N87j*J0~aPq37S>Sg-Uw4i6>d(Z3Mi!0x2f>whdhj)}*z*x33fDM_P$
zBK8C${^}3J#^u4J6yr)t%2mjlh(Ciew*hrLo{U$~zJYXTqdq~ht{T{?q2}>T?EDSd
z?Pu7vcXt&XzIqj%RqUx^?=R?T!|+pvKEs>$F7NDEkm@|Tn8JQ0et_w8^CnIPwMwx{
z$C&02wN6no#>6jDGJ_Me?<c|=xQCN4F~CVQh_5k>A6QSnWY>wli+jhZD^p9R?nxGP
zhFJa7m;Ite1@%{h^upVW_QM$ATfzo?o?wJ3z9r@mC8ud~0qt7^jw^Um!Ki{Wf-kl&
zp}v5;Md0Qgg+Wu}><h%(j--goksY=U-!PhXBK8e$V&D8o6^U_aANHS@{fCm2hPvf$
zWfR>aPpK4g;vh|cGYozVJ8>4Bgi8?c2;L5oz8Y|$ubx&P<>%>+PB0#%C6jg&Od>}6
c{dkAvl!&qi@8S|s6J*+Dt`yo#241KB1I|xWI{*Lx

literal 0
HcmV?d00001

diff --git a/src/main/java/com/fr/function/StringImage.java b/src/main/java/com/fr/function/StringImage.java
new file mode 100644
index 0000000..1345f16
--- /dev/null
+++ b/src/main/java/com/fr/function/StringImage.java
@@ -0,0 +1,59 @@
+//图片在下文字在上
+package com.fr.function;
+
+import com.fr.base.GraphHelper;
+import com.fr.data.core.db.BinaryObject;
+import com.fr.log.FineLoggerFactory;
+import com.fr.script.AbstractFunction;
+import com.fr.stable.CoreGraphHelper;
+import javax.imageio.ImageIO;
+import java.awt.Graphics2D;
+import java.awt.Image;
+import java.awt.image.BufferedImage;
+import java.io.IOException;
+
+
+/**
+ * 图片在下文字在上
+ */
+public class StringImage extends AbstractFunction {
+    @Override
+    public Object run(Object[] args) {
+        Image result = null;
+        int p = 0;
+        Object[] ob = new Object[2];
+        for (int i = 0; (i < args.length && p <= 1); i++) {
+            if (args[i] == null) {
+                continue;
+            }
+            ob[p] = args[i];
+            p++;
+
+        }
+
+        if (ob[1] instanceof BinaryObject) {
+            BinaryObject binaryObject = (BinaryObject) ob[1];
+            try {
+                result = initStringImage((String) ob[0], ImageIO.read(binaryObject.getInputStream()));
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+        } else if (ob[1] instanceof Image) {
+            result = initStringImage((String) ob[0], (Image) ob[1]);
+        } else {
+            FineLoggerFactory.getLogger().warn("Unsupported type of " + ob[1].getClass());
+        }
+
+        return result;
+    }
+
+    private Image initStringImage(String name, Image image) {
+        BufferedImage splashBuffedImage = CoreGraphHelper.toBufferedImage(image);
+        Graphics2D splashG2d = splashBuffedImage.createGraphics();
+        double centerX = 25;
+        double centerY = 25;
+        GraphHelper.drawString(splashG2d, name, centerX, centerY);
+        return splashBuffedImage;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/fr/function/Ubm.class b/src/main/java/com/fr/function/Ubm.class
new file mode 100644
index 0000000000000000000000000000000000000000..32253acf204a81e1854e5ca574be8a66f8e9cbb7
GIT binary patch
literal 1336
zcmZ`&T~iWa6n<V<SX@^{5R*RWQ(Y9H)U?Djr7Q}t!jCa8nq^&Z4HsG#$KTOiH(fQ;
zZQY=gGu?F8kFw4SBo@RnXW#REp65OL^Yq(y0Ml5PFo1}J2}C`JiMTC6;QAd*dN9S`
z(_Gx;Vn)I&?uocBLB<>xQ63%VzIiSla5XAoLBt}1d)_b&dx62Jgf|$3L}^E7=t~)<
zo~iEVbZbq`70KdDl{B@up;`vln?}LjH7X2&lvdi0<*iu0YHGGoGGptx{Wz7hswTsz
zvYpyf57byuH4CxT+@7x4@o>9|!J+Lkumnw^S_P`>?~q7UE4IbwY1PcymSGmCp`&6G
zqFgnf*C}MEEo8awp}?N3t!i)6YPk+X#6#kgLCTh@mZq;59I%HlM0pPx0St;*lCcb$
z4Ge?-wr<p=GBO_FG0ibtm9c^+GM*wS;~AcdNXbYeL!es8iCxuFHCwlMi&Ysf@RDb|
zl99z4MRs77A=I>1G|MR4v85c*K}A-Y)H8Tn4I0G!WoqzG@a)nb?|^dtHqOX&7j?5>
z(~Zz(B#E4gty*?v)8M9n(#CB({F<SwQswi|Z4gUJGTE`Pc%T-m`f8qG<b0V9n{hTv
ze+yI6wDkhNUQb!IDmtmWRr@$eKD3}D_*T2sa#=Tb7$O}4+h;smlYsIc1ctezA94g8
ziAdr){Pe~0pM&;=_J`yJ(qi<c6@qK*2<&U!Jw(!7H@Xp|v)l;4MO-3{;WDm}q+}MN
z@77JW!*S<i4UV+WnK^;5bp+R(5UIia5!(@;ScB&SrXnt{yN0gJ#4#kV_ZZ#pXIw$y
z1oBqEb%dT8dTZ$0jPM|D`tz?J5obNMpXUUHiMo?y)BPzZ)ZqI<y`A9m&Y_p22O_#4
z(c?!q%`4+3dN5ADS@a<ZFD-OGt+EeqC?ZdUScHRPTp%2?bPC}rT%;d1(el$ZB9Bq!
qcep|I98}%JEjl@=hK^y35DTM}<Aw7Sei2IjA6^Vm))?6x82=4+Xf3+{

literal 0
HcmV?d00001

diff --git a/src/main/java/com/fr/function/Ubm.java b/src/main/java/com/fr/function/Ubm.java
new file mode 100644
index 0000000..12d7aaf
--- /dev/null
+++ b/src/main/java/com/fr/function/Ubm.java
@@ -0,0 +1,25 @@
+// 自定义函数Unicode编码转化为中文 
+package com.fr.function;
+
+import com.fr.script.AbstractFunction;
+
+public class Ubm extends AbstractFunction {
+    public Object run(Object[] args) {
+        String str = args[0].toString();
+        String st = "";
+        StringBuffer buffer = new StringBuffer();
+        while (str.length() > 0) {
+            if (str.startsWith("%u")) {
+                st = str.substring(2, 6);
+                char ch = (char) Integer.parseInt(String.valueOf(st), 16);
+                buffer.append(new Character(ch).toString());
+                str = str.substring(6);
+            } else {
+                st = str.substring(0, str.indexOf("%u"));
+                buffer.append(st);
+                str = str.substring(st.length());
+            }
+        }
+        return buffer.toString();
+    }
+}
\ No newline at end of file