[incubator-inlong] branch master updated: [INLONG-1975][Bug]error occurs when deleting a data access(addendum) (#2007)

[go...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

gosonzhang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-inlong.git


The following commit(s) were added to refs/heads/master by this push:
     new 0ca7968  [INLONG-1975][Bug]error occurs when deleting a data access(addendum) (#2007)
0ca7968 is described below

commit 0ca7968ed0c04078aea2b845c2c6f7baadb61db8
Author: healchow <he...@gmail.com>
AuthorDate: Thu Dec 16 09:28:06 2021 +0800

    [INLONG-1975][Bug]error occurs when deleting a data access(addendum) (#2007)
---
 .../src/main/resources/mappers/DataStreamEntityMapper.xml           | 4 ++--
 .../apache/inlong/manager/web/controller/DataStreamController.java  | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/inlong-manager/manager-dao/src/main/resources/mappers/DataStreamEntityMapper.xml b/inlong-manager/manager-dao/src/main/resources/mappers/DataStreamEntityMapper.xml
index 5e55122..40cd4e0 100644
--- a/inlong-manager/manager-dao/src/main/resources/mappers/DataStreamEntityMapper.xml
+++ b/inlong-manager/manager-dao/src/main/resources/mappers/DataStreamEntityMapper.xml
@@ -129,7 +129,7 @@
         select count(1)
         from data_stream
         <where>
-            inlong_group_id = #{inlongGroupId,jdbcType=VARCHAR}
+            inlong_group_id = #{groupId,jdbcType=VARCHAR}
             and is_deleted = 0
         </where>
     </select>
@@ -420,7 +420,7 @@
                 peak_records= #{peakRecords,jdbcType=INTEGER},
             </if>
             <if test="maxLength != null">
-                max_length= #{maxLength,jdbcType=INTEGER}
+                max_length= #{maxLength,jdbcType=INTEGER},
             </if>
             <if test="inCharges != null">
                 in_charges = #{inCharges,jdbcType=VARCHAR},
diff --git a/inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/controller/DataStreamController.java b/inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/controller/DataStreamController.java
index 9871ec2..b63fc7e 100644
--- a/inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/controller/DataStreamController.java
+++ b/inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/controller/DataStreamController.java
@@ -120,12 +120,12 @@ public class DataStreamController {
     @OperationLog(operation = OperationType.DELETE)
     @ApiOperation(value = "Delete data stream information")
     @ApiImplicitParams({
-            @ApiImplicitParam(name = "groupId", dataTypeClass = String.class, required = true),
+            @ApiImplicitParam(name = "inlongGroupId", dataTypeClass = String.class, required = true),
             @ApiImplicitParam(name = "streamId", dataTypeClass = String.class, required = true)
     })
-    public Response<Boolean> delete(@RequestParam String groupId, @RequestParam String streamId) {
+    public Response<Boolean> delete(@RequestParam String inlongGroupId, @RequestParam String streamId) {
         String username = LoginUserUtil.getLoginUserDetail().getUserName();
-        return Response.success(dataStreamService.delete(groupId, streamId, username));
+        return Response.success(dataStreamService.delete(inlongGroupId, streamId, username));
     }
 
     @RequestMapping(value = "/getSummaryList/{groupId}", method = RequestMethod.GET)