From 2e46dfddfc07b25100ebf8e752fbd9da0e3ecdcf Mon Sep 17 00:00:00 2001
From: wangjiadong <1654135867@qq.com>
Date: Wed, 8 Feb 2023 10:56:23 +0800
Subject: [PATCH] =?UTF-8?q?=E6=98=BE=E7=A4=BA=E9=A1=BE=E5=AE=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../person/controller/ZyUserController.java   | 11 ++++++++
 .../modules/person/mapper/ZyUserMapper.java   |  7 ++++++
 .../person/mapper/xml/ZyUserMapper.xml        |  6 ++++-
 .../person/service/IZyUserService.java        |  2 ++
 .../service/Impl/ZyUserServiceImpl.java       | 25 +++++++++++++++++++
 5 files changed, 50 insertions(+), 1 deletion(-)

diff --git a/jeecg-boot/jeecg-boot-module-personnel/src/main/java/org/jeecg/modules/person/controller/ZyUserController.java b/jeecg-boot/jeecg-boot-module-personnel/src/main/java/org/jeecg/modules/person/controller/ZyUserController.java
index 330accb7..25726d78 100644
--- a/jeecg-boot/jeecg-boot-module-personnel/src/main/java/org/jeecg/modules/person/controller/ZyUserController.java
+++ b/jeecg-boot/jeecg-boot-module-personnel/src/main/java/org/jeecg/modules/person/controller/ZyUserController.java
@@ -30,6 +30,17 @@ public class ZyUserController {
 
 
 
+
+    @AutoLog(value = "查询所有流水线员工基本信息")
+    @ApiOperation(value = "查询所有流水线员工基本信息", notes = "查询所有流水线员工基本信息")
+    @GetMapping(value = "/allgk")
+    public Result<?> getAllgk() {
+        List<User1> allUsergk = iZyUserService.getAllUsergk();
+        System.out.println(allUsergk);
+        return Result.OK(allUsergk);
+    }
+
+
     @AutoLog(value = "查询所有流水线员工基本信息")
     @ApiOperation(value = "查询所有流水线员工基本信息", notes = "查询所有流水线员工基本信息")
     @GetMapping(value = "/allUserOnLine")
diff --git a/jeecg-boot/jeecg-boot-module-personnel/src/main/java/org/jeecg/modules/person/mapper/ZyUserMapper.java b/jeecg-boot/jeecg-boot-module-personnel/src/main/java/org/jeecg/modules/person/mapper/ZyUserMapper.java
index 47c783bb..8fd1091d 100644
--- a/jeecg-boot/jeecg-boot-module-personnel/src/main/java/org/jeecg/modules/person/mapper/ZyUserMapper.java
+++ b/jeecg-boot/jeecg-boot-module-personnel/src/main/java/org/jeecg/modules/person/mapper/ZyUserMapper.java
@@ -2,6 +2,7 @@ package org.jeecg.modules.person.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
 import org.jeecg.modules.person.vo.*;
 import org.jeecg.modules.person.entity.SysUser;
 import org.jeecg.modules.person.vo.*;
@@ -23,4 +24,10 @@ public interface ZyUserMapper extends BaseMapper<SysUser> {
     List<ZyIdentity1> getWorkIdentityByMachine(String id);
 
     List<GetWorker> getWorkByIdentityId(List<String> ids);
+
+    @Select("select id,username,realname,avatar,sex,email,phone,status from sys_user")
+    List<User1> getAllUsergk();
+
+    @Select("select count(1) from sys_user_role where user_id=#{id} and role_id='1601135568301318146'")
+    Boolean isboolc(String id);
 }
diff --git a/jeecg-boot/jeecg-boot-module-personnel/src/main/java/org/jeecg/modules/person/mapper/xml/ZyUserMapper.xml b/jeecg-boot/jeecg-boot-module-personnel/src/main/java/org/jeecg/modules/person/mapper/xml/ZyUserMapper.xml
index b6e649e3..0040225a 100644
--- a/jeecg-boot/jeecg-boot-module-personnel/src/main/java/org/jeecg/modules/person/mapper/xml/ZyUserMapper.xml
+++ b/jeecg-boot/jeecg-boot-module-personnel/src/main/java/org/jeecg/modules/person/mapper/xml/ZyUserMapper.xml
@@ -1,7 +1,11 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
 <mapper namespace="org.jeecg.modules.person.mapper.ZyUserMapper">
-    <!-- 查询所有流水线的员工的工位，工号，姓名和角色 -->
+
+
+
+
+    <!-- 查询所有流水线的员工的工位，工号，姓名和角色  -->
     <select id="getAllUserOnLine" resultType="org.jeecg.modules.person.vo.station">
         SELECT a.name AS lineName,b.code AS stationNumber,d.*
             FROM zy_fabric_warehouse a
diff --git a/jeecg-boot/jeecg-boot-module-personnel/src/main/java/org/jeecg/modules/person/service/IZyUserService.java b/jeecg-boot/jeecg-boot-module-personnel/src/main/java/org/jeecg/modules/person/service/IZyUserService.java
index ef1e8ccb..ee737276 100644
--- a/jeecg-boot/jeecg-boot-module-personnel/src/main/java/org/jeecg/modules/person/service/IZyUserService.java
+++ b/jeecg-boot/jeecg-boot-module-personnel/src/main/java/org/jeecg/modules/person/service/IZyUserService.java
@@ -17,4 +17,6 @@ public interface IZyUserService extends IService<SysUser> {
     List<ZyIdentity1> getWorkIdentityByMachine(String machineId);
 
     List<GetWorker> getWorkByIdentityId(List<String> list);
+
+    List<User1> getAllUsergk();
 }
diff --git a/jeecg-boot/jeecg-boot-module-personnel/src/main/java/org/jeecg/modules/person/service/Impl/ZyUserServiceImpl.java b/jeecg-boot/jeecg-boot-module-personnel/src/main/java/org/jeecg/modules/person/service/Impl/ZyUserServiceImpl.java
index 884fc76d..f0c9e1eb 100644
--- a/jeecg-boot/jeecg-boot-module-personnel/src/main/java/org/jeecg/modules/person/service/Impl/ZyUserServiceImpl.java
+++ b/jeecg-boot/jeecg-boot-module-personnel/src/main/java/org/jeecg/modules/person/service/Impl/ZyUserServiceImpl.java
@@ -17,6 +17,29 @@ public class ZyUserServiceImpl extends ServiceImpl<ZyUserMapper, SysUser> implem
     @Autowired
     private ZyUserMapper zyUserMapper;
 
+
+    @Override
+    public List<User1> getAllUsergk() {
+        List<User1> allUsergk = zyUserMapper.getAllUsergk();
+        List<User1> userList = new ArrayList<>();
+        for(User1 s:allUsergk){
+            User1 user = new User1();
+            String id = s.getId();
+            Boolean  c=  zyUserMapper.isboolc(id);
+            if (c){
+             user.setId(s.getId());
+             user.setRealName(s.getRealName());
+             user.setUserName(s.getUserName());
+             user.setAvatar(s.getAvatar());
+             user.setEmail(s.getEmail());
+             user.setPhone(s.getPhone());
+             user.setSex(s.getSex());
+             userList.add(user);
+            }
+        }
+        return userList;
+    }
+
     @Override
     public List<User> getAllUserOnLine() {
         List<station> allUserOnLine = zyUserMapper.getAllUserOnLine();
@@ -88,4 +111,6 @@ public class ZyUserServiceImpl extends ServiceImpl<ZyUserMapper, SysUser> implem
     }
 
 
+
+
 }