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

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

@@ -8,14 +8,7 @@ import org.apache.commons.lang3.ArrayUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 import com.ozs.common.annotation.Log;
 import com.ozs.common.constant.UserConstants;
@@ -114,7 +107,7 @@ public class SysUserController extends BaseController {
      */
     @PreAuthorize("@ss.hasPermi('system:user:add')")
     @Log(title = "用户管理", businessType = BusinessType.INSERT)
-    @PostMapping
+    @PostMapping("/add")
     public AjaxResult add(@Validated @RequestBody SysUser user) {
         if (UserConstants.NOT_UNIQUE.equals(userService.checkUserNameUnique(user))) {
             return error("新增用户'" + user.getUserName() + "'失败，登录账号已存在");
@@ -132,7 +125,7 @@ public class SysUserController extends BaseController {
      */
     @PreAuthorize("@ss.hasPermi('system:user:edit')")
     @Log(title = "用户管理", businessType = BusinessType.UPDATE)
-    @PutMapping
+    @RequestMapping(value ="/edit",method = RequestMethod.PUT)
     public AjaxResult edit(@Validated @RequestBody SysUser user) {
         userService.checkUserAllowed(user);
         userService.checkUserDataScope(user.getId());

hazard-admin/src/main/java/com/ozs/web/core/util/CameraUtil.java

@@ -18,6 +18,7 @@ import java.io.*;
 import java.util.*;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
+import java.util.stream.Collectors;
 
 /**
  * 相机工具
@@ -79,6 +80,7 @@ public class CameraUtil {
         }
 
         List<String> ls = new ArrayList<>();
+        Map<Date, String> m = new HashMap<>();
         // 调用视频服务返回参数
         String startTime = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, startTm);
         String endTime = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, endTm);
@@ -104,25 +106,29 @@ public class CameraUtil {
                         Date edate = DateUtils.dateTime(DateUtils.YYYYMMDDHHMMSS, s4);
                         /*     s | e     | */
                         if (startTm.compareTo(sdate) <= 0 && endTm.compareTo(edate) > 0) {
-                            ls.add(mappingUrl + path.toString());
-
+                            m.put(sdate, mappingUrl + path.toString());
                             /*  |   s    e    | */
                         } else if (startTm.compareTo(sdate) >= 0 && endTm.compareTo(edate) <= 0) {
-                            ls.add(mappingUrl + path.toString());
+                            m.put(sdate, mappingUrl + path.toString());
 
                             /*  |   s     |  e  */
                         } else if (startTm.compareTo(sdate) >= 0 && endTm.compareTo(edate) >= 0) {
-                            ls.add(mappingUrl + path.toString());
+                            m.put(sdate, mappingUrl + path.toString());
 
                             /*  s|      | e  */
                         } else if (startTm.compareTo(sdate) <= 0 && endTm.compareTo(edate) >= 0) {
-                            ls.add(mappingUrl + path.toString());
+                            m.put(sdate, mappingUrl + path.toString());
                         }
                     }
                 }
             }
         }
-        if (!ObjectUtils.isEmpty(ls)) {
+        if (!ObjectUtils.isEmpty(m) && m.size() > 0) {
+            Set<Date> dates = m.keySet();
+            // 排序
+            dates.stream().parallel().collect(Collectors.toList()).stream().sorted().forEach(d -> {
+                ls.add(m.get(d));
+            });
             return ls;
 //            try {
 //                return historyPlay(ls, ph);