排序

liuhaonan

2022-05-27 f04802851ffecf0e85b30f4ea7b73da5fbdbf188

排序

 dao/src/main/java/com/sandu/ximon/dao/enums/OrderByEnums.java

@@ -15,6 +15,33 @@
    //登录时间
    ADMIN_LOGIN_TIME("login_time"),


    /**
     * 摄像头列表
     */
    //灯杆名称
    MONITOR_POLE_NAME("t3.pole_name"),
    //添加时间
    MONITOR_CREATE_TIME("t1.update_time"),



    /**
     * IP音柱列表
     */
    //id
    IP_VOLUME_ID("id"),
    //终端名称
    IP_VOLUME_NAME("t1.terminal_name"),
    //绑定灯杆名称
    IP_VOLUME_POLE_NAME("t3.pole_name"),

    /**
     * 音柱任务列表
     */
    //创建时间
    IP_VOLUME_MISSION_CREATE_TIME("create_time"),

    /**
     * 音柱素材列表
     */
@@ -22,6 +49,8 @@
    IP_VOLUME_FILE_CREATE_TIME("create_time"),




    /**
     * 排序方式
     */

 dao/src/main/java/com/sandu/ximon/dao/mapper/MonitorMapper.java

@@ -12,7 +12,7 @@

    List<MonitorBo> listMonitorByIds(List<String> list, int equipmentState);

    List<MonitorBo> listMonitorDeviceSerial1(Long userid, String keyword, int bindingState);
    List<MonitorBo> listMonitorDeviceSerial1(Long userid, String keyword, int bindingState,String orderBy);
}



 dao/src/main/resources/mapper/MonitorMapper.xml

@@ -63,6 +63,9 @@
                AND t1.binding_state = #{bindingState}
            </if>
        </where>
        <if test="orderBy!=null ">
            ORDER BY ${orderBy}
        </if>
    </select>

</mapper>

 ximon-admin/src/main/java/com/sandu/ximon/admin/controller/GetListOnBindingController.java

@@ -7,21 +7,12 @@
import com.sandu.common.util.SpringContextHolder;
import com.sandu.ximon.admin.param.BroadcastTerminalV2Param;
import com.sandu.ximon.admin.security.SecurityUtils;
import com.sandu.ximon.admin.service.ClientService;
import com.sandu.ximon.admin.service.LedPlayerEntityService;
import com.sandu.ximon.admin.service.LedSFileService;
import com.sandu.ximon.dao.bo.LightBo;
import com.sandu.ximon.admin.service.*;
import com.sandu.ximon.dao.bo.BroadcastTerminalV2EntityBo;
import com.sandu.ximon.dao.bo.LightBo;
import com.sandu.ximon.dao.bo.MonitorBo;
import com.sandu.ximon.dao.domain.Client;
import com.sandu.ximon.dao.domain.LedPlayerEntity;
import com.sandu.ximon.dao.domain.LedSFile;
import com.sandu.ximon.dao.domain.Pole;
import com.sandu.ximon.dao.domain.*;
import com.sandu.ximon.dao.mapper.LightMapper;
import com.sandu.ximon.dao.domain.IpVolumeFile;
import com.sandu.ximon.dao.domain.LEDProgram;
import com.sandu.ximon.dao.domain.PoleLightemitEntity;
import com.sandu.ximon.dao.mapper.MonitorMapper;
import com.sandu.ximon.dao.mapper.PoleMapper;
import lombok.AllArgsConstructor;
@@ -220,9 +211,9 @@
        List<MonitorBo> monitorBos;
        //超管
        if (SecurityUtils.getClientId() == null) {
            monitorBos = monitorMapper.listMonitorDeviceSerial1(null, null, 2);
            monitorBos = monitorMapper.listMonitorDeviceSerial1(null, null, 2,null);
        } else {
            monitorBos = monitorMapper.listMonitorDeviceSerial1(SecurityUtils.getUserId(), null, 2);
            monitorBos = monitorMapper.listMonitorDeviceSerial1(SecurityUtils.getUserId(), null, 2,null);
        }
        List<Map> mapList = new ArrayList<>();
        Map map;
@@ -250,7 +241,7 @@
        param.setBindingState(2);
        param.setKeyword(null);
        param.setWorkState(2);
        List<BroadcastTerminalV2EntityBo> broadcastTerminalList = ipVolumeService.getBroadcastTerminalList(null, param);
        List<BroadcastTerminalV2EntityBo> broadcastTerminalList = ipVolumeService.getBroadcastTerminalList(null, null, null, param);
        List<Map> mapList = new ArrayList<>();
        Map map;
        for (BroadcastTerminalV2EntityBo bean : broadcastTerminalList) {

 ximon-admin/src/main/java/com/sandu/ximon/admin/controller/MonitorController.java

@@ -32,7 +32,10 @@
     * @return
     */
    @PostMapping("/listMonitor")
    public ResponseVO<Object> listMonitorByKeyword(BaseConditionVO baseConditionVO, @RequestBody(required = false) MonitorParam monitorParam) {
    public ResponseVO<Object> listMonitorByKeyword(BaseConditionVO baseConditionVO,
                                                   @RequestParam(value = "order", required = false) Integer order,
                                                   @RequestParam(value = "seq", required = false) Integer seq,
                                                   @RequestBody(required = false) MonitorParam monitorParam) {
        if (!permissionConfig.check(MenuEnum.MONITOR_LIST.getCode())) {
            return ResponseUtil.fail("缺少对应用户权限");
        }
@@ -40,9 +43,9 @@
        //返回查询的摄像头信息列表
        CommonPage commonPage;
        if (monitorParam == null) {
            commonPage = monitorService.listMonitorByKeyword(baseConditionVO, new MonitorParam());
            commonPage = monitorService.listMonitorByKeyword(baseConditionVO,order,seq, new MonitorParam());
        } else {
            commonPage = monitorService.listMonitorByKeyword(baseConditionVO, monitorParam);
            commonPage = monitorService.listMonitorByKeyword(baseConditionVO,order,seq, monitorParam);
        }

        return ResponseUtil.success(commonPage);

 ximon-admin/src/main/java/com/sandu/ximon/admin/service/IpVolumeMissionService.java

@@ -20,6 +20,7 @@
import com.sandu.ximon.dao.domain.BroadcastV2TaskTerminal;
import com.sandu.ximon.dao.domain.IpVolumeFile;
import com.sandu.ximon.dao.domain.IpVolumeMission;
import com.sandu.ximon.dao.enums.OrderByEnums;
import com.sandu.ximon.dao.mapper.IpVolumeMissionMapper;
import lombok.AllArgsConstructor;
import org.springframework.beans.BeanUtils;
@@ -369,7 +370,7 @@


        //排序字段
        String orderByResult = "create_time";
        String orderByResult = OrderByEnums.IP_VOLUME_ID.getCode();
        //正序、倒叙
        String orderBySeq = "ASC";
        if (order != null) {

 ximon-admin/src/main/java/com/sandu/ximon/admin/service/IpVolumeService.java

@@ -14,6 +14,7 @@
import com.sandu.ximon.admin.vo.TerminalVO;
import com.sandu.ximon.dao.bo.BroadcastTerminalV2EntityBo;
import com.sandu.ximon.dao.domain.BroadcastTerminalV2Entity;
import com.sandu.ximon.dao.enums.OrderByEnums;
import com.sandu.ximon.dao.enums.PoleBindingEnums;
import com.sandu.ximon.dao.mapper.IPBroadcastMapper;
import org.springframework.beans.factory.annotation.Autowired;
@@ -70,17 +71,20 @@
        if (broadcastTerminalV2Param == null) {
            broadcastTerminalV2Param = new BroadcastTerminalV2Param();
        }

        //排序字段
        String orderByResult = "id";
        String orderByResult = OrderByEnums.IP_VOLUME_ID.getCode();
        //正序、倒叙
        String orderBySeq = "ASC";
        String orderBySeq = OrderByEnums.ASC.getCode();
        if (order != null) {
            switch (order) {
                case 1:
                    orderByResult = "create_time";
                    orderByResult = OrderByEnums.IP_VOLUME_ID.getCode();
                    break;
                case 2:
                    orderByResult = "create_time";
                    orderByResult = OrderByEnums.IP_VOLUME_NAME.getCode();
                case 3:
                    orderByResult = OrderByEnums.IP_VOLUME_POLE_NAME.getCode();
                default:
            }
        }
@@ -96,11 +100,12 @@
                    break;
            }
        }

        //排序方式
        String orderBy = orderByResult + " " + orderBySeq;

        //在线状态全部的话需要分页
        if (baseConditionVO != null && 2 == broadcastTerminalV2Param.getWorkState()) {
            PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
            PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize(), orderBy);
        }

        List<BroadcastTerminalV2EntityBo> broadcastTerminalV2EntityBos;

 ximon-admin/src/main/java/com/sandu/ximon/admin/service/MonitorService.java

@@ -19,6 +19,7 @@
import com.sandu.ximon.dao.bo.MonitorBo;
import com.sandu.ximon.dao.domain.Monitor;
import com.sandu.ximon.dao.domain.PoleBinding;
import com.sandu.ximon.dao.enums.OrderByEnums;
import com.sandu.ximon.dao.enums.PoleBindingEnums;
import com.sandu.ximon.dao.mapper.MonitorMapper;
import lombok.AllArgsConstructor;
@@ -58,17 +59,47 @@
    /**
     * 模糊查询
     */
    public CommonPage listMonitorByKeyword(BaseConditionVO baseConditionVO, MonitorParam monitorParam) {
    public CommonPage listMonitorByKeyword(BaseConditionVO baseConditionVO,Integer order,Integer seq, MonitorParam monitorParam) {
        //绑定状态：已绑定/未绑定/全部
        if (monitorParam.getBindingState() == null) {
            //全部
            monitorParam.setBindingState(2);
        }
        //排序字段
        String orderByResult = "id";
        //正序、倒叙
        String orderBySeq =OrderByEnums.ASC.getCode();
        if (order != null) {
            switch (order) {
                case 1:
                    orderByResult = OrderByEnums.MONITOR_POLE_NAME.getCode();
                    break;
                case 2:
                    orderByResult = OrderByEnums.MONITOR_CREATE_TIME.getCode();
                    break;
                default:
            }
        }
        if (seq != null) {
            switch (seq) {
                case 1:
                    orderBySeq = " ASC";
                    break;
                case 2:
                    orderBySeq = " DESC";
                    break;
                default:
                    break;
            }
        }
        //排序方式
        String orderBy = orderByResult + " " + orderBySeq;

        List<MonitorBo> list;
        if (SecurityUtils.getClientId() == null) {
            list = monitorMapper.listMonitorDeviceSerial1(null, monitorParam.getKeyword(), monitorParam.getBindingState());
            list = monitorMapper.listMonitorDeviceSerial1(null, monitorParam.getKeyword(), monitorParam.getBindingState(),orderBy);
        } else {
            list = monitorMapper.listMonitorDeviceSerial1(SecurityUtils.getUserId(), monitorParam.getKeyword(), monitorParam.getBindingState());
            list = monitorMapper.listMonitorDeviceSerial1(SecurityUtils.getUserId(), monitorParam.getKeyword(), monitorParam.getBindingState(),orderBy);
        }

        //没有数据时候直接返回空数组

 ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleService.java

@@ -188,7 +188,7 @@
        BroadcastTerminalV2Param broadcastTerminalV2Param = new BroadcastTerminalV2Param();
        broadcastTerminalV2Param.setBindingState(2);
        broadcastTerminalV2Param.setWorkState(2);
        List<BroadcastTerminalV2EntityBo> broadcastTerminalList = SpringContextHolder.getBean(IpVolumeService.class).getBroadcastTerminalList(null, broadcastTerminalV2Param);
        List<BroadcastTerminalV2EntityBo> broadcastTerminalList = SpringContextHolder.getBean(IpVolumeService.class).getBroadcastTerminalList(null, null, null, broadcastTerminalV2Param);
        for (BroadcastTerminalV2EntityBo bean : broadcastTerminalList) {
            if (bean.getStatus() == 1 || bean.getStatus() == 0) {
                number++;
@@ -202,9 +202,9 @@
        MonitorParam monitorParam = new MonitorParam();
        monitorParam.setEquipmentState(2);
        monitorParam.setBindingState(2);
        List<MonitorBo> monitorBos = SpringContextHolder.getBean(MonitorService.class).listMonitorByKeyword(null, monitorParam).getList();
        List<MonitorBo> monitorBos = SpringContextHolder.getBean(MonitorService.class).listMonitorByKeyword(null,null,null, monitorParam).getList();
        monitorParam.setEquipmentState(1);
        List<MonitorBo> online = SpringContextHolder.getBean(MonitorService.class).listMonitorByKeyword(null, monitorParam).getList();
        List<MonitorBo> online = SpringContextHolder.getBean(MonitorService.class).listMonitorByKeyword(null,null,null, monitorParam).getList();
        result.put("monitorOnlineCount", online.size());
        result.put("monitorTotalCount", monitorBos.size());