Эх сурвалжийг харах

生成代码模板更新 - 替换成mybatisplus

车车 10 сар өмнө
parent
commit
417581957b

+ 19 - 6
ktg-generator/src/main/resources/vm/java/controller.java.vm

@@ -1,5 +1,7 @@
 package ${packageName}.controller;
 
+import cn.hutool.core.convert.Convert;
+import cn.hutool.core.lang.Assert;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ktg.common.annotation.Log;
@@ -16,8 +18,13 @@ import io.swagger.v3.oas.annotations.Parameters;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
+
 import javax.servlet.http.HttpServletResponse;
 import java.util.List;
+import java.util.Arrays;
+
+
+
 
 #if($table.crud || $table.sub)
 import com.ktg.common.core.page.TableDataInfo;
@@ -52,7 +59,7 @@ public class ${ClassName}Controller extends BaseController
     public CommonResult<Page<${ClassName}>> get${ClassName}Page(Page<${ClassName}> page, ${ClassName} ${className})
     {
         Page<${ClassName}> result = ${className}Service.page(page, Wrappers.<${ClassName}>lambdaQuery()
-                .orderByDesc(${ClassName}::getId));
+                .orderByDesc(${ClassName}::get${pkColumn.capJavaField}));
         return CommonResult.success(result);
     }
 #elseif($table.tree)
@@ -73,7 +80,11 @@ public class ${ClassName}Controller extends BaseController
     @PostMapping("/export${ClassName}")
     public void export${ClassName}(HttpServletResponse response, ${ClassName} ${className})
     {
-        List<${ClassName}> list = ${className}Service.select${ClassName}List(${className});
+        Page<${ClassName}> page = new Page<>();
+        page.setSize(-1);
+        page.setCurrent(1);
+        List<${ClassName}> list = ${className}Service.page(page, Wrappers.<${ClassName}>lambdaQuery()
+                .orderByDesc(${ClassName}::get${pkColumn.capJavaField})).getRecords();
         ExcelUtil<${ClassName}> util = new ExcelUtil<${ClassName}>(${ClassName}.class);
         util.exportExcel(response, list, "${functionName}数据");
     }
@@ -87,7 +98,7 @@ public class ${ClassName}Controller extends BaseController
     @GetMapping(value = "/select${ClassName}ById")
     public CommonResult<${ClassName}> select${ClassName}ById(${pkColumn.javaType} ${pkColumn.javaField})
     {
-        return CommonResult.success(${className}Service.select${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaField}));
+        return CommonResult.success(${className}Service.getById(${pkColumn.javaField}));
     }
 
     /**
@@ -99,7 +110,7 @@ public class ${ClassName}Controller extends BaseController
     @PostMapping("/insert${ClassName}")
     public CommonResult<Boolean> insert${ClassName}(@RequestBody @Parameter(name = "${className}", description = "新增数据类,放到body") ${ClassName} ${className})
     {
-        return CommonResult.success(${className}Service.insert${ClassName}(${className}) == 1);
+        return CommonResult.success(${className}Service.save(${className}));
     }
 
     /**
@@ -111,7 +122,7 @@ public class ${ClassName}Controller extends BaseController
     @PostMapping("/update${ClassName}")
     public CommonResult<Boolean> update${ClassName}(@RequestBody @Parameter(name = "${className}", description = "修改数据类,放到body") ${ClassName} ${className})
     {
-        return CommonResult.success(${className}Service.update${ClassName}(${className}) == 1);
+        return CommonResult.success(${className}Service.updateById(${className}));
     }
 
     /**
@@ -123,6 +134,8 @@ public class ${ClassName}Controller extends BaseController
 	@PostMapping("/delete${ClassName}By${pkColumn.capJavaField}s")
     public CommonResult<Boolean> delete${ClassName}By${pkColumn.capJavaField}s(String ${pkColumn.javaField}s)
     {
-        return CommonResult.success(${className}Service.delete${ClassName}By${pkColumn.capJavaField}s(${pkColumn.javaField}s) != 0);
+        Assert.notBlank(${pkColumn.javaField}s, "请选择需要删除的数据!");
+        Long[] longIds = Convert.toLongArray(${pkColumn.javaField}s);
+        return CommonResult.success(${className}Service.removeBatchByIds(Arrays.asList(longIds)));
     }
 }

+ 2 - 75
ktg-generator/src/main/resources/vm/java/mapper.java.vm

@@ -1,6 +1,7 @@
 package ${packageName}.mapper;
 
 import java.util.List;
+
 import org.apache.ibatis.annotations.Mapper;
 import com.ktg.common.mapper.BaseMapperX;
 import ${packageName}.domain.${ClassName};
@@ -15,80 +16,6 @@ import ${packageName}.domain.${subClassName};
  * @date ${datetime}
  */
 @Mapper
-public interface ${ClassName}Mapper extends BaseMapperX<${ClassName}>
-{
-    /**
-     * 查询${functionName}
-     *
-     * @param ${pkColumn.javaField} ${functionName}主键
-     * @return ${functionName}
-     */
-    ${ClassName} select${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaType} ${pkColumn.javaField});
-
-    /**
-     * 查询${functionName}列表
-     *
-     * @param ${className} ${functionName}
-     * @return ${functionName}集合
-     */
-    List<${ClassName}> select${ClassName}List(${ClassName} ${className});
-
-    /**
-     * 新增${functionName}
-     *
-     * @param ${className} ${functionName}
-     * @return 结果
-     */
-    int insert${ClassName}(${ClassName} ${className});
+public interface ${ClassName}Mapper extends BaseMapperX<${ClassName}> {
 
-    /**
-     * 修改${functionName}
-     *
-     * @param ${className} ${functionName}
-     * @return 结果
-     */
-    int update${ClassName}(${ClassName} ${className});
-
-    /**
-     * 删除${functionName}
-     *
-     * @param ${pkColumn.javaField} ${functionName}主键
-     * @return 结果
-     */
-    int delete${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaType} ${pkColumn.javaField});
-
-    /**
-     * 批量删除${functionName}
-     *
-     * @param ${pkColumn.javaField}s 需要删除的数据主键集合
-     * @return 结果
-     */
-    int delete${ClassName}By${pkColumn.capJavaField}s(${pkColumn.javaType}[] ${pkColumn.javaField}s);
-#if($table.sub)
-
-    /**
-     * 批量删除${subTable.functionName}
-     *
-     * @param ${pkColumn.javaField}s 需要删除的数据主键集合
-     * @return 结果
-     */
-    int delete${subClassName}By${subTableFkClassName}s(${pkColumn.javaType}[] ${pkColumn.javaField}s);
-
-    /**
-     * 批量新增${subTable.functionName}
-     *
-     * @param ${subclassName}List ${subTable.functionName}列表
-     * @return 结果
-     */
-    int batch${subClassName}(List<${subClassName}> ${subclassName}List);
-
-
-    /**
-     * 通过${functionName}主键删除${subTable.functionName}信息
-     *
-     * @param ${pkColumn.javaField} ${functionName}ID
-     * @return 结果
-     */
-    int delete${subClassName}By${subTableFkClassName}(${pkColumn.javaType} ${pkColumn.javaField});
-#end
 }

+ 1 - 48
ktg-generator/src/main/resources/vm/java/service.java.vm

@@ -10,53 +10,6 @@ import ${packageName}.domain.${ClassName};
  * @author ${author}
  * @date ${datetime}
  */
-public interface I${ClassName}Service extends IService<${ClassName}>
-{
-    /**
-     * 查询${functionName}
-     *
-     * @param ${pkColumn.javaField} ${functionName}主键
-     * @return ${functionName}
-     */
-    ${ClassName} select${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaType} ${pkColumn.javaField});
+public interface I${ClassName}Service extends IService<${ClassName}> {
 
-    /**
-     * 查询${functionName}列表
-     *
-     * @param ${className} ${functionName}
-     * @return ${functionName}集合
-     */
-    List<${ClassName}> select${ClassName}List(${ClassName} ${className});
-
-    /**
-     * 新增${functionName}
-     *
-     * @param ${className} ${functionName}
-     * @return 结果
-     */
-    int insert${ClassName}(${ClassName} ${className});
-
-    /**
-     * 修改${functionName}
-     *
-     * @param ${className} ${functionName}
-     * @return 结果
-     */
-    int update${ClassName}(${ClassName} ${className});
-
-    /**
-     * 批量删除${functionName}
-     *
-     * @param ${pkColumn.javaField}s 需要删除的${functionName}主键集合
-     * @return 结果
-     */
-    int delete${ClassName}By${pkColumn.capJavaField}s(String ${pkColumn.javaField}s);
-
-    /**
-     * 删除${functionName}信息
-     *
-     * @param ${pkColumn.javaField} ${functionName}主键
-     * @return 结果
-     */
-    int delete${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaType} ${pkColumn.javaField});
 }

+ 2 - 139
ktg-generator/src/main/resources/vm/java/serviceImpl.java.vm

@@ -29,146 +29,9 @@ import ${packageName}.service.I${ClassName}Service;
  * @date ${datetime}
  */
 @Service
-public class ${ClassName}ServiceImpl extends ServiceImpl<${ClassName}Mapper, ${ClassName}> implements I${ClassName}Service
-{
+public class ${ClassName}ServiceImpl extends ServiceImpl<${ClassName}Mapper, ${ClassName}> implements I${ClassName}Service {
+
     @Autowired
     private ${ClassName}Mapper ${className}Mapper;
 
-    /**
-     * 查询${functionName}
-     *
-     * @param ${pkColumn.javaField} ${functionName}主键
-     * @return ${functionName}
-     */
-    @Override
-    public ${ClassName} select${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaType} ${pkColumn.javaField})
-    {
-        return ${className}Mapper.select${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaField});
-    }
-
-    /**
-     * 查询${functionName}列表
-     *
-     * @param ${className} ${functionName}
-     * @return ${functionName}
-     */
-    @Override
-    public List<${ClassName}> select${ClassName}List(${ClassName} ${className})
-    {
-        return ${className}Mapper.select${ClassName}List(${className});
-    }
-
-    /**
-     * 新增${functionName}
-     *
-     * @param ${className} ${functionName}
-     * @return 结果
-     */
-#if($table.sub)
-    @Transactional
-#end
-    @Override
-    public int insert${ClassName}(${ClassName} ${className})
-    {
-#foreach ($column in $columns)
-#if($column.javaField == 'createTime')
-        ${className}.setCreateTime(DateUtils.getNowDate());
-#end
-#end
-#if($table.sub)
-        int rows = ${className}Mapper.insert${ClassName}(${className});
-        insert${subClassName}(${className});
-        return rows;
-#else
-        return ${className}Mapper.insert${ClassName}(${className});
-#end
-    }
-
-    /**
-     * 修改${functionName}
-     *
-     * @param ${className} ${functionName}
-     * @return 结果
-     */
-#if($table.sub)
-    @Transactional
-#end
-    @Override
-    public int update${ClassName}(${ClassName} ${className})
-    {
-#foreach ($column in $columns)
-#if($column.javaField == 'updateTime')
-        ${className}.setUpdateTime(DateUtils.getNowDate());
-#end
-#end
-#if($table.sub)
-        ${className}Mapper.delete${subClassName}By${subTableFkClassName}(${className}.get${pkColumn.capJavaField}());
-        insert${subClassName}(${className});
-#end
-        return ${className}Mapper.update${ClassName}(${className});
-    }
-
-    /**
-     * 批量删除${functionName}
-     *
-     * @param ${pkColumn.javaField}s 需要删除的${functionName}主键
-     * @return 结果
-     */
-#if($table.sub)
-    @Transactional
-#end
-    @Override
-    public int delete${ClassName}By${pkColumn.capJavaField}s(String ${pkColumn.javaField}s)
-    {
-        Assert.notBlank(${pkColumn.javaField}s, "请选择需要删除的数据!");
-        Long[] longIds = Convert.toLongArray(${pkColumn.javaField}s);
-#if($table.sub)
-        ${className}Mapper.delete${subClassName}By${subTableFkClassName}s(${pkColumn.javaField}s);
-#end
-        return ${className}Mapper.delete${ClassName}By${pkColumn.capJavaField}s(longIds);
-    }
-
-    /**
-     * 删除${functionName}信息
-     *
-     * @param ${pkColumn.javaField} ${functionName}主键
-     * @return 结果
-     */
-#if($table.sub)
-    @Transactional
-#end
-    @Override
-    public int delete${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaType} ${pkColumn.javaField})
-    {
-#if($table.sub)
-        ${className}Mapper.delete${subClassName}By${subTableFkClassName}(${pkColumn.javaField});
-#end
-        return ${className}Mapper.delete${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaField});
-    }
-#if($table.sub)
-
-    /**
-     * 新增${subTable.functionName}信息
-     *
-     * @param ${className} ${functionName}对象
-     */
-    public void insert${subClassName}(${ClassName} ${className})
-    {
-        List<${subClassName}> ${subclassName}List = ${className}.get${subClassName}List();
-        ${pkColumn.javaType} ${pkColumn.javaField} = ${className}.get${pkColumn.capJavaField}();
-        if (StringUtils.isNotNull(${subclassName}List))
-        {
-            List<${subClassName}> list = new ArrayList<${subClassName}>();
-            for (${subClassName} ${subclassName} : ${subclassName}List)
-            {
-                ${subclassName}.set${subTableFkClassName}(${pkColumn.javaField});
-                list.add(${subclassName});
-            }
-            if (list.size() > 0)
-            {
-                ${className}Mapper.batch${subClassName}(list);
-            }
-        }
-    }
-#end
 }

+ 3 - 131
ktg-generator/src/main/resources/vm/xml/mapper.xml.vm

@@ -1,135 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="${packageName}.mapper.${ClassName}Mapper">
-    
-    <resultMap type="${ClassName}" id="${ClassName}Result">
-#foreach ($column in $columns)
-        <result property="${column.javaField}"    column="${column.columnName}"    />
-#end
-    </resultMap>
-#if($table.sub)
 
-    <resultMap id="${ClassName}${subClassName}Result" type="${ClassName}" extends="${ClassName}Result">
-        <collection property="${subclassName}List" notNullColumn="sub_${subTable.pkColumn.columnName}" javaType="java.util.List" resultMap="${subClassName}Result" />
-    </resultMap>
-
-    <resultMap type="${subClassName}" id="${subClassName}Result">
-#foreach ($column in $subTable.columns)
-        <result property="${column.javaField}"    column="sub_${column.columnName}"    />
-#end
-    </resultMap>
-#end
-
-    <sql id="select${ClassName}Vo">
-        select#foreach($column in $columns) $column.columnName#if($foreach.count != $columns.size()),#end#end from ${tableName}
-    </sql>
-
-    <select id="select${ClassName}List" parameterType="${ClassName}" resultMap="${ClassName}Result">
-        <include refid="select${ClassName}Vo"/>
-        <where>  
-#foreach($column in $columns)
-#set($queryType=$column.queryType)
-#set($javaField=$column.javaField)
-#set($javaType=$column.javaType)
-#set($columnName=$column.columnName)
-#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
-#if($column.query)
-#if($column.queryType == "EQ")
-            <if test="$javaField != null #if($javaType == 'String' ) and $javaField.trim() != ''#end"> and $columnName = #{$javaField}</if>
-#elseif($queryType == "NE")
-            <if test="$javaField != null #if($javaType == 'String' ) and $javaField.trim() != ''#end"> and $columnName != #{$javaField}</if>
-#elseif($queryType == "GT")
-            <if test="$javaField != null #if($javaType == 'String' ) and $javaField.trim() != ''#end"> and $columnName &gt; #{$javaField}</if>
-#elseif($queryType == "GTE")
-            <if test="$javaField != null #if($javaType == 'String' ) and $javaField.trim() != ''#end"> and $columnName &gt;= #{$javaField}</if>
-#elseif($queryType == "LT")
-            <if test="$javaField != null #if($javaType == 'String' ) and $javaField.trim() != ''#end"> and $columnName &lt; #{$javaField}</if>
-#elseif($queryType == "LTE")
-            <if test="$javaField != null #if($javaType == 'String' ) and $javaField.trim() != ''#end"> and $columnName &lt;= #{$javaField}</if>
-#elseif($queryType == "LIKE")
-            <if test="$javaField != null #if($javaType == 'String' ) and $javaField.trim() != ''#end"> and $columnName like concat('%', #{$javaField}, '%')</if>
-#elseif($queryType == "BETWEEN")
-            <if test="params.begin$AttrName != null and params.begin$AttrName != '' and params.end$AttrName != null and params.end$AttrName != ''"> and $columnName between #{params.begin$AttrName} and #{params.end$AttrName}</if>
-#end
-#end
-#end
-        </where>
-    </select>
-    
-    <select id="select${ClassName}By${pkColumn.capJavaField}" parameterType="${pkColumn.javaType}" resultMap="#if($table.sub)${ClassName}${subClassName}Result#else${ClassName}Result#end">
-#if($table.crud || $table.tree)
-        <include refid="select${ClassName}Vo"/>
-        where ${pkColumn.columnName} = #{${pkColumn.javaField}}
-#elseif($table.sub)
-        select#foreach($column in $columns) a.$column.columnName#if($foreach.count != $columns.size()),#end#end,
-           #foreach($column in $subTable.columns) b.$column.columnName as sub_$column.columnName#if($foreach.count != $subTable.columns.size()),#end#end
-
-        from ${tableName} a
-        left join ${subTableName} b on b.${subTableFkName} = a.${pkColumn.columnName}
-        where a.${pkColumn.columnName} = #{${pkColumn.javaField}}
-#end
-    </select>
-        
-    <insert id="insert${ClassName}" parameterType="${ClassName}"#if($pkColumn.increment) useGeneratedKeys="true" keyProperty="$pkColumn.javaField"#end>
-        insert into ${tableName}
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-#foreach($column in $columns)
-#if($column.columnName != $pkColumn.columnName || !$pkColumn.increment)
-            <if test="$column.javaField != null#if($column.javaType == 'String' && $column.required) and $column.javaField != ''#end">$column.columnName,</if>
-#end
-#end
-         </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-#foreach($column in $columns)
-#if($column.columnName != $pkColumn.columnName || !$pkColumn.increment)
-            <if test="$column.javaField != null#if($column.javaType == 'String' && $column.required) and $column.javaField != ''#end">#{$column.javaField},</if>
-#end
-#end
-         </trim>
-    </insert>
-
-    <update id="update${ClassName}" parameterType="${ClassName}">
-        update ${tableName}
-        <trim prefix="SET" suffixOverrides=",">
-#foreach($column in $columns)
-#if($column.columnName != $pkColumn.columnName)
-            <if test="$column.javaField != null#if($column.javaType == 'String' && $column.required) and $column.javaField != ''#end">$column.columnName = #{$column.javaField},</if>
-#end
-#end
-        </trim>
-        where ${pkColumn.columnName} = #{${pkColumn.javaField}}
-    </update>
-
-    <delete id="delete${ClassName}By${pkColumn.capJavaField}" parameterType="${pkColumn.javaType}">
-        delete from ${tableName} where ${pkColumn.columnName} = #{${pkColumn.javaField}}
-    </delete>
-
-    <delete id="delete${ClassName}By${pkColumn.capJavaField}s" parameterType="String">
-        delete from ${tableName} where ${pkColumn.columnName} in 
-        <foreach item="${pkColumn.javaField}" collection="array" open="(" separator="," close=")">
-            #{${pkColumn.javaField}}
-        </foreach>
-    </delete>
-#if($table.sub)
-    
-    <delete id="delete${subClassName}By${subTableFkClassName}s" parameterType="String">
-        delete from ${subTableName} where ${subTableFkName} in 
-        <foreach item="${subTableFkclassName}" collection="array" open="(" separator="," close=")">
-            #{${subTableFkclassName}}
-        </foreach>
-    </delete>
-
-    <delete id="delete${subClassName}By${subTableFkClassName}" parameterType="${pkColumn.javaType}">
-        delete from ${subTableName} where ${subTableFkName} = #{${subTableFkclassName}}
-    </delete>
-
-    <insert id="batch${subClassName}">
-        insert into ${subTableName}(#foreach($column in $subTable.columns) $column.columnName#if($foreach.count != $subTable.columns.size()),#end#end) values
-		<foreach item="item" index="index" collection="list" separator=",">
-            (#foreach($column in $subTable.columns) #{item.$column.javaField}#if($foreach.count != $subTable.columns.size()),#end#end)
-        </foreach>
-    </insert>
-#end
-</mapper>
+</mapper>

+ 0 - 127
ktg-iscs/src/main/java/com/ktg/iscs/controller/TestIscsController.java

@@ -1,127 +0,0 @@
-package com.ktg.iscs.controller;
-
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ktg.common.annotation.Log;
-import com.ktg.common.core.controller.BaseController;
-import com.ktg.common.enums.BusinessType;
-import com.ktg.common.pojo.CommonResult;
-import com.ktg.common.utils.poi.ExcelUtil;
-import com.ktg.framework.websocket.WebSocketIots;
-import com.ktg.iscs.domain.TestIscs;
-import com.ktg.iscs.service.ITestIscsService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.Parameters;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-import javax.servlet.http.HttpServletResponse;
-import java.util.List;
-
-/**
- * 测试用Controller
- *
- * @author yinjinlu
- * @date 2024-10-15
- */
-@Api(tags = "测试用")
-@RestController
-@RequestMapping("/test/iscs")
-public class TestIscsController extends BaseController
-{
-    @Autowired
-    private ITestIscsService testIscsService;
-
-    /**
-     * 查询测试用分页
-     */
-    @ApiOperation("查询测试用-分页")
-    @Parameters({
-            @Parameter(name = "page", description = "Page"),
-            @Parameter(name = "sysTeam", description = "实体参数")
-    })
-    @PreAuthorize("@ss.hasPermi('test:iscs:list')")
-    @GetMapping("/getTestIscsPage")
-    public CommonResult<Page<TestIscs>> getTestIscsPage(Page<TestIscs> page, TestIscs testIscs)
-    {
-        Page<TestIscs> result = testIscsService.page(page, Wrappers.<TestIscs>lambdaQuery()
-                .orderByDesc(TestIscs::getId));
-        return CommonResult.success(result);
-    }
-
-    /**
-     * 导出测试用列表
-     */
-    @ApiOperation("导出测试用列表")
-    @Parameter(name = "testIscs", description = "实体参数")
-    @PreAuthorize("@ss.hasPermi('test:iscs:export')")
-    @Log(title = "测试用", businessType = BusinessType.EXPORT)
-    @PostMapping("/exportTestIscs")
-    public void exportTestIscs(HttpServletResponse response, TestIscs testIscs)
-    {
-        List<TestIscs> list = testIscsService.selectTestIscsList(testIscs);
-        ExcelUtil<TestIscs> util = new ExcelUtil<TestIscs>(TestIscs.class);
-        util.exportExcel(response, list, "测试用数据");
-    }
-
-    /**
-     * 获取测试用详细信息
-     */
-    @ApiOperation("获取测试用详细信息")
-    @Parameter(name = "id", description = "id")
-    @PreAuthorize("@ss.hasPermi('test:iscs:query')")
-    @GetMapping(value = "/selectTestIscsById")
-    public CommonResult<TestIscs> selectTestIscsById(Long id)
-    {
-        return CommonResult.success(testIscsService.selectTestIscsById(id));
-    }
-
-    /**
-     * 新增测试用
-     */
-    @ApiOperation("新增测试用")
-    @PreAuthorize("@ss.hasPermi('test:iscs:add')")
-    @Log(title = "测试用", businessType = BusinessType.INSERT)
-    @PostMapping("/insertTestIscs")
-    public CommonResult<Boolean> insertTestIscs(@RequestBody @Parameter(name = "testIscs", description = "新增数据类,放到body") TestIscs testIscs)
-    {
-        return CommonResult.success(testIscsService.insertTestIscs(testIscs) == 1);
-    }
-
-    /**
-     * 修改测试用
-     */
-    @ApiOperation("修改测试用")
-    @PreAuthorize("@ss.hasPermi('test:iscs:edit')")
-    @Log(title = "测试用", businessType = BusinessType.UPDATE)
-    @PostMapping("/updateTestIscs")
-    public CommonResult<Boolean> updateTestIscs(@RequestBody @Parameter(name = "testIscs", description = "修改数据类,放到body") TestIscs testIscs)
-    {
-        return CommonResult.success(testIscsService.updateTestIscs(testIscs) == 1);
-    }
-
-    /**
-     * 删除测试用
-     */
-    @ApiOperation("删除测试用")
-    @PreAuthorize("@ss.hasPermi('test:iscs:remove')")
-    @Log(title = "测试用", businessType = BusinessType.DELETE)
-	@PostMapping("/deleteTestIscsByIds")
-    public CommonResult<Boolean> deleteTestIscsByIds(String ids)
-    {
-        return CommonResult.success(testIscsService.deleteTestIscsByIds(ids) != 0);
-    }
-
-
-    @ApiOperation("测试发送消息")
-    @GetMapping(value = "/testSendMsg")
-    public CommonResult<Boolean> testSendMes(String msg)
-    {
-        WebSocketIots.sendMassMessage(msg);
-        return CommonResult.success(true);
-    }
-
-}

+ 0 - 43
ktg-iscs/src/main/java/com/ktg/iscs/domain/TestIscs.java

@@ -1,43 +0,0 @@
-package com.ktg.iscs.domain;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import io.swagger.v3.oas.annotations.media.Schema;
-import com.ktg.common.annotation.Excel;
-import com.ktg.common.core.domain.model.BaseBean;
-
-/**
- * 测试用对象 test_iscs
- *
- * @author yinjinlu
- * @date 2024-10-14
- */
-@EqualsAndHashCode(callSuper = true)
-@Data
-public class TestIscs extends BaseBean
-{
-    private static final long serialVersionUID = 1L;
-
-    /** 主键id */
-    @TableId(type = IdType.AUTO)
-    @Schema(description = "主键id")
-    private Long id;
-
-    /** 姓名 */
-    @Schema(description = "姓名")
-    @Excel(name = "姓名")
-    private String name;
-
-    /** 编号 */
-    @Schema(description = "编号")
-    @Excel(name = "编号")
-    private String code;
-
-    /** 删除标志(0代表存在 2代表删除) */
-    @Schema(description = "删除标志(0代表存在 2代表删除)")
-    private String delFlag;
-
-
-}

+ 0 - 63
ktg-iscs/src/main/java/com/ktg/iscs/mapper/TestIscsMapper.java

@@ -1,63 +0,0 @@
-package com.ktg.iscs.mapper;
-
-import com.ktg.common.mapper.BaseMapperX;
-import com.ktg.iscs.domain.TestIscs;
-
-import java.util.List;
-
-/**
- * 测试用Mapper接口
- *
- * @author yinjinlu
- * @date 2024-10-14
- */
-public interface TestIscsMapper extends BaseMapperX<TestIscs>
-{
-    /**
-     * 查询测试用
-     *
-     * @param id 测试用主键
-     * @return 测试用
-     */
-    TestIscs selectTestIscsById(Long id);
-
-    /**
-     * 查询测试用列表
-     *
-     * @param testIscs 测试用
-     * @return 测试用集合
-     */
-    List<TestIscs> selectTestIscsList(TestIscs testIscs);
-
-    /**
-     * 新增测试用
-     *
-     * @param testIscs 测试用
-     * @return 结果
-     */
-    int insertTestIscs(TestIscs testIscs);
-
-    /**
-     * 修改测试用
-     *
-     * @param testIscs 测试用
-     * @return 结果
-     */
-    int updateTestIscs(TestIscs testIscs);
-
-    /**
-     * 删除测试用
-     *
-     * @param id 测试用主键
-     * @return 结果
-     */
-    int deleteTestIscsById(Long id);
-
-    /**
-     * 批量删除测试用
-     *
-     * @param ids 需要删除的数据主键集合
-     * @return 结果
-     */
-    int deleteTestIscsByIds(Long[] ids);
-}

+ 0 - 63
ktg-iscs/src/main/java/com/ktg/iscs/service/ITestIscsService.java

@@ -1,63 +0,0 @@
-package com.ktg.iscs.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.ktg.iscs.domain.TestIscs;
-
-import java.util.List;
-
-/**
- * 测试用Service接口
- *
- * @author yinjinlu
- * @date 2024-10-15
- */
-public interface ITestIscsService extends IService<TestIscs>
-{
-    /**
-     * 查询测试用
-     *
-     * @param id 测试用主键
-     * @return 测试用
-     */
-    TestIscs selectTestIscsById(Long id);
-
-    /**
-     * 查询测试用列表
-     *
-     * @param testIscs 测试用
-     * @return 测试用集合
-     */
-    List<TestIscs> selectTestIscsList(TestIscs testIscs);
-
-    /**
-     * 新增测试用
-     *
-     * @param testIscs 测试用
-     * @return 结果
-     */
-    int insertTestIscs(TestIscs testIscs);
-
-    /**
-     * 修改测试用
-     *
-     * @param testIscs 测试用
-     * @return 结果
-     */
-    int updateTestIscs(TestIscs testIscs);
-
-    /**
-     * 批量删除测试用
-     *
-     * @param ids 需要删除的测试用主键集合
-     * @return 结果
-     */
-    int deleteTestIscsByIds(String ids);
-
-    /**
-     * 删除测试用信息
-     *
-     * @param id 测试用主键
-     * @return 结果
-     */
-    int deleteTestIscsById(Long id);
-}

+ 0 - 105
ktg-iscs/src/main/java/com/ktg/iscs/service/impl/TestIscsServiceImpl.java

@@ -1,105 +0,0 @@
-package com.ktg.iscs.service.impl;
-
-import cn.hutool.core.lang.Assert;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ktg.common.core.text.Convert;
-import com.ktg.common.utils.DateUtils;
-import com.ktg.iscs.domain.TestIscs;
-import com.ktg.iscs.mapper.TestIscsMapper;
-import com.ktg.iscs.service.ITestIscsService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.Arrays;
-import java.util.List;
-
-/**
- * 测试用Service业务层处理
- *
- * @author yinjinlu
- * @date 2024-10-15
- */
-@Service
-public class TestIscsServiceImpl extends ServiceImpl<TestIscsMapper, TestIscs> implements ITestIscsService
-{
-    @Autowired
-    private TestIscsMapper testIscsMapper;
-
-    /**
-     * 查询测试用
-     *
-     * @param id 测试用主键
-     * @return 测试用
-     */
-    @Override
-    public TestIscs selectTestIscsById(Long id)
-    {
-        return testIscsMapper.selectTestIscsById(id);
-    }
-
-    /**
-     * 查询测试用列表
-     *
-     * @param testIscs 测试用
-     * @return 测试用
-     */
-    @Override
-    public List<TestIscs> selectTestIscsList(TestIscs testIscs)
-    {
-        return testIscsMapper.selectTestIscsList(testIscs);
-    }
-
-    /**
-     * 新增测试用
-     *
-     * @param testIscs 测试用
-     * @return 结果
-     */
-    @Override
-    public int insertTestIscs(TestIscs testIscs)
-    {
-        testIscs.setCreateTime(DateUtils.getNowDate());
-        return testIscsMapper.insertTestIscs(testIscs);
-    }
-
-    /**
-     * 修改测试用
-     *
-     * @param testIscs 测试用
-     * @return 结果
-     */
-    @Override
-    public int updateTestIscs(TestIscs testIscs)
-    {
-        testIscs.setUpdateTime(DateUtils.getNowDate());
-        return testIscsMapper.updateTestIscs(testIscs);
-    }
-
-    /**
-     * 批量删除测试用
-     *
-     * @param ids 需要删除的测试用主键
-     * @return 结果
-     */
-    @Override
-    public int deleteTestIscsByIds(String ids)
-    {
-        Assert.notBlank(ids, "请选择需要删除的数据!");
-        Long[] longIds = Convert.toLongArray(ids);
-        boolean b = removeBatchByIds(Arrays.asList(longIds));
-        return 1;
-        // return testIscsMapper.deleteTestIscsByIds(longIds);
-    }
-
-    /**
-     * 删除测试用信息
-     *
-     * @param id 测试用主键
-     * @return 结果
-     */
-    @Override
-    public int deleteTestIscsById(Long id)
-    {
-        return testIscsMapper.deleteTestIscsById(id);
-    }
-}

+ 0 - 85
ktg-iscs/src/main/resources/mapper/TestIscsMapper.xml

@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ktg.iscs.mapper.TestIscsMapper">
-
-    <resultMap type="TestIscs" id="TestIscsResult">
-        <result property="id"    column="id"    />
-        <result property="name"    column="name"    />
-        <result property="code"    column="code"    />
-        <result property="delFlag"    column="del_flag"    />
-        <result property="createBy"    column="create_by"    />
-        <result property="createTime"    column="create_time"    />
-        <result property="updateBy"    column="update_by"    />
-        <result property="updateTime"    column="update_time"    />
-        <result property="remark"    column="remark"    />
-    </resultMap>
-
-    <sql id="selectTestIscsVo">
-        select id, name, code, del_flag, create_by, create_time, update_by, update_time, remark from test_iscs
-    </sql>
-
-    <select id="selectTestIscsList" parameterType="TestIscs" resultMap="TestIscsResult">
-        <include refid="selectTestIscsVo"/>
-        <where>
-            <if test="name != null  and name != ''"> and name like concat('%', #{name}, '%')</if>
-            <if test="code != null  and code != ''"> and code = #{code}</if>
-        </where>
-    </select>
-
-    <select id="selectTestIscsById" parameterType="Long" resultMap="TestIscsResult">
-        <include refid="selectTestIscsVo"/>
-        where id = #{id}
-    </select>
-
-    <insert id="insertTestIscs" parameterType="TestIscs" useGeneratedKeys="true" keyProperty="id">
-        insert into test_iscs
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="name != null">name,</if>
-            <if test="code != null">code,</if>
-            <if test="delFlag != null">del_flag,</if>
-            <if test="createBy != null">create_by,</if>
-            <if test="createTime != null">create_time,</if>
-            <if test="updateBy != null">update_by,</if>
-            <if test="updateTime != null">update_time,</if>
-            <if test="remark != null">remark,</if>
-         </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="name != null">#{name},</if>
-            <if test="code != null">#{code},</if>
-            <if test="delFlag != null">#{delFlag},</if>
-            <if test="createBy != null">#{createBy},</if>
-            <if test="createTime != null">#{createTime},</if>
-            <if test="updateBy != null">#{updateBy},</if>
-            <if test="updateTime != null">#{updateTime},</if>
-            <if test="remark != null">#{remark},</if>
-         </trim>
-    </insert>
-
-    <update id="updateTestIscs" parameterType="TestIscs">
-        update test_iscs
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="name != null">name = #{name},</if>
-            <if test="code != null">code = #{code},</if>
-            <if test="delFlag != null">del_flag = #{delFlag},</if>
-            <if test="createBy != null">create_by = #{createBy},</if>
-            <if test="createTime != null">create_time = #{createTime},</if>
-            <if test="updateBy != null">update_by = #{updateBy},</if>
-            <if test="updateTime != null">update_time = #{updateTime},</if>
-            <if test="remark != null">remark = #{remark},</if>
-        </trim>
-        where id = #{id}
-    </update>
-
-    <delete id="deleteTestIscsById" parameterType="Long">
-        delete from test_iscs where id = #{id}
-    </delete>
-
-    <delete id="deleteTestIscsByIds" parameterType="String">
-        delete from test_iscs where id in
-        <foreach item="id" collection="array" open="(" separator="," close=")">
-            #{id}
-        </foreach>
-    </delete>
-</mapper>