排序

liuhaonan

2022-05-27 f04802851ffecf0e85b30f4ea7b73da5fbdbf188

 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);
        }

        //没有数据时候直接返回空数组
@@ -268,6 +299,11 @@
     *                     //     * @param validateCode 设备验证码，设备机身上的六位大写字母
     */
    public boolean addYSYMonitor(String deviceSerial, String validateCode) {
        List<Monitor> list = list(Wrappers.lambdaQuery(Monitor.class).eq(Monitor::getDeviceSerial, deviceSerial));
        if (list.size() != 0) {
            throw new BusinessException("该摄像头已存在，无法重复添加！");
        }

        Map<String, Object> paramMap = new HashMap<>();
        paramMap.put("accessToken", getAccessToken());
        paramMap.put("deviceSerial", deviceSerial);
@@ -275,34 +311,45 @@
            paramMap.put("validateCode", validateCode);
        }
        String s = HttpUtil.post(YSY_URL + ADD_DEVICE_URL, paramMap);
        if (!s.startsWith("{") && !s.endsWith("}")) {
            throw new BusinessException("萤石云数据异常");
        }

        YSY_MonitorDto monitorDto = JSON.parseObject(s, YSY_MonitorDto.class);

        boolean result;
        if ("200".equals(monitorDto.getCode()) || "20017".equals(monitorDto.getCode())) {
            Monitor monitor = new Monitor();
            monitor.setDeviceSerial(monitorDto.getData().getDeviceSerial());
            monitor.setDevicesCode(validateCode);
            monitor.setDeviceName(monitorDto.getData().getDeviceName());
            monitor.setEquipmentState(monitorDto.getData().getStatus());
            monitor.setIsEncrypt(monitorDto.getData().getIsEncrypt());
            monitor.setDeviceType(monitorDto.getData().getModel());
            monitor.setNetAddress(monitorDto.getData().getNetAddress());
            result = addMonitorInfoToTable(monitor);
        if ("20017".equals(monitorDto.getCode())) {
            //当前摄像头已经被萤石云官网添加过,Code:20017
            monitorDto = getYSYMonitorInfo(getAccessToken(), deviceSerial);

            /**
             * 新增摄像头开始
             */
            String content = "{摄像头Code：" + monitor.getDeviceSerial() + "， 摄像头名称：" + monitor.getDeviceName() + " }";
            List<String> listCode = new ArrayList<>();
            listCode.add(monitor.getDeviceSerial());
            StoreOperationRecordsUtils.storeOperationData(listCode, null, "新增摄像头", content);
            /**
             * 新增摄像头结束
             */

        } else {
            result = false;
        } else if (!"200".equals(monitorDto.getCode())) {
            //当前摄像头成功被萤石云官网添加,Code:200
            throw new BusinessException(monitorDto.getMsg());
        }

        if (monitorDto.getData() == null) {
            throw new BusinessException("萤石云数据异常！");
        }
        Monitor monitor = new Monitor();
        monitor.setDeviceSerial(monitorDto.getData().getDeviceSerial());
        monitor.setDevicesCode(validateCode);
        monitor.setDeviceName(monitorDto.getData().getDeviceName());
        monitor.setEquipmentState(monitorDto.getData().getStatus());
        monitor.setIsEncrypt(monitorDto.getData().getIsEncrypt());
        monitor.setDeviceType(monitorDto.getData().getModel());
        monitor.setNetAddress(monitorDto.getData().getNetAddress());
        result = addMonitorInfoToTable(monitor);

        /**
         * 新增摄像头开始
         */
        String content = "{摄像头Code：" + monitor.getDeviceSerial() + "， 摄像头名称：" + monitor.getDeviceName() + " }";
        List<String> listCode = new ArrayList<>();
        listCode.add(monitor.getDeviceSerial());
        StoreOperationRecordsUtils.storeOperationData(listCode, null, "新增摄像头", content);
        /**
         * 新增摄像头结束
         */
        return result;
    }

@@ -435,8 +482,8 @@
            /**
             * 添加摄像头备注日志记录开始
             */
            String content = "编辑摄像头：" +deviceSerial+"编辑内容："+notes;
            List<String> list  = new ArrayList<>();
            String content = "编辑摄像头：" + deviceSerial + "编辑内容：" + notes;
            List<String> list = new ArrayList<>();
            list.add(deviceSerial);
            StoreOperationRecordsUtils.storeOperationData(list, null, "编辑摄像头", content);
            /**