修改代码生成器

railway-business/src/main/java/com/railway/business/catenary/mapper/BusZzdzxxDao.java → railway-business/src/main/java/com/railway/business/catenary/mapper/BusZzdzxxMapper.java

@@ -8,13 +8,13 @@ import org.springframework.stereotype.Repository;
 import java.util.List;
 
 /**
-* 支柱吊柱信息 row_format =
+* 支柱吊柱信息
 * @author wuhonghao
 * @date 2021/10/11
 */
 @Mapper
 @Repository
-public interface BusZzdzxxDao {
+public interface BusZzdzxxMapper {
 
     /**
     * @Description: 新增

railway-business/src/main/java/com/railway/business/catenary/service/impl/BusZzdzxxServiceImpl.java

@@ -1,7 +1,7 @@
 package com.railway.business.catenary.service.impl;
 
 import com.railway.business.catenary.domain.BusZzdzxx;
-import com.railway.business.catenary.mapper.BusZzdzxxDao;
+import com.railway.business.catenary.mapper.BusZzdzxxMapper;
 import com.railway.business.catenary.service.IBusZzdzxxService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -18,14 +18,15 @@ import java.util.List;
 @Transactional(readOnly = true)
 public class BusZzdzxxServiceImpl implements IBusZzdzxxService {
 	@Autowired
-	private BusZzdzxxDao busZzdzxxDao;
+	private BusZzdzxxMapper busZzdzxxMapper;
+
 
 	/**
 	* @Description: 新增
 	*/
 	@Transactional(rollbackFor = Exception.class)
 	public int create(BusZzdzxx busZzdzxx) {
-		return busZzdzxxDao.insert(busZzdzxx);
+		return busZzdzxxMapper.insert(busZzdzxx);
 	}
 
 	/**
@@ -33,7 +34,7 @@ public class BusZzdzxxServiceImpl implements IBusZzdzxxService {
 	*/
 	@Transactional(rollbackFor = Exception.class)
 	public int delete(String zzId) {
-		return busZzdzxxDao.delete(zzId);
+		return busZzdzxxMapper.delete(zzId);
 	}
 
 	/**
@@ -41,20 +42,20 @@ public class BusZzdzxxServiceImpl implements IBusZzdzxxService {
 	*/
 	@Transactional(rollbackFor = Exception.class)
 	public int update(BusZzdzxx busZzdzxx) {
-		return busZzdzxxDao.update(busZzdzxx);
+		return busZzdzxxMapper.update(busZzdzxx);
 	}
 
 	/**
 	* @Description: 获取单个
 	*/
 	public BusZzdzxx getInfo(String zzId) {
-		return busZzdzxxDao.getInfo(zzId);
+		return busZzdzxxMapper.getInfo(zzId);
 	}
 
 	/**
 	* @Description: 查询列表
 	*/
 	public List<BusZzdzxx> getList(BusZzdzxx busZzdzxx) {
-		return busZzdzxxDao.getList(busZzdzxx);
+		return busZzdzxxMapper.getList(busZzdzxx);
 	}
 }

railway-business/src/main/resources/mapper/business/BusZzdzxxDao.xml → railway-business/src/main/resources/mapper/business/BusZzdzxxMapper.xml

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.railway.business.catenary.mapper.BusZzdzxxDao">
+<mapper namespace="com.railway.business.catenary.mapper.BusZzdzxxMapper">
 
     <resultMap id="BaseResultMap" type="com.railway.business.catenary.domain.BusZzdzxx">
-                <result column="zzId" property="zzId"/>
+                <result column="zz_id" property="zzId"/>
                 <result column="duanbie" property="duanbie"/>
                 <result column="bumen" property="bumen"/>
                 <result column="xianbie" property="xianbie"/>
@@ -76,7 +76,7 @@
     </resultMap>
 
     <sql id="Base_Column_List">
-                zzId,
+                zz_id,
                 duanbie,
                 bumen,
                 xianbie,
@@ -153,7 +153,7 @@
         </selectKey>
         INSERT INTO bus_zzdzxx
         <trim prefix="(" suffix=")" suffixOverrides=",">
-                    zzId,
+                    zz_id,
                     <if test ='null != duanbie'>
                     duanbie,
                     </if>
@@ -646,7 +646,7 @@
                     <if test ='null != danwei'>danwei = #{danwei},</if>
                     <if test ='null != shujubianhao'>shujubianhao = #{shujubianhao}</if>
         </set>
-        WHERE zzId = #{zzId}
+        WHERE zz_id = #{zzId}
     </update>
 
 
@@ -654,7 +654,7 @@
         SELECT
         <include refid="Base_Column_List"/>
         FROM bus_zzdzxx
-        WHERE zzId = #{zzId}
+        WHERE zz_id = #{zzId}
 
     </select>
 

railway-generator/src/main/java/com/railway/generator/controller/IndexController.java

@@ -45,7 +45,7 @@ public class IndexController {
     public ReturnT<Map<String, String>> codeGenerate(String tableSql,
                                                      //2019-2-10 liutf 修改为@RequestParam参数校验
                                                      @RequestParam(required = false, defaultValue = "author") String authorName,
-                                                     @RequestParam(required = false, defaultValue = "com.railway.business") String packageName,
+                                                     @RequestParam(required = false, defaultValue = "com.railway.business.catenary") String packageName,
                                                      @RequestParam(required = false, defaultValue = "") String className,
                                                      @RequestParam(required = false, defaultValue = "id") String primaryKey,
                                                      @RequestParam(required = false, defaultValue = "/Users/wuhonghao/IdeaProjects/railway") String projectPath,
@@ -115,9 +115,9 @@ public class IndexController {
             String controllerPath = projectPath + File.separator + "railway-admin/src/main/java/com/railway/web/controller/business/catenary" + File.separator + classInfo.getClassName() + "Controller.java";
             String servicePath = projectPath + File.separator + "railway-business/src/main/java/com/railway/business/catenary"  + File.separator + "service" + File.separator + "I"+classInfo.getClassName() + "Service.java";
             String serviceImplPath = projectPath + File.separator + "railway-business/src/main/java/com/railway/business//catenary" + File.separator + "service" + File.separator + "impl" + File.separator + classInfo.getClassName() + "ServiceImpl.java";
-            String daoPath = projectPath + File.separator + "railway-business/src/main/java/com/railway/business/catenary" +  File.separator + "mapper" + File.separator + classInfo.getClassName() + "Dao.java";
+            String daoPath = projectPath + File.separator + "railway-business/src/main/java/com/railway/business/catenary" +  File.separator + "mapper" + File.separator + classInfo.getClassName() + "Mapper.java";
             String entityPath = projectPath + File.separator + "railway-business/src/main/java/com/railway/business/catenary" +  File.separator + "domain" + File.separator + classInfo.getClassName() + ".java";
-            String mapperPath = projectPath + File.separator + "railway-business/src/main/resources/mapper/business" + File.separator + classInfo.getClassName() + "Dao.xml";
+            String mapperPath = projectPath + File.separator + "railway-business/src/main/resources/mapper/business" + File.separator + classInfo.getClassName() + "Mapper.xml";
             //写入文件
             FileUtil.writeToFile(controllerPath, freemarkerTool.processString("code-generator/railway/back/controller.ftl", params));
             FileUtil.writeToFile(servicePath, freemarkerTool.processString("code-generator/railway/back/service.ftl", params));

railway-generator/src/main/resources/templates/code-generator/railway/back/controller.ftl

@@ -1,4 +1,4 @@
-package com.railway.web.controller.business;
+package com.railway.web.controller.business.catenary;
 
 import ${packageName}.domain.${classInfo.className};
 import ${packageName}.service.I${classInfo.className}Service;
@@ -46,7 +46,10 @@ public class ${classInfo.className}Controller extends BaseController {
     @ApiOperation(value = "单个")
     @GetMapping(value = {"/", "/${primaryKeyCame}"})
     public AjaxResult getInfo(String ${primaryKeyCame}) {
-        return toAjax(${classInfo.className?uncap_first}Service.getInfo(${primaryKeyCame}));
+        ${classInfo.className} info = ${classInfo.className?uncap_first}Service.getInfo(${primaryKeyCame});
+        AjaxResult ajax = AjaxResult.success();
+        ajax.put("info",info);
+        return ajax;
     }
 
     @ApiOperation(value = "列表")

railway-generator/src/main/resources/templates/code-generator/railway/back/dao.ftl

@@ -1,8 +1,7 @@
-package ${packageName}.dao;
+package ${packageName}.mapper;
 
 import com.github.pagehelper.Page;
-import com.sgcc.richsoft.platform.persistent.entity.QueryEntity;
-import ${packageName}.entity.${classInfo.className};
+import ${packageName}.domain.${classInfo.className};
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
@@ -14,7 +13,7 @@ import org.springframework.stereotype.Repository;
 */
 @Mapper
 @Repository
-public interface ${classInfo.className}Dao {
+public interface ${classInfo.className}Mapper {
 
     /**
     * @Description: 新增
@@ -34,11 +33,11 @@ public interface ${classInfo.className}Dao {
     /**
     * @Description: 获取单个
     */
-    ${classInfo.className} getOne(@Param("${primaryKeyCame}") String ${primaryKeyCame});
+    ${classInfo.className} getInfo(@Param("${primaryKeyCame}") String ${primaryKeyCame});
 
     /**
     * @Description: 查询列表
     */
-    Page<${classInfo.className}> getList(@Param("queryEntity") QueryEntity queryEntity);
+    Page<${classInfo.className}> getList(${classInfo.className} ${classInfo.className?uncap_first});
 
 }

railway-generator/src/main/resources/templates/code-generator/railway/back/entity.ftl

@@ -8,7 +8,7 @@ import lombok.EqualsAndHashCode;
 <#list classInfo.fieldList as fieldItem >
 <#if fieldItem.fieldClass == 'Date'>
 import java.util.Date;
-import javax.validation.constraints.NotNull;
+
     <#break>
 </#if>
 </#list>
@@ -18,13 +18,14 @@ import org.hibernate.validator.constraints.Length;
     <#break>
 </#if>
 </#list>
-
+import javax.validation.constraints.NotNull;
 /**
  * ${classInfo.classComment}
  * @author ${authorName} ${.now?string('yyyy-MM-dd')}
  */
 @Data
 @ApiModel("${classInfo.classComment}")
+@EqualsAndHashCode(callSuper = true)
 public class ${classInfo.className} extends BaseEntity{
 
 <#if classInfo.fieldList?exists && classInfo.fieldList?size gt 0>

railway-generator/src/main/resources/templates/code-generator/railway/back/mybatis.ftl

@@ -1,9 +1,9 @@
 <?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}Dao">
+<mapper namespace="${packageName}.mapper.${classInfo.className}Mapper">
 
-    <resultMap id="BaseResultMap" type="${packageName}.entity.${classInfo.className}">
+    <resultMap id="BaseResultMap" type="${packageName}.domain.${classInfo.className}">
                 <result column="${primaryKey}" property="${primaryKeyCame}"/>
         <#if classInfo.fieldList?exists && classInfo.fieldList?size gt 0>
             <#list classInfo.fieldList as fieldItem >
@@ -21,7 +21,7 @@
         </#if>
     </sql>
 
-    <insert id="insert" parameterType="${packageName}.entity.${classInfo.className}">
+    <insert id="insert" parameterType="${packageName}.domain.${classInfo.className}">
         <selectKey keyProperty="${primaryKeyCame}" order="BEFORE" resultType="String">
             select replace(uuid(), '-', '') from dual
         </selectKey>
@@ -54,7 +54,7 @@
         WHERE ${primaryKey} = ${r"#{"}${primaryKeyCame}${r"}"}
     </delete>
 
-    <update id="update" parameterType="${packageName}.entity.${classInfo.className}">
+    <update id="update" parameterType="${packageName}.domain.${classInfo.className}">
         UPDATE ${classInfo.tableName}
         <set>
             <#list classInfo.fieldList as fieldItem >
@@ -67,7 +67,7 @@
     </update>
 
 
-    <select id="getOne" resultMap="BaseResultMap">
+    <select id="getInfo" resultMap="BaseResultMap">
         SELECT
         <include refid="Base_Column_List"/>
         FROM ${classInfo.tableName}
@@ -79,6 +79,15 @@
         SELECT
         <include refid="Base_Column_List"/>
         FROM ${classInfo.tableName}
+        <#if classInfo.fieldList?exists && classInfo.fieldList?size gt 0>
+        <where>
+            <#list classInfo.fieldList as fieldItem >
+                <if test="${fieldItem.fieldName}!=null and ${fieldItem.fieldName}!=''">
+                    and ${fieldItem.columnName}=${r"#{"}${fieldItem.fieldName}${r"}"}
+                </if>
+            </#list>
+        </where>
+        </#if>
     </select>
 
 </mapper>

railway-generator/src/main/resources/templates/code-generator/railway/back/service.ftl

@@ -1,6 +1,6 @@
 package ${packageName}.service;
 
-import com.railway.business.domain.${classInfo.className};
+import ${packageName}.domain.${classInfo.className};
 import java.util.List;
 /**
 * ${classInfo.classComment}
@@ -12,17 +12,17 @@ public interface I${classInfo.className}Service{
     /**
     * @Description: 新增
     */
-    void create(${classInfo.className} ${classInfo.className?uncap_first});
+    int create(${classInfo.className} ${classInfo.className?uncap_first});
 
     /**
     * @Description: 删除
     */
-    void delete(String[] ${primaryKeyCame}s);
+    int delete(String ${primaryKeyCame}s);
 
     /**
     * @Description: 更新
     */
-    void update(${classInfo.className} ${classInfo.className?uncap_first});
+    int update(${classInfo.className} ${classInfo.className?uncap_first});
 
     /**
     * @Description: 获取单个

railway-generator/src/main/resources/templates/code-generator/railway/back/serviceImpl.ftl

@@ -2,13 +2,13 @@ package ${packageName}.service.impl;
 
 import com.github.pagehelper.Page;
 import com.github.pagehelper.PageHelper;
-import ${packageName}.dao.${classInfo.className}Dao;
-import ${packageName}.entity.${classInfo.className};
-import com.railway.business.service.I${classInfo.className}Service;
+import ${packageName}.mapper.${classInfo.className}Mapper;
+import ${packageName}.domain.${classInfo.className};
+import ${packageName}.service.I${classInfo.className}Service;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-
+import java.util.List;
 /**
 * ${classInfo.classComment}
 * @author ${authorName}
@@ -18,46 +18,43 @@ import org.springframework.transaction.annotation.Transactional;
 @Transactional(readOnly = true)
 public class ${classInfo.className}ServiceImpl implements I${classInfo.className}Service{
 @Autowired
-private ${classInfo.className}Dao ${classInfo.className?uncap_first}Dao;
+private ${classInfo.className}Mapper ${classInfo.className?uncap_first}Mapper;
 
 	/**
 	* @Description: 新增
 	*/
 	@Transactional(rollbackFor = Exception.class)
-	public void create(${classInfo.className} ${classInfo.className?uncap_first}) {
-		${classInfo.className?uncap_first}Dao.insert(${classInfo.className?uncap_first});
+	public int create(${classInfo.className} ${classInfo.className?uncap_first}) {
+		${classInfo.className?uncap_first}Mapper.insert(${classInfo.className?uncap_first});
 	}
 
 	/**
 	* @Description: 删除
 	*/
 	@Transactional(rollbackFor = Exception.class)
-	public void delete(String[] ${primaryKeyCame}s) {
-		for (String ${primaryKeyCame} : ${primaryKeyCame}s) {
-			${classInfo.className?uncap_first}Dao.delete(${primaryKeyCame});
-		}
+	public int delete(String ${primaryKeyCame}) {
+		return	${classInfo.className?uncap_first}Mapper.delete(${primaryKeyCame});
 	}
 
 	/**
 	* @Description: 更新
 	*/
 	@Transactional(rollbackFor = Exception.class)
-	public void update(${classInfo.className} ${classInfo.className?uncap_first}) {
-		${classInfo.className?uncap_first}.preUpdate();
-		${classInfo.className?uncap_first}Dao.update(${classInfo.className?uncap_first});
+	public int update(${classInfo.className} ${classInfo.className?uncap_first}) {
+		${classInfo.className?uncap_first}Mapper.update(${classInfo.className?uncap_first});
 	}
 
 	/**
 	* @Description: 获取单个
 	*/
 	public ${classInfo.className} getInfo(String ${primaryKeyCame}) {
-		return ${classInfo.className?uncap_first}Dao.getOne(${primaryKeyCame});
+		return ${classInfo.className?uncap_first}Mapper.getInfo(${primaryKeyCame});
 	}
 
 	/**
 	* @Description: 查询列表
 	*/
-	public List<${classInfo.className}> getList(QueryEntity queryEntity) {
-		return ${classInfo.className?uncap_first}Dao.getList(QueryEntityHelper.toDBColumnQueryEntity(queryEntity));
+	public List<${classInfo.className}> getList(${classInfo.className} ${classInfo.className?uncap_first}) {
+		return ${classInfo.className?uncap_first}Mapper.getList(${classInfo.className?uncap_first});
 	}
 }