|  | @@ -4,6 +4,7 @@ import cn.com.ctop.common.module.utils.Check;
 | 
	
		
			
				|  |  |  import cn.com.ctop.kuaishou.modules.live.entity.LiveDataAccounts;
 | 
	
		
			
				|  |  |  import cn.com.ctop.kuaishou.modules.live.service.ILiveDataAccountsService;
 | 
	
		
			
				|  |  |  import cn.com.ctop.kuaishou.modules.live.service.ILiveDataImportRecordService;
 | 
	
		
			
				|  |  | +import com.alibaba.fastjson.JSONObject;
 | 
	
		
			
				|  |  |  import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 | 
	
		
			
				|  |  |  import com.baomidou.mybatisplus.core.metadata.IPage;
 | 
	
		
			
				|  |  |  import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 | 
	
	
		
			
				|  | @@ -22,6 +23,7 @@ import org.springframework.web.bind.annotation.RequestParam;
 | 
	
		
			
				|  |  |  import org.springframework.web.bind.annotation.RestController;
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |  import javax.servlet.http.HttpServletRequest;
 | 
	
		
			
				|  |  | +import java.util.List;
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |  /**
 | 
	
		
			
				|  |  |   * 直播数据——操作记录表
 | 
	
	
		
			
				|  | @@ -63,9 +65,6 @@ public class LiveDataAccountsController {
 | 
	
		
			
				|  |  |          if (!Check.isNull(liveDataAccounts.getProductName())) {
 | 
	
		
			
				|  |  |              queryWrapper.like("product_name", liveDataAccounts.getProductName());
 | 
	
		
			
				|  |  |          }
 | 
	
		
			
				|  |  | -        if (!Check.isNull(liveDataAccounts.getProductId())) {
 | 
	
		
			
				|  |  | -            queryWrapper.like("product_id", liveDataAccounts.getProductId());
 | 
	
		
			
				|  |  | -        }
 | 
	
		
			
				|  |  |          if (Check.isNull(liveDataAccounts.getState())) {
 | 
	
		
			
				|  |  |              queryWrapper.eq("state", 1);
 | 
	
		
			
				|  |  |          } else {
 | 
	
	
		
			
				|  | @@ -79,6 +78,20 @@ public class LiveDataAccountsController {
 | 
	
		
			
				|  |  |      }
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |      /**
 | 
	
		
			
				|  |  | +     * 分页列表查询
 | 
	
		
			
				|  |  | +     */
 | 
	
		
			
				|  |  | +    @GetMapping(value = "/typeList")
 | 
	
		
			
				|  |  | +    public Result<Object> typeList() {
 | 
	
		
			
				|  |  | +        try {
 | 
	
		
			
				|  |  | +            List<JSONObject> list = liveDataAccountsService.typeList();
 | 
	
		
			
				|  |  | +            return Result.ok(list);
 | 
	
		
			
				|  |  | +        } catch (Exception e) {
 | 
	
		
			
				|  |  | +            e.printStackTrace();
 | 
	
		
			
				|  |  | +        }
 | 
	
		
			
				|  |  | +        return Result.ok("查询异常");
 | 
	
		
			
				|  |  | +    }
 | 
	
		
			
				|  |  | +
 | 
	
		
			
				|  |  | +    /**
 | 
	
		
			
				|  |  |       * 添加直播账户
 | 
	
		
			
				|  |  |       */
 | 
	
		
			
				|  |  |      @PostMapping(value = "/add")
 |