|
@@ -32,7 +32,7 @@ public class ReportsAdPushServiceImpl implements IReportsAdPushService {
|
|
|
public static final String APP_KEY = "OUlg7WTa6UWZItfTmJw2JdQvhVI4VcRj";
|
|
public static final String APP_KEY = "OUlg7WTa6UWZItfTmJw2JdQvhVI4VcRj";
|
|
|
|
|
|
|
|
public static final String TEMPLATE_ID = "AAqBGlVblKabY";
|
|
public static final String TEMPLATE_ID = "AAqBGlVblKabY";
|
|
|
- public static final String TEMPLATE_VERSION = "1.0.19";
|
|
|
|
|
|
|
+ public static final String TEMPLATE_VERSION = "1.0.23";
|
|
|
@Autowired
|
|
@Autowired
|
|
|
ReportsAdPushMapper reportsPushMapper;
|
|
ReportsAdPushMapper reportsPushMapper;
|
|
|
|
|
|
|
@@ -60,10 +60,10 @@ public class ReportsAdPushServiceImpl implements IReportsAdPushService {
|
|
|
public void test() {
|
|
public void test() {
|
|
|
List<String> userIds = Arrays.asList(
|
|
List<String> userIds = Arrays.asList(
|
|
|
"44fbaed6" //zhaotx
|
|
"44fbaed6" //zhaotx
|
|
|
- ,"ebeeced9" //yumeng
|
|
|
|
|
- ,"58e7a98a" //xsq
|
|
|
|
|
- ,"2ga9669f" //angaoqi
|
|
|
|
|
- ,"43gb7fbc" //huangpingkang
|
|
|
|
|
|
|
+// ,"ebeeced9" //yumeng
|
|
|
|
|
+// ,"58e7a98a" //xsq
|
|
|
|
|
+// ,"2ga9669f" //angaoqi
|
|
|
|
|
+// ,"43gb7fbc" //huangpingkang
|
|
|
);
|
|
);
|
|
|
send(userIds);
|
|
send(userIds);
|
|
|
}
|
|
}
|
|
@@ -106,14 +106,24 @@ public class ReportsAdPushServiceImpl implements IReportsAdPushService {
|
|
|
for (Pair<String, String> cp : columns) {
|
|
for (Pair<String, String> cp : columns) {
|
|
|
String c = cp.getKey();
|
|
String c = cp.getKey();
|
|
|
String cn = cp.getValue();
|
|
String cn = cp.getValue();
|
|
|
- String todayNum = String.valueOf(todayData.get(c));
|
|
|
|
|
- String lastHourNum = String.valueOf(lastHourData.get(c));
|
|
|
|
|
- String lastLastHourNum = String.valueOf(lastLastHourData.get(c));
|
|
|
|
|
JSONObject obj = new JSONObject();
|
|
JSONObject obj = new JSONObject();
|
|
|
obj.put("IndicatorName", cn);
|
|
obj.put("IndicatorName", cn);
|
|
|
|
|
+ String todayNum = String.valueOf(todayData.get(c));
|
|
|
obj.put("todayData", todayNum);
|
|
obj.put("todayData", todayNum);
|
|
|
- obj.put("thisHourData", lastHourNum);
|
|
|
|
|
- obj.put("lastHourData", lastLastHourNum);
|
|
|
|
|
|
|
+ if (c.equals("cost_amount")){
|
|
|
|
|
+ Double lastHourNumD = Double.parseDouble(String.valueOf(lastHourData.get(c)));
|
|
|
|
|
+ if (lastHourNumD >= 100000){
|
|
|
|
|
+ obj.put("thisHourData", "<font color='red'>"+lastHourNumD+"(起量)</font>");
|
|
|
|
|
+ }else {
|
|
|
|
|
+ obj.put("thisHourData", ""+lastHourNumD);
|
|
|
|
|
+ }
|
|
|
|
|
+ obj.put("lastHourData", String.valueOf(lastLastHourData.get(c)));
|
|
|
|
|
+ }else {
|
|
|
|
|
+ String lastHourNum = String.valueOf(lastHourData.get(c));
|
|
|
|
|
+ obj.put("thisHourData", lastHourNum);
|
|
|
|
|
+ String lastLastHourNum = String.valueOf(lastLastHourData.get(c));
|
|
|
|
|
+ obj.put("lastHourData", lastLastHourNum);
|
|
|
|
|
+ }
|
|
|
object_list_1.add(obj);
|
|
object_list_1.add(obj);
|
|
|
}
|
|
}
|
|
|
template_variables.put("object_list_1", object_list_1);
|
|
template_variables.put("object_list_1", object_list_1);
|
|
@@ -128,7 +138,13 @@ public class ReportsAdPushServiceImpl implements IReportsAdPushService {
|
|
|
// obj.put("movieNameColor", movieNameColor);
|
|
// obj.put("movieNameColor", movieNameColor);
|
|
|
// obj.put("endAmount", m.get("water_end_amount"));
|
|
// obj.put("endAmount", m.get("water_end_amount"));
|
|
|
// obj.put("movieRealRoi", m.get("real_roi"));
|
|
// obj.put("movieRealRoi", m.get("real_roi"));
|
|
|
- obj.put("hourCostAmount", m.get("hour_cost_amount"));
|
|
|
|
|
|
|
+ Double hourCostAmount = m.getDoubleValue("hour_cost_amount");
|
|
|
|
|
+ if (hourCostAmount >= 50000){
|
|
|
|
|
+ obj.put("hourCostAmount", "<font color='red'>"+hourCostAmount+"(起量)</font>");
|
|
|
|
|
+ }else {
|
|
|
|
|
+ obj.put("hourCostAmount", ""+hourCostAmount);
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
String iaaRoi = String.valueOf(m.get("iaa_roi"));
|
|
String iaaRoi = String.valueOf(m.get("iaa_roi"));
|
|
|
String iapRoi = String.valueOf(m.get("iap_roi"));
|
|
String iapRoi = String.valueOf(m.get("iap_roi"));
|
|
|
String iaaAmount = String.valueOf(m.get("share_iaa_amount_3"));
|
|
String iaaAmount = String.valueOf(m.get("share_iaa_amount_3"));
|