重构环境监测

eladmin-system/src/main/java/me/zhengjie/modules/dm/envmonitor/historydata/domain/DmEnvHistoryData.java

@@ -24,14 +24,17 @@ import javax.validation.constraints.*;
 import javax.persistence.Entity;
 import javax.persistence.Table;
 import org.hibernate.annotations.*;
+import org.springframework.data.annotation.CreatedBy;
+import org.springframework.data.annotation.LastModifiedBy;
+
 import java.sql.Timestamp;
 import java.io.Serializable;
 
 /**
 * @website https://el-admin.vip
 * @description /
-* @author shuai.huang
-* @date 2021-03-30
+* @author lr
+* @date 2022-05-19
 **/
 @Entity
 @Data
@@ -56,52 +59,30 @@ public class DmEnvHistoryData implements Serializable {
     @ApiModelProperty(value = "监控对象")
     private String monitorObject;
 
-    @Column(name = "temperature")
-    @ApiModelProperty(value = "气温")
-    private Double temperature;
-
-    @Column(name = "atmosphere_pressure")
-    @ApiModelProperty(value = "气压")
-    private Double atmospherePressure;
-
-    @Column(name = "wind_power")
-    @ApiModelProperty(value = "风力")
-    private Double windPower;
-
-    @Column(name = "env_uvi")
-    @ApiModelProperty(value = "紫外线指数")
-    private Double envUvi;
-
-    @Column(name = "humidity")
-    @ApiModelProperty(value = "湿度")
-    private Double humidity;
-
-    @Column(name = "env_pm2_5")
-    @ApiModelProperty(value = "pm2.5")
-    private Double envPm25;
-
-    @Column(name = "env_pm10")
-    @ApiModelProperty(value = "pm10")
-    private Double envPm10;
-
-    @Column(name = "create_by")
-    @ApiModelProperty(value = "创建人")
+    @CreatedBy
+    @Column(name = "create_by", updatable = false)
+    @ApiModelProperty(value = "创建人", hidden = true)
     private String createBy;
 
+    @LastModifiedBy
     @Column(name = "update_by")
-    @ApiModelProperty(value = "更新人")
+    @ApiModelProperty(value = "更新人", hidden = true)
     private String updateBy;
 
-    @Column(name = "create_time")
     @CreationTimestamp
-    @ApiModelProperty(value = "创建时间")
+    @Column(name = "create_time", updatable = false)
+    @ApiModelProperty(value = "创建时间", hidden = true)
     private Timestamp createTime;
 
-    @Column(name = "update_time")
     @UpdateTimestamp
-    @ApiModelProperty(value = "更新时间")
+    @Column(name = "update_time")
+    @ApiModelProperty(value = "更新时间", hidden = true)
     private Timestamp updateTime;
 
+    @Column(name = "device_state")
+    @ApiModelProperty(value = "状态 0离线 1在线 2告警")
+    private Integer deviceState;
+
     public void copy(DmEnvHistoryData source){
         BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true));
     }

eladmin-system/src/main/java/me/zhengjie/modules/dm/envmonitor/historydata/repository/DmEnvHistoryDataRepository.java

@@ -21,8 +21,8 @@ import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 
 /**
 * @website https://el-admin.vip
-* @author shuai.huang
-* @date 2021-03-30
+* @author lr
+* @date 2022-05-19
 **/
 public interface DmEnvHistoryDataRepository extends JpaRepository<DmEnvHistoryData, Long>, JpaSpecificationExecutor<DmEnvHistoryData> {
 }

eladmin-system/src/main/java/me/zhengjie/modules/dm/envmonitor/historydata/rest/DmEnvHistoryDataController.java

@@ -32,8 +32,8 @@ import javax.servlet.http.HttpServletResponse;
 
 /**
 * @website https://el-admin.vip
-* @author shuai.huang
-* @date 2021-03-30
+* @author lr
+* @date 2022-05-19
 **/
 @RestController
 @RequiredArgsConstructor
@@ -84,8 +84,4 @@ public class DmEnvHistoryDataController {
         dmEnvHistoryDataService.deleteAll(ids);
         return new ResponseEntity<>(HttpStatus.OK);
     }
-
-    public ResponseEntity<Object> queryWarn(DmEnvHistoryDataQueryCriteria criteria, Pageable pageable){
-        return new ResponseEntity<>(dmEnvHistoryDataService.queryAll(criteria,pageable),HttpStatus.OK);
-    }
 }

eladmin-system/src/main/java/me/zhengjie/modules/dm/envmonitor/historydata/service/DmEnvHistoryDataService.java

@@ -27,8 +27,8 @@ import javax.servlet.http.HttpServletResponse;
 /**
 * @website https://el-admin.vip
 * @description 服务接口
-* @author shuai.huang
-* @date 2021-03-30
+* @author lr
+* @date 2022-05-19
 **/
 public interface DmEnvHistoryDataService {
 

eladmin-system/src/main/java/me/zhengjie/modules/dm/envmonitor/historydata/service/dto/DmEnvHistoryDataDto.java

@@ -22,8 +22,8 @@ import java.io.Serializable;
 /**
 * @website https://el-admin.vip
 * @description /
-* @author shuai.huang
-* @date 2021-03-30
+* @author lr
+* @date 2022-05-19
 **/
 @Data
 public class DmEnvHistoryDataDto implements Serializable {
@@ -40,27 +40,6 @@ public class DmEnvHistoryDataDto implements Serializable {
     /** 监控对象 */
     private String monitorObject;
 
-    /** 气温 */
-    private Double temperature;
-
-    /** 气压 */
-    private Double atmospherePressure;
-
-    /** 风力 */
-    private Double windPower;
-
-    /** 紫外线指数 */
-    private Double envUvi;
-
-    /** 湿度 */
-    private Double humidity;
-
-    /** pm2.5 */
-    private Double envPm25;
-
-    /** pm10 */
-    private Double envPm10;
-
     /** 创建人 */
     private String createBy;
 
@@ -72,4 +51,7 @@ public class DmEnvHistoryDataDto implements Serializable {
 
     /** 更新时间 */
     private Timestamp updateTime;
+
+    /** 状态 0离线 1在线 2告警 */
+    private Integer deviceState;
 }

eladmin-system/src/main/java/me/zhengjie/modules/dm/envmonitor/historydata/service/dto/DmEnvHistoryDataQueryCriteria.java

@@ -16,20 +16,16 @@
 package me.zhengjie.modules.dm.envmonitor.historydata.service.dto;
 
 import lombok.Data;
-import java.sql.Timestamp;
 import java.util.List;
 import me.zhengjie.annotation.Query;
 
 /**
 * @website https://el-admin.vip
-* @author shuai.huang
-* @date 2021-03-30
+* @author lr
+* @date 2022-05-19
 **/
 @Data
 public class DmEnvHistoryDataQueryCriteria{
-    /** BETWEEN */
-    @Query(type = Query.Type.BETWEEN)
-    private List<Timestamp> createTime;
 
     /** 模糊 */
     @Query(type = Query.Type.INNER_LIKE)
@@ -38,8 +34,4 @@ public class DmEnvHistoryDataQueryCriteria{
     /** 模糊 */
     @Query(type = Query.Type.INNER_LIKE)
     private String deviceName;
-
-    /** 模糊 */
-    @Query(type = Query.Type.INNER_LIKE)
-    private String monitorObject;
 }

eladmin-system/src/main/java/me/zhengjie/modules/dm/envmonitor/historydata/service/impl/DmEnvHistoryDataServiceImpl.java

@@ -40,8 +40,8 @@ import java.util.LinkedHashMap;
 /**
 * @website https://el-admin.vip
 * @description 服务实现
-* @author shuai.huang
-* @date 2021-03-30
+* @author lr
+* @date 2022-05-19
 **/
 @Service
 @RequiredArgsConstructor
@@ -99,24 +99,13 @@ public class DmEnvHistoryDataServiceImpl implements DmEnvHistoryDataService {
             map.put("设备编号", dmEnvHistoryData.getDeviceIdentifier());
             map.put("设备名称", dmEnvHistoryData.getDeviceName());
             map.put("监控对象", dmEnvHistoryData.getMonitorObject());
-            map.put("气温", dmEnvHistoryData.getTemperature());
-            map.put("气压", dmEnvHistoryData.getAtmospherePressure());
-            map.put("风力", dmEnvHistoryData.getWindPower());
-            map.put("紫外线指数", dmEnvHistoryData.getEnvUvi());
-            map.put("湿度", dmEnvHistoryData.getHumidity());
-            map.put("pm2.5", dmEnvHistoryData.getEnvPm25());
-            map.put("pm10", dmEnvHistoryData.getEnvPm10());
             map.put("创建人", dmEnvHistoryData.getCreateBy());
             map.put("更新人", dmEnvHistoryData.getUpdateBy());
             map.put("创建时间", dmEnvHistoryData.getCreateTime());
             map.put("更新时间", dmEnvHistoryData.getUpdateTime());
+            map.put("状态 0离线 1在线 2告警", dmEnvHistoryData.getDeviceState());
             list.add(map);
         }
         FileUtil.downloadExcel(list, response);
     }
-
-    public Map<String,Object> queryWarn(DmEnvHistoryDataQueryCriteria criteria, int page, int size){
-
-        return PageUtil.toPage(page,size);
-    }
 }

eladmin-system/src/main/java/me/zhengjie/modules/dm/envmonitor/historydata/service/mapstruct/DmEnvHistoryDataMapper.java

@@ -23,8 +23,8 @@ import org.mapstruct.ReportingPolicy;
 
 /**
 * @website https://el-admin.vip
-* @author shuai.huang
-* @date 2021-03-30
+* @author lr
+* @date 2022-05-19
 **/
 @Mapper(componentModel = "spring", unmappedTargetPolicy = ReportingPolicy.IGNORE)
 public interface DmEnvHistoryDataMapper extends BaseMapper<DmEnvHistoryDataDto, DmEnvHistoryData> {

eladmin-system/src/main/java/me/zhengjie/modules/dm/envmonitor/historywarn/domain/DmEnvHistoryWarn.java

@@ -24,14 +24,17 @@ import javax.validation.constraints.*;
 import javax.persistence.Entity;
 import javax.persistence.Table;
 import org.hibernate.annotations.*;
+import org.springframework.data.annotation.CreatedBy;
+import org.springframework.data.annotation.LastModifiedBy;
+
 import java.sql.Timestamp;
 import java.io.Serializable;
 
 /**
 * @website https://el-admin.vip
 * @description /
-* @author yang
-* @date 2021-05-11
+* @author lr
+* @date 2022-05-19
 **/
 @Entity
 @Data
@@ -52,48 +55,38 @@ public class DmEnvHistoryWarn implements Serializable {
     @ApiModelProperty(value = "设备名称")
     private String deviceName;
 
-    @Column(name = "monitor_object")
-    @ApiModelProperty(value = "监控对象")
-    private String monitorObject;
-
-    @Column(name = "temperature")
-    @ApiModelProperty(value = "气温")
-    private Double temperature;
-
-    @Column(name = "humidity")
-    @ApiModelProperty(value = "湿度")
-    private Double humidity;
-
-    @Column(name = "env_pm2_5")
-    @ApiModelProperty(value = "pm2.5")
-    private Double envPm25;
-
-    @Column(name = "env_pm10")
-    @ApiModelProperty(value = "pm10")
-    private Double envPm10;
-
-    @Column(name = "warn_name")
-    @ApiModelProperty(value = "告警信息")
-    private String warnName;
-
-    @Column(name = "create_by")
-    @ApiModelProperty(value = "创建人")
+    @CreatedBy
+    @Column(name = "create_by", updatable = false)
+    @ApiModelProperty(value = "创建人", hidden = true)
     private String createBy;
 
+    @LastModifiedBy
     @Column(name = "update_by")
-    @ApiModelProperty(value = "更新人")
+    @ApiModelProperty(value = "更新人", hidden = true)
     private String updateBy;
 
-    @Column(name = "create_time")
     @CreationTimestamp
-    @ApiModelProperty(value = "创建时间")
+    @Column(name = "create_time", updatable = false)
+    @ApiModelProperty(value = "创建时间", hidden = true)
     private Timestamp createTime;
 
-    @Column(name = "update_time")
     @UpdateTimestamp
-    @ApiModelProperty(value = "更新时间")
+    @Column(name = "update_time")
+    @ApiModelProperty(value = "更新时间", hidden = true)
     private Timestamp updateTime;
 
+    @Column(name = "warn_index")
+    @ApiModelProperty(value = "告警指标")
+    private String warnIndex;
+
+    @Column(name = "warn_value")
+    @ApiModelProperty(value = "告警值")
+    private String warnValue;
+
+    @Column(name = "warn_content")
+    @ApiModelProperty(value = "告警内容")
+    private String warnContent;
+
     public void copy(DmEnvHistoryWarn source){
         BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true));
     }

eladmin-system/src/main/java/me/zhengjie/modules/dm/envmonitor/historywarn/repository/DmEnvHistoryWarnRepository.java

@@ -21,8 +21,8 @@ import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 
 /**
 * @website https://el-admin.vip
-* @author yang
-* @date 2021-05-11
+* @author lr
+* @date 2022-05-19
 **/
 public interface DmEnvHistoryWarnRepository extends JpaRepository<DmEnvHistoryWarn, Long>, JpaSpecificationExecutor<DmEnvHistoryWarn> {
 }

eladmin-system/src/main/java/me/zhengjie/modules/dm/envmonitor/historywarn/rest/DmEnvHistoryWarnController.java

@@ -32,8 +32,8 @@ import javax.servlet.http.HttpServletResponse;
 
 /**
 * @website https://el-admin.vip
-* @author yang
-* @date 2021-05-11
+* @author lr
+* @date 2022-05-19
 **/
 @RestController
 @RequiredArgsConstructor

eladmin-system/src/main/java/me/zhengjie/modules/dm/envmonitor/historywarn/service/DmEnvHistoryWarnService.java

@@ -27,8 +27,8 @@ import javax.servlet.http.HttpServletResponse;
 /**
 * @website https://el-admin.vip
 * @description 服务接口
-* @author yang
-* @date 2021-05-11
+* @author lr
+* @date 2022-05-19
 **/
 public interface DmEnvHistoryWarnService {
 

eladmin-system/src/main/java/me/zhengjie/modules/dm/envmonitor/historywarn/service/dto/DmEnvHistoryWarnDto.java

@@ -22,8 +22,8 @@ import java.io.Serializable;
 /**
 * @website https://el-admin.vip
 * @description /
-* @author yang
-* @date 2021-05-11
+* @author lr
+* @date 2022-05-19
 **/
 @Data
 public class DmEnvHistoryWarnDto implements Serializable {
@@ -37,24 +37,6 @@ public class DmEnvHistoryWarnDto implements Serializable {
     /** 设备名称 */
     private String deviceName;
 
-    /** 监控对象 */
-    private String monitorObject;
-
-    /** 气温 */
-    private Double temperature;
-
-    /** 湿度 */
-    private Double humidity;
-
-    /** pm2.5 */
-    private Double envPm25;
-
-    /** pm10 */
-    private Double envPm10;
-
-    /** 告警信息 */
-    private String warnName;
-
     /** 创建人 */
     private String createBy;
 
@@ -66,4 +48,13 @@ public class DmEnvHistoryWarnDto implements Serializable {
 
     /** 更新时间 */
     private Timestamp updateTime;
+
+    /** 告警指标 */
+    private String warnIndex;
+
+    /** 告警值 */
+    private String warnValue;
+
+    /** 告警内容 */
+    private String warnContent;
 }

eladmin-system/src/main/java/me/zhengjie/modules/dm/envmonitor/historywarn/service/dto/DmEnvHistoryWarnQueryCriteria.java

@@ -22,11 +22,19 @@ import me.zhengjie.annotation.Query;
 
 /**
 * @website https://el-admin.vip
-* @author yang
-* @date 2021-05-11
+* @author lr
+* @date 2022-05-19
 **/
 @Data
 public class DmEnvHistoryWarnQueryCriteria{
+
+    /** 模糊 */
+    @Query(type = Query.Type.INNER_LIKE)
+    private String deviceIdentifier;
+
+    /** 模糊 */
+    @Query(type = Query.Type.INNER_LIKE)
+    private String deviceName;
     /** BETWEEN */
     @Query(type = Query.Type.BETWEEN)
     private List<Timestamp> createTime;

eladmin-system/src/main/java/me/zhengjie/modules/dm/envmonitor/historywarn/service/impl/DmEnvHistoryWarnServiceImpl.java

@@ -40,8 +40,8 @@ import java.util.LinkedHashMap;
 /**
 * @website https://el-admin.vip
 * @description 服务实现
-* @author yang
-* @date 2021-05-11
+* @author lr
+* @date 2022-05-19
 **/
 @Service
 @RequiredArgsConstructor
@@ -98,16 +98,13 @@ public class DmEnvHistoryWarnServiceImpl implements DmEnvHistoryWarnService {
             Map<String,Object> map = new LinkedHashMap<>();
             map.put("设备编号", dmEnvHistoryWarn.getDeviceIdentifier());
             map.put("设备名称", dmEnvHistoryWarn.getDeviceName());
-            map.put("监控对象", dmEnvHistoryWarn.getMonitorObject());
-            map.put("气温", dmEnvHistoryWarn.getTemperature());
-            map.put("湿度", dmEnvHistoryWarn.getHumidity());
-            map.put("pm2.5", dmEnvHistoryWarn.getEnvPm25());
-            map.put("pm10", dmEnvHistoryWarn.getEnvPm10());
-            map.put("告警信息", dmEnvHistoryWarn.getWarnName());
             map.put("创建人", dmEnvHistoryWarn.getCreateBy());
             map.put("更新人", dmEnvHistoryWarn.getUpdateBy());
             map.put("创建时间", dmEnvHistoryWarn.getCreateTime());
             map.put("更新时间", dmEnvHistoryWarn.getUpdateTime());
+            map.put("告警指标", dmEnvHistoryWarn.getWarnIndex());
+            map.put("告警值", dmEnvHistoryWarn.getWarnValue());
+            map.put("告警内容", dmEnvHistoryWarn.getWarnContent());
             list.add(map);
         }
         FileUtil.downloadExcel(list, response);

eladmin-system/src/main/java/me/zhengjie/modules/dm/envmonitor/historywarn/service/mapstruct/DmEnvHistoryWarnMapper.java

@@ -23,8 +23,8 @@ import org.mapstruct.ReportingPolicy;
 
 /**
 * @website https://el-admin.vip
-* @author yang
-* @date 2021-05-11
+* @author lr
+* @date 2022-05-19
 **/
 @Mapper(componentModel = "spring", unmappedTargetPolicy = ReportingPolicy.IGNORE)
 public interface DmEnvHistoryWarnMapper extends BaseMapper<DmEnvHistoryWarnDto, DmEnvHistoryWarn> {

eladmin-system/src/main/java/me/zhengjie/modules/dm/envmonitor/historywarnconfig/domain/DmEnvHistoryWarnConfig.java

@@ -0,0 +1,71 @@
+/*
+*  Copyright 2019-2020 Zheng Jie
+*
+*  Licensed under the Apache License, Version 2.0 (the "License");
+*  you may not use this file except in compliance with the License.
+*  You may obtain a copy of the License at
+*
+*  http://www.apache.org/licenses/LICENSE-2.0
+*
+*  Unless required by applicable law or agreed to in writing, software
+*  distributed under the License is distributed on an "AS IS" BASIS,
+*  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+*  See the License for the specific language governing permissions and
+*  limitations under the License.
+*/
+package me.zhengjie.modules.dm.envmonitor.historywarnconfig.domain;
+
+import lombok.Data;
+import cn.hutool.core.bean.BeanUtil;
+import io.swagger.annotations.ApiModelProperty;
+import cn.hutool.core.bean.copier.CopyOptions;
+import javax.persistence.*;
+import javax.validation.constraints.*;
+import java.sql.Timestamp;
+import java.io.Serializable;
+
+/**
+* @website https://el-admin.vip
+* @description /
+* @author lr
+* @date 2022-05-19
+**/
+@Entity
+@Data
+@Table(name="dm_env_history_warn_config")
+public class DmEnvHistoryWarnConfig implements Serializable {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name = "id")
+    @ApiModelProperty(value = "id")
+    private Long id;
+
+    @Column(name = "data_item")
+    @ApiModelProperty(value = "数据项")
+    private String dataItem;
+
+    @Column(name = "warn_value")
+    @ApiModelProperty(value = "告警值")
+    private String warnValue;
+
+    @Column(name = "create_by")
+    @ApiModelProperty(value = "创建人")
+    private String createBy;
+
+    @Column(name = "update_by")
+    @ApiModelProperty(value = "更新人")
+    private String updateBy;
+
+    @Column(name = "create_time")
+    @ApiModelProperty(value = "创建时间")
+    private Timestamp createTime;
+
+    @Column(name = "update_time")
+    @ApiModelProperty(value = "更新时间")
+    private Timestamp updateTime;
+
+    public void copy(DmEnvHistoryWarnConfig source){
+        BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true));
+    }
+}

eladmin-system/src/main/java/me/zhengjie/modules/dm/envmonitor/historywarnconfig/repository/DmEnvHistoryWarnConfigRepository.java

@@ -0,0 +1,28 @@
+/*
+*  Copyright 2019-2020 Zheng Jie
+*
+*  Licensed under the Apache License, Version 2.0 (the "License");
+*  you may not use this file except in compliance with the License.
+*  You may obtain a copy of the License at
+*
+*  http://www.apache.org/licenses/LICENSE-2.0
+*
+*  Unless required by applicable law or agreed to in writing, software
+*  distributed under the License is distributed on an "AS IS" BASIS,
+*  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+*  See the License for the specific language governing permissions and
+*  limitations under the License.
+*/
+package me.zhengjie.modules.dm.envmonitor.historywarnconfig.repository;
+
+import me.zhengjie.modules.dm.envmonitor.historywarnconfig.domain.DmEnvHistoryWarnConfig;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+
+/**
+* @website https://el-admin.vip
+* @author lr
+* @date 2022-05-19
+**/
+public interface DmEnvHistoryWarnConfigRepository extends JpaRepository<DmEnvHistoryWarnConfig, Long>, JpaSpecificationExecutor<DmEnvHistoryWarnConfig> {
+}

eladmin-system/src/main/java/me/zhengjie/modules/dm/envmonitor/historywarnconfig/rest/DmEnvHistoryWarnConfigController.java

@@ -0,0 +1,87 @@
+/*
+*  Copyright 2019-2020 Zheng Jie
+*
+*  Licensed under the Apache License, Version 2.0 (the "License");
+*  you may not use this file except in compliance with the License.
+*  You may obtain a copy of the License at
+*
+*  http://www.apache.org/licenses/LICENSE-2.0
+*
+*  Unless required by applicable law or agreed to in writing, software
+*  distributed under the License is distributed on an "AS IS" BASIS,
+*  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+*  See the License for the specific language governing permissions and
+*  limitations under the License.
+*/
+package me.zhengjie.modules.dm.envmonitor.historywarnconfig.rest;
+
+import me.zhengjie.annotation.Log;
+import me.zhengjie.modules.dm.envmonitor.historywarnconfig.domain.DmEnvHistoryWarnConfig;
+import me.zhengjie.modules.dm.envmonitor.historywarnconfig.service.DmEnvHistoryWarnConfigService;
+import me.zhengjie.modules.dm.envmonitor.historywarnconfig.service.dto.DmEnvHistoryWarnConfigQueryCriteria;
+import org.springframework.data.domain.Pageable;
+import lombok.RequiredArgsConstructor;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+import io.swagger.annotations.*;
+import java.io.IOException;
+import javax.servlet.http.HttpServletResponse;
+
+/**
+* @website https://el-admin.vip
+* @author lr
+* @date 2022-05-19
+**/
+@RestController
+@RequiredArgsConstructor
+@Api(tags = "告警配置管理")
+@RequestMapping("/api/dmEnvHistoryWarnConfig")
+public class DmEnvHistoryWarnConfigController {
+
+    private final DmEnvHistoryWarnConfigService dmEnvHistoryWarnConfigService;
+
+    @Log("导出数据")
+    @ApiOperation("导出数据")
+    @GetMapping(value = "/download")
+    @PreAuthorize("@el.check('dmEnvHistoryWarnConfig:list')")
+    public void download(HttpServletResponse response, DmEnvHistoryWarnConfigQueryCriteria criteria) throws IOException {
+        dmEnvHistoryWarnConfigService.download(dmEnvHistoryWarnConfigService.queryAll(criteria), response);
+    }
+
+    @GetMapping
+    @Log("查询告警配置")
+    @ApiOperation("查询告警配置")
+    @PreAuthorize("@el.check('dmEnvHistoryWarnConfig:list')")
+    public ResponseEntity<Object> query(DmEnvHistoryWarnConfigQueryCriteria criteria, Pageable pageable){
+        return new ResponseEntity<>(dmEnvHistoryWarnConfigService.queryAll(criteria,pageable),HttpStatus.OK);
+    }
+
+    @PostMapping
+    @Log("新增告警配置")
+    @ApiOperation("新增告警配置")
+    @PreAuthorize("@el.check('dmEnvHistoryWarnConfig:add')")
+    public ResponseEntity<Object> create(@Validated @RequestBody DmEnvHistoryWarnConfig resources){
+        return new ResponseEntity<>(dmEnvHistoryWarnConfigService.create(resources),HttpStatus.CREATED);
+    }
+
+    @PutMapping
+    @Log("修改告警配置")
+    @ApiOperation("修改告警配置")
+    @PreAuthorize("@el.check('dmEnvHistoryWarnConfig:edit')")
+    public ResponseEntity<Object> update(@Validated @RequestBody DmEnvHistoryWarnConfig resources){
+        dmEnvHistoryWarnConfigService.update(resources);
+        return new ResponseEntity<>(HttpStatus.NO_CONTENT);
+    }
+
+    @Log("删除告警配置")
+    @ApiOperation("删除告警配置")
+    @PreAuthorize("@el.check('dmEnvHistoryWarnConfig:del')")
+    @DeleteMapping
+    public ResponseEntity<Object> delete(@RequestBody Long[] ids) {
+        dmEnvHistoryWarnConfigService.deleteAll(ids);
+        return new ResponseEntity<>(HttpStatus.OK);
+    }
+}

eladmin-system/src/main/java/me/zhengjie/modules/dm/envmonitor/historywarnconfig/service/DmEnvHistoryWarnConfigService.java

@@ -0,0 +1,83 @@
+/*
+*  Copyright 2019-2020 Zheng Jie
+*
+*  Licensed under the Apache License, Version 2.0 (the "License");
+*  you may not use this file except in compliance with the License.
+*  You may obtain a copy of the License at
+*
+*  http://www.apache.org/licenses/LICENSE-2.0
+*
+*  Unless required by applicable law or agreed to in writing, software
+*  distributed under the License is distributed on an "AS IS" BASIS,
+*  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+*  See the License for the specific language governing permissions and
+*  limitations under the License.
+*/
+package me.zhengjie.modules.dm.envmonitor.historywarnconfig.service;
+
+import me.zhengjie.modules.dm.envmonitor.historywarnconfig.domain.DmEnvHistoryWarnConfig;
+import me.zhengjie.modules.dm.envmonitor.historywarnconfig.service.dto.DmEnvHistoryWarnConfigDto;
+import me.zhengjie.modules.dm.envmonitor.historywarnconfig.service.dto.DmEnvHistoryWarnConfigQueryCriteria;
+import org.springframework.data.domain.Pageable;
+import java.util.Map;
+import java.util.List;
+import java.io.IOException;
+import javax.servlet.http.HttpServletResponse;
+
+/**
+* @website https://el-admin.vip
+* @description 服务接口
+* @author lr
+* @date 2022-05-19
+**/
+public interface DmEnvHistoryWarnConfigService {
+
+    /**
+    * 查询数据分页
+    * @param criteria 条件
+    * @param pageable 分页参数
+    * @return Map<String,Object>
+    */
+    Map<String,Object> queryAll(DmEnvHistoryWarnConfigQueryCriteria criteria, Pageable pageable);
+
+    /**
+    * 查询所有数据不分页
+    * @param criteria 条件参数
+    * @return List<DmEnvHistoryWarnConfigDto>
+    */
+    List<DmEnvHistoryWarnConfigDto> queryAll(DmEnvHistoryWarnConfigQueryCriteria criteria);
+
+    /**
+     * 根据ID查询
+     * @param id ID
+     * @return DmEnvHistoryWarnConfigDto
+     */
+    DmEnvHistoryWarnConfigDto findById(Long id);
+
+    /**
+    * 创建
+    * @param resources /
+    * @return DmEnvHistoryWarnConfigDto
+    */
+    DmEnvHistoryWarnConfigDto create(DmEnvHistoryWarnConfig resources);
+
+    /**
+    * 编辑
+    * @param resources /
+    */
+    void update(DmEnvHistoryWarnConfig resources);
+
+    /**
+    * 多选删除
+    * @param ids /
+    */
+    void deleteAll(Long[] ids);
+
+    /**
+    * 导出数据
+    * @param all 待导出的数据
+    * @param response /
+    * @throws IOException /
+    */
+    void download(List<DmEnvHistoryWarnConfigDto> all, HttpServletResponse response) throws IOException;
+}

eladmin-system/src/main/java/me/zhengjie/modules/dm/envmonitor/historywarnconfig/service/dto/DmEnvHistoryWarnConfigDto.java

@@ -0,0 +1,51 @@
+/*
+*  Copyright 2019-2020 Zheng Jie
+*
+*  Licensed under the Apache License, Version 2.0 (the "License");
+*  you may not use this file except in compliance with the License.
+*  You may obtain a copy of the License at
+*
+*  http://www.apache.org/licenses/LICENSE-2.0
+*
+*  Unless required by applicable law or agreed to in writing, software
+*  distributed under the License is distributed on an "AS IS" BASIS,
+*  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+*  See the License for the specific language governing permissions and
+*  limitations under the License.
+*/
+package me.zhengjie.modules.dm.envmonitor.historywarnconfig.service.dto;
+
+import lombok.Data;
+import java.sql.Timestamp;
+import java.io.Serializable;
+
+/**
+* @website https://el-admin.vip
+* @description /
+* @author lr
+* @date 2022-05-19
+**/
+@Data
+public class DmEnvHistoryWarnConfigDto implements Serializable {
+
+    /** id */
+    private Long id;
+
+    /** 数据项 */
+    private String dataItem;
+
+    /** 告警值 */
+    private String warnValue;
+
+    /** 创建人 */
+    private String createBy;
+
+    /** 更新人 */
+    private String updateBy;
+
+    /** 创建时间 */
+    private Timestamp createTime;
+
+    /** 更新时间 */
+    private Timestamp updateTime;
+}

eladmin-system/src/main/java/me/zhengjie/modules/dm/envmonitor/historywarnconfig/service/dto/DmEnvHistoryWarnConfigQueryCriteria.java

@@ -0,0 +1,29 @@
+/*
+*  Copyright 2019-2020 Zheng Jie
+*
+*  Licensed under the Apache License, Version 2.0 (the "License");
+*  you may not use this file except in compliance with the License.
+*  You may obtain a copy of the License at
+*
+*  http://www.apache.org/licenses/LICENSE-2.0
+*
+*  Unless required by applicable law or agreed to in writing, software
+*  distributed under the License is distributed on an "AS IS" BASIS,
+*  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+*  See the License for the specific language governing permissions and
+*  limitations under the License.
+*/
+package me.zhengjie.modules.dm.envmonitor.historywarnconfig.service.dto;
+
+import lombok.Data;
+import java.util.List;
+import me.zhengjie.annotation.Query;
+
+/**
+* @website https://el-admin.vip
+* @author lr
+* @date 2022-05-19
+**/
+@Data
+public class DmEnvHistoryWarnConfigQueryCriteria{
+}

eladmin-system/src/main/java/me/zhengjie/modules/dm/envmonitor/historywarnconfig/service/impl/DmEnvHistoryWarnConfigServiceImpl.java

@@ -0,0 +1,109 @@
+/*
+*  Copyright 2019-2020 Zheng Jie
+*
+*  Licensed under the Apache License, Version 2.0 (the "License");
+*  you may not use this file except in compliance with the License.
+*  You may obtain a copy of the License at
+*
+*  http://www.apache.org/licenses/LICENSE-2.0
+*
+*  Unless required by applicable law or agreed to in writing, software
+*  distributed under the License is distributed on an "AS IS" BASIS,
+*  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+*  See the License for the specific language governing permissions and
+*  limitations under the License.
+*/
+package me.zhengjie.modules.dm.envmonitor.historywarnconfig.service.impl;
+
+import me.zhengjie.modules.dm.envmonitor.historywarnconfig.domain.DmEnvHistoryWarnConfig;
+import me.zhengjie.utils.ValidationUtil;
+import me.zhengjie.utils.FileUtil;
+import lombok.RequiredArgsConstructor;
+import me.zhengjie.modules.dm.envmonitor.historywarnconfig.repository.DmEnvHistoryWarnConfigRepository;
+import me.zhengjie.modules.dm.envmonitor.historywarnconfig.service.DmEnvHistoryWarnConfigService;
+import me.zhengjie.modules.dm.envmonitor.historywarnconfig.service.dto.DmEnvHistoryWarnConfigDto;
+import me.zhengjie.modules.dm.envmonitor.historywarnconfig.service.dto.DmEnvHistoryWarnConfigQueryCriteria;
+import me.zhengjie.modules.dm.envmonitor.historywarnconfig.service.mapstruct.DmEnvHistoryWarnConfigMapper;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+import me.zhengjie.utils.PageUtil;
+import me.zhengjie.utils.QueryHelp;
+import java.util.List;
+import java.util.Map;
+import java.io.IOException;
+import javax.servlet.http.HttpServletResponse;
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
+
+/**
+* @website https://el-admin.vip
+* @description 服务实现
+* @author lr
+* @date 2022-05-19
+**/
+@Service
+@RequiredArgsConstructor
+public class DmEnvHistoryWarnConfigServiceImpl implements DmEnvHistoryWarnConfigService {
+
+    private final DmEnvHistoryWarnConfigRepository dmEnvHistoryWarnConfigRepository;
+    private final DmEnvHistoryWarnConfigMapper dmEnvHistoryWarnConfigMapper;
+
+    @Override
+    public Map<String,Object> queryAll(DmEnvHistoryWarnConfigQueryCriteria criteria, Pageable pageable){
+        Page<DmEnvHistoryWarnConfig> page = dmEnvHistoryWarnConfigRepository.findAll((root, criteriaQuery, criteriaBuilder) -> QueryHelp.getPredicate(root,criteria,criteriaBuilder),pageable);
+        return PageUtil.toPage(page.map(dmEnvHistoryWarnConfigMapper::toDto));
+    }
+
+    @Override
+    public List<DmEnvHistoryWarnConfigDto> queryAll(DmEnvHistoryWarnConfigQueryCriteria criteria){
+        return dmEnvHistoryWarnConfigMapper.toDto(dmEnvHistoryWarnConfigRepository.findAll((root, criteriaQuery, criteriaBuilder) -> QueryHelp.getPredicate(root,criteria,criteriaBuilder)));
+    }
+
+    @Override
+    @Transactional
+    public DmEnvHistoryWarnConfigDto findById(Long id) {
+        DmEnvHistoryWarnConfig dmEnvHistoryWarnConfig = dmEnvHistoryWarnConfigRepository.findById(id).orElseGet(DmEnvHistoryWarnConfig::new);
+        ValidationUtil.isNull(dmEnvHistoryWarnConfig.getId(),"DmEnvHistoryWarnConfig","id",id);
+        return dmEnvHistoryWarnConfigMapper.toDto(dmEnvHistoryWarnConfig);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public DmEnvHistoryWarnConfigDto create(DmEnvHistoryWarnConfig resources) {
+        return dmEnvHistoryWarnConfigMapper.toDto(dmEnvHistoryWarnConfigRepository.save(resources));
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void update(DmEnvHistoryWarnConfig resources) {
+        DmEnvHistoryWarnConfig dmEnvHistoryWarnConfig = dmEnvHistoryWarnConfigRepository.findById(resources.getId()).orElseGet(DmEnvHistoryWarnConfig::new);
+        ValidationUtil.isNull( dmEnvHistoryWarnConfig.getId(),"DmEnvHistoryWarnConfig","id",resources.getId());
+        dmEnvHistoryWarnConfig.copy(resources);
+        dmEnvHistoryWarnConfigRepository.save(dmEnvHistoryWarnConfig);
+    }
+
+    @Override
+    public void deleteAll(Long[] ids) {
+        for (Long id : ids) {
+            dmEnvHistoryWarnConfigRepository.deleteById(id);
+        }
+    }
+
+    @Override
+    public void download(List<DmEnvHistoryWarnConfigDto> all, HttpServletResponse response) throws IOException {
+        List<Map<String, Object>> list = new ArrayList<>();
+        for (DmEnvHistoryWarnConfigDto dmEnvHistoryWarnConfig : all) {
+            Map<String,Object> map = new LinkedHashMap<>();
+            map.put("数据项", dmEnvHistoryWarnConfig.getDataItem());
+            map.put("告警值", dmEnvHistoryWarnConfig.getWarnValue());
+            map.put("创建人", dmEnvHistoryWarnConfig.getCreateBy());
+            map.put("更新人", dmEnvHistoryWarnConfig.getUpdateBy());
+            map.put("创建时间", dmEnvHistoryWarnConfig.getCreateTime());
+            map.put("更新时间", dmEnvHistoryWarnConfig.getUpdateTime());
+            list.add(map);
+        }
+        FileUtil.downloadExcel(list, response);
+    }
+}

eladmin-system/src/main/java/me/zhengjie/modules/dm/envmonitor/historywarnconfig/service/mapstruct/DmEnvHistoryWarnConfigMapper.java

@@ -0,0 +1,32 @@
+/*
+*  Copyright 2019-2020 Zheng Jie
+*
+*  Licensed under the Apache License, Version 2.0 (the "License");
+*  you may not use this file except in compliance with the License.
+*  You may obtain a copy of the License at
+*
+*  http://www.apache.org/licenses/LICENSE-2.0
+*
+*  Unless required by applicable law or agreed to in writing, software
+*  distributed under the License is distributed on an "AS IS" BASIS,
+*  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+*  See the License for the specific language governing permissions and
+*  limitations under the License.
+*/
+package me.zhengjie.modules.dm.envmonitor.historywarnconfig.service.mapstruct;
+
+import me.zhengjie.base.BaseMapper;
+import me.zhengjie.modules.dm.envmonitor.historywarnconfig.domain.DmEnvHistoryWarnConfig;
+import me.zhengjie.modules.dm.envmonitor.historywarnconfig.service.dto.DmEnvHistoryWarnConfigDto;
+import org.mapstruct.Mapper;
+import org.mapstruct.ReportingPolicy;
+
+/**
+* @website https://el-admin.vip
+* @author lr
+* @date 2022-05-19
+**/
+@Mapper(componentModel = "spring", unmappedTargetPolicy = ReportingPolicy.IGNORE)
+public interface DmEnvHistoryWarnConfigMapper extends BaseMapper<DmEnvHistoryWarnConfigDto, DmEnvHistoryWarnConfig> {
+
+}

eladmin-system/src/main/java/me/zhengjie/modules/dm/envmonitor/monitorobject/domain/DmEnvMonitorObject.java

@@ -23,15 +23,20 @@ import javax.persistence.*;
 import javax.validation.constraints.*;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+
+import me.zhengjie.modules.dm.floor.domain.DmFloor;
 import org.hibernate.annotations.*;
+import org.springframework.data.annotation.CreatedBy;
+import org.springframework.data.annotation.LastModifiedBy;
+
 import java.sql.Timestamp;
 import java.io.Serializable;
 
 /**
 * @website https://el-admin.vip
 * @description /
-* @author shuai.huang
-* @date 2021-03-30
+* @author lr
+* @date 2022-05-19
 **/
 @Entity
 @Data
@@ -48,64 +53,47 @@ public class DmEnvMonitorObject implements Serializable {
     @ApiModelProperty(value = "建筑名称")
     private String constructName;
 
-    @Column(name = "gis_coordinate")
-    @ApiModelProperty(value = "GIS坐标")
-    private String gisCoordinate;
-
-    @Column(name = "construct_structure_type")
-    @ApiModelProperty(value = "建筑结构类型")
-    private String constructStructureType;
-
-    @Column(name = "construct_period")
-    @ApiModelProperty(value = "使用期限")
-    private String constructPeriod;
-
-    @Column(name = "construct_time")
-    @ApiModelProperty(value = "建筑年代")
-    private String constructTime;
-
-    @Column(name = "construct_type")
-    @ApiModelProperty(value = "建筑类别")
-    private String constructType;
-
-    @Column(name = "construct_storey")
-    @ApiModelProperty(value = "建筑层数")
-    private Integer constructStorey;
-
-    @Column(name = "construct_height")
-    @ApiModelProperty(value = "建筑高度")
-    private Float constructHeight;
-
-    @Column(name = "base_area")
-    @ApiModelProperty(value = "基底面积")
-    private Float baseArea;
-
-    @Column(name = "construct_area")
-    @ApiModelProperty(value = "总建筑面积")
-    private Float constructArea;
-
-    @Column(name = "remark")
-    @ApiModelProperty(value = "主要用途")
-    private String remark;
-
-    @Column(name = "create_by")
-    @ApiModelProperty(value = "创建者")
+    @CreatedBy
+    @Column(name = "create_by", updatable = false)
+    @ApiModelProperty(value = "创建人", hidden = true)
     private String createBy;
 
+    @LastModifiedBy
     @Column(name = "update_by")
-    @ApiModelProperty(value = "更新者")
-    private String updateBy;
+    @ApiModelProperty(value = "更新人", hidden = true)
+    private String updatedBy;
 
-    @Column(name = "create_time")
     @CreationTimestamp
-    @ApiModelProperty(value = "创建时间")
+    @Column(name = "create_time", updatable = false)
+    @ApiModelProperty(value = "创建时间", hidden = true)
     private Timestamp createTime;
 
-    @Column(name = "update_time")
     @UpdateTimestamp
-    @ApiModelProperty(value = "更新时间")
+    @Column(name = "update_time")
+    @ApiModelProperty(value = "更新时间", hidden = true)
     private Timestamp updateTime;
 
+    @Column(name = "device_code")
+    @ApiModelProperty(value = "设备编号")
+    private String deviceCode;
+
+    @Column(name = "object_name")
+    @ApiModelProperty(value = "对象名称")
+    private String objectName;
+
+    @Column(name = "GIS")
+    @ApiModelProperty(value = "GIS坐标")
+    private String gis;
+
+    @OneToOne
+    @JoinColumn(name = "floor_id")
+    @ApiModelProperty(value = "所属楼层")
+    private DmFloor dmFloor;
+
+    @Column(name = "position")
+    @ApiModelProperty(value = "位置")
+    private String position;
+
     public void copy(DmEnvMonitorObject source){
         BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true));
     }

eladmin-system/src/main/java/me/zhengjie/modules/dm/envmonitor/monitorobject/repository/DmEnvMonitorObjectRepository.java

@@ -18,16 +18,11 @@ package me.zhengjie.modules.dm.envmonitor.monitorobject.repository;
 import me.zhengjie.modules.dm.envmonitor.monitorobject.domain.DmEnvMonitorObject;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
-import org.springframework.data.jpa.repository.Query;
-
-import java.util.List;
 
 /**
 * @website https://el-admin.vip
-* @author shuai.huang
-* @date 2021-03-30
+* @author lr
+* @date 2022-05-19
 **/
 public interface DmEnvMonitorObjectRepository extends JpaRepository<DmEnvMonitorObject, Long>, JpaSpecificationExecutor<DmEnvMonitorObject> {
-    @Query(value = "SELECT s.* FROM dm_env_monitor_object s",nativeQuery = true)
-    List<DmEnvMonitorObject> findMonitorList();
 }

eladmin-system/src/main/java/me/zhengjie/modules/dm/envmonitor/monitorobject/rest/DmEnvMonitorObjectController.java

@@ -32,8 +32,8 @@ import javax.servlet.http.HttpServletResponse;
 
 /**
 * @website https://el-admin.vip
-* @author shuai.huang
-* @date 2021-03-30
+* @author lr
+* @date 2022-05-19
 **/
 @RestController
 @RequiredArgsConstructor
@@ -84,11 +84,4 @@ public class DmEnvMonitorObjectController {
         dmEnvMonitorObjectService.deleteAll(ids);
         return new ResponseEntity<>(HttpStatus.OK);
     }
-
-    @GetMapping(value="/findMonitorList")
-    @Log("监控对象列表")
-    @ApiOperation("监控对象列表")
-    public ResponseEntity<Object> findMonitorList(){
-        return new ResponseEntity<>(dmEnvMonitorObjectService.findMonitorList(),HttpStatus.OK);
-    }
 }

eladmin-system/src/main/java/me/zhengjie/modules/dm/envmonitor/monitorobject/service/DmEnvMonitorObjectService.java

@@ -27,8 +27,8 @@ import javax.servlet.http.HttpServletResponse;
 /**
 * @website https://el-admin.vip
 * @description 服务接口
-* @author shuai.huang
-* @date 2021-03-30
+* @author lr
+* @date 2022-05-19
 **/
 public interface DmEnvMonitorObjectService {
 
@@ -80,6 +80,4 @@ public interface DmEnvMonitorObjectService {
     * @throws IOException /
     */
     void download(List<DmEnvMonitorObjectDto> all, HttpServletResponse response) throws IOException;
-
-    List<DmEnvMonitorObject> findMonitorList();
 }

eladmin-system/src/main/java/me/zhengjie/modules/dm/envmonitor/monitorobject/service/dto/DmEnvMonitorObjectDto.java

@@ -16,14 +16,16 @@
 package me.zhengjie.modules.dm.envmonitor.monitorobject.service.dto;
 
 import lombok.Data;
+import me.zhengjie.modules.dm.floor.domain.DmFloor;
+
 import java.sql.Timestamp;
 import java.io.Serializable;
 
 /**
 * @website https://el-admin.vip
 * @description /
-* @author shuai.huang
-* @date 2021-03-30
+* @author lr
+* @date 2022-05-19
 **/
 @Data
 public class DmEnvMonitorObjectDto implements Serializable {
@@ -34,36 +36,6 @@ public class DmEnvMonitorObjectDto implements Serializable {
     /** 建筑名称 */
     private String constructName;
 
-    /** GIS坐标 */
-    private String gisCoordinate;
-
-    /** 建筑结构类型 */
-    private String constructStructureType;
-
-    /** 使用期限 */
-    private String constructPeriod;
-
-    /** 建筑年代 */
-    private String constructTime;
-
-    /** 建筑类别 */
-    private String constructType;
-
-    /** 建筑层数 */
-    private Integer constructStorey;
-
-    /** 建筑高度 */
-    private Float constructHeight;
-
-    /** 基底面积 */
-    private Float baseArea;
-
-    /** 总建筑面积 */
-    private Float constructArea;
-
-    /** 主要用途 */
-    private String remark;
-
     /** 创建者 */
     private String createBy;
 
@@ -75,4 +47,19 @@ public class DmEnvMonitorObjectDto implements Serializable {
 
     /** 更新时间 */
     private Timestamp updateTime;
+
+    /** 设备编号 */
+    private String deviceCode;
+
+    /** 对象名称 */
+    private String objectName;
+
+    /** GIS坐标 */
+    private String gis;
+
+    /** 所属楼层 */
+    private DmFloor dmFloor;
+
+    /** 位置 */
+    private String position;
 }

eladmin-system/src/main/java/me/zhengjie/modules/dm/envmonitor/monitorobject/service/dto/DmEnvMonitorObjectQueryCriteria.java

@@ -21,8 +21,8 @@ import me.zhengjie.annotation.Query;
 
 /**
 * @website https://el-admin.vip
-* @author shuai.huang
-* @date 2021-03-30
+* @author lr
+* @date 2022-05-19
 **/
 @Data
 public class DmEnvMonitorObjectQueryCriteria{
@@ -33,5 +33,5 @@ public class DmEnvMonitorObjectQueryCriteria{
 
     /** 模糊 */
     @Query(type = Query.Type.INNER_LIKE)
-    private String constructStructureType;
+    private String deviceCode;
 }

eladmin-system/src/main/java/me/zhengjie/modules/dm/envmonitor/monitorobject/service/impl/DmEnvMonitorObjectServiceImpl.java

@@ -40,8 +40,8 @@ import java.util.LinkedHashMap;
 /**
 * @website https://el-admin.vip
 * @description 服务实现
-* @author shuai.huang
-* @date 2021-03-30
+* @author lr
+* @date 2022-05-19
 **/
 @Service
 @RequiredArgsConstructor
@@ -97,26 +97,17 @@ public class DmEnvMonitorObjectServiceImpl implements DmEnvMonitorObjectService
         for (DmEnvMonitorObjectDto dmEnvMonitorObject : all) {
             Map<String,Object> map = new LinkedHashMap<>();
             map.put("建筑名称", dmEnvMonitorObject.getConstructName());
-            map.put("GIS坐标", dmEnvMonitorObject.getGisCoordinate());
-            map.put("建筑结构类型", dmEnvMonitorObject.getConstructStructureType());
-            map.put("使用期限", dmEnvMonitorObject.getConstructPeriod());
-            map.put("建筑年代", dmEnvMonitorObject.getConstructTime());
-            map.put("建筑类别", dmEnvMonitorObject.getConstructType());
-            map.put("建筑层数", dmEnvMonitorObject.getConstructStorey());
-            map.put("建筑高度", dmEnvMonitorObject.getConstructHeight());
-            map.put("基底面积", dmEnvMonitorObject.getBaseArea());
-            map.put("总建筑面积", dmEnvMonitorObject.getConstructArea());
-            map.put("主要用途", dmEnvMonitorObject.getRemark());
             map.put("创建者", dmEnvMonitorObject.getCreateBy());
             map.put("更新者", dmEnvMonitorObject.getUpdateBy());
             map.put("创建时间", dmEnvMonitorObject.getCreateTime());
             map.put("更新时间", dmEnvMonitorObject.getUpdateTime());
+            map.put("设备编号", dmEnvMonitorObject.getDeviceCode());
+            map.put("对象名称", dmEnvMonitorObject.getObjectName());
+            map.put("GIS坐标", dmEnvMonitorObject.getGis());
+            map.put("所属楼层", dmEnvMonitorObject.getDmFloor().getFloorName());
+            map.put("位置", dmEnvMonitorObject.getPosition());
             list.add(map);
         }
         FileUtil.downloadExcel(list, response);
     }
-
-    public List<DmEnvMonitorObject> findMonitorList() {
-        return dmEnvMonitorObjectRepository.findMonitorList();
-    }
 }

eladmin-system/src/main/java/me/zhengjie/modules/dm/envmonitor/monitorobject/service/mapstruct/DmEnvMonitorObjectMapper.java

@@ -23,8 +23,8 @@ import org.mapstruct.ReportingPolicy;
 
 /**
 * @website https://el-admin.vip
-* @author shuai.huang
-* @date 2021-03-30
+* @author lr
+* @date 2022-05-19
 **/
 @Mapper(componentModel = "spring", unmappedTargetPolicy = ReportingPolicy.IGNORE)
 public interface DmEnvMonitorObjectMapper extends BaseMapper<DmEnvMonitorObjectDto, DmEnvMonitorObject> {