Преглед на файлове

修改自动上新代码逻辑

syh преди 4 години
родител
ревизия
448b40e399

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

@@ -1,5 +1,7 @@
 package cn.com.ctop.kuaishou.modules.ai.controller;
 
+import cn.com.ctop.common.module.entity.UserAllocation;
+import cn.com.ctop.common.module.service.IUserAllocationService;
 import cn.com.ctop.kuaishou.modules.ai.entity.AiKuaishouAdvertiserStrategy;
 import cn.com.ctop.kuaishou.modules.ai.service.IAiKuaishouAdvertiserStrategyService;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -13,9 +15,11 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
+import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.List;
 
- /**
+/**
  * 快手账户策略设置信息表
  * @author jeecg-boot
  * @date   2021-01-25
@@ -46,11 +50,26 @@ public class AiKuaishouAdvertiserStrategyController {
 		QueryWrapper<AiKuaishouAdvertiserStrategy> queryWrapper = QueryGenerator.initQueryWrapper(aiKuaishouAdvertiserStrategy, req.getParameterMap());
 		Page<AiKuaishouAdvertiserStrategy> page = new Page<>(pageNo, pageSize);
 		IPage<AiKuaishouAdvertiserStrategy> pageList = aiKuaishouAdvertiserStrategyService.page(page, queryWrapper);
+		List<AiKuaishouAdvertiserStrategy> records = pageList.getRecords();
+		List<AiKuaishouAdvertiserStrategy> setData = new ArrayList<>();
+		if(null!=records&&!records.isEmpty()){
+
+			records.forEach(record->{
+				Long accountId = record.getAccountId();
+				UserAllocation allocation = allocationService.getByAccountId(accountId);
+				record.setAuthName(allocation.getAuthName());
+				setData.add(record);
+			});
+			pageList.setRecords(setData);
+		}
 		result.setSuccess(true);
 		result.setResult(pageList);
 		return result;
 	}
 
+	@Autowired
+	private IUserAllocationService allocationService;
+
 	/**
 	  *   添加
 	 * @param aiKuaishouAdvertiserStrategy

+ 4 - 1
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/ai/entity/AiKuaishouAdvertiserStrategy.java

@@ -2,6 +2,7 @@ package cn.com.ctop.kuaishou.modules.ai.entity;
 
 import cn.com.ctop.common.module.annotation.Dict;
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
@@ -24,7 +25,6 @@ public class AiKuaishouAdvertiserStrategy {
 	@TableId(type = IdType.AUTO)
 	private Long id;
 	/**账户ID*/
-	@Dict(dicCode = "account_id",dictTable="ctop_user_allocation",dicText="auth_name")
 	private Long accountId;
 	/**策略状态 1-使用 0-停用*/
 	private Integer status;
@@ -184,4 +184,7 @@ public class AiKuaishouAdvertiserStrategy {
 	private Date effectiveTime;
 	/**失效时间*/
 	private Date expiryTime;
+
+	@TableField(exist = false)
+	private String authName;
 }