Accept Merge Request #157: (dev -> master)

Merge Request: 修改代码模板，新增代码案例

Created By: @车国建
Accepted By: @车国建
URL: https://g-pheu9517.coding.net/p/grt-iscs/d/ISCS_Base/git/merge/157?initial=true

ktg-admin/pom.xml

@@ -67,6 +67,12 @@
             <artifactId>ktg-mes</artifactId>
         </dependency>
 
+        <!-- iscs业务模块-->
+        <dependency>
+            <groupId>com.ktg</groupId>
+            <artifactId>ktg-iscs</artifactId>
+        </dependency>
+
     </dependencies>
 
     <build>
@@ -86,17 +92,17 @@
                     </execution>
                 </executions>
             </plugin>
-            <plugin>   
-                <groupId>org.apache.maven.plugins</groupId>   
-                <artifactId>maven-war-plugin</artifactId>   
-                <version>3.1.0</version>   
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-war-plugin</artifactId>
+                <version>3.1.0</version>
                 <configuration>
                     <failOnMissingWebXml>false</failOnMissingWebXml>
                     <warName>${project.artifactId}</warName>
-                </configuration>   
-           </plugin>   
+                </configuration>
+           </plugin>
         </plugins>
         <finalName>${project.artifactId}</finalName>
     </build>
 
-</project>
+</project>

ktg-admin/src/main/resources/application-druid.yml

@@ -1,3 +1,7 @@
+# 开发环境配置
+server:
+    # 服务器的HTTP端口，默认为9090
+    port: 9090
 # 数据源配置
 spring:
     datasource:
@@ -6,9 +10,12 @@ spring:
         druid:
             # 主库数据源
             master:
-                url: jdbc:mysql://101.43.63.193:3306/j2eedb?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
-                username: root
-                password: my-secret-pw
+                url: jdbc:mysql://36.133.35.52:3306/iscs_dev?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                username: guoruandev
+                password: guoruan@#$devNUM1
+                #url: jdbc:mysql://100.113.202.103:3306/iscs_dev?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                #username: guoruandev
+                #password: guoruan@#$devNUM1
             # 从库数据源
             slave:
                 # 从数据源开关/默认关闭

ktg-admin/src/main/resources/application.yml

@@ -9,8 +9,7 @@ ktg-mes:
   # 实例演示开关
   demoEnabled: true
   # 文件路径 示例（ Windows配置D:/ktg/uploadPath，Linux配置 /home/ktg/uploadPath）
-  profile: C:/source_code/j2eeworkspace/ktg-mes/upload
-  #profile: /home/www/uploadPath
+  profile: /home/iscs
   # 获取ip地址开关
   addressEnabled: false
   # 验证码类型 math 数组计算 char 字符验证
@@ -18,8 +17,6 @@ ktg-mes:
 
 # 开发环境配置
 server:
-  # 服务器的HTTP端口，默认为9090
-  port: 9090
   servlet:
     # 应用的访问路径
     context-path: /

ktg-generator/src/main/resources/vm/java/controller.java.vm

@@ -84,8 +84,8 @@ public class ${ClassName}Controller extends BaseController
     @ApiOperation("获取${functionName}详细信息")
     @Parameter(name = "${pkColumn.javaField}", description = "${pkColumn.javaField}")
     @PreAuthorize("@ss.hasPermi('${permissionPrefix}:query')")
-    @GetMapping(value = "/{${pkColumn.javaField}}")
-    public CommonResult<${ClassName}> select${ClassName}ById(@PathVariable("${pkColumn.javaField}") ${pkColumn.javaType} ${pkColumn.javaField})
+    @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}));
     }
@@ -108,7 +108,7 @@ public class ${ClassName}Controller extends BaseController
     @ApiOperation("修改${functionName}")
     @PreAuthorize("@ss.hasPermi('${permissionPrefix}:edit')")
     @Log(title = "${functionName}", businessType = BusinessType.UPDATE)
-    @PutMapping("/update${ClassName}")
+    @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);
@@ -120,9 +120,9 @@ public class ${ClassName}Controller extends BaseController
     @ApiOperation("删除${functionName}")
     @PreAuthorize("@ss.hasPermi('${permissionPrefix}:remove')")
     @Log(title = "${functionName}", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{${pkColumn.javaField}s}")
-    public CommonResult<Boolean> delete${ClassName}By${pkColumn.capJavaField}s(@PathVariable ${pkColumn.javaType}[] ${pkColumn.javaField}s)
+	@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) == 1);
+        return CommonResult.success(${className}Service.delete${ClassName}By${pkColumn.capJavaField}s(${pkColumn.javaField}s) != 0);
     }
 }

ktg-generator/src/main/resources/vm/java/mapper.java.vm

@@ -1,6 +1,7 @@
 package ${packageName}.mapper;
 
 import java.util.List;
+import com.ktg.common.mapper.BaseMapperX;
 import ${packageName}.domain.${ClassName};
 #if($table.sub)
 import ${packageName}.domain.${subClassName};
@@ -12,7 +13,7 @@ import ${packageName}.domain.${subClassName};
  * @author ${author}
  * @date ${datetime}
  */
-public interface ${ClassName}Mapper
+public interface ${ClassName}Mapper extends BaseMapperX<${ClassName}>
 {
     /**
      * 查询${functionName}

ktg-generator/src/main/resources/vm/java/service.java.vm

@@ -1,5 +1,6 @@
 package ${packageName}.service;
 
+import com.baomidou.mybatisplus.extension.service.IService;
 import java.util.List;
 import ${packageName}.domain.${ClassName};
 
@@ -9,7 +10,7 @@ import ${packageName}.domain.${ClassName};
  * @author ${author}
  * @date ${datetime}
  */
-public interface I${ClassName}Service
+public interface I${ClassName}Service extends IService<${ClassName}>
 {
     /**
      * 查询${functionName}
@@ -49,7 +50,7 @@ public interface I${ClassName}Service
      * @param ${pkColumn.javaField}s 需要删除的${functionName}主键集合
      * @return 结果
      */
-    int delete${ClassName}By${pkColumn.capJavaField}s(${pkColumn.javaType}[] ${pkColumn.javaField}s);
+    int delete${ClassName}By${pkColumn.capJavaField}s(String ${pkColumn.javaField}s);
 
     /**
      * 删除${functionName}信息

ktg-generator/src/main/resources/vm/java/serviceImpl.java.vm

@@ -1,6 +1,9 @@
 package ${packageName}.service.impl;
 
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import java.util.List;
+import cn.hutool.core.lang.Assert;
+import com.ktg.common.core.text.Convert;
 #foreach ($column in $columns)
 #if($column.javaField == 'createTime' || $column.javaField == 'updateTime')
 import com.ktg.common.utils.DateUtils;
@@ -21,19 +24,19 @@ import ${packageName}.service.I${ClassName}Service;
 
 /**
  * ${functionName}Service业务层处理
- * 
+ *
  * @author ${author}
  * @date ${datetime}
  */
 @Service
-public class ${ClassName}ServiceImpl 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}
      */
@@ -45,7 +48,7 @@ public class ${ClassName}ServiceImpl implements I${ClassName}Service
 
     /**
      * 查询${functionName}列表
-     * 
+     *
      * @param ${className} ${functionName}
      * @return ${functionName}
      */
@@ -57,7 +60,7 @@ public class ${ClassName}ServiceImpl implements I${ClassName}Service
 
     /**
      * 新增${functionName}
-     * 
+     *
      * @param ${className} ${functionName}
      * @return 结果
      */
@@ -83,7 +86,7 @@ public class ${ClassName}ServiceImpl implements I${ClassName}Service
 
     /**
      * 修改${functionName}
-     * 
+     *
      * @param ${className} ${functionName}
      * @return 结果
      */
@@ -107,7 +110,7 @@ public class ${ClassName}ServiceImpl implements I${ClassName}Service
 
     /**
      * 批量删除${functionName}
-     * 
+     *
      * @param ${pkColumn.javaField}s 需要删除的${functionName}主键
      * @return 结果
      */
@@ -115,17 +118,19 @@ public class ${ClassName}ServiceImpl implements I${ClassName}Service
     @Transactional
 #end
     @Override
-    public int delete${ClassName}By${pkColumn.capJavaField}s(${pkColumn.javaType}[] ${pkColumn.javaField}s)
+    public int delete${ClassName}By${pkColumn.capJavaField}s(String ${pkColumn.javaField}s)
     {
+        Assert.notBlank(ids, "请选择需要删除的数据!");
+        Long[] longIds = Convert.toLongArray(ids);
 #if($table.sub)
         ${className}Mapper.delete${subClassName}By${subTableFkClassName}s(${pkColumn.javaField}s);
 #end
-        return ${className}Mapper.delete${ClassName}By${pkColumn.capJavaField}s(${pkColumn.javaField}s);
+        return ${className}Mapper.delete${ClassName}By${pkColumn.capJavaField}s(longIds);
     }
 
     /**
      * 删除${functionName}信息
-     * 
+     *
      * @param ${pkColumn.javaField} ${functionName}主键
      * @return 结果
      */
@@ -144,7 +149,7 @@ public class ${ClassName}ServiceImpl implements I${ClassName}Service
 
     /**
      * 新增${subTable.functionName}信息
-     * 
+     *
      * @param ${className} ${functionName}对象
      */
     public void insert${subClassName}(${ClassName} ${className})

ktg-iscs/pom.xml

@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>ktg</artifactId>
+        <groupId>com.ktg</groupId>
+        <version>3.8.2</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>ktg-iscs</artifactId>
+
+    <description>
+        iscs模块
+    </description>
+
+    <dependencies>
+
+        <!-- 通用工具-->
+        <dependency>
+            <groupId>com.ktg</groupId>
+            <artifactId>ktg-common</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.swagger</groupId>
+            <artifactId>swagger-annotations</artifactId>
+            <version>1.6.2</version>
+            <scope>compile</scope>
+        </dependency>
+
+    </dependencies>
+
+</project>

ktg-iscs/src/main/java/com/ktg/iscs/controller/TestIscsController.java

@@ -0,0 +1,116 @@
+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.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);
+    }
+}

ktg-iscs/src/main/java/com/ktg/iscs/domain/TestIscs.java

@@ -0,0 +1,40 @@
+package com.ktg.iscs.domain;
+
+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 */
+    @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;
+
+
+}

ktg-iscs/src/main/java/com/ktg/iscs/mapper/TestIscsMapper.java

@@ -0,0 +1,63 @@
+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);
+}

ktg-iscs/src/main/java/com/ktg/iscs/service/ITestIscsService.java

@@ -0,0 +1,63 @@
+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);
+}

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

@@ -0,0 +1,105 @@
+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);
+    }
+}

ktg-iscs/src/main/resources/mapper/test/TestIscsMapper.xml

@@ -0,0 +1,85 @@
+<?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>

ktg-system/src/main/java/com/ktg/system/service/ISysTeamService.java

@@ -3,8 +3,6 @@ package com.ktg.system.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.ktg.system.domain.SysTeam;
-import com.ktg.system.service.impl.SysTeamServiceImpl;
-import com.ktg.system.service.impl.SysUserServiceImpl;
 
 import java.util.List;
 

pom.xml

@@ -227,6 +227,13 @@
                 <version>${ktg.version}</version>
             </dependency>
 
+            <!-- iscs模块-->
+            <dependency>
+                <groupId>com.ktg</groupId>
+                <artifactId>ktg-iscs</artifactId>
+                <version>${ktg.version}</version>
+            </dependency>
+
             <!-- 通用工具-->
             <dependency>
                 <groupId>com.ktg</groupId>
@@ -252,6 +259,7 @@
         <module>ktg-generator</module>
         <module>ktg-common</module>
         <module>ktg-mes</module>
+        <module>ktg-iscs</module>
     </modules>
     <packaging>pom</packaging>