Merge branch 'feat-zdw' into 'master'

feat-zdw: 打卡作品旧数据迁移

See merge request rays/pcloud-book!148

pcloud-service-book/src/main/java/com/pcloud/book/clock/biz/impl/BookClockBizImpl.java

@@ -61,12 +61,15 @@ import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.stream.Collectors;
 
+import lombok.extern.slf4j.Slf4j;
+
 /**
  * @Author: hzk
  * @Date: 2019/5/24 14:50
  * @Version 1.0
  */
 @Component("bookClockBiz")
+@Slf4j
 public class BookClockBizImpl implements BookClockBiz {
 
     @Autowired
@@ -459,8 +462,8 @@ public class BookClockBizImpl implements BookClockBiz {
     }
 
     @Override
+    @ParamLog("微信群打卡作品数据迁移")
     public void dealOldData4WeixinAtt() {
-        timedTask.execute(()->{
             SetKeywordVO setKeywordVO = new SetKeywordVO();
             List<BookClockInfoDTO> clockInfoIds = bookClockInfoDao.getAllAttInfoIds();
             if(!ListUtils.isEmpty(clockInfoIds)){
@@ -487,18 +490,22 @@ public class BookClockBizImpl implements BookClockBiz {
                             setKeywordVO.setDescription("签到打卡");
                             setKeywordVO.setAddWarehouse(0);
                             setKeywordVO.setClassifyId(id);
-                            setKeywordVO.setReplyType(1);
+                            setKeywordVO.setSetType(1);
                             setKeywordVO.setReplyType(4);
                             setKeywordVO.setMatchingRule(0);
                             setKeywordVO.setBookGroupId(classifyVO.getBookGroupId());
                             setKeywordVO.setContent(bookClockInfoDTO.getOriginTitle());
                             setKeywordVO.setServeId(bookClockInfoDTO.getOriginId());
                             setKeywordVO.setServeType(bookClockInfoDTO.getOriginType());
-                            bookKeywordBiz.insertKeyword(setKeywordVO);
+                            setKeywordVO.setUserId(bookClockInfoDTO.getCreateUser());
+                            try {
+                                bookKeywordBiz.insertKeyword(setKeywordVO);
+                            }catch (BookBizException e){
+                                log.info("打卡关键词迁移失败："+e.toString());
+                            }
                         }
                     }
                 }
             }
-        });
     }
 }

pcloud-service-book/src/main/resources/mapper/clock/BookClockInfo.Mapper.xml

@@ -205,7 +205,7 @@
 
     <select id="getAllAttInfoIds" parameterType="map" resultMap="BaseResultMapDTO">
         select <include refid="Base_Column_List"/>
-        from book_clock_info where origin_type = 'APP'
+        from book_clock_info where origin_type = 'PRODUCT'
     </select>
 
 </mapper>
\ No newline at end of file