修改在线客服

zxkf-api/src/main/java/api/controller/common/CommonController.java

 package api.controller.common;
 
-import com.alibaba.excel.util.StringUtils;
 import api.controller.BaseController;
 import api.model.AjaxResult;
+import api.util.helper.DateHelper;
+import api.util.helper.FileUploadHelper;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.GetMapping;
 import java.net.URLConnection;
 import java.net.URLEncoder;
 import java.util.HashMap;
-import java.util.UUID;
 
 /**
  * 通用请求处理
         if (files == null || files.length == 0) {
             return Error("无文件");
         }
-        //新文件名
-        StringBuilder newFileName;
-
-        //全部文件名，若多个，则逗号分隔
-        StringBuilder allFileNames = new StringBuilder();
-
         //上传路径
-        String fileSavePath = "files";
-
+        String fileSavePath = "files/common/"+ DateHelper.getDate();
         //若文件夹不存在，则创建文件夹
         File pFile = new File(fileSavePath);
-        if (!pFile.exists()) {
-            pFile.mkdirs();
-        }
+        if (!pFile.exists()) { pFile.mkdirs(); }
 
+        HashMap<String, String> fileInfo =new HashMap<>();
         //遍历所有文件
         for (MultipartFile file : files) {
-            //得到原始文件名
-            newFileName = new StringBuilder(file.getOriginalFilename());
-            //查询文件名中点号所处位置
-            int i = newFileName.lastIndexOf(".");
-            //若点号位置大于0，则文件名正常
-            if (i > 0) {
-                //在点号前拼接UUID防止文件重名
-                newFileName.insert(i, "_" + UUID.randomUUID().toString().substring(0, 5));
-            } else {
-                //若点号位置小于等于0，则文件名不规范
-                return Error("文件'" + newFileName + "'名称不规范");
-            }
+            String filePath="";
             try {
-                // 保存文件
-                file.transferTo(new File(pFile.getAbsolutePath()+"/" + newFileName));
-                //若全部文件名为空，则此为第一个文件，直接追加此文件名
-                if (StringUtils.isBlank(allFileNames.toString())) {
-                    allFileNames.append(newFileName);
-                } else {
-                    //若全部文件名不为空，则追加逗号和文件名
-                    allFileNames.append(",").append(newFileName).toString();
-                }
+                filePath= FileUploadHelper.upload(fileSavePath,file);
             } catch (IOException e) {
-                log.error("上传失败",e);
-                return Error("上传失败");
+                throw new RuntimeException(e);
             }
+            fileInfo.put(file.getOriginalFilename(),filePath);
         }
 
-        //返回全部文件名和文件路径
-        HashMap<String, String> fileInfo = new HashMap<String, String>(2) {{
-            put("fileNames", allFileNames.toString());
-            put("filePath", fileSavePath);
-        }};
-        //返回信息
         return Success("上传成功", fileInfo);
     }
 
             File file = new File(path);
             // 获取文件名
             String filename = file.getName();
-            // 获取文件后缀名
-            String e1xt = filename.substring(filename.lastIndexOf(".") + 1).toLowerCase();
 
             // 将文件写入输入流
             FileInputStream fileInputStream = new FileInputStream(file);

zxkf-service/src/main/java/api/service/websocket/WebSocket.java

                 msg.setKhUser(userCode);
                 msg.setKhSource(source);
                 String kf = khkfs.get(userCode);
-                if (StringHelper.isEmpty(kf)) {
+                if (StringHelper.isEmpty(kf)||servicers.get(kf)==2) {
                     kf = servicerQueue.poll();
-                    if(!StringHelper.isEmpty(kf)) {
+                    if (!StringHelper.isEmpty(kf)) {
                         servicerQueue.add(kf);
                         khkfs.put(userCode, kf);
                     }
         String msg = "客户已下线";
         if(!(servicers.containsKey(kf)&&kfsessionPool.containsKey(kf))){
             msg = "此客服未签入";
-        }
-        else if (!StringHelper.isEmpty(kh)) {
+        } else if(servicers.get(kf)==2) {
+            msg = "此客服忙碌";
+        } else if (!StringHelper.isEmpty(kh)) {
             if (customers.containsKey(kh)) {
                 if (khkfs.containsKey(kh)) {
                     if (khkfs.get(kh).equals(kf) ) {
         };
 
         String kf = khkfs.get(sendUser);
-        if (StringHelper.isEmpty(kf)) {
+        if (StringHelper.isEmpty(kf)||servicers.get(kf)==2) {
             kf = servicerQueue.poll();
-            if(!StringHelper.isEmpty(kf)) {
+            if (!StringHelper.isEmpty(kf)) {
                 servicerQueue.add(kf);
                 khkfs.put(sendUser, kf);
             }

zxkf-util/pom.xml

                 </exclusion>
             </exclusions>
         </dependency>
-        <dependency>
-            <groupId>com.alibaba</groupId>
-            <artifactId>easyexcel</artifactId>
-            <version>3.0.5</version>
-        </dependency>
+        <!-- excel -->
         <dependency>
             <groupId>org.apache.poi</groupId>
             <artifactId>poi-ooxml</artifactId>