|
|
@@ -1,11 +1,8 @@
|
|
|
package com.tzld.longarticle.recommend.server.service.rank;
|
|
|
|
|
|
|
|
|
-<<<<<<<HEAD
|
|
|
- =======
|
|
|
import com.google.common.collect.Lists;
|
|
|
import com.tzld.longarticle.recommend.server.model.Content;
|
|
|
->>>>>>>e5f14a8(init)
|
|
|
import com.tzld.longarticle.recommend.server.service.score.ScoreParam;
|
|
|
import com.tzld.longarticle.recommend.server.service.score.ScoreResult;
|
|
|
import com.tzld.longarticle.recommend.server.service.score.ScoreService;
|
|
|
@@ -16,12 +13,9 @@ import lombok.extern.slf4j.Slf4j;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
|
|
|
-<<<<<<<HEAD
|
|
|
import java.util.Collections;
|
|
|
+import java.util.List;
|
|
|
import java.util.Map;
|
|
|
-=======
|
|
|
-import java.util.*;
|
|
|
->>>>>>>e5f14a8(init)
|
|
|
|
|
|
/**
|
|
|
* @author dyp
|
丁云鹏