zhouweidong 发布系统代码

app_web/public/assets/json/view-config.json

@@ -209,7 +209,7 @@
     },
     "ibzorganizationpickupview": {
         "title": "单位机构数据选择视图",
-        "caption": "单位机构1",
+        "caption": "单位机构",
         "viewtype": "DEPICKUPVIEW",
         "viewmodule": "ou",
         "viewname": "IBZOrganizationPickupView",
@@ -217,7 +217,7 @@
     },
     "ibzorganizationpickupgridview": {
         "title": "单位机构选择表格视图",
-        "caption": "单位机构1",
+        "caption": "单位机构",
         "viewtype": "DEPICKUPGRIDVIEW",
         "viewmodule": "ou",
         "viewname": "IBZOrganizationPickupGridView",

app_web/src/authservice/ibzorganization/ibzorganization-auth-service-base.ts

 import AuthService from '../auth-service';
 
 /**
- * 单位机构1权限服务对象基类
+ * 单位机构权限服务对象基类
  *
  * @export
  * @class IBZOrganizationAuthServiceBase

app_web/src/authservice/ibzorganization/ibzorganization-auth-service.ts

@@ -2,7 +2,7 @@ import IBZOrganizationAuthServiceBase from './ibzorganization-auth-service-base'
 
 
 /**
- * 单位机构1权限服务对象
+ * 单位机构权限服务对象
  *
  * @export
  * @class IBZOrganizationAuthService

app_web/src/locale/lanres/entities/ibzorganization/ibzorganization_en_US.ts

@@ -32,11 +32,11 @@ export default {
       		title: "单位管理",
 		},
 		pickupview: {
-			caption: "单位机构1",
+			caption: "单位机构",
       		title: "单位机构数据选择视图",
 		},
 		pickupgridview: {
-			caption: "单位机构1",
+			caption: "单位机构",
       		title: "单位机构选择表格视图",
 		},
 	},

app_web/src/locale/lanres/entities/ibzorganization/ibzorganization_zh_CN.ts

@@ -31,11 +31,11 @@ export default {
       		title: "单位管理",
 		},
 		pickupview: {
-			caption: "单位机构1",
+			caption: "单位机构",
       		title: "单位机构数据选择视图",
 		},
 		pickupgridview: {
-			caption: "单位机构1",
+			caption: "单位机构",
       		title: "单位机构选择表格视图",
 		},
 	},

app_web/src/mock/viewconfig/viewconfig.ts

@@ -217,7 +217,7 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => {
         },
         "ibzorganizationpickupview": {
             "title": "单位机构数据选择视图",
-            "caption": "单位机构1",
+            "caption": "单位机构",
             "viewtype": "DEPICKUPVIEW",
             "viewmodule": "ou",
             "viewname": "IBZOrganizationPickupView",
@@ -225,7 +225,7 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => {
         },
         "ibzorganizationpickupgridview": {
             "title": "单位机构选择表格视图",
-            "caption": "单位机构1",
+            "caption": "单位机构",
             "viewtype": "DEPICKUPGRIDVIEW",
             "viewmodule": "ou",
             "viewname": "IBZOrganizationPickupGridView",

app_web/src/service/ibzorganization/ibzorganization-service-base.ts

@@ -4,7 +4,7 @@ import EntityService from '../entity-service';
 
 
 /**
- * 单位机构1服务对象基类
+ * 单位机构服务对象基类
  *
  * @export
  * @class IBZOrganizationServiceBase

app_web/src/service/ibzorganization/ibzorganization-service.ts

@@ -3,7 +3,7 @@ import IBZOrganizationServiceBase from './ibzorganization-service-base';
 
 
 /**
- * 单位机构1服务对象
+ * 单位机构服务对象
  *
  * @export
  * @class IBZOrganizationService

app_web/src/uiservice/ibzorganization/ibzorganization-ui-service-base.ts

@@ -6,7 +6,7 @@ import IBZOrganizationService from '@/service/ibzorganization/ibzorganization-se
 import IBZOrganizationAuthService from '@/authservice/ibzorganization/ibzorganization-auth-service';
 
 /**
- * 单位机构1UI服务对象基类
+ * 单位机构UI服务对象基类
  *
  * @export
  * @class IBZOrganizationUIServiceBase

app_web/src/uiservice/ibzorganization/ibzorganization-ui-service.ts

 import IBZOrganizationUIServiceBase from './ibzorganization-ui-service-base';
 
 /**
- * 单位机构1UI服务对象
+ * 单位机构UI服务对象
  *
  * @export
  * @class IBZOrganizationUIService

app_web/src/widgets/ibzorganization/default-searchform/default-searchform-service.ts

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

app_web/src/widgets/ibzorganization/main-form/main-form-service.ts

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

app_web/src/widgets/ibzorganization/main-grid/main-grid-service.ts

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

app_web/src/widgets/ibzorganization/new-form-form/new-form-form-service.ts

@@ -13,7 +13,7 @@ import NewFormModel from './new-form-form-model';
 export default class NewFormService extends ControlService {
 
     /**
-     * 单位机构1服务对象
+     * 单位机构服务对象
      *
      * @type {IBZOrganizationService}
      * @memberof NewFormService

app_web/src/widgets/ibzorganization/org-tree-treeview/org-tree-treeview-service.ts

@@ -15,7 +15,7 @@ import i18n from '@/locale';
 export default class OrgTreeService extends ControlService {
 
     /**
-     * 单位机构1服务对象
+     * 单位机构服务对象
      *
      * @type {IBZOrganizationService}
      * @memberof OrgTreeService

ibzou-core/src/main/java/cn/ibizlab/core/ou/domain/IBZOrganization.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/IBZOrganizationServiceImpl.java

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

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

@@ -13,7 +13,7 @@
      }
     ,    {
     "dename":"IBZOrganization",
-    "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/IBZOrganizationResource.java

@@ -34,7 +34,7 @@ import cn.ibizlab.core.ou.filter.IBZOrganizationSearchContext;
 import cn.ibizlab.util.annotation.VersionCheck;
 
 @Slf4j
-@Api(tags = {"单位机构1" })
+@Api(tags = {"单位机构" })
 @RestController("api-ibzorganization")
 @RequestMapping("")
 public class IBZOrganizationResource {
@@ -47,7 +47,7 @@ public class IBZOrganizationResource {
     public IBZOrganizationMapping ibzorganizationMapping;
 
     @PreAuthorize("hasPermission(this.ibzorganizationMapping.toDomain(#ibzorganizationdto),'ibzou-IBZOrganization-Create')")
-    @ApiOperation(value = "新建单位机构1", tags = {"单位机构1" },  notes = "新建单位机构1")
+    @ApiOperation(value = "新建单位机构", tags = {"单位机构" },  notes = "新建单位机构")
 	@RequestMapping(method = RequestMethod.POST, value = "/ibzorganizations")
     public ResponseEntity<IBZOrganizationDTO> create(@RequestBody IBZOrganizationDTO ibzorganizationdto) {
         IBZOrganization domain = ibzorganizationMapping.toDomain(ibzorganizationdto);
@@ -57,7 +57,7 @@ public class IBZOrganizationResource {
     }
 
     @PreAuthorize("hasPermission(this.ibzorganizationMapping.toDomain(#ibzorganizationdtos),'ibzou-IBZOrganization-Create')")
-    @ApiOperation(value = "批量新建单位机构1", tags = {"单位机构1" },  notes = "批量新建单位机构1")
+    @ApiOperation(value = "批量新建单位机构", tags = {"单位机构" },  notes = "批量新建单位机构")
 	@RequestMapping(method = RequestMethod.POST, value = "/ibzorganizations/batch")
     public ResponseEntity<Boolean> createBatch(@RequestBody List<IBZOrganizationDTO> ibzorganizationdtos) {
         ibzorganizationService.createBatch(ibzorganizationMapping.toDomain(ibzorganizationdtos));
@@ -66,7 +66,7 @@ public class IBZOrganizationResource {
 
     @VersionCheck(entity = "ibzorganization" , versionfield = "updatedate")
     @PreAuthorize("hasPermission(this.ibzorganizationService.get(#ibzorganization_id),'ibzou-IBZOrganization-Update')")
-    @ApiOperation(value = "更新单位机构1", tags = {"单位机构1" },  notes = "更新单位机构1")
+    @ApiOperation(value = "更新单位机构", tags = {"单位机构" },  notes = "更新单位机构")
 	@RequestMapping(method = RequestMethod.PUT, value = "/ibzorganizations/{ibzorganization_id}")
     public ResponseEntity<IBZOrganizationDTO> update(@PathVariable("ibzorganization_id") String ibzorganization_id, @RequestBody IBZOrganizationDTO ibzorganizationdto) {
 		IBZOrganization domain  = ibzorganizationMapping.toDomain(ibzorganizationdto);
@@ -77,7 +77,7 @@ public class IBZOrganizationResource {
     }
 
     @PreAuthorize("hasPermission(this.ibzorganizationService.getIbzorganizationByEntities(this.ibzorganizationMapping.toDomain(#ibzorganizationdtos)),'ibzou-IBZOrganization-Update')")
-    @ApiOperation(value = "批量更新单位机构1", tags = {"单位机构1" },  notes = "批量更新单位机构1")
+    @ApiOperation(value = "批量更新单位机构", tags = {"单位机构" },  notes = "批量更新单位机构")
 	@RequestMapping(method = RequestMethod.PUT, value = "/ibzorganizations/batch")
     public ResponseEntity<Boolean> updateBatch(@RequestBody List<IBZOrganizationDTO> ibzorganizationdtos) {
         ibzorganizationService.updateBatch(ibzorganizationMapping.toDomain(ibzorganizationdtos));
@@ -85,14 +85,14 @@ public class IBZOrganizationResource {
     }
 
     @PreAuthorize("hasPermission(this.ibzorganizationService.get(#ibzorganization_id),'ibzou-IBZOrganization-Remove')")
-    @ApiOperation(value = "删除单位机构1", tags = {"单位机构1" },  notes = "删除单位机构1")
+    @ApiOperation(value = "删除单位机构", tags = {"单位机构" },  notes = "删除单位机构")
 	@RequestMapping(method = RequestMethod.DELETE, value = "/ibzorganizations/{ibzorganization_id}")
     public ResponseEntity<Boolean> remove(@PathVariable("ibzorganization_id") String ibzorganization_id) {
          return ResponseEntity.status(HttpStatus.OK).body(ibzorganizationService.remove(ibzorganization_id));
     }
 
     @PreAuthorize("hasPermission(this.ibzorganizationService.getIbzorganizationByIds(#ids),'ibzou-IBZOrganization-Remove')")
-    @ApiOperation(value = "批量删除单位机构1", tags = {"单位机构1" },  notes = "批量删除单位机构1")
+    @ApiOperation(value = "批量删除单位机构", tags = {"单位机构" },  notes = "批量删除单位机构")
 	@RequestMapping(method = RequestMethod.DELETE, value = "/ibzorganizations/batch")
     public ResponseEntity<Boolean> removeBatch(@RequestBody List<String> ids) {
         ibzorganizationService.removeBatch(ids);
@@ -100,7 +100,7 @@ public class IBZOrganizationResource {
     }
 
     @PostAuthorize("hasPermission(this.ibzorganizationMapping.toDomain(returnObject.body),'ibzou-IBZOrganization-Get')")
-    @ApiOperation(value = "获取单位机构1", tags = {"单位机构1" },  notes = "获取单位机构1")
+    @ApiOperation(value = "获取单位机构", tags = {"单位机构" },  notes = "获取单位机构")
 	@RequestMapping(method = RequestMethod.GET, value = "/ibzorganizations/{ibzorganization_id}")
     public ResponseEntity<IBZOrganizationDTO> get(@PathVariable("ibzorganization_id") String ibzorganization_id) {
         IBZOrganization domain = ibzorganizationService.get(ibzorganization_id);
@@ -108,27 +108,27 @@ public class IBZOrganizationResource {
         return ResponseEntity.status(HttpStatus.OK).body(dto);
     }
 
-    @ApiOperation(value = "获取单位机构1草稿", tags = {"单位机构1" },  notes = "获取单位机构1草稿")
+    @ApiOperation(value = "获取单位机构草稿", tags = {"单位机构" },  notes = "获取单位机构草稿")
 	@RequestMapping(method = RequestMethod.GET, value = "/ibzorganizations/getdraft")
     public ResponseEntity<IBZOrganizationDTO> getDraft() {
         return ResponseEntity.status(HttpStatus.OK).body(ibzorganizationMapping.toDto(ibzorganizationService.getDraft(new IBZOrganization())));
     }
 
-    @ApiOperation(value = "检查单位机构1", tags = {"单位机构1" },  notes = "检查单位机构1")
+    @ApiOperation(value = "检查单位机构", tags = {"单位机构" },  notes = "检查单位机构")
 	@RequestMapping(method = RequestMethod.POST, value = "/ibzorganizations/checkkey")
     public ResponseEntity<Boolean> checkKey(@RequestBody IBZOrganizationDTO ibzorganizationdto) {
         return  ResponseEntity.status(HttpStatus.OK).body(ibzorganizationService.checkKey(ibzorganizationMapping.toDomain(ibzorganizationdto)));
     }
 
     @PreAuthorize("hasPermission(this.ibzorganizationMapping.toDomain(#ibzorganizationdto),'ibzou-IBZOrganization-Save')")
-    @ApiOperation(value = "保存单位机构1", tags = {"单位机构1" },  notes = "保存单位机构1")
+    @ApiOperation(value = "保存单位机构", tags = {"单位机构" },  notes = "保存单位机构")
 	@RequestMapping(method = RequestMethod.POST, value = "/ibzorganizations/save")
     public ResponseEntity<Boolean> save(@RequestBody IBZOrganizationDTO ibzorganizationdto) {
         return ResponseEntity.status(HttpStatus.OK).body(ibzorganizationService.save(ibzorganizationMapping.toDomain(ibzorganizationdto)));
     }
 
     @PreAuthorize("hasPermission(this.ibzorganizationMapping.toDomain(#ibzorganizationdtos),'ibzou-IBZOrganization-Save')")
-    @ApiOperation(value = "批量保存单位机构1", tags = {"单位机构1" },  notes = "批量保存单位机构1")
+    @ApiOperation(value = "批量保存单位机构", tags = {"单位机构" },  notes = "批量保存单位机构")
 	@RequestMapping(method = RequestMethod.POST, value = "/ibzorganizations/savebatch")
     public ResponseEntity<Boolean> saveBatch(@RequestBody List<IBZOrganizationDTO> ibzorganizationdtos) {
         ibzorganizationService.saveBatch(ibzorganizationMapping.toDomain(ibzorganizationdtos));
@@ -136,7 +136,7 @@ public class IBZOrganizationResource {
     }
 
     @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzou-IBZOrganization-searchDefault-all') and hasPermission(#context,'ibzou-IBZOrganization-Get')")
-	@ApiOperation(value = "获取DEFAULT", tags = {"单位机构1" } ,notes = "获取DEFAULT")
+	@ApiOperation(value = "获取DEFAULT", tags = {"单位机构" } ,notes = "获取DEFAULT")
     @RequestMapping(method= RequestMethod.GET , value="/ibzorganizations/fetchdefault")
 	public ResponseEntity<List<IBZOrganizationDTO>> fetchDefault(IBZOrganizationSearchContext context) {
         Page<IBZOrganization> domains = ibzorganizationService.searchDefault(context) ;
@@ -149,7 +149,7 @@ public class IBZOrganizationResource {
 	}
 
     @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzou-IBZOrganization-searchDefault-all') and hasPermission(#context,'ibzou-IBZOrganization-Get')")
-	@ApiOperation(value = "查询DEFAULT", tags = {"单位机构1" } ,notes = "查询DEFAULT")
+	@ApiOperation(value = "查询DEFAULT", tags = {"单位机构" } ,notes = "查询DEFAULT")
     @RequestMapping(method= RequestMethod.POST , value="/ibzorganizations/searchdefault")
 	public ResponseEntity<Page<IBZOrganizationDTO>> searchDefault(@RequestBody IBZOrganizationSearchContext context) {
         Page<IBZOrganization> domains = ibzorganizationService.searchDefault(context) ;