diff --git a/ruoyi-admin/src/main/java/org/dromara/web/controller/app/EqDeviceController.java b/ruoyi-admin/src/main/java/org/dromara/web/controller/app/EqDeviceController.java index 525f6042e..fdb9915ef 100644 --- a/ruoyi-admin/src/main/java/org/dromara/web/controller/app/EqDeviceController.java +++ b/ruoyi-admin/src/main/java/org/dromara/web/controller/app/EqDeviceController.java @@ -59,7 +59,7 @@ public class EqDeviceController extends BaseController { - /** todo + /** * 添加设备 * @param bo 传参用户id 分布id 设备编码 * @return diff --git a/ruoyi-admin/src/main/java/org/dromara/web/controller/app/EqHomeController.java b/ruoyi-admin/src/main/java/org/dromara/web/controller/app/EqHomeController.java index 3bd634a5c..20c2cdd96 100644 --- a/ruoyi-admin/src/main/java/org/dromara/web/controller/app/EqHomeController.java +++ b/ruoyi-admin/src/main/java/org/dromara/web/controller/app/EqHomeController.java @@ -148,6 +148,11 @@ public class EqHomeController extends BaseController { } + /** + * 设备重排 + * @param bos + * @return + */ @PutMapping("/orderList") public R list(@RequestBody List bos){ return toAjax(eqEquipmentService.updateByBos(bos)); diff --git a/ruoyi-admin/src/main/java/org/dromara/web/domain/EqEquipment.java b/ruoyi-admin/src/main/java/org/dromara/web/domain/EqEquipment.java index 6642f2db0..b9e73dfe1 100644 --- a/ruoyi-admin/src/main/java/org/dromara/web/domain/EqEquipment.java +++ b/ruoyi-admin/src/main/java/org/dromara/web/domain/EqEquipment.java @@ -95,6 +95,6 @@ public class EqEquipment extends BaseEntity { /** * 排序 */ - private Integer order; + private Integer orderNum; } diff --git a/ruoyi-admin/src/main/java/org/dromara/web/domain/bo/EqEquipmentBo.java b/ruoyi-admin/src/main/java/org/dromara/web/domain/bo/EqEquipmentBo.java index 3782fd8ea..e0c6472c6 100644 --- a/ruoyi-admin/src/main/java/org/dromara/web/domain/bo/EqEquipmentBo.java +++ b/ruoyi-admin/src/main/java/org/dromara/web/domain/bo/EqEquipmentBo.java @@ -101,5 +101,5 @@ public class EqEquipmentBo extends BaseEntity { * 排序 */ @NotNull(message = "排序", groups = { AddGroup.class, EditGroup.class }) - private Integer order; + private Integer orderNum; } diff --git a/ruoyi-admin/src/main/java/org/dromara/web/domain/vo/EqEquipmentVo.java b/ruoyi-admin/src/main/java/org/dromara/web/domain/vo/EqEquipmentVo.java index 4653d016a..c3b8aae29 100644 --- a/ruoyi-admin/src/main/java/org/dromara/web/domain/vo/EqEquipmentVo.java +++ b/ruoyi-admin/src/main/java/org/dromara/web/domain/vo/EqEquipmentVo.java @@ -116,7 +116,7 @@ public class EqEquipmentVo implements Serializable { * 排序 */ @ExcelProperty(value = "排序") - private Integer order; + private Integer orderNum; } diff --git a/ruoyi-admin/src/main/java/org/dromara/web/service/impl/EqEquipmentServiceImpl.java b/ruoyi-admin/src/main/java/org/dromara/web/service/impl/EqEquipmentServiceImpl.java index 94ef440cd..a546070c8 100644 --- a/ruoyi-admin/src/main/java/org/dromara/web/service/impl/EqEquipmentServiceImpl.java +++ b/ruoyi-admin/src/main/java/org/dromara/web/service/impl/EqEquipmentServiceImpl.java @@ -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; }