dao/src/main/resources/mapper/AirDataNongGengMapper.xml
@@ -5,33 +5,34 @@ <mapper namespace="com.sandu.ximon.dao.mapper.AirDataNongGengMapper"> <resultMap id="BaseResultMap" type="com.sandu.ximon.dao.domain.AirDataNongGeng"> <id property="id" column="id" jdbcType="BIGINT"/> <result property="mac" column="mac" jdbcType="VARCHAR"/> <result property="noise" column="noise" jdbcType="VARCHAR"/> <result property="hydrogenSulfide" column="hydrogen_sulfide" jdbcType="VARCHAR"/> <result property="so2" column="so2" jdbcType="VARCHAR"/> <result property="no2" column="no2" jdbcType="VARCHAR"/> <result property="co" column="co" jdbcType="VARCHAR"/> <result property="o3" column="o3" jdbcType="VARCHAR"/> <result property="pm2point5" column="pm2point5" jdbcType="VARCHAR"/> <result property="pm10" column="pm10" jdbcType="VARCHAR"/> <result property="airTemperature" column="air_temperature" jdbcType="VARCHAR"/> <result property="airHumidity" column="air_humidity" jdbcType="VARCHAR"/> <result property="airPressure" column="air_pressure" jdbcType="VARCHAR"/> <result property="windDirection" column="wind_direction" jdbcType="VARCHAR"/> <result property="windSpeed" column="wind_speed" jdbcType="VARCHAR"/> <result property="tenRainfallMin" column="ten_rainfall_min" jdbcType="VARCHAR"/> <result property="radiation" column="radiation" jdbcType="VARCHAR"/> <result property="illumination" column="illumination" jdbcType="VARCHAR"/> <result property="ultraviolet" column="ultraviolet" jdbcType="VARCHAR"/> <result property="co2" column="co2" jdbcType="VARCHAR"/> <result property="o2" column="o2" jdbcType="VARCHAR"/> <result property="type" column="type" jdbcType="VARCHAR"/> <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/> <id property="id" column="id" jdbcType="BIGINT"/> <result property="mac" column="mac" jdbcType="VARCHAR"/> <result property="noise" column="noise" jdbcType="VARCHAR"/> <result property="hydrogenSulfide" column="hydrogen_sulfide" jdbcType="VARCHAR"/> <result property="so2" column="so2" jdbcType="VARCHAR"/> <result property="no2" column="no2" jdbcType="VARCHAR"/> <result property="co" column="co" jdbcType="VARCHAR"/> <result property="o3" column="o3" jdbcType="VARCHAR"/> <result property="pm2point5" column="pm2point5" jdbcType="VARCHAR"/> <result property="pm10" column="pm10" jdbcType="VARCHAR"/> <result property="airTemperature" column="air_temperature" jdbcType="VARCHAR"/> <result property="airHumidity" column="air_humidity" jdbcType="VARCHAR"/> <result property="airPressure" column="air_pressure" jdbcType="VARCHAR"/> <result property="windDirection" column="wind_direction" jdbcType="VARCHAR"/> <result property="windSpeed" column="wind_speed" jdbcType="VARCHAR"/> <result property="tenRainfallMin" column="ten_rainfall_min" jdbcType="VARCHAR"/> <result property="radiation" column="radiation" jdbcType="VARCHAR"/> <result property="illumination" column="illumination" jdbcType="VARCHAR"/> <result property="ultraviolet" column="ultraviolet" jdbcType="VARCHAR"/> <result property="co2" column="co2" jdbcType="VARCHAR"/> <result property="o2" column="o2" jdbcType="VARCHAR"/> <result property="type" column="type" jdbcType="VARCHAR"/> <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/> </resultMap> <sql id="Base_Column_List"> id,mac,noise, id ,mac,noise, hydrogen_sulfide,so2,no2, co,o3,pm2point5, pm10,air_temperature,air_humidity, @@ -51,6 +52,7 @@ LEFT JOIN pole t3 ON t3.id = t2.pole_id </if> <where> 1=1 <if test="keyword != null and keyword != ''"> AND t3.pole_name LIKE CONCAT(CONCAT('%', #{keyword}), '%') </if> dao/src/main/resources/mapper/LightReportErrorMapper.xml
@@ -53,7 +53,7 @@ LEFT JOIN pole t3 ON t1.device_code = t3.device_code WHERE <if test="userid != null"> t3.client_id = #{userId} OR t3.user_id = #{userId} t3.client_id = #{userId} OR t3.user_id = #{userId} AND </if> t1.light_report_error_id IN ( SELECT t.max_id FROM ( SELECT Max( light_report_error.light_report_error_id ) AS max_id FROM light_report_error GROUP BY light_report_error.device_code ) AS t ) ximon-admin/src/main/java/com/sandu/ximon/admin/controller/AirDataNongGengController.java
@@ -5,11 +5,21 @@ * @date 2022/4/24 17:36 */ import com.sandu.common.domain.ResponseVO; import com.sandu.common.object.BaseConditionVO; import com.sandu.common.util.ResponseUtil; import com.sandu.ximon.admin.security.PermissionConfig; import com.sandu.ximon.admin.service.AirDataNongGengService; import com.sandu.ximon.dao.bo.AirDataNongGengBo; import com.sandu.ximon.dao.enums.MenuEnum; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; import java.util.List; /** @@ -31,12 +41,12 @@ * @param keyword 关键字 * @return */ // @GetMapping("/listAirData") // public ResponseVO<Object> listAirDataByKeyword(BaseConditionVO baseConditionVO, @RequestParam(value = "keyword", required = false) String keyword) { // if (!permissionConfig.check(MenuEnum.AIR_DATA__NONG_GENG_LIST.getCode())) { // return ResponseUtil.fail("缺少对应用户权限"); // } // List<AirDataNongGengBo> list = airDataNongGengService.listAirDataByKeyword(baseConditionVO, keyword); // return ResponseUtil.successPage(list); // } @GetMapping("/listAirData") public ResponseVO<Object> listAirDataByKeyword(BaseConditionVO baseConditionVO, @RequestParam(value = "keyword", required = false) String keyword) { if (!permissionConfig.check(MenuEnum.AIR_DATA__NONG_GENG_LIST.getCode())) { return ResponseUtil.fail("缺少对应用户权限"); } List<AirDataNongGengBo> list = airDataNongGengService.listAirDataByKeyword(baseConditionVO, keyword); return ResponseUtil.successPage(list); } } ximon-admin/src/main/java/com/sandu/ximon/admin/controller/AirEquipmentNongGengController.java
@@ -37,7 +37,7 @@ return ResponseUtil.fail("缺少对应用户权限"); } List<AirEquipmentNongGengBo> list = airEquipmentNongGengService.listAirEquipmentByKeyword(baseConditionVO, keyword); return ResponseUtil.successPage(list); return ResponseUtil.success(list); } @PostMapping("/delete/{id}") ximon-admin/src/main/java/com/sandu/ximon/admin/service/AirDataNongGengService.java
@@ -1,15 +1,21 @@ package com.sandu.ximon.admin.service; import cn.hutool.core.collection.CollUtil; import com.github.pagehelper.PageHelper; import com.sandu.common.object.BaseConditionVO; import com.sandu.common.service.impl.BaseServiceImpl; import com.sandu.ximon.admin.manager.iot.frame.inner.report.A5AtmosphereNewHeartbeatReportInnerFrame; 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.dao.bo.AirDataNongGengBo; import com.sandu.ximon.dao.domain.AirDataNongGeng; import com.sandu.ximon.dao.domain.AirEquipmentNongGeng; import com.sandu.ximon.dao.mapper.AirDataNongGengMapper; import lombok.AllArgsConstructor; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import java.util.List; /** * 大气数据，农耕硬件 @@ -86,23 +92,23 @@ } // // /** // * 查询大气数据(模糊查询) // */ // public List<AirDataNongGengBo> listAirDataByKeyword(BaseConditionVO baseConditionVO, String keyword) { // PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize()); // List<Long> listAirId; // if (SecurityUtils.getClientId() == null) { // listAirId = baseMapper.listAirId(keyword, null); // } else { // listAirId = baseMapper.listAirId(keyword, SecurityUtils.getUserId()); // } // if (CollUtil.isEmpty(listAirId)) { // return CollUtil.newArrayList(); // } // List<AirDataNongGengBo> airDataBos = baseMapper.listAirDataByIds(listAirId); // return airDataBos; // // } /** * 查询大气数据(模糊查询) */ public List<AirDataNongGengBo> listAirDataByKeyword(BaseConditionVO baseConditionVO, String keyword) { PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize()); List<Long> listAirId; if (SecurityUtils.getClientId() == null) { listAirId = baseMapper.listAirId(keyword, null); } else { listAirId = baseMapper.listAirId(keyword, SecurityUtils.getUserId()); } if (CollUtil.isEmpty(listAirId)) { return CollUtil.newArrayList(); } List<AirDataNongGengBo> airDataBos = baseMapper.listAirDataByIds(listAirId); return airDataBos; } } ximon-admin/src/main/java/com/sandu/ximon/admin/service/AirEquipmentNongGengService.java
@@ -75,14 +75,8 @@ airEquipmentBos = airEquipmentNongGengMapper.listAirEquipmentByIds(keyword, SecurityUtils.getUserId()); } if (SecurityUtils.getClientId() == null) { airEquipmentBos = airEquipmentNongGengMapper.listAirEquipmentByIds(keyword, null); } else { airEquipmentBos = airEquipmentNongGengMapper.listAirEquipmentByIds(keyword, SecurityUtils.getUserId()); } return null; // return airEquipmentBos; return airEquipmentBos; } /** @@ -97,7 +91,6 @@ } return airEquipmentBos; // return null; } /**
