Merge branch 'master' of http://124.70.58.209:3000/ytrd-project-management/GeoHazardMonitor

hazard-admin/src/main/java/com/ozs/web/controller/system/SysDictDataController.java

@@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ozs.common.core.domain.vo.SysDictDataVo;
+import com.ozs.common.utils.DictUtils;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -152,6 +153,9 @@ public class SysDictDataController extends BaseController {
     public AjaxResult edit(@Validated @RequestBody SysDictData dict)
     {
         dict.setUpdateBy(getUsername());
+        if(StringUtils.equals(dict.getDictType(),"shot_switch")){
+            DictUtils.removeDictCache("shot_switch");
+        }
         return toAjax(dictDataService.updateDictData(dict));
     }
 

hazard-admin/src/main/java/com/ozs/web/controller/websocket/WebSocketServer.java

@@ -52,6 +52,7 @@ public class WebSocketServer {
             this.userId = userId;
             webSockets.add(this);
             sessionPool.put(userId, session);
+            System.out.println("链接成功" + webSockets.size());
             log.info("【websocket消息】有新的连接，总数为:" + webSockets.size());
         } catch (Exception e) {
         }
@@ -65,6 +66,7 @@ public class WebSocketServer {
         try {
             webSockets.remove(this);
             sessionPool.remove(this.userId);
+            System.out.println("链接失败" + webSockets.size());
             log.info("【websocket消息】连接断开，总数为:" + webSockets.size());
         } catch (Exception e) {
         }
@@ -90,6 +92,8 @@ public class WebSocketServer {
     public void onError(Session session, Throwable error) {
 
         log.error("用户错误,原因:" + error.getMessage());
+        log.error("用户错误,原因:" + error.getLocalizedMessage());
+        log.error("用户错误,原因sessionsessionsession:" + session.getId());
         error.printStackTrace();
     }