yumeng 3 年 前
コミット
ea868cb32e

+ 5 - 42
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/controller/BatchController.java

@@ -10,42 +10,13 @@ import cn.com.ctop.common.module.utils.BigDecimalUtil;
 import cn.com.ctop.common.module.utils.Check;
 import cn.com.ctop.common.module.utils.QueryGenerator;
 import cn.com.ctop.common.module.utils.RandomUtil;
-import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouActionBarText;
-import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouAdvertiserBaseInfo;
-import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouAppInfo;
-import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouAppList;
-import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouCampaign;
-import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouCreative;
-import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouDirectionalTemplate;
-import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouGroup;
-import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouGroupTarget;
-import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouImageGet;
-import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouRegionListParent;
-import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouTargetingTags;
-import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouVideoGet;
-import cn.com.ctop.kuaishou.modules.batch.entity.KuaishouPopulation;
+import cn.com.ctop.kuaishou.modules.batch.entity.*;
 import cn.com.ctop.kuaishou.modules.batch.entity.vo.ConvertVo;
 import cn.com.ctop.kuaishou.modules.batch.entity.vo.SpendVo;
 import cn.com.ctop.kuaishou.modules.batch.mapper.KuaiShouCampaignMapper;
 import cn.com.ctop.kuaishou.modules.batch.mapper.KuaiShouGroupMapper;
 import cn.com.ctop.kuaishou.modules.batch.mapper.KuaiShouTargetingTagsMapper;
-import cn.com.ctop.kuaishou.modules.batch.service.IBatchService;
-import cn.com.ctop.kuaishou.modules.batch.service.IKuaiShouActionBarTextService;
-import cn.com.ctop.kuaishou.modules.batch.service.IKuaiShouAdvertiserBaseInfoService;
-import cn.com.ctop.kuaishou.modules.batch.service.IKuaiShouAppInfoService;
-import cn.com.ctop.kuaishou.modules.batch.service.IKuaiShouAppListService;
-import cn.com.ctop.kuaishou.modules.batch.service.IKuaiShouCampaignService;
-import cn.com.ctop.kuaishou.modules.batch.service.IKuaiShouCreativeService;
-import cn.com.ctop.kuaishou.modules.batch.service.IKuaiShouDirectionalTemplateService;
-import cn.com.ctop.kuaishou.modules.batch.service.IKuaiShouGroupService;
-import cn.com.ctop.kuaishou.modules.batch.service.IKuaiShouGroupTargetService;
-import cn.com.ctop.kuaishou.modules.batch.service.IKuaiShouImageGetService;
-import cn.com.ctop.kuaishou.modules.batch.service.IKuaiShouRegionListParentService;
-import cn.com.ctop.kuaishou.modules.batch.service.IKuaiShouUpdateService;
-import cn.com.ctop.kuaishou.modules.batch.service.IKuaiShouVideoGetService;
-import cn.com.ctop.kuaishou.modules.batch.service.IKuaishouInterfaceService;
-import cn.com.ctop.kuaishou.modules.batch.service.IKuaishouPopulationService;
-import cn.com.ctop.kuaishou.modules.batch.service.ISyncPullMaterialService;
+import cn.com.ctop.kuaishou.modules.batch.service.*;
 import cn.com.ctop.kuaishou.modules.report.service.IEtlKuaiShouGroupDailyReportService;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
@@ -57,14 +28,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.util.DateUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
 import java.math.BigDecimal;
@@ -2285,9 +2249,8 @@ public class BatchController {
     public Result<Boolean> syncVideo(Long accountId) {
         Result<Boolean> result = new Result<>();
         try {
-            String nowDate = DateUtils.getNowDate("yyyy-MM-dd");
-            String startDate = DateUtils.getAnotherDay("yyyy-MM-dd", nowDate, -7);
-            syncPullMaterialService.getSyncVideoList(accountId, startDate, nowDate);
+
+            syncPullMaterialService.getSyncVideoList(accountId, null, null);
             result.setSuccess(true);
             result.setResult(true);
         } catch (Exception e) {

+ 12 - 3
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/dimension/controller/KuaiShouDimensionUnitController.java

@@ -181,10 +181,14 @@ public class KuaiShouDimensionUnitController {
      */
     @ApiOperation(value = " 多维度测试组列表-编辑", notes = " 多维度测试组列表-编辑")
     @PostMapping(value = "/editBatch")
-    public Result<KuaiShouDimensionUnit> editBatch(@RequestBody JSONObject requestJson) {
-        Result<KuaiShouDimensionUnit> result = new Result<KuaiShouDimensionUnit>();
+    public Result<Boolean> editBatch(@RequestBody JSONObject requestJson) {
+        Result<Boolean> result = new Result<>();
 
         try {
+            Long strategyId = requestJson.getLong("strategyId");
+            if (Check.isNull(strategyId)) {
+                throw new Exception("请输入策略id");
+            }
             Integer submitStatus = requestJson.getInteger("submitStatus");
             if (Check.isNull(submitStatus)) {
                 throw new Exception("请输入修改状态");
@@ -194,13 +198,18 @@ public class KuaiShouDimensionUnitController {
                 throw new Exception("请输入需修改的账户id");
             }
             kuaiShouDimensionUnitService.editBatch(submitStatus, ids);
+            Integer countCount = kuaiShouDimensionUnitService.getUnitCountByStrategyId(strategyId);
+            if (countCount > 0) {
+                result.setResult(true);
+            } else {
+                result.setResult(false);
+            }
             result.setSuccess(true);
             result.setMessage("编辑成功");
         } catch (Exception e) {
             e.printStackTrace();
             result.setSuccess(false);
             result.setMessage("编辑失败");
-
         }
 
 

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

@@ -22,4 +22,6 @@ public interface KuaiShouDimensionUnitMapper extends BaseMapper<KuaiShouDimensio
     Integer getUnitCount(@Param("accountId") Long accountId);
 
     void editBatch(@Param("submitStatus") Integer submitStatus, @Param("ids") JSONArray ids);
+
+    Integer getUnitCountByStrategyId(@Param("strategyId") Long strategyId);
 }

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

@@ -49,4 +49,10 @@
 			account_id = #{accountId}
 		AND submit_status = 0
 	</select>
+    <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
+
+	</select>
 </mapper>

+ 2 - 0
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/dimension/service/IKuaiShouDimensionUnitService.java

@@ -28,4 +28,6 @@ public interface IKuaiShouDimensionUnitService extends IService<KuaiShouDimensio
     List<KuaiShouDimensionUnit> getUnitListBy(Long strategyId, Long accountId, Long campaignId);
 
     void editBatch(Integer submitStatus, JSONArray ids);
+
+    Integer getUnitCountByStrategyId(Long strategyId);
 }

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

@@ -279,4 +279,9 @@ public class KuaiShouDimensionUnitServiceImpl extends ServiceImpl<KuaiShouDimens
         dimensionUnitMapper.editBatch(submitStatus, ids);
     }
 
+    @Override
+    public Integer getUnitCountByStrategyId(Long strategyId) {
+        return dimensionUnitMapper.getUnitCountByStrategyId(strategyId);
+    }
+
 }