代码修改

notes-pas/pom.xml

@@ -51,6 +51,24 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-security</artifactId>
         </dependency>
+
+        <dependency>
+            <groupId>com.dingtalk</groupId>
+            <artifactId>2</artifactId>
+            <version>2.3</version>
+            <scope>system</scope>
+            <systemPath>${project.basedir}/src/main/resources/jar/taobao-sdk-java-auto_1479188381469-20200309-source.jar</systemPath>
+        </dependency>
+
+        <dependency>
+            <groupId>com.dingtalk</groupId>
+            <artifactId>3</artifactId>
+            <version>2.3</version>
+            <scope>system</scope>
+            <systemPath>${project.basedir}/src/main/resources/jar/taobao-sdk-java-auto_1479188381469-20200309.jar</systemPath>
+        </dependency>
+
     </dependencies>
 
+
 </project>
\ No newline at end of file

notes-pas/src/main/java/com/zjty/tynotes/pas/controller/UserController.java

 package com.zjty.tynotes.pas.controller;
 
+import com.dingtalk.api.DefaultDingTalkClient;
+import com.dingtalk.api.DingTalkClient;
 import com.zjty.tynotes.misc.config.AutoDocument;
 import com.zjty.tynotes.pas.entity.User;
 import com.zjty.tynotes.pas.entity.vo.PageRequest;
@@ -104,4 +106,8 @@ public class UserController {
     }
 
 
+    public static void main(String[] args) {
+        DingTalkClient client = new DefaultDingTalkClient("https://oapi.dingtalk.com/user/get");
+    }
+
 }

notes-pas/src/main/java/com/zjty/tynotes/pas/entity/User.java

@@ -81,6 +81,12 @@ public class User implements UserDetails, Serializable {
     @ApiModelProperty(value = "密码",example = "password")
     private String password;
 
+    @ApiModelProperty(value = "人员状态",example = "1")
+    private String status;
+
+    @ApiModelProperty(value = "任务数量",example = "2")
+    private int workNum;
+
 //    @NotEmpty(message = "部门id集合")
     @ApiModelProperty(value = "部门id集合",example = "1")
     private List<String> departmentIds;
@@ -88,8 +94,6 @@ public class User implements UserDetails, Serializable {
     @Transient
     private List<Role> roles;
 
-    @Transient
-    private String status;//工作状态(0代表空闲  1代表忙碌)
 
 //    @NotNull(message = "角色Id不可为空")
 //    @ApiModelProperty(value = "角色id",example = "1")

notes-weekly/src/main/java/com/zjty/tynotes/weekly/subject/service/impl/UserManageServiceImpl.java

@@ -94,8 +94,25 @@ public class UserManageServiceImpl implements UserManageService {
             totalPage = (userList.size())/pageSize + 1;
         }
 
+        if(pageRequest.getSort()!=null && pageRequest.getSort()==1) {
+            Collections.sort(userList, new Comparator<User>() {
+                @Override
+                public int compare(User o1, User o2) {
+                    return o1.getWorkNum()-o2.getWorkNum();
+                }
+            });
+        }else{
+            Collections.sort(userList, new Comparator<User>() {
+                @Override
+                public int compare(User o1, User o2) {
+                    return o2.getWorkNum()-o1.getWorkNum();
+                }
+            });
+        }
+
+        List<User> users1 = null;
         if(totalPage>currentPage){
-            List<User> users1 = userList.subList(start, end);
+            users1 = userList.subList(start, end);
             for (User user : users1) {
                 userVos.add(new UserVo(user));
             }
@@ -103,7 +120,7 @@ public class UserManageServiceImpl implements UserManageService {
             pageResponse.setTotalCount(userList.size());
             return pageResponse;
         }else{
-            List<User> users1 = userList.subList(start, userList.size());
+            users1 = userList.subList(start, userList.size());
             for (User user : users1) {
                 userVos.add(new UserVo(user));
             }

notes-weekly/src/main/java/com/zjty/tynotes/weekly/task/UserStatus.java

+package com.zjty.tynotes.weekly.task;
+
+import com.zjty.tynotes.job.status.entity.Personnel;
+import com.zjty.tynotes.job.status.service.InternalService;
+import com.zjty.tynotes.pas.dao.PasUserDao;
+import com.zjty.tynotes.pas.entity.User;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @Author gwj
+ * @create 2020/3/9 11:19
+ */
+@Service
+public class UserStatus {
+    @Autowired
+    private PasUserDao pasUserDao;
+    @Autowired
+    private InternalService internalService;
+
+    @Scheduled(cron = "0/30 * * * * ? ")
+    public void setStatus(){
+        List<User> users = pasUserDao.findAll();
+        List<String> userIds = new ArrayList<>();
+        for (User user : users) {
+            userIds.add(user.getId());
+        }
+        List<Personnel> personnels = internalService.personnels(userIds);
+        for (User user : users) {
+            for (Personnel personnel : personnels) {
+                if(user.getId().equals(personnel.getId())){
+                    user.setWorkNum(personnel.getCount());
+                    if(user.getWorkNum()==0){
+                        user.setStatus("0");//用户状态为空闲
+                    }else if(user.getWorkNum()<=2&&user.getWorkNum()>0){
+                        user.setStatus("1");//用户状态为正常
+                    }else{
+                        user.setStatus("2");//用户状态为忙碌
+                    }
+                }
+            }
+        }
+        pasUserDao.saveAll(users);
+    }
+}