Sfoglia il codice sorgente

Merge branch 'dimension' into test

yumeng 3 anni fa
parent
commit
c279a153a4

+ 16 - 1
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/dimension/controller/KuaiShouDimensionStrategyController.java

@@ -1,6 +1,7 @@
 package cn.com.ctop.kuaishou.modules.dimension.controller;
 
 import cn.com.ctop.common.module.entity.UserAllocation;
+import cn.com.ctop.common.module.service.ISysRoleExtService;
 import cn.com.ctop.common.module.service.IUserAllocationService;
 import cn.com.ctop.common.module.utils.Check;
 import cn.com.ctop.common.module.utils.QueryGenerator;
@@ -23,7 +24,9 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.shiro.SecurityUtils;
 import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.common.util.DateUtils;
 import org.jeecg.common.util.oConvertUtils;
 import org.jeecgframework.poi.excel.ExcelImportUtil;
@@ -73,6 +76,8 @@ public class KuaiShouDimensionStrategyController {
     private IKuaiShouDimensionMaterialService dimensionMaterialService;
     @Autowired
     private IKuaiShouAppListService appListService;
+    @Autowired
+    private ISysRoleExtService sysRoleService;
 
 
     @GetMapping(value = "/checkStrategyName")
@@ -176,6 +181,13 @@ public class KuaiShouDimensionStrategyController {
         if (!Check.isNull(strategyName)) {
             queryWrapper.like("strategy_name", strategyName);
         }
+        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+        String roleCode = sysRoleService.getRoleCodeByUserId(sysUser.getId());
+        if (!roleCode.equals("admin")) {
+            queryWrapper.eq("user_id", sysUser.getId());
+        }
+
+        queryWrapper.orderByDesc("create_time");
         Page<KuaiShouDimensionStrategy> page = new Page<KuaiShouDimensionStrategy>(pageNo, pageSize);
         IPage<KuaiShouDimensionStrategy> pageList = kuaiShouDimensionStrategyService.page(page, queryWrapper);
         List<KuaiShouDimensionStrategy> records = pageList.getRecords();
@@ -221,7 +233,10 @@ public class KuaiShouDimensionStrategyController {
                 throw new Exception("策略配置应用不能为空");
             }
 
-            kuaiShouDimensionStrategyService.insertStrategy(strategyJson);
+            LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+
+
+            kuaiShouDimensionStrategyService.insertStrategy(sysUser.getId(), strategyJson);
             result.success("添加成功!");
         } catch (Exception e) {
             log.error(e.getMessage(), e);

+ 1 - 0
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/dimension/entity/KuaiShouDimensionStrategy.java

@@ -182,6 +182,7 @@ public class KuaiShouDimensionStrategy {
     @Excel(name = "策略名称", width = 15)
     @ApiModelProperty(value = "策略名称")
     private String strategyName;
+    private String userId;
 
     @TableField(exist = false)
     private JSONArray appInfoArray;

+ 3 - 3
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/dimension/mapper/xml/KuaiShouDimensionUnitMapper.xml

@@ -16,7 +16,8 @@
        SELECT
         t1.campaign_id as 'campaignId',
         t2.campaign_type as 'campaignType',
-        t2.campaign_name as 'campaignName'
+        t2.campaign_name as 'campaignName',
+        t2.day_budget as 'dayBudget'
         from
    	(
 		SELECT
@@ -34,8 +35,7 @@
 		*
 	    FROM
 		ctop_kuaishou_dimension_campaign
-	    WHERE strategy_id = #{strategyId}
-		and account_id = #{accountId}
+	    WHERE  account_id = #{accountId}
     )  t2
         ON t1.campaign_id = t2.campaign_id
 

+ 1 - 1
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/dimension/service/IKuaiShouDimensionStrategyService.java

@@ -14,7 +14,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface IKuaiShouDimensionStrategyService extends IService<KuaiShouDimensionStrategy> {
 
-    void insertStrategy(JSONObject strategyJson);
+    void insertStrategy(String userId, JSONObject strategyJson);
 
     JSONObject create(Long id, JSONArray materialArray);
 }

+ 17 - 19
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/dimension/service/impl/KuaiShouDimensionStrategyServiceImpl.java

@@ -83,10 +83,11 @@ public class KuaiShouDimensionStrategyServiceImpl extends ServiceImpl<KuaiShouDi
      * @param strategyJson
      */
     @Override
-    public void insertStrategy(JSONObject strategyJson) {
+    public void insertStrategy(String userId, JSONObject strategyJson) {
 
         KuaiShouDimensionStrategy dimensionStrategy = new KuaiShouDimensionStrategy();
 
+        dimensionStrategy.setUserId(userId);
         Long id = strategyJson.getLong("id"); // 主键id
         if (!Check.isNull(id)) {
             dimensionStrategy.setId(id);
@@ -297,6 +298,9 @@ public class KuaiShouDimensionStrategyServiceImpl extends ServiceImpl<KuaiShouDi
                             String inUseKey = in_use_key + account.getAccountId();
                             redisUtil.del(inUseKey);
                             campaignId = getCampaignId(account.getAccountId(), account, strategy);
+                            if (Check.isNull(campaignId)) {
+                                continue;
+                            }
                             countKey = campaign_relation_unit + campaignId;
                         } else {
                             count = createCount;
@@ -414,7 +418,7 @@ public class KuaiShouDimensionStrategyServiceImpl extends ServiceImpl<KuaiShouDi
                             } else {
                                 unit.setIntentionTarget(false);
                             }
-                        }else{
+                        } else {
                             unit.setIntentionTarget(false);
                         }
                     } else {
@@ -438,30 +442,24 @@ public class KuaiShouDimensionStrategyServiceImpl extends ServiceImpl<KuaiShouDi
                     if (!Check.isNull(intelli_extend)) {
                         if (intelli_extend == 0) {
                             unit.setIsOpen(0);
-                        } else {
+                        } else if (intelli_extend == 1) {
                             unit.setIsOpen(1);
-                            if (intelli_extend == 2) {
-                                if (!Check.isNull(ages_range)) {
-                                    if (!"unlimited".equals(ages_range)) {
-                                        unit.setNoAgeBreak(1);
-                                    }
+                            if (!Check.isNull(ages_range)) {
+                                if (!"unlimited".equals(ages_range)) {
+                                    unit.setNoAgeBreak(1);
                                 }
                             }
-                            if (intelli_extend == 3) {
-                                if (!Check.isNull(gender)) {
-                                    if (!"unlimited".equals(gender)) {
-                                        unit.setNoGenderBreak(1);
-                                    }
+                            if (!Check.isNull(gender)) {
+                                if (!"unlimited".equals(gender)) {
+                                    unit.setNoGenderBreak(1);
                                 }
                             }
-                            if (intelli_extend == 4) {
-                                if (!Check.isNull(region)) {
-                                    if (!"unlimited".equals(region)) {
-                                        unit.setNoAreaBreak(1);
-                                    }
+                            if (!Check.isNull(region)) {
+                                if (!"unlimited".equals(region)) {
+                                    unit.setNoAreaBreak(1);
                                 }
-
                             }
+
                         }
                     }
                     redisUtil.set(countKey, count + 1);

+ 5 - 1
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/dimension/service/impl/KuaiShouDimensionUnitServiceImpl.java

@@ -199,6 +199,10 @@ public class KuaiShouDimensionUnitServiceImpl extends ServiceImpl<KuaiShouDimens
             target.put("paid_audience", JSONArray.parseArray(unit.getPaidAudience()));
         }
 
+        if (!Check.isNull(unit.getFilterConvertedLevel())) {
+            target.put("filter_converted_level", unit.getFilterConvertedLevel());
+        }
+
         if (!Check.isNull(unit.getIsOpen())) {
             if (unit.getIsOpen() == 1) {
                 JSONObject intelli_extend = new JSONObject();
@@ -269,7 +273,7 @@ public class KuaiShouDimensionUnitServiceImpl extends ServiceImpl<KuaiShouDimens
         queryWrapper.eq("account_id", accountId);
         queryWrapper.eq("campaign_id", campaignId);
         queryWrapper.eq("submit_status", 0);
-        queryWrapper.orderByDesc("create_time");
+        queryWrapper.orderByDesc("unit_name");
         return dimensionUnitMapper.selectList(queryWrapper);
     }
 

+ 5 - 1
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/dimension/service/impl/KuaiShouDimensionVariableServiceImpl.java

@@ -78,8 +78,12 @@ public class KuaiShouDimensionVariableServiceImpl extends ServiceImpl<KuaiShouDi
         if (!Check.isNull(appIdArray)) {
             List<JSONObject> appIdList = new ArrayList<>();
             for (int i = 0; i < appIdArray.size(); i++) {
+                JSONArray app_ids = appIdArray.getJSONArray(i);
+                if (Check.isNull(app_ids)) {
+                    continue;
+                }
                 JSONObject appIdJson = new JSONObject();
-                appIdJson.put("app_ids", appIdArray.getJSONArray(i));
+                appIdJson.put("app_ids", app_ids);
                 appIdList.add(appIdJson);
             }
             inputList.add(appIdList);