|
@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONObject;
|
|
|
|
|
|
import java.math.BigDecimal;
|
|
|
import java.math.RoundingMode;
|
|
|
+import java.nio.charset.Charset;
|
|
|
import java.util.ArrayList;
|
|
|
import java.util.List;
|
|
|
|
|
@@ -18,6 +19,11 @@ public class LinkUtils {
|
|
|
List<JSONObject> result = new ArrayList<>();
|
|
|
beforeData.forEach(before -> {
|
|
|
String yesStat = String.valueOf(before.get(standard));
|
|
|
+ //修改点记率 乱码
|
|
|
+ byte[] click = before.getBytes("clickRate");
|
|
|
+ String clickRate = new String(click, Charset.forName("UTF-8"));
|
|
|
+ before.put("clickRate",clickRate);
|
|
|
+
|
|
|
AfterData.forEach(after -> {
|
|
|
if ((String.valueOf(after.get(standard))).equals(yesStat)) {
|
|
|
//消耗较昨日环比
|
|
@@ -29,6 +35,11 @@ public class LinkUtils {
|
|
|
if(after.getLong("convertNum")!=null){
|
|
|
after.put("convertNumProportion", countLink(BigDecimal.valueOf(after.getLong("convertNum")), BigDecimal.valueOf(before.getLong("convertNum"))));
|
|
|
}
|
|
|
+ //修改点记率 乱码
|
|
|
+ byte[] aftClick = after.getBytes("clickRate");
|
|
|
+ String afterCli = new String(aftClick, Charset.forName("UTF-8"));
|
|
|
+ after.put("clickRate",afterCli);
|
|
|
+
|
|
|
before.put("afterData", after);
|
|
|
}
|
|
|
});
|
|
@@ -46,4 +57,10 @@ public class LinkUtils {
|
|
|
return link;
|
|
|
}
|
|
|
|
|
|
+ public static void main(String[] args) {
|
|
|
+ BigDecimal a = BigDecimal.valueOf(5.2);
|
|
|
+ BigDecimal b = BigDecimal.valueOf(4.2);
|
|
|
+ System.out.println(countLink(a,b));
|
|
|
+ }
|
|
|
+
|
|
|
}
|