设备台账

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

@@ -4,9 +4,16 @@ import java.util.List;
 import java.util.Arrays;
 import java.util.concurrent.TimeUnit;
 
+import com.ruoyi.data.domain.TblEquipment;
+import com.ruoyi.data.domain.TblEquipmentOrganizational;
 import com.ruoyi.data.domain.TblEquipmentSbook;
+import com.ruoyi.data.domain.TblGateway;
 import com.ruoyi.data.domain.bo.TblEquipmentBo;
-import com.ruoyi.data.domain.vo.TblEquipmentVo;
+import com.ruoyi.data.domain.bo.TblEquipmentOrganizationalBo;
+import com.ruoyi.data.domain.vo.*;
+import com.ruoyi.data.service.ITblEquipmentOrganizationalService;
+import com.ruoyi.data.service.ITblEquipmentService;
+import com.ruoyi.data.service.ITblGatewayService;
 import lombok.RequiredArgsConstructor;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.constraints.*;
@@ -23,7 +30,6 @@ import com.ruoyi.common.core.validate.EditGroup;
 import com.ruoyi.common.core.validate.QueryGroup;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.data.domain.vo.TblEquipmentSbookVo;
 import com.ruoyi.data.domain.bo.TblEquipmentSbookBo;
 import com.ruoyi.data.service.ITblEquipmentSbookService;
 import com.ruoyi.common.core.page.TableDataInfo;
@@ -42,15 +48,38 @@ public class TblEquipmentSbookController extends BaseController {
 
     private final ITblEquipmentSbookService iTblEquipmentSbookService;
 
+    private final ITblGatewayService iTblGatewayService;
+
+    private final ITblEquipmentOrganizationalService iTblEquipmentOrganizationalService;
+
+    private final ITblEquipmentService iTblEquipmentService;
+
     /**
      * 查询设备台账列表
      */
     @SaCheckPermission("data:equipmentSbook:list")
     @GetMapping("/list")
-    public TableDataInfo<TblEquipmentSbookVo> list(TblEquipmentSbookBo bo, PageQuery pageQuery) {
-        return iTblEquipmentSbookService.queryPageList(bo, pageQuery);
+    public TableDataInfo<TblEquipmentSbook> list(TblEquipmentSbook bo, PageQuery pageQuery) {
+        TableDataInfo<TblEquipmentSbook> listObj= iTblEquipmentSbookService.queryallPageList(bo,pageQuery);
+        List<TblEquipmentSbook> 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(TblEquipmentOrganizationalVo tblEquipmentOrganizationalVo:tblEquipmentOrganizationalVoList){
+                if(tblEquipmentSbook.getEquipmentTreeId().longValue() == tblEquipmentOrganizationalVo.getId().longValue()){
+                    tblEquipmentSbook.setDeptName(tblEquipmentOrganizationalVo.getName());
+                }
+            }
+        }
+        listObj.setRows(tblEquipmentVoList);
+//        return obj;
+        return listObj;
     }
 
+
+
     /**
      * 导出设备台账列表
      */
@@ -82,6 +111,7 @@ public class TblEquipmentSbookController extends BaseController {
     @RepeatSubmit()
     @PostMapping()
     public R<Void> add(@Validated(AddGroup.class) @RequestBody TblEquipmentSbookBo bo) {
+        String codeId = bo.getSn();
         return toAjax(iTblEquipmentSbookService.insertByBo(bo));
     }
 
@@ -109,12 +139,33 @@ public class TblEquipmentSbookController extends BaseController {
         return toAjax(iTblEquipmentSbookService.deleteWithValidByIds(Arrays.asList(ids), true));
     }
 
-    /**
-     * 根据网关查询所有设备列表
-     */
-    @SaCheckPermission("data:equipmentSbook:list")
-    @GetMapping("/alllist")
-    public TableDataInfo<TblEquipmentSbookVo> alllist(TblEquipmentSbookBo bo,PageQuery query) {
-        return iTblEquipmentSbookService.queryPageList(bo,query);
-    }
+//    /**
+//     * 根据网关查询所有设备列表
+//     */
+//    @SaCheckPermission("data:equipmentSbook:list")
+//    @GetMapping("/alllist")
+//    public TableDataInfo<TblEquipmentSbookVo> alllist(TblEquipmentSbookBo bo) {
+//        if(bo.getGatewayId() != null){
+//            TableDataInfo<TblEquipmentSbookVo> obj= new TableDataInfo<>();
+//            List<TblEquipmentSbookVo> tblEquipmentVoList = iTblEquipmentSbookService.queryList(bo);
+//            TblGatewayVo tblGatewayVo = iTblGatewayService.queryById(bo.getGatewayId());
+//            for(TblEquipmentSbookVo tblEquipmentSbookVo:tblEquipmentVoList){
+//                tblEquipmentSbookVo.setGatewayName(tblGatewayVo.getName());
+//            }
+//            TblEquipmentOrganizationalBo organizationalBo = new TblEquipmentOrganizationalBo();
+//            List<TblEquipmentOrganizationalVo> tblEquipmentOrganizationalVoList = iTblEquipmentOrganizationalService.queryList(organizationalBo);
+//            for(TblEquipmentSbookVo tblEquipmentSbookVo:tblEquipmentVoList){
+//                for(TblEquipmentOrganizationalVo tblEquipmentOrganizationalVo:tblEquipmentOrganizationalVoList){
+//                    if(tblEquipmentSbookVo.getEquipmentTreeId().longValue() == tblEquipmentOrganizationalVo.getId().longValue()){
+//                        tblEquipmentSbookVo.setDeptName(tblEquipmentOrganizationalVo.getName());
+//                    }
+//                }
+//            }
+//            obj.setRows(tblEquipmentVoList);
+//            return obj;
+//        }else{
+//            return null;
+//        }
+
+//    }
 }