diff --git a/infosouth-generator/target/classes/META-INF/MANIFEST.MF b/infosouth-generator/target/classes/META-INF/MANIFEST.MF deleted file mode 100644 index 1f9fa9929..000000000 --- a/infosouth-generator/target/classes/META-INF/MANIFEST.MF +++ /dev/null @@ -1,5 +0,0 @@ -Manifest-Version: 1.0 -Built-By: tiny -Build-Jdk: 1.8.0_181 -Created-By: Maven Integration for Eclipse - diff --git a/infosouth-generator/target/classes/META-INF/maven/cn.com.infosouth/infosouth-generator/pom.properties b/infosouth-generator/target/classes/META-INF/maven/cn.com.infosouth/infosouth-generator/pom.properties deleted file mode 100644 index 81c8d3a32..000000000 --- a/infosouth-generator/target/classes/META-INF/maven/cn.com.infosouth/infosouth-generator/pom.properties +++ /dev/null @@ -1,7 +0,0 @@ -#Generated by Maven Integration for Eclipse -#Wed Mar 04 16:21:09 CST 2020 -version=4.1.0 -groupId=cn.com.infosouth -m2e.projectName=infosouth-generator -m2e.projectLocation=Z\:\\ram_eclipse_proj\\amas.comac.v2\\infosouth-generator -artifactId=infosouth-generator diff --git a/infosouth-generator/target/classes/META-INF/maven/cn.com.infosouth/infosouth-generator/pom.xml b/infosouth-generator/target/classes/META-INF/maven/cn.com.infosouth/infosouth-generator/pom.xml deleted file mode 100644 index 656d89f7d..000000000 --- a/infosouth-generator/target/classes/META-INF/maven/cn.com.infosouth/infosouth-generator/pom.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - amas.comac - cn.com.infosouth - 4.1.0 - - 4.0.0 - - infosouth-generator - - - generator代码生成 - - - - - - - org.apache.velocity - velocity - - - - - cn.com.infosouth - infosouth-common - - - - - \ No newline at end of file diff --git a/infosouth-generator/target/classes/generator.yml b/infosouth-generator/target/classes/generator.yml deleted file mode 100644 index 40e685a18..000000000 --- a/infosouth-generator/target/classes/generator.yml +++ /dev/null @@ -1,11 +0,0 @@ - -# 代码生成 -gen: - # 作者 - author: kxnf - # 默认生成包路径 system 需改成自己的模块名称 如 system monitor tool - packageName: cn.com.infosouth.xxx - # 自动去除表前缀，默认是false - autoRemovePre: false - # 表前缀（生成类名不会包含表前缀，多个用逗号分隔） - tablePrefix: sys_ \ No newline at end of file diff --git a/infosouth-generator/target/classes/mapper/generator/GenTableColumnMapper.xml b/infosouth-generator/target/classes/mapper/generator/GenTableColumnMapper.xml deleted file mode 100644 index 0f3d0c920..000000000 --- a/infosouth-generator/target/classes/mapper/generator/GenTableColumnMapper.xml +++ /dev/null @@ -1,120 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - select column_id, table_id, column_name, column_comment, column_type, java_type, java_field, is_pk, is_increment, is_required, is_insert, is_edit, is_list, is_query, query_type, html_type, dict_type, sort, create_by, create_time, update_by, update_time from gen_table_column - - - - - - - - insert into gen_table_column ( - table_id, - column_name, - column_comment, - column_type, - java_type, - java_field, - is_pk, - is_increment, - is_required, - is_insert, - is_edit, - is_list, - is_query, - query_type, - html_type, - dict_type, - sort, - create_by, - create_time - )values( - #{tableId}, - #{columnName}, - #{columnComment}, - #{columnType}, - #{javaType}, - #{javaField}, - #{isPk}, - #{isIncrement}, - #{isRequired}, - #{isInsert}, - #{isEdit}, - #{isList}, - #{isQuery}, - #{queryType}, - #{htmlType}, - #{dictType}, - #{sort}, - #{createBy}, - sysdate() - ) - - - - update gen_table_column - - column_comment = #{columnComment}, - java_type = #{javaType}, - java_field = #{javaField}, - is_insert = #{isInsert}, - is_edit = #{isEdit}, - is_list = #{isList}, - is_query = #{isQuery}, - is_required = #{isRequired}, - query_type = #{queryType}, - html_type = #{htmlType}, - dict_type = #{dictType}, - sort = #{sort}, - update_by = #{updateBy}, - update_time = sysdate() - - where column_id = #{columnId} - - - - delete from gen_table_column where table_id in - - #{tableId} - - - - \ No newline at end of file diff --git a/infosouth-generator/target/classes/mapper/generator/GenTableMapper.xml b/infosouth-generator/target/classes/mapper/generator/GenTableMapper.xml deleted file mode 100644 index ec9bf9e3c..000000000 --- a/infosouth-generator/target/classes/mapper/generator/GenTableMapper.xml +++ /dev/null @@ -1,169 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - select table_id, table_name, table_comment, class_name, tpl_category, package_name, module_name, business_name, function_name, function_author, options, create_by, create_time, update_by, update_time, remark from gen_table - - - - - - - - - - - - - - - - insert into gen_table ( - table_name, - table_comment, - class_name, - tpl_category, - package_name, - module_name, - business_name, - function_name, - function_author, - remark, - create_by, - create_time - )values( - #{tableName}, - #{tableComment}, - #{className}, - #{tplCategory}, - #{packageName}, - #{moduleName}, - #{businessName}, - #{functionName}, - #{functionAuthor}, - #{remark}, - #{createBy}, - sysdate() - ) - - - - update gen_table - - table_name = #{tableName}, - table_comment = #{tableComment}, - class_name = #{className}, - function_author = #{functionAuthor}, - tpl_category = #{tplCategory}, - package_name = #{packageName}, - module_name = #{moduleName}, - business_name = #{businessName}, - function_name = #{functionName}, - options = #{options}, - update_by = #{updateBy}, - remark = #{remark}, - update_time = sysdate() - - where table_id = #{tableId} - - - - delete from gen_table where table_id in - - #{tableId} - - - - \ No newline at end of file diff --git a/infosouth-generator/target/classes/templates/tool/gen/edit.html b/infosouth-generator/target/classes/templates/tool/gen/edit.html deleted file mode 100644 index d94e98306..000000000 --- a/infosouth-generator/target/classes/templates/tool/gen/edit.html +++ /dev/null @@ -1,483 +0,0 @@ - - - - - - - - -
-
-
-
-
-
- -
- -
- -
-
-
-
- -
- -
-
-
-
-
- -
- -
-
-
-
-
-
-
- -
- -
-
-
-
-
- -
- -
-
-
-
-
-
-
- -
- -
-
-
-
-
- - -
-
-
-
-
- - -
-
-
-
- -
- -
-
-
-
-
- -
- -
-
-
-
-
-
-
- -
- -
-
-
-
-
- -
- -
-
-
-
-
-
-
- -
- -
-
-
-
- -
-
-
-
-
-
-
-   - -
-
-
-
-
-
- - - - - - - - - - - - - - - - - diff --git a/infosouth-generator/target/classes/templates/tool/gen/gen.html b/infosouth-generator/target/classes/templates/tool/gen/gen.html deleted file mode 100644 index 38ec318e9..000000000 --- a/infosouth-generator/target/classes/templates/tool/gen/gen.html +++ /dev/null @@ -1,186 +0,0 @@ - - - - - - -
-
-
-
-
-
    -
  • - 表名称： -
    • -
  • - 表描述： -
    • -
  • - - - - - -
    • -
  • -  搜索 -  重置 -
    • -
-
-
-
- - - -
-
-
-
-
- - - - \ No newline at end of file diff --git a/infosouth-generator/target/classes/templates/tool/gen/importTable.html b/infosouth-generator/target/classes/templates/tool/gen/importTable.html deleted file mode 100644 index 425e8b62d..000000000 --- a/infosouth-generator/target/classes/templates/tool/gen/importTable.html +++ /dev/null @@ -1,99 +0,0 @@ - - - - - - -
-
-
-
-
- -
-
-
- -
-
-
-
-
- - - - \ No newline at end of file diff --git a/infosouth-generator/target/classes/vm/html/add.html.vm b/infosouth-generator/target/classes/vm/html/add.html.vm deleted file mode 100644 index 3770af47c..000000000 --- a/infosouth-generator/target/classes/vm/html/add.html.vm +++ /dev/null @@ -1,159 +0,0 @@ - - - - -#foreach($column in $columns) -#if($column.insert && !$column.superColumn && !$column.pk && $column.htmlType == "datetime") - -#break -#end -#end - - -
-
-#foreach($column in $columns) -#set($field=$column.javaField) -#if($column.insert && !$column.pk) -#if(($column.usableColumn) || (!$column.superColumn)) -#set($parentheseIndex=$column.columnComment.indexOf("（")) -#if($parentheseIndex != -1) -#set($comment=$column.columnComment.substring(0, $parentheseIndex)) -#else -#set($comment=$column.columnComment) -#end -#set($dictType=$column.dictType) -#if("" != $treeParentCode && $column.javaField == $treeParentCode) -
- -
-
-#set($BusinessName=$businessName.substring(0,1).toUpperCase() + ${businessName.substring(1)}) -#set($treeId = "${className}?.${treeCode}") - - - -
-
-
-#elseif($column.htmlType == "input") -
- -
- -
-
-#elseif($column.htmlType == "select" && "" != $dictType) -
- -
- -
-
-#elseif($column.htmlType == "select" && $dictType) -
- -
- - 代码生成请选择字典属性 -
-
-#elseif($column.htmlType == "radio" && "" != $dictType) -
- -
-
- - -
-
-
-#elseif($column.htmlType == "radio" && $dictType) -
- -
-
- - -
- 代码生成请选择字典属性 -
-
-#elseif($column.htmlType == "datetime") -
- -
-
- - -
-
-
-#elseif($column.htmlType == "textarea") -
- -
- -
-
-#end -#end -#end -#end -
-
- -#foreach($column in $columns) -#if($column.insert && !$column.superColumn && !$column.pk && $column.htmlType == "datetime") - -#break -#end -#end - - - \ No newline at end of file diff --git a/infosouth-generator/target/classes/vm/html/edit.html.vm b/infosouth-generator/target/classes/vm/html/edit.html.vm deleted file mode 100644 index 6001ccda1..000000000 --- a/infosouth-generator/target/classes/vm/html/edit.html.vm +++ /dev/null @@ -1,159 +0,0 @@ - - - - -#foreach($column in $columns) -#if($column.edit && !$column.superColumn && !$column.pk && $column.htmlType == "datetime") - -#break -#end -#end - - -
-
- -#foreach($column in $columns) -#if($column.edit && !$column.pk) -#if(($column.usableColumn) || (!$column.superColumn)) -#set($parentheseIndex=$column.columnComment.indexOf("（")) -#if($parentheseIndex != -1) -#set($comment=$column.columnComment.substring(0, $parentheseIndex)) -#else -#set($comment=$column.columnComment) -#end -#set($field=$column.javaField) -#set($dictType=$column.dictType) -#if("" != $treeParentCode && $column.javaField == $treeParentCode) -
- -
-
-#set($BusinessName=$businessName.substring(0,1).toUpperCase() + ${businessName.substring(1)}) - - - -
-
-
-#elseif($column.htmlType == "input") -
- -
- -
-
-#elseif($column.htmlType == "select" && "" != $dictType) -
- -
- -
-
-#elseif($column.htmlType == "select" && $dictType) -
- -
- - 代码生成请选择字典属性 -
-
-#elseif($column.htmlType == "radio" && "" != $dictType) -
- -
-
- - -
-
-
-#elseif($column.htmlType == "radio" && $dictType) -
- -
-
- - -
- 代码生成请选择字典属性 -
-
-#elseif($column.htmlType == "datetime") -
- -
-
- - -
-
-
-#elseif($column.htmlType == "textarea") -
- -
- -
-
-#end -#end -#end -#end -
-
- -#foreach($column in $columns) -#if($column.edit && !$column.superColumn && !$column.pk && $column.htmlType == "datetime") - -#break -#end -#end - - - \ No newline at end of file diff --git a/infosouth-generator/target/classes/vm/html/list-tree.html.vm b/infosouth-generator/target/classes/vm/html/list-tree.html.vm deleted file mode 100644 index 4b854c27d..000000000 --- a/infosouth-generator/target/classes/vm/html/list-tree.html.vm +++ /dev/null @@ -1,150 +0,0 @@ - - - - - - -
-
-
-
-
-
    -#foreach($column in $columns) -#if($column.query) -#set($dictType=$column.dictType) -#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)}) -#set($parentheseIndex=$column.columnComment.indexOf("（")) -#if($parentheseIndex != -1) -#set($comment=$column.columnComment.substring(0, $parentheseIndex)) -#else -#set($comment=$column.columnComment) -#end -#if($column.htmlType == "input") -
  • -

    ${comment}：

    - -
    • -#elseif($column.htmlType == "select" || $column.htmlType == "radio" && "" != $dictType) -
  • -

    ${comment}：

    - -
    • -#elseif($column.htmlType == "select" || $column.htmlType == "radio" && $dictType) -
  • -

    ${comment}：

    - -
    • -#elseif($column.htmlType == "datetime") -
  • -

    ${comment}：

    - - - - -
    • -#end -#end -#end -
  • -  搜索 -  重置 -
    • -
-
-
-
- - -
-
-
-
-
- - - - \ No newline at end of file diff --git a/infosouth-generator/target/classes/vm/html/list.html.vm b/infosouth-generator/target/classes/vm/html/list.html.vm deleted file mode 100644 index fa3bcfb19..000000000 --- a/infosouth-generator/target/classes/vm/html/list.html.vm +++ /dev/null @@ -1,148 +0,0 @@ - - - - - - -
-
-
-
-
-
    -#foreach($column in $columns) -#if($column.query) -#set($dictType=$column.dictType) -#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)}) -#set($parentheseIndex=$column.columnComment.indexOf("（")) -#if($parentheseIndex != -1) -#set($comment=$column.columnComment.substring(0, $parentheseIndex)) -#else -#set($comment=$column.columnComment) -#end -#if($column.htmlType == "input") -
  • -

    ${comment}：

    - -
    • -#elseif($column.htmlType == "select" || $column.htmlType == "radio" && "" != $dictType) -
  • -

    ${comment}：

    - -
    • -#elseif($column.htmlType == "select" || $column.htmlType == "radio" && $dictType) -
  • -

    ${comment}：

    - -
    • -#elseif($column.htmlType == "datetime") -
  • -

    ${comment}：

    - - - - -
    • -#end -#end -#end -
  • -  搜索 -  重置 -
    • -
-
-
-
- - -
-
-
-
-
- - - - \ No newline at end of file diff --git a/infosouth-generator/target/classes/vm/html/tree.html.vm b/infosouth-generator/target/classes/vm/html/tree.html.vm deleted file mode 100644 index 80364ad06..000000000 --- a/infosouth-generator/target/classes/vm/html/tree.html.vm +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - - - -#set($treeId = "${className}?." + $treeCode) -#set($treeName = "${className}?." + $treeName) - - -
- - -
- -
- 展开 / - 折叠 -
-
-
- - - - - \ No newline at end of file diff --git a/infosouth-generator/target/classes/vm/java/controller.java.vm b/infosouth-generator/target/classes/vm/java/controller.java.vm deleted file mode 100644 index ed3ed0769..000000000 --- a/infosouth-generator/target/classes/vm/java/controller.java.vm +++ /dev/null @@ -1,201 +0,0 @@ -package ${basePackage}.web.controller.${moduleName}; - -import java.util.List; -import org.apache.shiro.authz.annotation.RequiresPermissions; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Controller; -import org.springframework.ui.ModelMap; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.ResponseBody; -import Log; -import BusinessType; -import ${packageName}.domain.${ClassName}; -import ${packageName}.service.I${ClassName}Service; -import BaseController; -import AjaxResult; -import ExcelUtil; -#if($table.crud) -import TableDataInfo; -#elseif($table.tree) -import StringUtils; -import Ztree; -#end - -/** - * ${functionName}Controller - * - * @author ${author} - * @date ${datetime} - */ -@Controller -@RequestMapping("/${moduleName}/${businessName}") -public class ${ClassName}Controller extends BaseController -{ - private String prefix = "${moduleName}/${businessName}"; - - @Autowired - private I${ClassName}Service ${className}Service; - - @RequiresPermissions("${permissionPrefix}:view") - @GetMapping() - public String ${businessName}() - { - return prefix + "/${businessName}"; - } - -#if($table.crud) - /** - * 查询${functionName}列表 - */ - @RequiresPermissions("${permissionPrefix}:list") - @PostMapping("/list") - @ResponseBody - public TableDataInfo list(${ClassName} ${className}) - { - startPage(); - List<${ClassName}> list = ${className}Service.select${ClassName}List(${className}); - return getDataTable(list); - } -#elseif($table.tree) - /** - * 查询${functionName}树列表 - */ - @RequiresPermissions("${permissionPrefix}:list") - @PostMapping("/list") - @ResponseBody - public List<${ClassName}> list(${ClassName} ${className}) - { - List<${ClassName}> list = ${className}Service.select${ClassName}List(${className}); - return list; - } -#end - - /** - * 导出${functionName}列表 - */ - @RequiresPermissions("${permissionPrefix}:export") - @Log(title = "${functionName}", businessType = BusinessType.EXPORT) - @PostMapping("/export") - @ResponseBody - public AjaxResult export(${ClassName} ${className}) - { - List<${ClassName}> list = ${className}Service.select${ClassName}List(${className}); - ExcelUtil<${ClassName}> util = new ExcelUtil<${ClassName}>(${ClassName}.class); - return util.exportExcel(list, "${businessName}"); - } - -#if($table.crud) - /** - * 新增${functionName} - */ - @GetMapping("/add") - public String add() - { - return prefix + "/add"; - } -#elseif($table.tree) - /** - * 新增${functionName} - */ - @GetMapping(value = { "/add/{${pkColumn.javaField}}", "/add/" }) - public String add(@PathVariable(value = "${pkColumn.javaField}", required = false) Long ${pkColumn.javaField}, ModelMap mmap) - { - if (StringUtils.isNotNull(${pkColumn.javaField})) - { - mmap.put("${className}", ${className}Service.select${ClassName}ById(${pkColumn.javaField})); - } - return prefix + "/add"; - } -#end - - /** - * 新增保存${functionName} - */ - @RequiresPermissions("${permissionPrefix}:add") - @Log(title = "${functionName}", businessType = BusinessType.INSERT) - @PostMapping("/add") - @ResponseBody - public AjaxResult addSave(${ClassName} ${className}) - { - return toAjax(${className}Service.insert${ClassName}(${className})); - } - - /** - * 修改${functionName} - */ - @GetMapping("/edit/{${pkColumn.javaField}}") - public String edit(@PathVariable("${pkColumn.javaField}") ${pkColumn.javaType} ${pkColumn.javaField}, ModelMap mmap) - { - ${ClassName} ${className} = ${className}Service.select${ClassName}ById(${pkColumn.javaField}); - mmap.put("${className}", ${className}); - return prefix + "/edit"; - } - - /** - * 修改保存${functionName} - */ - @RequiresPermissions("${permissionPrefix}:edit") - @Log(title = "${functionName}", businessType = BusinessType.UPDATE) - @PostMapping("/edit") - @ResponseBody - public AjaxResult editSave(${ClassName} ${className}) - { - return toAjax(${className}Service.update${ClassName}(${className})); - } - -#if($table.crud) - /** - * 删除${functionName} - */ - @RequiresPermissions("${permissionPrefix}:remove") - @Log(title = "${functionName}", businessType = BusinessType.DELETE) - @PostMapping( "/remove") - @ResponseBody - public AjaxResult remove(String ids) - { - return toAjax(${className}Service.delete${ClassName}ByIds(ids)); - } -#elseif($table.tree) - /** - * 删除 - */ - @RequiresPermissions("${permissionPrefix}:remove") - @Log(title = "${functionName}", businessType = BusinessType.DELETE) - @GetMapping("/remove/{${pkColumn.javaField}}") - @ResponseBody - public AjaxResult remove(@PathVariable("${pkColumn.javaField}") ${pkColumn.javaType} ${pkColumn.javaField}) - { - return toAjax(${className}Service.delete${ClassName}ById(${pkColumn.javaField})); - } -#end -#if($table.tree) - - /** - * 选择${functionName}树 - */ -#set($BusinessName=$businessName.substring(0,1).toUpperCase() + ${businessName.substring(1)}) - @GetMapping(value = { "/select${BusinessName}Tree/{${pkColumn.javaField}}", "/select${BusinessName}Tree/" }) - public String select${BusinessName}Tree(@PathVariable(value = "${pkColumn.javaField}", required = false) Long ${pkColumn.javaField}, ModelMap mmap) - { - if (StringUtils.isNotNull(${pkColumn.javaField})) - { - mmap.put("${className}", ${className}Service.select${ClassName}ById(${pkColumn.javaField})); - } - return prefix + "/tree"; - } - - /** - * 加载${functionName}树列表 - */ - @GetMapping("/treeData") - @ResponseBody - public List treeData() - { - List ztrees = ${className}Service.select${ClassName}Tree(); - return ztrees; - } -#end -} diff --git a/infosouth-generator/target/classes/vm/java/domain.java.vm b/infosouth-generator/target/classes/vm/java/domain.java.vm deleted file mode 100644 index c9220897b..000000000 --- a/infosouth-generator/target/classes/vm/java/domain.java.vm +++ /dev/null @@ -1,84 +0,0 @@ -package ${packageName}.domain; - -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; -import Excel; -#if($table.crud) -import BaseEntity; -#elseif($table.tree) -import TreeEntity; -#end -#foreach ($import in $importList) -import ${import}; -#end - -/** - * ${functionName}对象 ${tableName} - * - * @author ${author} - * @date ${datetime} - */ -#if($table.crud) -#set($Entity="BaseEntity") -#elseif($table.tree) -#set($Entity="TreeEntity") -#end -public class ${ClassName} extends ${Entity} -{ - private static final long serialVersionUID = 1L; - -#foreach ($column in $columns) -#if(!$table.isSuperColumn($column.javaField)) - /** $column.columnComment */ -#if($column.list) -#set($parentheseIndex=$column.columnComment.indexOf("（")) -#if($parentheseIndex != -1) -#set($comment=$column.columnComment.substring(0, $parentheseIndex)) -#else -#set($comment=$column.columnComment) -#end -#if($parentheseIndex != -1) - @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") -#elseif($column.javaType == 'Date') - @Excel(name = "${comment}", width = 30, dateFormat = "yyyy-MM-dd") -#else - @Excel(name = "${comment}") -#end -#end - private $column.javaType $column.javaField; - -#end -#end -#foreach ($column in $columns) -#if(!$table.isSuperColumn($column.javaField)) -#if($column.javaField.length() > 2 && $column.javaField.substring(1,2).matches("[A-Z]")) -#set($AttrName=$column.javaField) -#else -#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)}) -#end - public void set${AttrName}($column.javaType $column.javaField) - { - this.$column.javaField = $column.javaField; - } - - public $column.javaType get${AttrName}() - { - return $column.javaField; - } -#end -#end - - @Override - public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) -#foreach ($column in $columns) -#if($column.javaField.length() > 2 && $column.javaField.substring(1,2).matches("[A-Z]")) -#set($AttrName=$column.javaField) -#else -#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)}) -#end - .append("${column.javaField}", get${AttrName}()) -#end - .toString(); - } -} diff --git a/infosouth-generator/target/classes/vm/java/mapper.java.vm b/infosouth-generator/target/classes/vm/java/mapper.java.vm deleted file mode 100644 index f31b115db..000000000 --- a/infosouth-generator/target/classes/vm/java/mapper.java.vm +++ /dev/null @@ -1,61 +0,0 @@ -package ${packageName}.mapper; - -import java.util.List; -import ${packageName}.domain.${ClassName}; - -/** - * ${functionName}Mapper接口 - * - * @author ${author} - * @date ${datetime} - */ -public interface ${ClassName}Mapper -{ - /** - * 查询${functionName} - * - * @param ${pkColumn.javaField} ${functionName}ID - * @return ${functionName} - */ - public ${ClassName} select${ClassName}ById(${pkColumn.javaType} ${pkColumn.javaField}); - - /** - * 查询${functionName}列表 - * - * @param ${className} ${functionName} - * @return ${functionName}集合 - */ - public List<${ClassName}> select${ClassName}List(${ClassName} ${className}); - - /** - * 新增${functionName} - * - * @param ${className} ${functionName} - * @return 结果 - */ - public int insert${ClassName}(${ClassName} ${className}); - - /** - * 修改${functionName} - * - * @param ${className} ${functionName} - * @return 结果 - */ - public int update${ClassName}(${ClassName} ${className}); - - /** - * 删除${functionName} - * - * @param ${pkColumn.javaField} ${functionName}ID - * @return 结果 - */ - public int delete${ClassName}ById(${pkColumn.javaType} ${pkColumn.javaField}); - - /** - * 批量删除${functionName} - * - * @param ${pkColumn.javaField}s 需要删除的数据ID - * @return 结果 - */ - public int delete${ClassName}ByIds(String[] ${pkColumn.javaField}s); -} diff --git a/infosouth-generator/target/classes/vm/java/service.java.vm b/infosouth-generator/target/classes/vm/java/service.java.vm deleted file mode 100644 index 613c519ff..000000000 --- a/infosouth-generator/target/classes/vm/java/service.java.vm +++ /dev/null @@ -1,73 +0,0 @@ -package ${packageName}.service; - -import java.util.List; -import ${packageName}.domain.${ClassName}; -#if($table.tree) -import Ztree; -#end - -/** - * ${functionName}Service接口 - * - * @author ${author} - * @date ${datetime} - */ -public interface I${ClassName}Service -{ - /** - * 查询${functionName} - * - * @param ${pkColumn.javaField} ${functionName}ID - * @return ${functionName} - */ - public ${ClassName} select${ClassName}ById(${pkColumn.javaType} ${pkColumn.javaField}); - - /** - * 查询${functionName}列表 - * - * @param ${className} ${functionName} - * @return ${functionName}集合 - */ - public List<${ClassName}> select${ClassName}List(${ClassName} ${className}); - - /** - * 新增${functionName} - * - * @param ${className} ${functionName} - * @return 结果 - */ - public int insert${ClassName}(${ClassName} ${className}); - - /** - * 修改${functionName} - * - * @param ${className} ${functionName} - * @return 结果 - */ - public int update${ClassName}(${ClassName} ${className}); - - /** - * 批量删除${functionName} - * - * @param ids 需要删除的数据ID - * @return 结果 - */ - public int delete${ClassName}ByIds(String ids); - - /** - * 删除${functionName}信息 - * - * @param ${pkColumn.javaField} ${functionName}ID - * @return 结果 - */ - public int delete${ClassName}ById(${pkColumn.javaType} ${pkColumn.javaField}); -#if($table.tree) - - /** - * 查询${functionName}树列表 - * - * @return 所有${functionName}信息 - */ - public List select${ClassName}Tree(); -#end -} diff --git a/infosouth-generator/target/classes/vm/java/serviceImpl.java.vm b/infosouth-generator/target/classes/vm/java/serviceImpl.java.vm deleted file mode 100644 index ab2a94c28..000000000 --- a/infosouth-generator/target/classes/vm/java/serviceImpl.java.vm +++ /dev/null @@ -1,141 +0,0 @@ -package ${packageName}.service.impl; - -import java.util.List; -#if($table.tree) -import java.util.ArrayList; -import Ztree; -#end -#foreach ($column in $columns) -#if($column.javaField == 'createTime' || $column.javaField == 'updateTime') -import DateUtils; -#break -#end -#end -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import ${packageName}.mapper.${ClassName}Mapper; -import ${packageName}.domain.${ClassName}; -import ${packageName}.service.I${ClassName}Service; -import Convert; - -/** - * ${functionName}Service业务层处理 - * - * @author ${author} - * @date ${datetime} - */ -@Service -public class ${ClassName}ServiceImpl implements I${ClassName}Service -{ - @Autowired - private ${ClassName}Mapper ${className}Mapper; - - /** - * 查询${functionName} - * - * @param ${pkColumn.javaField} ${functionName}ID - * @return ${functionName} - */ - @Override - public ${ClassName} select${ClassName}ById(${pkColumn.javaType} ${pkColumn.javaField}) - { - return ${className}Mapper.select${ClassName}ById(${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 结果 - */ - @Override - public int insert${ClassName}(${ClassName} ${className}) - { -#foreach ($column in $columns) -#if($column.javaField == 'createTime') - ${className}.setCreateTime(DateUtils.getNowDate()); -#end -#end - return ${className}Mapper.insert${ClassName}(${className}); - } - - /** - * 修改${functionName} - * - * @param ${className} ${functionName} - * @return 结果 - */ - @Override - public int update${ClassName}(${ClassName} ${className}) - { -#foreach ($column in $columns) -#if($column.javaField == 'updateTime') - ${className}.setUpdateTime(DateUtils.getNowDate()); -#end -#end - return ${className}Mapper.update${ClassName}(${className}); - } - - /** - * 删除${functionName}对象 - * - * @param ids 需要删除的数据ID - * @return 结果 - */ - @Override - public int delete${ClassName}ByIds(String ids) - { - return ${className}Mapper.delete${ClassName}ByIds(Convert.toStrArray(ids)); - } - - /** - * 删除${functionName}信息 - * - * @param ${pkColumn.javaField} ${functionName}ID - * @return 结果 - */ - @Override - public int delete${ClassName}ById(${pkColumn.javaType} ${pkColumn.javaField}) - { - return ${className}Mapper.delete${ClassName}ById(${pkColumn.javaField}); - } -#if($table.tree) - - /** - * 查询${functionName}树列表 - * - * @return 所有${functionName}信息 - */ - @Override - public List select${ClassName}Tree() - { - List<${ClassName}> ${className}List = ${className}Mapper.select${ClassName}List(new ${ClassName}()); - List ztrees = new ArrayList(); - for (${ClassName} ${className} : ${className}List) - { - Ztree ztree = new Ztree(); -#set($TreeCode=$treeCode.substring(0,1).toUpperCase() + ${treeCode.substring(1)}) -#set($TreeParentCode=$treeParentCode.substring(0,1).toUpperCase() + ${treeParentCode.substring(1)}) -#set($TreeName=$treeName.substring(0,1).toUpperCase() + ${treeName.substring(1)}) - ztree.setId(${className}.get${TreeCode}()); - ztree.setpId(${className}.get${TreeParentCode}()); - ztree.setName(${className}.get${TreeName}()); - ztree.setTitle(${className}.get${TreeName}()); - ztrees.add(ztree); - } - return ztrees; - } -#end -} diff --git a/infosouth-generator/target/classes/vm/sql/sql.vm b/infosouth-generator/target/classes/vm/sql/sql.vm deleted file mode 100644 index 1c367c214..000000000 --- a/infosouth-generator/target/classes/vm/sql/sql.vm +++ /dev/null @@ -1,22 +0,0 @@ --- 菜单 SQL -insert into sys_menu (menu_name, parent_id, order_num, url, menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark) -values('${functionName}', '3', '1', '/${moduleName}/${businessName}', 'C', '0', '${permissionPrefix}:view', '#', 'admin', '2018-03-01', 'ry', '2018-03-01', '${functionName}菜单'); - --- 按钮父菜单ID -SELECT @parentId := LAST_INSERT_ID(); - --- 按钮 SQL -insert into sys_menu (menu_name, parent_id, order_num, url, menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark) -values('${functionName}查询', @parentId, '1', '#', 'F', '0', '${permissionPrefix}:list', '#', 'admin', '2018-03-01', 'ry', '2018-03-01', ''); - -insert into sys_menu (menu_name, parent_id, order_num, url, menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark) -values('${functionName}新增', @parentId, '2', '#', 'F', '0', '${permissionPrefix}:add', '#', 'admin', '2018-03-01', 'ry', '2018-03-01', ''); - -insert into sys_menu (menu_name, parent_id, order_num, url, menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark) -values('${functionName}修改', @parentId, '3', '#', 'F', '0', '${permissionPrefix}:edit', '#', 'admin', '2018-03-01', 'ry', '2018-03-01', ''); - -insert into sys_menu (menu_name, parent_id, order_num, url, menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark) -values('${functionName}删除', @parentId, '4', '#', 'F', '0', '${permissionPrefix}:remove', '#', 'admin', '2018-03-01', 'ry', '2018-03-01', ''); - -insert into sys_menu (menu_name, parent_id, order_num, url, menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark) -values('${functionName}导出', @parentId, '5', '#', 'F', '0', '${permissionPrefix}:export', '#', 'admin', '2018-03-01', 'ry', '2018-03-01', ''); diff --git a/infosouth-generator/target/classes/vm/xml/mapper.xml.vm b/infosouth-generator/target/classes/vm/xml/mapper.xml.vm deleted file mode 100644 index 2abe209bd..000000000 --- a/infosouth-generator/target/classes/vm/xml/mapper.xml.vm +++ /dev/null @@ -1,108 +0,0 @@ - - - - - -#foreach ($column in $columns) - -#end -#if($table.tree) - -#end - - - - select#foreach($column in $columns) $column.columnName#if($velocityCount != $columns.size()),#end#end from ${tableName} - - - - - - - - insert into ${tableName} - -#foreach($column in $columns) -#if($column.columnName != $pkColumn.columnName || !$pkColumn.increment) - $column.columnName, -#end -#end - - -#foreach($column in $columns) -#if($column.columnName != $pkColumn.columnName || !$pkColumn.increment) - #{$column.javaField}, -#end -#end - - - - - update ${tableName} - -#foreach($column in $columns) -#if($column.columnName != $pkColumn.columnName) - $column.columnName = #{$column.javaField}, -#end -#end - - where ${pkColumn.columnName} = #{${pkColumn.javaField}} - - - - delete from ${tableName} where ${pkColumn.columnName} = #{${pkColumn.javaField}} - - - - delete from ${tableName} where ${pkColumn.columnName} in - - #{${pkColumn.javaField}} - - - - \ No newline at end of file diff --git a/infosouth-generator/target/infosouth-generator-4.1.0.jar b/infosouth-generator/target/infosouth-generator-4.1.0.jar deleted file mode 100644 index a41ea12e1..000000000 Binary files a/infosouth-generator/target/infosouth-generator-4.1.0.jar and /dev/null differ diff --git a/infosouth-generator/target/maven-archiver/pom.properties b/infosouth-generator/target/maven-archiver/pom.properties deleted file mode 100644 index 65b829ed6..000000000 --- a/infosouth-generator/target/maven-archiver/pom.properties +++ /dev/null @@ -1,5 +0,0 @@ -#Generated by Maven -#Wed Mar 04 15:29:06 CST 2020 -version=4.1.0 -groupId=cn.com.infosouth -artifactId=infosouth-generator diff --git a/infosouth-generator/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/infosouth-generator/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst deleted file mode 100644 index be2edb4f3..000000000 --- a/infosouth-generator/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst +++ /dev/null @@ -1,13 +0,0 @@ -cn\com\infosouth\generator\service\IGenTableService.class -cn\com\infosouth\generator\service\IGenTableColumnService.class -cn\com\infosouth\generator\util\GenUtils.class -cn\com\infosouth\generator\mapper\GenTableColumnMapper.class -cn\com\infosouth\generator\controller\GenController.class -cn\com\infosouth\generator\service\impl\GenTableColumnServiceImpl.class -cn\com\infosouth\generator\domain\GenTableColumn.class -cn\com\infosouth\generator\mapper\GenTableMapper.class -cn\com\infosouth\generator\domain\GenTable.class -cn\com\infosouth\generator\config\GenConfig.class -cn\com\infosouth\generator\util\VelocityUtils.class -cn\com\infosouth\generator\service\impl\GenTableServiceImpl.class -cn\com\infosouth\generator\util\VelocityInitializer.class diff --git a/infosouth-generator/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/infosouth-generator/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst deleted file mode 100644 index 16dd56b39..000000000 --- a/infosouth-generator/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst +++ /dev/null @@ -1,13 +0,0 @@ -Z:\ram_eclipse_proj\amas.comac.v2\infosouth-generator\src\main\java\cn\com\infosouth\generator\config\GenConfig.java -Z:\ram_eclipse_proj\amas.comac.v2\infosouth-generator\src\main\java\cn\com\infosouth\generator\controller\GenController.java -Z:\ram_eclipse_proj\amas.comac.v2\infosouth-generator\src\main\java\cn\com\infosouth\generator\domain\GenTableColumn.java -Z:\ram_eclipse_proj\amas.comac.v2\infosouth-generator\src\main\java\cn\com\infosouth\generator\util\GenUtils.java -Z:\ram_eclipse_proj\amas.comac.v2\infosouth-generator\src\main\java\cn\com\infosouth\generator\mapper\GenTableMapper.java -Z:\ram_eclipse_proj\amas.comac.v2\infosouth-generator\src\main\java\cn\com\infosouth\generator\service\IGenTableService.java -Z:\ram_eclipse_proj\amas.comac.v2\infosouth-generator\src\main\java\cn\com\infosouth\generator\util\VelocityInitializer.java -Z:\ram_eclipse_proj\amas.comac.v2\infosouth-generator\src\main\java\cn\com\infosouth\generator\mapper\GenTableColumnMapper.java -Z:\ram_eclipse_proj\amas.comac.v2\infosouth-generator\src\main\java\cn\com\infosouth\generator\service\IGenTableColumnService.java -Z:\ram_eclipse_proj\amas.comac.v2\infosouth-generator\src\main\java\cn\com\infosouth\generator\domain\GenTable.java -Z:\ram_eclipse_proj\amas.comac.v2\infosouth-generator\src\main\java\cn\com\infosouth\generator\util\VelocityUtils.java -Z:\ram_eclipse_proj\amas.comac.v2\infosouth-generator\src\main\java\cn\com\infosouth\generator\service\impl\GenTableServiceImpl.java -Z:\ram_eclipse_proj\amas.comac.v2\infosouth-generator\src\main\java\cn\com\infosouth\generator\service\impl\GenTableColumnServiceImpl.java