浏览代码

代码合并

yumeng 4 年之前
父节点
当前提交
781b46465d

+ 1 - 1
jeecg-boot-module-system/src/main/java/cn/com/ctop/kuaishou/modules/dimension/controller/KuaiShouDimensionAccountController.java

@@ -57,7 +57,7 @@ public class KuaiShouDimensionAccountController {
 
     @Autowired
     private ICtopOauthTokenService oauthTokenService;
-    static ExecutorService accountService = Executors.newFixedThreadPool(2);
+    static ExecutorService accountService = Executors.newFixedThreadPool(5);
 
 
     /**

+ 5 - 0
jeecg-boot-module-system/src/main/java/cn/com/ctop/kuaishou/modules/dimension/controller/KuaiShouDimensionStrategyController.java

@@ -181,11 +181,14 @@ public class KuaiShouDimensionStrategyController {
         if (!Check.isNull(strategyName)) {
             queryWrapper.like("strategy_name", strategyName);
         }
+        queryWrapper.orderByDesc("create_time");
         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();
@@ -232,6 +235,8 @@ public class KuaiShouDimensionStrategyController {
             }
 
             LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+
+
             kuaiShouDimensionStrategyService.insertStrategy(sysUser.getId(), strategyJson);
             result.success("添加成功!");
         } catch (Exception e) {

+ 0 - 1
jeecg-boot-module-system/src/main/java/cn/com/ctop/kuaishou/modules/dimension/controller/KuaiShouDimensionVariableController.java

@@ -200,7 +200,6 @@ public class KuaiShouDimensionVariableController {
     /**
      * 通过id查询
      *
-     * @param strategyId
      * @return
      */
     @ApiOperation(value = "多维度测试变量配置-通过id查询", notes = "多维度测试变量配置-通过id查询")

+ 15 - 15
jeecg-boot-module-system/src/main/java/cn/com/ctop/kuaishou/modules/dimension/mapper/xml/KuaiShouDimensionUnitMapper.xml

@@ -1,22 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="cn.com.ctop.kuaishou.modules.dimension.mapper.KuaiShouDimensionUnitMapper">
-    <update id="editBatch">
-        update ctop_kuaishou_dimension_unit
-        set submit_status = #{submitStatus}
-        where id in
-        <foreach collection="ids" item="item" separator=","
-                 open="(" close=")">
-            #{item}
-        </foreach>
+	<update id="editBatch">
+		update ctop_kuaishou_dimension_unit
+		set submit_status = #{submitStatus}
+		where id in
+		<foreach collection="ids" item="item" separator=","
+				 open="(" close=")">
+			#{item}
+		</foreach>
 
-    </update>
+	</update>
 
-    <select id="getCampaignCount" resultType="com.alibaba.fastjson.JSONObject">
+	<select id="getCampaignCount" resultType="com.alibaba.fastjson.JSONObject">
        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,13 +35,12 @@
 		*
 	    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
 
     </select>
-    <select id="getUnitCount" resultType="java.lang.Integer">
+	<select id="getUnitCount" resultType="java.lang.Integer">
 		SELECT
 			count(1) as 'count'
 		FROM
@@ -49,7 +49,7 @@
 			and account_id = #{accountId}
 		AND submit_status = 0
 	</select>
-    <select id="getUnitCountByStrategyId" resultType="java.lang.Integer">
+	<select id="getUnitCountByStrategyId" resultType="java.lang.Integer">
 		select  count(1) as 'count'  from
 		ctop_kuaishou_dimension_unit where strategy_id = #{strategyId}
 		and  submit_status = 0

+ 3 - 0
jeecg-boot-module-system/src/main/java/cn/com/ctop/kuaishou/modules/dimension/service/impl/KuaiShouDimensionStrategyServiceImpl.java

@@ -297,6 +297,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;