[用户] 添加根据用户单位查看单位专管员的接口

dev-user/src/main/java/com/tykj/dev/device/user/base/req/UnitNameVo.java

+package com.tykj.dev.device.user.base.req;
+
+import io.swagger.annotations.ApiModel;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @author zjm
+ * @version 1.0.0
+ * @ClassName UnitNameVo.java
+ * @Description TODO
+ * @createTime 2021年03月17日 16:17:00
+ */
+@AllArgsConstructor
+@NoArgsConstructor
+@Data
+@ApiModel(value = "根据单位名称查询用户的接口", description = "根据单位名称查询用户的接口")
+public class UnitNameVo {
+
+    private String unitName;
+}

dev-user/src/main/java/com/tykj/dev/device/user/subject/controller/UnitsController.java

@@ -112,4 +112,6 @@ public class UnitsController {
         return ResponseEntity.ok(unitsService.findDirectlyUnder());
     }
 
+
+
 }

dev-user/src/main/java/com/tykj/dev/device/user/subject/controller/UserController.java

 package com.tykj.dev.device.user.subject.controller;
 
 import com.tykj.dev.config.swagger.AutoDocument;
-import com.tykj.dev.device.user.base.req.DropDownUserLocation;
-import com.tykj.dev.device.user.base.req.LoginUser;
-import com.tykj.dev.device.user.base.req.NotIsUser;
-import com.tykj.dev.device.user.base.req.VenitalisVo;
+import com.tykj.dev.device.user.base.req.*;
 import com.tykj.dev.device.user.base.ret.UserUpdatePw;
 import com.tykj.dev.device.user.config.MyFilter;
 import com.tykj.dev.device.user.config.MyUserDetailsServiceImpl;
@@ -250,5 +247,11 @@ public class UserController {
         return ResponseEntity.ok("替换完成");
     }
 
+    @PostMapping("/list/unitName")
+    @ApiOperation(value = "根据单位名称查询单位用户")
+    public ResponseEntity findUnitName(@RequestBody UnitNameVo unitNameVo){
+
+        return ResponseEntity.ok(userService.findUnitNameListUser(unitNameVo));
+    }
 
 }

dev-user/src/main/java/com/tykj/dev/device/user/subject/dao/UserDao.java

@@ -22,4 +22,6 @@ public interface UserDao extends JpaRepository<User, Integer>, JpaSpecificationE
     int maxShowOrder(Integer unitsId);
 
     List<User> findAllByIsDel(Integer isDel);
+
+
 }

dev-user/src/main/java/com/tykj/dev/device/user/subject/service/UserService.java

@@ -3,6 +3,7 @@ package com.tykj.dev.device.user.subject.service;
 
 import com.tykj.dev.device.user.base.req.DropDownUserLocation;
 import com.tykj.dev.device.user.base.req.NotIsUser;
+import com.tykj.dev.device.user.base.req.UnitNameVo;
 import com.tykj.dev.device.user.base.ret.*;
 import com.tykj.dev.device.user.subject.entity.SecurityUser;
 import com.tykj.dev.device.user.subject.entity.Units;
@@ -165,4 +166,10 @@ public interface UserService extends PublicService<User> {
      */
     void  replaceOptFor(DropDownUserLocation dropDownUserLocation);
 
+    /**
+     * 根据单位名称查询单位下的人员
+     * @param unitNameVo 单位名称对象
+     * @return 人员集合
+     */
+    List<UserShenRe> findUnitNameListUser(UnitNameVo unitNameVo);
 }

dev-user/src/main/java/com/tykj/dev/device/user/subject/service/impl/UnitsServiceImpl.java

@@ -193,7 +193,7 @@ public class UnitsServiceImpl implements UnitsService {
            units1.add(units);
            units1.addAll(unitsDao.findAllByType(2));
        }
-        return units1;
+        return units1.stream().sorted(Comparator.comparing(Units::getShowOrder)).collect(Collectors.toList());
     }
 
     @Override

dev-user/src/main/java/com/tykj/dev/device/user/subject/service/impl/UserServiceImpl.java

@@ -3,6 +3,7 @@ package com.tykj.dev.device.user.subject.service.impl;
 import com.tykj.dev.config.cache.ConfigCache;
 import com.tykj.dev.device.user.base.req.DropDownUserLocation;
 import com.tykj.dev.device.user.base.req.NotIsUser;
+import com.tykj.dev.device.user.base.req.UnitNameVo;
 import com.tykj.dev.device.user.base.ret.*;
 import com.tykj.dev.device.user.cache.UserCache;
 import com.tykj.dev.device.user.read.service.MessageService;
@@ -12,10 +13,7 @@ import com.tykj.dev.device.user.subject.dao.UnitsDao;
 import com.tykj.dev.device.user.subject.dao.UserDao;
 import com.tykj.dev.device.user.subject.dao.UserRoleDao;
 import com.tykj.dev.device.user.subject.entity.*;
-import com.tykj.dev.device.user.subject.service.AreaService;
-import com.tykj.dev.device.user.subject.service.UnitsService;
-import com.tykj.dev.device.user.subject.service.UserLogService;
-import com.tykj.dev.device.user.subject.service.UserService;
+import com.tykj.dev.device.user.subject.service.*;
 import com.tykj.dev.misc.exception.ApiException;
 import com.tykj.dev.misc.utils.SpringUtils;
 import lombok.extern.slf4j.Slf4j;
@@ -52,6 +50,9 @@ public class UserServiceImpl implements UserService {
     @Autowired
     AreaService areaService;
 
+    @Autowired
+    UserPublicService userPublicService;
+
     @Autowired
     UnitsDao unitsDao;
 
@@ -478,6 +479,12 @@ public class UserServiceImpl implements UserService {
         userDao.saveAll(users);
     }
 
+    @Override
+    public List<UserShenRe> findUnitNameListUser(UnitNameVo unitNameVo) {
+
+        return userDao.findAllByUnitsId(userPublicService.findUnitIdByName(unitNameVo.getUnitName())).stream().map(User::toRe).collect(Collectors.toList());
+    }
+
     private List<Integer> to(List<Integer> ids,Area area){
 
         if (area.getFatherId()==null){