diff --git a/SpringBootCodeGenerator.iml b/SpringBootCodeGenerator.iml deleted file mode 100644 index e67ee345..00000000 --- a/SpringBootCodeGenerator.iml +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/generator-web/generator-web.iml b/generator-web/generator-web.iml deleted file mode 100644 index 6b33a9b7..00000000 --- a/generator-web/generator-web.iml +++ /dev/null @@ -1,84 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file 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 d8b52a22..400aa888 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 @@ -10,55 +10,62 @@ import java.util.Map; /** * ${classInfo.classComment} -* @author ${authorName} ${.now?string('yyyy-MM-dd')} +* @author ${authorName} +* @date ${.now?string('yyyy/MM/dd')} */ -@Controller +@RestController +@RequestMapping(value = "/${classInfo.className}") public class ${classInfo.className}Controller { @Resource private ${classInfo.className}Service ${classInfo.className?uncap_first}Service; /** - * 新增 - */ + * [新增] + * @author ${authorName} + * @date ${.now?string('yyyy/MM/dd')} + **/ @RequestMapping("/insert") - @ResponseBody public ReturnT 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')} + **/ @RequestMapping("/delete") - @ResponseBody public ReturnT delete(int id){ return ${classInfo.className?uncap_first}Service.delete(id); } /** - * 更新 - */ + * [更新] + * @author ${authorName} + * @date ${.now?string('yyyy/MM/dd')} + **/ @RequestMapping("/update") - @ResponseBody public ReturnT update(${classInfo.className} ${classInfo.className?uncap_first}){ return ${classInfo.className?uncap_first}Service.update(${classInfo.className?uncap_first}); } /** - * Load查询 - */ + * [查詢] 根據主鍵 id 查詢 + * @author ${authorName} + * @date ${.now?string('yyyy/MM/dd')} + **/ @RequestMapping("/load") - @ResponseBody public ReturnT load(int id){ return ${classInfo.className?uncap_first}Service.load(id); } /** - * 分页查询 - */ + * [查詢] 分頁查詢 + * @author ${authorName} + * @date ${.now?string('yyyy/MM/dd')} + **/ @RequestMapping("/pageList") - @ResponseBody public Map 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/dao.ftl b/generator-web/src/main/resources/templates/code-generator/mybatis/dao.ftl deleted file mode 100644 index cc602106..00000000 --- a/generator-web/src/main/resources/templates/code-generator/mybatis/dao.ftl +++ /dev/null @@ -1,49 +0,0 @@ -import org.apache.ibatis.annotations.Param; -import org.springframework.stereotype.Component; - -import java.util.List; - -/** -* ${classInfo.classComment} -* @author ${authorName} ${.now?string('yyyy-MM-dd')} -*/ -@Repository -public interface ${classInfo.className}Dao { - - /** - * 新增 - * @param ${classInfo.className}Entity - */ - public Integer insert(@Param("${classInfo.className?uncap_first}") ${classInfo.className}Entity ${classInfo.className?uncap_first}); - - /** - * 删除 - * @param id - */ - public Integer delete(@Param("id") Integer id); - - /** - * 更新 - * @param ${classInfo.className}Entity - */ - public Integer update(@Param("${classInfo.className?uncap_first}") ${classInfo.className}Entity ${classInfo.className?uncap_first}); - - /** - * 根据主键查询一个实体 - * @param id - */ - public ${classInfo.className}Entity selectByPrimaryKey(@Param("id") Integer id); - - /** - * 分页查询Data - * @param offset - * @param pageSize - */ - public List<${classInfo.className}Entity> pageList(@Param("offset") Integer offset, @Param("pageSize") Integer pageSize); - - /** - * 分页查询Count - */ - public Integer pageListCount(); - -} \ No newline at end of file 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 new file mode 100644 index 00000000..6a01e2bf --- /dev/null +++ b/generator-web/src/main/resources/templates/code-generator/mybatis/mapper.ftl @@ -0,0 +1,60 @@ +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import org.springframework.stereotype.Repository; +import java.util.List; + +/** +* ${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(@Param("${classInfo.className?uncap_first}") ${classInfo.className} ${classInfo.className?uncap_first}); + + /** + * [刪除] + * @author ${authorName} + * @date ${.now?string('yyyy/MM/dd')} + **/ + int delete(@Param("id") int id); + + /** + * [更新] + * @author ${authorName} + * @date ${.now?string('yyyy/MM/dd')} + **/ + int update(@Param("${classInfo.className?uncap_first}") ${classInfo.className} ${classInfo.className?uncap_first}); + + /** + * [查詢] 根據主鍵 id 查詢 + * @author ${authorName} + * @date ${.now?string('yyyy/MM/dd')} + **/ + ${classInfo.className} load(@Param("id") int id); + + /** + * [查詢] 分頁查詢 + * @author ${authorName} + * @date ${.now?string('yyyy/MM/dd')} + **/ + List<${classInfo.className}> pageList(@Param("offset") int offset, + @Param("pagesize") int pagesize); + + /** + * [查詢] 分頁查詢 count + * @author ${authorName} + * @date ${.now?string('yyyy/MM/dd')} + **/ + int pageListCount(@Param("offset") int offset, + @Param("pagesize") int pagesize); + +} 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 3de47531..11718e01 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 @@ -2,7 +2,8 @@ import java.util.Map; /** * ${classInfo.classComment} -* @author ${authorName} ${.now?string('yyyy-MM-dd')} +* @author ${authorName} +* @date ${.now?string('yyyy/MM/dd')} */ public interface ${classInfo.className}Service { @@ -22,7 +23,7 @@ public interface ${classInfo.className}Service { public ReturnT update(${classInfo.className} ${classInfo.className?uncap_first}); /** - * Load查询 + * 根據主鍵 id 查詢 */ public ${classInfo.className} load(int id); 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 8bb37a65..a5d6e89d 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 @@ -8,17 +8,16 @@ import java.util.Map; /** * ${classInfo.classComment} -* @author ${authorName} ${.now?string('yyyy-MM-dd')} +* @author ${authorName} +* @date ${.now?string('yyyy/MM/dd')} */ @Service public class ${classInfo.className}ServiceImpl implements ${classInfo.className}Service { @Resource - private ${classInfo.className}Dao ${classInfo.className?uncap_first}Dao; + private ${classInfo.className}Mapper ${classInfo.className?uncap_first}Mapper; + - /** - * 新增 - */ @Override public ReturnT insert(${classInfo.className} ${classInfo.className?uncap_first}) { @@ -27,49 +26,41 @@ public class ${classInfo.className}ServiceImpl implements ${classInfo.className} return new ReturnT(ReturnT.FAIL_CODE, "必要参数缺失"); } - ${classInfo.className?uncap_first}Dao.insert(${classInfo.className?uncap_first}); + ${classInfo.className?uncap_first}Mapper.insert(${classInfo.className?uncap_first}); return ReturnT.SUCCESS; } - /** - * 删除 - */ + @Override public ReturnT delete(int id) { - int ret = ${classInfo.className?uncap_first}Dao.delete(id); + int ret = ${classInfo.className?uncap_first}Mapper.delete(id); return ret>0?ReturnT.SUCCESS:ReturnT.FAIL; } - /** - * 更新 - */ + @Override public ReturnT update(${classInfo.className} ${classInfo.className?uncap_first}) { - int ret = ${classInfo.className?uncap_first}Dao.update(${classInfo.className?uncap_first}); + int ret = ${classInfo.className?uncap_first}Mapper.update(${classInfo.className?uncap_first}); return ret>0?ReturnT.SUCCESS:ReturnT.FAIL; } - /** - * Load查询 - */ + @Override public ${classInfo.className} load(int id) { - return ${classInfo.className?uncap_first}Dao.load(id); + return ${classInfo.className?uncap_first}Mapper.load(id); } - /** - * 分页查询 - */ + @Override public Map pageList(int offset, int pagesize) { - List<${classInfo.className}> pageList = ${classInfo.className?uncap_first}Dao.pageList(offset, pagesize); - int totalCount = ${classInfo.className?uncap_first}Dao.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 result = new HashMap(); - maps.put("pageList", pageList); - maps.put("totalCount", totalCount); + result.put("pageList", pageList); + result.put("totalCount", totalCount); return result; } diff --git a/generator-web/src/main/resources/templates/index.ftl b/generator-web/src/main/resources/templates/index.ftl index 5ca66f99..2a98e672 100644 --- a/generator-web/src/main/resources/templates/index.ftl +++ b/generator-web/src/main/resources/templates/index.ftl @@ -156,7 +156,7 @@ CREATE TABLE `userinfo` (
- +