add listQrCode4Android

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

@@ -112,4 +112,8 @@ public interface WeixinQrcodeService {
     @ApiOperation("根据版本号获取机器人ip")
     @GetMapping("getRobotIpByGeneration")
     ResponseEntity<ResponseDto<String>> getRobotIpByGeneration(@RequestParam("generation") Integer generation);
+
+    @ApiOperation("安卓Hook拉取待更新群二维码")
+    @RequestMapping(value = "/listQrCode4Android",method = RequestMethod.GET)
+    ResponseEntity<ResponseDto<List<UpdateQrDTO>>> listQrCode4Android(Integer generation,Integer num);
 }

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

@@ -174,4 +174,9 @@ public interface WeixinQrcodeDao extends BaseDao<WeixinQrcode> {
     List<UpdateQrDTO> listUpdateQrByGeneration(Integer generation, Integer limit);
 
     Integer getCanUseCount(Integer version);
+
+    /**
+     * 根据generation获取群信息 用于更新
+     */
+    List<UpdateQrDTO> listQrCode4Android(Integer generation, Integer num);
 }

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

@@ -193,4 +193,12 @@ public class WeixinQrcodeDaoImpl extends BaseDaoImpl<WeixinQrcode> implements We
     public Integer getCanUseCount(Integer version) {
         return this.getSessionTemplate().selectOne(getStatement("getCanUseCount"), version);
     }
+
+    @Override
+    public List<UpdateQrDTO> listQrCode4Android(Integer generation, Integer num) {
+        Map<String, Object> paramMap = new HashMap<>();
+        paramMap.put("generation", generation);
+        paramMap.put("num", num);
+        return this.getSessionTemplate().selectList(getStatement("listQrCode4Android"), paramMap);
+    }
 }

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

@@ -112,7 +112,7 @@ public class WeixinQrcodeServiceImpl implements WeixinQrcodeService {
     @Override
     @GetMapping("listOver10AvailableGroupByPage")
     public ResponseEntity<ResponseDto<List<BookWxQrcodeDTO>>> listOver10AvailableGroupByPage(@RequestParam("currentPage") Integer currentPage,
-                                                                                       @RequestParam("numPerPage") Integer numPerPage) {
+                                                                                             @RequestParam("numPerPage") Integer numPerPage) {
         return ResponseHandleUtil.toResponse(weixinQrcodeBiz.listOver10AvailableGroupByPage(currentPage, numPerPage));
     }
 
@@ -133,7 +133,7 @@ public class WeixinQrcodeServiceImpl implements WeixinQrcodeService {
     public ResponseEntity<ResponseDto<String>> getWxGroupId(@RequestParam("classifyId") Long classifyId) {
         List<ClassifyQrcodeVO> qrcodeByClassify = groupQrcodeBiz.getQrcodeByClassify(null, classifyId);
         String wxGroupId = null;
-        if (!ListUtils.isEmpty(qrcodeByClassify)){
+        if (!ListUtils.isEmpty(qrcodeByClassify)) {
             wxGroupId = qrcodeByClassify.get(0).getWeixinGroupId();
         }
         return ResponseHandleUtil.toResponse(wxGroupId);
@@ -178,4 +178,10 @@ public class WeixinQrcodeServiceImpl implements WeixinQrcodeService {
     public ResponseEntity<ResponseDto<String>> getRobotIpByGeneration(@RequestParam("generation") Integer generation) {
         return ResponseHandleUtil.toResponse(weixinQrcodeBiz.getRobotIpByGeneration(generation));
     }
+
+    @RequestMapping(value = "/listQrCode4Android", method = RequestMethod.GET)
+    @Override
+    public ResponseEntity<ResponseDto<List<UpdateQrDTO>>> listQrCode4Android(@RequestParam("generation") Integer generation, @RequestParam("num") Integer num) {
+        return ResponseHandleUtil.toResponse(weixinQrcodeDao.listQrCode4Android(generation, num));
+    }
 }

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

@@ -314,6 +314,14 @@
         LIMIT #{num}
     </select>
 
+    <select id="listQrCode4Android" parameterType="map" resultType="com.pcloud.book.group.dto.UpdateQrDTO">
+        SELECT id, weixin_group_id url, update_qr_time, generation
+        FROM weixin_qrcode
+        WHERE generation = #{generation}
+        ORDER BY update_qr_time ASC
+        LIMIT #{num}
+    </select>
+
     <select id="getCanUseCount" parameterType="int" resultType="integer">
         SELECT ifnull(COUNT(1), 0) FROM weixin_qrcode WHERE update_state !=2 AND use_state = 0
         and generation = #{_parameter}