通道组添加APP接入查询通道组接口

modules/admin/src/main/java/com/fire/admin/rest/ChannelGroupRest.java

@@ -7,10 +7,13 @@ import com.fire.dto.ChannelGroup;
 import com.fire.dto.response.BaseResponse;
 import com.fire.dto.response.BaseRestResponse;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
+
 /**
  * @author: admin
  * @Description:
@@ -40,6 +43,17 @@ public class ChannelGroupRest {
         }
     }
 
+    @GetMapping("/allChannelGroup")
+    @ApiModelProperty(value = "查询所有通道组不带分页", notes = "get_all_channelgroup.py")
+    public BaseRestResponse searchChannelGroup() {
+        List<ChannelGroup> list = channelGroupService.list();
+        if (list != null) {
+            return new BaseRestResponse(list);
+        } else {
+            return new BaseRestResponse(null);
+        }
+    }
+
     @PostMapping("/add")
     @ApiOperation(value = "添加通道组", notes = "add_channel_group.py")
     public BaseResponse saveChannelGroup(ChannelGroup channelGroup) {

modules/admin/src/main/resources/mapper/ChannelInfoMapper.xml

@@ -21,7 +21,10 @@
     </resultMap>
 
     <sql id="common_field">
-        aci.channel_id,
+        aci
+        .
+        channel_id
+        ,
         aci.supplier_id,
         cs.supplier_name,
         aci.channel_name,