权限控制

src/main/java/com/boot/security/server/dao/AdvertDao.java

@@ -28,6 +28,10 @@ public interface AdvertDao {
     @Select("select user_id userId from advertiser_user_map t group by user_id")
     List<AdvertiserData> getAdvertiserUserMap();
 
+    //从advertiser_user_map查询所有的用户
+    @Select("select advertiser_id advertiserId,advertiser_name advertiserName from advert_list t where code_id=#{codeId}")
+    AdvertiserData getAdvertiserIdBycodeId(@Param("codeId") String codeId);
+
     @Select("select *,advertiser_id advertiserId,advertiser_name,total_income totalIncome,income_seven incomeSeven,income_thirty incomeThirty,exposure_view exposureView,click_view clickView from advertiser_data_count t where advertiser_id=#{advertiserId}")
     AdvertiserData getAdvertiserDataById(@Param("advertiserId") Integer advertiserId);
 
@@ -49,7 +53,7 @@ public interface AdvertDao {
     @Select("SELECT count(*) FROM(SELECT advertiser_id FROM advertiser_user_map WHERE user_id=#{userId} and status=1) a LEFT JOIN advertiser_data_count b ON a.advertiser_id=b.advertiser_id")
     int getAdvertiserDataByUserIdCount(@Param("userId") Long userId);
 
-    @Select("select report_date reportDate,advertiser_id advertiserId,advertiser_name advertiserName,code_id codeId,sum(exposure) exposure,sum(click) click from advertiser_data_minutes t where code_id=#{advertiserData.codeId} and report_date<=#{advertiserData.reportDate} and report_date<=#{advertiserData.reportDate} group by report_date,advertiser_id,advertiser_name,code_id")
+    @Select("select report_date reportDate,advertiser_id advertiserId,advertiser_name advertiserName,code_id codeId,sum(exposure) exposure,sum(click) click from advertiser_data_minutes t where code_id=#{advertiserData.codeId} and report_date=#{advertiserData.reportDate} group by report_date,advertiser_id,advertiser_name,code_id")
     AdvertiserData getCliExExcel(@Param("advertiserData") AdvertiserData advertiserData);
 
     @Update("update advertiser_data_count set balance=#{balance},exposure_view=#{exposureView},click_view=#{clickView} where advertiser_id=#{advertiserId} ")

src/main/java/com/boot/security/server/service/impl/FileServiceImpl.java

@@ -140,17 +140,34 @@ public class FileServiceImpl implements FileService {
 				advertiserData.setClick(cliExExcel.getClick());
 			}
 		}
+		if(list.size()>0){
+			if(list.get(0).getAdvertiserId()==null){
+				for (AdvertiserData advertiserData : list) {
+					AdvertiserData data = advertDao.getAdvertiserIdBycodeId(advertiserData.getCodeId());
+					advertiserData.setAdvertiserId(data.getAdvertiserId());
+					advertiserData.setAdvertiserName(data.getAdvertiserName());
+				}
+			}
 
 			advertDao.insertAdvertDataCount(list);
+		}
 		//根据advert_data_count计算总收入、昨日收入、七日收入、30日收入插入到advertiser_data_count
 		List<AdvertiserData> advertiserDataIncome = advertDao.getAdvertiserDataIncome();
+		if(advertiserDataIncome.size()>0){
 			advertDao.insertAdvertiserDataIncome(advertiserDataIncome);
+		}
 		List<AdvertiserData> advertiserDataTotalIncome = advertDao.getAdvertiserDataTotalIncome();
+		if(advertiserDataTotalIncome.size()>0){
 			advertDao.insertAdvertiserDataTotalIncome(advertiserDataTotalIncome);
+		}
 		List<AdvertiserData> advertiserDataSevenIncome = advertDao.getAdvertiserDataSevenIncome();
+		if(advertiserDataSevenIncome.size()>0){
 			advertDao.insertAdvertiserDataSevenIncome(advertiserDataSevenIncome);
+		}
 		List<AdvertiserData> advertiserDataThirtyIncome = advertDao.getAdvertiserDataThirtyIncome();
+		if(advertiserDataThirtyIncome.size()>0){
 			advertDao.insertAdvertiserDataThirtyIncome(advertiserDataThirtyIncome);
 		}
+	}
 
 }