diff --git a/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/screen/dto/EnvironmentDto.java b/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/screen/dto/EnvironmentDto.java new file mode 100644 index 0000000..64dbecb --- /dev/null +++ b/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/screen/dto/EnvironmentDto.java @@ -0,0 +1,65 @@ +package com.securitycontrol.entity.screen.dto; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * 环境监测分析 + * @author fly + */ +@Data +public class EnvironmentDto extends ScreenParamDto { + + @ApiModelProperty(value = "日期") + private String currentDay; + + @ApiModelProperty(value = "时辰") + private String hours; + + @ApiModelProperty(value = "工程名称") + private String proName; + + @ApiModelProperty(value = "边坡位移") + private String slopeDisplacement; + + @ApiModelProperty(value = "温度") + private String temperature; + + @ApiModelProperty(value = "湿度") + private String humidity; + + @ApiModelProperty(value = "空气质量") + private String airQualityIndex; + + @ApiModelProperty(value = "噪音") + private String noiseLevel; + + @ApiModelProperty(value = "光照度") + private String illumination; + + @ApiModelProperty(value = "GIS安装环境温度") + private String gisInstallationTemp; + + @ApiModelProperty(value = "GIS安装环境湿度") + private String gisInstallationHumidity; + + @ApiModelProperty(value = "GIS安装环境粉尘") + private String gisInstallationDustConcentration; + + @ApiModelProperty(value = "有限空间氧气浓度(单位:%)") + private String confinedSpaceOxygen; + + @ApiModelProperty(value = "有限空间一氧化碳气体浓度(单位:ppm)") + private String confinedSpaceCarbonMonoxide; + + @ApiModelProperty(value = "有限空间硫化氢气体浓度(单位:ppm)") + private String confinedSpaceHydrogenSulfide; + + @ApiModelProperty(value = "有限空间可燃气体浓度(单位:%LEL)") + private String confinedSpaceCombustibleGas; + + private List list; + +} diff --git a/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/controller/EnvironmentController.java b/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/controller/EnvironmentController.java new file mode 100644 index 0000000..e9deb2b --- /dev/null +++ b/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/controller/EnvironmentController.java @@ -0,0 +1,34 @@ +package com.securitycontrol.screen.controller; + +import com.securitycontrol.common.core.web.controller.BaseController; +import com.securitycontrol.common.core.web.domain.AjaxResult; +import com.securitycontrol.common.log.annotation.Log; +import com.securitycontrol.common.log.enums.OperationType; +import com.securitycontrol.entity.screen.dto.EnvironmentDto; +import com.securitycontrol.screen.service.EnvironmentService; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; + +/** + * 环境监测分析 + * @author fly + */ +@RestController +@RequestMapping("/largeScreen/environment/") +@Slf4j +public class EnvironmentController extends BaseController { + @Resource(name = "EnvironmentService") + private EnvironmentService service; + + @ApiOperation(value = "环境监测分析") + @GetMapping("getEnvironmentList") + @Log(title = "环境监测分析", menu = "数据分析->环境监测分析", grade = OperationType.QUERY_BUSINESS, details = "环境监测分析", type = "业务日志") + public AjaxResult getEnvironmentList(EnvironmentDto dto) { + return service.getEnvironmentList(dto); + } + + +} diff --git a/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/mapper/EnvironmentMapper.java b/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/mapper/EnvironmentMapper.java new file mode 100644 index 0000000..2943185 --- /dev/null +++ b/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/mapper/EnvironmentMapper.java @@ -0,0 +1,21 @@ +package com.securitycontrol.screen.mapper; + +import com.securitycontrol.entity.screen.dto.AlarmMgeDto; +import com.securitycontrol.entity.screen.dto.EnvironmentDto; +import com.securitycontrol.entity.screen.vo.AlarmMgeVo; +import org.apache.ibatis.annotations.Param; +import org.springframework.stereotype.Repository; + +import java.util.List; + +/** + * 环境监测分析 + * @author fly + */ +@Repository(value = "EnvironmentMapper") +public interface EnvironmentMapper { + + EnvironmentDto getEnvironmentList(EnvironmentDto dto); + + List getEnvironmentListByDate(@Param("startDate") String s,@Param("endDate") String today); +} diff --git a/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/EnvironmentService.java b/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/EnvironmentService.java new file mode 100644 index 0000000..5740ce9 --- /dev/null +++ b/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/EnvironmentService.java @@ -0,0 +1,22 @@ +package com.securitycontrol.screen.service; + +import com.securitycontrol.common.core.domain.Result; +import com.securitycontrol.common.core.web.domain.AjaxResult; +import com.securitycontrol.entity.screen.dto.AlarmMgeDto; +import com.securitycontrol.entity.screen.dto.EnvironmentDto; +import com.securitycontrol.entity.screen.vo.AlarmMgeVo; + +import java.util.List; + +/** + * 环境监测分析 + * @author fly + */ +public interface EnvironmentService { + /** + * 告警管理 -列表 + * @param dto + * @return + */ + AjaxResult getEnvironmentList(EnvironmentDto dto); +} diff --git a/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/impl/EnvironmentServiceImpl.java b/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/impl/EnvironmentServiceImpl.java new file mode 100644 index 0000000..b880d13 --- /dev/null +++ b/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/impl/EnvironmentServiceImpl.java @@ -0,0 +1,54 @@ +package com.securitycontrol.screen.service.impl; + +import cn.hutool.core.date.DateUtil; +import com.securitycontrol.common.core.domain.Result; +import com.securitycontrol.common.core.web.domain.AjaxResult; +import com.securitycontrol.common.security.utils.SecurityUtils; +import com.securitycontrol.entity.screen.dto.AlarmMgeDto; +import com.securitycontrol.entity.screen.dto.EnvironmentDto; +import com.securitycontrol.entity.screen.vo.AlarmMgeVo; +import com.securitycontrol.entity.screen.vo.TowerAssInspectVo; +import com.securitycontrol.entity.system.SystemGlobal; +import com.securitycontrol.screen.mapper.AlarmMgeMapper; +import com.securitycontrol.screen.mapper.EnvironmentMapper; +import com.securitycontrol.screen.service.AlarmMgeService; +import com.securitycontrol.screen.service.EnvironmentService; +import com.securitycontrol.system.api.model.LoginUser; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +/** + * 环境监测分析 + * @author fly + */ +@Slf4j +@Service(value = "EnvironmentService") +public class EnvironmentServiceImpl implements EnvironmentService { + + @Resource(name = "EnvironmentMapper") + private EnvironmentMapper mapper; + + + @Override + public AjaxResult getEnvironmentList(EnvironmentDto dto) { + EnvironmentDto vo = null; + try { + //先查固定时间-- currentDay:2021-05-01 hours:9 + vo = mapper.getEnvironmentList(dto); + //在查最近七天,每天的平均值 + String today = DateUtil.today(); + // 获取七天前的日期,subtract方法可以用来减去指定的时间间隔 + Date sevenDaysAgo = DateUtil.offsetDay(DateUtil.date(), -7); + List list = mapper.getEnvironmentListByDate(DateUtil.format(sevenDaysAgo, "yyyy-MM-dd"),today); + vo.setList(list); + } catch (Exception e) { + log.error("环境监测分析-查询失败", e); + } + return AjaxResult.success(vo); + } +} diff --git a/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/EnvironmentMapper.xml b/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/EnvironmentMapper.xml new file mode 100644 index 0000000..5578504 --- /dev/null +++ b/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/EnvironmentMapper.xml @@ -0,0 +1,56 @@ + + + + + + + \ No newline at end of file