Merge branch 'dev' of http://192.168.1.43:3000/v2/zd-parents into dev

zd-modules/zd-algorithm/src/main/java/com/zd/alg/monitor/HardwareDeviceMonitor.java

@@ -78,7 +78,8 @@ public class HardwareDeviceMonitor {
                             for (Map m : list) {
                                 String code = (String) m.get("relayCode");
                                 if (!map.containsKey(code)) {
-                                    map.put(code, "---信息[名称" + m.get("name") + "，所在学院：" + m.get("deptName") + "，所在实验室：" + m.get("subjectName") + "]\n");
+                                    map.put(code, "---信息[名称：" +
+                                            "" + m.get("name") + "，所在学院：" + m.get("deptName") + "，所在实验室：" + m.get("subjectName") + "]\n");
                                 }
                             }
                             //封装消息

zd-modules/zd-base/src/main/java/com/zd/base/files/file/controller/SysFileController.java

@@ -2,6 +2,7 @@ package com.zd.base.files.file.controller;
 
 import com.zd.base.files.file.enums.FileEnum;
 import com.zd.base.files.file.service.ISysFileService;
+import com.zd.base.files.file.utils.FileUploadUtils;
 import com.zd.common.core.utils.file.FileUtils;
 import com.zd.model.domain.R;
 import com.zd.model.entity.SysFile;
@@ -13,6 +14,10 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
 
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
 /**
  * 文件请求处理
  *
@@ -39,15 +44,8 @@ public class SysFileController {
             }else {
                 fileSuffix = file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf("."));
             }
-            String[] picSuffixList = {".jpg", ".png", ".jpeg", ".gif", ".bmp", ".ico", ".pdf", ".doc", ".docx", ".ppt", ".pptx", ".mp3", ".mp4", ".avi", ".xls", ".xlsx", ".csv", ".txt", ".apk"};
-            boolean suffixFlag = false;
-            for (String white_suffix : picSuffixList) {
-                if (fileSuffix.toLowerCase().equals(white_suffix)) {
-                    suffixFlag = true;
-                    break;
-                }
-            }
-            if (suffixFlag) {
+            List<String> list = Arrays.asList(".jpg", ".png", ".jpeg", ".gif", ".bmp", ".ico", ".pdf", ".doc", ".docx", ".ppt", ".pptx", ".mp3", ".mp4", ".avi", ".xls", ".xlsx", ".csv", ".txt", ".apk");
+            if (list.contains(fileSuffix.toLowerCase())) {
                 // 上传并返回访问地址
                 String url = sysFileService.uploadFile(file);
                 SysFile sysFile = new SysFile();

zd-modules/zd-modules-system/src/main/java/com/zd/system/controller/SysTeacherController.java

@@ -203,6 +203,8 @@ public class SysTeacherController extends BaseController {
         } else if (StringUtils.isNotEmpty(user.getEmail())
                 && UserConstants.NOT_UNIQUE.equals(sysTeacherService.checkEmailUnique(user))) {
             return AjaxResult.error("修改用户'" + user.getUserName() + "'失败，邮箱账号已存在");
+        }else if (UserConstants.NOT_UNIQUE.equals(sysTeacherService.checkUserNameUnique(user.getUserName()))) {
+            return AjaxResult.error("修改用户'" + user.getUserName() + "'失败，账号已存在");
         }
         user.setUpdateBy(SecurityUtils.getUsername());
         return toAjax(sysTeacherService.update(user));