From 0e48cd386385110ea16ca05aae070f013c221f9a Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Tue, 11 May 2021 10:35:01 +0800
Subject: [PATCH] screen-manage 修改组织模块Bug
---
/dev/null | 27 ---------
screen-manage/src/main/java/com/moral/api/service/impl/UserServiceImpl.java | 21 ++++++
screen-manage/src/main/java/com/moral/api/controller/OrganizationController.java | 15 +----
screen-manage/src/main/java/com/moral/api/pojo/form/group/GroupUpdateForm.java | 17 +++++
screen-manage/src/main/java/com/moral/api/service/impl/OrganizationServiceImpl.java | 38 +-----------
screen-manage/src/main/java/com/moral/api/controller/GroupController.java | 36 ++++++++++++
screen-manage/src/main/java/com/moral/api/controller/AccountController.java | 2
7 files changed, 79 insertions(+), 77 deletions(-)
diff --git a/screen-manage/src/main/java/com/moral/api/controller/AccountController.java b/screen-manage/src/main/java/com/moral/api/controller/AccountController.java
index 53620af..e361433 100644
--- a/screen-manage/src/main/java/com/moral/api/controller/AccountController.java
+++ b/screen-manage/src/main/java/com/moral/api/controller/AccountController.java
@@ -5,9 +5,7 @@
import com.moral.api.pojo.form.account.AccountInsertForm;
import com.moral.api.pojo.form.account.AccountQueryForm;
import com.moral.api.pojo.form.account.AccountUpdateForm;
-import com.moral.api.pojo.vo.account.AccountDeleteVO;
import com.moral.api.pojo.vo.account.AccountQueryVO;
-import com.moral.api.pojo.vo.account.AccountUpdateVO;
import com.moral.api.service.ManageAccountService;
import com.moral.constant.ResponseCodeEnum;
import com.moral.constant.ResultMessage;
diff --git a/screen-manage/src/main/java/com/moral/api/controller/GroupController.java b/screen-manage/src/main/java/com/moral/api/controller/GroupController.java
new file mode 100644
index 0000000..e967b71
--- /dev/null
+++ b/screen-manage/src/main/java/com/moral/api/controller/GroupController.java
@@ -0,0 +1,36 @@
+package com.moral.api.controller;
+
+import com.moral.constant.ResultMessage;
+import io.swagger.annotations.Api;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.CrossOrigin;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @ClassName GroupController
+ * @Description TODO
+ * @Author ���������
+ * @Date 2021/5/11 10:16
+ * @Version TODO
+ **/
+@Slf4j
+@Api(tags = {"������������������"})
+@RestController
+@CrossOrigin(origins = "*", maxAge = 3600)
+@RequestMapping("/group")
+public class GroupController {
+
+ /**
+ * @Description: ���admin������������������������
+ * @Param: []
+ * @return: com.moral.constant.ResultMessage
+ * @Author: ���������
+ * @Date: 2021/5/11
+ */
+ @PostMapping("update")
+ public ResultMessage update() {
+ return null;
+ }
+}
diff --git a/screen-manage/src/main/java/com/moral/api/controller/OrganizationController.java b/screen-manage/src/main/java/com/moral/api/controller/OrganizationController.java
index fb183ff..8642de0 100644
--- a/screen-manage/src/main/java/com/moral/api/controller/OrganizationController.java
+++ b/screen-manage/src/main/java/com/moral/api/controller/OrganizationController.java
@@ -48,10 +48,7 @@
//������������������
OrganizationDTO dto = organizationService.insertOrganization(form);
- //���������������������������
- OrganizationInsertVO vo = OrganizationInsertVO.convert(dto);
-
- return new ResultMessage(dto.getCode(), dto.getMsg(), vo);
+ return new ResultMessage(dto.getCode(), dto.getMsg(), null);
}
@PostMapping("update")
@@ -71,10 +68,7 @@
//������������������
OrganizationDTO dto = organizationService.updateOrganization(form);
- //���������������������������
- OrganizationUpdateVO vo = OrganizationUpdateVO.convert(dto);
-
- return new ResultMessage(dto.getCode(), dto.getMsg(), vo);
+ return new ResultMessage(dto.getCode(), dto.getMsg(), null);
}
@PostMapping("delete")
@@ -87,10 +81,7 @@
//������������������
OrganizationDTO dto = organizationService.deleteOrganization(form);
- //���������������������������
- OrganizationDeleteVO vo = OrganizationDeleteVO.convert(dto);
-
- return new ResultMessage(dto.getCode(), dto.getMsg(), vo);
+ return new ResultMessage(dto.getCode(), dto.getMsg(), null);
}
@GetMapping("query")
diff --git a/screen-manage/src/main/java/com/moral/api/pojo/form/group/GroupUpdateForm.java b/screen-manage/src/main/java/com/moral/api/pojo/form/group/GroupUpdateForm.java
new file mode 100644
index 0000000..e6f3246
--- /dev/null
+++ b/screen-manage/src/main/java/com/moral/api/pojo/form/group/GroupUpdateForm.java
@@ -0,0 +1,17 @@
+package com.moral.api.pojo.form.group;
+
+import lombok.Data;
+
+/**
+ * @ClassName GroupUpdateForm
+ * @Description TODO
+ * @Author ���������
+ * @Date 2021/5/11 10:25
+ * @Version TODO
+ **/
+@Data
+public class GroupUpdateForm {
+
+ private Integer organizationId;
+
+}
diff --git a/screen-manage/src/main/java/com/moral/api/pojo/vo/account/AccountDeleteVO.java b/screen-manage/src/main/java/com/moral/api/pojo/vo/account/AccountDeleteVO.java
deleted file mode 100644
index d2bad3c..0000000
--- a/screen-manage/src/main/java/com/moral/api/pojo/vo/account/AccountDeleteVO.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.moral.api.pojo.vo.account;
-
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.moral.api.entity.ManageAccount;
-import com.moral.api.pojo.dto.account.AccountDTO;
-import com.moral.constant.ResponseCodeEnum;
-import lombok.Data;
-
-/**
- * @ClassName AccountDeleteVO
- * @Description TODO
- * @Author ���������
- * @Date 2021/3/16 11:40
- * @Version TODO
- **/
-@Data
-@JsonInclude(JsonInclude.Include.NON_EMPTY)
-
-public class AccountDeleteVO extends AccountVO {
-
- public static AccountDeleteVO convert(AccountDTO dto) {
- if (dto.getCode() != ResponseCodeEnum.SUCCESS.getCode())
- return null;
- AccountDeleteVO vo = new AccountDeleteVO();
- ManageAccount account = dto.getAccount();
- vo.setId(account.getId());
- vo.setUserName(account.getUserName());
- return vo;
- }
-}
diff --git a/screen-manage/src/main/java/com/moral/api/pojo/vo/account/AccountUpdateVO.java b/screen-manage/src/main/java/com/moral/api/pojo/vo/account/AccountUpdateVO.java
deleted file mode 100644
index 4be3321..0000000
--- a/screen-manage/src/main/java/com/moral/api/pojo/vo/account/AccountUpdateVO.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package com.moral.api.pojo.vo.account;
-
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.moral.api.entity.ManageRole;
-import com.moral.api.pojo.dto.account.AccountDTO;
-import com.moral.constant.ResponseCodeEnum;
-import lombok.Data;
-import org.springframework.util.ObjectUtils;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * @ClassName AccountUpdateVO
- * @Description TODO
- * @Author ���������
- * @Date 2021/3/15 17:35
- * @Version TODO
- **/
-@Data
-@JsonInclude(JsonInclude.Include.NON_EMPTY)
-
-public class AccountUpdateVO extends AccountVO {
-
- public static AccountUpdateVO convert(AccountDTO dto) {
- if (dto.getCode() != ResponseCodeEnum.SUCCESS.getCode())
- return null;
-
- AccountUpdateVO vo = new AccountUpdateVO();
-
- Integer id = dto.getAccount().getId();
- String userName = dto.getAccount().getUserName();
- String email = dto.getAccount().getEmail();
- String mobile = dto.getAccount().getMobile();
- String wechat = dto.getAccount().getWechat();
-
- //������������������������
- List<ManageRole> roles = dto.getRoles();
- List<String> roleNames = new ArrayList<>();
- if (!ObjectUtils.isEmpty(roles)) {
- roles.forEach(role -> roleNames.add(role.getName()));
- }
- vo.setId(id);
- vo.setUserName(userName);
- vo.setEmail(email);
- vo.setMobile(mobile);
- vo.setWechat(wechat);
- vo.setRoleNames(roleNames);
-
- return vo;
- }
-
-}
diff --git a/screen-manage/src/main/java/com/moral/api/pojo/vo/organization/OrganizationDeleteVO.java b/screen-manage/src/main/java/com/moral/api/pojo/vo/organization/OrganizationDeleteVO.java
deleted file mode 100644
index 899e279..0000000
--- a/screen-manage/src/main/java/com/moral/api/pojo/vo/organization/OrganizationDeleteVO.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package com.moral.api.pojo.vo.organization;
-
-
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.moral.api.entity.Organization;
-import com.moral.api.pojo.dto.organization.OrganizationDTO;
-import com.moral.constant.ResponseCodeEnum;
-import lombok.Data;
-
-/**
- * @ClassName OrganizationDeleteVO
- * @Description TODO
- * @Author ���������
- * @Date 2021/3/25 13:46
- * @Version TODO
- **/
-@Data
-@JsonInclude(JsonInclude.Include.NON_EMPTY)
-public class OrganizationDeleteVO extends OrganizationVO {
-
- public static OrganizationDeleteVO convert(OrganizationDTO dto){
- if (dto.getCode() != ResponseCodeEnum.SUCCESS.getCode())
- return null;
- OrganizationDeleteVO vo = new OrganizationDeleteVO();
- Organization organization = dto.getOrganization();
-
- vo.setName(organization.getName());
- vo.setId(organization.getId());
- return vo;
- }
-}
diff --git a/screen-manage/src/main/java/com/moral/api/pojo/vo/organization/OrganizationInsertVO.java b/screen-manage/src/main/java/com/moral/api/pojo/vo/organization/OrganizationInsertVO.java
deleted file mode 100644
index ec0e958..0000000
--- a/screen-manage/src/main/java/com/moral/api/pojo/vo/organization/OrganizationInsertVO.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.moral.api.pojo.vo.organization;
-
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.moral.api.entity.Organization;
-import com.moral.api.pojo.dto.organization.OrganizationDTO;
-import com.moral.constant.ResponseCodeEnum;
-import lombok.Data;
-
-/**
- * @ClassName OrganizationInsertVO
- * @Description TODO
- * @Author ���������
- * @Date 2021/3/23 17:14
- * @Version TODO
- **/
-@Data
-@JsonInclude(JsonInclude.Include.NON_EMPTY)
-public class OrganizationInsertVO extends OrganizationVO {
-
- public static OrganizationInsertVO convert(OrganizationDTO dto){
- if (dto.getCode() != ResponseCodeEnum.SUCCESS.getCode())
- return null;
- OrganizationInsertVO vo = new OrganizationInsertVO();
- Organization organization = dto.getOrganization();
-
- vo.setId(organization.getId());
- vo.setName(organization.getName());
- return vo;
- }
-}
diff --git a/screen-manage/src/main/java/com/moral/api/pojo/vo/organization/OrganizationUpdateVO.java b/screen-manage/src/main/java/com/moral/api/pojo/vo/organization/OrganizationUpdateVO.java
deleted file mode 100644
index b5fd463..0000000
--- a/screen-manage/src/main/java/com/moral/api/pojo/vo/organization/OrganizationUpdateVO.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.moral.api.pojo.vo.organization;
-
-
-import com.moral.api.entity.Organization;
-import com.moral.api.pojo.dto.organization.OrganizationDTO;
-import com.moral.constant.ResponseCodeEnum;
-
-/**
- * @ClassName OrganizationUpdateVO
- * @Description TODO
- * @Author ���������
- * @Date 2021/3/24 14:37
- * @Version TODO
- **/
-public class OrganizationUpdateVO extends OrganizationVO {
-
- public static OrganizationUpdateVO convert(OrganizationDTO dto) {
- if (dto.getCode() != ResponseCodeEnum.SUCCESS.getCode())
- return null;
- OrganizationUpdateVO vo = new OrganizationUpdateVO();
- Organization organization = dto.getOrganization();
-
- vo.setId(organization.getId());
- vo.setName(organization.getName());
- return vo;
- }
-}
diff --git a/screen-manage/src/main/java/com/moral/api/service/impl/OrganizationServiceImpl.java b/screen-manage/src/main/java/com/moral/api/service/impl/OrganizationServiceImpl.java
index bd2db85..b7a7099 100644
--- a/screen-manage/src/main/java/com/moral/api/service/impl/OrganizationServiceImpl.java
+++ b/screen-manage/src/main/java/com/moral/api/service/impl/OrganizationServiceImpl.java
@@ -91,26 +91,10 @@
organizationDTO.setMsg(ResponseCodeEnum.ORGANIZATION_EXIST.getMsg());
return organizationDTO;
}
- //���������������������������
- Integer parentId = organization.getParentId();
- Organization parentOrganization = new Organization();
- if (!ObjectUtils.isEmpty(parentId)) {
- parentOrganization.setId(parentId);
- parentOrganization.setIsDelete(Constants.NOT_DELETE);
- queryWrapper.setEntity(parentOrganization);
- parentOrganization = organizationMapper.selectOne(queryWrapper);
- if (ObjectUtils.isEmpty(parentOrganization)) {
- organizationDTO.setCode(ResponseCodeEnum.ORGANIZATION_PARENT_NOT_EXIST.getCode());
- organizationDTO.setMsg(ResponseCodeEnum.ORGANIZATION_PARENT_NOT_EXIST.getMsg());
- return organizationDTO;
- }
- }
//������������
organizationMapper.insert(organization);
//������DTO������
- organizationDTO.setParentOrganization(parentOrganization);
- organizationDTO.setOrganization(organization);
organizationDTO.setCode(ResponseCodeEnum.SUCCESS.getCode());
organizationDTO.setMsg(ResponseCodeEnum.SUCCESS.getMsg());
@@ -149,21 +133,6 @@
return organizationDTO;
}
- //������������������������������������������������������
- Integer parentId = organization.getParentId();
- Organization parentOrganization = new Organization();
- if (!ObjectUtils.isEmpty(parentId) && parentId != 0) {
- QueryWrapper<Organization> existParentWrapper = new QueryWrapper<>();
- parentOrganization.setId(parentId);
- parentOrganization.setIsDelete(Constants.NOT_DELETE);
- existParentWrapper.setEntity(parentOrganization);
- parentOrganization = organizationMapper.selectOne(existParentWrapper);
- if (ObjectUtils.isEmpty(parentOrganization)) {
- organizationDTO.setCode(ResponseCodeEnum.ORGANIZATION_PARENT_NOT_EXIST.getCode());
- organizationDTO.setMsg(ResponseCodeEnum.ORGANIZATION_PARENT_NOT_EXIST.getMsg());
- return organizationDTO;
- }
- }
//������������
organizationMapper.updateById(organization);
@@ -172,8 +141,6 @@
organization = organizationMapper.selectById(organization.getId());
//������DTO������
- organizationDTO.setParentOrganization(parentOrganization);
- organizationDTO.setOrganization(organization);
organizationDTO.setCode(ResponseCodeEnum.SUCCESS.getCode());
organizationDTO.setMsg(ResponseCodeEnum.SUCCESS.getMsg());
@@ -182,6 +149,8 @@
return organizationDTO;
}
+
+
/**
* @Description: ������������������
@@ -197,7 +166,7 @@
//������
Integer id = form.getOrganizationId();
- //������������������������
+ //������������������������������������������
Organization existOrganization = new Organization();
existOrganization.setIsDelete(Constants.NOT_DELETE);
existOrganization.setId(id);
@@ -252,7 +221,6 @@
}
//������������������
- dto.setOrganization(existOrganization);
dto.setCode(ResponseCodeEnum.SUCCESS.getCode());
dto.setMsg(ResponseCodeEnum.SUCCESS.getMsg());
//������������������
diff --git a/screen-manage/src/main/java/com/moral/api/service/impl/UserServiceImpl.java b/screen-manage/src/main/java/com/moral/api/service/impl/UserServiceImpl.java
index 0c42135..3d9a977 100644
--- a/screen-manage/src/main/java/com/moral/api/service/impl/UserServiceImpl.java
+++ b/screen-manage/src/main/java/com/moral/api/service/impl/UserServiceImpl.java
@@ -5,9 +5,13 @@
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.moral.api.config.mybatis.wrapper.NullFilterWrapper;
+import com.moral.api.entity.Group;
import com.moral.api.entity.Organization;
import com.moral.api.entity.User;
+import com.moral.api.entity.UserGroup;
+import com.moral.api.mapper.GroupMapper;
import com.moral.api.mapper.OrganizationMapper;
+import com.moral.api.mapper.UserGroupMapper;
import com.moral.api.mapper.UserMapper;
import com.moral.api.pojo.dto.user.UserDTO;
import com.moral.api.pojo.dto.user.UserQueryDTO;
@@ -44,6 +48,10 @@
UserMapper userMapper;
@Autowired
OrganizationMapper organizationMapper;
+ @Autowired
+ GroupMapper groupMapper;
+ @Autowired
+ UserGroupMapper userGroupMapper;
@Override
public UserQueryDTO queryUsers(UserQueryForm form) {
@@ -183,8 +191,19 @@
dto.setMsg(ResponseCodeEnum.ORGANIZATION_USER_EXIST.getMsg());
return dto;
}
- //������
+ //���������������
userMapper.insert(user);
+ //������������admin������
+ Group group = new Group();
+ group.setOrganizationId(organizationId);
+ group.setGroupName("admin");
+ groupMapper.insert(group);
+ //���������������������������
+ UserGroup userGroup = new UserGroup();
+ userGroup.setUserId(user.getId());
+ userGroup.setGroupId(group.getId());
+ userGroup.setOrganizationId(organizationId);
+ userGroupMapper.insert(userGroup);
//������������
Organization organization = new Organization();
organization.setAdminUserId(user.getId());
--
Gitblit v1.8.0