Browse Source

Merge branch 'master' of https://git.coding.net/aft/AFT.git

albertshaw 8 years ago
parent
commit
3a0283a62e
1 changed files with 16 additions and 9 deletions
  1. 16 9
      src/main/java/com/goafanti/star/service/impl/StarServiceImpl.java

+ 16 - 9
src/main/java/com/goafanti/star/service/impl/StarServiceImpl.java

@@ -40,10 +40,10 @@ public class StarServiceImpl implements StarService {
 	}
 
 	@Override
-	public void save(List<Star> startList, String[] hot) {
+	public void save(List<Star> starList, String[] hot) {
 		starMapper.deleteAll();
 		Set<String> set = new HashSet<>();
-		for (Star s : startList) {
+		for (Star s : starList) {
 			s.setId(UUID.randomUUID().toString());
 			s.setHot(StarHotType.UNHOT.getCode());
 			for (String h : hot) {
@@ -56,14 +56,21 @@ public class StarServiceImpl implements StarService {
 		}
 		Star star = null;
 		for (String s : set) {
-			star = new Star();
-			star.setId(UUID.randomUUID().toString());
-			star.setUid(s);
-			star.setHot(StarHotType.HOT.getCode());
-			star.setStar(StarType.UNSTAR.getCode());
-			startList.add(star);
+			for (Star ss : starList) {
+				if (ss.getUid().equals(s)) {
+					ss.setHot(StarHotType.HOT.getCode());
+				} else {
+					star = new Star();
+					star.setId(UUID.randomUUID().toString());
+					star.setUid(s);
+					star.setHot(StarHotType.HOT.getCode());
+					star.setStar(StarType.UNSTAR.getCode());
+					starList.add(star);
+				}
+			}
+
 		}
-		starMapper.insertBatch(startList);
+		starMapper.insertBatch(starList);
 	}
 
 	@Override