`fix 设备接口`

ruoyi-system/src/main/java/com/ruoyi/data/controller/TblEquipmentSbookController.java

@@ -59,14 +59,14 @@ public class TblEquipmentSbookController extends BaseController {
      */
     @SaCheckPermission("data:equipmentSbook:list")
     @GetMapping("/list")
-    public TableDataInfo<TblEquipmentSbook> list(TblEquipmentSbook bo, PageQuery pageQuery) {
-        TableDataInfo<TblEquipmentSbook> listObj= iTblEquipmentSbookService.queryallPageList(bo,pageQuery);
-        List<TblEquipmentSbook> tblEquipmentVoList = listObj.getRows();
+    public TableDataInfo<TblEquipmentSbookVo> list(TblEquipmentSbookBo bo, PageQuery pageQuery) {
+        TableDataInfo<TblEquipmentSbookVo> listObj= iTblEquipmentSbookService.queryallPageList(bo,pageQuery);
+        List<TblEquipmentSbookVo> tblEquipmentVoList = listObj.getRows();
         TblEquipmentOrganizationalBo organizationalBo = new TblEquipmentOrganizationalBo();
         List<TblEquipmentOrganizationalVo> tblEquipmentOrganizationalVoList = iTblEquipmentOrganizationalService.queryList(organizationalBo);
         TblEquipmentBo tblEquipmentBo = new TblEquipmentBo();
         List<TblEquipmentVo> tblEquipmentVos = iTblEquipmentService.queryList(tblEquipmentBo);
-        for(TblEquipmentSbook tblEquipmentSbook:tblEquipmentVoList){
+        for(TblEquipmentSbookVo tblEquipmentSbook:tblEquipmentVoList){
             for(TblEquipmentOrganizationalVo tblEquipmentOrganizationalVo:tblEquipmentOrganizationalVoList){
                 if(tblEquipmentSbook.getEquipmentTreeId().longValue() == tblEquipmentOrganizationalVo.getId().longValue()){
                     tblEquipmentSbook.setDeptName(tblEquipmentOrganizationalVo.getName());

ruoyi-system/src/main/java/com/ruoyi/data/domain/bo/TblEquipmentSbookBo.java

@@ -62,7 +62,7 @@ public class TblEquipmentSbookBo extends BaseEntity {
     /**
      * 所属公司
      */
-    @NotBlank(message = "所属公司不能为空", groups = { AddGroup.class, EditGroup.class })
+    @NotNull(message = "所属公司不能为空", groups = { AddGroup.class, EditGroup.class })
     private Long deptId;
 
     /**

ruoyi-system/src/main/java/com/ruoyi/data/service/ITblEquipmentSbookService.java

@@ -28,7 +28,7 @@ public interface ITblEquipmentSbookService {
     TableDataInfo<TblEquipmentSbookVo> queryPageList(TblEquipmentSbookBo bo, PageQuery pageQuery);
 
 
-    TableDataInfo<TblEquipmentSbook> queryallPageList(TblEquipmentSbook tblEquipmentSbook, PageQuery pageQuery);
+    TableDataInfo<TblEquipmentSbookVo> queryallPageList(TblEquipmentSbookBo tblEquipmentSbook, PageQuery pageQuery);
 
     /**
      * 查询设备台账列表

ruoyi-system/src/main/java/com/ruoyi/data/service/impl/TblEquipmentSbookServiceImpl.java

@@ -67,8 +67,9 @@ public class TblEquipmentSbookServiceImpl implements ITblEquipmentSbookService {
     }
 
     @Override
-    public TableDataInfo<TblEquipmentSbook> queryallPageList(TblEquipmentSbook tblEquipmentSbook, PageQuery pageQuery) {
-        Page<TblEquipmentSbook> page = baseMapper.selectPageList(pageQuery.build(), this.buildLeftWrapper(tblEquipmentSbook));
+    public TableDataInfo<TblEquipmentSbookVo> queryallPageList(TblEquipmentSbookBo tblEquipmentSbook, PageQuery pageQuery) {
+        LambdaQueryWrapper<TblEquipmentSbook> lqw = buildQueryWrapper(tblEquipmentSbook);
+        Page<TblEquipmentSbookVo> page = baseMapper.selectVoPage(pageQuery.build(),lqw);
         return TableDataInfo.build(page);
     }
 

ruoyi-ui-vue3/src/views/gateway/manager/add.vue

@@ -233,7 +233,7 @@ const {gateway_status, flow_units, protocal_type} = proxy.useDict("gateway_statu
 import {delModbusRtu, listModbusRtu} from "@/api/data/modbusRtu";
 import {listModbusTcp} from "@/api/data/modbusTcp";
 import {updateGateway} from "@/api/data/gateway";
-import {listGatewayEquipmentSbook,updateEquipmentSbook} from "@/api/data/equipmentSbook"
+import {listEquipmentSbook,updateEquipmentSbook} from "@/api/data/equipmentSbook"
 import {ElMessage} from "element-plus";
 import {cloneDeep} from "lodash";
 
@@ -383,7 +383,7 @@ const pagedata1 = ref({
   current: 1
 });
 const getalldata = () => {
-  listGatewayEquipmentSbook({...pagedata.value,gatewayId:currentgateway.value.id}).then(res => {
+  listEquipmentSbook({...pagedata.value,gatewayId:currentgateway.value.id}).then(res => {
     const {rows,total,page,size} = res;
     tabledata.value = rows;
     pagedata.value = {total:total,current:page, size:10};