检索条件字段名修改 设备列表接口修改

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

@@ -187,8 +187,9 @@ public class DeviceController {
      * @return
      */
     @GetMapping("/{workspace_id}/getDeviceType")
-    public HttpResultResponse getDeviceType(@PathVariable("workspace_id") String workspaceId) {
-        List<DeviceTypeDTO> resultList = deviceDictionaryService.getDeviceType();
+    public HttpResultResponse getDeviceType(@PathVariable("workspace_id") String workspaceId,
+                                            String flg) {
+        List<DeviceTypeDTO> resultList = deviceDictionaryService.getDeviceType(flg);
         return HttpResultResponse.success(resultList);
     }
 }

Backend/sample/src/main/java/com/dji/sample/manage/model/param/DeviceOprLogsQueryParam.java

@@ -25,8 +25,8 @@ public class DeviceOprLogsQueryParam {
     @JsonProperty("device_name")
     private String deviceName;
 
-    @JsonProperty("logs_information")
-    private String logsInformation;
+    @JsonProperty("search_info")
+    private String searchInfo;
 
 
 }

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

@@ -23,6 +23,6 @@ public interface IDeviceDictionaryService {
      */
     Optional<DeviceDictionaryDTO> getOneDictionaryInfoByTypeSubType(Integer domain, Integer deviceType, Integer subType);
 
-    List<DeviceTypeDTO> getDeviceType();
+    List<DeviceTypeDTO> getDeviceType(String flg);
 
 }

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

@@ -46,9 +46,14 @@ public class DeviceDictionaryServiceImpl implements IDeviceDictionaryService {
     }
 
     @Override
-    public List<DeviceTypeDTO> getDeviceType() {
+    public List<DeviceTypeDTO> getDeviceType(String flg) {
         QueryWrapper<DeviceDictionaryEntity> wrapper = new QueryWrapper<>();
-        wrapper.lambda().in(DeviceDictionaryEntity::getDomain, DeviceDomainEnum.DRONE.getDomain(),DeviceDomainEnum.DOCK.getDomain());
+
+        if(flg != null) {
+            wrapper.lambda().in(DeviceDictionaryEntity::getDomain, DeviceDomainEnum.DRONE.getDomain(),DeviceDomainEnum.REMOTER_CONTROL.getDomain(),DeviceDomainEnum.DOCK.getDomain());
+        } else {
+            wrapper.lambda().in(DeviceDictionaryEntity::getDomain, DeviceDomainEnum.DRONE.getDomain(),DeviceDomainEnum.DOCK.getDomain());
+        }
         List<DeviceDictionaryEntity> entities = mapper.selectList(wrapper);
         if(entities.size() > 0) {
             List<DeviceTypeDTO> result = entities.stream()

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

@@ -57,10 +57,10 @@ public class DeviceOprLogsServiceImpl implements IDeviceOprLogsService {
                 .between(Objects.nonNull(param.getBeginTime()) && Objects.nonNull(param.getEndTime()),
                         DeviceOprLogsEntity::getCreateTime, param.getBeginTime(), param.getEndTime())
                 .eq(param!=null && StringUtils.hasText(param.getDeviceName()),DeviceOprLogsEntity::getDeviceName,param.getDeviceName())
-                .and(StringUtils.hasText(param.getLogsInformation()),
-                        wrapper -> wrapper .like( DeviceOprLogsEntity::getLogInfo, param.getLogsInformation())
-                                .or().like( DeviceOprLogsEntity::getDeviceSn, param.getLogsInformation())
-                                .or().like(DeviceOprLogsEntity::getWorkspaceName, param.getLogsInformation())
+                .and(StringUtils.hasText(param.getSearchInfo()),
+                        wrapper -> wrapper .like( DeviceOprLogsEntity::getLogInfo, param.getSearchInfo())
+                                .or().like( DeviceOprLogsEntity::getDeviceSn, param.getSearchInfo())
+                                .or().like(DeviceOprLogsEntity::getWorkspaceName, param.getSearchInfo())
                 )
                 .orderByDesc(DeviceOprLogsEntity::getCreateTime);