优化socket

sxz-core/src/main/java/com/fdkk/sxz/webApi/socket/service/ComponentBizImpl.java

@@ -46,32 +46,37 @@ public class ComponentBizImpl {
                 while (flag) {
                     Thread.sleep(3000);
                     ComponentBizImpl.log.warn("查询" + session.id() + "|----------" + id);
-                    if (StrUtil.equals(status, "query")) {
-                        if (redisUtil.hasKey("componentUploadStatus:id:" + id)) {
-                            String ObjStatus = redisUtil.get("componentUploadStatus:id:" + id);
-                            if (StrUtil.equals(ObjStatus, "done") || StrUtil.equals(ObjStatus, "error")) {
-                                waitForResult(new ParamContext("msg", extracted(id, ObjStatus, action)), callId);
-                                flag = false;
-                            }
-                        } else {
-                            ComponentModelUploadEntity entity = componentModelUploadService.findById(id);
-                            Thread.sleep(2000);
-                            if (ObjectUtil.isNotNull(entity)) {
-                                if (entity.getStatus() == 1 && entity.getProgress() == 100) {
-                                    redisUtil.setEx("componentUploadStatus:id:" + id, "done", 5, TimeUnit.MINUTES);
-                                    waitForResult(new ParamContext("msg", extracted(id, "done", action)), callId);
+                    if (session.isOpen()) {
+                        if (StrUtil.equals(status, "query")) {
+                            if (redisUtil.hasKey("componentUploadStatus:id:" + id)) {
+                                String ObjStatus = redisUtil.get("componentUploadStatus:id:" + id);
+                                if (StrUtil.equals(ObjStatus, "done") || StrUtil.equals(ObjStatus, "error")) {
+                                    waitForResult(new ParamContext("msg", extracted(id, ObjStatus, action)), callId);
                                     flag = false;
-                                } else if (entity.getStatus() == -1) {
-                                    redisUtil.delete("modelUploadStatus:id:" + id);
+                                }
+                            } else {
+                                ComponentModelUploadEntity entity = componentModelUploadService.findById(id);
+                                Thread.sleep(2000);
+                                if (ObjectUtil.isNotNull(entity)) {
+                                    if (entity.getStatus() == 1 && entity.getProgress() == 100) {
+                                        redisUtil.setEx("componentUploadStatus:id:" + id, "done", 5, TimeUnit.MINUTES);
+                                        waitForResult(new ParamContext("msg", extracted(id, "done", action)), callId);
+                                        flag = false;
+                                    } else if (entity.getStatus() == -1) {
+                                        redisUtil.delete("modelUploadStatus:id:" + id);
+                                        waitForResult(new ParamContext("msg", extracted(id, "error", action)), callId);
+                                        flag = false;
+                                    }
+                                } else {
+                                    //查不到直接返回错误
                                     waitForResult(new ParamContext("msg", extracted(id, "error", action)), callId);
                                     flag = false;
                                 }
-                            } else {
-                                //查不到直接返回错误
-                                waitForResult(new ParamContext("msg", extracted(id, "error", action)), callId);
-                                flag = false;
                             }
                         }
+                    } else {
+                        ComponentBizImpl.log.info("连接关闭" + session.id());
+                        flag = false;
                     }
                 }
             }

sxz-core/src/main/java/com/fdkk/sxz/webApi/socket/service/ComponentCreateImgBizImpl.java

@@ -46,32 +46,37 @@ public class ComponentCreateImgBizImpl {
                 while (flag) {
                     Thread.sleep(3000);
                     ComponentCreateImgBizImpl.log.warn("查询" + session.id() + "|----------" + id);
-                    if (StrUtil.equals(status, "query")) {
-                        if (redisUtil.hasKey("componentCreateImgStatus:id:" + id)) {
-                            String ObjStatus = redisUtil.get("componentCreateImgStatus:id:" + id);
-                            if (StrUtil.equals(ObjStatus, "done") || StrUtil.equals(ObjStatus, "error")) {
-                                waitForResult(new ParamContext("msg", extracted(id, ObjStatus, action)), callId);
-                                flag = false;
-                            }
-                        } else {
-                            ComponentModelUploadEntity entity = componentModelUploadService.findById(id);
-                            Thread.sleep(2000);
-                            if (ObjectUtil.isNotNull(entity)) {
-                                if (entity.getStatus() == 1 && entity.getProgress() == 100) {
-                                    redisUtil.setEx("componentCreateImgStatus:id:" + id, "done", 5, TimeUnit.MINUTES);
-                                    waitForResult(new ParamContext("msg", extracted(id, "done", action)), callId);
+                    if (session.isOpen()) {
+                        if (StrUtil.equals(status, "query")) {
+                            if (redisUtil.hasKey("componentCreateImgStatus:id:" + id)) {
+                                String ObjStatus = redisUtil.get("componentCreateImgStatus:id:" + id);
+                                if (StrUtil.equals(ObjStatus, "done") || StrUtil.equals(ObjStatus, "error")) {
+                                    waitForResult(new ParamContext("msg", extracted(id, ObjStatus, action)), callId);
                                     flag = false;
-                                } else if (entity.getStatus() == -1) {
-                                    redisUtil.delete("modelUploadStatus:id:" + id);
+                                }
+                            } else {
+                                ComponentModelUploadEntity entity = componentModelUploadService.findById(id);
+                                Thread.sleep(2000);
+                                if (ObjectUtil.isNotNull(entity)) {
+                                    if (entity.getStatus() == 1 && entity.getProgress() == 100) {
+                                        redisUtil.setEx("componentCreateImgStatus:id:" + id, "done", 5, TimeUnit.MINUTES);
+                                        waitForResult(new ParamContext("msg", extracted(id, "done", action)), callId);
+                                        flag = false;
+                                    } else if (entity.getStatus() == -1) {
+                                        redisUtil.delete("modelUploadStatus:id:" + id);
+                                        waitForResult(new ParamContext("msg", extracted(id, "error", action)), callId);
+                                        flag = false;
+                                    }
+                                } else {
+                                    //查不到直接返回错误
                                     waitForResult(new ParamContext("msg", extracted(id, "error", action)), callId);
                                     flag = false;
                                 }
-                            } else {
-                                //查不到直接返回错误
-                                waitForResult(new ParamContext("msg", extracted(id, "error", action)), callId);
-                                flag = false;
                             }
                         }
+                    } else {
+                        ComponentCreateImgBizImpl.log.info("连接关闭" + session.id());
+                        flag = false;
                     }
                 }
             }

sxz-core/src/main/java/com/fdkk/sxz/webApi/socket/service/CreateImgBizImpl.java

@@ -46,32 +46,37 @@ public class CreateImgBizImpl {
                 while (flag) {
                     Thread.sleep(3000);
                     CreateImgBizImpl.log.warn("查询" + session.id() + "|----------" + id);
-                    if (StrUtil.equals(status, "query")) {
-                        if (redisUtil.hasKey("createImgStatus:id:" + id)) {
-                            String ObjStatus = redisUtil.get("createImgStatus:id:" + id);
-                            if (StrUtil.equals(ObjStatus, "done") || StrUtil.equals(ObjStatus, "error")) {
-                                waitForResult(new ParamContext("msg", extracted(id, ObjStatus, action)), callId);
-                                flag = false;
-                            }
-                        } else {
-                            ModelUploadEntity entity = modelUploadService.findById(id);
-                            Thread.sleep(2000);
-                            if (ObjectUtil.isNotNull(entity)) {
-                                if (entity.getStatus() == 1 && entity.getProgress() == 100) {
-                                    redisUtil.setEx("createImgStatus:id:" + id, "done", 5, TimeUnit.MINUTES);
-                                    waitForResult(new ParamContext("msg", extracted(id, "done", action)), callId);
+                    if (session.isOpen()) {
+                        if (StrUtil.equals(status, "query")) {
+                            if (redisUtil.hasKey("createImgStatus:id:" + id)) {
+                                String ObjStatus = redisUtil.get("createImgStatus:id:" + id);
+                                if (StrUtil.equals(ObjStatus, "done") || StrUtil.equals(ObjStatus, "error")) {
+                                    waitForResult(new ParamContext("msg", extracted(id, ObjStatus, action)), callId);
                                     flag = false;
-                                } else if (entity.getStatus() == -1) {
-                                    redisUtil.delete("createImgStatus:id:" + id);
+                                }
+                            } else {
+                                ModelUploadEntity entity = modelUploadService.findById(id);
+                                Thread.sleep(2000);
+                                if (ObjectUtil.isNotNull(entity)) {
+                                    if (entity.getStatus() == 1 && entity.getProgress() == 100) {
+                                        redisUtil.setEx("createImgStatus:id:" + id, "done", 5, TimeUnit.MINUTES);
+                                        waitForResult(new ParamContext("msg", extracted(id, "done", action)), callId);
+                                        flag = false;
+                                    } else if (entity.getStatus() == -1) {
+                                        redisUtil.delete("createImgStatus:id:" + id);
+                                        waitForResult(new ParamContext("msg", extracted(id, "error", action)), callId);
+                                        flag = false;
+                                    }
+                                } else {
+                                    //查不到直接返回错误
                                     waitForResult(new ParamContext("msg", extracted(id, "error", action)), callId);
                                     flag = false;
                                 }
-                            } else {
-                                //查不到直接返回错误
-                                waitForResult(new ParamContext("msg", extracted(id, "error", action)), callId);
-                                flag = false;
                             }
                         }
+                    } else {
+                        CreateImgBizImpl.log.info("连接关闭" + session.id());
+                        flag = false;
                     }
                 }
             }

sxz-core/src/main/java/com/fdkk/sxz/webApi/socket/service/ModelUploadBizImpl.java

@@ -46,32 +46,37 @@ public class ModelUploadBizImpl {
                 while (flag) {
                     Thread.sleep(3000);
                     ModelUploadBizImpl.log.warn("查询" + session.id() + "|----------" + id);
-                    if (StrUtil.equals(status, "query")) {
-                        if (redisUtil.hasKey("modelUploadStatus:id:" + id)) {
-                            String ObjStatus = redisUtil.get("modelUploadStatus:id:" + id);
-                            if (StrUtil.equals(ObjStatus, "done") || StrUtil.equals(ObjStatus, "error")) {
-                                waitForResult(new ParamContext("msg", extracted(id, ObjStatus, action)), callId);
-                                flag = false;
-                            }
-                        } else {
-                            ModelUploadEntity entity = modelUploadService.findById(id);
-                            Thread.sleep(2000);
-                            if (ObjectUtil.isNotNull(entity)) {
-                                if (entity.getStatus() == 1 && entity.getProgress() == 100) {
-                                    redisUtil.setEx("modelUploadStatus:id:" + id, "done", 5, TimeUnit.MINUTES);
-                                    waitForResult(new ParamContext("msg", extracted(id, "done", action)), callId);
+                    if (session.isOpen()) {
+                        if (StrUtil.equals(status, "query")) {
+                            if (redisUtil.hasKey("modelUploadStatus:id:" + id)) {
+                                String ObjStatus = redisUtil.get("modelUploadStatus:id:" + id);
+                                if (StrUtil.equals(ObjStatus, "done") || StrUtil.equals(ObjStatus, "error")) {
+                                    waitForResult(new ParamContext("msg", extracted(id, ObjStatus, action)), callId);
                                     flag = false;
-                                } else if (entity.getStatus() == -1) {
-                                    redisUtil.delete("modelUploadStatus:id:" + id);
+                                }
+                            } else {
+                                ModelUploadEntity entity = modelUploadService.findById(id);
+                                Thread.sleep(2000);
+                                if (ObjectUtil.isNotNull(entity)) {
+                                    if (entity.getStatus() == 1 && entity.getProgress() == 100) {
+                                        redisUtil.setEx("modelUploadStatus:id:" + id, "done", 5, TimeUnit.MINUTES);
+                                        waitForResult(new ParamContext("msg", extracted(id, "done", action)), callId);
+                                        flag = false;
+                                    } else if (entity.getStatus() == -1) {
+                                        redisUtil.delete("modelUploadStatus:id:" + id);
+                                        waitForResult(new ParamContext("msg", extracted(id, "error", action)), callId);
+                                        flag = false;
+                                    }
+                                } else {
+                                    //查不到直接返回错误
                                     waitForResult(new ParamContext("msg", extracted(id, "error", action)), callId);
                                     flag = false;
                                 }
-                            } else {
-                                //查不到直接返回错误
-                                waitForResult(new ParamContext("msg", extracted(id, "error", action)), callId);
-                                flag = false;
                             }
                         }
+                    } else {
+                        ModelUploadBizImpl.log.info("连接关闭" + session.id());
+                        flag = false;
                     }
                 }
             }