From b358c9989fae915eed732181a0de778cdf2c4990 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?LI-CCONG=5C=E6=9D=8E=E8=81=AA=E8=81=AA?= <1441652193@qq.com> Date: Wed, 20 Sep 2023 12:20:02 +0800 Subject: [PATCH 01/11] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E6=96=B0=E5=BB=BA?= =?UTF-8?q?=E8=8F=9C=E5=8D=95=E7=9B=AE=E5=BD=95=E6=97=B6=E7=B3=BB=E7=BB=9F?= =?UTF-8?q?=E5=BC=82=E5=B8=B8=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../scm/module/system/enums/permission/MenuTypeEnum.java | 6 ++++++ .../module/system/service/permission/MenuServiceImpl.java | 5 ++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/yunxi-module-system/yunxi-module-system-api/src/main/java/com/yunxi/scm/module/system/enums/permission/MenuTypeEnum.java b/yunxi-module-system/yunxi-module-system-api/src/main/java/com/yunxi/scm/module/system/enums/permission/MenuTypeEnum.java index d4e5af4..3151704 100644 --- a/yunxi-module-system/yunxi-module-system-api/src/main/java/com/yunxi/scm/module/system/enums/permission/MenuTypeEnum.java +++ b/yunxi-module-system/yunxi-module-system-api/src/main/java/com/yunxi/scm/module/system/enums/permission/MenuTypeEnum.java @@ -22,4 +22,10 @@ public enum MenuTypeEnum { */ private final Integer type; + + // 判断是否不为目录类型 + public static boolean isNoDIR(Integer type) { + return !DIR.getType().equals(type); + } + } diff --git a/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/service/permission/MenuServiceImpl.java b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/service/permission/MenuServiceImpl.java index d3306ee..0b217b9 100644 --- a/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/service/permission/MenuServiceImpl.java +++ b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/service/permission/MenuServiceImpl.java @@ -27,6 +27,7 @@ import static com.yunxi.scm.framework.common.util.collection.CollectionUtils.con import static com.yunxi.scm.module.system.dal.dataobject.permission.MenuDO.ID_ROOT; import static com.yunxi.scm.module.system.enums.ErrorCodeConstants.*; + /** * 菜单 Service 实现 * @@ -45,7 +46,9 @@ public class MenuServiceImpl implements MenuService { private TenantService tenantService; @Override - @CacheEvict(value = RedisKeyConstants.PERMISSION_MENU_ID_LIST, key = "#reqVO.permission") + @CacheEvict(value = RedisKeyConstants.PERMISSION_MENU_ID_LIST, key = "#reqVO.permission", condition="#reqVO.permission != null") +// @CacheEvict(value = RedisKeyConstants.PERMISSION_MENU_ID_LIST, key = "#reqVO.permission", +// condition="T(com.yunxi.scm.module.system.enums.permission.MenuTypeEnum).isNoDIR(#reqVO.type)") public Long createMenu(MenuCreateReqVO reqVO) { // 校验父菜单存在 validateParentMenu(reqVO.getParentId(), null); From b517aec7d753c241a8633df6009f2a3240f49638 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E4=B8=96=E5=BC=BA?= Date: Sat, 7 Oct 2023 10:40:33 +0800 Subject: [PATCH 02/11] =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E7=BA=BF=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/api/xxjj/businessWarehouse/index.ts | 8 +- .../views/xxjj/businessOrganization/index.vue | 2 +- .../BusinessTree.vue | 2 + .../businessWarehouse.data.ts | 87 +++++-------------- .../views/xxjj/businessWarehouse/index.vue | 6 +- .../BusinessWarehouseController.java | 8 ++ .../controller/admin/dept/DeptController.java | 12 +++ .../admin/dept/vo/dept/DeptSimpleRespVO.java | 2 + .../BusinessWarehouseMapper.java | 25 ++++++ .../BusinessWarehouseService.java | 8 ++ .../BusinessWarehouseServiceImpl.java | 5 ++ 11 files changed, 96 insertions(+), 69 deletions(-) diff --git a/yudao-ui-admin-vben-master/src/api/xxjj/businessWarehouse/index.ts b/yudao-ui-admin-vben-master/src/api/xxjj/businessWarehouse/index.ts index d254b0a..af5d2ff 100644 --- a/yudao-ui-admin-vben-master/src/api/xxjj/businessWarehouse/index.ts +++ b/yudao-ui-admin-vben-master/src/api/xxjj/businessWarehouse/index.ts @@ -1,4 +1,5 @@ import { defHttp } from '@/utils/http/axios' +import { handleTree } from '@/utils/tree' // 查询业务线/仓库列表 export function getBusinessWarehousePage(params) { @@ -32,5 +33,10 @@ export function exportBusinessWarehouse(params) { // 查询业务线（精简)列表 export function listSimpleBusiness() { - return defHttp.get({ url: '/system/business-warehouse/list-all-simple' }) + return defHttp.get({ url: '/system/business-warehouse/list-all-simple' }) } + + // 查询业务线列表 +export function getBusinessPage(params) { + return defHttp.get({ url: '/system/business-warehouse/business', params }) +} diff --git a/yudao-ui-admin-vben-master/src/views/xxjj/businessOrganization/index.vue b/yudao-ui-admin-vben-master/src/views/xxjj/businessOrganization/index.vue index 6f072bd..7b768e4 100644 --- a/yudao-ui-admin-vben-master/src/views/xxjj/businessOrganization/index.vue +++ b/yudao-ui-admin-vben-master/src/views/xxjj/businessOrganization/index.vue @@ -50,7 +50,7 @@ const { createConfirm, createMessage } = useMessage() const [registerModal, { openModal }] = useModal() const [registerTable, { getForm, reload }] = useTable({ - title: '业务线列表', + title: '业务组织列表', api: getBusinessWarehousePage, columns, formConfig: { labelWidth: 120, schemas: searchFormSchema }, diff --git a/yudao-ui-admin-vben-master/src/views/xxjj/businessOrganizationConfig/BusinessTree.vue b/yudao-ui-admin-vben-master/src/views/xxjj/businessOrganizationConfig/BusinessTree.vue index 200b9f1..c91be10 100644 --- a/yudao-ui-admin-vben-master/src/views/xxjj/businessOrganizationConfig/BusinessTree.vue +++ b/yudao-ui-admin-vben-master/src/views/xxjj/businessOrganizationConfig/BusinessTree.vue @@ -15,6 +15,8 @@ const treeData = ref([]) async function fetch() { const res = await listSimpleBusiness() treeData.value = handleTree(res, 'id') + console.log('res',res); + console.log('treeData',treeData.value) } function handleSelect(keys) { diff --git a/yudao-ui-admin-vben-master/src/views/xxjj/businessOrganizationConfig/businessWarehouse.data.ts b/yudao-ui-admin-vben-master/src/views/xxjj/businessOrganizationConfig/businessWarehouse.data.ts index 0542cdd..473d824 100644 --- a/yudao-ui-admin-vben-master/src/views/xxjj/businessOrganizationConfig/businessWarehouse.data.ts +++ b/yudao-ui-admin-vben-master/src/views/xxjj/businessOrganizationConfig/businessWarehouse.data.ts @@ -1,5 +1,20 @@ import { BasicColumn, FormSchema, useRender } from '@/components/Table' import { DICT_TYPE, getDictOptions } from '@/utils/dict' +import { getListSimpleUsers } from '@/api/system/user' +import { listSimpleBusiness } from '@/api/xxjj/businessWarehouse' +import { handleTree,listToTree } from '@/utils/tree' + + +let users: any[] = [] +async function getUserList() { + const res = await listSimpleBusiness() + const result = handleTree(res, 'id') + listToTree(result) + console.log('result',result) + users = result +} + +await getUserList() export const columns: BasicColumn[] = [ { @@ -109,72 +124,16 @@ export const searchFormSchema: FormSchema[] = [ export const createFormSchema: FormSchema[] = [ { - label: '编号', - field: 'id', - show: false, - component: 'Input' - }, - { - label: '业务线编号', - field: 'businessCode', - required: true, - component: 'Input' - }, - { - label: '业务线名称', - field: 'name', + label: '成员', + field: 'memberUserIds', required: true, - component: 'Input' - }, - { - label: '业务线简称', - field: 'businessSimple', - component: 'Input' - }, - { - label: '类型', - field: 'type', - component: 'Select', + component: 'ApiTransfer', componentProps: { - options: getDictOptions(DICT_TYPE.BUSINESS_TYPE, 'number') - } - }, - { - label: '所属行业', - field: 'industry', - component: 'Select', - componentProps: { - options: getDictOptions(DICT_TYPE.DUTY_TYPE, 'number') - } - }, - { - label: '所在城市', - field: 'city', - component: 'Input' - }, - { - label: '成立时间', - field: 'establishDate', - component: 'DatePicker' - }, - { - label: '介绍', - field: 'description', - component: 'InputTextArea' - }, - { - label: '归属人员', - field: 'belongUserId', - component: 'Input' - }, - { - label: '区分标志', - field: 'diffFlag', - required: true, - component: 'Select', - componentProps: { - options: getDictOptions(DICT_TYPE.DIFF_FLAG, 'number') - } + api: () => listSimpleBusiness(), + showSearch: true, + labelField: 'name', + valueField: 'id', + }, }, ] diff --git a/yudao-ui-admin-vben-master/src/views/xxjj/businessWarehouse/index.vue b/yudao-ui-admin-vben-master/src/views/xxjj/businessWarehouse/index.vue index 6bf4ca8..9deb508 100644 --- a/yudao-ui-admin-vben-master/src/views/xxjj/businessWarehouse/index.vue +++ b/yudao-ui-admin-vben-master/src/views/xxjj/businessWarehouse/index.vue @@ -40,7 +40,7 @@ import { useModal } from '@/components/Modal' import BusinessWarehouseModal from './BusinessWarehouseModal.vue' import { IconEnum } from '@/enums/appEnum' import { BasicTable, useTable, TableAction } from '@/components/Table' -import { deleteBusinessWarehouse, exportBusinessWarehouse, getBusinessWarehousePage } from '@/api/xxjj/businessWarehouse' +import { deleteBusinessWarehouse, exportBusinessWarehouse, getBusinessWarehousePage, getBusinessPage} from '@/api/xxjj/businessWarehouse' import { columns, searchFormSchema } from './businessWarehouse.data' defineOptions({ name: 'BusinessWarehouse' }) @@ -50,8 +50,8 @@ const { createConfirm, createMessage } = useMessage() const [registerModal, { openModal }] = useModal() const [registerTable, { getForm, reload }] = useTable({ - title: '业务线/仓库列表', - api: getBusinessWarehousePage, + title: '业务线列表', + api: getBusinessPage, columns, formConfig: { labelWidth: 120, schemas: searchFormSchema }, useSearchForm: true, diff --git a/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/businesswarehouse/BusinessWarehouseController.java b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/businesswarehouse/BusinessWarehouseController.java index d4a98e8..e51c217 100644 --- a/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/businesswarehouse/BusinessWarehouseController.java +++ b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/businesswarehouse/BusinessWarehouseController.java @@ -93,6 +93,14 @@ public class BusinessWarehouseController { return success(BusinessWarehouseConvert.INSTANCE.convertPage(pageResult)); } + @GetMapping("/business") + @Operation(summary = "获得业务线分页") + @PreAuthorize("@ss.hasPermission('system:business-warehouse:business')") + public CommonResult> getBusinessPage(@Valid BusinessWarehousePageReqVO pageVO) { + PageResult pageResult = businessWarehouseService.getBusinessPage(pageVO); + return success(BusinessWarehouseConvert.INSTANCE.convertPage(pageResult)); + } + @GetMapping("/export-excel") @Operation(summary = "导出业务线表 Excel") @PreAuthorize("@ss.hasPermission('system:business-warehouse:export')") diff --git a/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/dept/DeptController.java b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/dept/DeptController.java index 360ef8f..3a7f949 100644 --- a/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/dept/DeptController.java +++ b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/dept/DeptController.java @@ -90,4 +90,16 @@ public class DeptController { return success(DeptConvert.INSTANCE.convert(deptService.getDept(id))); } + @GetMapping("/list-user-simple") + @Operation(summary = "获取部门用户精简信息列表", description = "只包含被开启的部门，主要用于前端的下拉选项") + public CommonResult> getSimpleDeptUserList() { + // 获得部门列表，只要开启状态的 + DeptListReqVO reqVO = new DeptListReqVO(); + reqVO.setStatus(CommonStatusEnum.ENABLE.getStatus()); + List list = deptService.getDeptList(reqVO); + // 排序后，返回给前端 + list.sort(Comparator.comparing(DeptDO::getSort)); + return success(DeptConvert.INSTANCE.convertList02(list)); + } + } diff --git a/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/dept/vo/dept/DeptSimpleRespVO.java b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/dept/vo/dept/DeptSimpleRespVO.java index c1b8987..a9b1ba5 100644 --- a/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/dept/vo/dept/DeptSimpleRespVO.java +++ b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/dept/vo/dept/DeptSimpleRespVO.java @@ -23,4 +23,6 @@ public class DeptSimpleRespVO { @Schema(description = "父部门 ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024") private Long parentId; + + } diff --git a/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/dal/mysql/businesswarehouse/BusinessWarehouseMapper.java b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/dal/mysql/businesswarehouse/BusinessWarehouseMapper.java index 78d671f..7b38bde 100644 --- a/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/dal/mysql/businesswarehouse/BusinessWarehouseMapper.java +++ b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/dal/mysql/businesswarehouse/BusinessWarehouseMapper.java @@ -75,4 +75,29 @@ public interface BusinessWarehouseMapper extends BaseMapperX selectBusinessPage(BusinessWarehousePageReqVO reqVO) { + return selectPage(reqVO, new LambdaQueryWrapperX() + .eqIfPresent(BusinessWarehouseDO::getBusinessCode, reqVO.getBusinessCode()) + .likeIfPresent(BusinessWarehouseDO::getName, reqVO.getName()) + .eqIfPresent(BusinessWarehouseDO::getBusinessSimple, reqVO.getBusinessSimple()) + .eqIfPresent(BusinessWarehouseDO::getBusinessLogo, reqVO.getBusinessLogo()) + .eqIfPresent(BusinessWarehouseDO::getParentId, reqVO.getParentId()) + .eqIfPresent(BusinessWarehouseDO::getType, reqVO.getType()) + .eqIfPresent(BusinessWarehouseDO::getStatus, reqVO.getStatus()) + .eqIfPresent(BusinessWarehouseDO::getInstitutionNum, reqVO.getInstitutionNum()) + .eqIfPresent(BusinessWarehouseDO::getEmployeeNum, reqVO.getEmployeeNum()) + .eqIfPresent(BusinessWarehouseDO::getIndustry, reqVO.getIndustry()) + .eqIfPresent(BusinessWarehouseDO::getCity, reqVO.getCity()) + .betweenIfPresent(BusinessWarehouseDO::getEstablishDate, reqVO.getEstablishDate()) + .eqIfPresent(BusinessWarehouseDO::getBelongUserId, reqVO.getBelongUserId()) + .likeIfPresent(BusinessWarehouseDO::getBrandName, reqVO.getBrandName()) + .eqIfPresent(BusinessWarehouseDO::getPhone, reqVO.getPhone()) + .eqIfPresent(BusinessWarehouseDO::getDiffFlag, "0") + .eqIfPresent(BusinessWarehouseDO::getFax, reqVO.getFax()) + .eqIfPresent(BusinessWarehouseDO::getUrl, reqVO.getUrl()) + .eqIfPresent(BusinessWarehouseDO::getDescription, reqVO.getDescription()) + .betweenIfPresent(BusinessWarehouseDO::getCreateTime, reqVO.getCreateTime()) + .orderByDesc(BusinessWarehouseDO::getId)); + } + } diff --git a/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/service/businesswarehouse/BusinessWarehouseService.java b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/service/businesswarehouse/BusinessWarehouseService.java index cc5e2c9..3f8fcc0 100644 --- a/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/service/businesswarehouse/BusinessWarehouseService.java +++ b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/service/businesswarehouse/BusinessWarehouseService.java @@ -59,6 +59,14 @@ public interface BusinessWarehouseService { */ PageResult getBusinessWarehousePage(BusinessWarehousePageReqVO pageReqVO); + /** + * 获得业务线分页 + * + * @param pageReqVO 分页查询 + * @return 业务线表分页 + */ + PageResult getBusinessPage(BusinessWarehousePageReqVO pageReqVO); + /** * 获得业务线表列表, 用于 Excel 导出 * diff --git a/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/service/businesswarehouse/BusinessWarehouseServiceImpl.java b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/service/businesswarehouse/BusinessWarehouseServiceImpl.java index eda6b62..b84f203 100644 --- a/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/service/businesswarehouse/BusinessWarehouseServiceImpl.java +++ b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/service/businesswarehouse/BusinessWarehouseServiceImpl.java @@ -74,6 +74,11 @@ public class BusinessWarehouseServiceImpl implements BusinessWarehouseService { return businessWarehouseMapper.selectPage(pageReqVO); } + @Override + public PageResult getBusinessPage(BusinessWarehousePageReqVO pageReqVO) { + return businessWarehouseMapper.selectBusinessPage(pageReqVO); + } + @Override public List getBusinessWarehouseList(BusinessWarehouseExportReqVO exportReqVO) { return businessWarehouseMapper.selectList(exportReqVO); From 716df92a68774ad2505b2977950fb1e5d10bc182 Mon Sep 17 00:00:00 2001 From: 17602169347 Date: Sun, 8 Oct 2023 10:46:43 +0800 Subject: [PATCH 03/11] =?UTF-8?q?10.8=E6=9D=83=E9=99=90=E5=92=8C=E4=BE=9B?= =?UTF-8?q?=E5=BA=94=E5=95=86=E5=92=8C=E5=AE=A2=E6=88=B7=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- yudao-ui-admin-vben-master/.env.development | 4 +- .../src/api/base/login.ts | 6 +- .../src/api/xxjj/subjectBasic/index.ts | 31 + .../src/store/modules/user.ts | 3 - .../src/views/base/login/LoginForm.vue | 11 +- .../src/views/system/user/index.vue | 6 +- .../xxjj/subjectBasic/SubjectBasicModal.vue | 57 + .../src/views/xxjj/subjectBasic/index.vue | 92 + .../xxjj/subjectBasic/subjectBasic.data.ts | 1692 +++++++++++++++++ .../admin/auth/vo/AuthLoginRespVO.java | 3 + .../auth/vo/AuthPermissionInfoRespVO.java | 13 + .../controller/admin/dept/DeptController.java | 18 +- .../controller/admin/dept/PostController.java | 30 +- .../admin/dept/vo/dept/DeptBaseVO.java | 2 + .../admin/dept/vo/dept/DeptListReqVO.java | 2 + .../admin/dept/vo/post/PostBaseVO.java | 2 + .../admin/dept/vo/post/PostExcelVO.java | 3 + .../admin/dept/vo/post/PostExportReqVO.java | 2 + .../admin/dept/vo/post/PostListReqVO.java | 2 + .../admin/dept/vo/post/PostPageReqVO.java | 2 + .../admin/permission/RoleController.java | 30 +- .../admin/permission/vo/role/RoleBaseVO.java | 3 + .../admin/permission/vo/role/RoleExcelVO.java | 2 + .../permission/vo/role/RoleExportReqVO.java | 1 + .../permission/vo/role/RolePageReqVO.java | 1 + .../admin/permission/vo/role/RoleRespVO.java | 2 + .../admin/tenant/TenantController.java | 15 + .../controller/admin/user/UserController.java | 2 + .../system/convert/auth/AuthConvert.java | 2 +- .../system/dal/dataobject/dept/DeptDO.java | 6 + .../system/dal/dataobject/dept/PostDO.java | 6 + .../dal/dataobject/permission/RoleDO.java | 4 + .../dal/dataobject/tenant/TenantDO.java | 8 + .../dal/dataobject/user/AdminUserDO.java | 22 + .../BusinessWarehouseMapper.java | 1 + .../system/dal/mysql/dept/DeptMapper.java | 3 +- .../system/dal/mysql/dept/PostMapper.java | 2 + .../mysql/enterprise/EnterpriseMapper.java | 2 + .../dal/mysql/permission/RoleMapper.java | 2 + .../system/dal/mysql/tenant/TenantMapper.java | 1 + .../service/auth/AdminAuthServiceImpl.java | 12 +- .../BusinessWarehouseService.java | 7 + .../BusinessWarehouseServiceImpl.java | 4 + .../service/enterprise/EnterpriseService.java | 8 + .../enterprise/EnterpriseServiceImpl.java | 5 + .../system/service/tenant/TenantService.java | 7 + .../service/tenant/TenantServiceImpl.java | 5 + .../service/user/AdminUserServiceImpl.java | 34 +- .../BusinessWarehouseMapper.xml | 16 + .../Mapper/enterprise/EnterpriseMapper.xml | 5 +- .../resources/Mapper/tenant/TenantMapper.xml | 16 + .../subjectbasic/SubjectBasicController.java | 102 + .../subjectbasic/vo/SubjectBasicBaseVO.java | 271 +++ .../vo/SubjectBasicCreateReqVO.java | 14 + .../subjectbasic/vo/SubjectBasicExcelVO.java | 263 +++ .../vo/SubjectBasicExportReqVO.java | 248 +++ .../vo/SubjectBasicPageReqVO.java | 250 +++ .../subjectbasic/vo/SubjectBasicRespVO.java | 19 + .../vo/SubjectBasicUpdateReqVO.java | 18 + .../subjectbasic/SubjectBasicConvert.java | 34 + .../subjectbasic/SubjectBasicDO.java | 345 ++++ .../subjectbasic/SubjectBasicMapper.java | 184 ++ .../module/xxjj/enums/ErrorCodeConstants.java | 2 + .../subjectbasic/SubjectBasicService.java | 70 + .../subjectbasic/SubjectBasicServiceImpl.java | 82 + .../mapper/enterprise/EnterpriseMapper.xml | 1 - .../subjectbasic/SubjectBasicMapper.xml | 2 +- .../SubjectBasicServiceImplTest.java | 759 ++++++++ .../src/main/resources/application.yaml | 3 + 69 files changed, 4855 insertions(+), 27 deletions(-) create mode 100644 yudao-ui-admin-vben-master/src/api/xxjj/subjectBasic/index.ts create mode 100644 yudao-ui-admin-vben-master/src/views/xxjj/subjectBasic/SubjectBasicModal.vue create mode 100644 yudao-ui-admin-vben-master/src/views/xxjj/subjectBasic/index.vue create mode 100644 yudao-ui-admin-vben-master/src/views/xxjj/subjectBasic/subjectBasic.data.ts create mode 100644 yunxi-module-system/yunxi-module-system-biz/src/main/resources/Mapper/businesswarehouse/BusinessWarehouseMapper.xml create mode 100644 yunxi-module-system/yunxi-module-system-biz/src/main/resources/Mapper/tenant/TenantMapper.xml create mode 100644 yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/subjectbasic/SubjectBasicController.java create mode 100644 yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/subjectbasic/vo/SubjectBasicBaseVO.java create mode 100644 yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/subjectbasic/vo/SubjectBasicCreateReqVO.java create mode 100644 yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/subjectbasic/vo/SubjectBasicExcelVO.java create mode 100644 yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/subjectbasic/vo/SubjectBasicExportReqVO.java create mode 100644 yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/subjectbasic/vo/SubjectBasicPageReqVO.java create mode 100644 yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/subjectbasic/vo/SubjectBasicRespVO.java create mode 100644 yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/subjectbasic/vo/SubjectBasicUpdateReqVO.java create mode 100644 yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/convert/subjectbasic/SubjectBasicConvert.java create mode 100644 yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/dal/dataobject/subjectbasic/SubjectBasicDO.java create mode 100644 yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/dal/mysql/subjectbasic/SubjectBasicMapper.java create mode 100644 yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/service/subjectbasic/SubjectBasicService.java create mode 100644 yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/service/subjectbasic/SubjectBasicServiceImpl.java rename yunxi-module-system/yunxi-module-system-biz/src/main/resources/Mapper/usergroup/businesswarehouse/BusinessWarehouseMapper.xml => yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/resources/mapper/subjectbasic/SubjectBasicMapper.xml (84%) create mode 100644 yunxi-module-xxjj/yunxi-module-xxjj-biz/src/test/java/com/yunxi/scm/module/xxjj/service/subjectbasic/SubjectBasicServiceImplTest.java diff --git a/yudao-ui-admin-vben-master/.env.development b/yudao-ui-admin-vben-master/.env.development index f43a104..0c9f922 100644 --- a/yudao-ui-admin-vben-master/.env.development +++ b/yudao-ui-admin-vben-master/.env.development @@ -7,14 +7,14 @@ VITE_PUBLIC_PATH = / # 本地开发代理，可以解决跨域及多地址代理 # 如果接口地址匹配到，则会转发到http://localhost:3000，防止本地出现跨域问题 # 可以有多个，注意多个不能换行，否则代理将会失效 -VITE_PROXY = [["/dev-api","http://192.168.0.162:8091/admin-api"],["/upload","http://192.168.0.162:8091/admin-api/infra/file/upload"]] +VITE_PROXY = [["/dev-api","http://127.0.0.1:8091/admin-api"],["/upload","http://127.0.0.1:8091/admin-api/infra/file/upload"]] # VITE_PROXY=[["/api","http://vben.xingyuv.com/test"]] # 是否删除Console.log VITE_DROP_CONSOLE = false # 基础页面地址，例如 swagger 等页面 -VITE_GLOB_BASE_URL = "http://192.168.0.162:8091" +VITE_GLOB_BASE_URL = "http://127.0.0.1:8091" # 接口地址,如果没有跨域问题，直接在这里配置即可 VITE_GLOB_API_URL = /dev-api diff --git a/yudao-ui-admin-vben-master/src/api/base/login.ts b/yudao-ui-admin-vben-master/src/api/base/login.ts index eb663a7..8583bcd 100644 --- a/yudao-ui-admin-vben-master/src/api/base/login.ts +++ b/yudao-ui-admin-vben-master/src/api/base/login.ts @@ -6,6 +6,7 @@ enum Api { Login = '/system/auth/login', RefreshToken = '/system/auth/refresh-token?refreshToken=', GetTenantIdByName = '/system/tenant/get-id-by-name?name=', + GetTenantIdByUserName = '/system/tenant/get-tenantId-by-userName?name=', LoginOut = '/system/auth/logout', GetUserInfo = '/system/auth/get-permission-info', GetCaptcha = '/system/captcha/get', @@ -22,7 +23,10 @@ export function refreshToken() { export function getTenantIdByName(name: string) { return defHttp.get({ url: Api.GetTenantIdByName + name }) } - +// 使用租户名，获得租户编号 +export function getTenantIdByUserName(name: string) { + return defHttp.get({ url: Api.GetTenantIdByUserName + name }) +} // 登出 export function loginOut() { return defHttp.delete({ url: Api.LoginOut }) diff --git a/yudao-ui-admin-vben-master/src/api/xxjj/subjectBasic/index.ts b/yudao-ui-admin-vben-master/src/api/xxjj/subjectBasic/index.ts new file mode 100644 index 0000000..92df8da --- /dev/null +++ b/yudao-ui-admin-vben-master/src/api/xxjj/subjectBasic/index.ts @@ -0,0 +1,31 @@ +import { defHttp } from '@/utils/http/axios' + +// 查询基础业务信息表(客户，供应商，服务商主体)列表 +export function getSubjectBasicPage(params) { + return defHttp.get({ url: '/xxjj/subject-basic/page', params }) +} + +// 查询基础业务信息表(客户，供应商，服务商主体)详情 +export function getSubjectBasic(id: number) { + return defHttp.get({ url: '/xxjj/subject-basic/get?id=' + id }) +} + +// 新增基础业务信息表(客户，供应商，服务商主体) +export function createSubjectBasic(data) { + return defHttp.post({ url: '/xxjj/subject-basic/create', data }) +} + +// 修改基础业务信息表(客户，供应商，服务商主体) +export function updateSubjectBasic(data) { + return defHttp.put({ url: '/xxjj/subject-basic/update', data }) +} + +// 删除基础业务信息表(客户，供应商，服务商主体) +export function deleteSubjectBasic(id: number) { + return defHttp.delete({ url: '/xxjj/subject-basic/delete?id=' + id }) +} + +// 导出基础业务信息表(客户，供应商，服务商主体) Excel +export function exportSubjectBasic(params) { + return defHttp.download({ url: '/xxjj/subject-basic/export-excel', params }, '基础业务信息表(客户，供应商，服务商主体).xls') +} diff --git a/yudao-ui-admin-vben-master/src/store/modules/user.ts b/yudao-ui-admin-vben-master/src/store/modules/user.ts index bd8ceda..10216ea 100644 --- a/yudao-ui-admin-vben-master/src/store/modules/user.ts +++ b/yudao-ui-admin-vben-master/src/store/modules/user.ts @@ -15,7 +15,6 @@ import { useMessage } from '@/hooks/web/useMessage' import { getAuthCache, setAuthCache } from '@/utils/auth' import { doLogout, getUserInfo, loginApi, smsLogin } from '@/api/base/user' import type { GetUserInfoModel, LoginParams, SmsLoginParams } from '@/api/base/model/userModel' - import { isArray } from '@/utils/is' interface UserState { @@ -101,7 +100,6 @@ export const useUserStore = defineStore('app-user', { const { goHome = true, mode, ...loginParams } = params const data = await loginApi(loginParams, mode) const { accessToken, refreshToken } = data - // save token this.setAccessToken(accessToken) this.setRefreshToken(refreshToken) @@ -135,7 +133,6 @@ export const useUserStore = defineStore('app-user', { return null // get user info const userInfo = await this.getUserInfoAction() - const sessionTimeout = this.sessionTimeout if (sessionTimeout) { this.setSessionTimeout(false) diff --git a/yudao-ui-admin-vben-master/src/views/base/login/LoginForm.vue b/yudao-ui-admin-vben-master/src/views/base/login/LoginForm.vue index e6cb943..fcacfd2 100644 --- a/yudao-ui-admin-vben-master/src/views/base/login/LoginForm.vue +++ b/yudao-ui-admin-vben-master/src/views/base/login/LoginForm.vue @@ -18,7 +18,7 @@ import { useDesign } from '@/hooks/web/useDesign' import * as authUtil from '@/utils/auth' import { Verify } from '@/components/Verifition' -import { getTenantIdByName } from '@/api/base/login' +import { getTenantIdByName, getTenantIdByUserName } from '@/api/base/login' const FormItem = Form.Item const InputPassword = Input.Password @@ -42,7 +42,7 @@ const verify = ref() const captchaType = ref('blockPuzzle') // blockPuzzle 滑块 clickWord 点击文字 const formData = reactive({ - tenantName: '芋道源码', + tenantName: '长江云息', username: 'admin', password: 'admin123', captchaVerification: '', @@ -70,7 +70,8 @@ async function getCode() { // 获取租户ID async function getTenantId() { if (tenantEnable === 'true') { - const res = await getTenantIdByName(formData.tenantName) + //const res = await getTenantIdByName(formData.tenantName) + const res = await getTenantIdByUserName(formData.username) authUtil.setTenantId(res) } } @@ -113,7 +114,7 @@ async function handleLogin(params) {