Browse Source

消息提醒修改

Administrator 4 years ago
parent
commit
70017cd0c2

+ 1 - 1
GeneratorConfig.xml

@@ -43,7 +43,7 @@
     <property name="enableSubPackages" value="false"/>
      <property name="nullCatalogMeansCurrent" value="true"/>
     </javaClientGenerator>
-    <table schema="aft" tableName="public_release"
+    <table schema="aft" tableName="public_release_log"
 	enableCountByExample="false" enableUpdateByExample="false"
 	enableDeleteByExample="false" enableSelectByExample="false"
 	selectByExampleQueryId="false" enableSelectByPrimaryKey="true"

+ 13 - 1
src/main/java/com/goafanti/admin/controller/AdminNoticeApiController.java

@@ -35,13 +35,25 @@ public class AdminNoticeApiController extends CertifyApiController{
 	 * @return
 	 */
 	@RequestMapping(value = "/unread", method = RequestMethod.GET)
-	public Result unread(){
+	public Result unread(Integer type){
 		Result res = new Result();
 		res.setData(noticeService.updateListUnreadNoticeByAid());
 		return res;
 	}
 	
 	/**
+	 * 
+	 * 未读通知列表
+	 * @return
+	 */
+	@RequestMapping(value = "/publicReleaseUnread", method = RequestMethod.GET)
+	public Result publicReleaseUnread(){
+		Result res = new Result();
+		res.setData(noticeService.pushPublicReleaseUnread());
+		return res;
+	}
+	
+	/**
 	 * 已读通知列表
 	 * @return
 	 */

+ 10 - 0
src/main/java/com/goafanti/admin/controller/AdminReleaseApiController.java

@@ -139,6 +139,16 @@ public class AdminReleaseApiController extends CertifyApiController{
 		return res;
 	}
 	
+	/**
+	 * 外出审核日志列表
+	 * @return
+	 */
+	@RequestMapping(value = "/unreadPublicReleaseLog", method = RequestMethod.GET)
+	public Result unreadPublicReleaseLog(){
+		Result res =new Result();
+		res.data(publicReleaseService.unreadPublicReleaseLog());
+		return res;
+	}
 	
 	/**
 	 * 公出统计

+ 2 - 0
src/main/java/com/goafanti/admin/service/NoticeService.java

@@ -14,5 +14,7 @@ public interface NoticeService {
 
 	int findUnreadNoticeCount();
 
+	List<NoticeBo> pushPublicReleaseUnread();
+
 
 }

+ 2 - 0
src/main/java/com/goafanti/admin/service/PublicReleaseService.java

@@ -33,6 +33,8 @@ public interface PublicReleaseService {
 
 	OutPublicRelease followDtails(String id);
 
+	List<outPublicReleaseLog> unreadPublicReleaseLog();
+
 
 
 }

+ 14 - 0
src/main/java/com/goafanti/admin/service/impl/NoticeServiceImpl.java

@@ -78,5 +78,19 @@ public class NoticeServiceImpl extends BaseMybatisDao<NoticeMapper> implements N
 		return noticeMapper.selectUnreadedCount(TokenManager.getAdminId());
 	}
 
+	@Override
+	public List<NoticeBo> pushPublicReleaseUnread() {
+		List<NoticeBo> nl=noticeMapper.publicReleaseUnread(TokenManager.getAdminId());
+		List<String> dl=new  ArrayList<String>();
+		if (!nl.isEmpty()) {
+			for (NoticeBo n : nl) {
+				// 添加已读
+				dl.add(n.getId());
+			}
+			noticeMapper.batchUpdateUnreaded(dl);
+		}
+		return nl;
+	}
+
 
 }

+ 55 - 6
src/main/java/com/goafanti/admin/service/impl/PublicReleaseServiceImpl.java

@@ -12,6 +12,7 @@ import javax.mail.MessagingException;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.web.socket.TextMessage;
 
 import com.goafanti.admin.bo.AdminListBo;
 import com.goafanti.admin.bo.InputPublicDtails;
@@ -29,10 +30,14 @@ import com.goafanti.common.constant.AFTConstants;
 import com.goafanti.common.dao.AdminMapper;
 import com.goafanti.common.dao.PublicReleaseLogMapper;
 import com.goafanti.common.dao.PublicReleaseMapper;
+import com.goafanti.common.dao.UserMapper;
+import com.goafanti.common.enums.NoticeStatus;
 import com.goafanti.common.error.BusinessException;
 import com.goafanti.common.model.Admin;
+import com.goafanti.common.model.Notice;
 import com.goafanti.common.model.PublicRelease;
 import com.goafanti.common.model.PublicReleaseLog;
+import com.goafanti.common.model.User;
 import com.goafanti.common.utils.AsyncUtils;
 import com.goafanti.common.utils.DateUtils;
 import com.goafanti.common.utils.SendEmailUtil;
@@ -42,6 +47,7 @@ import com.goafanti.core.mybatis.page.Pagination;
 import com.goafanti.core.shiro.token.TokenManager;
 import com.goafanti.customer.bo.FollowBusinessBo;
 import com.goafanti.customer.service.CustomerService;
+import com.goafanti.core.websocket.SystemWebSocketHandler;
 
 import cn.jiguang.common.utils.StringUtils;
 
@@ -59,6 +65,10 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 	private AdminMapper adminMapper;
 	@Autowired
 	private	AsyncUtils asyncUtils;
+	@Autowired
+	private	UserMapper	userMapper;
+	@Autowired
+	private SystemWebSocketHandler	systemWebSocketHandler;
 	
 	@Override
 	public int addPublicRelease(InputPublicRelease in) {
@@ -79,14 +89,17 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 		PublicReleaseLog log=new PublicReleaseLog(in.getId(),TokenManager.getAdminId(),1,"发起外出申请",new Date());
 		publicReleaseLogMapper.insertSelective(log);
 		String openid=a.getOpenId();
+		User u=userMapper.selectByPrimaryKey(in.getUid());
+		String str="["+my.getName()+"]发起["+u.getNickname()+"]的外出申请,请及时审核。";
+		sendNoticeAndSoucket(a.getId(),NoticeStatus.PUBLIC_RELEASE_START.getCode(),str);
 		if (openid!=null) {
-			Integer res= weChatUtils.addNotice(openid, in.getStatus(),date,my.getName(),"["+my.getName()+"]发起外出审核");
+			Integer res= weChatUtils.addNotice(openid, in.getStatus(),date,my.getName(),str);
 			if (res!=0) {
-				senEmail(my, a,1);
+				sendEmail(my, a,1);
 			}
 			return  res;
 		}else {
-			//成功但是对方收不到消息
+			sendEmail(my, a,1);
 			return 2;
 		}
 	}
@@ -98,7 +111,25 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 
 
 
-	private void senEmail(AdminListBo my, Admin a,Integer type) {
+	private void sendNoticeAndSoucket(String id,Integer type,String content) {
+		systemWebSocketHandler.sendMessageToUser(id, new TextMessage("unread"));
+		Notice n =new Notice();
+		n.setId(UUID.randomUUID().toString());
+		n.setAid(id);
+		n.setNoticeType(type);
+		n.setContent(content);
+		n.setReaded(0);//未读
+		asyncUtils.addNotice(n);
+	}
+
+
+
+
+
+
+
+
+	private void sendEmail(AdminListBo my, Admin a,Integer type) {
 		String title="外出申请提醒";
 		if (type==0) title="外出申请驳回提醒";
 		else if (type==2) title="外出申请同意提醒";
@@ -160,10 +191,22 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 		publicReleaseLogMapper.insertSelective(log);
 		AdminListBo my = adminMapper.getDeptNameByAid(TokenManager.getAdminId());
 		Admin a=adminMapper.selectByPrimaryKey(use.getAid());
+		Integer type=0;
+		String content="";
+		User u=userMapper.selectByPrimaryKey(use.getUid());
+		if (status==0) {
+			type=NoticeStatus.PUBLIC_RELEASE_NO.getCode();
+			content="["+u.getNickname()+"]的外出申请,已通过审核!";
+		}else if(status==2) {
+			type=NoticeStatus.PUBLIC_RELEASE_YES.getCode();
+			content="["+u.getNickname()+"]的外出申请,未通过审核!";
+		}
+		sendNoticeAndSoucket(a.getId(),type,content);
 		if (my.getOpenId()!=null) {
 			Integer res=weChatUtils.addNotice(a.getOpenId(),p.getStatus(),date,my.getName(),remarks);
 			if (res!=0) {
-			senEmail( my,  a, status);
+				sendEmail( my,  a, status);
+				
 			}
 			return res;
 		}
@@ -172,10 +215,16 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 	
 	@Override
 	public List<outPublicReleaseLog> listPublicReleaseLog(Integer id) {
-		return publicReleaseLogMapper.listPublicReleaseLog(id);
+		List<outPublicReleaseLog> list=publicReleaseLogMapper.listPublicReleaseLog(id);
+		return list;
 	}
 
 	@Override
+	public List<outPublicReleaseLog> unreadPublicReleaseLog() {
+		List<outPublicReleaseLog> list=publicReleaseLogMapper.unreadPublicReleaseLog(TokenManager.getAdminId());
+		return list;
+	}
+	@Override
 	public int pushPublicReleaseClockIn(Integer id,String photoUrl) {
 		PublicRelease p=new PublicRelease();
 		PublicRelease use=publicReleaseMapper.selectByPrimaryKey(id);

+ 2 - 0
src/main/java/com/goafanti/common/dao/NoticeMapper.java

@@ -54,4 +54,6 @@ public interface NoticeMapper {
 	void insertBatch(List<Notice> notice);
 
 	List<NoticeBo> findUnreadNoticeListByPage(@Param("aid") String aid);
+
+	List<NoticeBo> publicReleaseUnread(@Param("aid") String aid);
 }

+ 13 - 7
src/main/java/com/goafanti/common/dao/PublicReleaseLogMapper.java

@@ -2,6 +2,8 @@ package com.goafanti.common.dao;
 
 import java.util.List;
 
+import org.apache.ibatis.annotations.Param;
+
 import com.goafanti.admin.bo.outPublicReleaseLog;
 import com.goafanti.common.model.PublicReleaseLog;
 
@@ -9,39 +11,43 @@ public interface PublicReleaseLogMapper {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table public_release_log
-	 * @mbg.generated  Tue Jun 01 15:52:56 CST 2021
+	 * @mbg.generated  Fri Jun 11 16:07:04 CST 2021
 	 */
 	int deleteByPrimaryKey(Integer id);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table public_release_log
-	 * @mbg.generated  Tue Jun 01 15:52:56 CST 2021
+	 * @mbg.generated  Fri Jun 11 16:07:04 CST 2021
 	 */
 	int insert(PublicReleaseLog record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table public_release_log
-	 * @mbg.generated  Tue Jun 01 15:52:56 CST 2021
+	 * @mbg.generated  Fri Jun 11 16:07:04 CST 2021
 	 */
 	int insertSelective(PublicReleaseLog record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table public_release_log
-	 * @mbg.generated  Tue Jun 01 15:52:56 CST 2021
+	 * @mbg.generated  Fri Jun 11 16:07:04 CST 2021
 	 */
 	PublicReleaseLog selectByPrimaryKey(Integer id);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table public_release_log
-	 * @mbg.generated  Tue Jun 01 15:52:56 CST 2021
+	 * @mbg.generated  Fri Jun 11 16:07:04 CST 2021
 	 */
 	int updateByPrimaryKeySelective(PublicReleaseLog record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table public_release_log
-	 * @mbg.generated  Tue Jun 01 15:52:56 CST 2021
+	 * @mbg.generated  Fri Jun 11 16:07:04 CST 2021
 	 */
 	int updateByPrimaryKey(PublicReleaseLog record);
 
-	List<outPublicReleaseLog> listPublicReleaseLog(Integer id);
+	List<outPublicReleaseLog> listPublicReleaseLog(@Param ("id")Integer id);
+
+	void updateNoRead();
+
+	List<outPublicReleaseLog> unreadPublicReleaseLog(String aid);
 }

+ 3 - 0
src/main/java/com/goafanti/common/enums/NoticeStatus.java

@@ -60,6 +60,9 @@ public enum NoticeStatus {
 	CUSTOMER_LOSE270(51,"客户释放(270天)"),
 	CUSTOMER_CHENNEL_RECOVERY(52,"渠道客户回收"),
 	CUSTOMER_CHENNEL_LOSE(53,"渠道客户丢失"),
+	PUBLIC_RELEASE_START(54,"外出打卡申请"),
+	PUBLIC_RELEASE_YES(55,"外出打卡通过"),
+	PUBLIC_RELEASE_NO(56,"外出打卡驳回"),
 	OTHER(0, "其他");
 
 	private NoticeStatus(Integer code, String desc) {

+ 13 - 0
src/main/java/com/goafanti/common/mapper/NoticeMapper.xml

@@ -216,6 +216,19 @@
     order by n.create_time desc
   </select>
     
+    
+    <select id="publicReleaseUnread"  resultType="com.goafanti.admin.bo.NoticeBo">
+    select n.id, n.aid, n.uid, n.notice_type as noticeType, n.content, n.create_time as createTime, n.type,
+		oi.unit_name as unitName, n.rid, a.name as principle, n.readed, n.year
+		from notice n 
+		LEFT JOIN organization_identity oi on n.uid = oi.uid
+		LEFT JOIN admin a on a.id = n.pid 
+    where n.readed = 0 and n.notice_type in(54,55,56)
+    <if test="aid != null">
+    	and n.aid = #{aid}
+    </if>
+    order by n.create_time desc
+  </select>
   
   <select id="findReadedNoticeListByPage" parameterType="java.lang.String" resultType="com.goafanti.admin.bo.NoticeBo">
      select n.id, n.uid, n.aid, n.notice_type as noticeType, n.content, n.create_time as createTime, 

+ 13 - 9
src/main/java/com/goafanti/common/mapper/PublicReleaseLogMapper.xml

@@ -5,7 +5,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Jun 01 15:52:56 CST 2021.
+      This element was generated on Fri Jun 11 16:07:04 CST 2021.
     -->
     <id column="id" jdbcType="INTEGER" property="id" />
     <result column="prid" jdbcType="INTEGER" property="prid" />
@@ -18,7 +18,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Jun 01 15:52:56 CST 2021.
+      This element was generated on Fri Jun 11 16:07:04 CST 2021.
     -->
     id, prid, aid, remarks, `status`, create_time
   </sql>
@@ -26,7 +26,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Jun 01 15:52:56 CST 2021.
+      This element was generated on Fri Jun 11 16:07:04 CST 2021.
     -->
     select 
     <include refid="Base_Column_List" />
@@ -37,7 +37,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Jun 01 15:52:56 CST 2021.
+      This element was generated on Fri Jun 11 16:07:04 CST 2021.
     -->
     delete from public_release_log
     where id = #{id,jdbcType=INTEGER}
@@ -46,7 +46,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Jun 01 15:52:56 CST 2021.
+      This element was generated on Fri Jun 11 16:07:04 CST 2021.
     -->
     insert into public_release_log (id, prid, aid, 
       remarks, `status`, create_time
@@ -59,7 +59,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Jun 01 15:52:56 CST 2021.
+      This element was generated on Fri Jun 11 16:07:04 CST 2021.
     -->
     insert into public_release_log
     <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -107,7 +107,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Jun 01 15:52:56 CST 2021.
+      This element was generated on Fri Jun 11 16:07:04 CST 2021.
     -->
     update public_release_log
     <set>
@@ -133,7 +133,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Jun 01 15:52:56 CST 2021.
+      This element was generated on Fri Jun 11 16:07:04 CST 2021.
     -->
     update public_release_log
     set prid = #{prid,jdbcType=INTEGER},
@@ -147,6 +147,10 @@
   select a.id,a.aid ,a.prid ,a.remarks ,a.status ,b.name aname,
 	date_format(a.create_time ,'%Y-%m-%d %H:%i:%S') createTimes
 	from public_release_log a left join admin b on a.aid =b.id 
-	where a.prid = #{id}
+	where 1=1
+	<if test="id !=null">
+	and a.prid = #{id}
+	</if>
   </select>
+
 </mapper>

+ 20 - 20
src/main/java/com/goafanti/common/model/PublicReleaseLog.java

@@ -6,43 +6,43 @@ import java.util.Date;
 public class PublicReleaseLog implements Serializable {
     /**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column public_release_log.id
-	 * @mbg.generated  Tue Jun 01 15:52:56 CST 2021
+	 * @mbg.generated  Fri Jun 11 16:07:04 CST 2021
 	 */
 	private Integer id;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column public_release_log.prid
-	 * @mbg.generated  Tue Jun 01 15:52:56 CST 2021
+	 * @mbg.generated  Fri Jun 11 16:07:04 CST 2021
 	 */
 	private Integer prid;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column public_release_log.aid
-	 * @mbg.generated  Tue Jun 01 15:52:56 CST 2021
+	 * @mbg.generated  Fri Jun 11 16:07:04 CST 2021
 	 */
 	private String aid;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column public_release_log.remarks
-	 * @mbg.generated  Tue Jun 01 15:52:56 CST 2021
+	 * @mbg.generated  Fri Jun 11 16:07:04 CST 2021
 	 */
 	private String remarks;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column public_release_log.status
-	 * @mbg.generated  Tue Jun 01 15:52:56 CST 2021
+	 * @mbg.generated  Fri Jun 11 16:07:04 CST 2021
 	 */
 	private Integer status;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column public_release_log.create_time
-	 * @mbg.generated  Tue Jun 01 15:52:56 CST 2021
+	 * @mbg.generated  Fri Jun 11 16:07:04 CST 2021
 	 */
 	private Date createTime;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table public_release_log
-	 * @mbg.generated  Tue Jun 01 15:52:56 CST 2021
+	 * @mbg.generated  Fri Jun 11 16:07:04 CST 2021
 	 */
 	private static final long serialVersionUID = 1L;
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column public_release_log.id
 	 * @return  the value of public_release_log.id
-	 * @mbg.generated  Tue Jun 01 15:52:56 CST 2021
+	 * @mbg.generated  Fri Jun 11 16:07:04 CST 2021
 	 */
 	public Integer getId() {
 		return id;
@@ -50,7 +50,7 @@ public class PublicReleaseLog implements Serializable {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column public_release_log.id
 	 * @param id  the value for public_release_log.id
-	 * @mbg.generated  Tue Jun 01 15:52:56 CST 2021
+	 * @mbg.generated  Fri Jun 11 16:07:04 CST 2021
 	 */
 	public void setId(Integer id) {
 		this.id = id;
@@ -58,7 +58,7 @@ public class PublicReleaseLog implements Serializable {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column public_release_log.prid
 	 * @return  the value of public_release_log.prid
-	 * @mbg.generated  Tue Jun 01 15:52:56 CST 2021
+	 * @mbg.generated  Fri Jun 11 16:07:04 CST 2021
 	 */
 	public Integer getPrid() {
 		return prid;
@@ -66,7 +66,7 @@ public class PublicReleaseLog implements Serializable {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column public_release_log.prid
 	 * @param prid  the value for public_release_log.prid
-	 * @mbg.generated  Tue Jun 01 15:52:56 CST 2021
+	 * @mbg.generated  Fri Jun 11 16:07:04 CST 2021
 	 */
 	public void setPrid(Integer prid) {
 		this.prid = prid;
@@ -74,7 +74,7 @@ public class PublicReleaseLog implements Serializable {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column public_release_log.aid
 	 * @return  the value of public_release_log.aid
-	 * @mbg.generated  Tue Jun 01 15:52:56 CST 2021
+	 * @mbg.generated  Fri Jun 11 16:07:04 CST 2021
 	 */
 	public String getAid() {
 		return aid;
@@ -82,7 +82,7 @@ public class PublicReleaseLog implements Serializable {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column public_release_log.aid
 	 * @param aid  the value for public_release_log.aid
-	 * @mbg.generated  Tue Jun 01 15:52:56 CST 2021
+	 * @mbg.generated  Fri Jun 11 16:07:04 CST 2021
 	 */
 	public void setAid(String aid) {
 		this.aid = aid == null ? null : aid.trim();
@@ -90,7 +90,7 @@ public class PublicReleaseLog implements Serializable {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column public_release_log.remarks
 	 * @return  the value of public_release_log.remarks
-	 * @mbg.generated  Tue Jun 01 15:52:56 CST 2021
+	 * @mbg.generated  Fri Jun 11 16:07:04 CST 2021
 	 */
 	public String getRemarks() {
 		return remarks;
@@ -98,7 +98,7 @@ public class PublicReleaseLog implements Serializable {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column public_release_log.remarks
 	 * @param remarks  the value for public_release_log.remarks
-	 * @mbg.generated  Tue Jun 01 15:52:56 CST 2021
+	 * @mbg.generated  Fri Jun 11 16:07:04 CST 2021
 	 */
 	public void setRemarks(String remarks) {
 		this.remarks = remarks == null ? null : remarks.trim();
@@ -106,7 +106,7 @@ public class PublicReleaseLog implements Serializable {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column public_release_log.status
 	 * @return  the value of public_release_log.status
-	 * @mbg.generated  Tue Jun 01 15:52:56 CST 2021
+	 * @mbg.generated  Fri Jun 11 16:07:04 CST 2021
 	 */
 	public Integer getStatus() {
 		return status;
@@ -114,7 +114,7 @@ public class PublicReleaseLog implements Serializable {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column public_release_log.status
 	 * @param status  the value for public_release_log.status
-	 * @mbg.generated  Tue Jun 01 15:52:56 CST 2021
+	 * @mbg.generated  Fri Jun 11 16:07:04 CST 2021
 	 */
 	public void setStatus(Integer status) {
 		this.status = status;
@@ -122,7 +122,7 @@ public class PublicReleaseLog implements Serializable {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column public_release_log.create_time
 	 * @return  the value of public_release_log.create_time
-	 * @mbg.generated  Tue Jun 01 15:52:56 CST 2021
+	 * @mbg.generated  Fri Jun 11 16:07:04 CST 2021
 	 */
 	public Date getCreateTime() {
 		return createTime;
@@ -130,14 +130,14 @@ public class PublicReleaseLog implements Serializable {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column public_release_log.create_time
 	 * @param createTime  the value for public_release_log.create_time
-	 * @mbg.generated  Tue Jun 01 15:52:56 CST 2021
+	 * @mbg.generated  Fri Jun 11 16:07:04 CST 2021
 	 */
 	public void setCreateTime(Date createTime) {
 		this.createTime = createTime;
 	}
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table public_release_log
-	 * @mbg.generated  Tue Jun 01 15:52:56 CST 2021
+	 * @mbg.generated  Fri Jun 11 16:07:04 CST 2021
 	 */
 	@Override
 	public String toString() {

+ 2 - 3
src/main/java/com/goafanti/core/websocket/SystemWebSocketHandler.java

@@ -14,12 +14,11 @@ import org.springframework.web.socket.WebSocketSession;
 
 import com.goafanti.common.utils.LoggerUtils;
 import com.goafanti.core.mybatis.JDBCIdGenerator;
+import com.goafanti.core.shiro.token.TokenManager;
 
 @Service
 public class SystemWebSocketHandler implements WebSocketHandler {
 	
-	@Autowired
-	private JDBCIdGenerator	idGenerator;
 
 	private static final Map<String, WebSocketSession> users = new ConcurrentHashMap<>();
 	
@@ -28,7 +27,7 @@ public class SystemWebSocketHandler implements WebSocketHandler {
 	public void afterConnectionEstablished(WebSocketSession session) throws Exception {
 		String userId = (String) session.getAttributes().get(Constants.WEBSOCKET_USERNAME);
 		if (userId==null) {
-			userId=idGenerator.generateId().toString();
+			userId=TokenManager.getAdminId();
 		}
 		if (userId != null) {
 			users.put(userId, session);