Parcourir la source

新上监控提交

zhouzeyu@c-top.com.cn il y a 3 ans
Parent
commit
cb0acea46f

+ 4 - 3
jeecg-boot-module-system/src/main/java/cn/com/ctop/kuaishou/modules/report/mapper/NewMonitorMapper.java

@@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSONObject;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.math.BigDecimal;
 import java.util.List;
 import java.util.Map;
 
@@ -19,11 +20,11 @@ public interface NewMonitorMapper {
 
     List<Map> getTouTiaoCampaign(@Param("date")String date,@Param("accountId")String accountId);
 
-    String getGroupCharge(@Param("unitId")String unitId,@Param("afterDate")String afterDate);
+    BigDecimal getGroupCharge(@Param("unitId")String unitId, @Param("afterDate")String afterDate);
 
-    String getCampaignCharge(@Param("campaignId")String campaignId,@Param("afterDate")String afterDate);
+    BigDecimal getCampaignCharge(@Param("campaignId")String campaignId,@Param("afterDate")String afterDate);
 
-    String getCampaignChargeTouTiao(@Param("campaignId")String campaignId,@Param("afterDate")String afterDate);
+    BigDecimal getCampaignChargeTouTiao(@Param("campaignId")String campaignId,@Param("afterDate")String afterDate);
 
     void saveMonitorGroup(@Param("accountId")String accountId,@Param("accountName")String accountName,@Param("operatingName")String operatingName,@Param("unitId")String unitId,@Param("createTime")String createTime,@Param("projectType")String projectType,@Param("effective")String effective);
 

+ 3 - 3
jeecg-boot-module-system/src/main/java/cn/com/ctop/kuaishou/modules/report/mapper/xml/NewMonitorMapper.xml

@@ -50,17 +50,17 @@
         </where>
     </select>
 
-    <select id="getGroupCharge" resultType="String">
+    <select id="getGroupCharge" resultType="BigDecimal">
 
         select sum(charge) from ctop_kuaishou_report_daily_group t where t.stat_date &lt; #{afterDate} and t.unit_id=#{unitId}
     </select>
 
-    <select id="getCampaignCharge" resultType="String">
+    <select id="getCampaignCharge" resultType="BigDecimal">
 
         select sum(charge) from ctop_kuaishou_report_daily_campaign t where t.stat_date &lt; #{afterDate} and t.campaign_id=#{campaignId}
     </select>
 
-    <select id="getCampaignChargeTouTiao" resultType="String">
+    <select id="getCampaignChargeTouTiao" resultType="BigDecimal">
 
         select sum(cost) from ctop_bytedance_report_plan_daily t where t.stat_datetime &lt; #{afterDate} and t.ad_id=#{campaignId}
     </select>

+ 7 - 6
jeecg-boot-module-system/src/main/java/cn/com/ctop/kuaishou/modules/report/service/impl/NewMonitorServiceImpl.java

@@ -10,6 +10,7 @@ import org.jeecg.common.util.DateUtils;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.math.BigDecimal;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
@@ -58,10 +59,10 @@ public class NewMonitorServiceImpl implements NewMonitorService {
                                 String userName = obj.get("userName") == null ? null : (String) obj.get("userName");
                                 String groupCreatTime = obj.get("groupCreatTime") == null ? null : (String) obj.get("groupCreatTime");
                                 if (unitId != null && afterTime != null) {
-                                    String groupCharge = newMonitorMapper.getGroupCharge(unitId, afterTime);
+                                    BigDecimal groupCharge = newMonitorMapper.getGroupCharge(unitId, afterTime);
                                     //大于500为有效广告组
                                     String effective = "0";
-                                    if (groupCharge != null && Long.parseLong(groupCharge) > 500) {
+                                    if (groupCharge != null && groupCharge.compareTo(new BigDecimal(500)) ==1 ) {
                                         //有效
                                         effective = "1";
                                     }
@@ -102,10 +103,10 @@ public class NewMonitorServiceImpl implements NewMonitorService {
                                 String userName = obj.get("userName") == null ? null : (String) obj.get("userName");
                                 String campaignCreatTime = obj.get("campaignCreatTime") == null ? null : (String) obj.get("campaignCreatTime");
                                 if (campaignId != null && afterTime != null) {
-                                    String campaignCharge = newMonitorMapper.getCampaignCharge(campaignId, afterTime);
+                                    BigDecimal campaignCharge = newMonitorMapper.getCampaignCharge(campaignId, afterTime);
                                     //大于500为有效广告计划
                                     String effective = "0";
-                                    if (campaignCharge != null && Long.parseLong(campaignCharge) > 500) {
+                                    if (campaignCharge != null && campaignCharge.compareTo(new BigDecimal(500)) ==1) {
                                         //有效
                                         effective = "1";
                                     }
@@ -144,10 +145,10 @@ public class NewMonitorServiceImpl implements NewMonitorService {
                                 String userName = obj.get("userName") == null ? null : (String) obj.get("userName");
                                 String campaignCreatTime = obj.get("campaignCreatTime") == null ? null : (String) obj.get("campaignCreatTime");
                                 if (campaignId != null && afterTime != null) {
-                                    String campaignCharge = newMonitorMapper.getCampaignChargeTouTiao(campaignId, afterTime);
+                                    BigDecimal campaignCharge = newMonitorMapper.getCampaignChargeTouTiao(campaignId, afterTime);
                                     //大于500为有效广告计划
                                     String effective = "0";
-                                    if (campaignCharge != null && Long.parseLong(campaignCharge) > 500) {
+                                    if (campaignCharge != null && campaignCharge.compareTo(new BigDecimal(500)) ==1) {
                                         //有效
                                         effective = "1";
                                     }