Commit a3d8e8726aaf2c3d88f0c4fd8e1cafc1babacaff
1 parent
9b26c3e9
【修复】codegen 生成代码时,delete 接口补充 dataTypeClass 属性,避免 Swagger 打印 WARN 日志
Showing
11 changed files
with
14 additions
and
13 deletions
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/definition/BpmFormController.java
| @@ -45,7 +45,7 @@ public class BpmFormController { | @@ -45,7 +45,7 @@ public class BpmFormController { | ||
| 45 | 45 | ||
| 46 | @DeleteMapping("/delete") | 46 | @DeleteMapping("/delete") |
| 47 | @ApiOperation("删除动态表单") | 47 | @ApiOperation("删除动态表单") |
| 48 | - @ApiImplicitParam(name = "id", value = "编号", required = true) | 48 | + @ApiImplicitParam(name = "id", value = "编号", required = true, dataTypeClass = Long.class) |
| 49 | @PreAuthorize("@ss.hasPermission('bpm:form:delete')") | 49 | @PreAuthorize("@ss.hasPermission('bpm:form:delete')") |
| 50 | public CommonResult<Boolean> deleteForm(@RequestParam("id") Long id) { | 50 | public CommonResult<Boolean> deleteForm(@RequestParam("id") Long id) { |
| 51 | formService.deleteForm(id); | 51 | formService.deleteForm(id); |
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/definition/BpmUserGroupController.java
| @@ -53,7 +53,7 @@ public class BpmUserGroupController { | @@ -53,7 +53,7 @@ public class BpmUserGroupController { | ||
| 53 | 53 | ||
| 54 | @DeleteMapping("/delete") | 54 | @DeleteMapping("/delete") |
| 55 | @ApiOperation("删除用户组") | 55 | @ApiOperation("删除用户组") |
| 56 | - @ApiImplicitParam(name = "id", value = "编号", required = true) | 56 | + @ApiImplicitParam(name = "id", value = "编号", required = true, dataTypeClass = Long.class) |
| 57 | @PreAuthorize("@ss.hasPermission('bpm:user-group:delete')") | 57 | @PreAuthorize("@ss.hasPermission('bpm:user-group:delete')") |
| 58 | public CommonResult<Boolean> deleteUserGroup(@RequestParam("id") Long id) { | 58 | public CommonResult<Boolean> deleteUserGroup(@RequestParam("id") Long id) { |
| 59 | userGroupService.deleteUserGroup(id); | 59 | userGroupService.deleteUserGroup(id); |
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/oa/OALeaveController.java
| @@ -61,7 +61,7 @@ public class OALeaveController { | @@ -61,7 +61,7 @@ public class OALeaveController { | ||
| 61 | 61 | ||
| 62 | @DeleteMapping("/delete") | 62 | @DeleteMapping("/delete") |
| 63 | @ApiOperation("删除请假申请") | 63 | @ApiOperation("删除请假申请") |
| 64 | - @ApiImplicitParam(name = "id", value = "编号", required = true) | 64 | + @ApiImplicitParam(name = "id", value = "编号", required = true, dataTypeClass = Long.class) |
| 65 | @PreAuthorize("@ss.hasPermission('oa:leave:delete')") | 65 | @PreAuthorize("@ss.hasPermission('oa:leave:delete')") |
| 66 | public CommonResult<Boolean> deleteLeave(@RequestParam("id") Long id) { | 66 | public CommonResult<Boolean> deleteLeave(@RequestParam("id") Long id) { |
| 67 | leaveService.deleteLeave(id); | 67 | leaveService.deleteLeave(id); |
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/controller/file/InfFileController.java
| @@ -54,7 +54,7 @@ public class InfFileController { | @@ -54,7 +54,7 @@ public class InfFileController { | ||
| 54 | 54 | ||
| 55 | @DeleteMapping("/delete") | 55 | @DeleteMapping("/delete") |
| 56 | @ApiOperation("删除文件") | 56 | @ApiOperation("删除文件") |
| 57 | - @ApiImplicitParam(name = "id", value = "编号", required = true) | 57 | + @ApiImplicitParam(name = "id", value = "编号", required = true, dataTypeClass = String.class) |
| 58 | @PreAuthorize("@ss.hasPermission('infra:file:delete')") | 58 | @PreAuthorize("@ss.hasPermission('infra:file:delete')") |
| 59 | public CommonResult<Boolean> deleteFile(@RequestParam("id") String id) { | 59 | public CommonResult<Boolean> deleteFile(@RequestParam("id") String id) { |
| 60 | fileCoreService.deleteFile(id); | 60 | fileCoreService.deleteFile(id); |
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/system/controller/errorcode/SysErrorCodeController.java
| @@ -50,7 +50,7 @@ public class SysErrorCodeController { | @@ -50,7 +50,7 @@ public class SysErrorCodeController { | ||
| 50 | 50 | ||
| 51 | @DeleteMapping("/delete") | 51 | @DeleteMapping("/delete") |
| 52 | @ApiOperation("删除错误码") | 52 | @ApiOperation("删除错误码") |
| 53 | - @ApiImplicitParam(name = "id", value = "编号", required = true) | 53 | + @ApiImplicitParam(name = "id", value = "编号", required = true, dataTypeClass = Long.class) |
| 54 | @PreAuthorize("@ss.hasPermission('system:error-code:delete')") | 54 | @PreAuthorize("@ss.hasPermission('system:error-code:delete')") |
| 55 | public CommonResult<Boolean> deleteErrorCode(@RequestParam("id") Long id) { | 55 | public CommonResult<Boolean> deleteErrorCode(@RequestParam("id") Long id) { |
| 56 | errorCodeService.deleteErrorCode(id); | 56 | errorCodeService.deleteErrorCode(id); |
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/system/controller/sms/SysSmsChannelController.java
| @@ -44,7 +44,7 @@ public class SysSmsChannelController { | @@ -44,7 +44,7 @@ public class SysSmsChannelController { | ||
| 44 | 44 | ||
| 45 | @DeleteMapping("/delete") | 45 | @DeleteMapping("/delete") |
| 46 | @ApiOperation("删除短信渠道") | 46 | @ApiOperation("删除短信渠道") |
| 47 | - @ApiImplicitParam(name = "id", value = "编号", required = true) | 47 | + @ApiImplicitParam(name = "id", value = "编号", required = true, dataTypeClass = Long.class) |
| 48 | @PreAuthorize("@ss.hasPermission('system:sms-channel:delete')") | 48 | @PreAuthorize("@ss.hasPermission('system:sms-channel:delete')") |
| 49 | public CommonResult<Boolean> deleteSmsChannel(@RequestParam("id") Long id) { | 49 | public CommonResult<Boolean> deleteSmsChannel(@RequestParam("id") Long id) { |
| 50 | smsChannelService.deleteSmsChannel(id); | 50 | smsChannelService.deleteSmsChannel(id); |
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/system/controller/sms/SysSmsTemplateController.java
| @@ -51,7 +51,7 @@ public class SysSmsTemplateController { | @@ -51,7 +51,7 @@ public class SysSmsTemplateController { | ||
| 51 | 51 | ||
| 52 | @DeleteMapping("/delete") | 52 | @DeleteMapping("/delete") |
| 53 | @ApiOperation("删除短信模板") | 53 | @ApiOperation("删除短信模板") |
| 54 | - @ApiImplicitParam(name = "id", value = "编号", required = true) | 54 | + @ApiImplicitParam(name = "id", value = "编号", required = true, dataTypeClass = Long.class) |
| 55 | @PreAuthorize("@ss.hasPermission('system:sms-template:delete')") | 55 | @PreAuthorize("@ss.hasPermission('system:sms-template:delete')") |
| 56 | public CommonResult<Boolean> deleteSmsTemplate(@RequestParam("id") Long id) { | 56 | public CommonResult<Boolean> deleteSmsTemplate(@RequestParam("id") Long id) { |
| 57 | smsTemplateService.deleteSmsTemplate(id); | 57 | smsTemplateService.deleteSmsTemplate(id); |
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/system/controller/tenant/SysTenantController.java
| @@ -57,7 +57,7 @@ public class SysTenantController { | @@ -57,7 +57,7 @@ public class SysTenantController { | ||
| 57 | 57 | ||
| 58 | @DeleteMapping("/delete") | 58 | @DeleteMapping("/delete") |
| 59 | @ApiOperation("删除租户") | 59 | @ApiOperation("删除租户") |
| 60 | - @ApiImplicitParam(name = "id", value = "编号", required = true) | 60 | + @ApiImplicitParam(name = "id", value = "编号", required = true, dataTypeClass = Long.class) |
| 61 | @PreAuthorize("@ss.hasPermission('system:tenant:delete')") | 61 | @PreAuthorize("@ss.hasPermission('system:tenant:delete')") |
| 62 | public CommonResult<Boolean> deleteTenant(@RequestParam("id") Long id) { | 62 | public CommonResult<Boolean> deleteTenant(@RequestParam("id") Long id) { |
| 63 | tenantService.deleteTenant(id); | 63 | tenantService.deleteTenant(id); |
yudao-admin-server/src/main/resources/application.yaml
| @@ -22,10 +22,10 @@ spring: | @@ -22,10 +22,10 @@ spring: | ||
| 22 | 22 | ||
| 23 | # 工作流 Activiti 配置 | 23 | # 工作流 Activiti 配置 |
| 24 | activiti: | 24 | activiti: |
| 25 | - # 1.false: 默认值,activiti启动时,对比数据库表中保存的版本,如果不匹配。将抛出异常 | ||
| 26 | - # 2.true: 启动时会对数据库中所有表进行更新操作,如果表存在,不做处理,反之,自动创建表 | ||
| 27 | - # 3.create_drop: 启动时自动创建表,关闭时自动删除表 | ||
| 28 | - # 4.drop_create: 启动时,删除旧表,再创建新表 | 25 | + # 1. false: 默认值,activiti启动时,对比数据库表中保存的版本,如果不匹配。将抛出异常 |
| 26 | + # 2. true: 启动时会对数据库中所有表进行更新操作,如果表存在,不做处理,反之,自动创建表 | ||
| 27 | + # 3. create_drop: 启动时自动创建表,关闭时自动删除表 | ||
| 28 | + # 4. drop_create: 启动时,删除旧表,再创建新表 | ||
| 29 | database-schema-update: false # 设置为 false,可通过 sql/activiti.sql 初始化 | 29 | database-schema-update: false # 设置为 false,可通过 sql/activiti.sql 初始化 |
| 30 | # activiti7 默认不生成历史信息表,需手动设置开启 | 30 | # activiti7 默认不生成历史信息表,需手动设置开启 |
| 31 | db-history-used: true | 31 | db-history-used: true |
yudao-admin-server/src/main/resources/codegen/java/controller/controller.vm
| @@ -54,7 +54,7 @@ public class ${table.className}Controller { | @@ -54,7 +54,7 @@ public class ${table.className}Controller { | ||
| 54 | 54 | ||
| 55 | @DeleteMapping("/delete") | 55 | @DeleteMapping("/delete") |
| 56 | @ApiOperation("删除${table.classComment}") | 56 | @ApiOperation("删除${table.classComment}") |
| 57 | - @ApiImplicitParam(name = "id", value = "编号", required = true) | 57 | + @ApiImplicitParam(name = "id", value = "编号", required = true, dataTypeClass = ${primaryColumn.javaType}.class) |
| 58 | @PreAuthorize("@ss.hasPermission('${permissionPrefix}:delete')") | 58 | @PreAuthorize("@ss.hasPermission('${permissionPrefix}:delete')") |
| 59 | public CommonResult<Boolean> delete${simpleClassName}(@RequestParam("id") ${primaryColumn.javaType} id) { | 59 | public CommonResult<Boolean> delete${simpleClassName}(@RequestParam("id") ${primaryColumn.javaType} id) { |
| 60 | ${classNameVar}Service.delete${simpleClassName}(id); | 60 | ${classNameVar}Service.delete${simpleClassName}(id); |
更新日志.md
| @@ -46,6 +46,7 @@ | @@ -46,6 +46,7 @@ | ||
| 46 | ### 🐞 Bug Fixes | 46 | ### 🐞 Bug Fixes |
| 47 | 47 | ||
| 48 | * 【修复】biz-data-permission 组件的缓存机制,导致部分 SQL 未进行数据过滤 | 48 | * 【修复】biz-data-permission 组件的缓存机制,导致部分 SQL 未进行数据过滤 |
| 49 | +* 【修复】codegen 生成代码时,delete 接口补充 dataTypeClass 属性,避免 Swagger 打印 WARN 日志 | ||
| 49 | 50 | ||
| 50 | ### 🔨 Dependency Upgrades | 51 | ### 🔨 Dependency Upgrades |
| 51 | 52 |