Quellcode durchsuchen

项目自动化功能调试修改

zhaoxian vor 4 Jahren
Ursprung
Commit
3a9dfb0778

+ 31 - 14
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/ai/controller/KuaishouAppPackageController.java

@@ -78,8 +78,8 @@ public class KuaishouAppPackageController {
     @GetMapping(value = "/getProjectAppList")
     public Result<Object> getProjectAppList(Long projectId) {
         try {
-            if(Check.isNull(projectId)){
-                return  Result.error("缺少参数");
+            if (Check.isNull(projectId)) {
+                return Result.error("缺少参数");
             }
             return kuaishouAppPackageService.getProjectAppList(projectId);
         } catch (Exception e) {
@@ -92,12 +92,12 @@ public class KuaishouAppPackageController {
     public Result<Object> getAppsDetail(@RequestBody JSONObject data) {
         try {
             String ids = data.getString("ids");
-            if(Check.isNull(ids)){
-                return  Result.error("缺少参数");
+            if (Check.isNull(ids)) {
+                return Result.error("缺少参数");
             }
             List<Long> list = JSONObject.parseObject(ids, List.class);
-            if(list.size()==0){
-                return  Result.error("缺少参数");
+            if (list.size() == 0) {
+                return Result.error("缺少参数");
             }
             return kuaishouAppPackageService.getAppsDetail(list);
         } catch (Exception e) {
@@ -107,19 +107,36 @@ public class KuaishouAppPackageController {
     }
 
     @PostMapping(value = "/edit")
-    public Result<KuaishouAppPackageRel> edit(@RequestBody KuaishouAppPackageRel kuaishouAppPackage) {
-        Result<KuaishouAppPackageRel> result = new Result<KuaishouAppPackageRel>();
-        KuaishouAppPackageRel packageRel = kuaishouAppPackageRelService.getById(kuaishouAppPackage.getId());
+    public Result<Object> edit(@RequestBody JSONObject data) {
+        String impressionUrl = data.getString("impressionUrl");
+        String trackUrl = data.getString("trackUrl");
+        if (Check.isNull(impressionUrl) || Check.isNull(trackUrl)) {
+            return Result.error("缺少参数");
+        }
+        Long id = data.getLong("id");
+        KuaishouAppPackageRel packageRel = kuaishouAppPackageRelService.getById(id);
         if (packageRel == null) {
-            result.error500("未找到对应实体");
+            return Result.error("未找到对应实体");
         } else {
-            boolean ok = kuaishouAppPackageRelService.updateById(kuaishouAppPackage);
+            boolean ok = false;
+            if (!Check.isNull(impressionUrl)) {
+                packageRel.setImpressionUrl(impressionUrl);
+                ok = kuaishouAppPackageRelService.updateById(packageRel);
+            }
+            if (!Check.isNull(trackUrl)) {
+                KuaishouAppPackage appTem = kuaishouAppPackageService.getById(packageRel.getApptemId());
+                if (!Check.isNull(appTem)) {
+                    appTem.setTrackUrl(trackUrl);
+                    ok = kuaishouAppPackageService.updateById(appTem);
+                }
+            }
             if (ok) {
-                result.success("修改成功!");
+                return Result.ok("修改成功!");
             }
         }
-        return result;
+        return Result.error("修改失败");
     }
+
     /**
      * 查询相关账户
      *
@@ -351,7 +368,7 @@ public class KuaishouAppPackageController {
             if (Check.isNull(projectId) || Check.isNull(appVersion)) {
                 return Result.error("缺失参数");
             }
-            List<Long> list = kuaishouAppPackageService.queryByAppVersion(projectId, appVersion,null);
+            List<Long> list = kuaishouAppPackageService.queryByAppVersion(projectId, appVersion, null);
             if (Check.isNull(list)) {
                 return Result.ok("success");
             } else {

+ 34 - 1
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/ai/controller/KuaishouProjectStrategyController.java

@@ -1,5 +1,7 @@
 package cn.com.ctop.kuaishou.modules.ai.controller;
 
+import cn.com.ctop.common.module.entity.Project;
+import cn.com.ctop.common.module.service.IProjectService;
 import cn.com.ctop.common.module.service.IUserAllocationService;
 import cn.com.ctop.common.module.utils.Check;
 import cn.com.ctop.common.module.utils.QueryGenerator;
@@ -57,6 +59,9 @@ public class KuaishouProjectStrategyController {
     private IKuaishouProjectStrategyService kuaishouProjectStrategyService;
     @Autowired
     private IUserAllocationService userAllocationService;
+    @Autowired
+    private IProjectService projectService;
+
 
     /**
      * 项目配置列表
@@ -130,6 +135,26 @@ public class KuaishouProjectStrategyController {
     }
 
     /**
+     * 校验是否有开启的项目
+     */
+    @GetMapping(value = "/checkProjectisOpen")
+    public Result<Object> checkProjectisOpen(Long projectId) {
+        try {
+            if (Check.isNull(projectId)) {
+                return Result.error("缺失参数");
+            }
+            boolean ok = kuaishouProjectStrategyService.checkProjectisOpen(projectId);
+            if (ok) {
+                return Result.ok("success");
+            }
+        } catch (Exception e) {
+            log.error("修改异常,", e.getMessage());
+            e.printStackTrace();
+        }
+        return Result.error("fail");
+    }
+
+    /**
      * 出价反显展示
      */
     @GetMapping(value = "/queryBidInfo")
@@ -150,6 +175,10 @@ public class KuaishouProjectStrategyController {
     public Result<Object> queryMatchResult(@RequestParam(name = "id", required = true) String id) {
         Result<KuaishouProjectStrategy> result = new Result<>();
         try {
+            //账户名称:authName
+            //账户状态:authStatus
+            //失败原因:resultText
+
             return kuaishouProjectStrategyService.queryMatchResult(id);
         } catch (Exception e) {
             e.printStackTrace();
@@ -165,7 +194,7 @@ public class KuaishouProjectStrategyController {
     public Result<KuaishouProjectStrategy> createProjectStrategy(@RequestBody JSONObject data) {
         Result<KuaishouProjectStrategy> result = new Result<>();
         try {
-            KuaishouProjectStrategy kuaishouProjectStrategy = JSONObject.parseObject(data.toJSONString(),KuaishouProjectStrategy.class);
+            KuaishouProjectStrategy kuaishouProjectStrategy = JSONObject.parseObject(data.toJSONString(), KuaishouProjectStrategy.class);
             kuaishouProjectStrategy.setStatDate(DateUtils.getNowDate("yyyy-MM-dd"));
             kuaishouProjectStrategyService.saveOrUpdate(kuaishouProjectStrategy);
             result.success("操作成功!");
@@ -228,6 +257,10 @@ public class KuaishouProjectStrategyController {
         if (kuaishouProjectStrategy == null) {
             result.error500("未找到对应实体");
         } else {
+            Project project = projectService.getById(kuaishouProjectStrategy.getProjectId());
+            if (Check.isNull(project)) {
+                kuaishouProjectStrategy.setProjectName(project.getProjectName());
+            }
             result.setResult(kuaishouProjectStrategy);
             result.setSuccess(true);
         }

+ 2 - 0
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/ai/entity/KuaishouProjectStrategy.java

@@ -367,4 +367,6 @@ public class KuaishouProjectStrategy {
     private String strategyUuid;
     @TableField(exist = false)
     private Long campaignId;
+    @TableField(exist = false)
+    private String projectName;
 }

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

@@ -22,4 +22,6 @@ public interface KuaishouProjectStrategyMapper extends BaseMapper<KuaishouProjec
     JSONObject queryProjectAll(JSONObject data);
 
     JSONObject queryAccountAll(JSONObject data);
+
+    int checkProjectisOpen(Long projectId);
 }

+ 8 - 1
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/ai/mapper/xml/KuaishouProjectStrategyMapper.xml

@@ -40,7 +40,7 @@
                 LEFT JOIN ctop_etl_kuaishou_report_account_daily t2 ON t2.account_id = t1.accountId
         where t2.stat_date &gt;=#{startTime}
         and t2.stat_date &lt;=#{endTime}
-        GROUP BY t1.projectId
+        GROUP BY t1.id
         <if test="sortCode != '' and sortCode != null ">
             ORDER BY ${sortCode} ${sortType}
         </if>
@@ -149,4 +149,11 @@
     </select>
 
 
+    <select id="checkProjectisOpen" resultType="java.lang.Integer">
+        SELECT 1 FROM ctop_ai_kuaishou_project_strategy WHERE data_status = 1
+        AND project_id = #{projectId}
+        LIMIT 1
+    </select>
+
+
 </mapper>

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

@@ -19,4 +19,6 @@ public interface IKuaishouProjectStrategyService extends IService<KuaishouProjec
     Result<Object> queryAccountList(JSONObject data);
 
     Result<Object> queryMatchResult(String id);
+
+    boolean checkProjectisOpen(Long projectId);
 }

+ 6 - 0
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/ai/service/impl/KuaishouProjectStrategyServiceImpl.java

@@ -55,4 +55,10 @@ public class KuaishouProjectStrategyServiceImpl extends ServiceImpl<KuaishouProj
     public Result<Object> queryMatchResult(String id) {
         return null;
     }
+
+    @Override
+    public boolean checkProjectisOpen(Long projectId) {
+        int num = kuaishouProjectStrategyMapper.checkProjectisOpen(projectId);
+        return  num>0;
+    }
 }