zhouweidong 发布系统代码

app_web/src/service/sys-team/sys-team-service-base.ts

@@ -4,7 +4,7 @@ import EntityService from '../entity-service';
 
 
 /**
- * 组1服务对象基类
+ * 组服务对象基类
  *
  * @export
  * @class SysTeamServiceBase

app_web/src/service/sys-team/sys-team-service.ts

@@ -3,7 +3,7 @@ import SysTeamServiceBase from './sys-team-service-base';
 
 
 /**
- * 组1服务对象
+ * 组服务对象
  *
  * @export
  * @class SysTeamService

app_web/src/uiservice/sys-team/sys-team-ui-service-base.ts

@@ -5,7 +5,7 @@ import { Subject } from 'rxjs';
 import SysTeamService from '@/service/sys-team/sys-team-service';
 
 /**
- * 组1UI服务对象基类
+ * 组UI服务对象基类
  *
  * @export
  * @class SysTeamUIServiceBase

app_web/src/uiservice/sys-team/sys-team-ui-service.ts

 import SysTeamUIServiceBase from './sys-team-ui-service-base';
 
 /**
- * 组1UI服务对象
+ * 组UI服务对象
  *
  * @export
  * @class SysTeamUIService

app_web/src/widgets/sys-team/default-searchform/default-searchform-service.ts

@@ -13,7 +13,7 @@ import DefaultModel from './default-searchform-model';
 export default class DefaultService extends ControlService {
 
     /**
-     * 组1服务对象
+     * 组服务对象
      *
      * @type {SysTeamService}
      * @memberof DefaultService

app_web/src/widgets/sys-team/main-form/main-form-service.ts

@@ -13,7 +13,7 @@ import MainModel from './main-form-model';
 export default class MainService extends ControlService {
 
     /**
-     * 组1服务对象
+     * 组服务对象
      *
      * @type {SysTeamService}
      * @memberof MainService

app_web/src/widgets/sys-team/main-grid/main-grid-service.ts

@@ -13,7 +13,7 @@ import MainModel from './main-grid-model';
 export default class MainService extends ControlService {
 
     /**
-     * 组1服务对象
+     * 组服务对象
      *
      * @type {SysTeamService}
      * @memberof MainService

ibzou-core/src/main/java/cn/ibizlab/core/ou/domain/SysTeam.java

@@ -29,7 +29,7 @@ import com.baomidou.mybatisplus.annotation.*;
 import cn.ibizlab.util.domain.EntityMP;
 
 /**
- * 实体[组1]
+ * 实体[组]
  */
 @Getter
 @Setter

ibzou-core/src/main/java/cn/ibizlab/core/ou/service/impl/SysTeamServiceImpl.java

@@ -40,7 +40,7 @@ import com.alibaba.fastjson.JSONObject;
 import org.springframework.util.StringUtils;
 
 /**
- * 实体[组1] 服务对象接口实现
+ * 实体[组] 服务对象接口实现
  */
 @Slf4j
 @Service("SysTeamServiceImpl")

ibzou-core/src/main/resources/permission/systemResource.json

@@ -29,7 +29,7 @@
      }
     ,    {
     "dename":"SysTeam",
-    "delogicname":"组1",
+    "delogicname":"组",
     "sysmoudle":{"id":"OU","name":"ou"},
     "dedataset":[{"id":"Default" , "name":"DEFAULT"}],
     "deaction":[{"id":"Create" , "name":"Create" , "type":"BUILTIN" },{"id":"Update" , "name":"Update" , "type":"BUILTIN" },{"id":"Remove" , "name":"Remove" , "type":"BUILTIN" },{"id":"Get" , "name":"Get" , "type":"BUILTIN" },{"id":"GetDraft" , "name":"GetDraft" , "type":"BUILTIN" },{"id":"CheckKey" , "name":"CheckKey" , "type":"BUILTIN" },{"id":"Save" , "name":"Save" , "type":"BUILTIN" }],

ibzou-provider/ibzou-provider-api/src/main/java/cn/ibizlab/api/rest/SysTeamMemberResource.java

@@ -285,7 +285,7 @@ public class SysTeamMemberResource {
                 .body(new PageImpl(systeammemberMapping.toDto(domains.getContent()), context.getPageable(), domains.getTotalElements()));
 	}
     @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzou-SysTeamMember-Create-all')")
-    @ApiOperation(value = "根据组1建立组成员", tags = {"组成员" },  notes = "根据组1建立组成员")
+    @ApiOperation(value = "根据组建立组成员", tags = {"组成员" },  notes = "根据组建立组成员")
 	@RequestMapping(method = RequestMethod.POST, value = "/systeams/{systeam_id}/systeammembers")
     public ResponseEntity<SysTeamMemberDTO> createBySysTeam(@PathVariable("systeam_id") String systeam_id, @RequestBody SysTeamMemberDTO systeammemberdto) {
         SysTeamMember domain = systeammemberMapping.toDomain(systeammemberdto);
@@ -296,7 +296,7 @@ public class SysTeamMemberResource {
     }
 
     @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzou-SysTeamMember-Create-all')")
-    @ApiOperation(value = "根据组1批量建立组成员", tags = {"组成员" },  notes = "根据组1批量建立组成员")
+    @ApiOperation(value = "根据组批量建立组成员", tags = {"组成员" },  notes = "根据组批量建立组成员")
 	@RequestMapping(method = RequestMethod.POST, value = "/systeams/{systeam_id}/systeammembers/batch")
     public ResponseEntity<Boolean> createBatchBySysTeam(@PathVariable("systeam_id") String systeam_id, @RequestBody List<SysTeamMemberDTO> systeammemberdtos) {
         List<SysTeamMember> domainlist=systeammemberMapping.toDomain(systeammemberdtos);
@@ -308,7 +308,7 @@ public class SysTeamMemberResource {
     }
 
     @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzou-SysTeamMember-Update-all')")
-    @ApiOperation(value = "根据组1更新组成员", tags = {"组成员" },  notes = "根据组1更新组成员")
+    @ApiOperation(value = "根据组更新组成员", tags = {"组成员" },  notes = "根据组更新组成员")
 	@RequestMapping(method = RequestMethod.PUT, value = "/systeams/{systeam_id}/systeammembers/{systeammember_id}")
     public ResponseEntity<SysTeamMemberDTO> updateBySysTeam(@PathVariable("systeam_id") String systeam_id, @PathVariable("systeammember_id") String systeammember_id, @RequestBody SysTeamMemberDTO systeammemberdto) {
         SysTeamMember domain = systeammemberMapping.toDomain(systeammemberdto);
@@ -320,7 +320,7 @@ public class SysTeamMemberResource {
     }
 
     @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzou-SysTeamMember-Update-all')")
-    @ApiOperation(value = "根据组1批量更新组成员", tags = {"组成员" },  notes = "根据组1批量更新组成员")
+    @ApiOperation(value = "根据组批量更新组成员", tags = {"组成员" },  notes = "根据组批量更新组成员")
 	@RequestMapping(method = RequestMethod.PUT, value = "/systeams/{systeam_id}/systeammembers/batch")
     public ResponseEntity<Boolean> updateBatchBySysTeam(@PathVariable("systeam_id") String systeam_id, @RequestBody List<SysTeamMemberDTO> systeammemberdtos) {
         List<SysTeamMember> domainlist=systeammemberMapping.toDomain(systeammemberdtos);
@@ -332,14 +332,14 @@ public class SysTeamMemberResource {
     }
 
     @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzou-SysTeamMember-Remove-all')")
-    @ApiOperation(value = "根据组1删除组成员", tags = {"组成员" },  notes = "根据组1删除组成员")
+    @ApiOperation(value = "根据组删除组成员", tags = {"组成员" },  notes = "根据组删除组成员")
 	@RequestMapping(method = RequestMethod.DELETE, value = "/systeams/{systeam_id}/systeammembers/{systeammember_id}")
     public ResponseEntity<Boolean> removeBySysTeam(@PathVariable("systeam_id") String systeam_id, @PathVariable("systeammember_id") String systeammember_id) {
 		return ResponseEntity.status(HttpStatus.OK).body(systeammemberService.remove(systeammember_id));
     }
 
     @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzou-SysTeamMember-Remove-all')")
-    @ApiOperation(value = "根据组1批量删除组成员", tags = {"组成员" },  notes = "根据组1批量删除组成员")
+    @ApiOperation(value = "根据组批量删除组成员", tags = {"组成员" },  notes = "根据组批量删除组成员")
 	@RequestMapping(method = RequestMethod.DELETE, value = "/systeams/{systeam_id}/systeammembers/batch")
     public ResponseEntity<Boolean> removeBatchBySysTeam(@RequestBody List<String> ids) {
         systeammemberService.removeBatch(ids);
@@ -347,7 +347,7 @@ public class SysTeamMemberResource {
     }
 
     @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzou-SysTeamMember-Get-all')")
-    @ApiOperation(value = "根据组1获取组成员", tags = {"组成员" },  notes = "根据组1获取组成员")
+    @ApiOperation(value = "根据组获取组成员", tags = {"组成员" },  notes = "根据组获取组成员")
 	@RequestMapping(method = RequestMethod.GET, value = "/systeams/{systeam_id}/systeammembers/{systeammember_id}")
     public ResponseEntity<SysTeamMemberDTO> getBySysTeam(@PathVariable("systeam_id") String systeam_id, @PathVariable("systeammember_id") String systeammember_id) {
         SysTeamMember domain = systeammemberService.get(systeammember_id);
@@ -355,7 +355,7 @@ public class SysTeamMemberResource {
         return ResponseEntity.status(HttpStatus.OK).body(dto);
     }
 
-    @ApiOperation(value = "根据组1获取组成员草稿", tags = {"组成员" },  notes = "根据组1获取组成员草稿")
+    @ApiOperation(value = "根据组获取组成员草稿", tags = {"组成员" },  notes = "根据组获取组成员草稿")
     @RequestMapping(method = RequestMethod.GET, value = "/systeams/{systeam_id}/systeammembers/getdraft")
     public ResponseEntity<SysTeamMemberDTO> getDraftBySysTeam(@PathVariable("systeam_id") String systeam_id) {
         SysTeamMember domain = new SysTeamMember();
@@ -363,14 +363,14 @@ public class SysTeamMemberResource {
         return ResponseEntity.status(HttpStatus.OK).body(systeammemberMapping.toDto(systeammemberService.getDraft(domain)));
     }
 
-    @ApiOperation(value = "根据组1检查组成员", tags = {"组成员" },  notes = "根据组1检查组成员")
+    @ApiOperation(value = "根据组检查组成员", tags = {"组成员" },  notes = "根据组检查组成员")
 	@RequestMapping(method = RequestMethod.POST, value = "/systeams/{systeam_id}/systeammembers/checkkey")
     public ResponseEntity<Boolean> checkKeyBySysTeam(@PathVariable("systeam_id") String systeam_id, @RequestBody SysTeamMemberDTO systeammemberdto) {
         return  ResponseEntity.status(HttpStatus.OK).body(systeammemberService.checkKey(systeammemberMapping.toDomain(systeammemberdto)));
     }
 
     @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzou-SysTeamMember-Save-all')")
-    @ApiOperation(value = "根据组1保存组成员", tags = {"组成员" },  notes = "根据组1保存组成员")
+    @ApiOperation(value = "根据组保存组成员", tags = {"组成员" },  notes = "根据组保存组成员")
 	@RequestMapping(method = RequestMethod.POST, value = "/systeams/{systeam_id}/systeammembers/save")
     public ResponseEntity<Boolean> saveBySysTeam(@PathVariable("systeam_id") String systeam_id, @RequestBody SysTeamMemberDTO systeammemberdto) {
         SysTeamMember domain = systeammemberMapping.toDomain(systeammemberdto);
@@ -379,7 +379,7 @@ public class SysTeamMemberResource {
     }
 
     @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzou-SysTeamMember-Save-all')")
-    @ApiOperation(value = "根据组1批量保存组成员", tags = {"组成员" },  notes = "根据组1批量保存组成员")
+    @ApiOperation(value = "根据组批量保存组成员", tags = {"组成员" },  notes = "根据组批量保存组成员")
 	@RequestMapping(method = RequestMethod.POST, value = "/systeams/{systeam_id}/systeammembers/savebatch")
     public ResponseEntity<Boolean> saveBatchBySysTeam(@PathVariable("systeam_id") String systeam_id, @RequestBody List<SysTeamMemberDTO> systeammemberdtos) {
         List<SysTeamMember> domainlist=systeammemberMapping.toDomain(systeammemberdtos);
@@ -391,7 +391,7 @@ public class SysTeamMemberResource {
     }
 
     @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzou-SysTeamMember-searchDefault-all')")
-	@ApiOperation(value = "根据组1获取DEFAULT", tags = {"组成员" } ,notes = "根据组1获取DEFAULT")
+	@ApiOperation(value = "根据组获取DEFAULT", tags = {"组成员" } ,notes = "根据组获取DEFAULT")
     @RequestMapping(method= RequestMethod.GET , value="/systeams/{systeam_id}/systeammembers/fetchdefault")
 	public ResponseEntity<List<SysTeamMemberDTO>> fetchSysTeamMemberDefaultBySysTeam(@PathVariable("systeam_id") String systeam_id,SysTeamMemberSearchContext context) {
         context.setN_teamid_eq(systeam_id);
@@ -405,7 +405,7 @@ public class SysTeamMemberResource {
 	}
 
     @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzou-SysTeamMember-searchDefault-all')")
-	@ApiOperation(value = "根据组1查询DEFAULT", tags = {"组成员" } ,notes = "根据组1查询DEFAULT")
+	@ApiOperation(value = "根据组查询DEFAULT", tags = {"组成员" } ,notes = "根据组查询DEFAULT")
     @RequestMapping(method= RequestMethod.POST , value="/systeams/{systeam_id}/systeammembers/searchdefault")
 	public ResponseEntity<Page<SysTeamMemberDTO>> searchSysTeamMemberDefaultBySysTeam(@PathVariable("systeam_id") String systeam_id, @RequestBody SysTeamMemberSearchContext context) {
         context.setN_teamid_eq(systeam_id);

ibzou-provider/ibzou-provider-api/src/main/java/cn/ibizlab/api/rest/SysTeamResource.java

@@ -34,7 +34,7 @@ import cn.ibizlab.core.ou.filter.SysTeamSearchContext;
 import cn.ibizlab.util.annotation.VersionCheck;
 
 @Slf4j
-@Api(tags = {"组1" })
+@Api(tags = {"组" })
 @RestController("api-systeam")
 @RequestMapping("")
 public class SysTeamResource {
@@ -47,7 +47,7 @@ public class SysTeamResource {
     public SysTeamMapping systeamMapping;
 
     @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzou-SysTeam-Create-all')")
-    @ApiOperation(value = "新建组1", tags = {"组1" },  notes = "新建组1")
+    @ApiOperation(value = "新建组", tags = {"组" },  notes = "新建组")
 	@RequestMapping(method = RequestMethod.POST, value = "/systeams")
     public ResponseEntity<SysTeamDTO> create(@RequestBody SysTeamDTO systeamdto) {
         SysTeam domain = systeamMapping.toDomain(systeamdto);
@@ -57,7 +57,7 @@ public class SysTeamResource {
     }
 
     @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzou-SysTeam-Create-all')")
-    @ApiOperation(value = "批量新建组1", tags = {"组1" },  notes = "批量新建组1")
+    @ApiOperation(value = "批量新建组", tags = {"组" },  notes = "批量新建组")
 	@RequestMapping(method = RequestMethod.POST, value = "/systeams/batch")
     public ResponseEntity<Boolean> createBatch(@RequestBody List<SysTeamDTO> systeamdtos) {
         systeamService.createBatch(systeamMapping.toDomain(systeamdtos));
@@ -65,7 +65,7 @@ public class SysTeamResource {
     }
 
     @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzou-SysTeam-Update-all')")
-    @ApiOperation(value = "更新组1", tags = {"组1" },  notes = "更新组1")
+    @ApiOperation(value = "更新组", tags = {"组" },  notes = "更新组")
 	@RequestMapping(method = RequestMethod.PUT, value = "/systeams/{systeam_id}")
     public ResponseEntity<SysTeamDTO> update(@PathVariable("systeam_id") String systeam_id, @RequestBody SysTeamDTO systeamdto) {
 		SysTeam domain  = systeamMapping.toDomain(systeamdto);
@@ -76,7 +76,7 @@ public class SysTeamResource {
     }
 
     @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzou-SysTeam-Update-all')")
-    @ApiOperation(value = "批量更新组1", tags = {"组1" },  notes = "批量更新组1")
+    @ApiOperation(value = "批量更新组", tags = {"组" },  notes = "批量更新组")
 	@RequestMapping(method = RequestMethod.PUT, value = "/systeams/batch")
     public ResponseEntity<Boolean> updateBatch(@RequestBody List<SysTeamDTO> systeamdtos) {
         systeamService.updateBatch(systeamMapping.toDomain(systeamdtos));
@@ -84,14 +84,14 @@ public class SysTeamResource {
     }
 
     @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzou-SysTeam-Remove-all')")
-    @ApiOperation(value = "删除组1", tags = {"组1" },  notes = "删除组1")
+    @ApiOperation(value = "删除组", tags = {"组" },  notes = "删除组")
 	@RequestMapping(method = RequestMethod.DELETE, value = "/systeams/{systeam_id}")
     public ResponseEntity<Boolean> remove(@PathVariable("systeam_id") String systeam_id) {
          return ResponseEntity.status(HttpStatus.OK).body(systeamService.remove(systeam_id));
     }
 
     @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzou-SysTeam-Remove-all')")
-    @ApiOperation(value = "批量删除组1", tags = {"组1" },  notes = "批量删除组1")
+    @ApiOperation(value = "批量删除组", tags = {"组" },  notes = "批量删除组")
 	@RequestMapping(method = RequestMethod.DELETE, value = "/systeams/batch")
     public ResponseEntity<Boolean> removeBatch(@RequestBody List<String> ids) {
         systeamService.removeBatch(ids);
@@ -99,7 +99,7 @@ public class SysTeamResource {
     }
 
     @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzou-SysTeam-Get-all')")
-    @ApiOperation(value = "获取组1", tags = {"组1" },  notes = "获取组1")
+    @ApiOperation(value = "获取组", tags = {"组" },  notes = "获取组")
 	@RequestMapping(method = RequestMethod.GET, value = "/systeams/{systeam_id}")
     public ResponseEntity<SysTeamDTO> get(@PathVariable("systeam_id") String systeam_id) {
         SysTeam domain = systeamService.get(systeam_id);
@@ -107,27 +107,27 @@ public class SysTeamResource {
         return ResponseEntity.status(HttpStatus.OK).body(dto);
     }
 
-    @ApiOperation(value = "获取组1草稿", tags = {"组1" },  notes = "获取组1草稿")
+    @ApiOperation(value = "获取组草稿", tags = {"组" },  notes = "获取组草稿")
 	@RequestMapping(method = RequestMethod.GET, value = "/systeams/getdraft")
     public ResponseEntity<SysTeamDTO> getDraft() {
         return ResponseEntity.status(HttpStatus.OK).body(systeamMapping.toDto(systeamService.getDraft(new SysTeam())));
     }
 
-    @ApiOperation(value = "检查组1", tags = {"组1" },  notes = "检查组1")
+    @ApiOperation(value = "检查组", tags = {"组" },  notes = "检查组")
 	@RequestMapping(method = RequestMethod.POST, value = "/systeams/checkkey")
     public ResponseEntity<Boolean> checkKey(@RequestBody SysTeamDTO systeamdto) {
         return  ResponseEntity.status(HttpStatus.OK).body(systeamService.checkKey(systeamMapping.toDomain(systeamdto)));
     }
 
     @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzou-SysTeam-Save-all')")
-    @ApiOperation(value = "保存组1", tags = {"组1" },  notes = "保存组1")
+    @ApiOperation(value = "保存组", tags = {"组" },  notes = "保存组")
 	@RequestMapping(method = RequestMethod.POST, value = "/systeams/save")
     public ResponseEntity<Boolean> save(@RequestBody SysTeamDTO systeamdto) {
         return ResponseEntity.status(HttpStatus.OK).body(systeamService.save(systeamMapping.toDomain(systeamdto)));
     }
 
     @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzou-SysTeam-Save-all')")
-    @ApiOperation(value = "批量保存组1", tags = {"组1" },  notes = "批量保存组1")
+    @ApiOperation(value = "批量保存组", tags = {"组" },  notes = "批量保存组")
 	@RequestMapping(method = RequestMethod.POST, value = "/systeams/savebatch")
     public ResponseEntity<Boolean> saveBatch(@RequestBody List<SysTeamDTO> systeamdtos) {
         systeamService.saveBatch(systeamMapping.toDomain(systeamdtos));
@@ -135,7 +135,7 @@ public class SysTeamResource {
     }
 
     @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzou-SysTeam-searchDefault-all')")
-	@ApiOperation(value = "获取DEFAULT", tags = {"组1" } ,notes = "获取DEFAULT")
+	@ApiOperation(value = "获取DEFAULT", tags = {"组" } ,notes = "获取DEFAULT")
     @RequestMapping(method= RequestMethod.GET , value="/systeams/fetchdefault")
 	public ResponseEntity<List<SysTeamDTO>> fetchDefault(SysTeamSearchContext context) {
         Page<SysTeam> domains = systeamService.searchDefault(context) ;
@@ -148,7 +148,7 @@ public class SysTeamResource {
 	}
 
     @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzou-SysTeam-searchDefault-all')")
-	@ApiOperation(value = "查询DEFAULT", tags = {"组1" } ,notes = "查询DEFAULT")
+	@ApiOperation(value = "查询DEFAULT", tags = {"组" } ,notes = "查询DEFAULT")
     @RequestMapping(method= RequestMethod.POST , value="/systeams/searchdefault")
 	public ResponseEntity<Page<SysTeamDTO>> searchDefault(@RequestBody SysTeamSearchContext context) {
         Page<SysTeam> domains = systeamService.searchDefault(context) ;