即时通信状态心跳机制

src/main/java/com/gyee/frame/common/conf/ExceptJobConfig.java

@@ -0,0 +1,27 @@
+package com.gyee.frame.common.conf;
+
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+import java.util.Map;
+
+/**
+ * 不启动调入任务的websocket函数
+ *
+ * @author gyee
+ */
+@Component
+@ConfigurationProperties(prefix = "exceptjob")
+public class ExceptJobConfig
+{
+
+    public  static Map<String,String> exceptmaps;
+
+    public static Map<String, String> getExceptmaps() {
+        return exceptmaps;
+    }
+
+    public static void setExceptmaps(Map<String, String> exceptmaps) {
+        ExceptJobConfig.exceptmaps = exceptmaps;
+    }
+}

src/main/java/com/gyee/frame/controller/admin/UserController.java

@@ -1,16 +1,6 @@
 package com.gyee.frame.controller.admin;
 
-import java.util.List;
-import org.apache.shiro.authz.annotation.RequiresPermissions;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.ui.ModelMap;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
+import com.github.pagehelper.PageInfo;
 import com.gyee.frame.common.base.BaseController;
 import com.gyee.frame.common.domain.AjaxResult;
 import com.gyee.frame.common.log.Log;
@@ -20,9 +10,14 @@ import com.gyee.frame.model.custom.RoleVo;
 import com.gyee.frame.model.custom.TableSplitResult;
 import com.gyee.frame.model.custom.Tablepar;
 import com.gyee.frame.model.custom.TitleVo;
-import com.github.pagehelper.PageInfo;
-
 import io.swagger.annotations.Api;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.ui.ModelMap;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
 
 /**
  * 用户Controller
@@ -66,8 +61,8 @@ public class UserController extends BaseController{
 	@RequiresPermissions("system:user:list")
 	@ResponseBody
 	public Object list(Tablepar tablepar,String searchText){
-		PageInfo<TsysUser> page=sysUserService.list(tablepar,searchText) ; 
-		TableSplitResult<TsysUser> result=new TableSplitResult<TsysUser>(page.getPageNum(), page.getTotal(), page.getList()); 
+		PageInfo<TsysUser> page=sysUserService.list(tablepar,searchText) ;
+		TableSplitResult<TsysUser> result=new TableSplitResult<TsysUser>(page.getPageNum(), page.getTotal(), page.getList());
 		return  result;
 	}
 	/**

src/main/java/com/gyee/frame/controller/gen/GyeeuserController.java

@@ -1,27 +1,24 @@
 package com.gyee.frame.controller.gen;
 
-import org.apache.shiro.authz.annotation.RequiresPermissions;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.ModelMap;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
 import com.github.pagehelper.PageInfo;
-import com.gyee.frame.common.base.BaseController;
 import com.gyee.frame.common.domain.AjaxResult;
 import com.gyee.frame.model.auto.Gyeeuser;
 import com.gyee.frame.model.custom.TableSplitResult;
 import com.gyee.frame.model.custom.Tablepar;
 import com.gyee.frame.model.custom.TitleVo;
+import com.gyee.frame.model.enumeration.Messagetype;
 import com.gyee.frame.netty.websocket.util.SocketToolController;
 import com.gyee.frame.service.GyeeuserService;
-
-import io.lettuce.core.dynamic.annotation.Param;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.ModelMap;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+import java.util.Map;
 
 @Controller
 @RequestMapping("GyeeuserController")
@@ -68,7 +65,29 @@ public class GyeeuserController extends SocketToolController{
 			return AjaxResult.successData(200, "-1");
 		}
 	}
-	
+
+	@PostMapping("/selectUserList")
+	@ResponseBody
+	public List<Gyeeuser> selectUserList(@RequestBody Map<String,String> map) {
+
+		List<Gyeeuser> result=gyeeuserService.findUserlist();
+		if( !result.isEmpty())
+		{
+			for(Gyeeuser user:result)
+			{
+				if(null!=map && map.containsKey(user.getId()))
+				{
+					user.setRemak1("1");
+				}else
+				{
+					user.setRemak1("0");
+				}
+			}
+		}
+		this.pushToWeb("pageNumber_4","functionNumber_3","all",result, Messagetype.MESSAGE);
+
+		return  result;
+	}
 	
 	//@Log(title = "集合查询", action = "111")
 	@PostMapping("list")
@@ -123,7 +142,6 @@ public class GyeeuserController extends SocketToolController{
 	
 	/**
 	 * 检查用户
-	 * @param tsysUser
 	 * @return
 	 */
 	@PostMapping("checkNameUnique")
@@ -169,7 +187,6 @@ public class GyeeuserController extends SocketToolController{
    	 * 根据主键查询
    	 * 
    	 * @param id
-   	 * @param mmap
    	 * @return
    	 */
    	@PostMapping("/get/{id}")

src/main/java/com/gyee/frame/mapper/auto/GyeeuserMapper.java

@@ -1,42 +1,100 @@
 package com.gyee.frame.mapper.auto;
 
+
 import com.gyee.frame.model.auto.Gyeeuser;
 import com.gyee.frame.model.auto.GyeeuserExample;
-import com.gyee.frame.model.auto.TsysUser;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
-import org.apache.ibatis.annotations.Param;
 
-/**
- *  GyeeuserMapper
- * @author gyee_自动生成
- * @email 1@qq.com
- * @date 2020-04-15 16:48:37
- */
 public interface GyeeuserMapper {
-      	   	      	      	      	      
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table gyeeuser
+     *
+     * @mbg.generated
+     */
     long countByExample(GyeeuserExample example);
 
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table gyeeuser
+     *
+     * @mbg.generated
+     */
     int deleteByExample(GyeeuserExample example);
-		
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table gyeeuser
+     *
+     * @mbg.generated
+     */
     int deleteByPrimaryKey(String id);
-		
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table gyeeuser
+     *
+     * @mbg.generated
+     */
     int insert(Gyeeuser record);
 
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table gyeeuser
+     *
+     * @mbg.generated
+     */
     int insertSelective(Gyeeuser record);
 
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table gyeeuser
+     *
+     * @mbg.generated
+     */
     List<Gyeeuser> selectByExample(GyeeuserExample example);
-		
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table gyeeuser
+     *
+     * @mbg.generated
+     */
     Gyeeuser selectByPrimaryKey(String id);
-		
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table gyeeuser
+     *
+     * @mbg.generated
+     */
     int updateByExampleSelective(@Param("record") Gyeeuser record, @Param("example") GyeeuserExample example);
 
-    int updateByExample(@Param("record") Gyeeuser record, @Param("example") GyeeuserExample example); 
-		
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table gyeeuser
+     *
+     * @mbg.generated
+     */
+    int updateByExample(@Param("record") Gyeeuser record, @Param("example") GyeeuserExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table gyeeuser
+     *
+     * @mbg.generated
+     */
     int updateByPrimaryKeySelective(Gyeeuser record);
 
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table gyeeuser
+     *
+     * @mbg.generated
+     */
     int updateByPrimaryKey(Gyeeuser record);
-    
+
     String queryIdByUserNamePassWord(Gyeeuser gyeeuser);
-  	  	
 }

src/main/java/com/gyee/frame/model/auto/Gyeeuser.java

@@ -1,87 +1,277 @@
 package com.gyee.frame.model.auto;
 
 import java.io.Serializable;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 
-
-/**
- *  Gyeeuser 
- * @author gyee_自动生成
- * @email 1@qq.com
- * @date 2020-04-15 16:48:37
- */
- @ApiModel(value="Gyeeuser", description="")
 public class Gyeeuser implements Serializable {
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column gyeeuser.id
+     *
+     * @mbg.generated
+     */
+    private String id;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column gyeeuser.username
+     *
+     * @mbg.generated
+     */
+    private String username;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column gyeeuser.password
+     *
+     * @mbg.generated
+     */
+    private String password;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column gyeeuser.nickname
+     *
+     * @mbg.generated
+     */
+    private String nickname;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column gyeeuser.photo
+     *
+     * @mbg.generated
+     */
+    private String photo;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column gyeeuser.remak1
+     *
+     * @mbg.generated
+     */
+    private String remak1;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column gyeeuser.remak2
+     *
+     * @mbg.generated
+     */
+    private String remak2;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column gyeeuser.remak3
+     *
+     * @mbg.generated
+     */
+    private String remak3;
 
-	private static final long serialVersionUID = 1L;
-	
-		
-	/**  **/
-	@ApiModelProperty(value = "") 
-private String id;
-		
-	/**  **/
-	@ApiModelProperty(value = "") 
-private String username;
-		
-	/**  **/
-	@ApiModelProperty(value = "") 
-private String password;
-		
-	/**  **/
-	@ApiModelProperty(value = "") 
-private String nickname;
-		
-		
-	public String getId() {
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table gyeeuser
+     *
+     * @mbg.generated
+     */
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column gyeeuser.id
+     *
+     * @return the value of gyeeuser.id
+     *
+     * @mbg.generated
+     */
+    public String getId() {
         return id;
     }
 
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column gyeeuser.id
+     *
+     * @param id the value for gyeeuser.id
+     *
+     * @mbg.generated
+     */
     public void setId(String id) {
-        this.id = id;
+        this.id = id == null ? null : id.trim();
     }
-	 
-			
-	public String getUsername() {
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column gyeeuser.username
+     *
+     * @return the value of gyeeuser.username
+     *
+     * @mbg.generated
+     */
+    public String getUsername() {
         return username;
     }
 
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column gyeeuser.username
+     *
+     * @param username the value for gyeeuser.username
+     *
+     * @mbg.generated
+     */
     public void setUsername(String username) {
-        this.username = username;
+        this.username = username == null ? null : username.trim();
     }
-	 
-			
-	public String getPassword() {
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column gyeeuser.password
+     *
+     * @return the value of gyeeuser.password
+     *
+     * @mbg.generated
+     */
+    public String getPassword() {
         return password;
     }
 
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column gyeeuser.password
+     *
+     * @param password the value for gyeeuser.password
+     *
+     * @mbg.generated
+     */
     public void setPassword(String password) {
-        this.password = password;
+        this.password = password == null ? null : password.trim();
     }
-	 
-			
-	public String getNickname() {
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column gyeeuser.nickname
+     *
+     * @return the value of gyeeuser.nickname
+     *
+     * @mbg.generated
+     */
+    public String getNickname() {
         return nickname;
     }
 
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column gyeeuser.nickname
+     *
+     * @param nickname the value for gyeeuser.nickname
+     *
+     * @mbg.generated
+     */
     public void setNickname(String nickname) {
-        this.nickname = nickname;
-    }
-	 
-			
-	public Gyeeuser() {
-        super();
-    }
-    
-																						
-	public Gyeeuser(String id,String username,String password,String nickname) {
-	
-		this.id = id;
-		this.username = username;
-		this.password = password;
-		this.nickname = nickname;
-		
-	}
-	
+        this.nickname = nickname == null ? null : nickname.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column gyeeuser.photo
+     *
+     * @return the value of gyeeuser.photo
+     *
+     * @mbg.generated
+     */
+    public String getPhoto() {
+        return photo;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column gyeeuser.photo
+     *
+     * @param photo the value for gyeeuser.photo
+     *
+     * @mbg.generated
+     */
+    public void setPhoto(String photo) {
+        this.photo = photo == null ? null : photo.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column gyeeuser.remak1
+     *
+     * @return the value of gyeeuser.remak1
+     *
+     * @mbg.generated
+     */
+    public String getRemak1() {
+        return remak1;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column gyeeuser.remak1
+     *
+     * @param remak1 the value for gyeeuser.remak1
+     *
+     * @mbg.generated
+     */
+    public void setRemak1(String remak1) {
+        this.remak1 = remak1 == null ? null : remak1.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column gyeeuser.remak2
+     *
+     * @return the value of gyeeuser.remak2
+     *
+     * @mbg.generated
+     */
+    public String getRemak2() {
+        return remak2;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column gyeeuser.remak2
+     *
+     * @param remak2 the value for gyeeuser.remak2
+     *
+     * @mbg.generated
+     */
+    public void setRemak2(String remak2) {
+        this.remak2 = remak2 == null ? null : remak2.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column gyeeuser.remak3
+     *
+     * @return the value of gyeeuser.remak3
+     *
+     * @mbg.generated
+     */
+    public String getRemak3() {
+        return remak3;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column gyeeuser.remak3
+     *
+     * @param remak3 the value for gyeeuser.remak3
+     *
+     * @mbg.generated
+     */
+    public void setRemak3(String remak3) {
+        this.remak3 = remak3 == null ? null : remak3.trim();
+    }
 }

src/main/java/com/gyee/frame/model/auto/GyeeuserExample.java

@@ -1,58 +1,121 @@
 package com.gyee.frame.model.auto;
 
-import java.math.BigDecimal;
 import java.util.ArrayList;
-import java.util.Date;
 import java.util.List;
 
-/**
- *  GyeeuserExample
- * @author gyee_自动生成
- * @email 1@qq.com
- * @date 2020-04-15 16:48:37
- */
 public class GyeeuserExample {
-
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table gyeeuser
+     *
+     * @mbg.generated
+     */
     protected String orderByClause;
 
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table gyeeuser
+     *
+     * @mbg.generated
+     */
     protected boolean distinct;
 
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table gyeeuser
+     *
+     * @mbg.generated
+     */
     protected List<Criteria> oredCriteria;
 
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table gyeeuser
+     *
+     * @mbg.generated
+     */
     public GyeeuserExample() {
         oredCriteria = new ArrayList<Criteria>();
     }
 
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table gyeeuser
+     *
+     * @mbg.generated
+     */
     public void setOrderByClause(String orderByClause) {
         this.orderByClause = orderByClause;
     }
 
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table gyeeuser
+     *
+     * @mbg.generated
+     */
     public String getOrderByClause() {
         return orderByClause;
     }
 
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table gyeeuser
+     *
+     * @mbg.generated
+     */
     public void setDistinct(boolean distinct) {
         this.distinct = distinct;
     }
 
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table gyeeuser
+     *
+     * @mbg.generated
+     */
     public boolean isDistinct() {
         return distinct;
     }
 
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table gyeeuser
+     *
+     * @mbg.generated
+     */
     public List<Criteria> getOredCriteria() {
         return oredCriteria;
     }
 
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table gyeeuser
+     *
+     * @mbg.generated
+     */
     public void or(Criteria criteria) {
         oredCriteria.add(criteria);
     }
 
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table gyeeuser
+     *
+     * @mbg.generated
+     */
     public Criteria or() {
         Criteria criteria = createCriteriaInternal();
         oredCriteria.add(criteria);
         return criteria;
     }
 
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table gyeeuser
+     *
+     * @mbg.generated
+     */
     public Criteria createCriteria() {
         Criteria criteria = createCriteriaInternal();
         if (oredCriteria.size() == 0) {
@@ -61,17 +124,35 @@ public class GyeeuserExample {
         return criteria;
     }
 
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table gyeeuser
+     *
+     * @mbg.generated
+     */
     protected Criteria createCriteriaInternal() {
         Criteria criteria = new Criteria();
         return criteria;
     }
 
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table gyeeuser
+     *
+     * @mbg.generated
+     */
     public void clear() {
         oredCriteria.clear();
         orderByClause = null;
         distinct = false;
     }
 
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table gyeeuser
+     *
+     * @mbg.generated
+     */
     protected abstract static class GeneratedCriteria {
         protected List<Criterion> criteria;
 
@@ -112,7 +193,7 @@ public class GyeeuserExample {
             }
             criteria.add(new Criterion(condition, value1, value2));
         }
-				
+
         public Criteria andIdIsNull() {
             addCriterion("id is null");
             return (Criteria) this;
@@ -182,8 +263,7 @@ public class GyeeuserExample {
             addCriterion("id not between", value1, value2, "id");
             return (Criteria) this;
         }
-        
-			
+
         public Criteria andUsernameIsNull() {
             addCriterion("username is null");
             return (Criteria) this;
@@ -253,8 +333,7 @@ public class GyeeuserExample {
             addCriterion("username not between", value1, value2, "username");
             return (Criteria) this;
         }
-        
-			
+
         public Criteria andPasswordIsNull() {
             addCriterion("password is null");
             return (Criteria) this;
@@ -324,8 +403,7 @@ public class GyeeuserExample {
             addCriterion("password not between", value1, value2, "password");
             return (Criteria) this;
         }
-        
-			
+
         public Criteria andNicknameIsNull() {
             addCriterion("nickname is null");
             return (Criteria) this;
@@ -395,9 +473,294 @@ public class GyeeuserExample {
             addCriterion("nickname not between", value1, value2, "nickname");
             return (Criteria) this;
         }
-        
-	}
 
+        public Criteria andPhotoIsNull() {
+            addCriterion("photo is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPhotoIsNotNull() {
+            addCriterion("photo is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPhotoEqualTo(String value) {
+            addCriterion("photo =", value, "photo");
+            return (Criteria) this;
+        }
+
+        public Criteria andPhotoNotEqualTo(String value) {
+            addCriterion("photo <>", value, "photo");
+            return (Criteria) this;
+        }
+
+        public Criteria andPhotoGreaterThan(String value) {
+            addCriterion("photo >", value, "photo");
+            return (Criteria) this;
+        }
+
+        public Criteria andPhotoGreaterThanOrEqualTo(String value) {
+            addCriterion("photo >=", value, "photo");
+            return (Criteria) this;
+        }
+
+        public Criteria andPhotoLessThan(String value) {
+            addCriterion("photo <", value, "photo");
+            return (Criteria) this;
+        }
+
+        public Criteria andPhotoLessThanOrEqualTo(String value) {
+            addCriterion("photo <=", value, "photo");
+            return (Criteria) this;
+        }
+
+        public Criteria andPhotoLike(String value) {
+            addCriterion("photo like", value, "photo");
+            return (Criteria) this;
+        }
+
+        public Criteria andPhotoNotLike(String value) {
+            addCriterion("photo not like", value, "photo");
+            return (Criteria) this;
+        }
+
+        public Criteria andPhotoIn(List<String> values) {
+            addCriterion("photo in", values, "photo");
+            return (Criteria) this;
+        }
+
+        public Criteria andPhotoNotIn(List<String> values) {
+            addCriterion("photo not in", values, "photo");
+            return (Criteria) this;
+        }
+
+        public Criteria andPhotoBetween(String value1, String value2) {
+            addCriterion("photo between", value1, value2, "photo");
+            return (Criteria) this;
+        }
+
+        public Criteria andPhotoNotBetween(String value1, String value2) {
+            addCriterion("photo not between", value1, value2, "photo");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemak1IsNull() {
+            addCriterion("remak1 is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemak1IsNotNull() {
+            addCriterion("remak1 is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemak1EqualTo(String value) {
+            addCriterion("remak1 =", value, "remak1");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemak1NotEqualTo(String value) {
+            addCriterion("remak1 <>", value, "remak1");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemak1GreaterThan(String value) {
+            addCriterion("remak1 >", value, "remak1");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemak1GreaterThanOrEqualTo(String value) {
+            addCriterion("remak1 >=", value, "remak1");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemak1LessThan(String value) {
+            addCriterion("remak1 <", value, "remak1");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemak1LessThanOrEqualTo(String value) {
+            addCriterion("remak1 <=", value, "remak1");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemak1Like(String value) {
+            addCriterion("remak1 like", value, "remak1");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemak1NotLike(String value) {
+            addCriterion("remak1 not like", value, "remak1");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemak1In(List<String> values) {
+            addCriterion("remak1 in", values, "remak1");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemak1NotIn(List<String> values) {
+            addCriterion("remak1 not in", values, "remak1");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemak1Between(String value1, String value2) {
+            addCriterion("remak1 between", value1, value2, "remak1");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemak1NotBetween(String value1, String value2) {
+            addCriterion("remak1 not between", value1, value2, "remak1");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemak2IsNull() {
+            addCriterion("remak2 is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemak2IsNotNull() {
+            addCriterion("remak2 is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemak2EqualTo(String value) {
+            addCriterion("remak2 =", value, "remak2");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemak2NotEqualTo(String value) {
+            addCriterion("remak2 <>", value, "remak2");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemak2GreaterThan(String value) {
+            addCriterion("remak2 >", value, "remak2");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemak2GreaterThanOrEqualTo(String value) {
+            addCriterion("remak2 >=", value, "remak2");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemak2LessThan(String value) {
+            addCriterion("remak2 <", value, "remak2");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemak2LessThanOrEqualTo(String value) {
+            addCriterion("remak2 <=", value, "remak2");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemak2Like(String value) {
+            addCriterion("remak2 like", value, "remak2");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemak2NotLike(String value) {
+            addCriterion("remak2 not like", value, "remak2");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemak2In(List<String> values) {
+            addCriterion("remak2 in", values, "remak2");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemak2NotIn(List<String> values) {
+            addCriterion("remak2 not in", values, "remak2");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemak2Between(String value1, String value2) {
+            addCriterion("remak2 between", value1, value2, "remak2");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemak2NotBetween(String value1, String value2) {
+            addCriterion("remak2 not between", value1, value2, "remak2");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemak3IsNull() {
+            addCriterion("remak3 is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemak3IsNotNull() {
+            addCriterion("remak3 is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemak3EqualTo(String value) {
+            addCriterion("remak3 =", value, "remak3");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemak3NotEqualTo(String value) {
+            addCriterion("remak3 <>", value, "remak3");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemak3GreaterThan(String value) {
+            addCriterion("remak3 >", value, "remak3");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemak3GreaterThanOrEqualTo(String value) {
+            addCriterion("remak3 >=", value, "remak3");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemak3LessThan(String value) {
+            addCriterion("remak3 <", value, "remak3");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemak3LessThanOrEqualTo(String value) {
+            addCriterion("remak3 <=", value, "remak3");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemak3Like(String value) {
+            addCriterion("remak3 like", value, "remak3");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemak3NotLike(String value) {
+            addCriterion("remak3 not like", value, "remak3");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemak3In(List<String> values) {
+            addCriterion("remak3 in", values, "remak3");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemak3NotIn(List<String> values) {
+            addCriterion("remak3 not in", values, "remak3");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemak3Between(String value1, String value2) {
+            addCriterion("remak3 between", value1, value2, "remak3");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemak3NotBetween(String value1, String value2) {
+            addCriterion("remak3 not between", value1, value2, "remak3");
+            return (Criteria) this;
+        }
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table gyeeuser
+     *
+     * @mbg.generated do_not_delete_during_merge
+     */
     public static class Criteria extends GeneratedCriteria {
 
         protected Criteria() {
@@ -405,6 +768,12 @@ public class GyeeuserExample {
         }
     }
 
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table gyeeuser
+     *
+     * @mbg.generated
+     */
     public static class Criterion {
         private String condition;
 

src/main/java/com/gyee/frame/netty/websocket/WebSocketServer.java

@@ -2,6 +2,7 @@ package com.gyee.frame.netty.websocket;
 
 import cn.hutool.log.Log;
 import cn.hutool.log.LogFactory;
+import com.gyee.frame.common.conf.ExceptJobConfig;
 import com.gyee.frame.common.quartz.SocketTaskUtil;
 import com.gyee.frame.netty.websocket.util.WebsocketUtil;
 import com.gyee.frame.util.StringUtils;
@@ -46,6 +47,9 @@ public class WebSocketServer extends SocketTaskUtil {
     public static ConcurrentHashMap<String, CopyOnWriteArraySet<String>> keyidMap = new ConcurrentHashMap();
 
 
+
+
+
     //与某个客户端的连接会话，需要通过它来给客户端发送数据
     private Session session;
 
@@ -163,7 +167,11 @@ public class WebSocketServer extends SocketTaskUtil {
 //            }
 //        }
 
-        this.restartJob((jobkey));//重启任务
+
+        if(!ExceptJobConfig.exceptmaps.containsKey(jobkey))
+        {
+            this.restartJob((jobkey));//重启任务
+        }
 
     }
 

src/main/java/com/gyee/frame/netty/websocket/config/ConfigDetail.txt

@@ -44,5 +44,6 @@ sisConfigMap->braceletPushTask->"pageNumber_9","functionNumber_1"
 
 24.矩阵监视模块推送，按照场站、期次、线路推送 keyid例如（wp_CL_FDC,pj_CL01_GC,ln_CL01_XL）
 socketConfigMap->monitor_target_matrixMonitor->"pageNumber_4","functionNumber_2","keyid"
-
+25.即时通信状态判断
+socketConfigMap->monitor_target_status->"pageNumber_4","functionNumber_3","keyid"
 

src/main/java/com/gyee/frame/service/GyeeuserService.java

@@ -1,9 +1,5 @@
 package com.gyee.frame.service;
 
-import java.util.List;
-import java.util.Arrays;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.gyee.frame.common.base.BaseService;
@@ -13,6 +9,10 @@ import com.gyee.frame.model.auto.Gyeeuser;
 import com.gyee.frame.model.auto.GyeeuserExample;
 import com.gyee.frame.model.custom.Tablepar;
 import com.gyee.frame.util.SnowflakeIdWorker;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
 
 /**
  *  GyeeuserService
@@ -24,14 +24,12 @@ import com.gyee.frame.util.SnowflakeIdWorker;
  **/
 @Service
 public class GyeeuserService implements BaseService<Gyeeuser, GyeeuserExample>{
-	@Autowired
+	@Resource
 	private GyeeuserMapper gyeeuserMapper;
 	
       	   	      	      	      	      	
 	/**
 	 * 分页查询
-	 * @param pageNum
-	 * @param pageSize
 	 * @return
 	 */
 	 public PageInfo<Gyeeuser> list(Tablepar tablepar,String name){
@@ -149,5 +147,12 @@ public class GyeeuserService implements BaseService<Gyeeuser, GyeeuserExample>{
 		return gyeeuserMapper.queryIdByUserNamePassWord(gyeeuser);
 	}
 
+	public List<Gyeeuser> findUserlist(){
+
+		GyeeuserExample example=new GyeeuserExample();
+		example.setOrderByClause("id");
+		List<Gyeeuser> list= gyeeuserMapper.selectByExample(example);
 
+		return  list;
+	}
 }

src/main/resources/application.yml

@@ -88,6 +88,8 @@ redis :
   redis_ss_port: 6379
   redis_ls_ip: 117.78.18.24
   redis_ls_port: 6380
+exceptjob :
+  exceptmaps: {'pageNumber_4_functionNumber_3': '1'}
 #mybatis:
 #  #配置mapper的扫描，找到所有的mapper.xml映射文件
 #  mapperLocations : classpath*:mybatis/*/*.xml

src/main/resources/mybatis/auto/GyeeuserMapper.xml

@@ -2,12 +2,25 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.gyee.frame.mapper.auto.GyeeuserMapper">
   <resultMap id="BaseResultMap" type="com.gyee.frame.model.auto.Gyeeuser">
-    <result column="id" jdbcType="VARCHAR" property="id" />
+
+  <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    <id column="id" jdbcType="VARCHAR" property="id" />
     <result column="username" jdbcType="VARCHAR" property="username" />
     <result column="password" jdbcType="VARCHAR" property="password" />
     <result column="nickname" jdbcType="VARCHAR" property="nickname" />
+    <result column="photo" jdbcType="VARCHAR" property="photo" />
+    <result column="remak1" jdbcType="VARCHAR" property="remak1" />
+    <result column="remak2" jdbcType="VARCHAR" property="remak2" />
+    <result column="remak3" jdbcType="VARCHAR" property="remak3" />
   </resultMap>
   <sql id="Example_Where_Clause">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
     <where>
       <foreach collection="oredCriteria" item="criteria" separator="or">
         <if test="criteria.valid">
@@ -37,6 +50,10 @@
     </where>
   </sql>
   <sql id="Update_By_Example_Where_Clause">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
     <where>
       <foreach collection="example.oredCriteria" item="criteria" separator="or">
         <if test="criteria.valid">
@@ -65,13 +82,18 @@
       </foreach>
     </where>
   </sql>
-<sql id="Base_Column_List">
-	  	  	      	id,
-       	  	      	username,
-       	  	      	password,
-       	  	    	  	nickname
-       	</sql>
+  <sql id="Base_Column_List">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    id, username, password, nickname, photo, remak1, remak2, remak3
+  </sql>
   <select id="selectByExample" parameterType="com.gyee.frame.model.auto.GyeeuserExample" resultMap="BaseResultMap">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
     select
     <if test="distinct">
       distinct
@@ -86,155 +108,217 @@
     </if>
   </select>
   <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
     select 
     <include refid="Base_Column_List" />
     from gyeeuser
     where id = #{id,jdbcType=VARCHAR}
   </select>
-
   <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
     delete from gyeeuser
     where id = #{id,jdbcType=VARCHAR}
   </delete>
   <delete id="deleteByExample" parameterType="com.gyee.frame.model.auto.GyeeuserExample">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
     delete from gyeeuser
     <if test="_parameter != null">
       <include refid="Example_Where_Clause" />
     </if>
   </delete>
-  
   <insert id="insert" parameterType="com.gyee.frame.model.auto.Gyeeuser">
-    insert into gyeeuser (
-      	  	       id,
-       	  	       username,
-       	  	       password,
-       	  	    	  nickname
-       	    )
-    values (
-	  	  	      	#{id,jdbcType=VARCHAR},
-       	  	      	#{username,jdbcType=VARCHAR},
-       	  	      	#{password,jdbcType=VARCHAR},
-       	  	    	  #{nickname,jdbcType=VARCHAR}
-       	    )
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    insert into gyeeuser (id, username, password, 
+      nickname, photo, remak1, 
+      remak2, remak3)
+    values (#{id,jdbcType=VARCHAR}, #{username,jdbcType=VARCHAR}, #{password,jdbcType=VARCHAR}, 
+      #{nickname,jdbcType=VARCHAR}, #{photo,jdbcType=VARCHAR}, #{remak1,jdbcType=VARCHAR}, 
+      #{remak2,jdbcType=VARCHAR}, #{remak3,jdbcType=VARCHAR})
   </insert>
-  
   <insert id="insertSelective" parameterType="com.gyee.frame.model.auto.Gyeeuser">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
     insert into gyeeuser
     <trim prefix="(" suffix=")" suffixOverrides=",">
-          
       <if test="id != null">
         id,
       </if>
-      
-         
       <if test="username != null">
         username,
       </if>
-      
-         
       <if test="password != null">
         password,
       </if>
-      
-         
       <if test="nickname != null">
         nickname,
       </if>
-      
-         </trim>
+      <if test="photo != null">
+        photo,
+      </if>
+      <if test="remak1 != null">
+        remak1,
+      </if>
+      <if test="remak2 != null">
+        remak2,
+      </if>
+      <if test="remak3 != null">
+        remak3,
+      </if>
+    </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
-          <if test="id != null">
+      <if test="id != null">
         #{id,jdbcType=VARCHAR},
       </if>
-          <if test="username != null">
+      <if test="username != null">
         #{username,jdbcType=VARCHAR},
       </if>
-          <if test="password != null">
+      <if test="password != null">
         #{password,jdbcType=VARCHAR},
       </if>
-          <if test="nickname != null">
+      <if test="nickname != null">
         #{nickname,jdbcType=VARCHAR},
       </if>
-        </trim>
+      <if test="photo != null">
+        #{photo,jdbcType=VARCHAR},
+      </if>
+      <if test="remak1 != null">
+        #{remak1,jdbcType=VARCHAR},
+      </if>
+      <if test="remak2 != null">
+        #{remak2,jdbcType=VARCHAR},
+      </if>
+      <if test="remak3 != null">
+        #{remak3,jdbcType=VARCHAR},
+      </if>
+    </trim>
   </insert>
-  
   <select id="countByExample" parameterType="com.gyee.frame.model.auto.GyeeuserExample" resultType="java.lang.Long">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
     select count(*) from gyeeuser
     <if test="_parameter != null">
       <include refid="Example_Where_Clause" />
     </if>
   </select>
-  
   <update id="updateByExampleSelective" parameterType="map">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
     update gyeeuser
     <set>
-          <if test="record.id != null">
+      <if test="record.id != null">
         id = #{record.id,jdbcType=VARCHAR},
       </if>
-          <if test="record.username != null">
+      <if test="record.username != null">
         username = #{record.username,jdbcType=VARCHAR},
       </if>
-          <if test="record.password != null">
+      <if test="record.password != null">
         password = #{record.password,jdbcType=VARCHAR},
       </if>
-          <if test="record.nickname != null">
+      <if test="record.nickname != null">
         nickname = #{record.nickname,jdbcType=VARCHAR},
       </if>
-         
+      <if test="record.photo != null">
+        photo = #{record.photo,jdbcType=VARCHAR},
+      </if>
+      <if test="record.remak1 != null">
+        remak1 = #{record.remak1,jdbcType=VARCHAR},
+      </if>
+      <if test="record.remak2 != null">
+        remak2 = #{record.remak2,jdbcType=VARCHAR},
+      </if>
+      <if test="record.remak3 != null">
+        remak3 = #{record.remak3,jdbcType=VARCHAR},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
   </update>
-  
-  
   <update id="updateByExample" parameterType="map">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
     update gyeeuser
-    set
-            	     	 id = #{record.id,jdbcType=VARCHAR},
-    	         	     	 username = #{record.username,jdbcType=VARCHAR},
-    	         	     	 password = #{record.password,jdbcType=VARCHAR},
-    	         	     	 nickname = #{record.nickname,jdbcType=VARCHAR}
-    	         <if test="_parameter != null">
+    set id = #{record.id,jdbcType=VARCHAR},
+      username = #{record.username,jdbcType=VARCHAR},
+      password = #{record.password,jdbcType=VARCHAR},
+      nickname = #{record.nickname,jdbcType=VARCHAR},
+      photo = #{record.photo,jdbcType=VARCHAR},
+      remak1 = #{record.remak1,jdbcType=VARCHAR},
+      remak2 = #{record.remak2,jdbcType=VARCHAR},
+      remak3 = #{record.remak3,jdbcType=VARCHAR}
+    <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
   </update>
-  
-  
-      <update id="updateByPrimaryKeySelective" parameterType="com.gyee.frame.model.auto.Gyeeuser">
+  <update id="updateByPrimaryKeySelective" parameterType="com.gyee.frame.model.auto.Gyeeuser">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
     update gyeeuser
     <set>
-                          <if test="username != null">
+      <if test="username != null">
         username = #{username,jdbcType=VARCHAR},
       </if>
-                      <if test="password != null">
+      <if test="password != null">
         password = #{password,jdbcType=VARCHAR},
       </if>
-                      <if test="nickname != null">
+      <if test="nickname != null">
         nickname = #{nickname,jdbcType=VARCHAR},
       </if>
-              </set>
-    where 
-            id = #{id,jdbcType=VARCHAR}
-                                  
+      <if test="photo != null">
+        photo = #{photo,jdbcType=VARCHAR},
+      </if>
+      <if test="remak1 != null">
+        remak1 = #{remak1,jdbcType=VARCHAR},
+      </if>
+      <if test="remak2 != null">
+        remak2 = #{remak2,jdbcType=VARCHAR},
+      </if>
+      <if test="remak3 != null">
+        remak3 = #{remak3,jdbcType=VARCHAR},
+      </if>
+    </set>
+    where id = #{id,jdbcType=VARCHAR}
   </update>
-
-      	      	   	      	   	      	   	      	
-
   <update id="updateByPrimaryKey" parameterType="com.gyee.frame.model.auto.Gyeeuser">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
     update gyeeuser
-    set 
-             	        	    	 			username = #{username,jdbcType=VARCHAR},
-		     	        	    	 			password = #{password,jdbcType=VARCHAR},
-		     	        	    	 			nickname = #{nickname,jdbcType=VARCHAR}
-		     	        where 
-            id = #{id,jdbcType=VARCHAR}
-                                    
+    set username = #{username,jdbcType=VARCHAR},
+      password = #{password,jdbcType=VARCHAR},
+      nickname = #{nickname,jdbcType=VARCHAR},
+      photo = #{photo,jdbcType=VARCHAR},
+      remak1 = #{remak1,jdbcType=VARCHAR},
+      remak2 = #{remak2,jdbcType=VARCHAR},
+      remak3 = #{remak3,jdbcType=VARCHAR}
+    where id = #{id,jdbcType=VARCHAR}
   </update>
-  
+
   <select id="queryIdByUserNamePassWord" parameterType="com.gyee.frame.model.auto.Gyeeuser" resultType="java.lang.String">
        select id from gyeeuser where username=#{username,jdbcType=VARCHAR} and password=#{password,jdbcType=VARCHAR}
  </select>
-  
-                        
+
 </mapper>