feat: 历史查询

src/main/java/com/bellmann/controller/DevOperateTypeController.java

@@ -16,7 +16,7 @@ import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
 
-@Tag(name = "17.设备操作组件")
+@Tag(name = "18.设备操作组件")
 @RestController
 @RequiredArgsConstructor
 @RequestMapping("/api/operate/v1")

src/main/java/com/bellmann/controller/HistoryQueryController.java

@@ -0,0 +1,31 @@
+package com.bellmann.controller;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.bellmann.common.result.PageResult;
+import com.bellmann.model.entity.DeviceLogicIdBind;
+import com.bellmann.model.query.SelectQuery;
+import com.bellmann.service.HistoryQueryService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@Tag(name = "19.历史查询")
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/api/history-query/v1")
+public class HistoryQueryController {
+
+    private final HistoryQueryService historyQueryService;
+
+    @PostMapping("page")
+    @Operation(summary = "历史查询分页接口")
+    public PageResult<DeviceLogicIdBind> page(@RequestBody SelectQuery query){
+        Page<DeviceLogicIdBind> page = historyQueryService.page(query);
+        return PageResult.success(page);
+    }
+
+}

src/main/java/com/bellmann/mapper/DeviceLogicIdBindMapper.java

@@ -0,0 +1,9 @@
+package com.bellmann.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.bellmann.model.entity.DeviceLogicIdBind;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface DeviceLogicIdBindMapper extends BaseMapper<DeviceLogicIdBind> {
+}

src/main/java/com/bellmann/model/entity/DeviceLogicIdBind.java

@@ -0,0 +1,26 @@
+package com.bellmann.model.entity;
+
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+@TableName("v_zj_device_loid_bind")
+public class DeviceLogicIdBind implements Serializable {
+
+    private static final long serialVersionUID = 545868992234882320L;
+
+    private String devSno;
+
+    private String devOui;
+
+    private String devTypeName;
+
+    private String userSnNo;
+
+    private String insertdate;
+
+    private String updatedate;
+}

src/main/java/com/bellmann/model/vo/RouteVO.java

@@ -53,7 +53,7 @@ public class RouteVO {
         private Boolean keepAlive;
 
         @Schema(description = "【目录】只有一个子路由是否始终显示", example = "true")
-        @JsonInclude(JsonInclude.Include.NON_NULL)
+//        @JsonInclude(JsonInclude.Include.NON_NULL)
         private Boolean alwaysShow;
     }
 

src/main/java/com/bellmann/service/HistoryQueryService.java

@@ -0,0 +1,9 @@
+package com.bellmann.service;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.bellmann.model.entity.DeviceLogicIdBind;
+import com.bellmann.model.query.SelectQuery;
+
+public interface HistoryQueryService {
+    Page<DeviceLogicIdBind> page(SelectQuery query);
+}

src/main/java/com/bellmann/service/impl/HistoryQueryServiceImpl.java

@@ -0,0 +1,35 @@
+package com.bellmann.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.bellmann.common.result.PageResult;
+import com.bellmann.mapper.DeviceLogicIdBindMapper;
+import com.bellmann.model.entity.DeviceLogicIdBind;
+import com.bellmann.model.query.SelectQuery;
+import com.bellmann.service.HistoryQueryService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+
+@Service
+@RequiredArgsConstructor
+public class HistoryQueryServiceImpl implements HistoryQueryService {
+    private final DeviceLogicIdBindMapper deviceLogicIdBindMapper;
+    @Override
+    public Page<DeviceLogicIdBind> page(SelectQuery query) {
+        int pageSize = query.getPageSize();
+        int pageNum = query.getPageNum();
+        String selectValue = String.valueOf(query.getSelectValue());
+        String selectName = query.getSelectName();
+        Page<DeviceLogicIdBind> page = new Page<>(pageNum,pageSize);
+        if (selectName.equals("logicId")){
+            return deviceLogicIdBindMapper.selectPage(page, new LambdaQueryWrapper<DeviceLogicIdBind>()
+                    .eq(DeviceLogicIdBind::getUserSnNo, selectValue)
+            );
+        }else {
+            return deviceLogicIdBindMapper.selectPage(page, new LambdaQueryWrapper<DeviceLogicIdBind>()
+                    .eq(DeviceLogicIdBind::getDevSno, selectValue)
+            );
+
+        }
+    }
+}

src/main/java/com/bellmann/service/impl/SysMenuServiceImpl.java

@@ -186,12 +186,7 @@ public class SysMenuServiceImpl extends ServiceImpl<SysMenuMapper, SysMenu> impl
                 && ObjectUtil.equals(routeBO.getKeepAlive(), 1)) {
             meta.setKeepAlive(true);
         }
-        // 【目录】只有一个子路由是否始终显示
-        if (MenuTypeEnum.CATALOG.equals(routeBO.getType())
-                && ObjectUtil.equals(routeBO.getAlwaysShow(), 1)) {
-            meta.setAlwaysShow(true);
-        }
-
+        meta.setAlwaysShow(ObjectUtil.equals(routeBO.getAlwaysShow(), 1));
         routeVO.setMeta(meta);
         return routeVO;
     }