|
@@ -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("删除失败");
|
|
|
}
|