设备台账修改

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

@@ -4,6 +4,9 @@ import java.util.List;
 import java.util.Arrays;
 import java.util.concurrent.TimeUnit;
 
+import com.ruoyi.data.domain.TblEquipmentSbook;
+import com.ruoyi.data.domain.bo.TblEquipmentBo;
+import com.ruoyi.data.domain.vo.TblEquipmentVo;
 import lombok.RequiredArgsConstructor;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.constraints.*;
@@ -105,4 +108,16 @@ public class TblEquipmentSbookController extends BaseController {
                           @PathVariable Long[] ids) {
         return toAjax(iTblEquipmentSbookService.deleteWithValidByIds(Arrays.asList(ids), true));
     }
+
+    /**
+     * 根据网关查询所有设备列表
+     */
+    @SaCheckPermission("data:equipmentSbook:list")
+    @GetMapping("/alllist")
+    public TableDataInfo<TblEquipmentSbookVo> alllist(TblEquipmentSbookBo bo) {
+        TableDataInfo<TblEquipmentSbookVo> obj= new TableDataInfo<>();
+        List<TblEquipmentSbookVo> tblEquipmentVoList = iTblEquipmentSbookService.queryList(bo);
+        obj.setRows(tblEquipmentVoList);
+        return obj;
+    }
 }

ruoyi-system/src/main/java/com/ruoyi/data/domain/TblEquipmentSbook.java

@@ -25,7 +25,7 @@ public class TblEquipmentSbook extends BaseEntity {
     private static final long serialVersionUID=1L;
 
     /**
-     * 
+     *
      */
     @TableId(value = "id")
     private Long id;
@@ -76,7 +76,7 @@ public class TblEquipmentSbook extends BaseEntity {
     /**
      * 关联设备id
      */
-    private String deviceId;
+    private Long gatewayId;
     /**
      * 标签
      */
@@ -126,11 +126,11 @@ public class TblEquipmentSbook extends BaseEntity {
      */
     private String remark;
     /**
-     * 
+     *
      */
     private String expr1;
     /**
-     * 
+     *
      */
     private String expr2;
 

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

@@ -99,7 +99,7 @@ public class TblEquipmentSbookBo extends BaseEntity {
      * 关联设备id
      */
 //    @NotBlank(message = "关联设备id不能为空", groups = { AddGroup.class, EditGroup.class })
-    private String deviceId;
+    private Long gatewayId;
 
     /**
      * 标签

ruoyi-system/src/main/java/com/ruoyi/data/domain/vo/TblEquipmentSbookVo.java

@@ -24,7 +24,7 @@ public class TblEquipmentSbookVo implements Serializable {
     private static final long serialVersionUID = 1L;
 
     /**
-     * 
+     *
      */
     @ExcelProperty(value = "")
     private Long id;
@@ -98,8 +98,8 @@ public class TblEquipmentSbookVo implements Serializable {
     /**
      * 关联设备id
      */
-    @ExcelProperty(value = "关联设备id")
-    private String deviceId;
+    @ExcelProperty(value = "网关设备id")
+    private Long gatewayId;
 
     /**
      * 标签
@@ -174,13 +174,13 @@ public class TblEquipmentSbookVo implements Serializable {
     private String remark;
 
     /**
-     * 
+     *
      */
     @ExcelProperty(value = "")
     private String expr1;
 
     /**
-     * 
+     *
      */
     @ExcelProperty(value = "")
     private String expr2;

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

@@ -72,7 +72,7 @@ public class TblEquipmentSbookServiceImpl implements ITblEquipmentSbookService {
         lqw.eq(StringUtils.isNotBlank(bo.getPersonInCharge()), TblEquipmentSbook::getPersonInCharge, bo.getPersonInCharge());
         lqw.eq(bo.getInstallationDate() != null, TblEquipmentSbook::getInstallationDate, bo.getInstallationDate());
         lqw.eq(StringUtils.isNotBlank(bo.getAddress()), TblEquipmentSbook::getAddress, bo.getAddress());
-        lqw.eq(StringUtils.isNotBlank(bo.getDeviceId()), TblEquipmentSbook::getDeviceId, bo.getDeviceId());
+        lqw.eq(bo.getGatewayId() != null, TblEquipmentSbook::getGatewayId, bo.getGatewayId());
         lqw.eq(StringUtils.isNotBlank(bo.getTagids()), TblEquipmentSbook::getTagids, bo.getTagids());
         lqw.eq(StringUtils.isNotBlank(bo.getStatus()), TblEquipmentSbook::getStatus, bo.getStatus());
         lqw.eq(bo.getEndOfWarrantyPeriod() != null, TblEquipmentSbook::getEndOfWarrantyPeriod, bo.getEndOfWarrantyPeriod());