Browse Source

根据上下班时间来给盒子发送是否开启/关闭算法

tjf 2 days ago
parent
commit
576ba32b4f

+ 1 - 1
ruoyi-admin/src/main/java/com/ruoyi/web/controller/manage/EquipmentManageController.java

@@ -44,7 +44,7 @@ public class EquipmentManageController extends BaseController {
     @PreAuthorize("@ss.hasPermi('manage:equipmentManage:listNoPage')")
     @GetMapping("/listNoPage")
     public TableDataInfo listNoPage(EquipmentManage equipmentManage) {
-        List<EquipmentManage> list = equipmentManageService.selectEquipmentManageList(equipmentManage);
+        List<EquipmentManage> list = equipmentManageService.selectEquipmentManageListTree(equipmentManage);
         return getDataTable(list);
     }
 

+ 0 - 1
ruoyi-system/src/main/resources/mapper/manage/EquipmentManageMapper.xml

@@ -105,7 +105,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         c.account,c.password,c.protocol_type, c.channel_details
         from equipment_manage e left join channel_number c on e.equipment_id = c.equipment_id
         <where>
-                e.del_flag = '0' and c.del_flag = '0'
             <if test="equipmentName != null  and equipmentName != ''">and e.equipment_name like concat('%',
                 #{equipmentName}, '%')
             </if>