用户管理新增修改时对应人员管理新增修改加上时间的处理

itdmServer/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/ItdmPersonManageTaskMapper.java

@@ -6,6 +6,7 @@ import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 import org.jeecg.modules.system.entity.ItdmPersonManageTask;
 
+import java.util.Date;
 import java.util.List;
 
 public interface ItdmPersonManageTaskMapper extends BaseMapper<ItdmPersonManageTask> {
@@ -13,21 +14,23 @@ public interface ItdmPersonManageTaskMapper extends BaseMapper<ItdmPersonManageT
     /**
      * 新增一条人员管理
      */
-    @Select("insert into itdm_person_manage set id=#{id}, name = #{name}, sex = #{sex}, tel = #{tel}, position = #{position}, user_id = #{userId}" )
+    @Select("insert into itdm_person_manage set id=#{id}, name = #{name}, sex = #{sex}, tel = #{tel}, position = #{position}, user_id = #{userId}, create_time = #{createTime}" )
     void insertIntoPersonManage(@Param("id") String id,
                                @Param("name") String name,
                                @Param("sex") Integer sex,
                                @Param("tel") String tel,
                                @Param("position") String position,
-                               @Param("userId") String userId);
+                               @Param("userId") String userId,
+                               @Param("createTime") Date createTime);
 
     /**
      * 修改对应的人员管理
      */
-    @Select("update itdm_person_manage set name = #{name}, sex = #{sex}, tel = #{tel}, position = #{position} where user_id = #{userId}" )
+    @Select("update itdm_person_manage set name = #{name}, sex = #{sex}, tel = #{tel}, position = #{position}, update_time = #{updateTime}, where user_id = #{userId}" )
     void updatePersonManage(@Param("name") String name,
                             @Param("sex") Integer sex,
                             @Param("tel") String tel,
                             @Param("position") String position,
-                            @Param("userId") String userId);
+                            @Param("userId") String userId,
+                            @Param("updateTime") Date updateTime);
 }

itdmServer/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysUserServiceImpl.java

@@ -541,8 +541,9 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
 			}
 		}
 		//新增用户管理
+		Date date = new Date();
 		DefaultIdentifierGenerator digester = new DefaultIdentifierGenerator();
-		personManageMapper.insertIntoPersonManage(String.valueOf(digester.nextId(null)),user.getRealname(),user.getSex(),user.getPhone(),role,user.getId());
+		personManageMapper.insertIntoPersonManage(String.valueOf(digester.nextId(null)),user.getRealname(),user.getSex(),user.getPhone(),role,user.getId(),date);
 	}
 
 	@Override
@@ -598,7 +599,8 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
 		userMapper.updateNullByEmptyString("email");
 		userMapper.updateNullByEmptyString("phone");
 		//修改对应的用户管理
-		personManageMapper.updatePersonManage(user.getRealname(),user.getSex(),user.getPhone(),role,user.getId());
+		Date date = new Date();
+		personManageMapper.updatePersonManage(user.getRealname(),user.getSex(),user.getPhone(),role,user.getId(),date);
 
 	}
 

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/largeScreen/component/WebSocketServer2.java

@@ -1,6 +1,5 @@
 package org.jeecg.modules.largeScreen.component;
 
-import org.jeecg.modules.itdmOpenDaping.entity.ItdmDaping;
 import org.jeecg.modules.largeScreen.config.CronTaskRegistrar;
 import org.jeecg.modules.largeScreen.task.DemoTask2;
 import org.jeecg.modules.largeScreen.task.SchedulingRunnable;
@@ -11,11 +10,13 @@ import org.springframework.stereotype.Component;
 import javax.websocket.*;
 import javax.websocket.server.ServerEndpoint;
 import java.io.IOException;
-import java.util.*;
+import java.util.Arrays;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.CopyOnWriteArraySet;
 
 /**
+ * 用于一级大屏——那个蓝色的
+ *
  * @ServerEndpoint 注解是一个类层次的注解，它的功能主要是将目前的类定义成一个websocket服务器端,
  * 注解的值将被用于监听用户连接的终端访问URL地址,客户端可以通过这个URL来连接到WebSocket服务器端
  */

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/largeScreen/component/WebSocketServer3.java

@@ -15,6 +15,8 @@ import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.CopyOnWriteArraySet;
 
 /**
+ * 用于首页小航语音唤醒”打开大屏“
+ *
  * @ServerEndpoint 注解是一个类层次的注解，它的功能主要是将目前的类定义成一个websocket服务器端,
  * 注解的值将被用于监听用户连接的终端访问URL地址,客户端可以通过这个URL来连接到WebSocket服务器端
  */
@@ -55,7 +57,7 @@ public class WebSocketServer3 {
 //        sendUser(this.getDemoTask3().dakaiwangye(), session);
 //        SchedulingRunnable task = new SchedulingRunnable("demoTask3", "dakaidaping", session);
 //
-//        addOnlineCount();//在线数加1
+        addOnlineCount();//在线数加1
 //        this.getCronTaskRegistrar().addCronTask(task, "0/100 * * * * ?");//30秒传一次数据
 //        webSocketSet1.put(session.getId(), task);
     }
@@ -67,7 +69,7 @@ public class WebSocketServer3 {
     public void onClose(Session session) {
         webSocketSet.remove(this);
         subOnlineCount();
-        this.getCronTaskRegistrar().removeCronTask(webSocketSet1.get(session.getId()));
+//        this.getCronTaskRegistrar().removeCronTask(webSocketSet1.get(session.getId()));
     }
 
     /**