添加飞行员 获取密码 检索条件

Backend/sample/src/main/java/com/dji/sample/common/smsp/CallSmsp.java

@@ -5,6 +5,7 @@ import cn.hutool.json.JSONArray;
 import cn.hutool.json.JSONObject;
 import com.dji.sample.configuration.CustomConfiguration;
 import com.dji.sample.manage.model.dto.ManageDeviceLivestreamUrlDTO;
+import com.dji.sample.manage.model.dto.RtmpUrlDTO;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import lombok.extern.slf4j.Slf4j;
@@ -44,11 +45,9 @@ public class CallSmsp {
         }
     }
 
-    public static List<ManageDeviceLivestreamUrlDTO> getRtmp(String token, String deviceSn, String payload) {
+    public static RtmpUrlDTO getRtmp(String token, String deviceSn) {
+        RtmpUrlDTO rtmpUrlDTO = new RtmpUrlDTO();
         List<ManageDeviceLivestreamUrlDTO> resultList = new ArrayList<>();
-        if(token == null) {
-            return resultList;
-        }
         String url = CustomConfiguration.smspRtmpUrl+"?token="+token;
         ObjectMapper objectMapper = new ObjectMapper();
         try {
@@ -79,13 +78,14 @@ public class CallSmsp {
                     }
                 }
             }
-//            if(response.get("message") != null) {
-//                resultList
-//            }
-            return resultList;
+            rtmpUrlDTO.setList(resultList);
+            if(response.get("message") != null) {
+                rtmpUrlDTO.setMessage(response.get("message"));
+            }
+            return rtmpUrlDTO;
         } catch (Exception e) {
             e.printStackTrace();
-            return resultList;
+            return rtmpUrlDTO;
         }
     }
 

Backend/sample/src/main/java/com/dji/sample/manage/controller/DeviceController.java

@@ -3,6 +3,7 @@ package com.dji.sample.manage.controller;
 import com.dji.sample.manage.model.dto.DeviceDTO;
 import com.dji.sample.manage.model.dto.DeviceFirmwareUpgradeDTO;
 import com.dji.sample.manage.model.dto.DevicePayloadDTO;
+import com.dji.sample.manage.model.param.DeviceOprLogsQueryParam;
 import com.dji.sample.manage.service.IDevicePayloadService;
 import com.dji.sample.manage.service.IDeviceService;
 import com.dji.sdk.common.HttpResultResponse;

Backend/sample/src/main/java/com/dji/sample/manage/controller/UserController.java

@@ -3,6 +3,7 @@ package com.dji.sample.manage.controller;
 import com.dji.sample.common.model.CustomClaim;
 import com.dji.sample.manage.model.dto.UserListDTO;
 import com.dji.sample.manage.model.dto.UserLoginDTO;
+import com.dji.sample.manage.model.dto.UserPilotDTO;
 import com.dji.sample.manage.service.IUserService;
 import com.dji.sdk.common.HttpResultResponse;
 import com.dji.sdk.common.PaginationData;
@@ -12,6 +13,7 @@ import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
+import javax.validation.constraints.NotNull;
 
 import static com.dji.sample.component.AuthInterceptor.TOKEN_CLAIM;
 
@@ -44,8 +46,9 @@ public class UserController {
     @GetMapping("/{workspace_id}/users")
     public HttpResultResponse<PaginationData<UserListDTO>> getUsers(@RequestParam(defaultValue = "1") Long page,
                                                                     @RequestParam(value = "page_size", defaultValue = "50") Long pageSize,
-                                                                    @PathVariable("workspace_id") String workspaceId) {
-        PaginationData<UserListDTO> paginationData = userService.getUsersByWorkspaceId(page, pageSize, workspaceId);
+                                                                    @PathVariable("workspace_id") String workspaceId,
+                                                                    String username) {
+        PaginationData<UserListDTO> paginationData = userService.getUsersByWorkspaceId(page, pageSize, workspaceId,username);
         return HttpResultResponse.success(paginationData);
     }
 
@@ -74,4 +77,19 @@ public class UserController {
         return userService.saveApiUser(clientId,username, password);
     }
 
+    @PostMapping("/savePilotUser")
+    public HttpResultResponse savePilotUser(HttpServletRequest request,@RequestBody UserPilotDTO pilotDTO) {
+        String username = pilotDTO.getUsername();
+        String password = pilotDTO.getPassword();
+        String workspaceId = pilotDTO.getWorkspaceId();
+        log.info("==========savePilotUser接口调用  username:" + username + ",password:" + password + ",workspaceId:" + workspaceId + ",IP:" + request.getRemoteAddr());
+        return userService.savePilotUser(username, password,workspaceId);
+    }
+
+    @GetMapping("/getPwd")
+    public HttpResultResponse getPwd(@NotNull String username) {
+        log.info("==========getPwd接口调用  username:" + username );
+        return userService.getPwd(username);
+    }
+
 }

Backend/sample/src/main/java/com/dji/sample/manage/model/dto/RtmpUrlDTO.java

@@ -0,0 +1,24 @@
+package com.dji.sample.manage.model.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+/**
+ * @author huiqing.jiang
+ * @date 2024/7/11
+ * @version 0.1
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
+public class RtmpUrlDTO {
+
+    private String message;
+
+    private List<ManageDeviceLivestreamUrlDTO> list;
+}

Backend/sample/src/main/java/com/dji/sample/manage/model/dto/UserPilotDTO.java

@@ -0,0 +1,26 @@
+package com.dji.sample.manage.model.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.time.LocalDateTime;
+
+/**
+ * @author sean
+ * @version 1.0
+ * @date 2022/4/18
+ */
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+public class UserPilotDTO {
+
+    private String username;
+
+    private String password;
+
+    private String workspaceId;
+}

Backend/sample/src/main/java/com/dji/sample/manage/service/IUserService.java

@@ -40,9 +40,10 @@ public interface IUserService {
     /**
      * Query information about all users in a workspace.
      * @param workspaceId   uuid
+     * @param username
      * @return
      */
-    PaginationData<UserListDTO> getUsersByWorkspaceId(long page, long pageSize, String workspaceId);
+    PaginationData<UserListDTO> getUsersByWorkspaceId(long page, long pageSize, String workspaceId,String username);
 
     HttpResultResponse saveApiUser(String clientId,String username, String password);
 
@@ -59,4 +60,20 @@ public interface IUserService {
     UserEntity getUserByUsername(String username);
 
     HttpResultResponse userLogin(SignLoginDTO signLoginDTO);
+
+    /**
+     * 新增飞行员
+     * @param username
+     * @param password
+     * @param workspaceId
+     * @return
+     */
+    HttpResultResponse savePilotUser(String username, String password,String workspaceId);
+
+    /**
+     * 获取密码
+     * @param username
+     * @return
+     */
+    HttpResultResponse getPwd(String username);
 }

Backend/sample/src/main/java/com/dji/sample/manage/service/impl/ManageDeviceLivestreamUrlServiceImpl.java

@@ -8,6 +8,7 @@ import com.dji.sample.manage.dao.IDevicePayloadMapper;
 import com.dji.sample.manage.dao.IManageDeviceLivestreamUrlMapper;
 import com.dji.sample.manage.dao.IUserMapper;
 import com.dji.sample.manage.model.dto.ManageDeviceLivestreamUrlDTO;
+import com.dji.sample.manage.model.dto.RtmpUrlDTO;
 import com.dji.sample.manage.model.entity.DevicePayloadEntity;
 import com.dji.sample.manage.model.entity.ManageDeviceLivestreamUrlEntity;
 import com.dji.sample.manage.model.entity.UserEntity;
@@ -61,7 +62,7 @@ public class ManageDeviceLivestreamUrlServiceImpl implements IManageDeviceLivest
         }
 
         //获取rtmp地址
-        List<ManageDeviceLivestreamUrlDTO> rtmpList = CallSmsp.getRtmp(tokenMap.get("Token"),deviceLivestreamUrlDTO.getDeviceSn(),deviceLivestreamUrlDTO.getPayload());
+        RtmpUrlDTO rtmpUrlDTO = CallSmsp.getRtmp(tokenMap.get("Token"),deviceLivestreamUrlDTO.getDeviceSn());
         ManageDeviceLivestreamUrlDTO rtmpDto = new ManageDeviceLivestreamUrlDTO();
 
         //获取数据库中deviceSn对应的url信息
@@ -69,9 +70,20 @@ public class ManageDeviceLivestreamUrlServiceImpl implements IManageDeviceLivest
         wrapper.lambda().eq(ManageDeviceLivestreamUrlEntity::getDeviceSn,deviceLivestreamUrlDTO.getDeviceSn())
                 .eq(ManageDeviceLivestreamUrlEntity::getWorkspaceId,deviceLivestreamUrlDTO.getWorkspaceId());
         List<ManageDeviceLivestreamUrlEntity> urlList = mapper.selectList(wrapper);
-        if(urlList.size() <= 0 && rtmpList.size() <= 0 ){
+
+        if(urlList.size() == 0 && rtmpUrlDTO.getMessage() != null ){
             log.debug("The result is null.");
-            throw new RuntimeException (tokenMap.get("message"));
+            if(tokenMap.get("message") != null) {
+                throw new RuntimeException (tokenMap.get("message"));
+            }
+            if(rtmpUrlDTO.getMessage() != null) {
+                throw new RuntimeException (rtmpUrlDTO.getMessage());
+            }
+            throw new RuntimeException ("The result is null.");
+        }
+        List<ManageDeviceLivestreamUrlDTO> rtmpList =  new ArrayList<>();
+        if (rtmpUrlDTO.getList().size() > 0) {
+            rtmpList = rtmpUrlDTO.getList();
         }
         List<Integer> urlL = urlList.stream()
                 .map(ManageDeviceLivestreamUrlEntity::getChannelId)
@@ -151,5 +163,4 @@ public class ManageDeviceLivestreamUrlServiceImpl implements IManageDeviceLivest
         }
     }
 
-
 }

Backend/sample/src/main/java/com/dji/sample/manage/service/impl/UserServiceImpl.java

@@ -199,10 +199,20 @@ public class UserServiceImpl implements IUserService {
     }
 
     @Override
-    public PaginationData<UserListDTO> getUsersByWorkspaceId(long page, long pageSize, String workspaceId) {
+    public PaginationData<UserListDTO> getUsersByWorkspaceId(long page, long pageSize, String workspaceId,String username) {
+        LambdaQueryWrapper<UserEntity> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(UserEntity::getWorkspaceId, workspaceId);
+        queryWrapper.and(wrapper -> {
+            wrapper.eq(UserEntity::getUserType, UserTypeEnum.WEB.getVal());
+            wrapper.or().eq(UserEntity::getUserType, UserTypeEnum.PILOT.getVal());
+        });
+        if(username != null) {
+            queryWrapper.like(UserEntity::getUsername,username);
+        }
+
         Page<UserEntity> userEntityPage = mapper.selectPage(
                 new Page<>(page, pageSize),
-                new LambdaQueryWrapper<UserEntity>().eq(UserEntity::getWorkspaceId, workspaceId));
+                queryWrapper);
 
         List<UserListDTO> usersList = userEntityPage.getRecords()
                 .stream()
@@ -382,7 +392,7 @@ public class UserServiceImpl implements IUserService {
             userEntity = new UserEntity();
             userEntity.setUsername(username);
             userEntity.setUserId(UUID.randomUUID().toString());
-            userEntity.setUserType(UserTypeEnum.SUPER_SYS.getVal());
+            userEntity.setUserType(UserTypeEnum.WEB.getVal());
             userEntity.setPassword("");
             userEntity.setWorkspaceId(workSpaceId);
             userEntity.setMqttUsername(mqttPropertyConfiguration.mqttConnectOptions().getUserName());
@@ -432,6 +442,72 @@ public class UserServiceImpl implements IUserService {
         return HttpResultResponse.success(userDTO);
     }
 
+    @Override
+    public HttpResultResponse savePilotUser(String username, String password,String workspaceId) {
+
+        if(!StringUtils.hasText(username)) {
+            return new HttpResultResponse()
+                    .setCode(HttpStatus.BAD_REQUEST.value())
+                    .setMessage("用户名不能为空");
+        }
+
+        if(!StringUtils.hasText(password)) {
+            return new HttpResultResponse()
+                    .setCode(HttpStatus.BAD_REQUEST.value())
+                    .setMessage("密码不能为空");
+        }
+
+        if(!StringUtils.hasText(workspaceId)) {
+            return new HttpResultResponse()
+                    .setCode(HttpStatus.BAD_REQUEST.value())
+                    .setMessage("工作空间不能为空");
+        }
+        UserEntity userEntity = getUserByUsername(username);
+        if(userEntity != null) {
+            return new HttpResultResponse()
+                    .setCode(HttpStatus.BAD_REQUEST.value())
+                    .setMessage("用户已存在");
+        }
+        Optional<WorkspaceDTO> workspace = workspaceService.getWorkspaceByWorkspaceId(workspaceId);
+        if(workspace.isEmpty()) {
+            return new HttpResultResponse()
+                    .setCode(HttpStatus.BAD_REQUEST.value())
+                    .setMessage("工作空间不存在");
+        }
+        //密码加密
+        String salt = DesUtil.genSalt();
+        String encryptPsw = DesUtil.getEncryptData(password,salt);
+
+        long curTime = System.currentTimeMillis();
+        userEntity = UserEntity.builder().
+                userId(UUID.randomUUID().toString())
+                .username(username)
+                .password(encryptPsw)
+                .workspaceId(workspaceId)
+                .userType(UserTypeEnum.PILOT.getVal())
+                .mqttUsername(mqttPropertyConfiguration.mqttConnectOptions().getUserName())
+                .mqttPassword(String.valueOf(mqttPropertyConfiguration.mqttConnectOptions().getPassword()))
+                .createTime(curTime)
+                .updateTime(curTime)
+                .salt(salt)
+                .build();
+        int cnt = mapper.insert(userEntity);
+        return cnt > 0 ? HttpResultResponse.success():HttpResultResponse.error("添加失败");
+
+    }
+
+    @Override
+    public HttpResultResponse getPwd(String username) {
+        UserEntity userEntity = getUserByUsername(username);
+        if (userEntity == null) {
+            return new HttpResultResponse()
+                    .setCode(HttpStatus.BAD_REQUEST.value())
+                    .setMessage("用户不存在");
+        }
+        String decryptPwd = DesUtil.getDecryptData(userEntity.getPassword(),userEntity.getSalt());
+        return new HttpResultResponse().success(decryptPwd);
+    }
+
     private UserEntity getApiUser(String clientId) {
         return mapper.selectOne(new QueryWrapper<UserEntity>()
                 .eq("client_id", clientId)

Backend/sample/src/main/java/com/dji/sample/media/controller/FileController.java

@@ -92,8 +92,9 @@ public class FileController {
     public HttpResultResponse<PaginationData<MediaFileDTO>> getDirFilesList(@RequestParam(defaultValue = "1") Long page,
                                                                          @RequestParam(name = "page_size", defaultValue = "10") Long pageSize,
                                                                          @PathVariable(name = "workspace_id") String workspaceId,
+                                                                         MediaFileQueryParam param,
                                                                          @PathVariable(name = "dir_id") String dirId) {
-        PaginationData<MediaFileDTO> filesList = fileService.getMediaFilesPaginationByDirId(dirId, page, pageSize);
+        PaginationData<MediaFileDTO> filesList = fileService.getMediaFilesPaginationByDirId(dirId, page, pageSize,param);
         return HttpResultResponse.success(filesList);
     }
 

Backend/sample/src/main/java/com/dji/sample/media/service/IFileService.java

@@ -81,9 +81,10 @@ public interface IFileService {
      * @param dirId
      * @param page
      * @param pageSize
+     * @param param
      * @return
      */
-    PaginationData<MediaFileDTO> getMediaFilesPaginationByDirId(String dirId, long page, long pageSize);
+    PaginationData<MediaFileDTO> getMediaFilesPaginationByDirId(String dirId, long page, long pageSize,MediaFileQueryParam param);
 
     List<MediaFileDTO> getMediaFilesByDirId(String dirId);
 

Backend/sample/src/main/java/com/dji/sample/media/service/impl/FileServiceImpl.java

@@ -317,16 +317,25 @@ public class FileServiceImpl implements IFileService {
     }
 
     @Override
-    public PaginationData<MediaFileDTO> getMediaFilesPaginationByDirId(String dirId, long page, long pageSize) {
+    public PaginationData<MediaFileDTO> getMediaFilesPaginationByDirId(String dirId, long page, long pageSize,MediaFileQueryParam param) {
         Page<MediaFileEntity> pageData = mapper.selectPage(
                 new Page<MediaFileEntity>(page, pageSize),
                 new LambdaQueryWrapper<MediaFileEntity>()
                         .eq(MediaFileEntity::getDirId, dirId)
+                        .ge(param != null && param.getBeginTime() != null, MediaFileEntity::getCreateTime,param.getBeginTime())
+                        .le(param != null && param.getEndTime() != null, MediaFileEntity::getCreateTime,param.getEndTime())
+                        .and(StringUtils.hasText(param.getSearchInfo()),
+                                wrapper -> wrapper.like( MediaFileEntity::getFileName, param.getSearchInfo())
+                                        .or().like( MediaFileEntity::getPayload, param.getSearchInfo())
+                        )
                         .orderByDesc(MediaFileEntity::getId));
         List<MediaFileDTO> records = pageData.getRecords()
                 .stream()
                 .map(this::entityConvertToDto)
                 .collect(Collectors.toList());
+        if (param.getMediaType() != null) {
+            records = records.stream().filter(mediaFileDTO -> param.getMediaType().equals(mediaFileDTO.getMediaType())).collect(Collectors.toList());
+        }
 
         MediaDirDTO mediaDirDTO = mediaDirService.getMediaDirById(null,String.valueOf(dirId));
         return new PaginationData<MediaFileDTO>(mediaDirDTO.getDirName(), records, new Pagination(pageData.getCurrent(), pageData.getSize(), pageData.getTotal()));

Web/src/pages/page-web/projects/media/index/components/Search.vue

@@ -24,7 +24,7 @@
             <a-select-option :value="3">
               带状航线
             </a-select-option>
-            <a-select-option :value="4">
+            <a-select-option value="">
               无
             </a-select-option>
           </a-select>

Web/src/pages/page-web/projects/member/components/Search.vue

@@ -7,13 +7,13 @@
     </a-col>
     <a-col>
       <a-form ref="formRef" layout="inline" :model="formModel" :colon="false">
-        <a-form-item name="device_name">
-          <a-select style="width: 200px;" placeholder="请选择项目" v-model:value="formModel.device_name">
-            <a-select-option value="1">
-              项目编号 0001
-            </a-select-option>
-          </a-select>
-        </a-form-item>
+<!--        <a-form-item name="device_name">-->
+<!--          <a-select style="width: 200px;" placeholder="请选择项目" v-model:value="formModel.device_name">-->
+<!--            <a-select-option value="1">-->
+<!--              项目编号 0001-->
+<!--            </a-select-option>-->
+<!--          </a-select>-->
+<!--        </a-form-item>-->
         <a-form-item name="keyword">
           <a-input style="width: 200px;" placeholder="用户名称" v-model:value="formModel.keyword" />
         </a-form-item>

Web/src/pages/page-web/projects/trajectory/components/Search.vue

@@ -19,7 +19,7 @@
             <a-select-option :value="3">
               带状航线
             </a-select-option>
-            <a-select-option :value="4">
+            <a-select-option value="">
               无
             </a-select-option>
           </a-select>