Merge branch 'feat-1002021' into 'master'

添加根据版本号获取机器人ip内部接口

See merge request rays/pcloud-book!246

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

@@ -98,4 +98,8 @@ public interface WeixinQrcodeService {
     @ApiOperation(value = "根据条件获取待跟新二维码", httpMethod = "POST")
     @RequestMapping(value = "listUpdateQrByGeneration", method = RequestMethod.POST)
     ResponseEntity<ResponseDto<List<UpdateQrDTO>>> listUpdateQrByGeneration(@RequestBody SearchDto searchDto);
+
+    @ApiOperation("根据版本号获取机器人ip")
+    @PostMapping("getRobotWxGroupIpByGeneration")
+    ResponseEntity<ResponseDto<Map<Integer, String>>> getRobotWxGroupIpByGeneration(@RequestBody List<Integer> generations);
 }

pcloud-service-book/src/main/java/com/pcloud/book/group/biz/WeixinQrcodeBiz.java

@@ -136,4 +136,9 @@ public interface WeixinQrcodeBiz {
     Map<String, BookWxQrcodeDTO> getGroupVersion(List<String> wxGroupIds);
 
     void updateGenerationMachineIp(Integer generation, String machineIp);
+
+    /**
+     * 根据版本号获取机器人ip
+     */
+    Map<Integer, String> getRobotWxGroupIpByGeneration(List<Integer> generations);
 }

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

@@ -7,6 +7,7 @@ import com.pcloud.book.consumer.wechatgroup.WechatGroupConsr;
 import com.pcloud.book.group.biz.WeixinQrcodeBiz;
 import com.pcloud.book.group.dao.GroupQrcodeDao;
 import com.pcloud.book.group.dao.WeixinQrcodeDao;
+import com.pcloud.book.group.dao.WeixinQrcodeGenerationDao;
 import com.pcloud.book.group.dto.BookWxQrcodeDTO;
 import com.pcloud.book.group.dto.ChangeGroupNameDTO;
 import com.pcloud.book.group.dto.SyncWeixinGroupIdRequestDTO;
@@ -15,6 +16,7 @@ import com.pcloud.book.group.dto.WeixinQrcodeCountDTO;
 import com.pcloud.book.group.dto.WeixinQrcodeDTO;
 import com.pcloud.book.group.entity.WeixinQrcode;
 import com.pcloud.book.group.enums.JoinGroupTypeEnum;
+import com.pcloud.book.group.entity.WeixinQrcodeGeneration;
 import com.pcloud.book.group.enums.UpdateStatusEnum;
 import com.pcloud.book.group.tools.Kit;
 import com.pcloud.book.group.tools.QrcodeTools;
@@ -73,6 +75,8 @@ public class WeixinQrcodeBizImpl implements WeixinQrcodeBiz {
     private WechatGroupConsr wechatGroupConsr;
     @Autowired
     private WeixinQrcodeBiz weixinQrcodeBiz;
+    @Autowired
+    private WeixinQrcodeGenerationDao weixinQrcodeGenerationDao;
 
 
     @Override
@@ -442,6 +446,22 @@ public class WeixinQrcodeBizImpl implements WeixinQrcodeBiz {
         weixinQrcodeDao.updateGenerationMachineIp(generation, machineIp);
     }
 
+    @ParamLog("根据版本号获取机器人ip")
+    @Override
+    public Map<Integer, String> getRobotWxGroupIpByGeneration(List<Integer> generations) {
+        Map<Integer, String> map = new HashMap<>();
+        if (ListUtils.isEmpty(generations)) {
+            return map;
+        }
+        List<WeixinQrcodeGeneration> weixinQrcodeGenerations = weixinQrcodeGenerationDao.getListByGenerations(generations);
+        if (!ListUtils.isEmpty(weixinQrcodeGenerations)) {
+            for (WeixinQrcodeGeneration weixinQrcodeGeneration : weixinQrcodeGenerations) {
+                map.put(weixinQrcodeGeneration.getGeneration(), weixinQrcodeGeneration.getWechatGroupIp());
+            }
+        }
+        return map;
+    }
+
     private void updateQrUrlVIP(List<UpdateQrDTO> updateQrs) {
         if (ListUtils.isEmpty(updateQrs)) {
             return;

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

@@ -3,6 +3,8 @@ package com.pcloud.book.group.dao;
 import com.pcloud.book.group.entity.WeixinQrcodeGeneration;
 import com.pcloud.common.core.dao.BaseDao;
 
+import java.util.List;
+
 /**
  * @author ruansiyuan
  * @date 2019/10/29 10:19
@@ -11,4 +13,5 @@ public interface WeixinQrcodeGenerationDao extends BaseDao<WeixinQrcodeGeneratio
 
     WeixinQrcodeGeneration getByGeneration(Integer generation);
 
+    List<WeixinQrcodeGeneration> getListByGenerations(List<Integer> generations);
 }

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

@@ -5,6 +5,8 @@ import com.pcloud.book.group.entity.WeixinQrcodeGeneration;
 import com.pcloud.common.core.dao.BaseDaoImpl;
 import org.springframework.stereotype.Component;
 
+import java.util.List;
+
 /**
  * @Description
  * @Author ruansiyuan
@@ -16,4 +18,9 @@ public class WeixinQrcodeGenerationDaoImpl extends BaseDaoImpl<WeixinQrcodeGener
     public WeixinQrcodeGeneration getByGeneration(Integer generation) {
         return this.getSqlSession().selectOne(this.getStatement("getByGeneration"),generation);
     }
+
+    @Override
+    public List<WeixinQrcodeGeneration> getListByGenerations(List<Integer> list) {
+        return this.getSqlSession().selectList(this.getStatement("getListByGenerations"),list);
+    }
 }

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

@@ -17,6 +17,7 @@ import com.pcloud.common.exceptions.BizException;
 import com.pcloud.common.utils.ListUtils;
 import com.pcloud.common.utils.ResponseHandleUtil;
 
+import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -163,4 +164,11 @@ public class WeixinQrcodeServiceImpl implements WeixinQrcodeService {
         return ResponseHandleUtil.toResponse(weixinQrcodeDao.listUpdateQrByGeneration(searchDto.getGeneration(), searchDto.getNum()));
     }
 
+    @ApiOperation("根据版本号获取机器人ip")
+    @PostMapping("getRobotWxGroupIpByGeneration")
+    @Override
+    public ResponseEntity<ResponseDto<Map<Integer, String>>> getRobotWxGroupIpByGeneration(@RequestBody List<Integer> generations) {
+        return ResponseHandleUtil.toResponse(weixinQrcodeBiz.getRobotWxGroupIpByGeneration(generations));
+    }
+
 }

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

@@ -29,4 +29,16 @@
         limit 1
     </select>
 
+    <!--根据版本号批量获取-->
+    <select id="getListByGenerations" parameterType="Integer" resultMap="BaseResultMap">
+        select
+        <include refid="Base_Column_List"/>
+        from weixin_qrcode_generation
+        where generation in
+        <foreach collection="list" item="item" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+
+    </select>
+
 </mapper>
\ No newline at end of file