opensource/RuoYi-Vue-Plus
2
0
Fork 1
mirror of https://gitee.com/dromara/RuoYi-Vue-Plus.git synced 2026-09-18 17:38:48 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

增加设备排序功能

Browse Source
This commit is contained in:
zhangzhicheng 2024-08-13 18:17:07 +08:00
parent 8711c51a90
commit e60614d2f3
6 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi-admin/src/main/java/org/dromara/web/controller/app/EqDeviceController.java
View File

@ -59,7 +59,7 @@ public class EqDeviceController extends BaseController {
/** todo
/**
* 添加设备
* @param bo 传参用户id 分布id 设备编码
* @return

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

@ -148,6 +148,11 @@ public class EqHomeController extends BaseController {
}
/**
* 设备重排
* @param bos
* @return
*/
@PutMapping("/orderList")
public R<Void> list(@RequestBody List<EqAppHomeBo> bos){
return toAjax(eqEquipmentService.updateByBos(bos));

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

@ -95,6 +95,6 @@ public class EqEquipment extends BaseEntity {
/**
* 排序
*/
private Integer order;
private Integer orderNum;
}

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

@ -101,5 +101,5 @@ public class EqEquipmentBo extends BaseEntity {
* 排序
*/
@NotNull(message = "排序", groups = { AddGroup.class, EditGroup.class })
private Integer order;
private Integer orderNum;
}

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

@ -116,7 +116,7 @@ public class EqEquipmentVo implements Serializable {
* 排序
*/
@ExcelProperty(value = "排序")
private Integer order;
private Integer orderNum;
}

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

@ -95,7 +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);
lqw.orderBy(true, true,EqEquipment::getOrderNum);
return lqw;
}