From 943a2364c76db4c4e570e0d0219a81b6caa9bffc Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Thu, 13 May 2021 14:27:08 +0800
Subject: [PATCH] deivce相关接口

---
 screen-manage/src/main/java/com/moral/api/service/impl/GroupMenuServiceImpl.java |   66 ++++++++++++++++++++++++++------
 1 files changed, 53 insertions(+), 13 deletions(-)

diff --git a/screen-manage/src/main/java/com/moral/api/service/impl/GroupMenuServiceImpl.java b/screen-manage/src/main/java/com/moral/api/service/impl/GroupMenuServiceImpl.java
index 85f0669..0d61854 100644
--- a/screen-manage/src/main/java/com/moral/api/service/impl/GroupMenuServiceImpl.java
+++ b/screen-manage/src/main/java/com/moral/api/service/impl/GroupMenuServiceImpl.java
@@ -7,6 +7,8 @@
 import com.moral.api.mapper.GroupMapper;
 import com.moral.api.mapper.GroupMenuMapper;
 import com.moral.api.pojo.dto.groupMenu.GroupMenuDTO;
+import com.moral.api.pojo.dto.groupMenu.GroupMenuQueryDTO;
+import com.moral.api.pojo.form.groupMenu.GroupMenuQueryForm;
 import com.moral.api.pojo.form.groupMenu.GroupMenuUpdateForm;
 import com.moral.api.service.GroupMenuService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -17,6 +19,7 @@
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.ObjectUtils;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -42,30 +45,24 @@
         GroupMenuDTO dto = new GroupMenuDTO();
         //������
         Integer orgId = form.getOrganizationId();
-        Integer channel = form.getChannel();
+        String channelKey = form.getChannelKey();
         List<Integer> insertMenuIds = form.getMenuIds();
         //������orgId������������admin������id
-        QueryWrapper<Group> queryGroupWrapper = new QueryWrapper<>();
-        Group groupConditon = new Group();
-        groupConditon.setOrganizationId(orgId);
-        groupConditon.setGroupName("admin");
-        groupConditon.setIsDelete(Constants.NOT_DELETE);
-        queryGroupWrapper.setEntity(groupConditon);
-        Group group = groupMapper.selectOne(queryGroupWrapper);
-        if(ObjectUtils.isEmpty(group)){//������������������������������������������������
+        Group group = queryAdminGroupByOrganizationId(orgId);
+        if (ObjectUtils.isEmpty(group)) {//������������������������������������������������
             dto.setCode(ResponseCodeEnum.ORGANIZATION_USER_NOT_EXIST.getCode());
             dto.setMsg(ResponseCodeEnum.ORGANIZATION_USER_NOT_EXIST.getMsg());
             return dto;
         }
         //���������������������������������
         UpdateWrapper deleteWrapper = new UpdateWrapper();
-        deleteWrapper.set("is_delete",Constants.DELETE);
-        deleteWrapper.eq("group_id",group.getId());
-        groupMenuMapper.update(null,deleteWrapper);
+        deleteWrapper.set("is_delete", Constants.DELETE);
+        deleteWrapper.eq("group_id", group.getId());
+        groupMenuMapper.update(null, deleteWrapper);
         //������������
         for (Integer menuId : insertMenuIds) {
             GroupMenu groupMenu = new GroupMenu();
-            groupMenu.setChannel(channel);
+            groupMenu.setChannelKey(channelKey);
             groupMenu.setGroupId(group.getId());
             groupMenu.setMenuId(menuId);
             groupMenu.setOrganizationId(orgId);
@@ -76,4 +73,47 @@
         dto.setMsg(ResponseCodeEnum.SUCCESS.getMsg());
         return dto;
     }
+
+    @Override
+    public GroupMenuQueryDTO queryGroupMenu(GroupMenuQueryForm form) {
+        //������������������
+        GroupMenuQueryDTO dto = new GroupMenuQueryDTO();
+        //������
+        Integer organizationId = form.getOrganizationId();
+        //������������admin������
+        Group group = queryAdminGroupByOrganizationId(organizationId);
+        if (ObjectUtils.isEmpty(group)) {//������������������������������������������������
+            dto.setCode(ResponseCodeEnum.ORGANIZATION_USER_NOT_EXIST.getCode());
+            dto.setMsg(ResponseCodeEnum.ORGANIZATION_USER_NOT_EXIST.getMsg());
+            return dto;
+        }
+        //���������������������������������������
+        QueryWrapper<GroupMenu> queryGroupMenuWrapper = new QueryWrapper<>();
+        queryGroupMenuWrapper.eq("group_id", group.getId());
+        queryGroupMenuWrapper.eq("is_delete",Constants.NOT_DELETE);
+        List<GroupMenu> groupMenus = groupMenuMapper.selectList(queryGroupMenuWrapper);
+        //������������������
+        List<GroupMenuDTO> dtos = new ArrayList<>();
+        for (GroupMenu groupMenu : groupMenus) {
+            GroupMenuDTO groupMenuDTO = new GroupMenuDTO();
+            groupMenuDTO.setGroupMenu(groupMenu);
+            dtos.add(groupMenuDTO);
+        }
+        dto.setDtos(dtos);
+        dto.setCode(ResponseCodeEnum.SUCCESS.getCode());
+        dto.setMsg(ResponseCodeEnum.SUCCESS.getMsg());
+        return dto;
+    }
+
+    private Group queryAdminGroupByOrganizationId(Integer OrganizationId) {
+        QueryWrapper<Group> queryGroupWrapper = new QueryWrapper<>();
+        Group groupConditon = new Group();
+        groupConditon.setOrganizationId(OrganizationId);
+        groupConditon.setGroupName("admin");
+        groupConditon.setIsDelete(Constants.NOT_DELETE);
+        queryGroupWrapper.setEntity(groupConditon);
+        return groupMapper.selectOne(queryGroupWrapper);
+    }
+
+
 }

--
Gitblit v1.8.0