接口优化

ruoyi-admin/src/main/java/org/dromara/web/controller/app/EqHomeController.java

@@ -137,7 +137,7 @@ public class EqHomeController extends BaseController {
     /**
      * 首页查看设备列表
      */
-    @GetMapping("/list")
+    @PostMapping("/list")
     public TableDataInfo<EqEquipmentVo> list(EqAppHomeBo bo, PageQuery pageQuery){
         //当前用户为家庭主体 切换用户后需要传输用户id
         if (bo.getUserId() == null) bo.setUserId(LoginHelper.getUserId());
@@ -147,6 +147,12 @@ public class EqHomeController extends BaseController {
         return eqEquipmentService.queryPageList(eqEquipmentBo, pageQuery); //在设备表中增加了分布id
     }
 
+
+    @PutMapping("/orderList")
+    public R<Void> list(@RequestBody List<EqAppHomeBo> bos){
+        return toAjax(eqEquipmentService.updateByBos(bos));
+    }
+
     /**
      * 设备详情 (暂时无用)
      * 传参 设备id

ruoyi-admin/src/main/java/org/dromara/web/domain/EqEquipment.java

@@ -92,5 +92,9 @@ public class EqEquipment extends BaseEntity {
      */
     private Long operationCount;
 
+    /**
+     * 排序
+     */
+    private Integer order;
 
 }

ruoyi-admin/src/main/java/org/dromara/web/domain/bo/EqEquipmentBo.java

@@ -97,5 +97,9 @@ public class EqEquipmentBo extends BaseEntity {
     @NotNull(message = "操作次数不能为空", groups = { AddGroup.class, EditGroup.class })
     private Long operationCount;
 
-
+    /**
+     * 排序
+     */
+    @NotNull(message = "排序", groups = { AddGroup.class, EditGroup.class })
+    private Integer order;
 }

ruoyi-admin/src/main/java/org/dromara/web/domain/vo/EqEquipmentVo.java

@@ -80,7 +80,7 @@ public class EqEquipmentVo implements Serializable {
     private String equipmentName;
 
     /**
-     * 设备状态
+     * 开合度状态 0 10 20 30 40 50 60 70 80 90 100
      */
     @ExcelProperty(value = "设备状态", converter = ExcelDictConvert.class)
     @ExcelDictFormat(dictType = "eq_status_type")
@@ -112,5 +112,11 @@ public class EqEquipmentVo implements Serializable {
     @ExcelProperty(value = "操作次数")
     private Long operationCount;
 
+    /**
+     * 排序
+     */
+    @ExcelProperty(value = "排序")
+    private Integer order;
+
 
 }

ruoyi-admin/src/main/java/org/dromara/web/service/IEqEquipmentService.java

@@ -82,5 +82,17 @@ public interface IEqEquipmentService {
      */
     EqEquipmentDetailVo getDeviceMsg(EqAppHomeBo bo);
 
+    /**
+     * 绑定设备
+     * @param bo
+     * @return
+     */
     Boolean bindDevice(EqAppHomeBo bo);
+
+    /**
+     * 批量更新
+     * @param bos
+     * @return
+     */
+    boolean updateByBos(List<EqAppHomeBo> bos);
 }

ruoyi-admin/src/main/java/org/dromara/web/service/impl/EqEquipmentServiceImpl.java

@@ -27,10 +27,7 @@ import org.dromara.web.domain.EqEquipment;
 import org.dromara.web.mapper.EqEquipmentMapper;
 import org.dromara.web.service.IEqEquipmentService;
 
-import java.util.Date;
+import java.util.*;
-import java.util.List;
-import java.util.Map;
-import java.util.Collection;
 
 /**
  * 设备信息Service业务层处理
@@ -98,6 +95,7 @@ public class EqEquipmentServiceImpl implements IEqEquipmentService {
         lqw.eq(bo.getStatus() != null, EqEquipment::getStatus, bo.getStatus());
         lqw.eq(bo.getFaultStatus() != null, EqEquipment::getFaultStatus, bo.getFaultStatus());
         lqw.eq(bo.getLineStatus() != null, EqEquipment::getLineStatus, bo.getLineStatus());
+        lqw.orderBy(true, true,EqEquipment::getOrder);
         return lqw;
     }
 
@@ -270,6 +268,15 @@ public class EqEquipmentServiceImpl implements IEqEquipmentService {
         return true;
     }
 
+    @Override
+    public boolean updateByBos(List<EqAppHomeBo> bos) {
+        List<EqEquipment> eqEquipments = new ArrayList<>();
+        for (EqAppHomeBo bo : bos) {
+            EqEquipment update = MapstructUtils.convert(bo, EqEquipment.class);
+            eqEquipments.add(update);
+        }
+        return baseMapper.updateBatchById(eqEquipments);
+    }
 
 
 }