BJ_ZTEITS-Developers / parking-cloud-yudao

Commit c26c4414b4ae037394080dcab4e4bbbc62fcabdc

Authored by puhui999
1 parent b7ab1030

fix: 代码生成 review todo 修改

Inline Side-by-side
Showing 14 changed files with 70 additions and 67 deletions
yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/demo/demo01/Demo01ContactController.java
  View file @c26c441
... ... @@ -65,7 +65,7 @@ public class Demo01ContactController {
65 65 @Operation(summary = "批量删除示例联系人")
66 66 @PreAuthorize("@ss.hasPermission('infra:demo01-contact:delete')")
67 67 public CommonResult<Boolean> deleteDemo0iContactList(@RequestParam("ids") List<Long> ids) {
68   - demo01ContactService.deleteDemo0iContactListByIds(ids);
  68 + demo01ContactService.deleteDemo0iContactList(ids);
69 69 return success(true);
70 70 }
71 71  
... ...
yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/demo/demo03/erp/Demo03StudentErpController.java
  View file @c26c441
... ... @@ -67,8 +67,7 @@ public class Demo03StudentErpController {
67 67 @Operation(summary = "批量删除学生")
68 68 @PreAuthorize("@ss.hasPermission('infra:demo03-student:delete')")
69 69 public CommonResult<Boolean> deleteDemo03StudentList(@RequestParam("ids") List<Long> ids) {
70   - // TODO @puhui999：deleteDemo03StudentList
71   - demo03StudentErpService.deleteDemo03StudentListByIds(ids);
  70 + demo03StudentErpService.deleteDemo03StudentList(ids);
72 71 return success(true);
73 72 }
74 73  
... ... @@ -142,7 +141,7 @@ public class Demo03StudentErpController {
142 141 @Operation(summary = "批量删除学生课程")
143 142 @PreAuthorize("@ss.hasPermission('infra:demo03-student:delete')")
144 143 public CommonResult<Boolean> deleteDemo03CourseList(@RequestParam("ids") List<Long> ids) {
145   - demo03StudentErpService.deleteDemo03CourseListByIds(ids);
  144 + demo03StudentErpService.deleteDemo03CourseList(ids);
146 145 return success(true);
147 146 }
148 147  
... ... @@ -194,7 +193,7 @@ public class Demo03StudentErpController {
194 193 @Operation(summary = "批量删除学生班级")
195 194 @PreAuthorize("@ss.hasPermission('infra:demo03-student:delete')")
196 195 public CommonResult<Boolean> deleteDemo03GradeList(@RequestParam("ids") List<Long> ids) {
197   - demo03StudentErpService.deleteDemo03GradeListByIds(ids);
  196 + demo03StudentErpService.deleteDemo03GradeList(ids);
198 197 return success(true);
199 198 }
200 199  
... ...
yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/demo/demo03/inner/Demo03StudentInnerController.java
  View file @c26c441
... ... @@ -67,7 +67,7 @@ public class Demo03StudentInnerController {
67 67 @Operation(summary = "批量删除学生")
68 68 @PreAuthorize("@ss.hasPermission('infra:demo03-student:delete')")
69 69 public CommonResult<Boolean> deleteDemo03StudentList(@RequestParam("ids") List<Long> ids) {
70   - demo03StudentInnerService.deleteDemo03StudentListByIds(ids);
  70 + demo03StudentInnerService.deleteDemo03StudentList(ids);
71 71 return success(true);
72 72 }
73 73  
... ...
yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/demo/demo03/normal/Demo03StudentNormalController.java
  View file @c26c441
... ... @@ -67,7 +67,7 @@ public class Demo03StudentNormalController {
67 67 @Operation(summary = "批量删除学生")
68 68 @PreAuthorize("@ss.hasPermission('infra:demo03-student:delete')")
69 69 public CommonResult<Boolean> deleteDemo03StudentList(@RequestParam("ids") List<Long> ids) {
70   - demo03StudentNormalService.deleteDemo03StudentListByIds(ids);
  70 + demo03StudentNormalService.deleteDemo03StudentList(ids);
71 71 return success(true);
72 72 }
73 73  
... ...
yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/service/demo/demo01/Demo01ContactService.java
  View file @c26c441
... ... @@ -42,7 +42,7 @@ public interface Demo01ContactService {
42 42 *
43 43 * @param ids 编号
44 44 */
45   - void deleteDemo0iContactListByIds(List<Long> ids);
  45 + void deleteDemo0iContactList(List<Long> ids);
46 46  
47 47 /**
48 48 * 获得示例联系人
... ...
yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/service/demo/demo01/Demo01ContactServiceImpl.java
  View file @c26c441
... ... @@ -55,7 +55,7 @@ public class Demo01ContactServiceImpl implements Demo01ContactService {
55 55 }
56 56  
57 57 @Override
58   - public void deleteDemo0iContactListByIds(List<Long> ids) {
  58 + public void deleteDemo0iContactList(List<Long> ids) {
59 59 // 校验存在
60 60 validateDemo01ContactExists(ids);
61 61 // 删除
... ...
yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/service/demo/demo03/erp/Demo03StudentErpService.java
  View file @c26c441
... ... @@ -45,7 +45,7 @@ public interface Demo03StudentErpService {
45 45 *
46 46 * @param ids 编号
47 47 */
48   - void deleteDemo03StudentListByIds(List<Long> ids);
  48 + void deleteDemo03StudentList(List<Long> ids);
49 49  
50 50 /**
51 51 * 获得学生
... ... @@ -101,7 +101,7 @@ public interface Demo03StudentErpService {
101 101 *
102 102 * @param ids 编号
103 103 */
104   - void deleteDemo03CourseListByIds(List<Long> ids);
  104 + void deleteDemo03CourseList(List<Long> ids);
105 105  
106 106 /**
107 107 * 获得学生课程
... ... @@ -149,7 +149,7 @@ public interface Demo03StudentErpService {
149 149 *
150 150 * @param ids 编号
151 151 */
152   - void deleteDemo03GradeListByIds(List<Long> ids);
  152 + void deleteDemo03GradeList(List<Long> ids);
153 153  
154 154 /**
155 155 * 获得学生班级
... ...
yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/service/demo/demo03/erp/Demo03StudentErpServiceImpl.java
  View file @c26c441
... ... @@ -71,7 +71,7 @@ public class Demo03StudentErpServiceImpl implements Demo03StudentErpService {
71 71  
72 72 @Override
73 73 @Transactional(rollbackFor = Exception.class)
74   - public void deleteDemo03StudentListByIds(List<Long> ids) {
  74 + public void deleteDemo03StudentList(List<Long> ids) {
75 75 // 校验存在
76 76 validateDemo03StudentExists(ids);
77 77 // 删除
... ... @@ -134,7 +134,7 @@ public class Demo03StudentErpServiceImpl implements Demo03StudentErpService {
134 134 }
135 135  
136 136 @Override
137   - public void deleteDemo03CourseListByIds(List<Long> ids) {
  137 + public void deleteDemo03CourseList(List<Long> ids) {
138 138 // 删除
139 139 demo03CourseErpMapper.deleteByIds(ids);
140 140 }
... ... @@ -192,7 +192,7 @@ public class Demo03StudentErpServiceImpl implements Demo03StudentErpService {
192 192 }
193 193  
194 194 @Override
195   - public void deleteDemo03GradeListByIds(List<Long> ids) {
  195 + public void deleteDemo03GradeList(List<Long> ids) {
196 196 // 删除
197 197 demo03GradeErpMapper.deleteByIds(ids);
198 198 }
... ...
yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/service/demo/demo03/inner/Demo03StudentInnerService.java
  View file @c26c441
... ... @@ -44,7 +44,7 @@ public interface Demo03StudentInnerService {
44 44 *
45 45 * @param ids 编号
46 46 */
47   - void deleteDemo03StudentListByIds(List<Long> ids);
  47 + void deleteDemo03StudentList(List<Long> ids);
48 48  
49 49 /**
50 50 * 获得学生
... ...
yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/service/demo/demo03/inner/Demo03StudentInnerServiceImpl.java
  View file @c26c441
... ... @@ -83,7 +83,7 @@ public class Demo03StudentInnerServiceImpl implements Demo03StudentInnerService
83 83  
84 84 @Override
85 85 @Transactional(rollbackFor = Exception.class)
86   - public void deleteDemo03StudentListByIds(List<Long> ids) {
  86 + public void deleteDemo03StudentList(List<Long> ids) {
87 87 // 校验存在
88 88 validateDemo03StudentExists(ids);
89 89 // 删除
... ...
yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/service/demo/demo03/normal/Demo03StudentNormalService.java
  View file @c26c441
... ... @@ -44,7 +44,7 @@ public interface Demo03StudentNormalService {
44 44 *
45 45 * @param ids 编号
46 46 */
47   - void deleteDemo03StudentListByIds(List<Long> ids);
  47 + void deleteDemo03StudentList(List<Long> ids);
48 48  
49 49 /**
50 50 * 获得学生
... ...
yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/service/demo/demo03/normal/Demo03StudentNormalServiceImpl.java
  View file @c26c441
... ... @@ -83,7 +83,7 @@ public class Demo03StudentNormalServiceImpl implements Demo03StudentNormalServic
83 83  
84 84 @Override
85 85 @Transactional(rollbackFor = Exception.class)
86   - public void deleteDemo03StudentListByIds(List<Long> ids) {
  86 + public void deleteDemo03StudentList(List<Long> ids) {
87 87 // 校验存在
88 88 validateDemo03StudentExists(ids);
89 89 // 删除
... ...
yudao-module-infra/src/main/resources/codegen/java/service/serviceImpl.vm
  View file @c26c441
... ... @@ -65,10 +65,13 @@ public class ${table.className}ServiceImpl implements ${table.className}Service
65 65 #end
66 66 // 插入
67 67 #if ($voType == 10)
68   -## TODO @puhui999：insert 也要加下 clean。万一前端乱传递，哈哈哈。这个就是 do 模式的缺点；（只在 do 模式下）；看看主子表，是不是也可能存在，insert 的时候；
69 68 ${table.className}DO ${classNameVar} = BeanUtils.toBean(createReqVO, ${table.className}DO.class);
70   -#end
71 69 ${classNameVar}Mapper.insert(${classNameVar});
  70 +#else
  71 + ${saveReqVOVar}.clean() // 清理掉创建、更新时间等相关属性值
  72 + ${classNameVar}Mapper.insert(${saveReqVOVar});
  73 +#end
  74 +
72 75 ## 特殊：主子表专属逻辑（非 ERP 模式）
73 76 #if ( $subTables && $subTables.size() > 0 && $table.templateType != 11 )
74 77  
... ... @@ -112,6 +115,7 @@ public class ${table.className}ServiceImpl implements ${table.className}Service
112 115 ${table.className}DO updateObj = BeanUtils.toBean(updateReqVO, ${table.className}DO.class);
113 116 ${classNameVar}Mapper.updateById(updateObj);
114 117 #else
  118 + ${updateReqVOVar}.clean() // 清理掉创建、更新时间等相关属性值
115 119 ${classNameVar}Mapper.updateById(${updateReqVOVar});
116 120 #end
117 121 ## 特殊：主子表专属逻辑（非 ERP 模式）
... ... @@ -320,6 +324,7 @@ public class ${table.className}ServiceImpl implements ${table.className}Service
320 324 }
321 325 // 插入
322 326 #end
  327 + ${subClassNameVar}.clean() // 清理掉创建、更新时间等相关属性值
323 328 ${subClassNameVars.get($index)}Mapper.insert(${subClassNameVar});
324 329 return ${subClassNameVar}.getId();
325 330 }
... ...
yudao-module-infra/src/main/resources/codegen/vue3_vben5_antd/general/api/api.ts.vm
  View file @c26c441
... ... @@ -102,7 +102,6 @@ export function export${simpleClassName}(params: any) {
102 102 }
103 103  
104 104 ## 特殊：主子表专属逻辑
105   -## TODO @puhui999：下面这块缩进调整了，会乱掉么？
106 105 #foreach ($subTable in $subTables)
107 106 #set ($index = $foreach.count - 1)
108 107 #set ($subSimpleClassName = $subSimpleClassNames.get($index))
... ... @@ -115,54 +114,54 @@ export function export${simpleClassName}(params: any) {
115 114  
116 115 // ==================== 子表（$subTable.classComment） ====================
117 116  
118   - ## 情况一：MASTER_ERP 时，需要分查询页子表
119   - #if ( $table.templateType == 11 )
120   - /** 获得${subTable.classComment}分页 */
121   - export function get${subSimpleClassName}Page(params: PageParam) {
122   - return requestClient.get<PageResult<${simpleClassName}Api.${subSimpleClassName}>>(`${baseURL}/${subSimpleClassName_strikeCase}/page`, { params });
123   - }
124   - ## 情况二：非 MASTER_ERP 时，需要列表查询子表
125   - #else
126   - #if ( $subTable.subJoinMany )
127   - /** 获得${subTable.classComment}列表 */
128   - export function get${subSimpleClassName}ListBy${SubJoinColumnName}(${subJoinColumn.javaField}: number) {
129   - return requestClient.get<${simpleClassName}Api.${subSimpleClassName}[]>(`${baseURL}/${subSimpleClassName_strikeCase}/list-by-${subJoinColumn_strikeCase}?${subJoinColumn.javaField}=${${subJoinColumn.javaField}}`);
130   - }
131   - #else
132   - /** 获得${subTable.classComment} */
133   - export function get${subSimpleClassName}By${SubJoinColumnName}(${subJoinColumn.javaField}: number) {
134   - return requestClient.get<${simpleClassName}Api.${subSimpleClassName}>(`${baseURL}/${subSimpleClassName_strikeCase}/get-by-${subJoinColumn_strikeCase}?${subJoinColumn.javaField}=${${subJoinColumn.javaField}}`);
135   - }
136   - #end
137   - #end
138   - ## 特殊：MASTER_ERP 时，支持单个的新增、修改、删除操作
139   - #if ( $table.templateType == 11 )
140   - /** 新增${subTable.classComment} */
141   - export function create${subSimpleClassName}(data: ${simpleClassName}Api.${subSimpleClassName}) {
142   - return requestClient.post(`${baseURL}/${subSimpleClassName_strikeCase}/create`, data);
143   - }
  117 +## 情况一：MASTER_ERP 时，需要分查询页子表
  118 +#if ( $table.templateType == 11 )
  119 +/** 获得${subTable.classComment}分页 */
  120 +export function get${subSimpleClassName}Page(params: PageParam) {
  121 + return requestClient.get<PageResult<${simpleClassName}Api.${subSimpleClassName}>>(`${baseURL}/${subSimpleClassName_strikeCase}/page`, { params });
  122 +}
  123 + ## 情况二：非 MASTER_ERP 时，需要列表查询子表
  124 +#else
  125 +#if ( $subTable.subJoinMany )
  126 +/** 获得${subTable.classComment}列表 */
  127 +export function get${subSimpleClassName}ListBy${SubJoinColumnName}(${subJoinColumn.javaField}: number) {
  128 + return requestClient.get<${simpleClassName}Api.${subSimpleClassName}[]>(`${baseURL}/${subSimpleClassName_strikeCase}/list-by-${subJoinColumn_strikeCase}?${subJoinColumn.javaField}=${${subJoinColumn.javaField}}`);
  129 +}
  130 +#else
  131 +/** 获得${subTable.classComment} */
  132 +export function get${subSimpleClassName}By${SubJoinColumnName}(${subJoinColumn.javaField}: number) {
  133 + return requestClient.get<${simpleClassName}Api.${subSimpleClassName}>(`${baseURL}/${subSimpleClassName_strikeCase}/get-by-${subJoinColumn_strikeCase}?${subJoinColumn.javaField}=${${subJoinColumn.javaField}}`);
  134 +}
  135 +#end
  136 +#end
  137 +## 特殊：MASTER_ERP 时，支持单个的新增、修改、删除操作
  138 +#if ( $table.templateType == 11 )
  139 +/** 新增${subTable.classComment} */
  140 +export function create${subSimpleClassName}(data: ${simpleClassName}Api.${subSimpleClassName}) {
  141 + return requestClient.post(`${baseURL}/${subSimpleClassName_strikeCase}/create`, data);
  142 +}
144 143  
145   - /** 修改${subTable.classComment} */
146   - export function update${subSimpleClassName}(data: ${simpleClassName}Api.${subSimpleClassName}) {
147   - return requestClient.put(`${baseURL}/${subSimpleClassName_strikeCase}/update`, data);
148   - }
  144 +/** 修改${subTable.classComment} */
  145 +export function update${subSimpleClassName}(data: ${simpleClassName}Api.${subSimpleClassName}) {
  146 + return requestClient.put(`${baseURL}/${subSimpleClassName_strikeCase}/update`, data);
  147 +}
149 148  
150   - /** 删除${subTable.classComment} */
151   - export function delete${subSimpleClassName}(id: number) {
152   - return requestClient.delete(`${baseURL}/${subSimpleClassName_strikeCase}/delete?id=${id}`);
153   - }
  149 +/** 删除${subTable.classComment} */
  150 +export function delete${subSimpleClassName}(id: number) {
  151 + return requestClient.delete(`${baseURL}/${subSimpleClassName_strikeCase}/delete?id=${id}`);
  152 +}
154 153  
155   - #if ($deleteBatchEnable)
156   - /** 批量删除${subTable.classComment} */
157   - export function delete${subSimpleClassName}List(ids: number[]) {
158   - return requestClient.delete(`${baseURL}/${subSimpleClassName_strikeCase}/delete-list?ids=${ids.join(',')}`)
159   - }
160   - #end
  154 +#if ($deleteBatchEnable)
  155 +/** 批量删除${subTable.classComment} */
  156 +export function delete${subSimpleClassName}List(ids: number[]) {
  157 + return requestClient.delete(`${baseURL}/${subSimpleClassName_strikeCase}/delete-list?ids=${ids.join(',')}`)
  158 +}
  159 +#end
161 160  
162   - /** 获得${subTable.classComment} */
163   - export function get${subSimpleClassName}(id: number) {
164   - return requestClient.get<${simpleClassName}Api.${subSimpleClassName}>(`${baseURL}/${subSimpleClassName_strikeCase}/get?id=${id}`);
165   - }
166   - #end
  161 +/** 获得${subTable.classComment} */
  162 +export function get${subSimpleClassName}(id: number) {
  163 + return requestClient.get<${simpleClassName}Api.${subSimpleClassName}>(`${baseURL}/${subSimpleClassName_strikeCase}/get?id=${id}`);
  164 +}
  165 +#end
167 166 #end
168 167  
... ...