From b26ebaaf4477ee8e003ba6a8ccfa6b5590d9a155 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=86=B7=E5=86=B7?= <wangiegie@gmail.com>
Date: Mon, 31 Dec 2018 17:59:28 +0800
Subject: [PATCH] :fire: Removing code or files. gencode import

---
 .../src/main/resources/template/Controller.java.vm        | 5 +----
 .../src/main/resources/template/Entity.java.vm            | 2 +-
 .../src/main/resources/template/Service.java.vm           | 2 --
 .../src/main/resources/template/ServiceImpl.java.vm       | 3 +--
 .../pigx-codegen/src/main/resources/template/menu.sql.vm  | 8 ++++----
 5 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/pigx-visual/pigx-codegen/src/main/resources/template/Controller.java.vm b/pigx-visual/pigx-codegen/src/main/resources/template/Controller.java.vm
index 958d72980..9bd08062c 100755
--- a/pigx-visual/pigx-codegen/src/main/resources/template/Controller.java.vm
+++ b/pigx-visual/pigx-codegen/src/main/resources/template/Controller.java.vm
@@ -16,8 +16,7 @@
  */
 package ${package}.${moduleName}.controller;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.pig4cloud.pigx.common.core.util.R;
 import com.pig4cloud.pigx.common.log.annotation.SysLog;
@@ -26,8 +25,6 @@ import ${package}.${moduleName}.service.${className}Service;
 import lombok.AllArgsConstructor;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.Map;
-
 
 /**
  * ${comments}
diff --git a/pigx-visual/pigx-codegen/src/main/resources/template/Entity.java.vm b/pigx-visual/pigx-codegen/src/main/resources/template/Entity.java.vm
index 0b2d23611..dfcc4a293 100755
--- a/pigx-visual/pigx-codegen/src/main/resources/template/Entity.java.vm
+++ b/pigx-visual/pigx-codegen/src/main/resources/template/Entity.java.vm
@@ -34,8 +34,8 @@ import java.time.LocalDateTime;
  * @date ${datetime}
  */
 @Data
-@EqualsAndHashCode(callSuper = true)
 @TableName("${tableName}")
+@EqualsAndHashCode(callSuper = true)
 public class ${className} extends Model<${className}> {
 private static final long serialVersionUID = 1L;
 
diff --git a/pigx-visual/pigx-codegen/src/main/resources/template/Service.java.vm b/pigx-visual/pigx-codegen/src/main/resources/template/Service.java.vm
index d1ca0db44..b5c347de6 100755
--- a/pigx-visual/pigx-codegen/src/main/resources/template/Service.java.vm
+++ b/pigx-visual/pigx-codegen/src/main/resources/template/Service.java.vm
@@ -16,8 +16,6 @@
  */
 package ${package}.${moduleName}.service;
 
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import ${package}.${moduleName}.entity.${className};
 
diff --git a/pigx-visual/pigx-codegen/src/main/resources/template/ServiceImpl.java.vm b/pigx-visual/pigx-codegen/src/main/resources/template/ServiceImpl.java.vm
index e0f7181fe..616862dd6 100755
--- a/pigx-visual/pigx-codegen/src/main/resources/template/ServiceImpl.java.vm
+++ b/pigx-visual/pigx-codegen/src/main/resources/template/ServiceImpl.java.vm
@@ -16,10 +16,9 @@
  */
 package ${package}.${moduleName}.service.impl;
 
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import ${package}.${moduleName}.entity.${className};
+import ${package}.${moduleName}.mapper.${className}Mapper;
 import ${package}.${moduleName}.service.${className}Service;
 import org.springframework.stereotype.Service;
 
diff --git a/pigx-visual/pigx-codegen/src/main/resources/template/menu.sql.vm b/pigx-visual/pigx-codegen/src/main/resources/template/menu.sql.vm
index bb76c5b6f..44ac11a3d 100644
--- a/pigx-visual/pigx-codegen/src/main/resources/template/menu.sql.vm
+++ b/pigx-visual/pigx-codegen/src/main/resources/template/menu.sql.vm
@@ -1,13 +1,13 @@
 -- 该脚本不要执行，请完善 ID 对应关系,注意层级关系 !!!!
 
 -- 菜单SQL
-insert into `pigx`.`sys_menu` ( `parent_id`, `component`, `permission`, `type`, `path`, `icon`, `menu_id`, `del_flag`, `create_time`, `sort`, `update_time`, `name`)
+insert into `sys_menu` ( `parent_id`, `component`, `permission`, `type`, `path`, `icon`, `menu_id`, `del_flag`, `create_time`, `sort`, `update_time`, `name`)
     values ( '父菜单ID', 'views/${moduleName}/${pathName}/index', '', '0', '${pathName}', 'icon-bangzhushouji', '菜单ID', '0', '2018-01-20 13:17:19', '8', '2018-07-29 13:38:19', '${comments}管理');
 
 -- 菜单对应按钮SQL
-insert into `pigx`.`sys_menu` ( `parent_id`, `component`, `permission`, `type`, `path`, `icon`, `menu_id`, `del_flag`, `create_time`, `sort`, `update_time`, `name`)
+insert into `sys_menu` ( `parent_id`, `component`, `permission`, `type`, `path`, `icon`, `menu_id`, `del_flag`, `create_time`, `sort`, `update_time`, `name`)
     values ( '菜单ID', null, '${moduleName}_${pathName}_add', '1', null, '1', '子按钮ID1', '0', '2018-05-15 21:35:18', '0', '2018-07-29 13:38:59', '${comments}新增');
-insert into `pigx`.`sys_menu` ( `parent_id`, `component`, `permission`, `type`, `path`, `icon`, `menu_id`, `del_flag`, `create_time`, `sort`, `update_time`, `name`)
+insert into `sys_menu` ( `parent_id`, `component`, `permission`, `type`, `path`, `icon`, `menu_id`, `del_flag`, `create_time`, `sort`, `update_time`, `name`)
     values ( '菜单ID', null, '${moduleName}_${pathName}_edit', '1', null, '1', '子按钮ID2', '0', '2018-05-15 21:35:18', '1', '2018-07-29 13:38:59', '${comments}修改');
-insert into `pigx`.`sys_menu` ( `parent_id`, `component`, `permission`, `type`, `path`, `icon`, `menu_id`, `del_flag`, `create_time`, `sort`, `update_time`, `name`)
+insert into `sys_menu` ( `parent_id`, `component`, `permission`, `type`, `path`, `icon`, `menu_id`, `del_flag`, `create_time`, `sort`, `update_time`, `name`)
     values ( '菜单ID', null, '${moduleName}_${pathName}_del', '1', null, '1', '子按钮ID3', '0', '2018-05-15 21:35:18', '2', '2018-07-29 13:38:59', '${comments}删除');