Merge branch 'develop' of 192.168.1.249:LJJ/encrypted-file-system into develop

efs-user/src/main/java/com/zjty/efs/user/subject/controller/UserController.java

@@ -147,6 +147,7 @@ public class UserController {
 
     @Autowired
     private UserDao userDao;
+
     @PutMapping("/user")
     @ApiOperation(value = "更新人员信息的接口")
     @ApiImplicitParams({
@@ -187,4 +188,16 @@ public class UserController {
         return ResponseEntity.ok(rs);
     }
 
+    @ApiOperation(value = "查询单位接口")
+    @GetMapping("/unit")
+    public ResponseEntity<List<Unit>> getUnit() {
+        return ResponseEntity.ok(userService.findUnit());
+    }
+
+    @GetMapping("/unit/meb")
+    @ApiOperation(value = "根据单位查询人员")
+    public ResponseEntity getUnitMeb(@RequestParam(value = "unit") String unit) {
+        return ResponseEntity.ok(userService.findByUnit(unit));
+    }
+
 }

efs-user/src/main/java/com/zjty/efs/user/subject/dao/UnitDao.java

+package com.zjty.efs.user.subject.dao;
+
+import com.zjty.efs.user.subject.entity.Unit;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+import java.util.List;
+
+/**
+ * @author LJJ cnljj1995@gmail.com
+ * on 2020-04-02
+ */
+public interface UnitDao extends JpaRepository<Unit, String> {
+
+    List<Unit> findByName(String name);
+
+}

efs-user/src/main/java/com/zjty/efs/user/subject/dao/UserDao.java

@@ -19,4 +19,6 @@ public interface UserDao extends JpaRepository<UserDo, String> {
 
     void deleteUserDosByAccount(String name);
 
+    List<UserDo> findByUnit(String name);
+
 }

efs-user/src/main/java/com/zjty/efs/user/subject/entity/Unit.java

+package com.zjty.efs.user.subject.entity;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.hibernate.annotations.GenericGenerator;
+
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import java.util.Date;
+
+/**
+ * @author LJJ cnljj1995@gmail.com
+ * on 2020-04-02
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Entity
+public class Unit {
+
+    @Id
+    @GeneratedValue(generator = "uuid2")
+    @GenericGenerator(name = "uuid2", strategy = "org.hibernate.id.UUIDGenerator")
+    String id;
+
+    String name;
+
+}

efs-user/src/main/java/com/zjty/efs/user/subject/entity/UnitMemVo.java

+package com.zjty.efs.user.subject.entity;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @author LJJ cnljj1995@gmail.com
+ * on 2020-04-02
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class UnitMemVo {
+
+    private String id;
+
+    private String name;
+
+    private String unit;
+
+    private String department;
+}

efs-user/src/main/java/com/zjty/efs/user/subject/entity/UnitVo.java

+package com.zjty.efs.user.subject.entity;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @author LJJ cnljj1995@gmail.com
+ * on 2020-04-02
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class UnitVo {
+
+    private String unitName;
+
+    private String num;
+
+}

efs-user/src/main/java/com/zjty/efs/user/subject/service/UserService.java

 package com.zjty.efs.user.subject.service;
 
-import com.zjty.efs.user.subject.entity.NameListVo;
-import com.zjty.efs.user.subject.entity.UserDo;
-import com.zjty.efs.user.subject.entity.UserVo;
+import com.zjty.efs.user.subject.entity.*;
 
 import java.util.List;
 
@@ -81,4 +79,18 @@ public interface UserService {
      */
     UserDo updatePwd(String id, String oPwd, String nPwd);
 
+
+    /**
+     * 查找所有部门
+     * @return 部门集合
+     */
+    List<Unit> findUnit();
+
+    /**
+     * 根据单位查找用户
+     * @param unit 单位名称
+     * @return obj
+     */
+    List<UnitMemVo> findByUnit(String unit);
+
 }

efs-user/src/main/java/com/zjty/efs/user/subject/service/impl/UserServiceImpl.java

@@ -3,10 +3,9 @@ package com.zjty.efs.user.subject.service.impl;
 import com.zjty.efs.log.subject.entity.EfsLog;
 import com.zjty.efs.log.tool.EfsLogUtil;
 import com.zjty.efs.misc.util.MD5Untils;
+import com.zjty.efs.user.subject.dao.UnitDao;
 import com.zjty.efs.user.subject.dao.UserDao;
-import com.zjty.efs.user.subject.entity.NameListVo;
-import com.zjty.efs.user.subject.entity.UserDo;
-import com.zjty.efs.user.subject.entity.UserVo;
+import com.zjty.efs.user.subject.entity.*;
 import com.zjty.efs.user.subject.service.UserService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -33,6 +32,8 @@ public class UserServiceImpl implements UserService {
     private UserDao userDao;
     @Autowired
     private EfsLogUtil efsLogUtil;
+    @Autowired
+    private UnitDao unitDao;
 
     @Override
     public UserDo update(UserDo userDo) {
@@ -119,6 +120,13 @@ public class UserServiceImpl implements UserService {
                     "]";
             efsLogUtil.addLog(new EfsLog(null,"admin",msg, new Date()));
 
+
+            List<Unit> units = unitDao.findByName(userDo.getUnit());
+            if (units.size() == 0) {
+                Unit unit = new Unit(null, userDo.getUnit());
+                unitDao.save(unit);
+                log.info("新增单位:{}", unit.getName());
+            }
             return userDo;
         }else {
             log.warn("新增出错；已存在该用户");
@@ -173,4 +181,21 @@ public class UserServiceImpl implements UserService {
         efsLogUtil.addLog(new EfsLog(null, id, msg, new Date()));
     return user;
     }
+
+    @Override
+    public List<Unit> findUnit() {
+        return unitDao.findAll();
+    }
+
+    @Override
+    public List<UnitMemVo> findByUnit(String unit) {
+        List<UserDo> users = userDao.findByUnit(unit);
+        List<UnitMemVo> rs = new ArrayList<>();
+        users.forEach(o -> {
+            UnitMemVo unitMemVo = new UnitMemVo(o.getId(), o.getName(), o.getUnit(), o.getDepartment());
+            rs.add(unitMemVo);
+                }
+        );
+        return rs;
+    }
 }