权限控制

src/main/java/com/boot/security/server/controller/AdvertiserController.java

@@ -68,7 +68,7 @@ public class AdvertiserController {
     @PostMapping("/syncAdvertiserData")
     @ApiOperation(value = "同步cms广告主数据")
     @ResponseBody
-    public void syncAdvertiserData(@RequestBody PageTableRequest request) {
+    public void syncAdvertiserData() {
         advertiserService.syncAdvertiserAndAdvert();
     }
 }

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

@@ -157,10 +157,15 @@ public class AdvertiserServiceImpl implements AdvertiserService {
         advertiserData = advertDao.getAdvertiserData();
         for (AdvertiserData data : advertiserData) {
             List<AdvertiserData> exFromRedis = getExFromRedis(data);
+            if(exFromRedis!=null){
                 advertDao.insertAdvertDataMinuteEx(exFromRedis);
+            }
             List<AdvertiserData> clFromRedis = getCliFromRedis(data);
+            if(clFromRedis!=null){
                 advertDao.insertAdvertDataMinuteCl(clFromRedis);
             }
+
+        }
     }
 
     public void getRedisExCli(AdvertiserData advertiserData){
@@ -176,6 +181,9 @@ public class AdvertiserServiceImpl implements AdvertiserService {
         String date = new SimpleDateFormat("yyyy-MM-dd").format(new Date());
         String exposureKey="redisAdvertDataDayExposure:"+date+":"+advertiserData.getAdvertiserId();
         Map<String, Integer> exposureMap = JedisHelper.hgetAll(Integer.class, exposureKey);
+        if(exposureMap.isEmpty()){
+            return null;
+        }
         List<String> minutesCodeIdExposure = mapToList(exposureMap);
         List<AdvertiserData> list=new ArrayList<>();
         for (String s : minutesCodeIdExposure) {
@@ -186,6 +194,7 @@ public class AdvertiserServiceImpl implements AdvertiserService {
             data.setMinutes(s.split(",")[0]);
             data.setCodeId(s.split(",")[1]);
             data.setExposure(Integer.valueOf(s.split(",")[2]));
+            list.add(data);
         }
         return list;
     }
@@ -195,6 +204,9 @@ public class AdvertiserServiceImpl implements AdvertiserService {
         String date = new SimpleDateFormat("yyyy-MM-dd").format(new Date());
         String clickKey="redisAdvertDataDayClick:"+date+":"+advertiserData.getAdvertiserId();
         Map<String, Integer> clickMap = JedisHelper.hgetAll(Integer.class, clickKey);
+        if(clickMap.isEmpty()){
+            return null;
+        }
         List<String> minutesCodeIdClick = mapToList(clickMap);
         List<AdvertiserData> list=new ArrayList<>();
         for (String s : minutesCodeIdClick) {
@@ -205,6 +217,7 @@ public class AdvertiserServiceImpl implements AdvertiserService {
             data.setMinutes(s.split(",")[0]);
             data.setCodeId(s.split(",")[1]);
             data.setClick(Integer.valueOf(s.split(",")[2]));
+            list.add(data);
         }
         return list;
     }

src/main/resources/config.properties

@@ -28,5 +28,5 @@ redis.pool.timeout=500
 #redis集群服务数
 redis.cluster.count=1
 #redis集群服务地址
-redis.cluster.master.1.host=172.17.255.212
+redis.cluster.master.1.host=172.17.255.136
 redis.cluster.master.1.port=6379

src/main/resources/mybatis-mappers/AdvertMapper.xml

@@ -127,14 +127,12 @@
         INSERT INTO advertiser_data_minutes(report_date,advertiser_id, advertiser_name,code_id,minutes,exposure)
         VALUES
         <foreach collection="list" item="item" index="index" separator=",">
-            (#{item.reportDate},#{item.advertiserId},#{item.advertiserName},#{item.codeId},#{item.minutes},#{item.exposure})
+            ( #{item.reportDate},#{item.advertiserId},
+            #{item.advertiserName},#{item.codeId},
+            #{item.minutes},
+            #{item.exposure} )
         </foreach>
         ON DUPLICATE KEY UPDATE
-        report_date = VALUES(report_date),
-        advertiser_id = VALUES(advertiser_id),
-        advertiser_name = VALUES(advertiser_name),
-        code_id = VALUES(code_id),
-        minutes = VALUES(minutes),
         exposure = VALUES(exposure)
     </insert>
 
@@ -145,11 +143,6 @@
             (#{item.reportDate},#{item.advertiserId},#{item.advertiserName},#{item.codeId},#{item.minutes},#{item.click})
         </foreach>
         ON DUPLICATE KEY UPDATE
-        report_date = VALUES(report_date),
-        advertiser_id = VALUES(advertiser_id),
-        advertiser_name = VALUES(advertiser_name),
-        code_id = VALUES(code_id),
-        minutes = VALUES(minutes),
         click = VALUES(click)
     </insert>
 </mapper>
\ No newline at end of file

src/main/resources/static/pages/advertiserManager/advertiserManager.html

@@ -21,9 +21,6 @@
 <script type="text/javascript" src="../../layui/layui.js"></script>
 <script type="text/javascript" src="../../js/my/permission.js"></script>
 <script src="../../js/libs/jquery.treetable.js"></script>
-<script type="text/html" id="viewData">
-    <a class="layui-btn layui-btn-xs" lay-event="edit">编辑</a>
-</script>
 <script>
 
     $(".layui-btn").click(function() {
@@ -35,8 +32,6 @@
             //请求地址
             url : "/advertiserController/syncAdvertiserData",
             async:false,
-            //数据，json字符串
-            data : JSON.stringify(json),
             //请求成功
             success : function(result) {
                 layer.msg("同步成功");