From 730ea560e73bff41a51432255d16de39a6650f98 Mon Sep 17 00:00:00 2001 From: wangxiang <1827945911@qq.com> Date: Fri, 22 Apr 2022 00:45:53 +0800 Subject: [PATCH] =?UTF-8?q?=F0=9F=8E=9F=20=E6=9E=84=E5=BB=BA=E5=B9=B3?= =?UTF-8?q?=E5=8F=B0=E4=B8=9A=E5=8A=A1=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cloud/kicc/system/api/dto/LoginDto.java | 34 ---- .../cloud/kicc/system/api/entity/Address.java | 28 --- .../kicc/system/api/entity/Hospital.java | 42 ----- .../system/api/entity/ProjectManager.java | 27 --- .../cloud/kicc/system/api/entity/Role.java | 5 - .../kicc/system/api/entity/Shortcut.java | 48 ----- .../system/controller/AddressController.java | 103 ----------- .../system/controller/HospitalController.java | 100 ----------- .../controller/ProjectManagerController.java | 102 ----------- .../system/controller/RoleController.java | 10 -- .../system/controller/ShortcutController.java | 83 --------- .../kicc/system/mapper/AddressMapper.java | 14 -- .../kicc/system/mapper/HospitalMapper.java | 13 -- .../system/mapper/ProjectManagerMapper.java | 15 -- .../kicc/system/mapper/ShortcutMapper.java | 16 -- .../kicc/system/service/AddressService.java | 15 -- .../kicc/system/service/HospitalService.java | 13 -- .../system/service/ProjectManagerService.java | 15 -- .../kicc/system/service/ShortcutService.java | 16 -- .../service/impl/AddressServiceImpl.java | 24 --- .../service/impl/HospitalServiceImpl.java | 18 -- .../impl/ProjectManagerServiceImpl.java | 19 -- .../service/impl/ShortcutServiceImpl.java | 20 --- .../main/resources/mapper/AddressMapper.xml | 4 - .../main/resources/mapper/HospitalMapper.xml | 4 - .../resources/mapper/ProjectManagerMapper.xml | 4 - .../src/main/resources/mapper/RoleMapper.xml | 3 +- .../main/resources/mapper/ShortcutMapper.xml | 24 --- kicc-ui/src/api/model/baseModel.ts | 17 +- kicc-ui/src/api/system/menu.ts | 8 +- kicc-ui/src/api/system/model/clientModel.ts | 6 +- kicc-ui/src/api/system/model/departModel.ts | 8 +- kicc-ui/src/api/system/model/dictModel.ts | 6 +- kicc-ui/src/api/system/model/logModel.ts | 6 +- kicc-ui/src/api/system/model/menuModel.ts | 29 ++- kicc-ui/src/api/system/model/roleModel.ts | 42 ++--- kicc-ui/src/api/system/model/userModel.ts | 6 +- kicc-ui/src/api/system/role.ts | 40 ++--- kicc-ui/src/enums/cacheEnum.ts | 2 +- kicc-ui/src/store/modules/app.ts | 6 +- kicc-ui/src/utils/http/axios/index.ts | 3 +- kicc-ui/src/views/system/menu/MenuModal.vue | 4 +- kicc-ui/src/views/system/menu/index.vue | 4 +- kicc-ui/src/views/system/role/RoleDrawer.vue | 96 +++++----- kicc-ui/src/views/system/role/index.vue | 167 ++++++++++-------- kicc-ui/types/index.d.ts | 8 +- 46 files changed, 232 insertions(+), 1045 deletions(-) delete mode 100644 kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/dto/LoginDto.java delete mode 100644 kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/entity/Address.java delete mode 100644 kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/entity/Hospital.java delete mode 100644 kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/entity/ProjectManager.java delete mode 100644 kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/entity/Shortcut.java delete mode 100644 kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/AddressController.java delete mode 100644 kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/HospitalController.java delete mode 100644 kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/ProjectManagerController.java delete mode 100644 kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/ShortcutController.java delete mode 100644 kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/mapper/AddressMapper.java delete mode 100644 kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/mapper/HospitalMapper.java delete mode 100644 kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/mapper/ProjectManagerMapper.java delete mode 100644 kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/mapper/ShortcutMapper.java delete mode 100644 kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/AddressService.java delete mode 100644 kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/HospitalService.java delete mode 100644 kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/ProjectManagerService.java delete mode 100644 kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/ShortcutService.java delete mode 100644 kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/impl/AddressServiceImpl.java delete mode 100644 kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/impl/HospitalServiceImpl.java delete mode 100644 kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/impl/ProjectManagerServiceImpl.java delete mode 100644 kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/impl/ShortcutServiceImpl.java delete mode 100644 kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/AddressMapper.xml delete mode 100644 kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/HospitalMapper.xml delete mode 100644 kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/ProjectManagerMapper.xml delete mode 100644 kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/ShortcutMapper.xml diff --git a/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/dto/LoginDto.java b/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/dto/LoginDto.java deleted file mode 100644 index 5cbf6a2a..00000000 --- a/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/dto/LoginDto.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.cloud.kicc.system.api.dto; - -import lombok.Data; - -/** - *

- * 登录信息 - *

- * - * @Author: entfrm开发团队-王翔 - * @Date: 2022/2/24 - */ -@Data -public class LoginDto { - /** - * 用户名 - */ - private String userName; - - /** - * 用户密码 - */ - private String password; - - /** - * 验证码 - */ - private String code; - - /** - * redis验证码存储密钥 - */ - private String realKey; -} diff --git a/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/entity/Address.java b/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/entity/Address.java deleted file mode 100644 index 991c985b..00000000 --- a/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/entity/Address.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.cloud.kicc.system.api.entity; - -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.cloud.kicc.common.data.entity.TreeEntity; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -/** - * @Author: TangSheng - * @Description: 地址管理实体 - * @Since 1.0 - * @Date Created in 9:57 2022/3/21 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@Accessors(chain = true) -@TableName(value="sys_address", excludeProperty = {"delFlag"}) -public class Address extends TreeEntity
{ - - @TableId - private String id; - - private String code; - - -} diff --git a/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/entity/Hospital.java b/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/entity/Hospital.java deleted file mode 100644 index 5a0bd6af..00000000 --- a/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/entity/Hospital.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.cloud.kicc.system.api.entity; - -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.cloud.kicc.common.data.entity.CommonEntity; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -/** - * @Author: TangSheng - * @Description: 医院管理实体 - * @Since 1.0 - * @Date Created in 9:57 2022/3/21 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@Accessors(chain = true) -@TableName(value="sys_hospital") -public class Hospital extends CommonEntity { - - @TableId - private String id; - - private String name; - - private String contactsName; - - private String contactsTel; - - private String contactsTitle; - - private Integer payment; - - private String addressId; - - private String detailAddress; - - private Integer state; - - -} diff --git a/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/entity/ProjectManager.java b/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/entity/ProjectManager.java deleted file mode 100644 index 62677ac8..00000000 --- a/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/entity/ProjectManager.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.cloud.kicc.system.api.entity; - -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.cloud.kicc.common.data.entity.TreeEntity; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -/** - * @Author: TangSheng - * @Description: 项目 - * @Since 1.0 - * @Date Created in 9:27 2022/3/24 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@Accessors(chain = true) -@TableName(value="sys_project_manager") -public class ProjectManager extends TreeEntity { - - @TableId - private String id; - - private String code; - -} diff --git a/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/entity/Role.java b/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/entity/Role.java index 271ae71d..67030278 100644 --- a/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/entity/Role.java +++ b/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/entity/Role.java @@ -42,11 +42,6 @@ public class Role extends CommonEntity { */ private String code; - /** - * 数据范围（1：全部数据权限 2：自定数据权限） - */ - private String dataScope; - /** * 显示顺序 */ diff --git a/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/entity/Shortcut.java b/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/entity/Shortcut.java deleted file mode 100644 index 8ab34099..00000000 --- a/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/entity/Shortcut.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.cloud.kicc.system.api.entity; - -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.cloud.kicc.common.data.entity.CommonEntity; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -/** - *

- * 快捷方式对象 Shortcut - *

- * - * @Author: entfrm开发团队-王翔 - * @Date: 2022/2/24 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@Accessors(chain = true) -@TableName("sys_shortcut") -public class Shortcut extends CommonEntity { - - private static final long serialVersionUID = 1L; - - /** 编号 */ - @TableId - private String id; - - /** 名称 */ - private String name; - - /** 区域 */ - private String region; - - /** 图标 */ - private String icon; - - /** 背景颜色 */ - private String bgColor; - - /** 路径 */ - private String path; - - /** 顺序 */ - private Integer sort; - -} diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/AddressController.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/AddressController.java deleted file mode 100644 index 85efdfb5..00000000 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/AddressController.java +++ /dev/null @@ -1,103 +0,0 @@ -package com.cloud.kicc.system.controller; - -import cn.hutool.core.util.StrUtil; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.cloud.kicc.system.api.entity.Address; -import com.cloud.kicc.system.service.AddressService; -import com.cloud.kicc.common.core.api.R; -import com.cloud.kicc.common.core.constant.AppConstants; -import io.swagger.annotations.Api; -import lombok.RequiredArgsConstructor; -import org.springframework.web.bind.annotation.*; - -import java.util.Arrays; -import java.util.List; - -/** - * @Author: TangSheng - * @Description: 地址管理 - * @Since 1.0 - * @Date Created in 10:22 2022/3/21 - */ -@RestController -@RequiredArgsConstructor -@RequestMapping(AppConstants.APP_SYSTEM + "/address") -@Api(value = "app", tags = "地址管理模块") -public class AddressController { - - private final AddressService addressService; - - /** - * 新增节点 - * @param address 节点dto - * @return - */ - @PostMapping("/add") - public R add(@RequestBody Address address){ - addressService.save(address); - return R.ok(address); - } - - /** - * 修改节点 - * @param address 修改对象 - * @return - */ - @PutMapping("/update") - public R update(@RequestBody Address address){ - addressService.updateById(address); - return R.ok(address); - } - - /** - * 删除地址节点 - * @param ids 节点id - * @return - */ - @DeleteMapping("/remove/{ids}") - public R remove(@PathVariable("ids") String[] ids){ - addressService.removeBatchByIds(Arrays.asList(ids)); - return R.ok(); - } - - /** - * 查询根据id - * @param id - * @return - */ - @GetMapping("/query/{id}") - public R getById(@PathVariable("id") String id) { - return R.ok(addressService.getById(id)); - } - - /** - * 查询根据条件 - * @param address - * @return - */ - @GetMapping("/list") - public R list(Address address) { - List
addressList = addressService.list(getQueryWrapper(address)); - if (addressList.size() > 0) { - for (Address address1 : addressList) { - if (StrUtil.isNotBlank(address.getName())) { - address1.setParentId("0"); - } - } - } - return R.ok(addressList, addressList.size()); - } - - - private QueryWrapper
getQueryWrapper(Address address) { - return new QueryWrapper
() - .like(StrUtil.isNotBlank(address.getName()), "name", address.getName()) - .between(!StrUtil.hasBlank(address.getBeginTime(),address.getEndTime()),"create_time", - address.getBeginTime(), - address.getEndTime()) - .eq(StrUtil.isNotBlank(address.getCode()),"code", address.getCode()) - .orderByAsc("sort"); - } - - -} diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/HospitalController.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/HospitalController.java deleted file mode 100644 index aa50edc4..00000000 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/HospitalController.java +++ /dev/null @@ -1,100 +0,0 @@ -package com.cloud.kicc.system.controller; - -import cn.hutool.core.util.StrUtil; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.cloud.kicc.system.api.entity.Hospital; -import com.cloud.kicc.system.service.HospitalService; -import com.cloud.kicc.common.core.api.R; -import com.cloud.kicc.common.core.constant.AppConstants; -import io.swagger.annotations.Api; -import lombok.RequiredArgsConstructor; -import org.springframework.web.bind.annotation.*; - -import java.util.Arrays; -import java.util.List; - -/** - * @Author: TangSheng - * @Description: - * @Since 1.0 - * @Date Created in 15:32 2022/3/24 - */ -@RestController -@RequiredArgsConstructor -@RequestMapping(AppConstants.APP_SYSTEM + "/hospital") -@Api(value = "app", tags = "医院管理模块") -public class HospitalController { - - private final HospitalService hospitalService; - - /** - * 新增节点 - * @param hospital 节点dto - * @return - */ - @PostMapping("/add") - public R add(@RequestBody Hospital hospital){ - hospitalService.save(hospital); - return R.ok(hospital); - } - - /** - * 修改节点 - * @param hospital 修改对象 - * @return - */ - @PutMapping("/update") - public R update(@RequestBody Hospital hospital){ - hospitalService.updateById(hospital); - return R.ok(hospital); - } - - /** - * 删除节点 - * @param ids 节点id - * @return - */ - @DeleteMapping("/remove/{ids}") - public R remove(@PathVariable("ids") String[] ids){ - hospitalService.removeBatchByIds(Arrays.asList(ids)); - return R.ok(); - } - - /** - * 查询根据id - * @param id - * @return - */ - @GetMapping("/query/{id}") - public R getById(@PathVariable("id") String id) { - return R.ok(hospitalService.getById(id)); - } - - /** - * 查询根据条件 - * @param hospital - * @return - */ - @GetMapping("/list") - public R list(Hospital hospital) { - List hospitalList = hospitalService.list(getQueryWrapper(hospital)); - return R.ok(hospitalList, hospitalList.size()); - } - - - private QueryWrapper getQueryWrapper(Hospital hospital) { - return new QueryWrapper() - .like(StrUtil.isNotBlank(hospital.getName()), "name", hospital.getName()) - .like(StrUtil.isNotBlank(hospital.getContactsName()), "contacts_name", hospital.getContactsName()) - .like(StrUtil.isNotBlank(hospital.getContactsTel()), "contacts_tel", hospital.getContactsTel()) - .like(StrUtil.isNotBlank(hospital.getContactsTitle()), "contacts_title", hospital.getContactsTitle()) - .like(StrUtil.isNotBlank(hospital.getDetailAddress()), "detail_address", hospital.getDetailAddress()) - .between(!StrUtil.hasBlank(hospital.getBeginTime(),hospital.getEndTime()),"create_time", - hospital.getBeginTime(), - hospital.getEndTime()) - .orderByAsc("create_time"); - } - - - -} diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/ProjectManagerController.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/ProjectManagerController.java deleted file mode 100644 index 7a49b8c2..00000000 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/ProjectManagerController.java +++ /dev/null @@ -1,102 +0,0 @@ -package com.cloud.kicc.system.controller; - -import cn.hutool.core.util.StrUtil; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.cloud.kicc.system.api.entity.ProjectManager; -import com.cloud.kicc.system.service.ProjectManagerService; -import com.cloud.kicc.common.core.api.R; -import com.cloud.kicc.common.core.constant.AppConstants; -import io.swagger.annotations.Api; -import lombok.RequiredArgsConstructor; -import org.springframework.web.bind.annotation.*; - -import java.util.Arrays; -import java.util.List; - -/** - * @Author: TangSheng - * @Description: 项目管理api - * @Since 1.0 - * @Date Created in 9:36 2022/3/24 - */ -@RestController -@RequiredArgsConstructor -@RequestMapping(AppConstants.APP_SYSTEM + "/projectManager") -@Api(value = "app", tags = "项目管理模块") -public class ProjectManagerController { - - private final ProjectManagerService projectManagerService; - - /** - * 新增节点 - * @param projectManager 节点dto - * @return - */ - @PostMapping("/add") - public R add(@RequestBody ProjectManager projectManager){ - projectManagerService.save(projectManager); - return R.ok(projectManager); - } - - /** - * 修改节点 - * @param projectManager 修改对象 - * @return - */ - @PutMapping("/update") - public R update(@RequestBody ProjectManager projectManager){ - projectManagerService.updateById(projectManager); - return R.ok(projectManager); - } - - /** - * 删除节点 - * @param ids 节点id - * @return - */ - @DeleteMapping("/remove/{ids}") - public R remove(@PathVariable("ids") String[] ids){ - projectManagerService.removeBatchByIds(Arrays.asList(ids)); - return R.ok(); - } - - /** - * 查询根据id - * @param id - * @return - */ - @GetMapping("/query/{id}") - public R getById(@PathVariable("id") String id) { - return R.ok(projectManagerService.getById(id)); - } - - /** - * 查询根据条件 - * @param projectManager - * @return - */ - @GetMapping("/list") - public R list(ProjectManager projectManager) { - List projectList = projectManagerService.list(getQueryWrapper(projectManager)); - if (projectList.size() > 0) { - for (ProjectManager project1 : projectList) { - if (StrUtil.isNotBlank(projectManager.getName())) { - project1.setParentId("0"); - } - } - } - return R.ok(projectList, projectList.size()); - } - - - private QueryWrapper getQueryWrapper(ProjectManager projectManager) { - return new QueryWrapper() - .like(StrUtil.isNotBlank(projectManager.getName()), "name", projectManager.getName()) - .between(!StrUtil.hasBlank(projectManager.getBeginTime(),projectManager.getEndTime()),"create_time", - projectManager.getBeginTime(), - projectManager.getEndTime()) - .eq(StrUtil.isNotBlank(projectManager.getCode()),"code", projectManager.getCode()) - .orderByAsc("sort"); - } - -} diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/RoleController.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/RoleController.java index 4712add5..06266ce7 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/RoleController.java +++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/RoleController.java @@ -71,16 +71,6 @@ public class RoleController { return R.ok(); } - @SysLog("数据权限修改") - @PutMapping("/dataScope") - @PreAuthorize("@pms.hasPermission('role_data')") - public R dataScope(@RequestBody Role role) { - if(role.getId() == "1"){ - return R.error("不允许操作超级管理员角色"); - } - return R.ok(roleService.updatePerms(role)); - } - @SysLog("角色状态更改") @PutMapping("/changeStatus") @PreAuthorize("@pms.hasPermission('role_edit')") diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/ShortcutController.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/ShortcutController.java deleted file mode 100644 index 2bdd2412..00000000 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/ShortcutController.java +++ /dev/null @@ -1,83 +0,0 @@ -package com.cloud.kicc.system.controller; - -import cn.hutool.core.util.StrUtil; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.cloud.kicc.system.api.entity.Shortcut; -import com.cloud.kicc.system.service.ShortcutService; -import com.cloud.kicc.common.core.api.R; -import com.cloud.kicc.common.core.constant.AppConstants; -import com.cloud.kicc.common.log.annotation.SysLog; -import lombok.AllArgsConstructor; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.web.bind.annotation.*; - -import java.util.Arrays; -import java.util.List; - - -/** - *

- * 快捷方式Controller - *

- * - * @Author: entfrm开发团队-王翔 - * @Date: 2022/2/24 - */ -@RestController -@AllArgsConstructor -@RequestMapping(AppConstants.APP_SYSTEM + "/shortcut") -public class ShortcutController { - - private final ShortcutService shortcutService; - - private QueryWrapper getQueryWrapper(Shortcut shortcut) { - return new QueryWrapper() - .like(StrUtil.isNotBlank(shortcut.getName()), "name", shortcut.getName()) - .eq(StrUtil.isNotBlank(shortcut.getRegion()), "region", shortcut.getRegion()) - .orderByAsc("sort"); - } - - @GetMapping("/list") - @PreAuthorize("@pms.hasPermission('shortcut_view')") - public R list(Page page, Shortcut shortcut) { - IPage shortcutPage = shortcutService.page(page, getQueryWrapper(shortcut)); - return R.ok(shortcutPage.getRecords(), shortcutPage.getTotal()); - } - - @GetMapping("/shortcutList") - @PreAuthorize("@pms.hasPermission('shortcut_view')") - public R shortcutList(Shortcut shortcut) { - List shortcutList = shortcutService.list(getQueryWrapper(shortcut)); - return R.ok(shortcutList); - } - - @GetMapping("/{id:\\w+}") - public R getById(@PathVariable String id) { - return R.ok(shortcutService.getById(id)); - } - - @SysLog("快捷方式新增") - @PostMapping("/save") - @PreAuthorize("@pms.hasPermission('shortcut_add')") - public R save(@RequestBody Shortcut shortcut) { - shortcutService.saveOrUpdate(shortcut); - return R.ok(); - } - - @SysLog("快捷方式修改") - @PutMapping("/update") - @PreAuthorize("@pms.hasPermission('shortcut_edit')") - public R update(@RequestBody Shortcut shortcut) { - shortcutService.updateById(shortcut); - return R.ok(); - } - - @SysLog("快捷方式删除") - @DeleteMapping("/remove/{id:[\\w,]+}") - @PreAuthorize("@pms.hasPermission('shortcut_del')") - public R remove(@PathVariable String[] id) { - return R.ok(shortcutService.removeByIds(Arrays.asList(id))); - } -} diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/mapper/AddressMapper.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/mapper/AddressMapper.java deleted file mode 100644 index 5855e44f..00000000 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/mapper/AddressMapper.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.cloud.kicc.system.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.cloud.kicc.system.api.entity.Address; -/** - * @Author: TangSheng - * @Description: - * @Since 1.0 - * @Date Created in 11:07 2022/3/21 - */ -public interface AddressMapper extends BaseMapper
{ - - -} diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/mapper/HospitalMapper.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/mapper/HospitalMapper.java deleted file mode 100644 index 289b40ec..00000000 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/mapper/HospitalMapper.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.cloud.kicc.system.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.cloud.kicc.system.api.entity.Hospital; - -/** - * @Author: TangSheng - * @Description: 医院管理 - * @Since 1.0 - * @Date Created in 15:28 2022/3/24 - */ -public interface HospitalMapper extends BaseMapper { -} diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/mapper/ProjectManagerMapper.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/mapper/ProjectManagerMapper.java deleted file mode 100644 index 1f8bbbd3..00000000 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/mapper/ProjectManagerMapper.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.cloud.kicc.system.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.cloud.kicc.system.api.entity.ProjectManager; - -/** - * @Author: TangSheng - * @Description: - * @Since 1.0 - * @Date Created in 9:32 2022/3/24 - */ -public interface ProjectManagerMapper extends BaseMapper { - - -} diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/mapper/ShortcutMapper.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/mapper/ShortcutMapper.java deleted file mode 100644 index 470a62e1..00000000 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/mapper/ShortcutMapper.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.cloud.kicc.system.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.cloud.kicc.system.api.entity.Shortcut; - -/** - *

- * 快捷方式Mapper接口 - *

- * - * @Author: entfrm开发团队-王翔 - * @Date: 2022/2/24 - */ -public interface ShortcutMapper extends BaseMapper{ - -} diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/AddressService.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/AddressService.java deleted file mode 100644 index 5580410c..00000000 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/AddressService.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.cloud.kicc.system.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.cloud.kicc.system.api.entity.Address; - -/** - * @Author: TangSheng - * @Description: - * @Since 1.0 - * @Date Created in 10:23 2022/3/21 - */ -public interface AddressService extends IService
{ - - -} diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/HospitalService.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/HospitalService.java deleted file mode 100644 index c53957bc..00000000 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/HospitalService.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.cloud.kicc.system.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.cloud.kicc.system.api.entity.Hospital; - -/** - * @Author: TangSheng - * @Description: 医院管理 - * @Since 1.0 - * @Date Created in 15:29 2022/3/24 - */ -public interface HospitalService extends IService { -} diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/ProjectManagerService.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/ProjectManagerService.java deleted file mode 100644 index 421571f4..00000000 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/ProjectManagerService.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.cloud.kicc.system.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.cloud.kicc.system.api.entity.ProjectManager; - -/** - * @Author: TangSheng - * @Description: 项目业务 - * @Since 1.0 - * @Date Created in 9:32 2022/3/24 - */ -public interface ProjectManagerService extends IService { - - -} diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/ShortcutService.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/ShortcutService.java deleted file mode 100644 index f9d2b6a9..00000000 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/ShortcutService.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.cloud.kicc.system.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.cloud.kicc.system.api.entity.Shortcut; - -/** - *

- * 快捷方式Service接口 - *

- * - * @Author: entfrm开发团队-王翔 - * @Date: 2022/2/24 - */ -public interface ShortcutService extends IService { - -} diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/impl/AddressServiceImpl.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/impl/AddressServiceImpl.java deleted file mode 100644 index ed3da3f3..00000000 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/impl/AddressServiceImpl.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.cloud.kicc.system.service.impl; - - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.cloud.kicc.system.api.entity.Address; -import com.cloud.kicc.system.mapper.AddressMapper; -import com.cloud.kicc.system.service.AddressService; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Service; - -/** - * @Author: TangSheng - * @Description: 地址管理业务实现 - * @Since 1.0 - * @Date Created in 10:24 2022/3/21 - */ -@Service -@RequiredArgsConstructor -@Slf4j -public class AddressServiceImpl extends ServiceImpl implements AddressService { - - -} diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/impl/HospitalServiceImpl.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/impl/HospitalServiceImpl.java deleted file mode 100644 index 53fed1fc..00000000 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/impl/HospitalServiceImpl.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.cloud.kicc.system.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.cloud.kicc.system.api.entity.Hospital; -import com.cloud.kicc.system.mapper.HospitalMapper; -import com.cloud.kicc.system.service.HospitalService; -import org.springframework.stereotype.Service; - -/** - * @Author: TangSheng - * @Description: 医院管理 - * @Since 1.0 - * @Date Created in 15:30 2022/3/24 - */ -@Service -public class HospitalServiceImpl extends ServiceImpl implements HospitalService { - -} diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/impl/ProjectManagerServiceImpl.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/impl/ProjectManagerServiceImpl.java deleted file mode 100644 index 0e25b006..00000000 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/impl/ProjectManagerServiceImpl.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.cloud.kicc.system.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.cloud.kicc.system.api.entity.ProjectManager; -import com.cloud.kicc.system.mapper.ProjectManagerMapper; -import com.cloud.kicc.system.service.ProjectManagerService; -import org.springframework.stereotype.Service; - -/** - * @Author: TangSheng - * @Description: - * @Since 1.0 - * @Date Created in 9:35 2022/3/24 - */ -@Service -public class ProjectManagerServiceImpl extends ServiceImpl implements ProjectManagerService { - - -} diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/impl/ShortcutServiceImpl.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/impl/ShortcutServiceImpl.java deleted file mode 100644 index 04a797cf..00000000 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/impl/ShortcutServiceImpl.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.cloud.kicc.system.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.cloud.kicc.system.api.entity.Shortcut; -import com.cloud.kicc.system.mapper.ShortcutMapper; -import com.cloud.kicc.system.service.ShortcutService; -import org.springframework.stereotype.Service; - -/** - *

- * 快捷方式Service业务层 - *

- * - * @Author: entfrm开发团队-王翔 - * @Date: 2022/2/24 - */ -@Service -public class ShortcutServiceImpl extends ServiceImpl implements ShortcutService { - -} diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/AddressMapper.xml b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/AddressMapper.xml deleted file mode 100644 index f6694219..00000000 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/AddressMapper.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/HospitalMapper.xml b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/HospitalMapper.xml deleted file mode 100644 index d80be37e..00000000 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/HospitalMapper.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/ProjectManagerMapper.xml b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/ProjectManagerMapper.xml deleted file mode 100644 index 9df2ecf3..00000000 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/ProjectManagerMapper.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/RoleMapper.xml b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/RoleMapper.xml index f3c78373..f086cbf2 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/RoleMapper.xml +++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/RoleMapper.xml @@ -7,7 +7,6 @@ - @@ -19,7 +18,7 @@