Prechádzať zdrojové kódy

修改代码生成模板

铁公鸡wind 1 rok pred
rodič
commit
8d7fc9f5ce

+ 2 - 1
src/main/java/io/renren/utils/GenUtils.java

@@ -334,7 +334,8 @@ public class GenUtils {
         }
 
         if (template.contains("ServiceImpl.java.vm")) {
-            return packagePath + "biz"+File.separator+"service" + File.separator + "impl" + File.separator + className + "ServiceImpl.java";
+            //return packagePath + "biz"+File.separator+"service" + File.separator + "impl" + File.separator + className + "ServiceImpl.java";
+            return packagePath + "biz"+File.separator+"provider" + File.separator + className + "ServiceImpl.java";
         }
 
         if (template.contains("Controller.java.vm")) {

+ 3 - 0
src/main/resources/template/AddPO.java.vm

@@ -39,6 +39,9 @@ public class ${className}AddPO implements Serializable {
 	@NotBlank(message = "$column.comments 不能为空")
 #elseif($column.attrType != "String" && $column.nullable == "NO")
 	@NotNull(message = "$column.comments 不能为空")
+#elseif($column.attrType == "Date")
+	@JsonFormat(pattern = DateUtil.FORMAT_YYYY_MM_DD_HH_MM_SS)
+	@DateTimeFormat(pattern = DateUtil.FORMAT_YYYY_MM_DD_HH_MM_SS)
 #end
     @ApiModelProperty(value = "$column.comments")
     private $column.attrType $column.attrname;

+ 5 - 1
src/main/resources/template/Controller.java.vm

@@ -1,5 +1,6 @@
 package ${package}.${moduleName}.api.web.controller;
 
+import com.kingdom.api.core.operationlog.OperationLog;
 import ${package}.common.utils.pagination.Pagination;
 import ${package}.api.core.controller.BaseController;
 import ${package}.api.core.response.ApiResponse;
@@ -44,7 +45,7 @@ public class ${className}Controller extends BaseController {
      */
     @GetMapping("/page")
     @ApiOperation("分页")
-    @RequiresPermissions("${moduleName}:${pathName}:page")
+    //@RequiresPermissions("${moduleName}:${pathName}:page")
     public ApiResponse<Pagination<${className}VO>> page(${className}PagePO request) {
 
         Pagination<${className}VO> result = ${classname}Service.page(request);
@@ -68,6 +69,7 @@ public class ${className}Controller extends BaseController {
      */
     @PostMapping("/save")
     @ApiOperation("保存")
+    @OperationLog(tag = "${comments}管理",remark = "保存${comments}信息")
     @RequiresPermissions("${moduleName}:${pathName}:save")
     @Transactional(rollbackFor = Exception.class)
     public ApiResponse<Object> save(@RequestBody @Validated ${className}AddPO request) {
@@ -82,6 +84,7 @@ public class ${className}Controller extends BaseController {
     @PutMapping("/update")
     @ApiOperation("修改")
     @RequiresPermissions("${moduleName}:${pathName}:update")
+    @OperationLog(tag = "${comments}管理",remark = "修改${comments}信息")
     @Transactional(rollbackFor = Exception.class)
     public ApiResponse<R> update(@RequestBody @Validated ${className}UpdatePO request) {
 
@@ -95,6 +98,7 @@ public class ${className}Controller extends BaseController {
     @DeleteMapping("/delete")
     @ApiOperation("删除")
     @RequiresPermissions("${moduleName}:${pathName}:delete")
+    @OperationLog(tag = "${comments}管理",remark = "删除${comments}信息")
     @Transactional(rollbackFor = Exception.class)
     public ApiResponse<R> delete(@RequestBody Long[] ids) {
 		${classname}Service.removeByIds(Arrays.asList(ids));

+ 1 - 1
src/main/resources/template/Entity.java.vm

@@ -25,7 +25,7 @@ import lombok.experimental.Accessors;
 @Getter
 @Setter
 @Accessors(chain = true)
-@TableName("${tableName}")
+@TableName(value = "${tableName}", autoResultMap = true)
 public class ${className}Entity extends BaseEntity implements Serializable {
 	private static final long serialVersionUID = 1L;
 

+ 10 - 15
src/main/resources/template/menu.sql.vm

@@ -16,26 +16,21 @@
 --    SELECT @parentId, '删除', null, '${moduleName}:${pathName}:delete', '2', null, '6';
 
 -- 菜单SQL
-INSERT INTO `t_sys_resources` (`parent_id`, `type`, `name`, `permission_code`, `icon`, `url`, `component`, `sort`,
-                               `deleted`,`create_time`,`update_time`,`create_user_id`,`update_user_id`)
-    VALUES ('1', 1, '分页', '${moduleName}:${pathName}:page', '', '/', '/', 1,0,now(),now(),1,1);
+INSERT INTO `t_sys_resources` (`id`, `parent_id`, `type`, `name`, `permission_code`, `icon`, `url`, `component`, `sort`,`deleted`,`create_time`,`update_time`,`create_user_id`,`update_user_id`,`tenant_id`,`dept_id`,`factories_id`)
+    VALUES (((UNIX_TIMESTAMP() * 100) << 23) | (1 << 22) | (FLOOR(RAND() * 1023) << 10) | (FLOOR(RAND() * 1023)), 1, '${comments}分页查询', '${moduleName}:${pathName}:page', '', '/', '/', 1,0,now(),now(),1,1,1,NULL,NULL);
 
 -- 按钮父菜单ID
 set @parentId = @@identity;
 
 -- 菜单对应按钮SQL
-INSERT INTO `t_sys_resources` (`parent_id`, `type`, `name`, `permission_code`, `icon`, `url`, `component`, `sort`,
-                               `deleted`,`create_time`,`update_time`,`create_user_id`,`update_user_id`)
-SELECT @parentId, 2, '查看', '${moduleName}:${pathName}:info', '', '/', '/', 1,0,now(),now(),1,1;
-INSERT INTO `t_sys_resources` (`parent_id`, `type`, `name`, `permission_code`, `icon`, `url`, `component`, `sort`,
-                               `deleted`,`create_time`,`update_time`,`create_user_id`,`update_user_id`)
-SELECT @parentId, 2, '新增', '${moduleName}:${pathName}:save', '', '/', '/', 1,0,now(),now(),1,1;
-INSERT INTO `t_sys_resources` (`parent_id`, `type`, `name`, `permission_code`, `icon`, `url`, `component`, `sort`,
-                               `deleted`,`create_time`,`update_time`,`create_user_id`,`update_user_id`)
-SELECT @parentId, 2, '修改', '${moduleName}:${pathName}:update', '', '/', '/', 1,0,now(),now(),1,1;
-INSERT INTO `t_sys_resources` (`parent_id`, `type`, `name`, `permission_code`, `icon`, `url`, `component`, `sort`,
-                               `deleted`,`create_time`,`update_time`,`create_user_id`,`update_user_id`)
-SELECT @parentId, 2, '删除', '${moduleName}:${pathName}:delete', '', '/', '/', 1,0,now(),now(),1,1;
+INSERT INTO `t_sys_resources` (`id`, `parent_id`, `type`, `name`, `permission_code`, `icon`, `url`, `component`, `sort`,`deleted`,`create_time`,`update_time`,`create_user_id`,`update_user_id`,`tenant_id`,`dept_id`,`factories_id`)
+SELECT @parentId, 2, '查看', '${moduleName}:${pathName}:info', '', '/', '/', 1,0,now(),now(),1,1,1,NULL,NULL;
+INSERT INTO `t_sys_resources` (`id`, `parent_id`, `type`, `name`, `permission_code`, `icon`, `url`, `component`, `sort`,`deleted`,`create_time`,`update_time`,`create_user_id`,`update_user_id`,`tenant_id`,`dept_id`,`factories_id`)
+SELECT @parentId, 2, '新增', '${moduleName}:${pathName}:save', '', '/', '/', 1,0,now(),now(),1,1,1,NULL,NULL;
+INSERT INTO `t_sys_resources` (`id`, `parent_id`, `type`, `name`, `permission_code`, `icon`, `url`, `component`, `sort`,`deleted`,`create_time`,`update_time`,`create_user_id`,`update_user_id`,`tenant_id`,`dept_id`,`factories_id`)
+SELECT @parentId, 2, '修改', '${moduleName}:${pathName}:update', '', '/', '/', 1,0,now(),now(),1,1,1,NULL,NULL;
+INSERT INTO `t_sys_resources` (`id`, `parent_id`, `type`, `name`, `permission_code`, `icon`, `url`, `component`, `sort`,`deleted`,`create_time`,`update_time`,`create_user_id`,`update_user_id`,`tenant_id`,`dept_id`,`factories_id`)
+SELECT @parentId, 2, '删除', '${moduleName}:${pathName}:delete', '', '/', '/', 1,0,now(),now(),1,1,1,NULL,NULL;