manager/my-worker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

service 新增 getAndValid(entity) 替换 get(pkClass, pkValue, isNewRecord)

Browse Source 
方法，为了更好支持复合主键和服务接口
This commit is contained in:
thinkgem
2020-03-08 00:50:26 +08:00
parent 8a7f73a7b8
commit b3d1d1b344
4 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
modules/core/src/main/java/com/jeesite/modules/sys/web/user/EmpUserController.java
View File

@@ -73,7 +73,10 @@ public class EmpUserController extends BaseController {
@ModelAttribute @ModelAttribute
public EmpUser get(String userCode, boolean isNewRecord) { public EmpUser get(String userCode, boolean isNewRecord) {
return empUserService.get(userCode, isNewRecord); EmpUser empUser = new EmpUser();
empUser.setUserCode(userCode);
empUser.setIsNewRecord(isNewRecord);
return empUserService.getAndValid(empUser);
} }
@RequiresPermissions("sys:empUser:view") @RequiresPermissions("sys:empUser:view")

8
modules/core/src/main/resources/templates/modules/gen/crud/controller.xml
View File

@@ -63,8 +63,12 @@ public class ${ClassName}Controller extends BaseController {
<% if (table.pkList.~size == 1){ %> <% if (table.pkList.~size == 1){ %>
return ${className}Service.get(<% for(pk in table.pkList){ %>${pkLP.index!=1?', ':''}${pk.simpleAttrName}<% } %>, isNewRecord); return ${className}Service.get(<% for(pk in table.pkList){ %>${pkLP.index!=1?', ':''}${pk.simpleAttrName}<% } %>, isNewRecord);
<% }else{ %> <% }else{ %>
return ${className}Service.get(new Class<?>[]{<% for(pk in table.pkList){ %>${pkLP.index!=1?', ':''}${pk.simpleAttrType}.class<% } %>}, ${ClassName} ${className} = new ${ClassName}();
new Object[]{<% for(pk in table.pkList){ %>${pkLP.index!=1?', ':''}${pk.simpleAttrName}<% } %>}, isNewRecord); <% for(pk in table.pkList){ %>
${className}.set${@StringUtils.cap(pk.simpleAttrName)}(${pk.simpleAttrName});
<% } %>
${className}.setIsNewRecord(isNewRecord);
return ${className}Service.getAndValid(${className});
<% } %> <% } %>
} }

2
modules/core/src/main/resources/templates/modules/gen/crud/entity.xml
View File

@@ -199,7 +199,7 @@ public class ${ClassName} extends ${table.isTreeEntity?'Tree':'Data'}Entity<${Cl
%> %>
public ${ClassName}() { public ${ClassName}() {
this(null); this(<% for(pk in table.pkList){ %>${pkLP.index!=1?', ':''}null<% } %>);
} }
<% <%

8
modules/core/src/main/resources/templates/modules/gen/query/controller.xml
View File

@@ -61,8 +61,12 @@ public class ${ClassName}Controller extends BaseController {
<% if (table.pkList.~size == 1){ %> <% if (table.pkList.~size == 1){ %>
return ${className}Service.get(<% for(pk in table.pkList){ %>${pkLP.index!=1?', ':''}${pk.simpleAttrName}<% } %>, isNewRecord); return ${className}Service.get(<% for(pk in table.pkList){ %>${pkLP.index!=1?', ':''}${pk.simpleAttrName}<% } %>, isNewRecord);
<% }else{ %> <% }else{ %>
return ${className}Service.get(new Class<?>[]{<% for(pk in table.pkList){ %>${pkLP.index!=1?', ':''}${pk.simpleAttrType}.class<% } %>}, ${ClassName} ${className} = new ${ClassName}();
new Object[]{<% for(pk in table.pkList){ %>${pkLP.index!=1?', ':''}${pk.simpleAttrName}<% } %>}, isNewRecord); <% for(pk in table.pkList){ %>
${className}.set${@StringUtils.cap(pk.simpleAttrName)}(${pk.simpleAttrName});
<% } %>
${className}.setIsNewRecord(isNewRecord);
return ${className}Service.getAndValid(${className});
<% } %> <% } %>
} }