From 657eba5290c0921d3d445bd07b8523de80832bb3 Mon Sep 17 00:00:00 2001
From: starplatinumora <2500441778@qq.com>
Date: Wed, 9 Mar 2022 14:19:48 +0800
Subject: [PATCH 01/15] ignore

---
 .gitignore | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.gitignore b/.gitignore
index 6d23dd5..b886a4d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,6 +2,9 @@
 # Created by https://www.gitignore.io/api/java,maven,eclipse,java-web,intellij+all
 # Edit at https://www.gitignore.io/?templates=java,maven,eclipse,java-web,intellij+all
 
+
+gitignore
+
 ### Eclipse ###
 .metadata
 bin/
-- 
Gitee


From 0ed6cf723c4c7a68c1b3ec545e619b4d4c6dd6cc Mon Sep 17 00:00:00 2001
From: starplatinum111 <5428527+starplatinum111@user.noreply.gitee.com>
Date: Fri, 15 Apr 2022 13:05:25 +0800
Subject: [PATCH 02/15] =?UTF-8?q?=E6=B3=A8=E8=A7=A3=E7=9A=84mybtis=20?=
 =?UTF-8?q?=E5=92=8Cxml=E7=9A=84=20=E6=8E=A5=E5=8F=A3=E5=9F=BA=E6=9C=AC?=
 =?UTF-8?q?=E6=94=B9=E6=88=90=E4=B8=80=E8=87=B4=E7=9A=84=EF=BC=8C=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0elm=20=E7=9A=84=E5=A2=9E=E5=88=A0=E6=9F=A5=E6=94=B9js?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/GeneratorController.java       |  14 +
 .../system/generator/util/TableParseUtil.java |  10 +-
 .../src/main/resources/application-dev.yml    |   3 +
 .../src/main/resources/template.json          |  39 +++
 .../mybatis-starp/annotation-mapper-starp.ftl |  98 +++++++
 .../mybatis-starp/controller-starp.ftl        |  89 +++++++
 .../mybatis-starp/mapper-starp.ftl            |  59 +++++
 .../mybatis-starp/model-starp.ftl             |  43 ++++
 .../mybatis-starp/mybatis-starp.ftl           |  91 +++++++
 .../mybatis-starp/service-starp.ftl           |  41 +++
 .../mybatis-starp/service_impl-starp.ftl      |  86 +++++++
 .../code-generator/mybatis/controller.ftl     |  29 ++-
 .../code-generator/mybatis/mapper.ftl         |   4 +-
 .../code-generator/mybatis/mapper2.ftl        |  48 +++-
 .../code-generator/mybatis/model.ftl          |   3 +
 .../code-generator/mybatis/mybatis.ftl        |   4 +-
 .../code-generator/mybatis/service.ftl        |   7 +-
 .../code-generator/mybatis/service_impl.ftl   |  32 ++-
 .../code-generator/ui/element-ui.ftl          | 243 +++++++++++++++++-
 19 files changed, 914 insertions(+), 29 deletions(-)
 create mode 100644 generator-web/src/main/resources/templates/code-generator/mybatis-starp/annotation-mapper-starp.ftl
 create mode 100644 generator-web/src/main/resources/templates/code-generator/mybatis-starp/controller-starp.ftl
 create mode 100644 generator-web/src/main/resources/templates/code-generator/mybatis-starp/mapper-starp.ftl
 create mode 100644 generator-web/src/main/resources/templates/code-generator/mybatis-starp/model-starp.ftl
 create mode 100644 generator-web/src/main/resources/templates/code-generator/mybatis-starp/mybatis-starp.ftl
 create mode 100644 generator-web/src/main/resources/templates/code-generator/mybatis-starp/service-starp.ftl
 create mode 100644 generator-web/src/main/resources/templates/code-generator/mybatis-starp/service_impl-starp.ftl

diff --git a/generator-web/src/main/java/com/softdev/system/generator/controller/GeneratorController.java b/generator-web/src/main/java/com/softdev/system/generator/controller/GeneratorController.java
index 12704ba..f5fbe14 100644
--- a/generator-web/src/main/java/com/softdev/system/generator/controller/GeneratorController.java
+++ b/generator-web/src/main/java/com/softdev/system/generator/controller/GeneratorController.java
@@ -10,10 +10,12 @@ import com.softdev.system.generator.util.ValueUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.ModelAndView;
 
+import java.io.File;
 import java.util.Date;
 import java.util.Map;
 
@@ -49,6 +51,10 @@ public class GeneratorController {
         String templates = generatorService.getTemplateConfig();
         return ReturnT.ok().put("templates",templates);
     }
+
+    @Value("${file.path}")
+    public String filePathStr;
+
     @PostMapping("/code/generate")
     @ResponseBody
     public ReturnT generateCode(@RequestBody ParamInfo paramInfo) throws Exception {
@@ -79,6 +85,14 @@ public class GeneratorController {
         paramInfo.getOptions().put("classInfo", classInfo);
         paramInfo.getOptions().put("tableName", classInfo == null ? System.currentTimeMillis() : classInfo.getTableName());
 
+        String tableName = classInfo.getTableName();
+//        filePath
+        File filePath = new File(filePathStr);
+        log.info("filePath {}",filePath);
+        if (!filePath.exists() && !filePath.isDirectory()) {
+            filePath.mkdir();
+        }
+
         //log the generated table and filed size记录解析了什么表，有多少个字段
         //log.info("generated table :{} , size :{}",classInfo.getTableName(),(classInfo.getFieldList() == null ? "" : classInfo.getFieldList().size()));
 
diff --git a/generator-web/src/main/java/com/softdev/system/generator/util/TableParseUtil.java b/generator-web/src/main/java/com/softdev/system/generator/util/TableParseUtil.java
index 51e318c..64d1f8d 100644
--- a/generator-web/src/main/java/com/softdev/system/generator/util/TableParseUtil.java
+++ b/generator-web/src/main/java/com/softdev/system/generator/util/TableParseUtil.java
@@ -46,6 +46,8 @@ public class TableParseUtil {
         //deal with java string copy \n"
         tableSql = tableSql.trim().replaceAll("\\\\n`", "").replaceAll("\\+", "").replaceAll("``", "`").replaceAll("\\\\", "");
         // table Name
+        System.out.println("tableSql");
+        System.out.println(tableSql);
         String tableName = null;
         if (tableSql.contains("TABLE") && tableSql.contains("(")) {
             tableName = tableSql.substring(tableSql.indexOf("TABLE") + 5, tableSql.indexOf("("));
@@ -110,6 +112,8 @@ public class TableParseUtil {
 
         // 正常( ) 内的一定是字段相关的定义。
         String fieldListTmp = tableSql.substring(tableSql.indexOf("(") + 1, tableSql.lastIndexOf(")"));
+        System.out.println("fieldListTmp");
+        System.out.println(fieldListTmp);
 
         // 匹配 comment，替换备注里的小逗号, 防止不小心被当成切割符号切割
         String commentPattenStr1 = "comment `(.*?)\\`";
@@ -149,6 +153,7 @@ public class TableParseUtil {
         if (fieldLineList.length > 0) {
             int i = 0;
             //i为了解决primary key关键字出现的地方，出现在前3行，一般和id有关
+//            为什么id 不要呢，这里看起来把id略过了，还是说前后端传值的时候不用传id的吗
             for (String columnLine : fieldLineList) {
                 i++;
                 columnLine = columnLine.replaceAll("\n", "").replaceAll("\t", "").trim();
@@ -164,7 +169,10 @@ public class TableParseUtil {
                         && !columnLine.contains("pctincrease")
                         && !columnLine.contains("buffer_pool") && !columnLine.contains("tablespace")
                         && !(columnLine.contains("primary ") && i > 3));
-                if (specialFlag) {
+//                if (columnLine.contains("id")) {
+//
+//                }
+                if (specialFlag||columnLine.contains("id")) {
                     //如果是oracle的number(x,x)，可能出现最后分割残留的,x)，这里做排除处理
                     if (columnLine.length() < 5) {
                         continue;
diff --git a/generator-web/src/main/resources/application-dev.yml b/generator-web/src/main/resources/application-dev.yml
index 42869ce..44a5d5d 100644
--- a/generator-web/src/main/resources/application-dev.yml
+++ b/generator-web/src/main/resources/application-dev.yml
@@ -60,3 +60,6 @@ OEM:
   returnUtilFailure: ReturnT.error
   outputStr: zhengkai.blog.csdn.net
   mode: local
+
+file:
+  path: D:/genCodeFile
diff --git a/generator-web/src/main/resources/template.json b/generator-web/src/main/resources/template.json
index 13c6cb2..34f2fcf 100644
--- a/generator-web/src/main/resources/template.json
+++ b/generator-web/src/main/resources/template.json
@@ -249,5 +249,44 @@
         "description": "jpacontroller"
       }
     ]
+  },
+  {
+    "group": "mybatis-starp",
+    "templates": [{
+      "id": "110",
+      "name": "controller-starp",
+      "description": "controller"
+    },
+      {
+        "id": "111",
+        "name": "service-starp",
+        "description": "service"
+      },
+      {
+        "id": "112",
+        "name": "service_impl-starp",
+        "description": "service_impl"
+      },
+      {
+        "id": "113",
+        "name": "mapper-starp",
+        "description": "mapper"
+      },
+      {
+        "id": "114",
+        "name": "mybatis-starp",
+        "description": "mybatis"
+      },
+      {
+        "id": "115",
+        "name": "model-starp",
+        "description": "model"
+      },
+      {
+        "id": "116",
+        "name": "annotation-mapper-starp",
+        "description": "mapper annotation"
+      }
+    ]
   }
 ]
diff --git a/generator-web/src/main/resources/templates/code-generator/mybatis-starp/annotation-mapper-starp.ftl b/generator-web/src/main/resources/templates/code-generator/mybatis-starp/annotation-mapper-starp.ftl
new file mode 100644
index 0000000..46caea9
--- /dev/null
+++ b/generator-web/src/main/resources/templates/code-generator/mybatis-starp/annotation-mapper-starp.ftl
@@ -0,0 +1,98 @@
+<#if isWithPackage?exists && isWithPackage==true>package ${packageName}.mapper;</#if>
+<#if isAutoImport?exists && isAutoImport==true>
+import org.apache.ibatis.annotations.*;
+import org.springframework.stereotype.Repository;
+import java.util.List;
+</#if>
+/**
+ * @description ${classInfo.classComment}Mapper
+ * @author ${authorName}
+ * @date ${.now?string('yyyy-MM-dd')}
+ */
+@Mapper
+@Repository
+public interface ${classInfo.className}Mapper {
+
+//这种假如表是stu 那么id是 stu_id
+  //  @Select("select * from ${classInfo.tableName} where ${classInfo.tableName}_id=井{id}")
+  //  public ${classInfo.className} getById(Integer id);
+
+// @Delete(value = "delete from ${classInfo.tableName} where ${classInfo.tableName}_id=井{${classInfo.className?uncap_first}Id}")
+//  boolean delete(Integer ${classInfo.className?uncap_first}Id);
+
+//@Options(useGeneratedKeys=true,keyProperty="${classInfo.className?uncap_first}Id")
+//@Insert("insert into ${classInfo.tableName}" +
+//" (<#list classInfo.fieldList as fieldItem >${fieldItem.columnName}<#if fieldItem_has_next>,</#if></#list>)" +
+//" values(<#list classInfo.fieldList as fieldItem >${fieldItem.fieldName}<#if fieldItem_has_next>,<#else>)</#if></#list>")
+//public Integer insert(${classInfo.className} ${classInfo.className?uncap_first});
+
+
+//  @Update(value = "update ${classInfo.tableName} set "
+//   <#list classInfo.fieldList as fieldItem >
+    //      <#if fieldItem.columnName != "id">+" ${fieldItem.columnName}=井{${fieldItem.fieldName}}<#if fieldItem_has_next>,</#if>"</#if>
+    //   </#list>
+//   +" where ${classInfo.tableName}_id=井{${classInfo.className?uncap_first}Id} ")
+//    boolean update(${classInfo.className} ${classInfo.className?uncap_first});
+
+//这种假如表是stu 那么id是 id, 两种选择都放着，想用某一种 只要把另外一种注释就行了
+@Select("select * from ${classInfo.tableName} where id=井{id}")
+public ${classInfo.className} getById(Integer id);
+
+@Delete(value = "delete from ${classInfo.tableName} where id=井{id}")
+Integer delete(Integer id);
+
+    @Options(useGeneratedKeys=true,keyProperty="id")
+    @Insert("insert into ${classInfo.tableName}" +
+        " (<#list classInfo.fieldList as fieldItem >${fieldItem.columnName}<#if fieldItem_has_next>,</#if></#list>)" +
+        " values(<#list classInfo.fieldList as fieldItem >井{${fieldItem.fieldName}}<#if fieldItem_has_next>,<#else>)</#if></#list>")
+    public Integer insert(${classInfo.className} ${classInfo.className?uncap_first});
+
+
+
+
+    @Update(value = "update ${classInfo.tableName} set "
+    <#list classInfo.fieldList as fieldItem >
+        <#if fieldItem.columnName != "id">+" ${fieldItem.columnName}=井{${fieldItem.fieldName}}<#if fieldItem_has_next>,</#if>"</#if>
+    </#list>
+        +" where id=井{id} ")
+    Integer update(${classInfo.className} ${classInfo.className?uncap_first});
+
+
+    @Results(value = {
+    <#list classInfo.fieldList as fieldItem >
+        @Result(property = "${fieldItem.fieldName}", column = "${fieldItem.columnName}")<#if fieldItem_has_next>,</#if>
+    </#list>
+    })
+    @Select(value = "select * from ${classInfo.tableName} where ${classInfo.tableName}_id=井{queryParam}")
+    ${classInfo.className} selectOne(String queryParam);
+
+    @Results(value = {
+    <#list classInfo.fieldList as fieldItem >
+        @Result(property = "${fieldItem.fieldName}", column = "${fieldItem.columnName}")<#if fieldItem_has_next>,</#if>
+    </#list>
+    })
+    @Select(value = "select * from ${classInfo.tableName} where "
+    <#list classInfo.fieldList as fieldItem >
+        +" ${fieldItem.columnName}=井{${fieldItem.fieldName}}<#if fieldItem_has_next> or </#if>"
+    </#list>
+    )
+    List<${classInfo.className}> selectList(${classInfo.className} ${classInfo.className?uncap_first});
+
+@Results(value = {
+<#list classInfo.fieldList as fieldItem >
+    @Result(property = "${fieldItem.fieldName}", column = "${fieldItem.columnName}")<#if fieldItem_has_next>,</#if>
+</#list>
+})
+@Select(value = "select * from ${classInfo.tableName} where "
+<#list classInfo.fieldList as fieldItem >
+    +" ${fieldItem.columnName}=井{${fieldItem.fieldName}}<#if fieldItem_has_next> or </#if>"
+</#list>
++" LIMIT 井{offset} , 井{pageSize}"
+)
+List<${classInfo.className}> pageList(int offset, int pageSize);
+
+    @Select(value = "SELECT count(1)\n" +
+    "        FROM ${classInfo.tableName} "
+    )
+    Integer pageListCount(int offset, int pageSize);
+}
diff --git a/generator-web/src/main/resources/templates/code-generator/mybatis-starp/controller-starp.ftl b/generator-web/src/main/resources/templates/code-generator/mybatis-starp/controller-starp.ftl
new file mode 100644
index 0000000..c567600
--- /dev/null
+++ b/generator-web/src/main/resources/templates/code-generator/mybatis-starp/controller-starp.ftl
@@ -0,0 +1,89 @@
+<#if isAutoImport?exists && isAutoImport==true>
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import java.util.List;
+import java.util.Map;
+</#if>
+
+/**
+ * @description ${classInfo.classComment}
+ * @author ${authorName}
+ * @date ${.now?string('yyyy-MM-dd')}
+ */
+@CrossOrigin
+@RestController
+@RequestMapping(value = "/${classInfo.className?uncap_first}")
+public class ${classInfo.className}Controller {
+
+    @Resource
+    private ${classInfo.className}Service ${classInfo.className?uncap_first}Service;
+
+/**
+* id 存在就更新 不然插入
+* @param ${classInfo.className?uncap_first}
+* @return
+*/
+@PostMapping("/save")
+public Object save(@RequestBody  ${classInfo.className} ${classInfo.className?uncap_first}){
+return ${classInfo.className?uncap_first}Service.save(${classInfo.className?uncap_first});
+}
+
+    /**
+    * 新增
+    * @author ${authorName}
+    * @date ${.now?string('yyyy/MM/dd')}
+    **/
+    @PostMapping("/insert")
+    public Object insert(${classInfo.className} ${classInfo.className?uncap_first}){
+        return ${classInfo.className?uncap_first}Service.insert(${classInfo.className?uncap_first});
+    }
+
+    /**
+    * 刪除
+    * @author ${authorName}
+    * @date ${.now?string('yyyy/MM/dd')}
+    **/
+    @PostMapping("/delete")
+    public Object delete(int id){
+        return ${classInfo.className?uncap_first}Service.delete(id);
+    }
+
+    /**
+    * 更新
+    * @author ${authorName}
+    * @date ${.now?string('yyyy/MM/dd')}
+    **/
+    @PostMapping("/update")
+    public Object update(${classInfo.className} ${classInfo.className?uncap_first}){
+        return ${classInfo.className?uncap_first}Service.update(${classInfo.className?uncap_first});
+    }
+
+    /**
+    * 查询 根据主键 id 查询
+    * @author ${authorName}
+    * @date ${.now?string('yyyy/MM/dd')}
+    **/
+    @PostMapping("/load")
+    public Object load(int id){
+        return ${classInfo.className?uncap_first}Service.load(id);
+    }
+
+    /**
+    * 查询 分页查询
+    * @author ${authorName}
+    * @date ${.now?string('yyyy/MM/dd')}
+    **/
+    @PostMapping("/list")
+    public Map<String, Object> pageList(@RequestParam(required = false, defaultValue = "0") int pageNumber,
+                                        @RequestParam(required = false, defaultValue = "10") int pageSize) {
+        return ${classInfo.className?uncap_first}Service.pageList(pageNumber, pageSize);
+        //Map<String, Object> pageList = ${classInfo.className?uncap_first}Service.pageList(pageNumber, pageSize);
+//return ReturnT.success(pageList);
+    }
+
+}
diff --git a/generator-web/src/main/resources/templates/code-generator/mybatis-starp/mapper-starp.ftl b/generator-web/src/main/resources/templates/code-generator/mybatis-starp/mapper-starp.ftl
new file mode 100644
index 0000000..fd8cf1d
--- /dev/null
+++ b/generator-web/src/main/resources/templates/code-generator/mybatis-starp/mapper-starp.ftl
@@ -0,0 +1,59 @@
+<#if isAutoImport?exists && isAutoImport==true>
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
+import java.util.List;
+</#if>
+
+/**
+ * @description ${classInfo.classComment}
+ * @author ${authorName}
+ * @date ${.now?string('yyyy-MM-dd')}
+ */
+@Mapper
+@Repository
+public interface ${classInfo.className}Mapper {
+
+    /**
+    * 新增
+    * @author ${authorName}
+    * @date ${.now?string('yyyy/MM/dd')}
+    **/
+    int insert(${classInfo.className} ${classInfo.className?uncap_first});
+
+    /**
+    * 刪除
+    * @author ${authorName}
+    * @date ${.now?string('yyyy/MM/dd')}
+    **/
+    int delete(int id);
+
+    /**
+    * 更新
+    * @author ${authorName}
+    * @date ${.now?string('yyyy/MM/dd')}
+    **/
+    int update(${classInfo.className} ${classInfo.className?uncap_first});
+
+    /**
+    * 查询 根据主键 id 查询
+    * @author ${authorName}
+    * @date ${.now?string('yyyy/MM/dd')}
+    **/
+    ${classInfo.className} load(int id);
+
+    /**
+    * 查询 分页查询
+    * @author ${authorName}
+    * @date ${.now?string('yyyy/MM/dd')}
+    **/
+    List<${classInfo.className}> pageList(int offset,int pageSize);
+
+    /**
+    * 查询 分页查询 count
+    * @author ${authorName}
+    * @date ${.now?string('yyyy/MM/dd')}
+    **/
+    int pageListCount(int offset,int pageSize);
+
+}
diff --git a/generator-web/src/main/resources/templates/code-generator/mybatis-starp/model-starp.ftl b/generator-web/src/main/resources/templates/code-generator/mybatis-starp/model-starp.ftl
new file mode 100644
index 0000000..f3aed4b
--- /dev/null
+++ b/generator-web/src/main/resources/templates/code-generator/mybatis-starp/model-starp.ftl
@@ -0,0 +1,43 @@
+<#if isAutoImport?exists && isAutoImport==true>
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+</#if>
+/**
+ * @description ${classInfo.classComment}
+ * @author ${authorName}
+ * @date ${.now?string('yyyy-MM-dd')}
+ */
+@Data
+public class ${classInfo.className} implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+private Integer id;
+
+<#if classInfo.fieldList?exists && classInfo.fieldList?size gt 0>
+<#list classInfo.fieldList as fieldItem >
+    <#if isComment?exists && isComment==true>/**
+    * ${fieldItem.fieldComment}
+    */</#if>
+    private ${fieldItem.fieldClass} ${fieldItem.fieldName};
+
+</#list>
+</#if>
+
+<#if classInfo.fieldList?exists && classInfo.fieldList?size gt 0>
+    public ${classInfo.className}() {
+    }
+
+<#list classInfo.fieldList as fieldItem>
+    public ${fieldItem.fieldClass} get${fieldItem.fieldName?cap_first}() {
+        return ${fieldItem.fieldName};
+    }
+
+    public void set${fieldItem.fieldName?cap_first}(${fieldItem.fieldClass} ${fieldItem.fieldName}) {
+        this.${fieldItem.fieldName} = ${fieldItem.fieldName};
+    }
+
+</#list>
+</#if>
+}
diff --git a/generator-web/src/main/resources/templates/code-generator/mybatis-starp/mybatis-starp.ftl b/generator-web/src/main/resources/templates/code-generator/mybatis-starp/mybatis-starp.ftl
new file mode 100644
index 0000000..8cfe1a8
--- /dev/null
+++ b/generator-web/src/main/resources/templates/code-generator/mybatis-starp/mybatis-starp.ftl
@@ -0,0 +1,91 @@
+<?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="${packageName}.dao.${classInfo.className}Mapper">
+
+    <resultMap id="BaseResultMap" type="${packageName}.entity.${classInfo.className}" >
+        <result column="id" property="id" />
+        <#if classInfo.fieldList?exists && classInfo.fieldList?size gt 0>
+            <#list classInfo.fieldList as fieldItem >
+                <result column="${fieldItem.columnName}" property="${fieldItem.fieldName}" />
+            </#list>
+        </#if>
+    </resultMap>
+
+    <sql id="Base_Column_List">
+        id,
+        <#if classInfo.fieldList?exists && classInfo.fieldList?size gt 0>
+            <#list classInfo.fieldList as fieldItem >
+                ${fieldItem.columnName}<#if fieldItem_has_next>,</#if>
+            </#list>
+        </#if>
+    </sql>
+
+    <insert id="insert" useGeneratedKeys="true" keyColumn="id" keyProperty="id" parameterType="${packageName}.entity.${classInfo.className}">
+        INSERT INTO ${classInfo.originTableName}
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <#if classInfo.fieldList?exists && classInfo.fieldList?size gt 0>
+                <#list classInfo.fieldList as fieldItem >
+                    <#if fieldItem.columnName != "id" >
+                        <if test="null != ${fieldItem.fieldName} <#if fieldItem.fieldClass ="String">and '' != ${fieldItem.fieldName}</#if>">
+                        ${fieldItem.columnName}<#if fieldItem_has_next>,</#if>
+                        ${r"</if>"}
+                    </#if>
+                </#list>
+            </#if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <#if classInfo.fieldList?exists && classInfo.fieldList?size gt 0>
+                <#list classInfo.fieldList as fieldItem >
+                    <#if fieldItem.columnName != "id" >
+                    <#--<#if fieldItem.columnName="addtime" || fieldItem.columnName="updatetime" >
+                    ${r"<if test ='null != "}${fieldItem.fieldName}${r"'>"}
+                        NOW()<#if fieldItem_has_next>,</#if>
+                    ${r"</if>"}
+                    <#else>-->
+                        <if test="null != ${fieldItem.fieldName} <#if fieldItem.fieldClass ="String">and '' != ${fieldItem.fieldName}</#if>">
+                        ${r"#{"}${fieldItem.fieldName}${r"}"}<#if fieldItem_has_next>,</#if>
+                        ${r"</if>"}
+                    <#--</#if>-->
+                    </#if>
+                </#list>
+            </#if>
+        </trim>
+    </insert>
+
+    <delete id="delete" >
+        DELETE FROM ${classInfo.originTableName}
+        WHERE id = ${r"#{id}"}
+    </delete>
+
+    <update id="update" parameterType="${packageName}.entity.${classInfo.className}">
+        UPDATE ${classInfo.originTableName}
+        <set>
+            <#list classInfo.fieldList as fieldItem >
+                <#if fieldItem.columnName != "id" && fieldItem.columnName != "AddTime" && fieldItem.columnName != "UpdateTime" >
+                    <if test="null != ${fieldItem.fieldName} <#if fieldItem.fieldClass ="String">and '' != ${fieldItem.fieldName}</#if>">${fieldItem.columnName} = ${r"#{"}${fieldItem.fieldName}${r"}"}<#if fieldItem_has_next>,</#if>${r"</if>"}
+                </#if>
+            </#list>
+        </set>
+        WHERE id = ${r"#{"}id${r"}"}
+    </update>
+
+
+    <select id="load" resultMap="BaseResultMap">
+        SELECT <include refid="Base_Column_List" />
+        FROM ${classInfo.originTableName}
+        WHERE id = ${r"#{id}"}
+    </select>
+
+    <select id="pageList" resultMap="BaseResultMap">
+        SELECT <include refid="Base_Column_List" />
+        FROM ${classInfo.originTableName}
+        LIMIT ${r"#{offset}"}, ${r"#{pageSize}"}
+    </select>
+
+    <select id="pageListCount" resultType="java.lang.Integer">
+        SELECT count(1)
+        FROM ${classInfo.originTableName}
+    </select>
+
+</mapper>
diff --git a/generator-web/src/main/resources/templates/code-generator/mybatis-starp/service-starp.ftl b/generator-web/src/main/resources/templates/code-generator/mybatis-starp/service-starp.ftl
new file mode 100644
index 0000000..6909bf8
--- /dev/null
+++ b/generator-web/src/main/resources/templates/code-generator/mybatis-starp/service-starp.ftl
@@ -0,0 +1,41 @@
+<#if isAutoImport?exists && isAutoImport==true>
+import java.util.Map;
+</#if>
+/**
+ * @description ${classInfo.classComment}
+ * @author ${authorName}
+ * @date ${.now?string('yyyy-MM-dd')}
+ */
+public interface ${classInfo.className}Service {
+
+    /**
+    * 新增
+    */
+    public Object insert(${classInfo.className} ${classInfo.className?uncap_first});
+
+    /**
+    * 删除
+    */
+    public Object delete(int id);
+
+    /**
+    * 更新
+    */
+    public Object update(${classInfo.className} ${classInfo.className?uncap_first});
+
+    /**
+    * 根据主键 id 查询
+    */
+    public ${classInfo.className} load(int id);
+
+/**
+* 如果已经有这个id的，就更新，不然是插入
+*/
+Object save(${classInfo.className} ${classInfo.className?uncap_first});
+
+    /**
+    * 分页查询
+    */
+    public Map<String,Object> pageList(int offset, int pageSize);
+
+}
diff --git a/generator-web/src/main/resources/templates/code-generator/mybatis-starp/service_impl-starp.ftl b/generator-web/src/main/resources/templates/code-generator/mybatis-starp/service_impl-starp.ftl
new file mode 100644
index 0000000..c93f5ea
--- /dev/null
+++ b/generator-web/src/main/resources/templates/code-generator/mybatis-starp/service_impl-starp.ftl
@@ -0,0 +1,86 @@
+<#if isAutoImport?exists && isAutoImport==true>
+import org.springframework.stereotype.Service;
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+</#if>
+/**
+ * @description ${classInfo.classComment}
+ * @author ${authorName}
+ * @date ${.now?string('yyyy-MM-dd')}
+ */
+@Service
+public class ${classInfo.className}ServiceImpl implements ${classInfo.className}Service {
+
+	@Resource
+	private ${classInfo.className}Mapper ${classInfo.className?uncap_first}Mapper;
+
+
+	@Override
+	public Object insert(${classInfo.className} ${classInfo.className?uncap_first}) {
+
+		// valid
+		if (${classInfo.className?uncap_first} == null) {
+			return ${returnUtilFailure}("必要参数缺失");
+        }
+
+		${classInfo.className?uncap_first}Mapper.insert(${classInfo.className?uncap_first});
+        return ${returnUtilSuccess}();
+	}
+
+
+	@Override
+	public Object delete(Integer id) {
+		int ret = ${classInfo.className?uncap_first}Mapper.delete(id);
+		return ret>0?${returnUtilSuccess}():${returnUtilFailure}();
+	}
+
+
+	@Override
+	public Object update(${classInfo.className} ${classInfo.className?uncap_first}) {
+		int ret = ${classInfo.className?uncap_first}Mapper.update(${classInfo.className?uncap_first});
+		return ret>0?${returnUtilSuccess}():${returnUtilFailure}();
+	}
+
+
+	@Override
+	public ${classInfo.className} getById(Integer id) {
+		return ${classInfo.className?uncap_first}Mapper.getById(id);
+	}
+
+@Override
+public Object save(${classInfo.className} ${classInfo.className?uncap_first}) {
+Integer id = ${classInfo.className?uncap_first}.getId();
+if (id==null) {
+int insert = ${classInfo.className?uncap_first}Mapper.insert(${classInfo.className?uncap_first});
+return ReturnT.success();
+}
+${classInfo.className} load = ${classInfo.className?uncap_first}Mapper.getById(${classInfo.className?uncap_first}.getId());
+if (load==null) {
+int insert = ${classInfo.className?uncap_first}Mapper.insert(${classInfo.className?uncap_first});
+
+return ReturnT.success();
+}
+${classInfo.className?uncap_first}Mapper.update(${classInfo.className?uncap_first});
+return  ReturnT.success();
+}
+
+
+	@Override
+	public Map<String,Object> pageList(int offset, int pageSize) {
+
+		List<${classInfo.className}> pageList = ${classInfo.className?uncap_first}Mapper.pageList(offset, pageSize);
+Integer totalCount = ${classInfo.className?uncap_first}Mapper.pageListCount(offset, pageSize);
+
+		// result
+		Map<String, Object> result = new HashMap<String, Object>();
+		//result.put("pageList", pageList);
+		result.put("content", pageList);
+		result.put("totalCount", totalCount);
+
+		return result;
+	}
+
+}
diff --git a/generator-web/src/main/resources/templates/code-generator/mybatis/controller.ftl b/generator-web/src/main/resources/templates/code-generator/mybatis/controller.ftl
index c5859af..c567600 100644
--- a/generator-web/src/main/resources/templates/code-generator/mybatis/controller.ftl
+++ b/generator-web/src/main/resources/templates/code-generator/mybatis/controller.ftl
@@ -15,6 +15,7 @@ import java.util.Map;
  * @author ${authorName}
  * @date ${.now?string('yyyy-MM-dd')}
  */
+@CrossOrigin
 @RestController
 @RequestMapping(value = "/${classInfo.className?uncap_first}")
 public class ${classInfo.className}Controller {
@@ -22,12 +23,22 @@ public class ${classInfo.className}Controller {
     @Resource
     private ${classInfo.className}Service ${classInfo.className?uncap_first}Service;
 
+/**
+* id 存在就更新 不然插入
+* @param ${classInfo.className?uncap_first}
+* @return
+*/
+@PostMapping("/save")
+public Object save(@RequestBody  ${classInfo.className} ${classInfo.className?uncap_first}){
+return ${classInfo.className?uncap_first}Service.save(${classInfo.className?uncap_first});
+}
+
     /**
     * 新增
     * @author ${authorName}
     * @date ${.now?string('yyyy/MM/dd')}
     **/
-    @RequestMapping("/insert")
+    @PostMapping("/insert")
     public Object insert(${classInfo.className} ${classInfo.className?uncap_first}){
         return ${classInfo.className?uncap_first}Service.insert(${classInfo.className?uncap_first});
     }
@@ -37,7 +48,7 @@ public class ${classInfo.className}Controller {
     * @author ${authorName}
     * @date ${.now?string('yyyy/MM/dd')}
     **/
-    @RequestMapping("/delete")
+    @PostMapping("/delete")
     public Object delete(int id){
         return ${classInfo.className?uncap_first}Service.delete(id);
     }
@@ -47,7 +58,7 @@ public class ${classInfo.className}Controller {
     * @author ${authorName}
     * @date ${.now?string('yyyy/MM/dd')}
     **/
-    @RequestMapping("/update")
+    @PostMapping("/update")
     public Object update(${classInfo.className} ${classInfo.className?uncap_first}){
         return ${classInfo.className?uncap_first}Service.update(${classInfo.className?uncap_first});
     }
@@ -57,7 +68,7 @@ public class ${classInfo.className}Controller {
     * @author ${authorName}
     * @date ${.now?string('yyyy/MM/dd')}
     **/
-    @RequestMapping("/load")
+    @PostMapping("/load")
     public Object load(int id){
         return ${classInfo.className?uncap_first}Service.load(id);
     }
@@ -67,10 +78,12 @@ public class ${classInfo.className}Controller {
     * @author ${authorName}
     * @date ${.now?string('yyyy/MM/dd')}
     **/
-    @RequestMapping("/pageList")
-    public Map<String, Object> pageList(@RequestParam(required = false, defaultValue = "0") int offset,
-                                        @RequestParam(required = false, defaultValue = "10") int pagesize) {
-        return ${classInfo.className?uncap_first}Service.pageList(offset, pagesize);
+    @PostMapping("/list")
+    public Map<String, Object> pageList(@RequestParam(required = false, defaultValue = "0") int pageNumber,
+                                        @RequestParam(required = false, defaultValue = "10") int pageSize) {
+        return ${classInfo.className?uncap_first}Service.pageList(pageNumber, pageSize);
+        //Map<String, Object> pageList = ${classInfo.className?uncap_first}Service.pageList(pageNumber, pageSize);
+//return ReturnT.success(pageList);
     }
 
 }
diff --git a/generator-web/src/main/resources/templates/code-generator/mybatis/mapper.ftl b/generator-web/src/main/resources/templates/code-generator/mybatis/mapper.ftl
index e7dc9ef..fd8cf1d 100644
--- a/generator-web/src/main/resources/templates/code-generator/mybatis/mapper.ftl
+++ b/generator-web/src/main/resources/templates/code-generator/mybatis/mapper.ftl
@@ -47,13 +47,13 @@ public interface ${classInfo.className}Mapper {
     * @author ${authorName}
     * @date ${.now?string('yyyy/MM/dd')}
     **/
-    List<${classInfo.className}> pageList(int offset,int pagesize);
+    List<${classInfo.className}> pageList(int offset,int pageSize);
 
     /**
     * 查询 分页查询 count
     * @author ${authorName}
     * @date ${.now?string('yyyy/MM/dd')}
     **/
-    int pageListCount(int offset,int pagesize);
+    int pageListCount(int offset,int pageSize);
 
 }
diff --git a/generator-web/src/main/resources/templates/code-generator/mybatis/mapper2.ftl b/generator-web/src/main/resources/templates/code-generator/mybatis/mapper2.ftl
index ee0b5e0..a687636 100644
--- a/generator-web/src/main/resources/templates/code-generator/mybatis/mapper2.ftl
+++ b/generator-web/src/main/resources/templates/code-generator/mybatis/mapper2.ftl
@@ -13,23 +13,48 @@ import java.util.List;
 @Repository
 public interface ${classInfo.className}Mapper {
 
-    @Select("select * from ${classInfo.tableName} where ${classInfo.tableName}_id=井{id}")
-    public ${classInfo.className} getById(Integer id);
+//这种假如表是stu 那么id是 stu_id
+  //  @Select("select * from ${classInfo.tableName} where ${classInfo.tableName}_id=井{id}")
+  //  public ${classInfo.className} getById(Integer id);
 
-    @Options(useGeneratedKeys=true,keyProperty="${classInfo.className?uncap_first}Id")
+// @Delete(value = "delete from ${classInfo.tableName} where ${classInfo.tableName}_id=井{${classInfo.className?uncap_first}Id}")
+//  boolean delete(Integer ${classInfo.className?uncap_first}Id);
+
+//@Options(useGeneratedKeys=true,keyProperty="${classInfo.className?uncap_first}Id")
+//@Insert("insert into ${classInfo.tableName}" +
+//" (<#list classInfo.fieldList as fieldItem >${fieldItem.columnName}<#if fieldItem_has_next>,</#if></#list>)" +
+//" values(<#list classInfo.fieldList as fieldItem >${fieldItem.fieldName}<#if fieldItem_has_next>,<#else>)</#if></#list>")
+//public Integer insert(${classInfo.className} ${classInfo.className?uncap_first});
+
+
+//  @Update(value = "update ${classInfo.tableName} set "
+//   <#list classInfo.fieldList as fieldItem >
+    //      <#if fieldItem.columnName != "id">+" ${fieldItem.columnName}=井{${fieldItem.fieldName}}<#if fieldItem_has_next>,</#if>"</#if>
+    //   </#list>
+//   +" where ${classInfo.tableName}_id=井{${classInfo.className?uncap_first}Id} ")
+//    boolean update(${classInfo.className} ${classInfo.className?uncap_first});
+
+//这种假如表是stu 那么id是 id, 两种选择都放着，想用某一种 只要把另外一种注释就行了
+@Select("select * from ${classInfo.tableName} where id=井{id}")
+public ${classInfo.className} getById(Integer id);
+
+@Delete(value = "delete from ${classInfo.tableName} where id=井{id}")
+Integer delete(Integer id);
+
+    @Options(useGeneratedKeys=true,keyProperty="id")
     @Insert("insert into ${classInfo.tableName}" +
         " (<#list classInfo.fieldList as fieldItem >${fieldItem.columnName}<#if fieldItem_has_next>,</#if></#list>)" +
         " values(<#list classInfo.fieldList as fieldItem >${fieldItem.fieldName}<#if fieldItem_has_next>,<#else>)</#if></#list>")
     public Integer insert(${classInfo.className} ${classInfo.className?uncap_first});
 
-    @Delete(value = "delete from ${classInfo.tableName} where ${classInfo.tableName}_id=井{${classInfo.className?uncap_first}Id}")
-    boolean delete(Integer id);
+
+
 
     @Update(value = "update ${classInfo.tableName} set "
     <#list classInfo.fieldList as fieldItem >
         <#if fieldItem.columnName != "id">+" ${fieldItem.columnName}=井{${fieldItem.fieldName}}<#if fieldItem_has_next>,</#if>"</#if>
     </#list>
-        +" where ${classInfo.tableName}_id=井{${classInfo.className?uncap_first}Id} ")
+        +" where id=井{id} ")
     boolean update(${classInfo.className} ${classInfo.className?uncap_first});
 
 
@@ -53,4 +78,13 @@ public interface ${classInfo.className}Mapper {
     )
     List<${classInfo.className}> selectList(${classInfo.className} ${classInfo.className?uncap_first});
 
-}
\ No newline at end of file
+@Select(value = "select * from ${classInfo.tableName}  "
++" LIMIT 井{offset} , 井{pageSize}"
+)
+List<${classInfo.className}> pageList(int offset, int pageSize);
+
+    @Select(value = "SELECT count(1)\n" +
+    "        FROM ${classInfo.tableName} "
+    )
+    Integer pageListCount(int offset, int pageSize);
+}
diff --git a/generator-web/src/main/resources/templates/code-generator/mybatis/model.ftl b/generator-web/src/main/resources/templates/code-generator/mybatis/model.ftl
index 3e94df7..f3aed4b 100644
--- a/generator-web/src/main/resources/templates/code-generator/mybatis/model.ftl
+++ b/generator-web/src/main/resources/templates/code-generator/mybatis/model.ftl
@@ -8,10 +8,13 @@ import java.util.List;
  * @author ${authorName}
  * @date ${.now?string('yyyy-MM-dd')}
  */
+@Data
 public class ${classInfo.className} implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+private Integer id;
+
 <#if classInfo.fieldList?exists && classInfo.fieldList?size gt 0>
 <#list classInfo.fieldList as fieldItem >
     <#if isComment?exists && isComment==true>/**
diff --git a/generator-web/src/main/resources/templates/code-generator/mybatis/mybatis.ftl b/generator-web/src/main/resources/templates/code-generator/mybatis/mybatis.ftl
index d22cac0..8cfe1a8 100644
--- a/generator-web/src/main/resources/templates/code-generator/mybatis/mybatis.ftl
+++ b/generator-web/src/main/resources/templates/code-generator/mybatis/mybatis.ftl
@@ -4,6 +4,7 @@
 <mapper namespace="${packageName}.dao.${classInfo.className}Mapper">
 
     <resultMap id="BaseResultMap" type="${packageName}.entity.${classInfo.className}" >
+        <result column="id" property="id" />
         <#if classInfo.fieldList?exists && classInfo.fieldList?size gt 0>
             <#list classInfo.fieldList as fieldItem >
                 <result column="${fieldItem.columnName}" property="${fieldItem.fieldName}" />
@@ -12,6 +13,7 @@
     </resultMap>
 
     <sql id="Base_Column_List">
+        id,
         <#if classInfo.fieldList?exists && classInfo.fieldList?size gt 0>
             <#list classInfo.fieldList as fieldItem >
                 ${fieldItem.columnName}<#if fieldItem_has_next>,</#if>
@@ -86,4 +88,4 @@
         FROM ${classInfo.originTableName}
     </select>
 
-</mapper>
\ No newline at end of file
+</mapper>
diff --git a/generator-web/src/main/resources/templates/code-generator/mybatis/service.ftl b/generator-web/src/main/resources/templates/code-generator/mybatis/service.ftl
index c31f30b..6909bf8 100644
--- a/generator-web/src/main/resources/templates/code-generator/mybatis/service.ftl
+++ b/generator-web/src/main/resources/templates/code-generator/mybatis/service.ftl
@@ -28,9 +28,14 @@ public interface ${classInfo.className}Service {
     */
     public ${classInfo.className} load(int id);
 
+/**
+* 如果已经有这个id的，就更新，不然是插入
+*/
+Object save(${classInfo.className} ${classInfo.className?uncap_first});
+
     /**
     * 分页查询
     */
-    public Map<String,Object> pageList(int offset, int pagesize);
+    public Map<String,Object> pageList(int offset, int pageSize);
 
 }
diff --git a/generator-web/src/main/resources/templates/code-generator/mybatis/service_impl.ftl b/generator-web/src/main/resources/templates/code-generator/mybatis/service_impl.ftl
index 3a8345d..c93f5ea 100644
--- a/generator-web/src/main/resources/templates/code-generator/mybatis/service_impl.ftl
+++ b/generator-web/src/main/resources/templates/code-generator/mybatis/service_impl.ftl
@@ -32,7 +32,7 @@ public class ${classInfo.className}ServiceImpl implements ${classInfo.className}
 
 
 	@Override
-	public Object delete(int id) {
+	public Object delete(Integer id) {
 		int ret = ${classInfo.className?uncap_first}Mapper.delete(id);
 		return ret>0?${returnUtilSuccess}():${returnUtilFailure}();
 	}
@@ -46,20 +46,38 @@ public class ${classInfo.className}ServiceImpl implements ${classInfo.className}
 
 
 	@Override
-	public ${classInfo.className} load(int id) {
-		return ${classInfo.className?uncap_first}Mapper.load(id);
+	public ${classInfo.className} getById(Integer id) {
+		return ${classInfo.className?uncap_first}Mapper.getById(id);
 	}
 
+@Override
+public Object save(${classInfo.className} ${classInfo.className?uncap_first}) {
+Integer id = ${classInfo.className?uncap_first}.getId();
+if (id==null) {
+int insert = ${classInfo.className?uncap_first}Mapper.insert(${classInfo.className?uncap_first});
+return ReturnT.success();
+}
+${classInfo.className} load = ${classInfo.className?uncap_first}Mapper.getById(${classInfo.className?uncap_first}.getId());
+if (load==null) {
+int insert = ${classInfo.className?uncap_first}Mapper.insert(${classInfo.className?uncap_first});
+
+return ReturnT.success();
+}
+${classInfo.className?uncap_first}Mapper.update(${classInfo.className?uncap_first});
+return  ReturnT.success();
+}
+
 
 	@Override
-	public Map<String,Object> pageList(int offset, int pagesize) {
+	public Map<String,Object> pageList(int offset, int pageSize) {
 
-		List<${classInfo.className}> pageList = ${classInfo.className?uncap_first}Mapper.pageList(offset, pagesize);
-		int totalCount = ${classInfo.className?uncap_first}Mapper.pageListCount(offset, pagesize);
+		List<${classInfo.className}> pageList = ${classInfo.className?uncap_first}Mapper.pageList(offset, pageSize);
+Integer totalCount = ${classInfo.className?uncap_first}Mapper.pageListCount(offset, pageSize);
 
 		// result
 		Map<String, Object> result = new HashMap<String, Object>();
-		result.put("pageList", pageList);
+		//result.put("pageList", pageList);
+		result.put("content", pageList);
 		result.put("totalCount", totalCount);
 
 		return result;
diff --git a/generator-web/src/main/resources/templates/code-generator/ui/element-ui.ftl b/generator-web/src/main/resources/templates/code-generator/ui/element-ui.ftl
index 9f9e224..69ac289 100644
--- a/generator-web/src/main/resources/templates/code-generator/ui/element-ui.ftl
+++ b/generator-web/src/main/resources/templates/code-generator/ui/element-ui.ftl
@@ -1,6 +1,8 @@
+<template>
 <el-form :inline="true" :model="submitData" class="demo-form-inline" :rules="rules" ref="ruleForm">
     <el-card class="box-card">
-        <div slot="header" class="header clearfix">
+<#--        slot="header"-->
+        <div class="header clearfix">
             <span>${classInfo.classComment}</span>
             <el-button v-if="!ischeck && !isFind" class="fr" type="primary" @click="validate('ruleForm')">提交</el-button>
             <el-button v-else class="fr" type="primary" @click="goBack">返回</el-button>
@@ -13,4 +15,241 @@
             </#list>
         </#if>
     </el-card>
-</el-form>
\ No newline at end of file
+</el-form>
+
+<div class="container">
+    <el-button @click="loadList">刷新</el-button>
+    <el-table
+            :data="tableData"
+            border
+            class="table"
+            ref="multipleTable"
+            header-cell-class-name="table-header">
+        <el-table-column prop="id" label="id"  align="center"></el-table-column>
+        <#if classInfo.fieldList?exists && classInfo.fieldList?size gt 0>
+            <#list classInfo.fieldList as fieldItem >
+                <el-table-column prop="${fieldItem.fieldName}" label="${fieldItem.fieldComment}"  align="center"></el-table-column>
+            </#list>
+        </#if>
+        <el-table-column label="操作" width="120" align="center" fixed="right">
+            <template v-slot="scope">
+                <el-button
+                        type="text"
+                        icon="el-icon-edit"
+                        @click="handleEdit(scope.$index, scope.row)"
+                >编辑
+                </el-button>
+                <el-button
+                           type="text"
+                           icon="el-icon-delete"
+                           class="red"
+                           @click="handleDelete(scope.$index, scope.row)"
+                >删除
+                </el-button>
+            </template>
+        </el-table-column>
+
+    </el-table>
+
+    <div class="pagination">
+        <el-pagination
+                background
+                layout="prev, pager, next"
+                :current-page="pageParam.pageIndex"
+                :page-size="pageParam.pageSize"
+                :total="pageTotal"
+                @current-change="load"
+        >
+        </el-pagination>
+    </div>
+
+    <el-dialog class="edit-dialog" title="编辑"  v-model="editVisible" width="30%">
+        <el-form ref="formEdit" :model="formEdit" label-width="110px">
+        <#if classInfo.fieldList?exists && classInfo.fieldList?size gt 0>
+            <#list classInfo.fieldList as fieldItem >
+                <el-form-item label="${fieldItem.fieldComment}">
+                    <el-input v-model="formEdit.${fieldItem.fieldName}"></el-input>
+                </el-form-item>
+            </#list>
+        </#if>
+        </el-form>
+        <span   class="dialog-footer">
+                <el-button @click="editVisible = false;getData()">取 消</el-button>
+                <el-button type="primary" @click="saveEdit">确 定</el-button>
+            </span>
+    </el-dialog>
+</div>
+
+</template>
+
+<script>
+
+    import method from "@/utils/method";
+    import Common from "@/common/common";
+    export default {
+        name: '${classInfo.className}Table',
+        components: {
+
+        },
+        data() {
+            return {
+                formData: {
+                    <#if classInfo.fieldList?exists && classInfo.fieldList?size gt 0>
+                    <#list classInfo.fieldList as fieldItem >
+                    ${fieldItem.fieldName}:"",
+                </#list>
+                </#if>
+                },
+                value: '选项1',
+                editVisible: false,
+                form: [],
+                formEdit:[],
+                query: {
+                    uname: "",
+                    pname: "",
+                    pageIndex: 1,
+                    pageSize: 10
+                },
+                pageParam: {
+                    pageNumber: 0,
+                    pageSize: 10
+                },
+                tableKey: 0,
+                list: null,
+                total: 0,
+                listLoading: true,
+                listQuery: {
+                    page: 1,
+                    limit: 20,
+                    importance: undefined,
+                    title: undefined,
+                    type: undefined,
+                    sort: '+id'
+                },
+                sortOptions: [{label: 'ID Ascending', key: '+id'}, {label: 'ID Descending', key: '-id'}],
+                statusOptions: ['published', 'draft', 'deleted'],
+                showReviewer: false,
+                temp: {
+                    id: undefined,
+                    importance: 1,
+                    remark: '',
+                    timestamp: new Date(),
+                    title: '',
+                    type: '',
+                    status: 'published'
+                },
+                dialogFormVisible: false,
+                dialogStatus: '',
+                textMap: {
+                    update: 'Edit',
+                    create: 'Create'
+                },
+                dialogPvVisible: false,
+                pvData: [],
+                rules: {
+                    type: [{required: true, message: 'type is required', trigger: 'change'}],
+                    timestamp: [{type: 'date', required: true, message: 'timestamp is required', trigger: 'change'}],
+                    title: [{required: true, message: 'title is required', trigger: 'blur'}]
+                },
+                downloadLoading: false,
+                tableData: [],
+                pageTotal: 0
+            }
+        },
+        created() {
+            this.loadList()
+        },
+        methods: {
+            editCancel() {
+                this.editVisible = false;
+                // getData()
+                this.loadList()
+            },
+
+            handleEdit(index, row) {
+                this.idx = index;
+                // this.form = row;
+                this.formEdit = row;
+                this.editVisible = true;
+            },
+            saveEdit(){
+                method.post("${classInfo.className?uncap_first}/save", this.formEdit, this)
+                    .then(response => {
+                    this.editVisible=false
+                    this.loadList()
+                })
+            .catch(function (error) {
+                    console.log(error);
+                });
+            },
+            handleDelete(index, row) {
+                method.postWithParams("${classInfo.className?uncap_first}/delete", {},{id:row.id}, this)
+                    .then(response => {
+                    this.loadList()
+                })
+            .catch(function (error) {
+                    console.log(error);
+                });
+            },
+            validate(ruleForm) {
+                method.post("${classInfo.className?uncap_first}/save", this.formData, this)
+                    .then(response => {
+                    console.log("response")
+                    console.log(response)
+                    this.$message.success('提交成功！');
+                    this.loadList()
+                })
+                .catch(error=> {
+                    console.log(error);
+                    this.$message.error('提交失败！'+error);
+                });
+            },
+            loadList(){
+                method.postWithParams("${classInfo.className?uncap_first}/list", {}, this.pageParam, this)
+                    .then(response => {
+                    let content = response.data.content
+                    this.tableData = content
+                    // this.pageTotal = response.data.pageable.pageSize;
+                this.pageTotal = response.data.totalElements
+                    })
+                    .catch(function (error) {
+                            console.log(error);
+                        });
+                    },
+            loadById(id){
+                method.postWithParams("${classInfo.className?uncap_first}/load", {}, id, this)
+                    .then(response => {
+                    let content = response.data.content
+                    this.tableData = content
+                    this.pageTotal = response.data.totalElements
+                })
+            .catch( error=> {
+                    console.log(error);
+            });
+            },
+
+            load(val) {
+                this.pageParam.pageNumber = val - 1
+                this.loadList()
+            },
+        }
+    }
+</script>
+
+<style scoped>
+
+    .pagination {
+        margin: 20px 0;
+        text-align: right;
+    }
+
+    .container {
+        padding: 30px;
+        background: #fff;
+        border: 1px solid #ddd;
+        border-radius: 5px;
+    }
+
+
+</style>
+
-- 
Gitee


From edab00e8c8c5cae2fe981ecc720902e1aa8bc2a6 Mon Sep 17 00:00:00 2001
From: starplatinum111 <5428527+starplatinum111@user.noreply.gitee.com>
Date: Fri, 15 Apr 2022 13:27:14 +0800
Subject: [PATCH 03/15] =?UTF-8?q?=E8=BF=98=E5=8E=9F=E4=B9=8B=E5=89=8D?=
 =?UTF-8?q?=E7=9A=84mybtis?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../code-generator/mybatis/controller.ftl     | 29 ++++-------
 .../code-generator/mybatis/mapper.ftl         |  4 +-
 .../code-generator/mybatis/mapper2.ftl        | 48 +++----------------
 .../code-generator/mybatis/model.ftl          |  3 --
 .../code-generator/mybatis/mybatis.ftl        |  4 +-
 .../code-generator/mybatis/service.ftl        |  7 +--
 .../code-generator/mybatis/service_impl.ftl   | 32 +++----------
 7 files changed, 26 insertions(+), 101 deletions(-)

diff --git a/generator-web/src/main/resources/templates/code-generator/mybatis/controller.ftl b/generator-web/src/main/resources/templates/code-generator/mybatis/controller.ftl
index c567600..c5859af 100644
--- a/generator-web/src/main/resources/templates/code-generator/mybatis/controller.ftl
+++ b/generator-web/src/main/resources/templates/code-generator/mybatis/controller.ftl
@@ -15,7 +15,6 @@ import java.util.Map;
  * @author ${authorName}
  * @date ${.now?string('yyyy-MM-dd')}
  */
-@CrossOrigin
 @RestController
 @RequestMapping(value = "/${classInfo.className?uncap_first}")
 public class ${classInfo.className}Controller {
@@ -23,22 +22,12 @@ public class ${classInfo.className}Controller {
     @Resource
     private ${classInfo.className}Service ${classInfo.className?uncap_first}Service;
 
-/**
-* id 存在就更新 不然插入
-* @param ${classInfo.className?uncap_first}
-* @return
-*/
-@PostMapping("/save")
-public Object save(@RequestBody  ${classInfo.className} ${classInfo.className?uncap_first}){
-return ${classInfo.className?uncap_first}Service.save(${classInfo.className?uncap_first});
-}
-
     /**
     * 新增
     * @author ${authorName}
     * @date ${.now?string('yyyy/MM/dd')}
     **/
-    @PostMapping("/insert")
+    @RequestMapping("/insert")
     public Object insert(${classInfo.className} ${classInfo.className?uncap_first}){
         return ${classInfo.className?uncap_first}Service.insert(${classInfo.className?uncap_first});
     }
@@ -48,7 +37,7 @@ return ${classInfo.className?uncap_first}Service.save(${classInfo.className?unca
     * @author ${authorName}
     * @date ${.now?string('yyyy/MM/dd')}
     **/
-    @PostMapping("/delete")
+    @RequestMapping("/delete")
     public Object delete(int id){
         return ${classInfo.className?uncap_first}Service.delete(id);
     }
@@ -58,7 +47,7 @@ return ${classInfo.className?uncap_first}Service.save(${classInfo.className?unca
     * @author ${authorName}
     * @date ${.now?string('yyyy/MM/dd')}
     **/
-    @PostMapping("/update")
+    @RequestMapping("/update")
     public Object update(${classInfo.className} ${classInfo.className?uncap_first}){
         return ${classInfo.className?uncap_first}Service.update(${classInfo.className?uncap_first});
     }
@@ -68,7 +57,7 @@ return ${classInfo.className?uncap_first}Service.save(${classInfo.className?unca
     * @author ${authorName}
     * @date ${.now?string('yyyy/MM/dd')}
     **/
-    @PostMapping("/load")
+    @RequestMapping("/load")
     public Object load(int id){
         return ${classInfo.className?uncap_first}Service.load(id);
     }
@@ -78,12 +67,10 @@ return ${classInfo.className?uncap_first}Service.save(${classInfo.className?unca
     * @author ${authorName}
     * @date ${.now?string('yyyy/MM/dd')}
     **/
-    @PostMapping("/list")
-    public Map<String, Object> pageList(@RequestParam(required = false, defaultValue = "0") int pageNumber,
-                                        @RequestParam(required = false, defaultValue = "10") int pageSize) {
-        return ${classInfo.className?uncap_first}Service.pageList(pageNumber, pageSize);
-        //Map<String, Object> pageList = ${classInfo.className?uncap_first}Service.pageList(pageNumber, pageSize);
-//return ReturnT.success(pageList);
+    @RequestMapping("/pageList")
+    public Map<String, Object> pageList(@RequestParam(required = false, defaultValue = "0") int offset,
+                                        @RequestParam(required = false, defaultValue = "10") int pagesize) {
+        return ${classInfo.className?uncap_first}Service.pageList(offset, pagesize);
     }
 
 }
diff --git a/generator-web/src/main/resources/templates/code-generator/mybatis/mapper.ftl b/generator-web/src/main/resources/templates/code-generator/mybatis/mapper.ftl
index fd8cf1d..e7dc9ef 100644
--- a/generator-web/src/main/resources/templates/code-generator/mybatis/mapper.ftl
+++ b/generator-web/src/main/resources/templates/code-generator/mybatis/mapper.ftl
@@ -47,13 +47,13 @@ public interface ${classInfo.className}Mapper {
     * @author ${authorName}
     * @date ${.now?string('yyyy/MM/dd')}
     **/
-    List<${classInfo.className}> pageList(int offset,int pageSize);
+    List<${classInfo.className}> pageList(int offset,int pagesize);
 
     /**
     * 查询 分页查询 count
     * @author ${authorName}
     * @date ${.now?string('yyyy/MM/dd')}
     **/
-    int pageListCount(int offset,int pageSize);
+    int pageListCount(int offset,int pagesize);
 
 }
diff --git a/generator-web/src/main/resources/templates/code-generator/mybatis/mapper2.ftl b/generator-web/src/main/resources/templates/code-generator/mybatis/mapper2.ftl
index a687636..ee0b5e0 100644
--- a/generator-web/src/main/resources/templates/code-generator/mybatis/mapper2.ftl
+++ b/generator-web/src/main/resources/templates/code-generator/mybatis/mapper2.ftl
@@ -13,48 +13,23 @@ import java.util.List;
 @Repository
 public interface ${classInfo.className}Mapper {
 
-//这种假如表是stu 那么id是 stu_id
-  //  @Select("select * from ${classInfo.tableName} where ${classInfo.tableName}_id=井{id}")
-  //  public ${classInfo.className} getById(Integer id);
+    @Select("select * from ${classInfo.tableName} where ${classInfo.tableName}_id=井{id}")
+    public ${classInfo.className} getById(Integer id);
 
-// @Delete(value = "delete from ${classInfo.tableName} where ${classInfo.tableName}_id=井{${classInfo.className?uncap_first}Id}")
-//  boolean delete(Integer ${classInfo.className?uncap_first}Id);
-
-//@Options(useGeneratedKeys=true,keyProperty="${classInfo.className?uncap_first}Id")
-//@Insert("insert into ${classInfo.tableName}" +
-//" (<#list classInfo.fieldList as fieldItem >${fieldItem.columnName}<#if fieldItem_has_next>,</#if></#list>)" +
-//" values(<#list classInfo.fieldList as fieldItem >${fieldItem.fieldName}<#if fieldItem_has_next>,<#else>)</#if></#list>")
-//public Integer insert(${classInfo.className} ${classInfo.className?uncap_first});
-
-
-//  @Update(value = "update ${classInfo.tableName} set "
-//   <#list classInfo.fieldList as fieldItem >
-    //      <#if fieldItem.columnName != "id">+" ${fieldItem.columnName}=井{${fieldItem.fieldName}}<#if fieldItem_has_next>,</#if>"</#if>
-    //   </#list>
-//   +" where ${classInfo.tableName}_id=井{${classInfo.className?uncap_first}Id} ")
-//    boolean update(${classInfo.className} ${classInfo.className?uncap_first});
-
-//这种假如表是stu 那么id是 id, 两种选择都放着，想用某一种 只要把另外一种注释就行了
-@Select("select * from ${classInfo.tableName} where id=井{id}")
-public ${classInfo.className} getById(Integer id);
-
-@Delete(value = "delete from ${classInfo.tableName} where id=井{id}")
-Integer delete(Integer id);
-
-    @Options(useGeneratedKeys=true,keyProperty="id")
+    @Options(useGeneratedKeys=true,keyProperty="${classInfo.className?uncap_first}Id")
     @Insert("insert into ${classInfo.tableName}" +
         " (<#list classInfo.fieldList as fieldItem >${fieldItem.columnName}<#if fieldItem_has_next>,</#if></#list>)" +
         " values(<#list classInfo.fieldList as fieldItem >${fieldItem.fieldName}<#if fieldItem_has_next>,<#else>)</#if></#list>")
     public Integer insert(${classInfo.className} ${classInfo.className?uncap_first});
 
-
-
+    @Delete(value = "delete from ${classInfo.tableName} where ${classInfo.tableName}_id=井{${classInfo.className?uncap_first}Id}")
+    boolean delete(Integer id);
 
     @Update(value = "update ${classInfo.tableName} set "
     <#list classInfo.fieldList as fieldItem >
         <#if fieldItem.columnName != "id">+" ${fieldItem.columnName}=井{${fieldItem.fieldName}}<#if fieldItem_has_next>,</#if>"</#if>
     </#list>
-        +" where id=井{id} ")
+        +" where ${classInfo.tableName}_id=井{${classInfo.className?uncap_first}Id} ")
     boolean update(${classInfo.className} ${classInfo.className?uncap_first});
 
 
@@ -78,13 +53,4 @@ Integer delete(Integer id);
     )
     List<${classInfo.className}> selectList(${classInfo.className} ${classInfo.className?uncap_first});
 
-@Select(value = "select * from ${classInfo.tableName}  "
-+" LIMIT 井{offset} , 井{pageSize}"
-)
-List<${classInfo.className}> pageList(int offset, int pageSize);
-
-    @Select(value = "SELECT count(1)\n" +
-    "        FROM ${classInfo.tableName} "
-    )
-    Integer pageListCount(int offset, int pageSize);
-}
+}
\ No newline at end of file
diff --git a/generator-web/src/main/resources/templates/code-generator/mybatis/model.ftl b/generator-web/src/main/resources/templates/code-generator/mybatis/model.ftl
index f3aed4b..3e94df7 100644
--- a/generator-web/src/main/resources/templates/code-generator/mybatis/model.ftl
+++ b/generator-web/src/main/resources/templates/code-generator/mybatis/model.ftl
@@ -8,13 +8,10 @@ import java.util.List;
  * @author ${authorName}
  * @date ${.now?string('yyyy-MM-dd')}
  */
-@Data
 public class ${classInfo.className} implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-private Integer id;
-
 <#if classInfo.fieldList?exists && classInfo.fieldList?size gt 0>
 <#list classInfo.fieldList as fieldItem >
     <#if isComment?exists && isComment==true>/**
diff --git a/generator-web/src/main/resources/templates/code-generator/mybatis/mybatis.ftl b/generator-web/src/main/resources/templates/code-generator/mybatis/mybatis.ftl
index 8cfe1a8..d22cac0 100644
--- a/generator-web/src/main/resources/templates/code-generator/mybatis/mybatis.ftl
+++ b/generator-web/src/main/resources/templates/code-generator/mybatis/mybatis.ftl
@@ -4,7 +4,6 @@
 <mapper namespace="${packageName}.dao.${classInfo.className}Mapper">
 
     <resultMap id="BaseResultMap" type="${packageName}.entity.${classInfo.className}" >
-        <result column="id" property="id" />
         <#if classInfo.fieldList?exists && classInfo.fieldList?size gt 0>
             <#list classInfo.fieldList as fieldItem >
                 <result column="${fieldItem.columnName}" property="${fieldItem.fieldName}" />
@@ -13,7 +12,6 @@
     </resultMap>
 
     <sql id="Base_Column_List">
-        id,
         <#if classInfo.fieldList?exists && classInfo.fieldList?size gt 0>
             <#list classInfo.fieldList as fieldItem >
                 ${fieldItem.columnName}<#if fieldItem_has_next>,</#if>
@@ -88,4 +86,4 @@
         FROM ${classInfo.originTableName}
     </select>
 
-</mapper>
+</mapper>
\ No newline at end of file
diff --git a/generator-web/src/main/resources/templates/code-generator/mybatis/service.ftl b/generator-web/src/main/resources/templates/code-generator/mybatis/service.ftl
index 6909bf8..c31f30b 100644
--- a/generator-web/src/main/resources/templates/code-generator/mybatis/service.ftl
+++ b/generator-web/src/main/resources/templates/code-generator/mybatis/service.ftl
@@ -28,14 +28,9 @@ public interface ${classInfo.className}Service {
     */
     public ${classInfo.className} load(int id);
 
-/**
-* 如果已经有这个id的，就更新，不然是插入
-*/
-Object save(${classInfo.className} ${classInfo.className?uncap_first});
-
     /**
     * 分页查询
     */
-    public Map<String,Object> pageList(int offset, int pageSize);
+    public Map<String,Object> pageList(int offset, int pagesize);
 
 }
diff --git a/generator-web/src/main/resources/templates/code-generator/mybatis/service_impl.ftl b/generator-web/src/main/resources/templates/code-generator/mybatis/service_impl.ftl
index c93f5ea..3a8345d 100644
--- a/generator-web/src/main/resources/templates/code-generator/mybatis/service_impl.ftl
+++ b/generator-web/src/main/resources/templates/code-generator/mybatis/service_impl.ftl
@@ -32,7 +32,7 @@ public class ${classInfo.className}ServiceImpl implements ${classInfo.className}
 
 
 	@Override
-	public Object delete(Integer id) {
+	public Object delete(int id) {
 		int ret = ${classInfo.className?uncap_first}Mapper.delete(id);
 		return ret>0?${returnUtilSuccess}():${returnUtilFailure}();
 	}
@@ -46,38 +46,20 @@ public class ${classInfo.className}ServiceImpl implements ${classInfo.className}
 
 
 	@Override
-	public ${classInfo.className} getById(Integer id) {
-		return ${classInfo.className?uncap_first}Mapper.getById(id);
+	public ${classInfo.className} load(int id) {
+		return ${classInfo.className?uncap_first}Mapper.load(id);
 	}
 
-@Override
-public Object save(${classInfo.className} ${classInfo.className?uncap_first}) {
-Integer id = ${classInfo.className?uncap_first}.getId();
-if (id==null) {
-int insert = ${classInfo.className?uncap_first}Mapper.insert(${classInfo.className?uncap_first});
-return ReturnT.success();
-}
-${classInfo.className} load = ${classInfo.className?uncap_first}Mapper.getById(${classInfo.className?uncap_first}.getId());
-if (load==null) {
-int insert = ${classInfo.className?uncap_first}Mapper.insert(${classInfo.className?uncap_first});
-
-return ReturnT.success();
-}
-${classInfo.className?uncap_first}Mapper.update(${classInfo.className?uncap_first});
-return  ReturnT.success();
-}
-
 
 	@Override
-	public Map<String,Object> pageList(int offset, int pageSize) {
+	public Map<String,Object> pageList(int offset, int pagesize) {
 
-		List<${classInfo.className}> pageList = ${classInfo.className?uncap_first}Mapper.pageList(offset, pageSize);
-Integer totalCount = ${classInfo.className?uncap_first}Mapper.pageListCount(offset, pageSize);
+		List<${classInfo.className}> pageList = ${classInfo.className?uncap_first}Mapper.pageList(offset, pagesize);
+		int totalCount = ${classInfo.className?uncap_first}Mapper.pageListCount(offset, pagesize);
 
 		// result
 		Map<String, Object> result = new HashMap<String, Object>();
-		//result.put("pageList", pageList);
-		result.put("content", pageList);
+		result.put("pageList", pageList);
 		result.put("totalCount", totalCount);
 
 		return result;
-- 
Gitee


From decaa4d259589d46a7e593afe211a3f67ebbe896 Mon Sep 17 00:00:00 2001
From: starplatinum111 <5428527+starplatinum111@user.noreply.gitee.com>
Date: Fri, 15 Apr 2022 13:36:33 +0800
Subject: [PATCH 04/15] =?UTF-8?q?rm=20=E6=96=87=E4=BB=B6=E6=93=8D=E4=BD=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../generator/controller/GeneratorController.java   | 13 +------------
 .../system/generator/util/TableParseUtil.java       |  4 +---
 2 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/generator-web/src/main/java/com/softdev/system/generator/controller/GeneratorController.java b/generator-web/src/main/java/com/softdev/system/generator/controller/GeneratorController.java
index f5fbe14..e8f456a 100644
--- a/generator-web/src/main/java/com/softdev/system/generator/controller/GeneratorController.java
+++ b/generator-web/src/main/java/com/softdev/system/generator/controller/GeneratorController.java
@@ -10,12 +10,10 @@ import com.softdev.system.generator.util.ValueUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.ModelAndView;
 
-import java.io.File;
 import java.util.Date;
 import java.util.Map;
 
@@ -52,8 +50,7 @@ public class GeneratorController {
         return ReturnT.ok().put("templates",templates);
     }
 
-    @Value("${file.path}")
-    public String filePathStr;
+
 
     @PostMapping("/code/generate")
     @ResponseBody
@@ -85,14 +82,6 @@ public class GeneratorController {
         paramInfo.getOptions().put("classInfo", classInfo);
         paramInfo.getOptions().put("tableName", classInfo == null ? System.currentTimeMillis() : classInfo.getTableName());
 
-        String tableName = classInfo.getTableName();
-//        filePath
-        File filePath = new File(filePathStr);
-        log.info("filePath {}",filePath);
-        if (!filePath.exists() && !filePath.isDirectory()) {
-            filePath.mkdir();
-        }
-
         //log the generated table and filed size记录解析了什么表，有多少个字段
         //log.info("generated table :{} , size :{}",classInfo.getTableName(),(classInfo.getFieldList() == null ? "" : classInfo.getFieldList().size()));
 
diff --git a/generator-web/src/main/java/com/softdev/system/generator/util/TableParseUtil.java b/generator-web/src/main/java/com/softdev/system/generator/util/TableParseUtil.java
index 64d1f8d..33b613c 100644
--- a/generator-web/src/main/java/com/softdev/system/generator/util/TableParseUtil.java
+++ b/generator-web/src/main/java/com/softdev/system/generator/util/TableParseUtil.java
@@ -169,9 +169,7 @@ public class TableParseUtil {
                         && !columnLine.contains("pctincrease")
                         && !columnLine.contains("buffer_pool") && !columnLine.contains("tablespace")
                         && !(columnLine.contains("primary ") && i > 3));
-//                if (columnLine.contains("id")) {
-//
-//                }
+
                 if (specialFlag||columnLine.contains("id")) {
                     //如果是oracle的number(x,x)，可能出现最后分割残留的,x)，这里做排除处理
                     if (columnLine.length() < 5) {
-- 
Gitee


From 271472e2eb69cd0e6d1fe99464ea9a8b21819479 Mon Sep 17 00:00:00 2001
From: starplatinum111 <5428527+starplatinum111@user.noreply.gitee.com>
Date: Fri, 15 Apr 2022 13:40:46 +0800
Subject: [PATCH 05/15] =?UTF-8?q?=E5=88=A0=E9=99=A4debug=E6=97=B6=E5=80=99?=
 =?UTF-8?q?=E7=9A=84=E6=89=93=E5=8D=B0=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/softdev/system/generator/util/TableParseUtil.java   | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/generator-web/src/main/java/com/softdev/system/generator/util/TableParseUtil.java b/generator-web/src/main/java/com/softdev/system/generator/util/TableParseUtil.java
index 33b613c..4c56093 100644
--- a/generator-web/src/main/java/com/softdev/system/generator/util/TableParseUtil.java
+++ b/generator-web/src/main/java/com/softdev/system/generator/util/TableParseUtil.java
@@ -46,8 +46,7 @@ public class TableParseUtil {
         //deal with java string copy \n"
         tableSql = tableSql.trim().replaceAll("\\\\n`", "").replaceAll("\\+", "").replaceAll("``", "`").replaceAll("\\\\", "");
         // table Name
-        System.out.println("tableSql");
-        System.out.println(tableSql);
+
         String tableName = null;
         if (tableSql.contains("TABLE") && tableSql.contains("(")) {
             tableName = tableSql.substring(tableSql.indexOf("TABLE") + 5, tableSql.indexOf("("));
@@ -112,8 +111,7 @@ public class TableParseUtil {
 
         // 正常( ) 内的一定是字段相关的定义。
         String fieldListTmp = tableSql.substring(tableSql.indexOf("(") + 1, tableSql.lastIndexOf(")"));
-        System.out.println("fieldListTmp");
-        System.out.println(fieldListTmp);
+
 
         // 匹配 comment，替换备注里的小逗号, 防止不小心被当成切割符号切割
         String commentPattenStr1 = "comment `(.*?)\\`";
-- 
Gitee


From 3eae796e7a283a567686e8bbc6cdc49b814ed8a5 Mon Sep 17 00:00:00 2001
From: starplatinum111 <5428527+starplatinum111@user.noreply.gitee.com>
Date: Fri, 15 Apr 2022 05:59:08 +0000
Subject: [PATCH 06/15] =?UTF-8?q?update=20generator-web/src/main/resources?=
 =?UTF-8?q?/application-dev.yml.=20=E6=9C=AC=E6=9D=A5=E6=83=B3=E7=94=9F?=
 =?UTF-8?q?=E6=88=90=E6=96=87=E4=BB=B6=E7=9A=84=20=E5=90=8E=E6=9D=A5?=
 =?UTF-8?q?=E6=B2=A1=E5=86=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 generator-web/src/main/resources/application-dev.yml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/generator-web/src/main/resources/application-dev.yml b/generator-web/src/main/resources/application-dev.yml
index 44a5d5d..42869ce 100644
--- a/generator-web/src/main/resources/application-dev.yml
+++ b/generator-web/src/main/resources/application-dev.yml
@@ -60,6 +60,3 @@ OEM:
   returnUtilFailure: ReturnT.error
   outputStr: zhengkai.blog.csdn.net
   mode: local
-
-file:
-  path: D:/genCodeFile
-- 
Gitee


From 14a515b0a9f93357df8fffd57a7249836c0277c2 Mon Sep 17 00:00:00 2001
From: starplatinum111 <5428527+starplatinum111@user.noreply.gitee.com>
Date: Thu, 5 May 2022 15:35:36 +0800
Subject: [PATCH 07/15] mybatis starp

---
 README.md                                     |  5 ++
 .../system/generator/util/TableParseUtil.java |  4 +-
 .../src/main/resources/template.json          |  9 +++
 .../code-generator/android/initView.ftl       | 49 ++++++++++++
 .../templates/code-generator/android/json.ftl | 13 ++++
 .../templates/code-generator/android/sql.ftl  | 74 +++++++++++++++++++
 .../code-generator/android/swagger-yml.ftl    | 12 +++
 .../templates/code-generator/android/xml.ftl  | 11 +++
 .../mybatis-starp/controller-starp.ftl        |  6 +-
 .../mybatis-starp/mapper-starp.ftl            |  2 +-
 .../mybatis-starp/model-starp.ftl             |  2 +-
 .../mybatis-starp/mybatis-starp.ftl           |  2 +-
 .../mybatis-starp/service-starp.ftl           |  4 +-
 .../mybatis-starp/service_impl-starp.ftl      | 32 ++++----
 .../code-generator/ui/element-ui.ftl          |  6 ++
 .../code-generator/util/beanutil.ftl          |  1 +
 16 files changed, 207 insertions(+), 25 deletions(-)
 create mode 100644 generator-web/src/main/resources/templates/code-generator/android/initView.ftl
 create mode 100644 generator-web/src/main/resources/templates/code-generator/android/json.ftl
 create mode 100644 generator-web/src/main/resources/templates/code-generator/android/sql.ftl
 create mode 100644 generator-web/src/main/resources/templates/code-generator/android/swagger-yml.ftl
 create mode 100644 generator-web/src/main/resources/templates/code-generator/android/xml.ftl

diff --git a/README.md b/README.md
index ca825a1..8942148 100644
--- a/README.md
+++ b/README.md
@@ -40,6 +40,11 @@
 - 可在`applicaltion.yml`中的`OEM.mode`设置`js/css引入模式`为`local`(本地模式，默认)/`CDN`(云CDN模式，在线网站推荐，省流量)
 - OEM信息可以在`applicaltion.yml`中的`OEM`中更改
 
+: 本机地址: http://localhost:1234/generator
+
+
+
+
 # Url
 
 感谢`卡卡`将他部署在[BEJSON](https://java.bejson.com/generator)上，目前是besjon专供的金牌工具(线上版本不一定是最新的，会有延迟，请谅解，谢谢).<br>
diff --git a/generator-web/src/main/java/com/softdev/system/generator/util/TableParseUtil.java b/generator-web/src/main/java/com/softdev/system/generator/util/TableParseUtil.java
index 4c56093..58fe8ae 100644
--- a/generator-web/src/main/java/com/softdev/system/generator/util/TableParseUtil.java
+++ b/generator-web/src/main/java/com/softdev/system/generator/util/TableParseUtil.java
@@ -168,7 +168,9 @@ public class TableParseUtil {
                         && !columnLine.contains("buffer_pool") && !columnLine.contains("tablespace")
                         && !(columnLine.contains("primary ") && i > 3));
 
-                if (specialFlag||columnLine.contains("id")) {
+//                我知道了 为了排除  PRIMARY KEY (`id`) 这种
+//                if (specialFlag||columnLine.contains("id")) {
+                if (specialFlag) {
                     //如果是oracle的number(x,x)，可能出现最后分割残留的,x)，这里做排除处理
                     if (columnLine.length() < 5) {
                         continue;
diff --git a/generator-web/src/main/resources/template.json b/generator-web/src/main/resources/template.json
index 34f2fcf..25245ca 100644
--- a/generator-web/src/main/resources/template.json
+++ b/generator-web/src/main/resources/template.json
@@ -288,5 +288,14 @@
         "description": "mapper annotation"
       }
     ]
+  },
+  {
+    "group": "android",
+    "templates": [{
+      "id": "120",
+      "name": "initView",
+      "description": "initView"
+    }
+    ]
   }
 ]
diff --git a/generator-web/src/main/resources/templates/code-generator/android/initView.ftl b/generator-web/src/main/resources/templates/code-generator/android/initView.ftl
new file mode 100644
index 0000000..0097b58
--- /dev/null
+++ b/generator-web/src/main/resources/templates/code-generator/android/initView.ftl
@@ -0,0 +1,49 @@
+/**
+* ${classInfo.classComment}安卓 initView
+* @author ${authorName} ${.now?string('yyyy-MM-dd')}
+*/
+
+<#if classInfo.fieldList?exists && classInfo.fieldList?size gt 0>
+
+
+    <#list classInfo.fieldList as fieldItem>
+        TextView textView${fieldItem.fieldName?cap_first};
+    </#list>
+
+
+<#--    void initFragmentView() {-->
+<#--    <#list classInfo.fieldList as fieldItem>-->
+<#--        textView${fieldItem.fieldName?cap_first}=getActivity().findViewById(R.id.textView${fieldItem.fieldName?cap_first});-->
+<#--    </#list>-->
+<#--    }-->
+
+
+
+    void initFragmentView(View view) {
+    <#list classInfo.fieldList as fieldItem>
+        textView${fieldItem.fieldName?cap_first}=view.findViewById(R.id.textView${fieldItem.fieldName?cap_first});
+    </#list>
+    }
+
+    void initView() {
+    <#list classInfo.fieldList as fieldItem>
+    <#--        // ${fieldItem.fieldComment}-->
+        textView${fieldItem.fieldName?cap_first}=findViewById(R.id.textView${fieldItem.fieldName?cap_first});
+    </#list>
+    }
+
+
+    <#list classInfo.fieldList as fieldItem>
+        if(textView${fieldItem.fieldName?cap_first}!=null){
+            textView${fieldItem.fieldName?cap_first}.setText(${classInfo.className?uncap_first}.get${fieldItem.fieldName?cap_first}());
+        }
+    </#list>
+
+    void setViewData(${classInfo.className?cap_first} ${classInfo.className?uncap_first}){
+    <#list classInfo.fieldList as fieldItem>
+        if(textView${fieldItem.fieldName?cap_first}!=null){
+        textView${fieldItem.fieldName?cap_first}.setText(${classInfo.className?uncap_first}.get${fieldItem.fieldName?cap_first}());
+        }
+    </#list>
+    }
+</#if>
diff --git a/generator-web/src/main/resources/templates/code-generator/android/json.ftl b/generator-web/src/main/resources/templates/code-generator/android/json.ftl
new file mode 100644
index 0000000..596cce4
--- /dev/null
+++ b/generator-web/src/main/resources/templates/code-generator/android/json.ftl
@@ -0,0 +1,13 @@
+<#if classInfo.fieldList?exists && classInfo.fieldList?size gt 0>
+{
+<#list classInfo.fieldList as fieldItem>
+ "${fieldItem.fieldName}":"${fieldItem.fieldComment}"<#if fieldItem_has_next>,</#if>
+</#list>
+}
+
+{
+<#list classInfo.fieldList as fieldItem>
+ "${fieldItem.fieldName}":""<#if fieldItem_has_next>,</#if>
+</#list>
+}
+</#if>
diff --git a/generator-web/src/main/resources/templates/code-generator/android/sql.ftl b/generator-web/src/main/resources/templates/code-generator/android/sql.ftl
new file mode 100644
index 0000000..126f84d
--- /dev/null
+++ b/generator-web/src/main/resources/templates/code-generator/android/sql.ftl
@@ -0,0 +1,74 @@
+
+<#if classInfo.fieldList?exists && classInfo.fieldList?size gt 0>
+ #SQL横向select
+    SELECT <#list classInfo.fieldList as fieldItem >t.${fieldItem.columnName}<#if fieldItem_has_next>,</#if></#list>
+    FROM ${classInfo.tableName} t;
+
+ #CSV横向字段名
+    <#list classInfo.fieldList as fieldItem >${fieldItem.columnName}<#if fieldItem_has_next>,</#if></#list>
+</#if>
+
+<#if classInfo.fieldList?exists && classInfo.fieldList?size gt 0>
+#LEFT JOIN
+    SELECT
+        *
+    FROM
+    ${classInfo.tableName} a
+    LEFT JOIN ${classInfo.tableName} b
+    ON a.${classInfo.tableName}_id=b.${classInfo.tableName}_id
+    WHERE 1=1;
+</#if>
+
+<#if classInfo.fieldList?exists && classInfo.fieldList?size gt 0>
+#INSERT INTO
+    INSERT INTO ${classInfo.tableName} ( <#list classInfo.fieldList as fieldItem >${fieldItem.columnName}<#if fieldItem_has_next>,</#if></#list> )
+    VALUES
+    (
+    <#list classInfo.fieldList as fieldItem >''<#if fieldItem_has_next>,</#if></#list>
+    );
+</#if>
+
+
+<#if classInfo.fieldList?exists && classInfo.fieldList?size gt 0>
+#关联更新
+    UPDATE ${classInfo.tableName} a
+    JOIN ${classInfo.tableName}_join b ON a.${classInfo.tableName}_id = b.${classInfo.tableName}_id
+    SET <#list classInfo.fieldList as fieldItem > a.${fieldItem.columnName} = b.${fieldItem.columnName}<#if fieldItem_has_next>,</#if> </#list>
+    WHERE
+    b.${classInfo.tableName}_id IS NOT NULL;
+
+    UPDATE ${classInfo.tableName} a,${classInfo.tableName}_join b
+    SET <#list classInfo.fieldList as fieldItem > a.${fieldItem.columnName} = b.${fieldItem.columnName}<#if fieldItem_has_next>,</#if> </#list>
+    WHERE a.${classInfo.tableName}_id = b.${classInfo.tableName}_id;
+
+#普通update
+    UPDATE ${classInfo.tableName}
+    SET
+    <#list classInfo.fieldList as fieldItem >
+        ${fieldItem.columnName} = ''<#if fieldItem_has_next>,</#if>
+    </#list>
+    WHERE
+    <#list classInfo.fieldList as fieldItem >
+        ${fieldItem.columnName} = ''<#if fieldItem_has_next>,</#if>
+    </#list>;
+</#if>
+
+
+
+<#if classInfo.fieldList?exists && classInfo.fieldList?size gt 0>
+#关联删除
+    delete a from ${classInfo.tableName}_del as a inner join ${classInfo.tableName} as b
+    where a.${classInfo.tableName}_id=b.${classInfo.tableName}_id;
+
+#普通删除
+    DELETE
+    FROM
+    ${classInfo.tableName}
+    WHERE
+    <#list classInfo.fieldList as fieldItem >
+        ${fieldItem.columnName} = ''<#if fieldItem_has_next>,</#if>
+    </#list>;
+
+</#if>
+
+
diff --git a/generator-web/src/main/resources/templates/code-generator/android/swagger-yml.ftl b/generator-web/src/main/resources/templates/code-generator/android/swagger-yml.ftl
new file mode 100644
index 0000000..ce22aaa
--- /dev/null
+++ b/generator-web/src/main/resources/templates/code-generator/android/swagger-yml.ftl
@@ -0,0 +1,12 @@
+
+<#if classInfo.fieldList?exists && classInfo.fieldList?size gt 0>
+${classInfo.className}:
+  type: "object"
+  properties:
+<#list classInfo.fieldList as fieldItem >
+    ${fieldItem.fieldName}:
+      type: ${fieldItem.swaggerClass}
+      description:  <#if isComment?exists && isComment==true>"${fieldItem.fieldComment}"</#if>
+</#list>
+</#if>
+
diff --git a/generator-web/src/main/resources/templates/code-generator/android/xml.ftl b/generator-web/src/main/resources/templates/code-generator/android/xml.ftl
new file mode 100644
index 0000000..3959cfc
--- /dev/null
+++ b/generator-web/src/main/resources/templates/code-generator/android/xml.ftl
@@ -0,0 +1,11 @@
+<!--
+ ${classInfo.classComment}对象Get Set
+ @author ${authorName} ${.now?string('yyyy-MM-dd')}
+-->
+<#if classInfo.fieldList?exists && classInfo.fieldList?size gt 0>
+<${classInfo.className}>
+<#list classInfo.fieldList as fieldItem>
+ <${fieldItem.fieldName}>${fieldItem.fieldComment}</${fieldItem.fieldName}>
+</#list>
+</${classInfo.className}>
+</#if>
diff --git a/generator-web/src/main/resources/templates/code-generator/mybatis-starp/controller-starp.ftl b/generator-web/src/main/resources/templates/code-generator/mybatis-starp/controller-starp.ftl
index c567600..4ce1173 100644
--- a/generator-web/src/main/resources/templates/code-generator/mybatis-starp/controller-starp.ftl
+++ b/generator-web/src/main/resources/templates/code-generator/mybatis-starp/controller-starp.ftl
@@ -68,9 +68,9 @@ return ${classInfo.className?uncap_first}Service.save(${classInfo.className?unca
     * @author ${authorName}
     * @date ${.now?string('yyyy/MM/dd')}
     **/
-    @PostMapping("/load")
-    public Object load(int id){
-        return ${classInfo.className?uncap_first}Service.load(id);
+    @PostMapping("/getById")
+    public Object getById(Integer id){
+        return ${classInfo.className?uncap_first}Service.getById(id);
     }
 
     /**
diff --git a/generator-web/src/main/resources/templates/code-generator/mybatis-starp/mapper-starp.ftl b/generator-web/src/main/resources/templates/code-generator/mybatis-starp/mapper-starp.ftl
index fd8cf1d..37c0db9 100644
--- a/generator-web/src/main/resources/templates/code-generator/mybatis-starp/mapper-starp.ftl
+++ b/generator-web/src/main/resources/templates/code-generator/mybatis-starp/mapper-starp.ftl
@@ -40,7 +40,7 @@ public interface ${classInfo.className}Mapper {
     * @author ${authorName}
     * @date ${.now?string('yyyy/MM/dd')}
     **/
-    ${classInfo.className} load(int id);
+    ${classInfo.className} getById(Integer id);
 
     /**
     * 查询 分页查询
diff --git a/generator-web/src/main/resources/templates/code-generator/mybatis-starp/model-starp.ftl b/generator-web/src/main/resources/templates/code-generator/mybatis-starp/model-starp.ftl
index f3aed4b..b95307e 100644
--- a/generator-web/src/main/resources/templates/code-generator/mybatis-starp/model-starp.ftl
+++ b/generator-web/src/main/resources/templates/code-generator/mybatis-starp/model-starp.ftl
@@ -8,7 +8,7 @@ import java.util.List;
  * @author ${authorName}
  * @date ${.now?string('yyyy-MM-dd')}
  */
-@Data
+<#--@Data-->
 public class ${classInfo.className} implements Serializable {
 
     private static final long serialVersionUID = 1L;
diff --git a/generator-web/src/main/resources/templates/code-generator/mybatis-starp/mybatis-starp.ftl b/generator-web/src/main/resources/templates/code-generator/mybatis-starp/mybatis-starp.ftl
index 8cfe1a8..f47ff3b 100644
--- a/generator-web/src/main/resources/templates/code-generator/mybatis-starp/mybatis-starp.ftl
+++ b/generator-web/src/main/resources/templates/code-generator/mybatis-starp/mybatis-starp.ftl
@@ -71,7 +71,7 @@
     </update>
 
 
-    <select id="load" resultMap="BaseResultMap">
+    <select id="getById" resultMap="BaseResultMap">
         SELECT <include refid="Base_Column_List" />
         FROM ${classInfo.originTableName}
         WHERE id = ${r"#{id}"}
diff --git a/generator-web/src/main/resources/templates/code-generator/mybatis-starp/service-starp.ftl b/generator-web/src/main/resources/templates/code-generator/mybatis-starp/service-starp.ftl
index 6909bf8..8249ba5 100644
--- a/generator-web/src/main/resources/templates/code-generator/mybatis-starp/service-starp.ftl
+++ b/generator-web/src/main/resources/templates/code-generator/mybatis-starp/service-starp.ftl
@@ -16,7 +16,7 @@ public interface ${classInfo.className}Service {
     /**
     * 删除
     */
-    public Object delete(int id);
+    public Object delete(Integer id);
 
     /**
     * 更新
@@ -26,7 +26,7 @@ public interface ${classInfo.className}Service {
     /**
     * 根据主键 id 查询
     */
-    public ${classInfo.className} load(int id);
+    public ${classInfo.className} getById(Integer id);
 
 /**
 * 如果已经有这个id的，就更新，不然是插入
diff --git a/generator-web/src/main/resources/templates/code-generator/mybatis-starp/service_impl-starp.ftl b/generator-web/src/main/resources/templates/code-generator/mybatis-starp/service_impl-starp.ftl
index c93f5ea..8ab36d7 100644
--- a/generator-web/src/main/resources/templates/code-generator/mybatis-starp/service_impl-starp.ftl
+++ b/generator-web/src/main/resources/templates/code-generator/mybatis-starp/service_impl-starp.ftl
@@ -50,29 +50,29 @@ public class ${classInfo.className}ServiceImpl implements ${classInfo.className}
 		return ${classInfo.className?uncap_first}Mapper.getById(id);
 	}
 
-@Override
-public Object save(${classInfo.className} ${classInfo.className?uncap_first}) {
-Integer id = ${classInfo.className?uncap_first}.getId();
-if (id==null) {
-int insert = ${classInfo.className?uncap_first}Mapper.insert(${classInfo.className?uncap_first});
-return ReturnT.success();
-}
-${classInfo.className} load = ${classInfo.className?uncap_first}Mapper.getById(${classInfo.className?uncap_first}.getId());
-if (load==null) {
-int insert = ${classInfo.className?uncap_first}Mapper.insert(${classInfo.className?uncap_first});
+    @Override
+    public Object save(${classInfo.className} ${classInfo.className?uncap_first}) {
+        Integer id = ${classInfo.className?uncap_first}.getId();
+        if (id==null) {
+            int insert = ${classInfo.className?uncap_first}Mapper.insert(${classInfo.className?uncap_first});
+            return ReturnT.success();
+        }
+        ${classInfo.className} load = ${classInfo.className?uncap_first}Mapper.getById(${classInfo.className?uncap_first}.getId());
+        if (load==null) {
+            int insert = ${classInfo.className?uncap_first}Mapper.insert(${classInfo.className?uncap_first});
 
-return ReturnT.success();
-}
-${classInfo.className?uncap_first}Mapper.update(${classInfo.className?uncap_first});
-return  ReturnT.success();
-}
+            return ReturnT.success();
+        }
+        ${classInfo.className?uncap_first}Mapper.update(${classInfo.className?uncap_first});
+        return  ReturnT.success();
+    }
 
 
 	@Override
 	public Map<String,Object> pageList(int offset, int pageSize) {
 
 		List<${classInfo.className}> pageList = ${classInfo.className?uncap_first}Mapper.pageList(offset, pageSize);
-Integer totalCount = ${classInfo.className?uncap_first}Mapper.pageListCount(offset, pageSize);
+        Integer totalCount = ${classInfo.className?uncap_first}Mapper.pageListCount(offset, pageSize);
 
 		// result
 		Map<String, Object> result = new HashMap<String, Object>();
diff --git a/generator-web/src/main/resources/templates/code-generator/ui/element-ui.ftl b/generator-web/src/main/resources/templates/code-generator/ui/element-ui.ftl
index 69ac289..0112db0 100644
--- a/generator-web/src/main/resources/templates/code-generator/ui/element-ui.ftl
+++ b/generator-web/src/main/resources/templates/code-generator/ui/element-ui.ftl
@@ -1,4 +1,10 @@
 <template>
+    <#if classInfo.fieldList?exists && classInfo.fieldList?size gt 0>
+        <#list classInfo.fieldList as fieldItem >
+            <el-input v-model="query.${fieldItem.fieldName}" placeholder="${fieldItem.fieldComment}" class="handle-input"></el-input>
+        </#list>
+    </#if>
+    <el-button type="primary" icon="el-icon-search" @click="handleSearch">搜索</el-button>
 <el-form :inline="true" :model="submitData" class="demo-form-inline" :rules="rules" ref="ruleForm">
     <el-card class="box-card">
 <#--        slot="header"-->
diff --git a/generator-web/src/main/resources/templates/code-generator/util/beanutil.ftl b/generator-web/src/main/resources/templates/code-generator/util/beanutil.ftl
index 108e27a..eba8b70 100644
--- a/generator-web/src/main/resources/templates/code-generator/util/beanutil.ftl
+++ b/generator-web/src/main/resources/templates/code-generator/util/beanutil.ftl
@@ -38,4 +38,5 @@ map.put("${fieldItem.fieldComment}",${classInfo.className?uncap_first}.get${fiel
 map.put("${fieldItem.fieldName?uncap_first}",${classInfo.className?uncap_first}.get${fieldItem.fieldName?cap_first}());
 </#list>
 
+
 </#if>
-- 
Gitee


From 037671d8e78273644c0a75b7211ff1c05a0be2aa Mon Sep 17 00:00:00 2001
From: starplatinum111 <5428527+starplatinum111@user.noreply.gitee.com>
Date: Thu, 12 May 2022 16:29:28 +0800
Subject: [PATCH 08/15] elm ui

---
 .../controller/GeneratorController.java       |   1 +
 .../system/generator/entity/FieldInfo.java    |   1 +
 .../system/generator/util/CodeMaker.java      | 210 +++++++++++
 .../src/main/resources/template.json          |  18 +
 .../code-generator/jdbc-template/jt-like.ftl  |  67 ++++
 .../code-generator/jpa-starp/starp-entity.ftl |   1 +
 .../ui/element-ui-starp-underline.ftl         | 349 +++++++++++++++++
 .../code-generator/ui/element-ui-starp.ftl    | 350 ++++++++++++++++++
 8 files changed, 997 insertions(+)
 create mode 100644 generator-web/src/main/java/com/softdev/system/generator/util/CodeMaker.java
 create mode 100644 generator-web/src/main/resources/templates/code-generator/jdbc-template/jt-like.ftl
 create mode 100644 generator-web/src/main/resources/templates/code-generator/ui/element-ui-starp-underline.ftl
 create mode 100644 generator-web/src/main/resources/templates/code-generator/ui/element-ui-starp.ftl

diff --git a/generator-web/src/main/java/com/softdev/system/generator/controller/GeneratorController.java b/generator-web/src/main/java/com/softdev/system/generator/controller/GeneratorController.java
index e8f456a..6f35ef8 100644
--- a/generator-web/src/main/java/com/softdev/system/generator/controller/GeneratorController.java
+++ b/generator-web/src/main/java/com/softdev/system/generator/controller/GeneratorController.java
@@ -76,6 +76,7 @@ public class GeneratorController {
             classInfo = TableParseUtil.processTableToClassInfoByRegex(paramInfo);
             //默认模式：default parse sql by java
         }
+//        根据class info 自己生成模板吧  字符串操作更加灵活
 
         //2.Set the params 设置表格参数
 
diff --git a/generator-web/src/main/java/com/softdev/system/generator/entity/FieldInfo.java b/generator-web/src/main/java/com/softdev/system/generator/entity/FieldInfo.java
index df9bb3f..0b6e7fc 100644
--- a/generator-web/src/main/java/com/softdev/system/generator/entity/FieldInfo.java
+++ b/generator-web/src/main/java/com/softdev/system/generator/entity/FieldInfo.java
@@ -10,6 +10,7 @@ import lombok.Data;
 @Data
 public class FieldInfo {
 
+//    user_id 类似这样的字段 数据库的,不过如果数据库里不是下划线形式的,也不一定是这样
     private String columnName;
     private String fieldName;
     private String fieldClass;
diff --git a/generator-web/src/main/java/com/softdev/system/generator/util/CodeMaker.java b/generator-web/src/main/java/com/softdev/system/generator/util/CodeMaker.java
new file mode 100644
index 0000000..9e09b65
--- /dev/null
+++ b/generator-web/src/main/java/com/softdev/system/generator/util/CodeMaker.java
@@ -0,0 +1,210 @@
+package com.softdev.system.generator.util;
+
+import com.softdev.system.generator.entity.ClassInfo;
+import com.softdev.system.generator.entity.FieldInfo;
+
+import java.util.List;
+
+public class CodeMaker {
+    static String  makeJdbcTemplateCode(ClassInfo classInfo){
+        String template="package zucc.kinect.jdbc;\n" +
+                "\n" +
+                "import lombok.extern.slf4j.Slf4j;\n" +
+                "import org.springframework.beans.factory.annotation.Autowired;\n" +
+                "import org.springframework.jdbc.core.JdbcTemplate;\n" +
+                "import org.springframework.jdbc.support.rowset.SqlRowSet;\n" +
+                "import org.springframework.stereotype.Repository;\n" +
+                "import zucc.kinect.page.EquipRedPageTime;\n" +
+                "import zucc.kinect.page.EquipRedPageTimeYuan;\n" +
+                "import zucc.kinect.util.DecimalUtil;\n" +
+                "import zucc.kinect.util.StrUtil;\n" +
+                "\n" +
+                "import java.sql.Timestamp;\n" +
+                "import java.util.ArrayList;\n" +
+                "import java.util.List;\n" +
+                "\n" +
+                "@Slf4j\n" +
+                "@Repository\n" +
+                "public class #className#JdbcT {\n" +
+                "\n" +
+                "    private JdbcTemplate jdbcTemplate;\n" +
+                "\n" +
+                "    @Autowired\n" +
+                "    public void setJdbcTemplate(JdbcTemplate jdbcTemplate) {\n" +
+                "        this.jdbcTemplate = jdbcTemplate;\n" +
+                "    }\n" +
+                "\n" +
+                "\n" +
+                "    String l(Object object) {\n" +
+                "        return StrUtil.like(object);\n" +
+                "    }\n" +
+                "\n" +
+                "    public List<EquipRedPageTimeYuan> list(EquipRedPageTimeYuan equipRedPageTimeYuan, Integer comId) {\n" +
+                "\n" +
+                "\n" +
+                "        String equipRedPageSql = \"select ride.*,\\n\" +\n" +
+                "                \"       tbl_user.user_name,\\n\" +\n" +
+                "                \"       tbl_user.user_phone,\\n\" +\n" +
+                "                \"       tbl_equipment.equipment_sid\\n\" +\n" +
+                "                \"from ride,\\n\" +\n" +
+                "                \"     tbl_user,\\n\" +\n" +
+                "                \"     tbl_equipment\\n\" +\n" +
+                "                \"where ride.user_id = tbl_user.id\\n\" +\n" +
+                "                \"  and tbl_equipment.id = ride.equip_id \\n\";\n" +
+                "        if (comId != null) {\n" +
+                "            equipRedPageSql += \"  and company_id = ?\";\n" +
+                "\n" +
+                "        }\n" +
+                "\n" +
+                "\n" +
+                "        Long id = equipRedPageTimeYuan.getId();\n" +
+                "        Integer equipId = equipRedPageTimeYuan.getEquipId();\n" +
+                "        Integer dayMaxRed = equipRedPageTimeYuan.getDayMaxRed();\n" +
+                "        Integer todayCanRed = equipRedPageTimeYuan.getTodayCanRed();\n" +
+                "        Timestamp changeDate = equipRedPageTimeYuan.getChangeDate();\n" +
+                "        Integer deleteFlag = equipRedPageTimeYuan.getDeleteFlag();\n" +
+                "//        传入null 的话 就有问题啊\n" +
+                "//        if()\n" +
+                "        String redStandStr = equipRedPageTimeYuan.getRedStand();\n" +
+                "\n" +
+                "        Integer redStand   = DecimalUtil.yuanToFen(equipRedPageTimeYuan.getRedStand());\n" +
+                "\n" +
+                "        Integer canRed = equipRedPageTimeYuan.getCanRed();\n" +
+                "\n" +
+                "        String ip = equipRedPageTimeYuan.getIp();\n" +
+                "        String equipName = equipRedPageTimeYuan.getEquipName();\n" +
+                "\n" +
+                "\n" +
+                "\n" +
+                "        Integer redUp =  DecimalUtil.yuanToFen(equipRedPageTimeYuan.getRedUp());\n" +
+                "        Integer redDown =  DecimalUtil.yuanToFen(equipRedPageTimeYuan.getRedDown());\n" +
+                "        Integer dayCanRedVal =  DecimalUtil.yuanToFen(equipRedPageTimeYuan.getDayCanRedVal());\n" +
+                "        Integer haveSendNum = equipRedPageTimeYuan.getHaveSendNum();\n" +
+                "        String companyName = equipRedPageTimeYuan.getCompanyName();\n" +
+                "\n" +
+                "        if (id != null) {\n" +
+                "//            sql += \" and id like \" + l(id);\n" +
+                "            equipRedPageSql += \" and equipment_red_packet.id like \" + l(id);\n" +
+                "        }\n" +
+                "        if (equipId != null) {\n" +
+                "//            sql += \" and id like \" + l(id);\n" +
+                "            equipRedPageSql += \" and equipment_id like \" + l(equipId);\n" +
+                "        }\n" +
+                "\n" +
+                "        if (dayMaxRed != null) {\n" +
+                "            equipRedPageSql += \" and day_max_red like \" + l(dayMaxRed);\n" +
+                "        }\n" +
+                "\n" +
+                "        if (todayCanRed != null) {\n" +
+                "            equipRedPageSql += \" and today_can_red like \" + l(todayCanRed);\n" +
+                "        }\n" +
+                "\n" +
+                "        if (changeDate != null) {\n" +
+                "            equipRedPageSql += \" and equipment_red_packet.change_date like \" + l(changeDate);\n" +
+                "        }\n" +
+                "\n" +
+                "        if (deleteFlag != null) {\n" +
+                "            equipRedPageSql += \" and equipment_red_packet.delete_flag like \" + l(deleteFlag);\n" +
+                "        }\n" +
+                "\n" +
+                "        if (redStand != null) {\n" +
+                "            equipRedPageSql += \" and red_stand like \" + l(redStand);\n" +
+                "        }\n" +
+                "\n" +
+                "        if (canRed != null) {\n" +
+                "            equipRedPageSql += \" and can_red like \" + l(canRed);\n" +
+                "        }\n" +
+                "\n" +
+                "        if (redUp != null) {\n" +
+                "//            sql += \" and id like \" + l(id);\n" +
+                "            equipRedPageSql += \" and red_up like \" + l(redUp);\n" +
+                "        }\n" +
+                "        if (redDown != null) {\n" +
+                "//            sql += \" and id like \" + l(id);\n" +
+                "            equipRedPageSql += \" and red_down like \" + l(redDown);\n" +
+                "        }\n" +
+                "\n" +
+                "\n" +
+                "        if (dayCanRedVal != null) {\n" +
+                "            equipRedPageSql += \" and day_can_red_val like \" + l(dayCanRedVal);\n" +
+                "        }\n" +
+                "\n" +
+                "        if (haveSendNum != null) {\n" +
+                "            equipRedPageSql += \" and have_send_num like \" + l(haveSendNum);\n" +
+                "        }\n" +
+                "        if (companyName != null) {\n" +
+                "            equipRedPageSql += \" and company_name like \" + l(companyName);\n" +
+                "        }\n" +
+                "\n" +
+                "\n" +
+                "\n" +
+                "        if (ip != null) {\n" +
+                "//            sql += \" and id like \" + l(id);\n" +
+                "            equipRedPageSql += \" and ip like \" + l(ip);\n" +
+                "        }\n" +
+                "        if (equipName != null) {\n" +
+                "//            sql += \" and id like \" + l(id);\n" +
+                "            equipRedPageSql += \" and equipment_sid like \" + l(equipName);\n" +
+                "        }\n" +
+                "\n" +
+                "        int pageIndex = equipRedPageTimeYuan.getPageIndex();\n" +
+                "        int pageSize = equipRedPageTimeYuan.getPageSize();\n" +
+                "\n" +
+                "        String startTime = equipRedPageTimeYuan.getStartTime();\n" +
+                "        String endTime = equipRedPageTimeYuan.getEndTime();\n" +
+                "        if (startTime != null && endTime != null) {\n" +
+                "            equipRedPageSql += \" and date(change_date)>= \" + StrUtil.quotation(startTime);\n" +
+                "            equipRedPageSql += \" and date(change_date)<= \" + StrUtil.quotation(endTime);\n" +
+                "        }\n" +
+                "\n" +
+                "        List<EquipRedPageTimeYuan> list = new ArrayList<>();\n" +
+                "\n" +
+                "        SqlRowSet sqlRowSet;\n" +
+                "        if(comId==null){\n" +
+                "            sqlRowSet = jdbcTemplate.queryForRowSet(equipRedPageSql);\n" +
+                "\n" +
+                "        }else{\n" +
+                "            sqlRowSet = jdbcTemplate.queryForRowSet(equipRedPageSql, comId);\n" +
+                "        }\n" +
+                "        while (sqlRowSet.next()) {\n" +
+                "            Long id1 = sqlRowSet.getLong(\"id\");\n" +
+                "            Integer equipment_id = sqlRowSet.getInt(\"equipment_id\");\n" +
+                "            Integer day_max_red = sqlRowSet.getInt(\"day_max_red\");\n" +
+                "            Integer today_can_red = sqlRowSet.getInt(\"today_can_red\");\n" +
+                "            Timestamp change_date = sqlRowSet.getTimestamp(\"change_date\");\n" +
+                "            Integer delete_flag = sqlRowSet.getInt(\"delete_flag\");\n" +
+                "            Integer red_stand = sqlRowSet.getInt(\"red_stand\");\n" +
+                "            Integer can_red = sqlRowSet.getInt(\"can_red\");\n" +
+                "            String ip1 = sqlRowSet.getString(\"ip\");\n" +
+                "            String equipment_sid = sqlRowSet.getString(\"equipment_sid\");\n" +
+                "\n" +
+                "\n" +
+                "            int red_up = sqlRowSet.getInt(\"red_up\");\n" +
+                "            int red_down = sqlRowSet.getInt(\"red_down\");\n" +
+                "            int day_can_red_val = sqlRowSet.getInt(\"day_can_red_val\");\n" +
+                "            int have_send_num = sqlRowSet.getInt(\"have_send_num\");\n" +
+                "            String company_name = sqlRowSet.getString(\"company_name\");\n" +
+                "\n" +
+                "\n" +
+                "            EquipRedPageTime equipRedPageTime1 = new EquipRedPageTime(id1, equipment_id, change_date, ip1, red_stand,\n" +
+                "                    equipment_sid, day_max_red, today_can_red, can_red, delete_flag, pageIndex, pageSize,\n" +
+                "                    startTime, endTime,red_up,red_down,day_can_red_val,have_send_num,company_name);\n" +
+                "            EquipRedPageTimeYuan equipRedPageTimeYuanRes = equipRedPageTime1.toYuan();\n" +
+                "\n" +
+                "            list.add(equipRedPageTimeYuanRes);\n" +
+                "        }\n" +
+                "        return list;\n" +
+                "\n" +
+                "\n" +
+                "    }\n" +
+                "}\n";
+        List<FieldInfo> fieldList = classInfo.getFieldList();
+        for (FieldInfo fieldInfo : fieldList) {
+            String fieldName = fieldInfo.getFieldName();
+            String columnName = fieldInfo.getColumnName();
+//            这个应该是下划线的吧
+        }
+        template=  template.replace("#className#",classInfo.getClassName());
+        return null;
+    }
+}
diff --git a/generator-web/src/main/resources/template.json b/generator-web/src/main/resources/template.json
index 25245ca..902f517 100644
--- a/generator-web/src/main/resources/template.json
+++ b/generator-web/src/main/resources/template.json
@@ -24,7 +24,19 @@
       "id": "14",
       "name": "layui-list",
       "description": "layui-list"
+    },
+    {
+      "id": "15",
+      "name": "element-ui-starp",
+      "description": "element-ui-starp"
+    },
+    {
+      "id": "16",
+      "name": "element-ui-starp-underline",
+      "description": "element-ui-starp-underline"
     }
+
+
   ]
 },
   {
@@ -97,7 +109,13 @@
         "id": "41",
         "name": "jtdaoimpl",
         "description": "jtdaoimpl"
+      },
+      {
+        "id": "42",
+        "name": "jt-like",
+        "description": "jt-like"
       }
+
     ]
   },
 
diff --git a/generator-web/src/main/resources/templates/code-generator/jdbc-template/jt-like.ftl b/generator-web/src/main/resources/templates/code-generator/jdbc-template/jt-like.ftl
new file mode 100644
index 0000000..652a804
--- /dev/null
+++ b/generator-web/src/main/resources/templates/code-generator/jdbc-template/jt-like.ftl
@@ -0,0 +1,67 @@
+<#if isWithPackage?exists && isWithPackage==true>package ${packageName}.jdbct;</#if>
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.jdbc.support.rowset.SqlRowSet;
+import org.springframework.stereotype.Repository;
+import zucc.kinect.page.EquipRedPageTime;
+import zucc.kinect.page.EquipRedPageTimeYuan;
+import zucc.kinect.util.DecimalUtil;
+import zucc.kinect.util.StrUtil;
+
+import java.sql.Timestamp;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+@Slf4j
+@Repository
+public class ${classInfo.className}JdbcT {
+
+private JdbcTemplate jdbcTemplate;
+
+@Autowired
+public void setJdbcTemplate(JdbcTemplate jdbcTemplate) {
+this.jdbcTemplate = jdbcTemplate;
+}
+
+
+String l(Object object) {
+return StrUtil.like(object);
+}
+
+public List<Map<String, Object>>  list(${classInfo.className} ${classInfo.className?uncap_first}, Integer comId) {
+
+
+    String sqlStr = "";
+    if (comId != null) {
+    sqlStr += "  and company_id = ?";
+
+    }
+
+    <#if classInfo.fieldList?exists && classInfo.fieldList?size gt 0>
+        <#list classInfo.fieldList as fieldItem >
+            if (${classInfo.className?uncap_first}.get${fieldItem.fieldName?cap_first}() != null) {
+            sqlStr += " and ${classInfo.originTableName}.${fieldItem.columnName} like " + l(${classInfo.className?uncap_first}.get${fieldItem.fieldName?cap_first}());
+            }
+        </#list>
+    </#if>
+
+
+    int pageIndex = equipRedPageTimeYuan.getPageIndex();
+    int pageSize = equipRedPageTimeYuan.getPageSize();
+
+    String startTime = equipRedPageTimeYuan.getStartTime();
+    String endTime = equipRedPageTimeYuan.getEndTime();
+    if (startTime != null && endTime != null) {
+    sqlStr += " and date(change_date)>= " + StrUtil.quotation(startTime);
+    sqlStr += " and date(change_date)<= " + StrUtil.quotation(endTime);
+    }
+
+    List<Map<String, Object>> maps = jdbcTemplate.queryForList(sqlStr);
+    return maps;
+
+
+        }
+        }
diff --git a/generator-web/src/main/resources/templates/code-generator/jpa-starp/starp-entity.ftl b/generator-web/src/main/resources/templates/code-generator/jpa-starp/starp-entity.ftl
index 4818345..152c317 100644
--- a/generator-web/src/main/resources/templates/code-generator/jpa-starp/starp-entity.ftl
+++ b/generator-web/src/main/resources/templates/code-generator/jpa-starp/starp-entity.ftl
@@ -53,6 +53,7 @@ public class ${classInfo.className} implements Serializable {
         return ${fieldItem.fieldName};
     }
 
+<#--    https://blog.csdn.net/niuch1029291561/article/details/8190617-->
     public void set${fieldItem.fieldName?cap_first}(${fieldItem.fieldClass} ${fieldItem.fieldName}) {
         this.${fieldItem.fieldName} = ${fieldItem.fieldName};
     }
diff --git a/generator-web/src/main/resources/templates/code-generator/ui/element-ui-starp-underline.ftl b/generator-web/src/main/resources/templates/code-generator/ui/element-ui-starp-underline.ftl
new file mode 100644
index 0000000..9a1bb3c
--- /dev/null
+++ b/generator-web/src/main/resources/templates/code-generator/ui/element-ui-starp-underline.ftl
@@ -0,0 +1,349 @@
+<template>
+    <div>
+        <div class="crumbs">
+            <el-breadcrumb separator="/">
+                <el-breadcrumb-item> <i class="el-icon-lx-cascades"></i> 公司红包账户 </el-breadcrumb-item>
+            </el-breadcrumb>
+        </div>
+        <div class="container">
+            <div class="handle-box">
+                <el-button @click="exportExcel" type="primary" class="button" style="margin-right: 10px">导出数据</el-button>
+                <#if classInfo.fieldList?exists && classInfo.fieldList?size gt 0>
+                    <#list classInfo.fieldList as fieldItem >
+                        <el-input v-model="query.${fieldItem.fieldName}" placeholder="${fieldItem.fieldComment}" class="handle-input mr10"></el-input>
+                    </#list>
+                </#if>
+                <el-button type="primary" icon="el-icon-search" @click="handleSearch">搜索</el-button>
+            </div>
+
+            <el-table :data="tableDataAll" style="display: none" id="alldata">
+                <#if classInfo.fieldList?exists && classInfo.fieldList?size gt 0>
+                    <#list classInfo.fieldList as fieldItem >
+                        <el-table-column prop="${fieldItem.columnName}" label="${fieldItem.fieldComment}"
+                                         align="center"></el-table-column>
+                    </#list>
+                </#if>
+
+            </el-table>
+
+            <el-table :data="tableData" border class="table" ref="multipleTable" header-cell-class-name="table-header">
+                <#if classInfo.fieldList?exists && classInfo.fieldList?size gt 0>
+                    <#list classInfo.fieldList as fieldItem >
+                        <el-table-column prop="${fieldItem.columnName}" label="${fieldItem.fieldComment}"
+                                         align="center"></el-table-column>
+                    </#list>
+                </#if>
+                <el-table-column label="操作"  align="center">
+<#--                    v-if="scope.row.deleteFlag === 0"-->
+                    <template slot-scope="scope" >
+                        <el-button type="text" icon="el-icon-edit" @click="handleEdit(scope.$index, scope.row)">编辑</el-button>
+                    </template>
+                </el-table-column>
+            </el-table>
+            <div class="pagination">
+                <el-pagination
+                        background
+                        layout="prev, pager, next"
+                        :current-page="query.pageIndex"
+                        :page-size="query.pageSize"
+                        :total="pageTotal"
+                        @current-change="load"
+                >
+                </el-pagination>
+            </div>
+        </div>
+
+        <!-- 编辑弹出框 -->
+        <el-dialog title="编辑" :visible.sync="editVisible" width="30%">
+            <el-form ref="form" :rules="formRules" :model="form" label-width="70px">
+
+                <#if classInfo.fieldList?exists && classInfo.fieldList?size gt 0>
+                    <#list classInfo.fieldList as fieldItem >
+
+                        <el-form-item label="${fieldItem.fieldComment}" prop="${fieldItem.columnName}">
+                            <el-input v-model="form.${fieldItem.fieldName}"></el-input>
+                        </el-form-item>
+                    </#list>
+                </#if>
+            </el-form>
+            <span slot="footer" class="dialog-footer">
+                <el-button
+                        @click="
+                        editVisible = false;
+                        getData();
+                    "
+                >取 消</el-button
+                >
+                <el-button type="primary" @click="saveEdit">确 定</el-button>
+            </span>
+        </el-dialog>
+    </div>
+</template>
+
+<script>
+    import FileSaver from 'file-saver';
+    import XLSX from 'xlsx';
+    export default {
+        name: '${classInfo.className}Table',
+        data() {
+            return {
+                tableName:"${classInfo.className?uncap_first}",
+                radio: false,
+                value: '选项1',
+                query: {
+            <#if classInfo.fieldList?exists && classInfo.fieldList?size gt 0>
+            <#list classInfo.fieldList as fieldItem >
+            ${fieldItem.fieldName}:null,
+            </#list>
+            </#if>
+                pageIndex: 1,
+                pageSize: 10
+                },
+                tableData: [],
+                tableDataAll: [],
+                multipleSelection: [],
+                delList: [],
+                editVisible: false,
+                pageTotal: 0,
+                form: {},
+
+                editVisible2: false,
+                formadmin: {},
+                passwordnew: '',
+                password: '',
+                idx: -1,
+                id: -1,
+                formRules: {
+                    companyRest: [{ required: true, message: '请输入红包账户余额', trigger: 'blur' }]
+                }
+            };
+        },
+        created() {
+            this.$axios
+                .get(this._api + 'admin/token', {
+                    params: {},
+                    headers: {
+                        token: this.$cookies.get('token'),
+                        'Content-Type': 'application/json;charset=utf-8' //头部信息
+                    }
+                })
+                .then((response) => {
+                if (response.data.port == '200') {
+                if (response.data.role != 'Superadmin') {
+                    this.$message.error('权限不足');
+                    this.$router.go(-1);
+                }
+
+                this.getData();
+            } else {
+                this.$message.error(response.data.msg);
+                this.$router.go(-1);
+            }
+        })
+        .catch(function (error) {
+                console.log(error);
+            });
+        },
+        methods: {
+            formatDate(row, column) {
+                // 获取单元格数据
+                let data = row[column.property];
+                let dt = new Date(data);
+                return (
+                    dt.getFullYear() +
+                    '-' +
+                    (dt.getMonth() + 1 > 9 ? dt.getMonth() + 1 : '0' + (dt.getMonth() + 1)) +
+                    '-' +
+                    (dt.getDate() > 9 ? dt.getDate() : '0' + dt.getDate()) +
+                    ' ' +
+                    (dt.getHours() > 9 ? dt.getHours() : '0' + dt.getHours()) +
+                    ':' +
+                    (dt.getMinutes() > 9 ? dt.getMinutes() : '0' + dt.getMinutes()) +
+                    ':' +
+                    (dt.getSeconds() > 9 ? dt.getSeconds() : '0' + dt.getSeconds())
+                );
+            },
+
+            exportExcel() {
+                let time = new Date();
+                let year = time.getFullYear();
+                let month = time.getMonth() + 1;
+                let day = time.getDate();
+                let name = year + '' + month + '' + day + '-公司红包账户';
+                var xlsxParam = { raw: true };
+                var wb = XLSX.utils.table_to_book(document.querySelector('#alldata'), xlsxParam);
+                var wbout = XLSX.write(wb, {
+                    bookType: 'xlsx',
+                    bookSST: true,
+                    type: 'array'
+                });
+                try {
+                    FileSaver.saveAs(new Blob([wbout], { type: 'application/octet-stream' }), name + '.xlsx');
+                } catch (e) {
+                    if (typeof console !== 'undefined') console.log(e, wbout);
+                }
+                return wbout;
+            },
+
+            // 获取数据
+            getData() {
+                if (this.radio) {
+                    this.query.flag = -1;
+                } else {
+                    this.query.flag = 0;
+                }
+                let params = {
+
+                    pageIndex: this.query.pageIndex - 1,
+                    pageSize: this.query.pageSize,
+                <#if classInfo.fieldList?exists && classInfo.fieldList?size gt 0>
+                <#list classInfo.fieldList as fieldItem >
+                ${fieldItem.fieldName}:this.query.${fieldItem.fieldName},
+                </#list>
+                </#if>
+                };
+                // https://blog.csdn.net/niuch1029291561/article/details/8190617
+                this.$axios
+                    .post(this._api + '${classInfo.className?uncap_first}/list', params, {
+                        headers: {
+                            token: this.$cookies.get('token'),
+                            'Content-Type': 'application/json;charset=utf-8' //头部信息
+                        }
+                    })
+                    .then((response) => {
+                    this.tableData = [];
+                // this.tableData = response.data.data.content;
+                // this.pageTotal = response.data.data.totalElements;
+
+                this.tableData =  response.data.content||response.data.data.content
+                this.pageTotal =response.data.totalElements|| response.data.data.totalElements
+
+                console.log(this.tableData);
+            })
+            .catch(function (error) {
+                    console.log(error);
+                });
+                let data={
+                <#if classInfo.fieldList?exists && classInfo.fieldList?size gt 0>
+                <#list classInfo.fieldList as fieldItem >
+                ${fieldItem.fieldName}:null,
+                </#list>
+                </#if>
+                    pageIndex: 0,
+                    pageSize: 100000,
+                }
+                this.$axios
+                    .post(
+                        this._api + '${classInfo.className?uncap_first}/list', data,
+                        {
+                            headers: {
+                                token: this.$cookies.get('token'),
+                                'Content-Type': 'application/json;charset=utf-8' //头部信息
+                            }
+                        }
+                    )
+                    .then((response) => {
+                    this.tableDataAll = [];
+                this.tableDataAll = response.data.content||response.data.data.content;
+            })
+            .catch(function (error) {
+                    console.log(error);
+                });
+            },
+            // 触发搜索按钮
+            handleSearch() {
+                this.$set(this.query, 'pageIndex', 1);
+                this.getData();
+            },
+
+            // 编辑操作
+            handleEdit(index, row) {
+                if (row.deleteFlag == 1) {
+                    this.$message.error('该单位不可用！');
+                } else {
+                    this.idx = index;
+                    this.form = row;
+                    this.editVisible = true;
+                }
+            },
+
+            // 保存编辑
+            saveEdit() {
+                if (this.form.companyRest < 0) {
+                    this.$message.error('账户余额不能小于0');
+                    this.getData();
+                    return false;
+                }
+                if (this.form.companyRest == '') {
+                    this.$message.error('账户余额不能为空');
+                    this.getData();
+                    return false;
+                }
+
+                let params = this.form;
+                this.$axios
+                    .post(this._api + '${classInfo.className?uncap_first}/save', params, {
+                        headers: {
+                            token: this.$cookies.get('token'),
+                            'Content-Type': 'application/json;charset=utf-8'
+                        } //头部信息
+                    })
+                    .then((response) => {
+                    if (response.data.port == '200') {
+                    this.$message.success('修改成功！');
+                    this.editVisible = false;
+                    this.getData();
+                } else {
+                    this.$message.error(response.data.msg);
+                }
+            })
+            .catch(function (error) {
+                    console.log(error);
+                });
+            },
+
+            // 分页导航
+            load(val) {
+                this.$set(this.query, 'pageIndex', val);
+                this.getData();
+            }
+        }
+    };
+</script>
+
+<style scoped>
+    .handle-box {
+        margin-bottom: 20px;
+    }
+
+    .handle-select {
+        width: 120px;
+    }
+
+    .handle-input {
+        width: 200px;
+        display: inline-block;
+    }
+    .table {
+        width: 100%;
+        font-size: 14px;
+    }
+    .red {
+        color: #ff0000;
+    }
+    .green {
+        color: green;
+    }
+    .grey {
+        color: grey;
+    }
+    .mr10 {
+        margin-right: 10px;
+    }
+    .table-td-thumb {
+        display: block;
+        margin: auto;
+        width: 40px;
+        height: 40px;
+    }
+</style>
diff --git a/generator-web/src/main/resources/templates/code-generator/ui/element-ui-starp.ftl b/generator-web/src/main/resources/templates/code-generator/ui/element-ui-starp.ftl
new file mode 100644
index 0000000..e859c3a
--- /dev/null
+++ b/generator-web/src/main/resources/templates/code-generator/ui/element-ui-starp.ftl
@@ -0,0 +1,350 @@
+<template>
+    <div>
+        <div class="crumbs">
+            <el-breadcrumb separator="/">
+                <el-breadcrumb-item> <i class="el-icon-lx-cascades"></i> 公司红包账户 </el-breadcrumb-item>
+            </el-breadcrumb>
+        </div>
+        <div class="container">
+            <div class="handle-box">
+                <el-button @click="exportExcel" type="primary" class="button" style="margin-right: 10px">导出数据</el-button>
+                <#if classInfo.fieldList?exists && classInfo.fieldList?size gt 0>
+                    <#list classInfo.fieldList as fieldItem >
+                        <el-input v-model="query.${fieldItem.fieldName}" placeholder="${fieldItem.fieldComment}" class="handle-input mr10"></el-input>
+
+                    </#list>
+                </#if>
+                <el-button type="primary" icon="el-icon-search" @click="handleSearch">搜索</el-button>
+            </div>
+
+            <el-table :data="tableDataAll" style="display: none" id="alldata">
+                <#if classInfo.fieldList?exists && classInfo.fieldList?size gt 0>
+                    <#list classInfo.fieldList as fieldItem >
+                        <el-table-column prop="${fieldItem.fieldName}" label="${fieldItem.fieldComment}"
+                                         align="center"></el-table-column>
+                    </#list>
+                </#if>
+
+            </el-table>
+
+            <el-table :data="tableData" border class="table" ref="multipleTable" header-cell-class-name="table-header">
+                <#if classInfo.fieldList?exists && classInfo.fieldList?size gt 0>
+                    <#list classInfo.fieldList as fieldItem >
+                        <el-table-column prop="${fieldItem.fieldName}" label="${fieldItem.fieldComment}"
+                                         align="center"></el-table-column>
+                    </#list>
+                </#if>
+                <el-table-column label="操作"  align="center">
+<#--                    v-if="scope.row.deleteFlag === 0"-->
+                    <template slot-scope="scope" >
+                        <el-button type="text" icon="el-icon-edit" @click="handleEdit(scope.$index, scope.row)">编辑</el-button>
+                    </template>
+                </el-table-column>
+            </el-table>
+            <div class="pagination">
+                <el-pagination
+                        background
+                        layout="prev, pager, next"
+                        :current-page="query.pageIndex"
+                        :page-size="query.pageSize"
+                        :total="pageTotal"
+                        @current-change="load"
+                >
+                </el-pagination>
+            </div>
+        </div>
+
+        <!-- 编辑弹出框 -->
+        <el-dialog title="编辑" :visible.sync="editVisible" width="30%">
+            <el-form ref="form" :rules="formRules" :model="form" label-width="70px">
+
+                <#if classInfo.fieldList?exists && classInfo.fieldList?size gt 0>
+                    <#list classInfo.fieldList as fieldItem >
+
+                        <el-form-item label="${fieldItem.fieldComment}" prop="${fieldItem.fieldName}">
+                            <el-input v-model="form.${fieldItem.fieldName}"></el-input>
+                        </el-form-item>
+                    </#list>
+                </#if>
+            </el-form>
+            <span slot="footer" class="dialog-footer">
+                <el-button
+                        @click="
+                        editVisible = false;
+                        getData();
+                    "
+                >取 消</el-button
+                >
+                <el-button type="primary" @click="saveEdit">确 定</el-button>
+            </span>
+        </el-dialog>
+    </div>
+</template>
+
+<script>
+    import FileSaver from 'file-saver';
+    import XLSX from 'xlsx';
+    export default {
+        name: '${classInfo.className}Table',
+        data() {
+            return {
+                tableName:"${classInfo.className?uncap_first}",
+                radio: false,
+                value: '选项1',
+                query: {
+            <#if classInfo.fieldList?exists && classInfo.fieldList?size gt 0>
+            <#list classInfo.fieldList as fieldItem >
+            ${fieldItem.fieldName}:null,
+            </#list>
+            </#if>
+                pageIndex: 1,
+                pageSize: 10
+                },
+                tableData: [],
+                tableDataAll: [],
+                multipleSelection: [],
+                delList: [],
+                editVisible: false,
+                pageTotal: 0,
+                form: {},
+
+                editVisible2: false,
+                formadmin: {},
+                passwordnew: '',
+                password: '',
+                idx: -1,
+                id: -1,
+                formRules: {
+                    companyRest: [{ required: true, message: '请输入红包账户余额', trigger: 'blur' }]
+                }
+            };
+        },
+        created() {
+            this.$axios
+                .get(this._api + 'admin/token', {
+                    params: {},
+                    headers: {
+                        token: this.$cookies.get('token'),
+                        'Content-Type': 'application/json;charset=utf-8' //头部信息
+                    }
+                })
+                .then((response) => {
+                if (response.data.port == '200') {
+                if (response.data.role != 'Superadmin') {
+                    this.$message.error('权限不足');
+                    this.$router.go(-1);
+                }
+
+                this.getData();
+            } else {
+                this.$message.error(response.data.msg);
+                this.$router.go(-1);
+            }
+        })
+        .catch(function (error) {
+                console.log(error);
+            });
+        },
+        methods: {
+            formatDate(row, column) {
+                // 获取单元格数据
+                let data = row[column.property];
+                let dt = new Date(data);
+                return (
+                    dt.getFullYear() +
+                    '-' +
+                    (dt.getMonth() + 1 > 9 ? dt.getMonth() + 1 : '0' + (dt.getMonth() + 1)) +
+                    '-' +
+                    (dt.getDate() > 9 ? dt.getDate() : '0' + dt.getDate()) +
+                    ' ' +
+                    (dt.getHours() > 9 ? dt.getHours() : '0' + dt.getHours()) +
+                    ':' +
+                    (dt.getMinutes() > 9 ? dt.getMinutes() : '0' + dt.getMinutes()) +
+                    ':' +
+                    (dt.getSeconds() > 9 ? dt.getSeconds() : '0' + dt.getSeconds())
+                );
+            },
+
+            exportExcel() {
+                let time = new Date();
+                let year = time.getFullYear();
+                let month = time.getMonth() + 1;
+                let day = time.getDate();
+                let name = year + '' + month + '' + day + '-公司红包账户';
+                var xlsxParam = { raw: true };
+                var wb = XLSX.utils.table_to_book(document.querySelector('#alldata'), xlsxParam);
+                var wbout = XLSX.write(wb, {
+                    bookType: 'xlsx',
+                    bookSST: true,
+                    type: 'array'
+                });
+                try {
+                    FileSaver.saveAs(new Blob([wbout], { type: 'application/octet-stream' }), name + '.xlsx');
+                } catch (e) {
+                    if (typeof console !== 'undefined') console.log(e, wbout);
+                }
+                return wbout;
+            },
+
+            // 获取数据
+            getData() {
+                if (this.radio) {
+                    this.query.flag = -1;
+                } else {
+                    this.query.flag = 0;
+                }
+                let params = {
+
+                    pageIndex: this.query.pageIndex - 1,
+                    pageSize: this.query.pageSize,
+                <#if classInfo.fieldList?exists && classInfo.fieldList?size gt 0>
+                <#list classInfo.fieldList as fieldItem >
+                ${fieldItem.fieldName}:this.query.${fieldItem.fieldName},
+                </#list>
+                </#if>
+                };
+                // https://blog.csdn.net/niuch1029291561/article/details/8190617
+                this.$axios
+                    .post(this._api + '${classInfo.className?uncap_first}/list', params, {
+                        headers: {
+                            token: this.$cookies.get('token'),
+                            'Content-Type': 'application/json;charset=utf-8' //头部信息
+                        }
+                    })
+                    .then((response) => {
+                    this.tableData = [];
+                // this.tableData = response.data.data.content;
+                // this.pageTotal = response.data.data.totalElements;
+
+                this.tableData =  response.data.content||response.data.data.content
+                this.pageTotal =response.data.totalElements|| response.data.data.totalElements
+
+                console.log(this.tableData);
+            })
+            .catch(function (error) {
+                    console.log(error);
+                });
+                let data={
+                <#if classInfo.fieldList?exists && classInfo.fieldList?size gt 0>
+                <#list classInfo.fieldList as fieldItem >
+                ${fieldItem.fieldName}:null,
+                </#list>
+                </#if>
+                    pageIndex: 0,
+                    pageSize: 100000,
+                }
+                this.$axios
+                    .post(
+                        this._api + '${classInfo.className?uncap_first}/list', data,
+                        {
+                            headers: {
+                                token: this.$cookies.get('token'),
+                                'Content-Type': 'application/json;charset=utf-8' //头部信息
+                            }
+                        }
+                    )
+                    .then((response) => {
+                    this.tableDataAll = [];
+                this.tableDataAll = response.data.content||response.data.data.content;
+            })
+            .catch(function (error) {
+                    console.log(error);
+                });
+            },
+            // 触发搜索按钮
+            handleSearch() {
+                this.$set(this.query, 'pageIndex', 1);
+                this.getData();
+            },
+
+            // 编辑操作
+            handleEdit(index, row) {
+                if (row.deleteFlag == 1) {
+                    this.$message.error('该单位不可用！');
+                } else {
+                    this.idx = index;
+                    this.form = row;
+                    this.editVisible = true;
+                }
+            },
+
+            // 保存编辑
+            saveEdit() {
+                if (this.form.companyRest < 0) {
+                    this.$message.error('账户余额不能小于0');
+                    this.getData();
+                    return false;
+                }
+                if (this.form.companyRest == '') {
+                    this.$message.error('账户余额不能为空');
+                    this.getData();
+                    return false;
+                }
+
+                let params = this.form;
+                this.$axios
+                    .post(this._api + '${classInfo.className?uncap_first}/save', params, {
+                        headers: {
+                            token: this.$cookies.get('token'),
+                            'Content-Type': 'application/json;charset=utf-8'
+                        } //头部信息
+                    })
+                    .then((response) => {
+                    if (response.data.port == '200') {
+                    this.$message.success('修改成功！');
+                    this.editVisible = false;
+                    this.getData();
+                } else {
+                    this.$message.error(response.data.msg);
+                }
+            })
+            .catch(function (error) {
+                    console.log(error);
+                });
+            },
+
+            // 分页导航
+            load(val) {
+                this.$set(this.query, 'pageIndex', val);
+                this.getData();
+            }
+        }
+    };
+</script>
+
+<style scoped>
+    .handle-box {
+        margin-bottom: 20px;
+    }
+
+    .handle-select {
+        width: 120px;
+    }
+
+    .handle-input {
+        width: 200px;
+        display: inline-block;
+    }
+    .table {
+        width: 100%;
+        font-size: 14px;
+    }
+    .red {
+        color: #ff0000;
+    }
+    .green {
+        color: green;
+    }
+    .grey {
+        color: grey;
+    }
+    .mr10 {
+        margin-right: 10px;
+    }
+    .table-td-thumb {
+        display: block;
+        margin: auto;
+        width: 40px;
+        height: 40px;
+    }
+</style>
-- 
Gitee


From feebe8899e6c282a87fd6157e2da8747cbf8d5ac Mon Sep 17 00:00:00 2001
From: starplatinum111 <5428527+starplatinum111@user.noreply.gitee.com>
Date: Sun, 22 May 2022 22:34:19 +0800
Subject: [PATCH 09/15] form

---
 .../system/generator/entity/FieldInfo.java    |   1 +
 .../system/generator/util/TableParseUtil.java |   1 +
 .../src/main/resources/template.json          |  10 +
 .../code-generator/jpa-starp/i-view-api.ftl   | 172 ++++++++
 .../code-generator/jpa-starp/i-view-form.ftl  | 390 ++++++++++++++++++
 .../code-generator/jpa-starp/i-view.ftl       | 384 +++++++++++++++++
 .../mybatis-plus/pluscontroller.ftl           |   4 +-
 7 files changed, 960 insertions(+), 2 deletions(-)
 create mode 100644 generator-web/src/main/resources/templates/code-generator/jpa-starp/i-view-api.ftl
 create mode 100644 generator-web/src/main/resources/templates/code-generator/jpa-starp/i-view-form.ftl
 create mode 100644 generator-web/src/main/resources/templates/code-generator/jpa-starp/i-view.ftl

diff --git a/generator-web/src/main/java/com/softdev/system/generator/entity/FieldInfo.java b/generator-web/src/main/java/com/softdev/system/generator/entity/FieldInfo.java
index 0b6e7fc..efbe9e5 100644
--- a/generator-web/src/main/java/com/softdev/system/generator/entity/FieldInfo.java
+++ b/generator-web/src/main/java/com/softdev/system/generator/entity/FieldInfo.java
@@ -13,6 +13,7 @@ public class FieldInfo {
 //    user_id 类似这样的字段 数据库的,不过如果数据库里不是下划线形式的,也不一定是这样
     private String columnName;
     private String fieldName;
+//    字段是 int 还是string 还是别的什么
     private String fieldClass;
     private String swaggerClass;
     private String fieldComment;
diff --git a/generator-web/src/main/java/com/softdev/system/generator/util/TableParseUtil.java b/generator-web/src/main/java/com/softdev/system/generator/util/TableParseUtil.java
index 58fe8ae..785bd5f 100644
--- a/generator-web/src/main/java/com/softdev/system/generator/util/TableParseUtil.java
+++ b/generator-web/src/main/java/com/softdev/system/generator/util/TableParseUtil.java
@@ -220,6 +220,7 @@ public class TableParseUtil {
                     }
                     // field class
                     // int(11) NOT NULL AUTO_INCREMENT COMMENT '用户ID',
+//                    字段是 int 还是string 还是别的什么
                     String fieldClass = Object.class.getSimpleName();
                     //2018-9-16 zhengk 补充char/clob/blob/json等类型，如果类型未知，默认为String
                     //2018-11-22 lshz0088 处理字段类型的时候，不严谨columnLine.contains(" int") 类似这种的，可在前后适当加一些空格之类的加以区分，否则当我的字段包含这些字符的时候，产生类型判断问题。
diff --git a/generator-web/src/main/resources/template.json b/generator-web/src/main/resources/template.json
index 902f517..ab06fd3 100644
--- a/generator-web/src/main/resources/template.json
+++ b/generator-web/src/main/resources/template.json
@@ -265,6 +265,16 @@
         "id": "103",
         "name": "starp-jpa-controller",
         "description": "jpacontroller"
+      },
+      {
+        "id": "104",
+        "name": "i-view",
+        "description": "i-view.ftl"
+      },
+      {
+        "id": "105",
+        "name": "i-view-api",
+        "description": "i-view-api"
       }
     ]
   },
diff --git a/generator-web/src/main/resources/templates/code-generator/jpa-starp/i-view-api.ftl b/generator-web/src/main/resources/templates/code-generator/jpa-starp/i-view-api.ftl
new file mode 100644
index 0000000..55fa7bb
--- /dev/null
+++ b/generator-web/src/main/resources/templates/code-generator/jpa-starp/i-view-api.ftl
@@ -0,0 +1,172 @@
+import request from "../utils/request";
+
+export function selectWriters(data) {
+return request({
+url: '/writer/selectWriters',
+data: data,
+method: 'POST'
+});
+}
+
+
+export function selectAll(data) {
+return request({
+url: '/${classInfo.className?uncap_first}/selectAll',
+data: data,
+method: 'POST'
+});
+}
+
+export function selectPage(data,pageNumber,pageSize) {
+return request({
+url: `/${classInfo.className?uncap_first}/selectPage?pageNumber=${r'${pageNumber}'}&pageSize=${r'${pageSize}'}`,
+data: data,
+method: 'POST'
+});
+}
+
+
+export function selectVerifyWriters(data) {
+return request({
+url: '/writer/selectVerifyWriters',
+data: data,
+method: 'POST'
+})
+}
+
+export function createWriter(data) {
+return request({
+url: '/writer',
+data: data,
+method: 'POST'
+})
+}
+export function create(data) {
+return request({
+url: '/${classInfo.className?uncap_first}',
+data: data,
+method: 'POST'
+})
+}
+
+
+export function updateWriter(data) {
+return request({
+url: '/writer',
+data: data,
+method: 'PUT'
+})
+}
+
+export function update(data) {
+return request({
+url: '/${classInfo.className?uncap_first}',
+data: data,
+method: 'PUT'
+})
+}
+
+
+export function uploadPhoto(wid, data) {
+return request({
+url: '/writer/upload/' + wid,
+data: data,
+method: 'POST'
+})
+}
+
+
+// export function uploadExcel(wid, excelData) {
+//   return request({
+//     url: '/writer/uploadExcel/' + wid,
+//     data: excelData,
+//     method: 'POST'
+//   })
+// }
+
+
+// export function uploadExcel(excelData) {
+//   return request({
+//     url: '/writer/uploadExcel' ,
+//     data: excelData,
+//     method: 'POST'
+//   })
+// }
+
+export function uploadExcelOfBodyComposition(excelData) {
+return request({
+url: '/bodyComposition/uploadExcel' ,
+data: excelData,
+method: 'POST'
+})
+}
+// BodyCompositionService
+
+export function deleteWriter(wid) {
+return request({
+url: '/writer/' + wid,
+method: 'DELETE'
+})
+}
+
+export function deleteOne(wid) {
+return request({
+url: '/${classInfo.className?uncap_first}/' + wid,
+method: 'DELETE'
+})
+}
+
+export function getWriterInfo(wid) {
+return request({
+url: '/writer/' + wid,
+method: 'GET'
+})
+}
+
+export function getInfo(wid) {
+return request({
+url: '/${classInfo.className?uncap_first}/' + wid,
+method: 'GET'
+})
+}
+
+export function batchInsertWriters(data) {
+return request({
+url: '/writer/batchInsert',
+data: data,
+method: 'POST'
+})
+}
+
+
+export function batchInsert(data) {
+return request({
+url: '/${classInfo.className?uncap_first}/batchInsert',
+data: data,
+method: 'POST'
+})
+}
+
+export function batchDelete(data) {
+return request({
+url: '/${classInfo.className?uncap_first}/batchDelete',
+data: data,
+method: 'POST'
+})
+}
+
+export function verifyWriter(data) {
+return request({
+url: '/writer/verify',
+method: 'POST',
+data: data
+})
+}
+
+export function exportToWord(wid) {
+return request({
+url: '/writer/exportToWord/' + wid,
+method: 'GET',
+responseType: 'blob'
+})
+}
diff --git a/generator-web/src/main/resources/templates/code-generator/jpa-starp/i-view-form.ftl b/generator-web/src/main/resources/templates/code-generator/jpa-starp/i-view-form.ftl
new file mode 100644
index 0000000..973e253
--- /dev/null
+++ b/generator-web/src/main/resources/templates/code-generator/jpa-starp/i-view-form.ftl
@@ -0,0 +1,390 @@
+<template>
+    <Form label-position="left" :label-width="120" :model="writerForm" ref="writerForm" :rules="ruleValidate">
+        <Row class="writer-form">
+            <Col span="12">
+            <#if classInfo.fieldList?exists && classInfo.fieldList?size gt 0>
+                <#list classInfo.fieldList as fieldItem >
+
+<#--                    <#if ${fieldItem.fieldClass}=='boolean' >-->
+<#--                      </#if>-->
+
+            <#if fieldItem.fieldClass=='boolean' >
+                <FormItem label="${fieldItem.fieldComment}" style="text-align: left" prop="${fieldItem.fieldName}">
+                    <RadioGroup v-model="writerForm.${fieldItem.fieldName}">
+                        <Radio label="是" border></Radio>
+                        <Radio label="否" border></Radio>
+                    </RadioGroup>
+                </FormItem>
+            </#if>
+
+<#--               <#elseif fieldItem.fieldClass!='boolean' >-->
+<#--              <FormItem label="${fieldItem.fieldComment}" prop="${fieldItem.fieldName}">-->
+<#--                        <Input placeholder="请输入${fieldItem.fieldComment}" v-model="writerForm.${fieldItem.fieldName}"/>-->
+<#--                    </FormItem>-->
+<#--            </#elseif>-->
+
+            <#if fieldItem.fieldClass!='boolean' >
+            <FormItem label="${fieldItem.fieldComment}" prop="${fieldItem.fieldName}">
+                <Input placeholder="请输入${fieldItem.fieldComment}" v-model="writerForm.${fieldItem.fieldName}"/>
+            </FormItem>
+            </#if>
+
+            <#if fieldItem.fieldClass=='java.util.Date' >
+                <FormItem label="${fieldItem.fieldComment}" prop="${fieldItem.fieldName}">
+                    <DatePicker type="date" placeholder="请选择${fieldItem.fieldComment}" v-model="writerForm.${fieldItem.fieldName}"></DatePicker>
+                </FormItem>
+            </#if>
+
+
+                </#list>
+
+            </#if>
+
+            </Col>
+            <Col span="12">
+            <!--        2021年9月18日10:00:46  mqp-->
+            <!--        action="//jsonplaceholder.typicode.com/posts/"-->
+            <Upload   action="//jsonplaceholder.typicode.com/posts/"  @change="changeExcel"  >
+                <Button icon="ios-cloud-upload-outline">Upload files</Button>
+            </Upload>
+
+
+            <FormItem label="头像">
+                <phone-upload @change="changePhoto" :image-url="writerForm.photo"></phone-upload>
+            </FormItem>
+            <!--          图片名字有了  现在 change-->
+            <!--        只是作为 保存图片用，没有用到 action-->
+
+            </Col>
+        </Row>
+
+        <FormItem :label-width="0">
+            <Button type="primary" style="margin-right: 20px" @click="commit">{{ editButton }}</Button>
+            <Button>重置</Button>
+        </FormItem>
+    </Form>
+</template>
+
+<script>
+    import {cityData} from "../../utils/cityData";
+    import PhoneUpload from "../upload/phone-upload";
+    import TeamSelect from "../input/team-select";
+    import FieldSelect from "../input/field-select";
+    import {createWriter, getWriterInfo, updateWriter, uploadPhoto,uploadExcel} from "../../api/writer";
+    import {formatDate} from "../../utils/common";
+    import FieldMultiSelect from "../input/field-multi-select";
+    import {validatorTel} from "../../utils/validate";
+
+    export default {
+        name: "writer-form",
+        components: {FieldMultiSelect, FieldSelect, TeamSelect, PhoneUpload},
+        props: {
+            wid: {
+                default: null
+            },
+            // 三种类型: 修改（update）、管理员添加（create）、用户注册（registerwr）
+            type: {
+                required: true,
+            }
+        },
+        // 父组件
+        beforeMount() {
+            window.parentMounted = this._isMounted	// _isMounted是当前实例mouned()是否执行 此时为false
+        },
+        created() {
+            if (!!this.wid) {
+                this.editButton = '确认修改';
+                this.writerForm.wid = this.wid;
+                this.init();
+                // 代码跳转 不是自己这个文件的代码吗
+                //   子组件在父组件数据加载完之后渲染 vue
+            } else {
+                this.editButton = '确认添加';
+                if (this.type === 'register') {
+                    this.writerForm.telephone = this.$store.state.user.telephone;
+                    this.writerForm.teamId = this.$store.state.user.teamId;
+                } else {
+                    this.writerForm.teamId = 4;
+                }
+
+                // console.log("writer-form create ")
+                // console.log( "this.writerForm.teamId")
+                // console.log( this.writerForm.teamId)
+                // console.log("================")
+            }
+            console.log("writer-form create ")
+            console.log( "this.writerForm.teamId")
+            console.log( this.writerForm.teamId)
+            console.log("================")
+        },
+        computed: {
+            chinaWriter: {
+                get() {
+                    return this.writerForm.chinaWriter ? '是' : '否'
+                },
+                set(val) {
+                    this.writerForm.chinaWriter = val === '是'
+                }
+            },
+            xinheWriter: {
+                get() {
+                    return this.writerForm.xinheWriter ? '是' : '否'
+                },
+                set(val) {
+                    this.writerForm.xinheWriter = val === '是'
+                }
+            },
+            nativePlace: {
+                get() {
+                    if (!!this.writerForm.nativePlace) {
+                        return this.writerForm.nativePlace.split(' ')
+                    } else {
+                        return []
+                    }
+                },
+                set(val) {
+                    this.writerForm.nativePlace = val.join(' ')
+                }
+            }
+        },
+        data() {
+            return {
+                editButton: '',
+                cityData: cityData,
+                writerForm: {
+                    wid: null,
+                    name: '',
+                    penName: '',
+                    commonName: '',
+                    sex: '',
+                    idNumber: '',
+                    nation: '',
+                    teamId: null,
+                    joinDate: formatDate(new Date()),
+                    nativePlace: '',
+                    category: '',
+                    education: '',
+                    political: '',
+                    jobTitle: '',
+                    jobLevel: '',
+                    workUnit: '',
+                    workPost: '',
+                    unitNative: '',
+                    socialJob: '',
+                    homeAddress: '',
+                    unitAddress: '',
+                    telephone: '',
+                    unitPhone: '',
+                    homePhone: '',
+                    postcode: '',
+                    qq: '',
+                    wechat: '',
+                    email: '',
+                    awards: '',
+                    photo: '',
+                    experience: '',
+                    status: '',
+                    remark: ''
+                },
+                ruleValidate: {
+                    name: [
+                        {required: true, message: '姓名不能为空', trigger: 'change'},
+                        {required: true, message: '姓名不能为空', trigger: 'blur'}
+                    ],
+                    email: [
+                        {type: 'email', message: '邮箱错误', trigger: 'blur'},
+                    ],
+                    idNumber: [
+                        // {required: true, message: '身份证不能为空', trigger: 'change'},
+                        // {required: true, message: '身份证不能为空', trigger: 'blur'}
+                        {required: false, message: '身份证不能为空', trigger: 'change'},
+                        {required: false, message: '身份证不能为空', trigger: 'blur'}
+                    ],
+                    nation: [
+                        // {required: true, message: '民族不能为空', trigger: 'blur'},
+                        //   {required: true, message: '民族不能为空', trigger: 'change'},
+                        {required: false, message: '民族不能为空', trigger: 'blur'},
+                        {required: false, message: '民族不能为空', trigger: 'change'}
+
+                    ],
+                    sex: [
+                        {required: true, message: '请选择性别', trigger: 'change'}
+                    ],
+                    telephone: [
+                        {required: true, validator: validatorTel, trigger: 'blur'},
+                    ],
+                    /*teamId: [
+                      {required: true, message: '请选择你要加入的团体', trigger: 'change'}
+                    ],*/
+                    /* joinDate: [
+                      {required: true, message: '请输入加入团体日期', trigger: 'blur', type: 'date'}
+                    ], */
+                    category: [
+                        // {required: true, message: '请选择申报门类信息', trigger: 'change'}
+                        {required: false, message: '请选择申报门类信息', trigger: 'change'}
+                    ],
+                    political: [
+                        // {required: true, message: '请选择政治面貌', trigger: 'change'}
+                        {required: false, message: '请选择政治面貌', trigger: 'change'}
+                    ],
+                    workUnit: [
+                        // {required: true, message: '请输入工作单位', trigger: 'blur'}
+                        {required: false, message: '请输入工作单位', trigger: 'blur'}
+                    ],
+                    workPost: [
+                        // {required: true, message: '请输入单位性质', trigger: 'blur'}
+                        {required: false, message: '请输入单位性质', trigger: 'blur'}
+                    ],
+                    unitNative: [
+                        // {required: true, message: '请输入工作职务', trigger: 'blur'}
+                        {required: false, message: '请输入工作职务', trigger: 'blur'}
+                    ],
+                    awards: [
+                        // {required: true, message: '请输入获奖情况及作品影响', trigger: 'blur'}
+                        {required: false, message: '请输入获奖情况及作品影响', trigger: 'blur'}
+                    ]
+                },
+                photoData: null,
+                excelData:null,
+                statusList: [
+                    {value: '1', label: '正常'},
+                    {value: '2', label: '离世'},
+                    {value: '3', label: '转出'},
+                    {value: '4', label: '退会'}
+                ]
+            }
+        },
+        methods: {
+            init() {
+                this.getWriterInfo();
+            },
+            getWriterInfo() {
+                // 有wid 的话
+                let that=this
+                if (!!this.writerForm.wid) {
+                    let address= window.localStorage.getItem("address");
+                    console.log("address")
+                    console.log(address)
+                    getWriterInfo(this.writerForm.wid).then(res => {
+                        this.writerForm = res.data.data;
+                    console.log(" this.writerForm")
+                    console.log( this.writerForm)
+                    if( !!this.writerForm.photo&&this.writerForm.photo!==null&&this.writerForm.photo!==undefined){
+                        console.log("this.writerForm.photo")
+                        console.log(this.writerForm.photo)
+                        this.writerForm.photo=  this.writerForm.photo.replace(/localhost:8088/,address)
+                        console.log("修改之后")
+                        console.log("this.writerForm.photo")
+                        console.log(this.writerForm.photo)
+                    }
+
+                    // console.log(" this.writerForm")
+                    // console.log( this.writerForm)
+                    // console.log('this.writerForm')
+                    // console.log(this.writerForm)
+                    console.log("start===============start")
+                    console.log("getWriterInfo")
+                    console.log("this.writerForm.teamId")
+                    console.log(this.writerForm.teamId)
+                    console.log("================")
+                    // 有时候显示协会 有时候不显示
+                    // this.photo = res.data.data.photo;
+                    //   console.log(  "this.photo ")
+                    //   console.log(  this.photo )
+                    // 这个回调貌似晚了
+                    window.parentMounted = that._isMounted	// _isMounted是当前实例mouned()是否执行 此时为true
+                })
+                }
+            },
+            updateWriter() {
+                this.$refs['writerForm'].validate(valid => {
+                    if (valid) {
+                        updateWriter(this.handleWriterData()).then(() => {
+                            this.$Message.success('修改成功');
+                        this.updateWriterPhoto();
+                        // 2021年9月18日10:22:56  mqp
+                        this.  updateWriterExcel();
+                        this.init();
+                    })
+                    } else {
+                        return false;
+            }
+            })
+            },
+            createWriter() {
+                this.$refs['writerForm'].validate(valid => {
+                    if (valid) {
+                        createWriter(this.handleWriterData()).then(res => {
+                            this.$Message.success('添加成功');
+                        this.writerForm.wid = res.data.data;
+                        this.updateWriterPhoto();
+                        this.init();
+
+                        if (this.type === 'register') {
+                            this.$store.dispatch('user/getLoginInfo').then(() => {})
+                        }
+                    })
+                    } else {
+                        return false;
+            }
+            })
+            },
+            updateWriterPhoto() {
+                if (!!this.photoData) {
+                    uploadPhoto(this.writerForm.wid, this.photoData).then(() => {
+                        // 失败提示，成功不进行提示
+                        // uploadExcel
+                    })
+                }
+            },
+
+            // uploadFile(file) {
+            //   if (!!this.photoData) {
+            //     uploadPhoto(this.writerForm.wid, this.photoData).then(() => {
+            //       // 失败提示，成功不进行提示
+            //       uploadExcel
+            //     })
+            //   }
+            // },
+
+            updateWriterExcel() {
+                if (!!this.excelData) {
+                    uploadExcel(this.excelData).then(() => {
+                        // 失败提示，成功不进行提示
+                        // uploadExcel
+                    })
+                }
+            },
+            commit() {
+                if (!!this.wid) {
+                    this.updateWriter();
+                } else {
+                    this.createWriter();
+                }
+            },
+            // 处理添加和修改作家的信息
+            handleWriterData() {
+                this.writerForm.joinDate = formatDate(this.writerForm.joinDate);
+                return this.writerForm;
+            },
+            // 什么时候 取得名字
+            changePhoto(data) {
+                this.photoData = data;
+            },
+            changeExcel(excelData) {
+                this.excelData = excelData;
+            }
+        }
+    }
+</script>
+
+<style scoped>
+    .writer-form /deep/ .ivu-form-item {
+        width: 80%;
+    }
+
+    .experience-form /deep/ .ivu-form-item {
+        width: 90%;
+    }
+
+</style>
diff --git a/generator-web/src/main/resources/templates/code-generator/jpa-starp/i-view.ftl b/generator-web/src/main/resources/templates/code-generator/jpa-starp/i-view.ftl
new file mode 100644
index 0000000..47ae6d0
--- /dev/null
+++ b/generator-web/src/main/resources/templates/code-generator/jpa-starp/i-view.ftl
@@ -0,0 +1,384 @@
+<template>
+    <div>
+        <layout-content>
+            <div slot="main">
+                <!--查询-->
+                <Form label-position="right" :label-width="120">
+                    <Row>
+
+                        <#if classInfo.fieldList?exists && classInfo.fieldList?size gt 0>
+                            <#list classInfo.fieldList as fieldItem >
+                                <Col span="8">
+                                <FormItem label="${fieldItem.fieldComment} ：">
+                                    <Input v-model="select.${fieldItem.fieldName}"/>
+                                </FormItem>
+                                </Col>
+
+                            </#list>
+
+                        </#if>
+                        <Col>
+                        <FormItem :label-width="0">
+                            <div style="float: right">
+                                <Button type="primary" icon="ios-search" style="margin-right: 10px" @click="selectWriters">查询</Button>
+                                <Button
+                                        type="primary"
+                                        icon="ios-download-outline"
+                                        style="margin-right: 10px"
+                                        @click="exportToExcel"
+                                        :loading="exportLoading">导出
+                                </Button>
+                                <Button @click="reset" style="margin-right: 10px">重置</Button>
+                                <span class="scale" v-if="spread" @click="spread = !spread">收起<Icon type="ios-arrow-up"/></span>
+                                <span class="scale" v-if="!spread" @click="spread = !spread">展开<Icon type="ios-arrow-down"/></span>
+                            </div>
+                        </FormItem>
+                        </Col>
+                    </Row>
+                </Form>
+                <div style="margin-bottom: 20px;">
+                    <Button icon="md-add" type="primary" @click="handleAdd" style="margin-right: 20px" ghost>添加作家</Button>
+                    <Button icon="md-trash" type="error" @click="handleBatchDelete" ghost>批量删除</Button>
+                    <RadioGroup v-model="display" type="button" button-style="solid" style="float: right;">
+                        <Radio label="平铺"></Radio>
+                        <Radio label="列表"></Radio>
+                    </RadioGroup>
+                    <div style="float: right; margin: 5px 30px 5px 0">筛选中国作协会员：
+                        <i-switch v-model="filterChinaWriter" @change="selectWriters">
+                            <span slot="open">开</span>
+                            <span slot="close">关</span>
+                        </i-switch>
+                    </div>
+                    <div style="float: right; margin: 5px 30px 5px 0">屏蔽不再联系的作家：
+                        <i-switch v-model="status" @change="selectWriters">
+                            <span slot="open">开</span>
+                            <span slot="close">关</span>
+                        </i-switch>
+                    </div>
+                </div>
+                <template v-if="display === '平铺'">
+<#--                    <Row>-->
+<#--                        <Col span="8" v-for="writer of allList" style="padding: 10px">-->
+<#--                        <writer-info-card :info="writer"></writer-info-card>-->
+<#--                        </Col>-->
+<#--                    </Row>-->
+                </template>
+                <template v-if="display === '列表'">
+                    <Table :columns="columns" :data="allList" ref="selection" :loading="searchLoading">
+                        <!--              这么离谱 这里不用配置列表项-->
+                        <!--              配置在 columns-->
+<#--                        <template slot-scope="{ row,index }" slot="name">-->
+<#--                            <!--                  <Button @click="handleUpdate(index)" >{{row.name}}</Button>&ndash;&gt;-->
+
+<#--                            <div  @click="handleUpdate(index)">{{row.name}}</div>-->
+<#--                        </template>-->
+<#--                        <template slot-scope="{ row,index }" slot="state">-->
+<#--                            <Tag color="red" v-if="row.status === '2'">离世</Tag>-->
+<#--                            <Tag color="red" v-if="row.status === '3'">转出</Tag>-->
+<#--                            <Tag color="red" v-if="row.status === '4'">退会</Tag>-->
+<#--                            <state-tag v-if="row.status === '1'" :state="row.verify ? row.verify.verifyState : null"/>-->
+<#--                        </template>-->
+<#--                        <template slot-scope="{ row,index }" slot="chinaWriter">-->
+<#--                            <Tag color="green" v-if="row.chinaWriter">是</Tag>-->
+<#--                            <Tag color="red" v-else>否</Tag>-->
+<#--                        </template>-->
+                        <template slot-scope="{ row, index }" slot="action">
+                            <Button type="text" size="small" style="margin-right: 10px; color: #2d8cf0" @click="handleUpdate(index)">
+                                修改
+                            </Button>
+                            <Divider type="vertical"/>
+                            <Button type="text" size="small" style="margin-right: 10px; color: #2d8cf0" @click="exportToWord(index)">
+                                导出
+                            </Button>
+                            <Divider type="vertical"/>
+                            <Button type="text" size="small" style="margin-right: 10px; color: #ed4014" @click="handleDelete(index)">
+                                删除
+                            </Button>
+                        </template>
+                    </Table>
+                </template>
+                <div style="margin: 20px; text-align: center">
+                    <Page :current="select.pageNum" :total="total" :page-size="select.pageSize"
+                          show-elevator @on-change="pageChange" show-total/>
+                </div>
+                <!--        898 total 每页是 10？ 这样是 89页， 每页是9 那要90页啊 都不是。。 不对啊 898/10==89...8 那确实要90页 -->
+                <!--        那 数据不是少了吗  显示 是每页只有9个 啊 -->
+            </div>
+        </layout-content>
+        <Modal v-model="del.modal" width="360" class-name="vertical-center-modal">
+            <p slot="header" style="color:#f60;text-align:center">
+                <Icon type="ios-information-circle"/>
+                <span>删除警告</span>
+            </p>
+            <div style="text-align:center">
+                <p>{{ del.title }}</p>
+                <p style="color: #ed4014">(删除作家信息时会删除其作品和专辑信息)</p>
+            </div>
+            <div slot="footer">
+                <Button @click="del.modal = false">取消</Button>
+                <Button type="error" :loading="del.loading" @click="deleteWriter">删除</Button>
+            </div>
+        </Modal>
+    </div>
+</template>
+
+<script>
+    import LayoutContent from "../../components/layout/layout-content";
+    // import {batchDelete, deleteWriter, exportToWord, selectWriters} from "../../api/writer";
+    import {batchDelete, deleteOne, exportToWord,selectAll,selectPage} from "../../api/${classInfo.className?uncap_first}";
+    // import {batchDelete, deleteWriter, exportToWord, selectWriters} from "../../api/writer";
+    import WriterInfoCard from "../../components/card/writer-info-card";
+    import FieldSelect from "../../components/input/field-select";
+    import TeamSelect from "../../components/input/team-select";
+    import {export2Excel} from "../../utils/excel";
+    import {writerColumns} from "../../utils/dictData";
+    import {resetDict} from "../../utils/common";
+    import StateTag from "../../components/tag/state-tag";
+    import { mapGetters } from "vuex";
+    // https://www.cnblogs.com/aidixie/p/14980957.html
+    export default {
+        name: "writer-manage",
+        components: {StateTag, TeamSelect, FieldSelect, WriterInfoCard, LayoutContent},
+
+        beforeDestroy: function () {
+            window.removeEventListener('resize', this.handleResize)
+        },
+
+        // https://blog.csdn.net/Little_Pig_Bug/article/details/88408445
+        data() {
+            return {
+                spread: true,
+                fullWidth:document.documentElement.clientWidth,
+
+                select: {
+                    <#if classInfo.fieldList?exists && classInfo.fieldList?size gt 0>
+                    <#list classInfo.fieldList as fieldItem >
+            ${fieldItem.fieldName}: '',
+                </#list>
+
+                </#if>
+
+                pageNum: 1,
+                pageSize: 10
+
+                    // 会 显示9个 是因为他吗 不是因为后台
+                    // 确实有问题 ，这里要写10个 ，才是正常的诶
+                    // 那个控件要改掉他 每页的个数吧
+                    // 只有 90页  这样显示不全的吧
+                    // 只要给 total 就可以工作了吧
+                },
+                status:0,
+                display: '列表',
+                writerList: [],
+                columns: [
+                    {
+                        type: 'selection',
+                        width: 60,
+                        align: 'center'
+                    },
+                    {
+                        type: 'index',
+                        width: 60,
+                        align: 'center'
+                    },
+
+            <#if classInfo.fieldList?exists && classInfo.fieldList?size gt 0>
+            <#list classInfo.fieldList as fieldItem >
+                {
+                    title: '${fieldItem.fieldComment}',
+                    key: '${fieldItem.fieldName}',
+                  //  slot:"${fieldItem.fieldName}",
+                    // 这里要配置 slot 才能被抓到
+                    width: 100
+                },
+                </#list>
+
+                </#if>
+
+                    {
+                        title: '操作',
+                        slot: 'action',
+                        fixed: 'right',
+                        width: 240,
+                        align: 'center'
+                    }
+
+                ],
+                total: 0,
+                allList:[],
+                searchLoading: false,
+                exportLoading: false,
+                del: {
+                    loading: false,
+                    modal: false,
+                    index: 0,
+                    type: '',
+                    title: '',
+                    widList: []
+                },
+                statusList: [
+                    {value: '1', label: '正常'},
+                    {value: '2', label: '离世'},
+                    {value: '3', label: '转出'},
+                    {value: '4', label: '退会'}
+                ]
+            }
+        },
+        created() {
+            // this.selectWriters();
+            // this.selectAll();
+            this.selectPage()
+            window.addEventListener('resize', this.handleResize)
+        },
+        computed: {
+            ...mapGetters([
+                'isCollapse',
+            ]),
+            rightWidth(){
+                let leftWidth = this.isCollapse ? '64' : '200';
+                console.log(this.fullWidth)
+                return (this.fullWidth-leftWidth)+'px'
+            },
+
+            filterChinaWriter: {
+                get() {
+                    return false;
+                },
+                set(val) {
+                    this.select.chinaWriter = val ? 1 : null;
+                }
+            }
+        },
+        methods: {
+
+            selectPage() {
+                this.searchLoading = true;
+                selectPage(this.select,this.select.pageNum,
+                    this.select.pageSize).then(res => {
+                    // this.writerList = res.data.data.list;
+                    // this.allList = res.data.data.list;
+                    this.allList = res.data.data.list||res.data.data;
+                this.total = res.data.data.total;
+                this.searchLoading = false;
+            })
+            },
+
+            handleResize (event) {
+                this.fullWidth = document.documentElement.clientWidth
+            },
+            handleAdd() {
+                // this.$router.push({name: 'WriterInfoEdit'});
+                this.$router.push({name: '${classInfo.className}InfoEdit'});
+            },
+            handleUpdate(index) {
+                // this.$router.push({name: 'WriterInfoEdit', query: {wid: this.writerList[index].wid}});
+                this.$router.push({name: '${classInfo.className}InfoEdit', query: {id: this.allList[index].id}});
+            },
+            handleDelete(index) {
+                this.del.index = index;
+                this.del.title = '您确定要删除该作家吗？';
+                this.del.type = 'delete';
+                this.del.modal = true;
+            },
+            handleBatchDelete() {
+                let selectList = this.$refs.selection.getSelection();
+                if (selectList.length === 0) {
+                    this.$Message.error('请选择要删除的作家');
+                    return;
+                }
+                this.del.widList.splice(0, this.del.widList.length);
+                for (let item of selectList) {
+                    this.del.widList.push(item.wid);
+                }
+                this.del.modal = true;
+                this.del.title = '您确定要批量删除这些作家吗？';
+                this.del.type = 'batchDelete';
+            },
+            deleteWriter() {
+                if (this.del.type === 'delete') {
+                    deleteWriter(this.writerList[this.del.index].wid).then(() => {
+                        this.$Message.success('删除成功');
+                    this.del.loading = false;
+                    this.del.modal = false;
+                    // 删除了自己的用户信息, 刷新一下个人信息
+                    if (this.writerList[this.del.index].telephone === this.$store.state.user.telephone) {
+                        this.$store.dispatch('user/getLoginInfo').then(() => {})
+                    }
+
+                    this.selectWriters();
+                })
+                } else if (this.del.type === 'batchDelete') {
+                    batchDelete(this.del.widList).then(() => {
+                        this.$Message.success('删除成功');
+                    this.del.loading = false;
+                    this.del.modal = false;
+                    this.selectWriters();
+                })
+                }
+            },
+            selectWriters() {
+                this.searchLoading = true;
+                selectWriters(this.select).then(res => {
+                    this.writerList = res.data.data.list;
+                this.total = res.data.data.total;
+                this.searchLoading = false;
+            })
+            },
+
+            selectAll() {
+                this.searchLoading = true;
+                selectAll(this.select).then(res => {
+                    // this.writerList = res.data.data.list;
+                    this.allList = res.data.data.list;
+                this.total = res.data.data.total;
+                this.searchLoading = false;
+            })
+            },
+            // 下面选中了 哪个page  一共有90页
+            pageChange(index) {
+                this.select.pageNum = index;
+                this.selectWriters();
+            },
+            exportToExcel() {
+                this.select.pageSize = 99999;
+                this.exportLoading = true;
+                selectWriters(this.select).then(res => {
+                    export2Excel(writerColumns, res.data.data.list, '作家查询下载结果');
+                this.select.pageSize = 9;
+                this.exportLoading = false;
+            })
+            },
+            exportToWord(index) {
+                exportToWord(this.writerList[index].wid).then(res => {
+                    const a = document.createElement('a');
+                let blob = new Blob([res.data],{type: 'application/msword'});
+                const link = document.createElement('a');
+                let fName = this.writerList[index].name;
+                link.href = URL.createObjectURL(blob);
+                link.style.display = 'none';
+                link.setAttribute('download', fName);
+                document.body.appendChild(link);
+                link.click();
+                document.body.removeChild(link);
+            })
+            },
+            // 重置查询
+            reset() {
+                resetDict(this.select);
+            },
+            changeSelectTeamId(val) {
+                this.select.teamId = val;
+            }
+        }
+    }
+</script>
+
+<style scoped>
+    .scale {
+        color: #2d8cf0;
+    }
+
+    .scale:hover {
+        cursor: pointer;
+    }
+</style>
diff --git a/generator-web/src/main/resources/templates/code-generator/mybatis-plus/pluscontroller.ftl b/generator-web/src/main/resources/templates/code-generator/mybatis-plus/pluscontroller.ftl
index f18e442..6e55603 100644
--- a/generator-web/src/main/resources/templates/code-generator/mybatis-plus/pluscontroller.ftl
+++ b/generator-web/src/main/resources/templates/code-generator/mybatis-plus/pluscontroller.ftl
@@ -152,10 +152,10 @@ public class ${classInfo.className}Controller {
     */
     @PostMapping("/execute")
     public Object execute(){
-        return ${returnUtilSuccess};
+        return ${returnUtilSuccess}("成功");
     }
 }
-}
+
 
 
 
-- 
Gitee


From 2d45d3263df05affe1b1960ed0f471e41e80fb67 Mon Sep 17 00:00:00 2001
From: starplatinum111 <5428527+starplatinum111@user.noreply.gitee.com>
Date: Thu, 16 Jun 2022 14:27:38 +0800
Subject: [PATCH 10/15] to iot

---
 .../templates/code-generator/jpa-starp/i-view.ftl    | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/generator-web/src/main/resources/templates/code-generator/jpa-starp/i-view.ftl b/generator-web/src/main/resources/templates/code-generator/jpa-starp/i-view.ftl
index 47ae6d0..a769ba7 100644
--- a/generator-web/src/main/resources/templates/code-generator/jpa-starp/i-view.ftl
+++ b/generator-web/src/main/resources/templates/code-generator/jpa-starp/i-view.ftl
@@ -36,6 +36,18 @@
                         </Col>
                     </Row>
                 </Form>
+
+                <div v-for="item in allList">
+                    <#if classInfo.fieldList?exists && classInfo.fieldList?size gt 0>
+                        <#list classInfo.fieldList as fieldItem >
+<#--                            {{item.${fieldItem.fieldComment}}}-->
+<#--                            {{${fieldItem.fieldComment}}}-->
+                            ${fieldItem.fieldComment}:
+                            {{item.${fieldItem.fieldName}}}
+                        </#list>
+
+                    </#if>
+                </div>
                 <div style="margin-bottom: 20px;">
                     <Button icon="md-add" type="primary" @click="handleAdd" style="margin-right: 20px" ghost>添加作家</Button>
                     <Button icon="md-trash" type="error" @click="handleBatchDelete" ghost>批量删除</Button>
-- 
Gitee


From 6a62c2659f509869bd2c10f8c2db4bf5143a9890 Mon Sep 17 00:00:00 2001
From: starplatinum111 <5428527+starplatinum111@user.noreply.gitee.com>
Date: Fri, 17 Jun 2022 15:59:16 +0800
Subject: [PATCH 11/15] ources/templates/code-generator/ui/element-ui-starp.ftl

---
 .../code-generator/jpa-starp/i-view.ftl       |   9 +-
 .../code-generator/jpa-starp/i-viewReq.ftl    | 400 ++++++++++++++++++
 .../mybatis-plus/pluscontroller.ftl           |  29 ++
 .../mybatis-plus/plusentity.ftl               |   1 +
 .../mybatis-plus/plusmapper.ftl               |   3 +-
 .../mybatis-plus/plusservice.ftl              |  10 +
 .../code-generator/util/beanutil.ftl          |  10 +
 .../templates/code-generator/util/json.ftl    |  27 ++
 8 files changed, 486 insertions(+), 3 deletions(-)
 create mode 100644 generator-web/src/main/resources/templates/code-generator/jpa-starp/i-viewReq.ftl

diff --git a/generator-web/src/main/resources/templates/code-generator/jpa-starp/i-view.ftl b/generator-web/src/main/resources/templates/code-generator/jpa-starp/i-view.ftl
index a769ba7..ddb3b73 100644
--- a/generator-web/src/main/resources/templates/code-generator/jpa-starp/i-view.ftl
+++ b/generator-web/src/main/resources/templates/code-generator/jpa-starp/i-view.ftl
@@ -137,7 +137,10 @@
 <script>
     import LayoutContent from "../../components/layout/layout-content";
     // import {batchDelete, deleteWriter, exportToWord, selectWriters} from "../../api/writer";
-    import {batchDelete, deleteOne, exportToWord,selectAll,selectPage} from "../../api/${classInfo.className?uncap_first}";
+    <#--import {batchDelete, deleteOne, exportToWord,selectAll,selectPage} from "../../api/${classInfo.className?uncap_first}";-->
+    <#--import {batchDelete, deleteOne, exportToWord,selectAll,selectPage} from "../../api/${classInfo.className?uncap_first}";-->
+    // import {batchDelete, deleteOne, exportToWord,selectAll,selectPage} from "../../utils/request";
+    import {batchDelete, deleteOne,selectAll,selectPage} from "../../utils/request";
     // import {batchDelete, deleteWriter, exportToWord, selectWriters} from "../../api/writer";
     import WriterInfoCard from "../../components/card/writer-info-card";
     import FieldSelect from "../../components/input/field-select";
@@ -159,6 +162,7 @@
         // https://blog.csdn.net/Little_Pig_Bug/article/details/88408445
         data() {
             return {
+                urlRoot:"${classInfo.className?uncap_first}",
                 spread: true,
                 fullWidth:document.documentElement.clientWidth,
 
@@ -266,7 +270,8 @@
             selectPage() {
                 this.searchLoading = true;
                 selectPage(this.select,this.select.pageNum,
-                    this.select.pageSize).then(res => {
+                    // this.select.pageSize).then(res => {
+                    this.select.pageSize,this.urlRoot).then(res => {
                     // this.writerList = res.data.data.list;
                     // this.allList = res.data.data.list;
                     this.allList = res.data.data.list||res.data.data;
diff --git a/generator-web/src/main/resources/templates/code-generator/jpa-starp/i-viewReq.ftl b/generator-web/src/main/resources/templates/code-generator/jpa-starp/i-viewReq.ftl
new file mode 100644
index 0000000..8c45be4
--- /dev/null
+++ b/generator-web/src/main/resources/templates/code-generator/jpa-starp/i-viewReq.ftl
@@ -0,0 +1,400 @@
+<template>
+    <div>
+        <layout-content>
+            <div slot="main">
+                <!--查询-->
+                <Form label-position="right" :label-width="120">
+                    <Row>
+
+                        <#if classInfo.fieldList?exists && classInfo.fieldList?size gt 0>
+                            <#list classInfo.fieldList as fieldItem >
+                                <Col span="8">
+                                <FormItem label="${fieldItem.fieldComment} ：">
+                                    <Input v-model="select.${fieldItem.fieldName}"/>
+                                </FormItem>
+                                </Col>
+
+                            </#list>
+
+                        </#if>
+                        <Col>
+                        <FormItem :label-width="0">
+                            <div style="float: right">
+                                <Button type="primary" icon="ios-search" style="margin-right: 10px" @click="selectWriters">查询</Button>
+                                <Button
+                                        type="primary"
+                                        icon="ios-download-outline"
+                                        style="margin-right: 10px"
+                                        @click="exportToExcel"
+                                        :loading="exportLoading">导出
+                                </Button>
+                                <Button @click="reset" style="margin-right: 10px">重置</Button>
+                                <span class="scale" v-if="spread" @click="spread = !spread">收起<Icon type="ios-arrow-up"/></span>
+                                <span class="scale" v-if="!spread" @click="spread = !spread">展开<Icon type="ios-arrow-down"/></span>
+                            </div>
+                        </FormItem>
+                        </Col>
+                    </Row>
+                </Form>
+
+                <div v-for="item in allList">
+                    <#if classInfo.fieldList?exists && classInfo.fieldList?size gt 0>
+                        <#list classInfo.fieldList as fieldItem >
+<#--                            {{item.${fieldItem.fieldComment}}}-->
+<#--                            {{${fieldItem.fieldComment}}}-->
+                            ${fieldItem.fieldComment}:
+                            {{item.${fieldItem.fieldName}}}
+                        </#list>
+
+                    </#if>
+                </div>
+                <div style="margin-bottom: 20px;">
+                    <Button icon="md-add" type="primary" @click="handleAdd" style="margin-right: 20px" ghost>添加作家</Button>
+                    <Button icon="md-trash" type="error" @click="handleBatchDelete" ghost>批量删除</Button>
+                    <RadioGroup v-model="display" type="button" button-style="solid" style="float: right;">
+                        <Radio label="平铺"></Radio>
+                        <Radio label="列表"></Radio>
+                    </RadioGroup>
+                    <div style="float: right; margin: 5px 30px 5px 0">筛选中国作协会员：
+                        <i-switch v-model="filterChinaWriter" @change="selectWriters">
+                            <span slot="open">开</span>
+                            <span slot="close">关</span>
+                        </i-switch>
+                    </div>
+                    <div style="float: right; margin: 5px 30px 5px 0">屏蔽不再联系的作家：
+                        <i-switch v-model="status" @change="selectWriters">
+                            <span slot="open">开</span>
+                            <span slot="close">关</span>
+                        </i-switch>
+                    </div>
+                </div>
+                <template v-if="display === '平铺'">
+<#--                    <Row>-->
+<#--                        <Col span="8" v-for="writer of allList" style="padding: 10px">-->
+<#--                        <writer-info-card :info="writer"></writer-info-card>-->
+<#--                        </Col>-->
+<#--                    </Row>-->
+                </template>
+                <template v-if="display === '列表'">
+                    <Table :columns="columns" :data="allList" ref="selection" :loading="searchLoading">
+                        <!--              这么离谱 这里不用配置列表项-->
+                        <!--              配置在 columns-->
+<#--                        <template slot-scope="{ row,index }" slot="name">-->
+<#--                            <!--                  <Button @click="handleUpdate(index)" >{{row.name}}</Button>&ndash;&gt;-->
+
+<#--                            <div  @click="handleUpdate(index)">{{row.name}}</div>-->
+<#--                        </template>-->
+<#--                        <template slot-scope="{ row,index }" slot="state">-->
+<#--                            <Tag color="red" v-if="row.status === '2'">离世</Tag>-->
+<#--                            <Tag color="red" v-if="row.status === '3'">转出</Tag>-->
+<#--                            <Tag color="red" v-if="row.status === '4'">退会</Tag>-->
+<#--                            <state-tag v-if="row.status === '1'" :state="row.verify ? row.verify.verifyState : null"/>-->
+<#--                        </template>-->
+<#--                        <template slot-scope="{ row,index }" slot="chinaWriter">-->
+<#--                            <Tag color="green" v-if="row.chinaWriter">是</Tag>-->
+<#--                            <Tag color="red" v-else>否</Tag>-->
+<#--                        </template>-->
+                        <template slot-scope="{ row, index }" slot="action">
+                            <Button type="text" size="small" style="margin-right: 10px; color: #2d8cf0" @click="handleUpdate(index)">
+                                修改
+                            </Button>
+                            <Divider type="vertical"/>
+                            <Button type="text" size="small" style="margin-right: 10px; color: #2d8cf0" @click="exportToWord(index)">
+                                导出
+                            </Button>
+                            <Divider type="vertical"/>
+                            <Button type="text" size="small" style="margin-right: 10px; color: #ed4014" @click="handleDelete(index)">
+                                删除
+                            </Button>
+                        </template>
+                    </Table>
+                </template>
+                <div style="margin: 20px; text-align: center">
+                    <Page :current="select.pageNum" :total="total" :page-size="select.pageSize"
+                          show-elevator @on-change="pageChange" show-total/>
+                </div>
+                <!--        898 total 每页是 10？ 这样是 89页， 每页是9 那要90页啊 都不是。。 不对啊 898/10==89...8 那确实要90页 -->
+                <!--        那 数据不是少了吗  显示 是每页只有9个 啊 -->
+            </div>
+        </layout-content>
+        <Modal v-model="del.modal" width="360" class-name="vertical-center-modal">
+            <p slot="header" style="color:#f60;text-align:center">
+                <Icon type="ios-information-circle"/>
+                <span>删除警告</span>
+            </p>
+            <div style="text-align:center">
+                <p>{{ del.title }}</p>
+                <p style="color: #ed4014">(删除作家信息时会删除其作品和专辑信息)</p>
+            </div>
+            <div slot="footer">
+                <Button @click="del.modal = false">取消</Button>
+                <Button type="error" :loading="del.loading" @click="deleteWriter">删除</Button>
+            </div>
+        </Modal>
+    </div>
+</template>
+
+<script>
+    import LayoutContent from "../../components/layout/layout-content";
+    // import {batchDelete, deleteWriter, exportToWord, selectWriters} from "../../api/writer";
+    <#--import {batchDelete, deleteOne, exportToWord,selectAll,selectPage} from "../../api/${classInfo.className?uncap_first}";-->
+    <#--import {batchDelete, deleteOne, exportToWord,selectAll,selectPage} from "../../api/${classInfo.className?uncap_first}";-->
+    import {batchDelete, deleteOne, exportToWord,selectAll,selectPage} from "../../utils/request";
+
+    // import {batchDelete, deleteWriter, exportToWord, selectWriters} from "../../api/writer";
+    import WriterInfoCard from "../../components/card/writer-info-card";
+    import FieldSelect from "../../components/input/field-select";
+    import TeamSelect from "../../components/input/team-select";
+    import {export2Excel} from "../../utils/excel";
+    import {writerColumns} from "../../utils/dictData";
+    import {resetDict} from "../../utils/common";
+    import StateTag from "../../components/tag/state-tag";
+    import { mapGetters } from "vuex";
+    // https://www.cnblogs.com/aidixie/p/14980957.html
+    export default {
+        name: "writer-manage",
+        components: {StateTag, TeamSelect, FieldSelect, WriterInfoCard, LayoutContent},
+
+        beforeDestroy: function () {
+            window.removeEventListener('resize', this.handleResize)
+        },
+
+        // https://blog.csdn.net/Little_Pig_Bug/article/details/88408445
+        data() {
+            return {
+                spread: true,
+                fullWidth:document.documentElement.clientWidth,
+
+                select: {
+                    <#if classInfo.fieldList?exists && classInfo.fieldList?size gt 0>
+                    <#list classInfo.fieldList as fieldItem >
+            ${fieldItem.fieldName}: '',
+                </#list>
+
+                </#if>
+
+                pageNum: 1,
+                pageSize: 10
+
+                    // 会 显示9个 是因为他吗 不是因为后台
+                    // 确实有问题 ，这里要写10个 ，才是正常的诶
+                    // 那个控件要改掉他 每页的个数吧
+                    // 只有 90页  这样显示不全的吧
+                    // 只要给 total 就可以工作了吧
+                },
+                status:0,
+                display: '列表',
+                writerList: [],
+                columns: [
+                    {
+                        type: 'selection',
+                        width: 60,
+                        align: 'center'
+                    },
+                    {
+                        type: 'index',
+                        width: 60,
+                        align: 'center'
+                    },
+
+            <#if classInfo.fieldList?exists && classInfo.fieldList?size gt 0>
+            <#list classInfo.fieldList as fieldItem >
+                {
+                    title: '${fieldItem.fieldComment}',
+                    key: '${fieldItem.fieldName}',
+                  //  slot:"${fieldItem.fieldName}",
+                    // 这里要配置 slot 才能被抓到
+                    width: 100
+                },
+                </#list>
+
+                </#if>
+
+                    {
+                        title: '操作',
+                        slot: 'action',
+                        fixed: 'right',
+                        width: 240,
+                        align: 'center'
+                    }
+
+                ],
+                total: 0,
+                allList:[],
+                searchLoading: false,
+                exportLoading: false,
+                del: {
+                    loading: false,
+                    modal: false,
+                    index: 0,
+                    type: '',
+                    title: '',
+                    widList: []
+                },
+                statusList: [
+                    {value: '1', label: '正常'},
+                    {value: '2', label: '离世'},
+                    {value: '3', label: '转出'},
+                    {value: '4', label: '退会'}
+                ]
+            }
+        },
+        created() {
+            // this.selectWriters();
+            // this.selectAll();
+            this.selectPage()
+            window.addEventListener('resize', this.handleResize)
+        },
+        computed: {
+            ...mapGetters([
+                'isCollapse',
+            ]),
+            rightWidth(){
+                let leftWidth = this.isCollapse ? '64' : '200';
+                console.log(this.fullWidth)
+                return (this.fullWidth-leftWidth)+'px'
+            },
+
+            filterChinaWriter: {
+                get() {
+                    return false;
+                },
+                set(val) {
+                    this.select.chinaWriter = val ? 1 : null;
+                }
+            }
+        },
+        methods: {
+
+            selectPage() {
+                this.searchLoading = true;
+                selectPage(this.select,this.select.pageNum,
+                    // this.select.pageSize).then(res => {
+                    this.select.pageSize,this.urlRoot).then(res => {
+                    // this.writerList = res.data.data.list;
+                    // this.allList = res.data.data.list;
+                    this.allList = res.data.data.list||res.data.data;
+                this.total = res.data.data.total;
+                this.searchLoading = false;
+            })
+            },
+
+            handleResize (event) {
+                this.fullWidth = document.documentElement.clientWidth
+            },
+            handleAdd() {
+                // this.$router.push({name: 'WriterInfoEdit'});
+                this.$router.push({name: '${classInfo.className}InfoEdit'});
+            },
+            handleUpdate(index) {
+                // this.$router.push({name: 'WriterInfoEdit', query: {wid: this.writerList[index].wid}});
+                this.$router.push({name: '${classInfo.className}InfoEdit', query: {id: this.allList[index].id}});
+            },
+            handleDelete(index) {
+                this.del.index = index;
+                this.del.title = '您确定要删除该作家吗？';
+                this.del.type = 'delete';
+                this.del.modal = true;
+            },
+            handleBatchDelete() {
+                let selectList = this.$refs.selection.getSelection();
+                if (selectList.length === 0) {
+                    this.$Message.error('请选择要删除的作家');
+                    return;
+                }
+                this.del.widList.splice(0, this.del.widList.length);
+                for (let item of selectList) {
+                    this.del.widList.push(item.wid);
+                }
+                this.del.modal = true;
+                this.del.title = '您确定要批量删除这些作家吗？';
+                this.del.type = 'batchDelete';
+            },
+            deleteWriter() {
+                if (this.del.type === 'delete') {
+                    deleteWriter(this.writerList[this.del.index].wid).then(() => {
+                        this.$Message.success('删除成功');
+                    this.del.loading = false;
+                    this.del.modal = false;
+                    // 删除了自己的用户信息, 刷新一下个人信息
+                    if (this.writerList[this.del.index].telephone === this.$store.state.user.telephone) {
+                        this.$store.dispatch('user/getLoginInfo').then(() => {})
+                    }
+
+                    this.selectWriters();
+                })
+                } else if (this.del.type === 'batchDelete') {
+                    batchDelete(this.del.widList).then(() => {
+                        this.$Message.success('删除成功');
+                    this.del.loading = false;
+                    this.del.modal = false;
+                    this.selectWriters();
+                })
+                }
+            },
+            selectWriters() {
+                this.searchLoading = true;
+                selectWriters(this.select).then(res => {
+                    this.writerList = res.data.data.list;
+                this.total = res.data.data.total;
+                this.searchLoading = false;
+            })
+            },
+
+            selectAll() {
+                this.searchLoading = true;
+                selectAll(this.select).then(res => {
+                    // this.writerList = res.data.data.list;
+                    this.allList = res.data.data.list;
+                this.total = res.data.data.total;
+                this.searchLoading = false;
+            })
+            },
+            // 下面选中了 哪个page  一共有90页
+            pageChange(index) {
+                this.select.pageNum = index;
+                this.selectWriters();
+            },
+            exportToExcel() {
+                this.select.pageSize = 99999;
+                this.exportLoading = true;
+                selectWriters(this.select).then(res => {
+                    export2Excel(writerColumns, res.data.data.list, '作家查询下载结果');
+                this.select.pageSize = 9;
+                this.exportLoading = false;
+            })
+            },
+            exportToWord(index) {
+                exportToWord(this.writerList[index].wid).then(res => {
+                    const a = document.createElement('a');
+                let blob = new Blob([res.data],{type: 'application/msword'});
+                const link = document.createElement('a');
+                let fName = this.writerList[index].name;
+                link.href = URL.createObjectURL(blob);
+                link.style.display = 'none';
+                link.setAttribute('download', fName);
+                document.body.appendChild(link);
+                link.click();
+                document.body.removeChild(link);
+            })
+            },
+            // 重置查询
+            reset() {
+                resetDict(this.select);
+            },
+            changeSelectTeamId(val) {
+                this.select.teamId = val;
+            }
+        }
+    }
+</script>
+
+<style scoped>
+    .scale {
+        color: #2d8cf0;
+    }
+
+    .scale:hover {
+        cursor: pointer;
+    }
+</style>
diff --git a/generator-web/src/main/resources/templates/code-generator/mybatis-plus/pluscontroller.ftl b/generator-web/src/main/resources/templates/code-generator/mybatis-plus/pluscontroller.ftl
index 6e55603..b76c340 100644
--- a/generator-web/src/main/resources/templates/code-generator/mybatis-plus/pluscontroller.ftl
+++ b/generator-web/src/main/resources/templates/code-generator/mybatis-plus/pluscontroller.ftl
@@ -5,6 +5,8 @@ import ${packageName}.entity.${classInfo.className};
 import ${packageName}.mapper.${classInfo.className}Mapper;
 import ${packageName}.util.ReturnT;
 import lombok.extern.slf4j.Slf4j;
+    import com.github.pagehelper.Page;
+    import java.util.Date;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -50,6 +52,33 @@ public class ${classInfo.className}Controller {
         return ${returnUtilSuccess}("保存成功");
     }
 
+        @Autowired
+        ${classInfo.className}Service ${classInfo.className?uncap_first}Service;
+
+        @RequestMapping(value = "/selectPage", method = RequestMethod.POST)
+        public Result selectPage(@RequestBody ${classInfo.className} ${classInfo.className?uncap_first},
+        @RequestParam(required = false, defaultValue = "0") int pageNumber,
+        @RequestParam(required = false, defaultValue = "10") int pageSize) {
+            try {
+
+                PageHelper.startPage(pageNumber,pageSize);
+
+                List< ${classInfo.className}> list = ${classInfo.className?uncap_first}Service.list();
+
+                Page writersPage = (Page) list;
+                return Result.success(writersPage);
+
+            }
+            catch (Exception e){
+                log.info("error {}",e.getMessage());
+                return  Result.error(e.getMessage());
+
+            }
+            finally {
+                PageHelper.clearPage();
+                 }
+        }
+
     /**
     * 删除
     */
diff --git a/generator-web/src/main/resources/templates/code-generator/mybatis-plus/plusentity.ftl b/generator-web/src/main/resources/templates/code-generator/mybatis-plus/plusentity.ftl
index 52134ed..53bedc2 100644
--- a/generator-web/src/main/resources/templates/code-generator/mybatis-plus/plusentity.ftl
+++ b/generator-web/src/main/resources/templates/code-generator/mybatis-plus/plusentity.ftl
@@ -18,6 +18,7 @@ import io.swagger.annotations.ApiModelProperty;</#if>
  */
 <#if isLombok?exists && isLombok==true>@Data</#if><#if isSwagger?exists && isSwagger==true>
 @ApiModel("${classInfo.classComment}")</#if>
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class ${classInfo.className} implements Serializable {
 
     private static final long serialVersionUID = 1L;
diff --git a/generator-web/src/main/resources/templates/code-generator/mybatis-plus/plusmapper.ftl b/generator-web/src/main/resources/templates/code-generator/mybatis-plus/plusmapper.ftl
index 438b514..c15ab01 100644
--- a/generator-web/src/main/resources/templates/code-generator/mybatis-plus/plusmapper.ftl
+++ b/generator-web/src/main/resources/templates/code-generator/mybatis-plus/plusmapper.ftl
@@ -12,7 +12,8 @@ import java.util.List;
  * @date ${.now?string('yyyy-MM-dd')}
  */
 @Mapper
-public interface ${classInfo.className}Mapper extends BaseMapper<${classInfo.className}> {
+<#--public interface ${classInfo.className}Mapper extends BaseMapper<${classInfo.className}> {-->
+public interface ${classInfo.className}Mapper extends RootMapper<${classInfo.className}> {
 
     @Select(
     "<script>select t0.* from ${classInfo.tableName} t0 " +
diff --git a/generator-web/src/main/resources/templates/code-generator/mybatis-plus/plusservice.ftl b/generator-web/src/main/resources/templates/code-generator/mybatis-plus/plusservice.ftl
index 4672e01..eb4b9db 100644
--- a/generator-web/src/main/resources/templates/code-generator/mybatis-plus/plusservice.ftl
+++ b/generator-web/src/main/resources/templates/code-generator/mybatis-plus/plusservice.ftl
@@ -13,4 +13,14 @@ public interface ${classInfo.className}Service extends IService<${classInfo.clas
 
 
 
+}
+
+
+@Service
+@Slf4j
+<#--public class ${classInfo.className}ServiceImpl extends ServiceImpl<${classInfo.className}Mapper, ${classInfo.className}>-->
+public class ${classInfo.className}ServiceImpl extends BasicServiceImpl<${classInfo.className}Mapper, ${classInfo.className}>
+implements ${classInfo.className}Service {
+
+
 }
diff --git a/generator-web/src/main/resources/templates/code-generator/util/beanutil.ftl b/generator-web/src/main/resources/templates/code-generator/util/beanutil.ftl
index eba8b70..33f2334 100644
--- a/generator-web/src/main/resources/templates/code-generator/util/beanutil.ftl
+++ b/generator-web/src/main/resources/templates/code-generator/util/beanutil.ftl
@@ -38,5 +38,15 @@ map.put("${fieldItem.fieldComment}",${classInfo.className?uncap_first}.get${fiel
 map.put("${fieldItem.fieldName?uncap_first}",${classInfo.className?uncap_first}.get${fieldItem.fieldName?cap_first}());
 </#list>
 
+    public   ${classInfo.className} toEntity(){
+    ${classInfo.className}  ${classInfo.className?uncap_first} = new    ${classInfo.className}();
+    <#list classInfo.fieldList as fieldItem>
+        // ${fieldItem.fieldComment}
+        ${classInfo.className?uncap_first}.set${fieldItem.fieldName?cap_first}(${fieldItem.fieldName});
+    </#list>
+    return  ${classInfo.className?uncap_first};
+    }
+
+
 
 </#if>
diff --git a/generator-web/src/main/resources/templates/code-generator/util/json.ftl b/generator-web/src/main/resources/templates/code-generator/util/json.ftl
index 596cce4..928ccf1 100644
--- a/generator-web/src/main/resources/templates/code-generator/util/json.ftl
+++ b/generator-web/src/main/resources/templates/code-generator/util/json.ftl
@@ -11,3 +11,30 @@
 </#list>
 }
 </#if>
+
+
+<#if classInfo.fieldList?exists && classInfo.fieldList?size gt 0>
+    {
+    <#list classInfo.fieldList as fieldItem>
+        "${fieldItem.fieldName}":"${fieldItem.fieldComment}"<#if fieldItem_has_next>,</#if>
+    </#list>
+    }
+
+    {
+    <#list classInfo.fieldList as fieldItem>
+        "${fieldItem.fieldName}":""<#if fieldItem_has_next>,</#if>
+    </#list>
+    }
+</#if>
+export const ${classInfo.className?uncap_first}Columns = [
+<#if classInfo.fieldList?exists && classInfo.fieldList?size gt 0>
+
+    <#list classInfo.fieldList as fieldItem>
+        {
+        label: '${fieldItem.fieldComment}', key: '${fieldItem.fieldName}'
+        },
+    </#list>
+    ];
+
+</#if>
+
-- 
Gitee


From 17f3b8f1556ac0887a785cbb969a49ec4f9afac4 Mon Sep 17 00:00:00 2001
From: starplatinum111 <5428527+starplatinum111@user.noreply.gitee.com>
Date: Sat, 18 Jun 2022 10:15:57 +0800
Subject: [PATCH 12/15] i view  form create

---
 .../src/main/resources/template.json          |  5 ++
 .../code-generator/jpa-starp/i-view-form.ftl  | 75 ++++++++++++++++---
 .../mybatis-plus/pluscontroller.ftl           | 12 ++-
 .../code-generator/util/beanutil.ftl          |  8 ++
 push.cmd                                      |  3 +
 5 files changed, 89 insertions(+), 14 deletions(-)
 create mode 100644 push.cmd

diff --git a/generator-web/src/main/resources/template.json b/generator-web/src/main/resources/template.json
index ab06fd3..4598c73 100644
--- a/generator-web/src/main/resources/template.json
+++ b/generator-web/src/main/resources/template.json
@@ -275,6 +275,11 @@
         "id": "105",
         "name": "i-view-api",
         "description": "i-view-api"
+      },
+      {
+        "id": "106",
+        "name": "i-view-form",
+        "description": "i-view-form"
       }
     ]
   },
diff --git a/generator-web/src/main/resources/templates/code-generator/jpa-starp/i-view-form.ftl b/generator-web/src/main/resources/templates/code-generator/jpa-starp/i-view-form.ftl
index 973e253..5ab0833 100644
--- a/generator-web/src/main/resources/templates/code-generator/jpa-starp/i-view-form.ftl
+++ b/generator-web/src/main/resources/templates/code-generator/jpa-starp/i-view-form.ftl
@@ -1,5 +1,6 @@
 <template>
-    <Form label-position="left" :label-width="120" :model="writerForm" ref="writerForm" :rules="ruleValidate">
+<#--    <Form label-position="left" :label-width="120" :model="writerForm" ref="writerForm" :rules="ruleValidate">-->
+    <Form label-position="left" :label-width="120" :model="form" ref="form" :rules="ruleValidate">
         <Row class="writer-form">
             <Col span="12">
             <#if classInfo.fieldList?exists && classInfo.fieldList?size gt 0>
@@ -10,7 +11,7 @@
 
             <#if fieldItem.fieldClass=='boolean' >
                 <FormItem label="${fieldItem.fieldComment}" style="text-align: left" prop="${fieldItem.fieldName}">
-                    <RadioGroup v-model="writerForm.${fieldItem.fieldName}">
+                    <RadioGroup v-model="form.${fieldItem.fieldName}">
                         <Radio label="是" border></Radio>
                         <Radio label="否" border></Radio>
                     </RadioGroup>
@@ -25,13 +26,13 @@
 
             <#if fieldItem.fieldClass!='boolean' >
             <FormItem label="${fieldItem.fieldComment}" prop="${fieldItem.fieldName}">
-                <Input placeholder="请输入${fieldItem.fieldComment}" v-model="writerForm.${fieldItem.fieldName}"/>
+                <Input placeholder="请输入${fieldItem.fieldComment}" v-model="form.${fieldItem.fieldName}"/>
             </FormItem>
             </#if>
 
             <#if fieldItem.fieldClass=='java.util.Date' >
                 <FormItem label="${fieldItem.fieldComment}" prop="${fieldItem.fieldName}">
-                    <DatePicker type="date" placeholder="请选择${fieldItem.fieldComment}" v-model="writerForm.${fieldItem.fieldName}"></DatePicker>
+                    <DatePicker type="date" placeholder="请选择${fieldItem.fieldComment}" v-model="form.${fieldItem.fieldName}"></DatePicker>
                 </FormItem>
             </#if>
 
@@ -50,7 +51,7 @@
 
 
             <FormItem label="头像">
-                <phone-upload @change="changePhoto" :image-url="writerForm.photo"></phone-upload>
+                <phone-upload @change="changePhoto" :image-url="form.photo"></phone-upload>
             </FormItem>
             <!--          图片名字有了  现在 change-->
             <!--        只是作为 保存图片用，没有用到 action-->
@@ -74,7 +75,7 @@
     import {formatDate} from "../../utils/common";
     import FieldMultiSelect from "../input/field-multi-select";
     import {validatorTel} from "../../utils/validate";
-
+    import {update,create} from "../../utils/request";
     export default {
         name: "writer-form",
         components: {FieldMultiSelect, FieldSelect, TeamSelect, PhoneUpload},
@@ -84,7 +85,10 @@
             },
             // 三种类型: 修改（update）、管理员添加（create）、用户注册（registerwr）
             type: {
-                required: true,
+                default:'create',
+                // required: true,
+                required: false,
+                // required: true,
             }
         },
         // 父组件
@@ -151,6 +155,15 @@
             return {
                 editButton: '',
                 cityData: cityData,
+                form:{
+            <#if classInfo.fieldList?exists && classInfo.fieldList?size gt 0>
+            <#list classInfo.fieldList as fieldItem >
+            ${fieldItem.fieldName}: null,
+            </#list>
+
+            </#if>
+                },
+            tableName:"${classInfo.className?uncap_first}",
                 writerForm: {
                     wid: null,
                     name: '',
@@ -311,6 +324,43 @@
             }
             })
             },
+            updateForm() {
+                this.$refs['form'].validate(valid => {
+                    if(!valid){
+                    return false;
+                      }
+                    update(this.form,this.tableName)
+                    // updateWriter(this.handleWriterData())
+                        .then((res) => {
+                        console.log(res)
+                            this.$Message.success('修改成功');
+                        // this.updateWriterPhoto();
+                        // 2021年9月18日10:22:56  mqp
+                        // this.  updateWriterExcel();
+                        this.init();
+                    })
+
+             })
+            },
+            createForm() {
+                this.$refs['form'].validate(valid => {
+                    if (valid) {
+                        create(this.form,this.tableName).then(res => {
+                            this.$Message.success('添加成功');
+                        // this.writerForm.wid = res.data.data;
+                        // this.updateWriterPhoto();
+                        this.init();
+
+                        if (this.type === 'register') {
+                            this.$store.dispatch('user/getLoginInfo').then(() => {})
+                        }
+                    })
+                    } else {
+                        return false;
+                     }
+            })
+            },
+
             createWriter() {
                 this.$refs['writerForm'].validate(valid => {
                     if (valid) {
@@ -356,11 +406,12 @@
                 }
             },
             commit() {
-                if (!!this.wid) {
-                    this.updateWriter();
-                } else {
-                    this.createWriter();
-                }
+                // if (!!this.wid) {
+                //     this.updateWriter();
+                // } else {
+                //     this.createWriter();
+                // }
+                this.createForm()
             },
             // 处理添加和修改作家的信息
             handleWriterData() {
diff --git a/generator-web/src/main/resources/templates/code-generator/mybatis-plus/pluscontroller.ftl b/generator-web/src/main/resources/templates/code-generator/mybatis-plus/pluscontroller.ftl
index b76c340..abb9c2f 100644
--- a/generator-web/src/main/resources/templates/code-generator/mybatis-plus/pluscontroller.ftl
+++ b/generator-web/src/main/resources/templates/code-generator/mybatis-plus/pluscontroller.ftl
@@ -29,7 +29,8 @@ import java.util.Map;
 @RequestMapping("/${classInfo.className?uncap_first}")
 public class ${classInfo.className}Controller {
 
-    @Autowired
+<#--    @Autowired-->
+    @Resource
     private ${classInfo.className}Mapper ${classInfo.className?uncap_first}Mapper;
 
     /**
@@ -55,6 +56,13 @@ public class ${classInfo.className}Controller {
         @Autowired
         ${classInfo.className}Service ${classInfo.className?uncap_first}Service;
 
+<#--@PostMapping("/")-->
+@PostMapping("")
+public Object create(@RequestBody ${classInfo.className} ${classInfo.className?uncap_first}){
+int insert = ${classInfo.className?uncap_first}Mapper.insert(${classInfo.className?uncap_first});
+return Result.success(insert);
+}
+
         @RequestMapping(value = "/selectPage", method = RequestMethod.POST)
         public Result selectPage(@RequestBody ${classInfo.className} ${classInfo.className?uncap_first},
         @RequestParam(required = false, defaultValue = "0") int pageNumber,
@@ -172,7 +180,7 @@ public class ${classInfo.className}Controller {
         }else if(status.equals(${classInfo.className?uncap_first}.getStatus())){
             return ${returnUtilFailure}("状态不正确");
         }else{
-            return ${returnUtilFailure}();
+            return ${returnUtilFailure}("失败");
         }
     }
 
diff --git a/generator-web/src/main/resources/templates/code-generator/util/beanutil.ftl b/generator-web/src/main/resources/templates/code-generator/util/beanutil.ftl
index 33f2334..4ede8e7 100644
--- a/generator-web/src/main/resources/templates/code-generator/util/beanutil.ftl
+++ b/generator-web/src/main/resources/templates/code-generator/util/beanutil.ftl
@@ -48,5 +48,13 @@ map.put("${fieldItem.fieldName?uncap_first}",${classInfo.className?uncap_first}.
     }
 
 
+    public   ${classInfo.className}Form toForm(){
+    ${classInfo.className}Form  ${classInfo.className?uncap_first}Form = new    ${classInfo.className}Form();
+    <#list classInfo.fieldList as fieldItem>
+        // ${fieldItem.fieldComment}
+        ${classInfo.className?uncap_first}Form.set${fieldItem.fieldName?cap_first}(${fieldItem.fieldName});
+    </#list>
+    return  ${classInfo.className?uncap_first}Form;
+    }
 
 </#if>
diff --git a/push.cmd b/push.cmd
new file mode 100644
index 0000000..eda287b
--- /dev/null
+++ b/push.cmd
@@ -0,0 +1,3 @@
+git add .
+git commit -m "i view  form create"
+git push origin master
-- 
Gitee


From c5bcfbbd7fe5f5157eb7d7c65b49a8253412f45b Mon Sep 17 00:00:00 2001
From: starplatinum111 <5428527+starplatinum111@user.noreply.gitee.com>
Date: Sun, 19 Jun 2022 11:07:42 +0800
Subject: [PATCH 13/15] i view  edit

---
 .../src/main/resources/template.json          |   5 +
 .../code-generator/jpa-starp/i-view-edit.ftl  | 150 ++++++++++++++++++
 .../code-generator/jpa-starp/i-view-form.ftl  |  12 +-
 .../code-generator/jpa-starp/i-view.ftl       |   6 +-
 push.cmd                                      |   3 +-
 5 files changed, 164 insertions(+), 12 deletions(-)
 create mode 100644 generator-web/src/main/resources/templates/code-generator/jpa-starp/i-view-edit.ftl

diff --git a/generator-web/src/main/resources/template.json b/generator-web/src/main/resources/template.json
index 4598c73..b9265e6 100644
--- a/generator-web/src/main/resources/template.json
+++ b/generator-web/src/main/resources/template.json
@@ -280,6 +280,11 @@
         "id": "106",
         "name": "i-view-form",
         "description": "i-view-form"
+      },
+      {
+        "id": "107",
+        "name": "i-view-edit",
+        "description": "i-view-edit"
       }
     ]
   },
diff --git a/generator-web/src/main/resources/templates/code-generator/jpa-starp/i-view-edit.ftl b/generator-web/src/main/resources/templates/code-generator/jpa-starp/i-view-edit.ftl
new file mode 100644
index 0000000..f6e7814
--- /dev/null
+++ b/generator-web/src/main/resources/templates/code-generator/jpa-starp/i-view-edit.ftl
@@ -0,0 +1,150 @@
+<template>
+    <div>
+        <layout-edit-content title="用户信息编辑">
+            <div slot="main">
+<#--                <user-form :user-id="userId" :type="type"></user-form>-->
+<#--                <${classInfo.className}Form :user-id="userId" :type="type"></${classInfo.className}Form>-->
+                <${classInfo.className}Form :entityId="entityId" :type="type"></${classInfo.className}Form>
+            </div>
+        </layout-edit-content>
+
+        <Table :columns="columns" :data="allList" ref="selection" :loading="searchLoading">
+
+        </Table>
+
+    </div>
+</template>
+
+<script>
+    import {getUserInfo} from "../../api/user";
+    import LayoutEditContent from "../../components/layout/layout-edit-content";
+    // import UserForm from "../../components/form/user-form";
+    import ${classInfo.className}Form from "../../components/form/${classInfo.className?uncap_first}-form";
+    // import {batchDelete, deleteOne, exportToWord,selectAll,selectPage} from "../../api/permission";
+    import {batchDelete, deleteOne, exportToWord,selectAll} from "../../api/permission";
+    import {update,create,selectPage} from "../../utils/request";
+    export default {
+        name: "UserInfoEdit",
+        components: {
+            LayoutEditContent,
+            ${classInfo.className}Form },
+        created() {
+            this.userId = this.$route.query.userId;
+            if (!!this.userId) {
+                this.type = 'update';
+            }
+
+            this. selectPage();
+        },
+        methods:{
+            selectPage() {
+                this.searchLoading = true;
+                selectPage(this.select,this.select.pageNum,
+                    this.select.pageSize,this.tableName).then(res => {
+                    // this.writerList = res.data.data.list;
+
+                    console.log("res")
+                    console.log(res)
+                    // this.allList = res.data.data.list;
+                    this.allList = res.data.data;
+
+                    console.log( "this.allList")
+                    console.log( this.allList)
+
+                    this.total = res.data.data.total;
+                    this.searchLoading = false;
+                })
+            },
+
+            addPermissions(){
+                let selectList = this.$refs.selection.getSelection();
+                if (selectList.length === 0) {
+                    this.$Message.error('请选择要添加的权限');
+                    return;
+                }
+
+                for (let item of selectList) {
+                    this.del.widList.push(item.wid);
+                }
+            }
+        },
+        data() {
+            return {
+                entityId:'',
+                tableName:"${classInfo.className?uncap_first}",
+                total: 0,
+                searchLoading: false,
+                userId: '',
+                type: 'create',
+                select: {
+            <#if classInfo.fieldList?exists && classInfo.fieldList?size gt 0>
+            <#list classInfo.fieldList as fieldItem >
+            ${fieldItem.fieldName}: '',
+                </#list>
+
+                </#if>
+
+                pageNum: 1,
+                pageSize: 10
+
+            // 会 显示9个 是因为他吗 不是因为后台
+            // 确实有问题 ，这里要写10个 ，才是正常的诶
+            // 那个控件要改掉他 每页的个数吧
+            // 只有 90页  这样显示不全的吧
+            // 只要给 total 就可以工作了吧
+        },
+
+                columns: [
+                    {
+                        type: 'selection',
+                        width: 60,
+                        align: 'center'
+                    },
+                    {
+                        type: 'index',
+                        width: 60,
+                        align: 'center'
+                    },
+
+                    <#if classInfo.fieldList?exists && classInfo.fieldList?size gt 0>
+                    <#list classInfo.fieldList as fieldItem >
+                    {
+                        title: '${fieldItem.fieldComment}',
+                        key: '${fieldItem.fieldName}',
+                        //  slot:"${fieldItem.fieldName}",
+                        // 这里要配置 slot 才能被抓到
+                        width: 100
+                    },
+                    </#list>
+
+                    </#if>
+
+
+
+
+                    {
+                        title: '操作',
+                        // slot: 'action',
+                        fixed: 'right',
+                        width: 240,
+                        align: 'center'
+                    }
+                    ,
+                    {
+                        title: '作品',
+                        // slot: 'works',
+                        // slot 注释掉 就有了
+                        width: 300,
+                        key: 'works',
+
+                    }
+                ],
+                allList:[],
+            }
+        },
+    }
+</script>
+
+<style scoped>
+
+</style>
diff --git a/generator-web/src/main/resources/templates/code-generator/jpa-starp/i-view-form.ftl b/generator-web/src/main/resources/templates/code-generator/jpa-starp/i-view-form.ftl
index 5ab0833..2917ac2 100644
--- a/generator-web/src/main/resources/templates/code-generator/jpa-starp/i-view-form.ftl
+++ b/generator-web/src/main/resources/templates/code-generator/jpa-starp/i-view-form.ftl
@@ -5,10 +5,8 @@
             <Col span="12">
             <#if classInfo.fieldList?exists && classInfo.fieldList?size gt 0>
                 <#list classInfo.fieldList as fieldItem >
-
 <#--                    <#if ${fieldItem.fieldClass}=='boolean' >-->
 <#--                      </#if>-->
-
             <#if fieldItem.fieldClass=='boolean' >
                 <FormItem label="${fieldItem.fieldComment}" style="text-align: left" prop="${fieldItem.fieldName}">
                     <RadioGroup v-model="form.${fieldItem.fieldName}">
@@ -17,7 +15,6 @@
                     </RadioGroup>
                 </FormItem>
             </#if>
-
 <#--               <#elseif fieldItem.fieldClass!='boolean' >-->
 <#--              <FormItem label="${fieldItem.fieldComment}" prop="${fieldItem.fieldName}">-->
 <#--                        <Input placeholder="请输入${fieldItem.fieldComment}" v-model="writerForm.${fieldItem.fieldName}"/>-->
@@ -29,16 +26,12 @@
                 <Input placeholder="请输入${fieldItem.fieldComment}" v-model="form.${fieldItem.fieldName}"/>
             </FormItem>
             </#if>
-
             <#if fieldItem.fieldClass=='java.util.Date' >
                 <FormItem label="${fieldItem.fieldComment}" prop="${fieldItem.fieldName}">
                     <DatePicker type="date" placeholder="请选择${fieldItem.fieldComment}" v-model="form.${fieldItem.fieldName}"></DatePicker>
                 </FormItem>
             </#if>
-
-
                 </#list>
-
             </#if>
 
             </Col>
@@ -48,8 +41,6 @@
             <Upload   action="//jsonplaceholder.typicode.com/posts/"  @change="changeExcel"  >
                 <Button icon="ios-cloud-upload-outline">Upload files</Button>
             </Upload>
-
-
             <FormItem label="头像">
                 <phone-upload @change="changePhoto" :image-url="form.photo"></phone-upload>
             </FormItem>
@@ -89,6 +80,9 @@
                 // required: true,
                 required: false,
                 // required: true,
+            },
+            entityId:{
+                required: false
             }
         },
         // 父组件
diff --git a/generator-web/src/main/resources/templates/code-generator/jpa-starp/i-view.ftl b/generator-web/src/main/resources/templates/code-generator/jpa-starp/i-view.ftl
index ddb3b73..d7608e4 100644
--- a/generator-web/src/main/resources/templates/code-generator/jpa-starp/i-view.ftl
+++ b/generator-web/src/main/resources/templates/code-generator/jpa-starp/i-view.ftl
@@ -285,11 +285,13 @@
             },
             handleAdd() {
                 // this.$router.push({name: 'WriterInfoEdit'});
-                this.$router.push({name: '${classInfo.className}InfoEdit'});
+                <#--this.$router.push({name: '${classInfo.className}InfoEdit'});-->
+                this.$router.push({name: '${classInfo.className}Edit'});
             },
             handleUpdate(index) {
                 // this.$router.push({name: 'WriterInfoEdit', query: {wid: this.writerList[index].wid}});
-                this.$router.push({name: '${classInfo.className}InfoEdit', query: {id: this.allList[index].id}});
+                <#--this.$router.push({name: '${classInfo.className}InfoEdit', query: {id: this.allList[index].id}});-->
+                this.$router.push({name: '${classInfo.className}Edit', query: {id: this.allList[index].id}});
             },
             handleDelete(index) {
                 this.del.index = index;
diff --git a/push.cmd b/push.cmd
index eda287b..dbc37ec 100644
--- a/push.cmd
+++ b/push.cmd
@@ -1,3 +1,4 @@
 git add .
-git commit -m "i view  form create"
+@REM git commit -m "i view  form create"
+git commit -m "i view  edit"
 git push origin master
-- 
Gitee


From 3164e1f5f6fe5084270c6aa61508bf5520c76e73 Mon Sep 17 00:00:00 2001
From: starplatinum111 <5428527+starplatinum111@user.noreply.gitee.com>
Date: Mon, 27 Jun 2022 09:06:28 +0800
Subject: [PATCH 14/15] `1

---
 .../code-generator/jpa-starp/i-view-edit.ftl  |  13 +-
 .../code-generator/jpa-starp/i-view-form.ftl  | 253 ++----------------
 .../code-generator/jpa-starp/i-view.ftl       |   3 +-
 .../mybatis-plus/plusentity.ftl               |  41 +++
 4 files changed, 72 insertions(+), 238 deletions(-)

diff --git a/generator-web/src/main/resources/templates/code-generator/jpa-starp/i-view-edit.ftl b/generator-web/src/main/resources/templates/code-generator/jpa-starp/i-view-edit.ftl
index f6e7814..7b7e48e 100644
--- a/generator-web/src/main/resources/templates/code-generator/jpa-starp/i-view-edit.ftl
+++ b/generator-web/src/main/resources/templates/code-generator/jpa-starp/i-view-edit.ftl
@@ -29,8 +29,13 @@
             LayoutEditContent,
             ${classInfo.className}Form },
         created() {
-            this.userId = this.$route.query.userId;
-            if (!!this.userId) {
+            // this.userId = this.$route.query.userId;
+            // if (!!this.userId) {
+            //     this.type = 'update';
+            // }
+
+            // this.entityId =    this.$route.query.id;
+            if (!!this.entityId) {
                 this.type = 'update';
             }
 
@@ -70,7 +75,9 @@
         },
         data() {
             return {
-                entityId:'',
+                // entityId:'',
+                // entityId:this.$route.query.userId,
+                entityId:this.$route.query.id,
                 tableName:"${classInfo.className?uncap_first}",
                 total: 0,
                 searchLoading: false,
diff --git a/generator-web/src/main/resources/templates/code-generator/jpa-starp/i-view-form.ftl b/generator-web/src/main/resources/templates/code-generator/jpa-starp/i-view-form.ftl
index 2917ac2..efe644f 100644
--- a/generator-web/src/main/resources/templates/code-generator/jpa-starp/i-view-form.ftl
+++ b/generator-web/src/main/resources/templates/code-generator/jpa-starp/i-view-form.ftl
@@ -66,7 +66,7 @@
     import {formatDate} from "../../utils/common";
     import FieldMultiSelect from "../input/field-multi-select";
     import {validatorTel} from "../../utils/validate";
-    import {update,create} from "../../utils/request";
+    import {update,create,post} from "../../utils/request";
     export default {
         name: "writer-form",
         components: {FieldMultiSelect, FieldSelect, TeamSelect, PhoneUpload},
@@ -90,60 +90,20 @@
             window.parentMounted = this._isMounted	// _isMounted是当前实例mouned()是否执行 此时为false
         },
         created() {
-            if (!!this.wid) {
+            if(!!this.entityId){
                 this.editButton = '确认修改';
-                this.writerForm.wid = this.wid;
-                this.init();
-                // 代码跳转 不是自己这个文件的代码吗
-                //   子组件在父组件数据加载完之后渲染 vue
-            } else {
-                this.editButton = '确认添加';
-                if (this.type === 'register') {
-                    this.writerForm.telephone = this.$store.state.user.telephone;
-                    this.writerForm.teamId = this.$store.state.user.teamId;
-                } else {
-                    this.writerForm.teamId = 4;
-                }
-
-                // console.log("writer-form create ")
-                // console.log( "this.writerForm.teamId")
-                // console.log( this.writerForm.teamId)
-                // console.log("================")
+                post(this.tableName+"/find?id="+ this.entityId).then(res=>{
+                    console.log(res)
+                    this.form=res.data.data
+                })
+                return
+                // return
             }
-            console.log("writer-form create ")
-            console.log( "this.writerForm.teamId")
-            console.log( this.writerForm.teamId)
-            console.log("================")
+            this.editButton = '确认添加';
+
         },
         computed: {
-            chinaWriter: {
-                get() {
-                    return this.writerForm.chinaWriter ? '是' : '否'
-                },
-                set(val) {
-                    this.writerForm.chinaWriter = val === '是'
-                }
-            },
-            xinheWriter: {
-                get() {
-                    return this.writerForm.xinheWriter ? '是' : '否'
-                },
-                set(val) {
-                    this.writerForm.xinheWriter = val === '是'
-                }
-            },
-            nativePlace: {
-                get() {
-                    if (!!this.writerForm.nativePlace) {
-                        return this.writerForm.nativePlace.split(' ')
-                    } else {
-                        return []
-                    }
-                },
-                set(val) {
-                    this.writerForm.nativePlace = val.join(' ')
-                }
-            }
+
         },
         data() {
             return {
@@ -158,166 +118,16 @@
             </#if>
                 },
             tableName:"${classInfo.className?uncap_first}",
-                writerForm: {
-                    wid: null,
-                    name: '',
-                    penName: '',
-                    commonName: '',
-                    sex: '',
-                    idNumber: '',
-                    nation: '',
-                    teamId: null,
-                    joinDate: formatDate(new Date()),
-                    nativePlace: '',
-                    category: '',
-                    education: '',
-                    political: '',
-                    jobTitle: '',
-                    jobLevel: '',
-                    workUnit: '',
-                    workPost: '',
-                    unitNative: '',
-                    socialJob: '',
-                    homeAddress: '',
-                    unitAddress: '',
-                    telephone: '',
-                    unitPhone: '',
-                    homePhone: '',
-                    postcode: '',
-                    qq: '',
-                    wechat: '',
-                    email: '',
-                    awards: '',
-                    photo: '',
-                    experience: '',
-                    status: '',
-                    remark: ''
-                },
-                ruleValidate: {
-                    name: [
-                        {required: true, message: '姓名不能为空', trigger: 'change'},
-                        {required: true, message: '姓名不能为空', trigger: 'blur'}
-                    ],
-                    email: [
-                        {type: 'email', message: '邮箱错误', trigger: 'blur'},
-                    ],
-                    idNumber: [
-                        // {required: true, message: '身份证不能为空', trigger: 'change'},
-                        // {required: true, message: '身份证不能为空', trigger: 'blur'}
-                        {required: false, message: '身份证不能为空', trigger: 'change'},
-                        {required: false, message: '身份证不能为空', trigger: 'blur'}
-                    ],
-                    nation: [
-                        // {required: true, message: '民族不能为空', trigger: 'blur'},
-                        //   {required: true, message: '民族不能为空', trigger: 'change'},
-                        {required: false, message: '民族不能为空', trigger: 'blur'},
-                        {required: false, message: '民族不能为空', trigger: 'change'}
 
-                    ],
-                    sex: [
-                        {required: true, message: '请选择性别', trigger: 'change'}
-                    ],
-                    telephone: [
-                        {required: true, validator: validatorTel, trigger: 'blur'},
-                    ],
-                    /*teamId: [
-                      {required: true, message: '请选择你要加入的团体', trigger: 'change'}
-                    ],*/
-                    /* joinDate: [
-                      {required: true, message: '请输入加入团体日期', trigger: 'blur', type: 'date'}
-                    ], */
-                    category: [
-                        // {required: true, message: '请选择申报门类信息', trigger: 'change'}
-                        {required: false, message: '请选择申报门类信息', trigger: 'change'}
-                    ],
-                    political: [
-                        // {required: true, message: '请选择政治面貌', trigger: 'change'}
-                        {required: false, message: '请选择政治面貌', trigger: 'change'}
-                    ],
-                    workUnit: [
-                        // {required: true, message: '请输入工作单位', trigger: 'blur'}
-                        {required: false, message: '请输入工作单位', trigger: 'blur'}
-                    ],
-                    workPost: [
-                        // {required: true, message: '请输入单位性质', trigger: 'blur'}
-                        {required: false, message: '请输入单位性质', trigger: 'blur'}
-                    ],
-                    unitNative: [
-                        // {required: true, message: '请输入工作职务', trigger: 'blur'}
-                        {required: false, message: '请输入工作职务', trigger: 'blur'}
-                    ],
-                    awards: [
-                        // {required: true, message: '请输入获奖情况及作品影响', trigger: 'blur'}
-                        {required: false, message: '请输入获奖情况及作品影响', trigger: 'blur'}
-                    ]
-                },
+
                 photoData: null,
                 excelData:null,
-                statusList: [
-                    {value: '1', label: '正常'},
-                    {value: '2', label: '离世'},
-                    {value: '3', label: '转出'},
-                    {value: '4', label: '退会'}
-                ]
+
             }
         },
         methods: {
-            init() {
-                this.getWriterInfo();
-            },
-            getWriterInfo() {
-                // 有wid 的话
-                let that=this
-                if (!!this.writerForm.wid) {
-                    let address= window.localStorage.getItem("address");
-                    console.log("address")
-                    console.log(address)
-                    getWriterInfo(this.writerForm.wid).then(res => {
-                        this.writerForm = res.data.data;
-                    console.log(" this.writerForm")
-                    console.log( this.writerForm)
-                    if( !!this.writerForm.photo&&this.writerForm.photo!==null&&this.writerForm.photo!==undefined){
-                        console.log("this.writerForm.photo")
-                        console.log(this.writerForm.photo)
-                        this.writerForm.photo=  this.writerForm.photo.replace(/localhost:8088/,address)
-                        console.log("修改之后")
-                        console.log("this.writerForm.photo")
-                        console.log(this.writerForm.photo)
-                    }
 
-                    // console.log(" this.writerForm")
-                    // console.log( this.writerForm)
-                    // console.log('this.writerForm')
-                    // console.log(this.writerForm)
-                    console.log("start===============start")
-                    console.log("getWriterInfo")
-                    console.log("this.writerForm.teamId")
-                    console.log(this.writerForm.teamId)
-                    console.log("================")
-                    // 有时候显示协会 有时候不显示
-                    // this.photo = res.data.data.photo;
-                    //   console.log(  "this.photo ")
-                    //   console.log(  this.photo )
-                    // 这个回调貌似晚了
-                    window.parentMounted = that._isMounted	// _isMounted是当前实例mouned()是否执行 此时为true
-                })
-                }
-            },
-            updateWriter() {
-                this.$refs['writerForm'].validate(valid => {
-                    if (valid) {
-                        updateWriter(this.handleWriterData()).then(() => {
-                            this.$Message.success('修改成功');
-                        this.updateWriterPhoto();
-                        // 2021年9月18日10:22:56  mqp
-                        this.  updateWriterExcel();
-                        this.init();
-                    })
-                    } else {
-                        return false;
-            }
-            })
-            },
+
             updateForm() {
                 this.$refs['form'].validate(valid => {
                     if(!valid){
@@ -343,11 +153,11 @@
                             this.$Message.success('添加成功');
                         // this.writerForm.wid = res.data.data;
                         // this.updateWriterPhoto();
-                        this.init();
-
-                        if (this.type === 'register') {
-                            this.$store.dispatch('user/getLoginInfo').then(() => {})
-                        }
+                        // this.init();
+                        //
+                        // if (this.type === 'register') {
+                        //     this.$store.dispatch('user/getLoginInfo').then(() => {})
+                        // }
                     })
                     } else {
                         return false;
@@ -355,24 +165,7 @@
             })
             },
 
-            createWriter() {
-                this.$refs['writerForm'].validate(valid => {
-                    if (valid) {
-                        createWriter(this.handleWriterData()).then(res => {
-                            this.$Message.success('添加成功');
-                        this.writerForm.wid = res.data.data;
-                        this.updateWriterPhoto();
-                        this.init();
 
-                        if (this.type === 'register') {
-                            this.$store.dispatch('user/getLoginInfo').then(() => {})
-                        }
-                    })
-                    } else {
-                        return false;
-            }
-            })
-            },
             updateWriterPhoto() {
                 if (!!this.photoData) {
                     uploadPhoto(this.writerForm.wid, this.photoData).then(() => {
@@ -382,14 +175,6 @@
                 }
             },
 
-            // uploadFile(file) {
-            //   if (!!this.photoData) {
-            //     uploadPhoto(this.writerForm.wid, this.photoData).then(() => {
-            //       // 失败提示，成功不进行提示
-            //       uploadExcel
-            //     })
-            //   }
-            // },
 
             updateWriterExcel() {
                 if (!!this.excelData) {
diff --git a/generator-web/src/main/resources/templates/code-generator/jpa-starp/i-view.ftl b/generator-web/src/main/resources/templates/code-generator/jpa-starp/i-view.ftl
index d7608e4..af76ff0 100644
--- a/generator-web/src/main/resources/templates/code-generator/jpa-starp/i-view.ftl
+++ b/generator-web/src/main/resources/templates/code-generator/jpa-starp/i-view.ftl
@@ -169,7 +169,8 @@
                 select: {
                     <#if classInfo.fieldList?exists && classInfo.fieldList?size gt 0>
                     <#list classInfo.fieldList as fieldItem >
-            ${fieldItem.fieldName}: '',
+<#--            ${fieldItem.fieldName}: '',-->
+            ${fieldItem.fieldName}: null,
                 </#list>
 
                 </#if>
diff --git a/generator-web/src/main/resources/templates/code-generator/mybatis-plus/plusentity.ftl b/generator-web/src/main/resources/templates/code-generator/mybatis-plus/plusentity.ftl
index 53bedc2..9917ad9 100644
--- a/generator-web/src/main/resources/templates/code-generator/mybatis-plus/plusentity.ftl
+++ b/generator-web/src/main/resources/templates/code-generator/mybatis-plus/plusentity.ftl
@@ -23,6 +23,47 @@ public class ${classInfo.className} implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+        public  static LambdaQueryWrapper<${classInfo.className}> getEqLambdaQueryWrapper(${classInfo.className} ${classInfo.className?uncap_first}){
+
+            LambdaQueryWrapper<${classInfo.className}> eq =
+                Wrappers.lambdaQuery(${classInfo.className}.class)
+        <#if classInfo.fieldList?exists && classInfo.fieldList?size gt 0>
+            <#list classInfo.fieldList as fieldItem >
+                .eq(${classInfo.className}::get${fieldItem.fieldName?cap_first}, ${classInfo.className?uncap_first}.get${fieldItem.fieldName?cap_first}())
+            </#list>
+        </#if>
+        ;
+                return eq;
+                }
+
+        public  static LambdaQueryWrapper<${classInfo.className}> getLikeLambdaQueryWrapper(${classInfo.className} ${classInfo.className?uncap_first}){
+
+        LambdaQueryWrapper<${classInfo.className}> queryWrapper =
+        Wrappers.lambdaQuery(${classInfo.className}.class)
+        <#if classInfo.fieldList?exists && classInfo.fieldList?size gt 0>
+            <#list classInfo.fieldList as fieldItem >
+                .like(${classInfo.className?uncap_first}.get${fieldItem.fieldName?cap_first}()!=null,${classInfo.className}::get${fieldItem.fieldName?cap_first}, ${classInfo.className?uncap_first}.get${fieldItem.fieldName?cap_first}())
+            </#list>
+        </#if>
+        ;
+        return queryWrapper;
+        }
+
+
+        public   LambdaQueryWrapper<${classInfo.className}> getEqLambdaQueryWrapper(){
+
+        LambdaQueryWrapper<${classInfo.className}> eq =
+        Wrappers.lambdaQuery(${classInfo.className}.class)
+        <#if classInfo.fieldList?exists && classInfo.fieldList?size gt 0>
+            <#list classInfo.fieldList as fieldItem >
+                .eq(${classInfo.className}::get${fieldItem.fieldName?cap_first}, get${fieldItem.fieldName?cap_first}())
+            </#list>
+        </#if>
+        ;
+        return eq;
+        }
+
+
     @TableId(type = IdType.AUTO)
 <#if classInfo.fieldList?exists && classInfo.fieldList?size gt 0>
 <#list classInfo.fieldList as fieldItem >
-- 
Gitee


From 1da1cc5b4c85a7ebc5ee829dc3a97d15dda6fd3c Mon Sep 17 00:00:00 2001
From: starplatinum111 <5428527+starplatinum111@user.noreply.gitee.com>
Date: Mon, 27 Jun 2022 09:10:17 +0800
Subject: [PATCH 15/15]  list like

---
 .../code-generator/jpa-starp/starp-entity.ftl |  3 +-
 .../jpa-starp/starp-jpa-controller.ftl        | 80 +++++++++++++++++++
 .../jpa-starp/starp-repository.ftl            |  3 +-
 3 files changed, 84 insertions(+), 2 deletions(-)

diff --git a/generator-web/src/main/resources/templates/code-generator/jpa-starp/starp-entity.ftl b/generator-web/src/main/resources/templates/code-generator/jpa-starp/starp-entity.ftl
index 152c317..70f2ed8 100644
--- a/generator-web/src/main/resources/templates/code-generator/jpa-starp/starp-entity.ftl
+++ b/generator-web/src/main/resources/templates/code-generator/jpa-starp/starp-entity.ftl
@@ -9,7 +9,8 @@ import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Id;
 import javax.persistence.Table;
-import javax.persistence.GeneratedValue;
+    import javax.persistence.*;
+    import javax.persistence.GeneratedValue;
 <#if isSwagger?exists && isSwagger==true>
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;</#if>
diff --git a/generator-web/src/main/resources/templates/code-generator/jpa-starp/starp-jpa-controller.ftl b/generator-web/src/main/resources/templates/code-generator/jpa-starp/starp-jpa-controller.ftl
index f9470fc..74fa536 100644
--- a/generator-web/src/main/resources/templates/code-generator/jpa-starp/starp-jpa-controller.ftl
+++ b/generator-web/src/main/resources/templates/code-generator/jpa-starp/starp-jpa-controller.ftl
@@ -16,6 +16,8 @@ import java.util.Map;
 import java.util.Optional;
 
 </#if>
+import javax.persistence.criteria.Predicate;
+
 /**
  * @description ${classInfo.classComment}
  * @author ${authorName}
@@ -103,4 +105,82 @@ public class ${classInfo.className}Controller {
 
     }
 
+<#--        @PostMapping("/findAllById")-->
+<#--        @ApiOperation(value = "findAllById", notes = "findAllById")-->
+<#--        public Object findAllById(@RequestBody  List<Integer> ids){-->
+<#--            try {-->
+<#--            List<${classInfo.className}> allById = ${classInfo.className?uncap_first}Repository.findAllById(ids);-->
+<#--                return ReturnT.success(allById);-->
+<#--                } catch (Exception e) {-->
+<#--                e.printStackTrace();-->
+<#--                return ReturnT.error("保存失败");-->
+<#--                }-->
+<#--                }-->
+
+        @PostMapping("/findAllById")
+        @ApiOperation(value = "findAllById", notes = "findAllById")
+        public Object findAllById(@RequestBody  List<Integer> ids,
+        @RequestParam(required = false, defaultValue = "0") int pageNumber,
+        @RequestParam(required = false, defaultValue = "10") int pageSize){
+        try {
+        List<${classInfo.className}> allById =  ${classInfo.className?uncap_first}Repository.findAllById(ids);
+            StarpPage<${classInfo.className}>starpPage=new StarpPage<>(allById,pageNumber,pageSize);
+                return ReturnT.success(starpPage);
+                } catch (Exception e) {
+            e.printStackTrace();
+            return ReturnT.error("保存失败");
+              }
+        }
+
+
+
+                @PostMapping("/deleteInBatch")
+    @ApiOperation(value = "deleteInBatch", notes = "deleteInBatch")
+    public Object deleteInBatch(@RequestBody  List<${classInfo.className} > entities){
+            try {
+                ${classInfo.className?uncap_first}Repository.deleteInBatch(entities);
+                return ReturnT.success("批量删除成功");
+            } catch (Exception e) {
+                e.printStackTrace();
+                return ReturnT.error("批量删除失败");
+             }
+            }
+
+        @PostMapping("/listLike")
+        @ApiOperation(value = "listLike", notes = "listLike")
+        public Object listLike(@RequestBody ${classInfo.className} ${classInfo.className?uncap_first},
+        @RequestParam(required = false, defaultValue = "0") int pageNumber,
+        @RequestParam(required = false, defaultValue = "10") int pageSize) {
+
+        try {
+
+            Pageable pageable = PageRequest.of(pageNumber,pageSize);
+          Page< ${classInfo.className}> page = ${classInfo.className?uncap_first}Repository.findAll((Specification< ${classInfo.className}>)
+                (root, criteriaQuery, criteriaBuilder) -> {
+                List<Predicate> list = new ArrayList<Predicate>();
+<#--                list.add(criteriaBuilder.like(-->
+                <#if classInfo.fieldList?exists && classInfo.fieldList?size gt 0>
+                    <#list classInfo.fieldList as fieldItem >
+<#--                        if(null!=${classInfo.className?uncap_first}.get${fieldItem.fieldName?cap_first}()){-->
+<#--                root.get("${fieldItem.fieldName}").as(${fieldItem.fieldClass}.class),-->
+<#--                        "%"+ ${classInfo.className?uncap_first}.get${fieldItem.fieldName?cap_first}()+"%"));-->
+<#--                        }-->
+                        if(null!=${classInfo.className?uncap_first}.get${fieldItem.fieldName?cap_first}()){
+                        list.add(criteriaBuilder.like(root.get("${fieldItem.fieldName}").as(String.class), "%"+ ${classInfo.className?uncap_first}.get${fieldItem.fieldName?cap_first}()+"%"));
+                        }
+                    </#list>
+                </#if>
+
+                        Predicate[] p = new Predicate[list.size()];
+                        return criteriaBuilder.and(list.toArray(p));
+                        },pageable);
+                            return ReturnT.success(page);
+
+                        } catch (Exception e) {
+                            e.printStackTrace();
+                            return ReturnT.error(e.getMessage());
+                    }
+
+                   }
+
 }
diff --git a/generator-web/src/main/resources/templates/code-generator/jpa-starp/starp-repository.ftl b/generator-web/src/main/resources/templates/code-generator/jpa-starp/starp-repository.ftl
index c3643a2..50ece49 100644
--- a/generator-web/src/main/resources/templates/code-generator/jpa-starp/starp-repository.ftl
+++ b/generator-web/src/main/resources/templates/code-generator/jpa-starp/starp-repository.ftl
@@ -19,7 +19,8 @@ import org.springframework.stereotype.Repository;
  * @date ${.now?string('yyyy-MM-dd')}
  */
 @Repository
-public interface ${classInfo.className}Repository extends JpaRepository<${classInfo.className},Integer> {
+public interface ${classInfo.className}Repository extends JpaRepository<${classInfo.className},Integer> ,
+            JpaSpecificationExecutor<${classInfo.className}>{
 
 
 
-- 
Gitee