大气数据历史

zhanzhiqin

2022-06-15 10c4bb6cd7ca168872638d7630f3d885edd34500

大气数据历史

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

@@ -33,6 +33,7 @@
    LED_FILE_S_LIST("LED屏素材列表"),
    AIR_EQUIPMENT_LIST("大气设备列表"),
    AIR_DATA_LIST("大气数据列表"),
    AIR_DATA_LIST_HISTORY("大气数据历史"),
    AIR_EQUIPMENT_NONG_GENG_LIST("大气设备农耕列表"),
    AIR_DATA__NONG_GENG_LIST("大气数据农耕列表"),
    WATER_EQUIPMENT_LIST("水质设备列表"),

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

@@ -19,6 +19,8 @@
    List<AirDataBo> listAirDataByIds(List<Long> airIdList);

    String getCodeByPoleId(Long poleId ,Long clientId);

    List<AirDataBo> listAirDataHistory(String deviceMac);
}



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

@@ -80,4 +80,16 @@
        </if>

    </select>
    <select id="listAirDataHistory" resultType="com.sandu.ximon.dao.bo.AirDataBo">
        SELECT
        t1.*, t2.pole_id,
        t3.pole_name
        FROM
        air_data t1
        LEFT JOIN pole_binding t2 ON t1.device_mac = t2.device_code
        AND t2.device_type = 3
        LEFT JOIN pole t3 ON t3.id = t2.pole_id
        WHERE  t1.device_mac = #{deviceMac}
        ORDER BY t1.create_time DESC
    </select>
</mapper>

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

@@ -2,6 +2,7 @@

import com.sandu.common.domain.ResponseVO;
import com.sandu.common.object.BaseConditionVO;
import com.sandu.common.security.annotation.AnonymousAccess;
import com.sandu.common.util.ResponseUtil;
import com.sandu.common.util.SpringContextHolder;
import com.sandu.ximon.admin.manager.iot.amqp.processor.AirDataProcessor;
@@ -55,6 +56,21 @@
        return ResponseUtil.successPage(list);
    }

    /**
     * 查询大气数据历史
     *
     * @param deviceMac 设备号
     * @return
     */
    @GetMapping("/listAirDataOfDeviceCode")
    public ResponseVO<Object> listAirDataOfDeviceCode(BaseConditionVO baseConditionVO, @RequestParam(value = "deviceMac", required = false) String deviceMac) {
        if (!permissionConfig.check(MenuEnum.AIR_DATA_LIST_HISTORY.getCode())) {
            return ResponseUtil.fail("缺少对应用户权限");
        }
        List<AirDataBo> list = airDataService.listAirDataOfDeviceCode(baseConditionVO, deviceMac);
        return ResponseUtil.successPage(list);
    }

    @PostMapping("/updateAirEquipmentInfo")
    public ResponseVO<Object> updataAirEquipmentInfo(@RequestBody List<String> listMac) {
        if (!permissionConfig.check(MenuEnum.AIR_DATA_UPDATE.getCode())) {

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

@@ -2,19 +2,25 @@


import cn.hutool.core.collection.CollUtil;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.github.pagehelper.PageHelper;
import com.sandu.common.execption.BusinessException;
import com.sandu.common.object.BaseConditionVO;
import com.sandu.common.service.impl.BaseServiceImpl;
import com.sandu.common.util.ResUtils;
import com.sandu.common.util.SpringContextHolder;
import com.sandu.ximon.admin.manager.iot.frame.inner.report.A5AtmosphereHeartbeatReportInnerFrame;
import com.sandu.ximon.admin.manager.iot.rrpc.enums.AtmoFunctionCode;
import com.sandu.ximon.admin.security.SecurityUtils;
import com.sandu.ximon.admin.utils.RedisUtils;
import com.sandu.ximon.admin.utils.StringUtil;
import com.sandu.ximon.dao.bo.AirDataBo;
import com.sandu.ximon.dao.domain.AirData;
import com.sandu.ximon.dao.domain.AirEquipment;
import com.sandu.ximon.dao.domain.PoleBinding;
import com.sandu.ximon.dao.mapper.AirDataMapper;
import lombok.AllArgsConstructor;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;

@@ -72,6 +78,20 @@
    }

    /**
     * 查询大气设备历史数据
     */
    public List<AirDataBo> listAirDataOfDeviceCode(BaseConditionVO baseConditionVO, String deviceMac) {
        if (StringUtils.isEmpty(deviceMac)) {
            throw new BusinessException("设备号不能为空！");
        }
        PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
        List<AirDataBo> list = baseMapper.listAirDataHistory(deviceMac);

        return list;

    }

    /**
     * +
     * 根据灯杆id查询大气数据
     */