浏览代码

修改list入参传入方式

tangbin 1 年之前
父节点
当前提交
bba48dd9fe

+ 3 - 3
logic/equip-logic/src/main/java/com/iohao/mmo/equip/action/EquipAction.java

@@ -88,11 +88,11 @@ public class EquipAction {
      * 批量删除装备
      *
      * @param flowContext flowContext
-     * @param stringValue 装备itemTypeIds
+     * @param idList 装备id列表
      */
     @ActionMethod(EquipCmd.delEquipBatch)
-    public void delEquipBatch(FlowContext flowContext, StringValue stringValue) {
-        equipService.delBatch(Arrays.asList(stringValue.value.split("-")));
+    public void delEquipBatch(FlowContext flowContext, List<String> idList) {
+        equipService.delBatch(idList);
     }
 
     @ActionMethod(EquipCmd.createEquip)

+ 3 - 4
logic/equip-logic/src/main/java/com/iohao/mmo/equip/action/EquipTemplateAction.java

@@ -59,13 +59,12 @@ public class EquipTemplateAction {
      * 根据装备库列表随机出新的装备,
      *
      * @param flowContext flowContext
-     * @param stringValve 装备库itemTypeIds(xxx-xxx)
+     * @param itemTypeIds 装备库itemTypeIds
      */
     @ActionMethod(EquipCmd.randomEquip)
-    public List<EquipMessage> randomEquip(FlowContext flowContext, StringValue stringValve) { //参数值
+    public List<EquipMessage> randomEquip(FlowContext flowContext, List<String> itemTypeIds) { //参数值
         long userId = flowContext.getUserId();
-        String[] itemTypeIds = stringValve.value.split("-");
-        List<EquipMessage> equipMessageList = equipTemplateService.randomEquipBatch(Arrays.asList(itemTypeIds),userId)
+        List<EquipMessage> equipMessageList = equipTemplateService.randomEquipBatch(itemTypeIds,userId)
                 .stream()
                 .map(EquipMapper.ME::convert)
                 .toList();;

+ 1 - 0
logic/equip-logic/src/main/java/com/iohao/mmo/equip/utils/RandomUtils.java

@@ -109,6 +109,7 @@ public class RandomUtils {
 
     /**
      * 本次是否生成极品
+     * @param addExcellentRate 极品率 0.0000-1.0000
      *
      * @return boolean
      */

+ 13 - 4
one-client/src/main/java/com/iohao/mmo/client/input/EquipInputCommandRegion.java

@@ -18,8 +18,11 @@
  */
 package com.iohao.mmo.client.input;
 
+import com.google.protobuf.ListValue;
 import com.iohao.game.action.skeleton.protocol.wrapper.ByteValueList;
 import com.iohao.game.action.skeleton.protocol.wrapper.StringValue;
+import com.iohao.game.action.skeleton.protocol.wrapper.StringValueList;
+import com.iohao.game.action.skeleton.protocol.wrapper.WrapperKit;
 import com.iohao.game.external.client.AbstractInputCommandRegion;
 import com.iohao.game.external.client.command.InputRequestData;
 import com.iohao.game.external.client.kit.ScannerKit;
@@ -28,6 +31,8 @@ import com.iohao.mmo.common.provide.kit.JsonKit;
 import com.iohao.mmo.equip.cmd.EquipCmd;
 import com.iohao.mmo.equip.proto.*;
 import lombok.extern.slf4j.Slf4j;
+
+import java.util.Arrays;
 import java.util.List;
 
 /**
@@ -129,9 +134,11 @@ public class EquipInputCommandRegion extends AbstractInputCommandRegion {
             ScannerKit.log(() -> log.info("请输入要删除的装备id,格式 [装备1id-装备2id]"));
             String ids = ScannerKit.nextLine("1-1");
 
+            List<String> idList = Arrays.asList(ids.split("-"));
+
             // 请求参数
-            StringValue stringValue = StringValue.of(ids);
-            return stringValue;
+            StringValueList listValue =  WrapperKit.ofListStringValue(idList);
+            return listValue;
         };
 
         // 10-5
@@ -151,10 +158,12 @@ public class EquipInputCommandRegion extends AbstractInputCommandRegion {
             ScannerKit.log(() -> log.info("请输入装备库itemTypeId列表,格式 [装备库itemTypeId1-装备库itemTypeId2-装备库itemTypeId3...]"));
             String itemTypeIds = ScannerKit.nextLine("1-1");
 
+            List<String> itemTypeIdList = Arrays.asList(itemTypeIds.split("-"));
+
             // 请求参数
-            StringValue stringValue = StringValue.of(itemTypeIds);
+            StringValueList listValue =  WrapperKit.ofListStringValue(itemTypeIdList);
 
-            return stringValue;
+            return listValue;
         };
         // 10-13
         ofCommand(EquipCmd.randomEquip).callback(ByteValueList.class, result -> {