Merge branch 'zcy-add-service' into 'master'

add service updateGenerationMachineIp

See merge request rays/pcloud-book!187

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

@@ -91,6 +91,8 @@ public interface WeixinQrcodeService {
     @RequestMapping(value = "getWxGroupInfoByIds", method = RequestMethod.POST)
     ResponseEntity<ResponseDto<Map<Long, GroupQrcodeInfo4Advertising>>> getWxGroupInfoByIds(@RequestBody List<Long> qrcodeIds);
 
-
+    @ApiOperation(value = "修改模拟器IP地址", httpMethod = "GET")
+    @RequestMapping(value = "updateGenerationMachineIp", method = RequestMethod.GET)
+    void updateGenerationMachineIp(@RequestParam("generation") Integer generation, @RequestParam("machineIp") String machineIp);
 
 }

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

@@ -134,4 +134,6 @@ public interface WeixinQrcodeBiz {
     void inviteNewRobot(String wxUserId);
 
     Map<String, BookWxQrcodeDTO> getGroupVersion(List<String> wxGroupIds);
+
+    void updateGenerationMachineIp(Integer generation, String machineIp);
 }

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

@@ -425,6 +425,14 @@ public class WeixinQrcodeBizImpl implements WeixinQrcodeBiz {
         return weixinQrcodeDao.listByWxGroupIds(wxGroupIds) == null ? new HashMap<>() : weixinQrcodeDao.listByWxGroupIds(wxGroupIds);
     }
 
+    @Override
+    public void updateGenerationMachineIp(Integer generation, String machineIp) {
+        if (null == generation || StringUtil.isEmpty(machineIp)) {
+            return;
+        }
+        weixinQrcodeDao.updateGenerationMachineIp(generation, machineIp);
+    }
+
     private void updateQrUrlVIP(List<UpdateQrDTO> updateQrs) {
         if (ListUtils.isEmpty(updateQrs)) {
             return;

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

@@ -168,4 +168,6 @@ public interface WeixinQrcodeDao extends BaseDao<WeixinQrcode> {
      * 根据状态获取群数量
      */
     Integer countByState(Integer state, List<String> altIds);
+
+    void updateGenerationMachineIp(Integer generation, String machineIp);
 }

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

@@ -174,4 +174,12 @@ public class WeixinQrcodeDaoImpl extends BaseDaoImpl<WeixinQrcode> implements We
         paramMap.put("altIds", altIds);
         return this.getSessionTemplate().selectOne("countByState", paramMap);
     }
+
+    @Override
+    public void updateGenerationMachineIp(Integer generation, String machineIp) {
+        Map<String, Object> paramMap = new HashMap<>();
+        paramMap.put("generation", generation);
+        paramMap.put("machineIp", machineIp);
+        this.getSessionTemplate().update(getStatement("updateGenerationMachineIp"), paramMap);
+    }
 }

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

@@ -143,4 +143,10 @@ public class WeixinQrcodeServiceImpl implements WeixinQrcodeService {
         return ResponseHandleUtil.toResponse(wechatGroupInfoMap);
     }
 
+    @Override
+    @RequestMapping(value = "updateGenerationMachineIp", method = RequestMethod.GET)
+    public void updateGenerationMachineIp(@RequestParam("generation") Integer generation, @RequestParam("machineIp") String machineIp) {
+        weixinQrcodeBiz.updateGenerationMachineIp(generation, machineIp);
+    }
+
 }

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

@@ -302,4 +302,8 @@
         </foreach>
         and use_state=#{state}
     </select>
+
+    <update id="updateGenerationMachineIp" parameterType="map">
+        update weixin_qrcode_generation set virtual_machine_ip = #{machineIp} where generation = #{generation}
+    </update>
 </mapper>
\ No newline at end of file