Parcourir la source

人群包功能开发

zhaoxian il y a 4 ans
Parent
commit
d4a87aeb32

+ 2 - 2
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/ai/controller/KuaishouCrowdPackController.java

@@ -113,11 +113,11 @@ public class KuaishouCrowdPackController {
     }
 
     @GetMapping(value = "/queryFailReason")
-    public Result<Object> queryFailReason(Long orientationId,
+    public Result<Object> queryFailReason(String signature,
                                           @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
                                           @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) {
         try {
-            return kuaishouCrowdPackService.queryFailReason(orientationId, pageNo, pageSize);
+            return kuaishouCrowdPackService.queryFailReason(signature, pageNo, pageSize);
         } catch (Exception e) {
             log.error("查询异常,", e.getMessage());
             e.printStackTrace();

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

@@ -25,7 +25,7 @@ public interface KuaishouCrowdPackMapper extends BaseMapper<KuaishouCrowdPack> {
 
     void updateBatch(@Param(value = "details") JSONArray details);
 
-    List<JSONObject> queryFailReason(@Param(value = "orientationId") Long orientationId);
+    List<JSONObject> queryFailReason(@Param(value = "signature") String signature);
 
     List<JSONObject> queryRelAccounts(@Param(value = "signature") String signature);
 

+ 2 - 3
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/ai/mapper/xml/KuaishouCrowdPackMapper.xml

@@ -97,9 +97,8 @@
         FROM ctop_kuaishou_crowd_package t1
                  INNER JOIN ctop_user_allocation t2 ON t1.account_id = t2.account_id
                  INNER JOIN ctop_project t3 ON t2.project_id = t3.id
-        WHERE t1.orientation_id = #{orientationId}
-          AND t1.message !='OK' OR t1.message !='PUSH OK'
-          AND  t1.data_status = 1
+        WHERE t1.signature = #{signature}
+          AND  t1.data_status = 0
     </select>
 
     <select id="queryRelAccounts" resultType="com.alibaba.fastjson.JSONObject">

+ 1 - 1
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/ai/service/IKuaishouCrowdPackService.java

@@ -23,7 +23,7 @@ public interface IKuaishouCrowdPackService extends IService<KuaishouCrowdPack> {
 
     Result<Object> queryRel(String type, String signature, Integer pageNo, Integer pageSize);
 
-    Result<Object> queryFailReason(Long orientationId, Integer pageNo, Integer pageSize);
+    Result<Object> queryFailReason(String signature, Integer pageNo, Integer pageSize);
 
     Result<Object> updateDataStatus(KuaishouCrowdPack kuaishouCrowdPack);
 }

+ 11 - 9
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/ai/service/impl/KuaishouCrowdPackServiceImpl.java

@@ -111,11 +111,13 @@ public class KuaishouCrowdPackServiceImpl extends ServiceImpl<KuaishouCrowdPackM
                 this.save(crowdPack);
             } else {
                 KuaishouCrowdPack crowdPack = new KuaishouCrowdPack();
+                crowdPack.setAccountId(accountId);
+                crowdPack.setOrientationName(orientationName);
                 crowdPack.setSignature(md5);
                 crowdPack.setUrl(url);
                 crowdPack.setMessage(jsonObject.getString("message"));
                 crowdPack.setStatDate(DateUtils.formatDate(new Date()));
-                crowdPack.setDataStatus(1);
+                crowdPack.setDataStatus(0);
                 this.save(crowdPack);
                 return Result.error(jsonObject.getString("message"));
             }
@@ -132,6 +134,7 @@ public class KuaishouCrowdPackServiceImpl extends ServiceImpl<KuaishouCrowdPackM
         QueryWrapper<KuaishouCrowdPack> wrapper = new QueryWrapper<>();
         wrapper.eq("account_id", accountId);
         wrapper.eq("orientation_id", orientationId);
+        wrapper.last("limit 1");
         KuaishouCrowdPack kuaishouCrowdPack = crowdPackMapper.selectOne(wrapper);
         JSONObject jsonObject = iKuaishouPopulationService.pushAccountsPopulation(token, orientationId, accountIds);
         if (jsonObject.getInteger("code") == 0) {
@@ -190,14 +193,13 @@ public class KuaishouCrowdPackServiceImpl extends ServiceImpl<KuaishouCrowdPackM
                                     if (Check.isNull(crowdPackMapper.queryByAccountId(obj.getLong("account_id"), obj.getLong("orientation_id")))) {
                                         KuaishouCrowdPack oldPack = crowdPackMapper.queryByAccountId(null, obj.getLong("orientation_id"));
                                         KuaishouCrowdPack crowdPackEntity = JSONObject.toJavaObject(obj, KuaishouCrowdPack.class);
-                                        if(!Check.isNull(oldPack)){
+                                        if (!Check.isNull(oldPack)) {
                                             crowdPackEntity.setStatDate(oldPack.getStatDate());
                                             crowdPackEntity.setUrl(oldPack.getUrl());
                                             crowdPackEntity.setSignature(oldPack.getSignature());
-                                            crowdPackEntity.setMessage("PUSH OK");
-                                            crowdPackEntity.setDataStatus(1);
                                         }
-
+                                        crowdPackEntity.setMessage("PUSH OK");
+                                        crowdPackEntity.setDataStatus(1);
                                         this.save(crowdPackEntity);
                                     } else {
                                         datas.add(obj);
@@ -226,9 +228,9 @@ public class KuaishouCrowdPackServiceImpl extends ServiceImpl<KuaishouCrowdPackM
     }
 
     @Override
-    public Result<Object> queryFailReason(Long orientationId, Integer pageNo, Integer pageSize) {
+    public Result<Object> queryFailReason(String signature, Integer pageNo, Integer pageSize) {
         PageHelper.startPage(pageNo, pageSize);
-        List<JSONObject> list = crowdPackMapper.queryFailReason(orientationId);
+        List<JSONObject> list = crowdPackMapper.queryFailReason(signature);
         PageInfo pageInfo = new PageInfo(list);
         return Result.ok(pageInfo);
     }
@@ -238,12 +240,12 @@ public class KuaishouCrowdPackServiceImpl extends ServiceImpl<KuaishouCrowdPackM
         CtopOauthToken token = tokenService.getTokenByAccountId(kuaishouCrowdPack.getAccountId());
         JSONObject object = iKuaishouPopulationService.deletePopulation(kuaishouCrowdPack.getAccountId(), kuaishouCrowdPack.getOrientationId(), token.getAccessToken());
         if (!Check.isNull(object)) {
-            kuaishouCrowdPack.setMessage(object.getString("data"));
             if (object.getInteger("code") == 0) {
-                if (this.updateById(kuaishouCrowdPack)) {
+                if (this.removeById(kuaishouCrowdPack.getId())) {
                     return Result.ok("删除成功");
                 }
             }
+            return Result.ok("删除失败,".concat(object.getString("message")));
         }
         return Result.ok("删除失败");
     }