Merge branch 'master' into feat-1001847

pcloud-facade-book/src/main/java/com/pcloud/book/group/dto/SearchDto.java

+package com.pcloud.book.group.dto;
+
+import java.io.Serializable;
+
+import lombok.Data;
+
+/**
+ * @date: 2019年10月16日 15:49
+ * @Author: Zcy
+ * @Descprition
+ */
+@Data
+public class SearchDto implements Serializable {
+
+    private Integer generation;
+
+    private Integer num;
+
+}

pcloud-facade-book/src/main/java/com/pcloud/book/group/service/WeixinQrcodeService.java

@@ -95,4 +95,7 @@ public interface WeixinQrcodeService {
     @RequestMapping(value = "updateGenerationMachineIp", method = RequestMethod.GET)
     void updateGenerationMachineIp(@RequestParam("generation") Integer generation, @RequestParam("machineIp") String machineIp);
 
+    @ApiOperation(value = "根据条件获取待跟新二维码", httpMethod = "POST")
+    @RequestMapping(value = "listUpdateQrByGeneration", method = RequestMethod.POST)
+    ResponseEntity<ResponseDto<List<UpdateQrDTO>>> listUpdateQrByGeneration(@RequestBody SearchDto searchDto);
 }

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

@@ -682,6 +682,7 @@ public class BookAdviserBizImpl implements BookAdviserBiz {
 		updateBookAdviserStatus(bookId, adviserId, channelId, templetId, secondTempletId, BookConstant.BOOK_ADVISER_NO_DELETE,BookConstant.MAIN_ADVISER);
 		// 恢复图书关联的二维码 20190723-刘娜【ID1001264】社群书删除后，再创建时不要自动恢复
 		if (recoverScene) {
+			bookGroupBiz.recoverByBookId(bookId, channelId, adviserId);
 			qrcodeSceneConsr.recoverByBook(bookId, channelId, adviserId);
 		}
 
@@ -711,8 +712,6 @@ public class BookAdviserBizImpl implements BookAdviserBiz {
 		bookAdviserDao.updateBook4Adviser(paramMap);
 		if (BookConstant.BOOK_ADVISER_DELETE.equals(deleteStatus)) {
             bookGroupBiz.deleteByBookId(bookId, channelId, adviserId);
-        } else {
-            bookGroupBiz.recoverByBookId(bookId, channelId, adviserId);
         }
 		LOGGER.info("修改书籍编辑的状态（删除或者恢复） <END>");
 	}

pcloud-service-book/src/main/java/com/pcloud/book/group/dao/WeixinQrcodeDao.java

@@ -170,4 +170,6 @@ public interface WeixinQrcodeDao extends BaseDao<WeixinQrcode> {
     Integer countByState(Integer state, List<String> altIds);
 
     void updateGenerationMachineIp(Integer generation, String machineIp);
+
+    List<UpdateQrDTO> listUpdateQrByGeneration(Integer generation, Integer limit);
 }

pcloud-service-book/src/main/java/com/pcloud/book/group/dao/impl/WeixinQrcodeDaoImpl.java

@@ -9,11 +9,9 @@ import com.pcloud.book.group.dto.WeixinQrcodeDTO;
 import com.pcloud.book.group.entity.WeixinQrcode;
 import com.pcloud.book.group.vo.QrStatisticsVO;
 import com.pcloud.common.core.dao.BaseDaoImpl;
-import com.pcloud.common.utils.DateUtils;
 
 import org.springframework.stereotype.Component;
 
-import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -182,4 +180,12 @@ public class WeixinQrcodeDaoImpl extends BaseDaoImpl<WeixinQrcode> implements We
         paramMap.put("machineIp", machineIp);
         this.getSessionTemplate().update(getStatement("updateGenerationMachineIp"), paramMap);
     }
+
+    @Override
+    public List<UpdateQrDTO> listUpdateQrByGeneration(Integer generation, Integer limit) {
+        Map<String, Object> paramMap = new HashMap<>();
+        paramMap.put("generation", generation);
+        paramMap.put("num", limit);
+        return this.getSessionTemplate().selectList(getStatement("listUpdateQrByGeneration"), paramMap);
+    }
 }

pcloud-service-book/src/main/java/com/pcloud/book/group/service/impl/WeixinQrcodeServiceImpl.java

@@ -2,7 +2,14 @@ package com.pcloud.book.group.service.impl;
 
 import com.pcloud.book.group.biz.GroupQrcodeBiz;
 import com.pcloud.book.group.biz.WeixinQrcodeBiz;
-import com.pcloud.book.group.dto.*;
+import com.pcloud.book.group.dao.WeixinQrcodeDao;
+import com.pcloud.book.group.dto.BookWxQrcodeDTO;
+import com.pcloud.book.group.dto.GroupQrcodeInfo4Advertising;
+import com.pcloud.book.group.dto.SearchDto;
+import com.pcloud.book.group.dto.SyncWeixinGroupIdDTO;
+import com.pcloud.book.group.dto.UpdateQrDTO;
+import com.pcloud.book.group.dto.WeixinQrcodeCountDTO;
+import com.pcloud.book.group.dto.WeixinQrcodeDTO;
 import com.pcloud.book.group.service.WeixinQrcodeService;
 import com.pcloud.book.group.vo.ClassifyQrcodeVO;
 import com.pcloud.common.dto.ResponseDto;
@@ -20,7 +27,6 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -36,6 +42,8 @@ public class WeixinQrcodeServiceImpl implements WeixinQrcodeService {
     private WeixinQrcodeBiz weixinQrcodeBiz;
     @Autowired
     private GroupQrcodeBiz groupQrcodeBiz;
+    @Autowired
+    private WeixinQrcodeDao weixinQrcodeDao;
 
     @Override
     @GetMapping("tenQuartz")
@@ -149,4 +157,10 @@ public class WeixinQrcodeServiceImpl implements WeixinQrcodeService {
         weixinQrcodeBiz.updateGenerationMachineIp(generation, machineIp);
     }
 
+    @Override
+    @RequestMapping(value = "listUpdateQrByGeneration", method = RequestMethod.POST)
+    public ResponseEntity<ResponseDto<List<UpdateQrDTO>>> listUpdateQrByGeneration(@RequestBody SearchDto searchDto) {
+        return ResponseHandleUtil.toResponse(weixinQrcodeDao.listUpdateQrByGeneration(searchDto.getGeneration(), searchDto.getNum()));
+    }
+
 }

pcloud-service-book/src/main/resources/mapper/group/WeixinQrcode.Mapper.xml

@@ -306,4 +306,11 @@
     <update id="updateGenerationMachineIp" parameterType="map">
         update weixin_qrcode_generation set virtual_machine_ip = #{machineIp} where generation = #{generation}
     </update>
+
+    <select id="listUpdateQrByGeneration" parameterType="map" resultType="com.pcloud.book.group.dto.UpdateQrDTO">
+        SELECT id, qrcode_url url, update_qr_time FROM weixin_qrcode
+        WHERE generation =#{generation} AND update_state IN(0,1,3)
+        ORDER BY update_qr_time ASC
+        LIMIT #{num}
+    </select>
 </mapper>
\ No newline at end of file