环境监测

eladmin-common/src/main/java/me/zhengjie/base/BaseDTO.java

@@ -17,7 +17,7 @@ public class BaseDTO  implements Serializable {
 
     private String createBy;
 
-    private String updatedBy;
+    private String updateBy;
 
     private Timestamp createTime;
 

eladmin-common/src/main/java/me/zhengjie/base/BaseEntity.java

@@ -50,7 +50,7 @@ public class BaseEntity implements Serializable {
     @LastModifiedBy
     @Column(name = "update_by")
     @ApiModelProperty(value = "更新人", hidden = true)
-    private String updatedBy;
+    private String updateBy;
 
     @CreationTimestamp
     @Column(name = "create_time", updatable = false)

eladmin-system/src/main/java/me/zhengjie/modules/dm/company/service/impl/DmCompanyServiceImpl.java

@@ -110,7 +110,7 @@ public class DmCompanyServiceImpl implements DmCompanyService {
             map.put("备注", dmCompany.getRemark());
             map.put("注册时间", dmCompany.getRegisterDate());
             map.put("创建者", dmCompany.getCreateBy());
-            map.put("更新者", dmCompany.getUpdatedBy());
+            map.put("更新者", dmCompany.getUpdateBy());
             map.put("创建日期", dmCompany.getCreateTime());
             map.put("更新时间", dmCompany.getUpdateTime());
             list.add(map);

eladmin-system/src/main/java/me/zhengjie/modules/dm/envmonitor/icdevicenew/domain/DmEnvIcDeciveNew.java

@@ -23,6 +23,8 @@ import javax.persistence.*;
 import javax.validation.constraints.*;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+
+import me.zhengjie.base.BaseEntity;
 import org.hibernate.annotations.*;
 import java.sql.Timestamp;
 import java.io.Serializable;
@@ -30,13 +32,13 @@ import java.io.Serializable;
 /**
 * @website https://el-admin.vip
 * @description /
-* @author yang
-* @date 2021-05-08
+* @author wanglongda
+* @date 2022-05-12
 **/
 @Entity
 @Data
 @Table(name="dm_env_ic_decive_new")
-public class DmEnvIcDeciveNew implements Serializable {
+public class DmEnvIcDeciveNew extends BaseEntity implements Serializable {
 
     @Id
     @Column(name = "id")
@@ -51,39 +53,24 @@ public class DmEnvIcDeciveNew implements Serializable {
     @ApiModelProperty(value = "设备名称")
     private String deviceName;
 
-    @Column(name = "region")
-    @ApiModelProperty(value = "所在区域")
-    private String region;
-
-    @Column(name = "monitor_object")
-    @ApiModelProperty(value = "监控对象")
-    private String monitorObject;
-
-    @Column(name = "channel")
-    @ApiModelProperty(value = "通信方式")
-    private String channel;
-
     @Column(name = "status")
     @ApiModelProperty(value = "状态")
-    private Boolean status;
-
-    @Column(name = "create_time")
-    @CreationTimestamp
-    @ApiModelProperty(value = "注册时间")
-    private Timestamp createTime;
+    private String status;
 
-    @Column(name = "update_time")
-    @UpdateTimestamp
-    @ApiModelProperty(value = "更新时间")
-    private Timestamp updateTime;
+    @Column(name = "device_port")
+    @NotNull(message = "开放端口不能为空")
+    @ApiModelProperty(value = "设备端口")
+    private Integer devicePort;
 
-    @Column(name = "create_by")
-    @ApiModelProperty(value = "创建人")
-    private String createBy;
+    @Column(name = "device_topic")
+    @NotBlank(message = "topic不能为空")
+    @ApiModelProperty(value = "设备队列地址")
+    private String deviceTopic;
 
-    @Column(name = "update_by")
-    @ApiModelProperty(value = "更新人")
-    private String updateBy;
+    @Column(name = "device_ip")
+    @NotBlank(message = "参数ip不能为空")
+    @ApiModelProperty(value = "设备ip")
+    private String deviceIp;
 
     public void copy(DmEnvIcDeciveNew source){
         BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true));

eladmin-system/src/main/java/me/zhengjie/modules/dm/envmonitor/icdevicenew/repository/DmEnvIcDeciveNewRepository.java

@@ -21,8 +21,8 @@ import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 
 /**
 * @website https://el-admin.vip
-* @author yang
-* @date 2021-05-08
+* @author wanglongda
+* @date 2022-05-12
 **/
 public interface DmEnvIcDeciveNewRepository extends JpaRepository<DmEnvIcDeciveNew, Long>, JpaSpecificationExecutor<DmEnvIcDeciveNew> {
 }

eladmin-system/src/main/java/me/zhengjie/modules/dm/envmonitor/icdevicenew/rest/DmEnvIcDeciveNewController.java

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

eladmin-system/src/main/java/me/zhengjie/modules/dm/envmonitor/icdevicenew/service/DmEnvIcDeciveNewService.java

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

eladmin-system/src/main/java/me/zhengjie/modules/dm/envmonitor/icdevicenew/service/dto/DmEnvIcDeciveNewDto.java

@@ -20,15 +20,16 @@ import java.sql.Timestamp;
 import java.io.Serializable;
 import com.alibaba.fastjson.annotation.JSONField;
 import com.alibaba.fastjson.serializer.ToStringSerializer;
+import me.zhengjie.base.BaseDTO;
 
 /**
 * @website https://el-admin.vip
 * @description /
-* @author yang
-* @date 2021-05-08
+* @author wanglongda
+* @date 2022-05-12
 **/
 @Data
-public class DmEnvIcDeciveNewDto implements Serializable {
+public class DmEnvIcDeciveNewDto extends BaseDTO implements Serializable {
 
     /** 主键 */
     /** 防止精度丢失 */
@@ -41,17 +42,8 @@ public class DmEnvIcDeciveNewDto implements Serializable {
     /** 设备名称 */
     private String deviceName;
 
-    /** 所在区域 */
-    private String region;
-
-    /** 监控对象 */
-    private String monitorObject;
-
-    /** 通信方式 */
-    private String channel;
-
     /** 状态 */
-    private Boolean status;
+    private String status;
 
     /** 注册时间 */
     private Timestamp createTime;
@@ -64,4 +56,13 @@ public class DmEnvIcDeciveNewDto implements Serializable {
 
     /** 更新人 */
     private String updateBy;
+
+    /** 设备端口 */
+    private Integer devicePort;
+
+    /** 设备队列地址 */
+    private String deviceTopic;
+
+    /** 设备ip */
+    private String deviceIp;
 }

eladmin-system/src/main/java/me/zhengjie/modules/dm/envmonitor/icdevicenew/service/dto/DmEnvIcDeciveNewQueryCriteria.java

@@ -21,17 +21,24 @@ import me.zhengjie.annotation.Query;
 
 /**
 * @website https://el-admin.vip
-* @author yang
-* @date 2021-05-08
+* @author wanglongda
+* @date 2022-05-12
 **/
 @Data
 public class DmEnvIcDeciveNewQueryCriteria{
-
-    /** 模糊 */
-    @Query(type = Query.Type.INNER_LIKE)
+    /** 精确 */
+    @Query
     private String deviceIdentifier;
 
     /** 模糊 */
     @Query(type = Query.Type.INNER_LIKE)
     private String deviceName;
+
+    /** 精确 */
+    @Query
+    private String status;
+
+    /** 精确 */
+    @Query
+    private String deviceIp;
 }

eladmin-system/src/main/java/me/zhengjie/modules/dm/envmonitor/icdevicenew/service/impl/DmEnvIcDeciveNewServiceImpl.java

@@ -42,8 +42,8 @@ import java.util.LinkedHashMap;
 /**
 * @website https://el-admin.vip
 * @description 服务实现
-* @author yang
-* @date 2021-05-08
+* @author wanglongda
+* @date 2022-05-12
 **/
 @Service
 @RequiredArgsConstructor
@@ -102,14 +102,14 @@ public class DmEnvIcDeciveNewServiceImpl implements DmEnvIcDeciveNewService {
             Map<String,Object> map = new LinkedHashMap<>();
             map.put("设备编码", dmEnvIcDeciveNew.getDeviceIdentifier());
             map.put("设备名称", dmEnvIcDeciveNew.getDeviceName());
-            map.put("所在区域", dmEnvIcDeciveNew.getRegion());
-            map.put("监控对象", dmEnvIcDeciveNew.getMonitorObject());
-            map.put("通信方式", dmEnvIcDeciveNew.getChannel());
             map.put("状态", dmEnvIcDeciveNew.getStatus());
             map.put("注册时间", dmEnvIcDeciveNew.getCreateTime());
             map.put("更新时间", dmEnvIcDeciveNew.getUpdateTime());
             map.put("创建人", dmEnvIcDeciveNew.getCreateBy());
             map.put("更新人", dmEnvIcDeciveNew.getUpdateBy());
+            map.put("设备端口", dmEnvIcDeciveNew.getDevicePort());
+            map.put("设备队列地址", dmEnvIcDeciveNew.getDeviceTopic());
+            map.put("设备ip", dmEnvIcDeciveNew.getDeviceIp());
             list.add(map);
         }
         FileUtil.downloadExcel(list, response);

eladmin-system/src/main/java/me/zhengjie/modules/dm/envmonitor/icdevicenew/service/mapstruct/DmEnvIcDeciveNewMapper.java

@@ -23,8 +23,8 @@ import org.mapstruct.ReportingPolicy;
 
 /**
 * @website https://el-admin.vip
-* @author yang
-* @date 2021-05-08
+* @author wanglongda
+* @date 2022-05-12
 **/
 @Mapper(componentModel = "spring", unmappedTargetPolicy = ReportingPolicy.IGNORE)
 public interface DmEnvIcDeciveNewMapper extends BaseMapper<DmEnvIcDeciveNewDto, DmEnvIcDeciveNew> {

eladmin-system/src/main/java/me/zhengjie/modules/dm/envmonitor/peptdevicenew/domain/DmEnvPeptDeciveNew.java

@@ -15,14 +15,20 @@
 */
 package me.zhengjie.modules.dm.envmonitor.peptdevicenew.domain;
 
+import com.alibaba.fastjson.annotation.JSONField;
+import com.alibaba.fastjson.serializer.ToStringSerializer;
 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.persistence.CascadeType;
 import javax.validation.constraints.*;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+
+import me.zhengjie.base.BaseEntity;
+import me.zhengjie.modules.dm.envmonitor.icdevicenew.domain.DmEnvIcDeciveNew;
 import org.hibernate.annotations.*;
 import java.sql.Timestamp;
 import java.io.Serializable;
@@ -30,17 +36,18 @@ import java.io.Serializable;
 /**
 * @website https://el-admin.vip
 * @description /
-* @author yang
-* @date 2021-05-08
+* @author wanglongda
+* @date 2022-05-13
 **/
 @Entity
 @Data
 @Table(name="dm_env_pept_decive_new")
-public class DmEnvPeptDeciveNew implements Serializable {
+public class DmEnvPeptDeciveNew extends BaseEntity implements Serializable {
 
     @Id
     @Column(name = "id")
     @ApiModelProperty(value = "主键")
+    @JSONField(serializeUsing = ToStringSerializer.class)
     private Long id;
 
     @Column(name = "device_identifier")
@@ -51,39 +58,22 @@ public class DmEnvPeptDeciveNew implements Serializable {
     @ApiModelProperty(value = "设备名称")
     private String deviceName;
 
-    @Column(name = "region")
-    @ApiModelProperty(value = "所在区域")
-    private String region;
-
-    @Column(name = "monitor_object")
-    @ApiModelProperty(value = "监控对象")
-    private String monitorObject;
-
-    @Column(name = "channel")
-    @ApiModelProperty(value = "通信方式")
-    private String channel;
-
     @Column(name = "status")
     @ApiModelProperty(value = "状态")
-    private Boolean status;
-
-    @Column(name = "create_time")
-    @CreationTimestamp
-    @ApiModelProperty(value = "注册时间")
-    private Timestamp createTime;
+    private String status;
 
-    @Column(name = "update_time")
-    @UpdateTimestamp
-    @ApiModelProperty(value = "更新时间")
-    private Timestamp updateTime;
+    @Column(name = "device_floor")
+    @ApiModelProperty(value = "所在楼层")
+    private Integer deviceFloor;
 
-    @Column(name = "create_by")
-    @ApiModelProperty(value = "创建人")
-    private String createBy;
+    @Column(name = "device_address")
+    @ApiModelProperty(value = "所在位置")
+    private String deviceAddress;
 
-    @Column(name = "update_by")
-    @ApiModelProperty(value = "更新人")
-    private String updateBy;
+    @ManyToOne(fetch = FetchType.LAZY,cascade = {CascadeType.MERGE,CascadeType.PERSIST})
+    @JoinColumn(name = "ic_device_identifier",referencedColumnName = "device_identifier")
+    @ApiModelProperty(value = "关联通信设备id")
+    private DmEnvIcDeciveNew dmEnvIcDeciveNew;
 
     public void copy(DmEnvPeptDeciveNew source){
         BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true));

eladmin-system/src/main/java/me/zhengjie/modules/dm/envmonitor/peptdevicenew/repository/DmEnvPeptDeciveNewRepository.java

@@ -21,8 +21,8 @@ import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 
 /**
 * @website https://el-admin.vip
-* @author yang
-* @date 2021-05-08
+* @author wanglongda
+* @date 2022-05-13
 **/
 public interface DmEnvPeptDeciveNewRepository extends JpaRepository<DmEnvPeptDeciveNew, Long>, JpaSpecificationExecutor<DmEnvPeptDeciveNew> {
 }

eladmin-system/src/main/java/me/zhengjie/modules/dm/envmonitor/peptdevicenew/rest/DmEnvPeptDeciveNewController.java

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

eladmin-system/src/main/java/me/zhengjie/modules/dm/envmonitor/peptdevicenew/service/DmEnvPeptDeciveNewService.java

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

eladmin-system/src/main/java/me/zhengjie/modules/dm/envmonitor/peptdevicenew/service/dto/DmEnvPeptDeciveNewDto.java

@@ -20,15 +20,17 @@ import java.sql.Timestamp;
 import java.io.Serializable;
 import com.alibaba.fastjson.annotation.JSONField;
 import com.alibaba.fastjson.serializer.ToStringSerializer;
+import me.zhengjie.base.BaseDTO;
+import me.zhengjie.modules.dm.envmonitor.icdevicenew.domain.DmEnvIcDeciveNew;
 
 /**
 * @website https://el-admin.vip
 * @description /
-* @author yang
-* @date 2021-05-08
+* @author wanglongda
+* @date 2022-05-13
 **/
 @Data
-public class DmEnvPeptDeciveNewDto implements Serializable {
+public class DmEnvPeptDeciveNewDto extends BaseDTO implements Serializable {
 
     /** 主键 */
     /** 防止精度丢失 */
@@ -41,27 +43,15 @@ public class DmEnvPeptDeciveNewDto implements Serializable {
     /** 设备名称 */
     private String deviceName;
 
-    /** 所在区域 */
-    private String region;
-
-    /** 监控对象 */
-    private String monitorObject;
-
-    /** 通信方式 */
-    private String channel;
-
     /** 状态 */
-    private Boolean status;
-
-    /** 注册时间 */
-    private Timestamp createTime;
+    private String status;
 
-    /** 更新时间 */
-    private Timestamp updateTime;
+    /** 所在楼层 */
+    private Integer deviceFloor;
 
-    /** 创建人 */
-    private String createBy;
+    /** 所在位置 */
+    private String deviceAddress;
 
-    /** 更新人 */
-    private String updateBy;
+    /** 关联通信设备id */
+    private DmEnvIcDeciveNew dmEnvIcDeciveNew;
 }

eladmin-system/src/main/java/me/zhengjie/modules/dm/envmonitor/peptdevicenew/service/dto/DmEnvPeptDeciveNewQueryCriteria.java

@@ -21,17 +21,21 @@ import me.zhengjie.annotation.Query;
 
 /**
 * @website https://el-admin.vip
-* @author yang
-* @date 2021-05-08
+* @author wanglongda
+* @date 2022-05-13
 **/
 @Data
 public class DmEnvPeptDeciveNewQueryCriteria{
 
-    /** 模糊 */
-    @Query(type = Query.Type.INNER_LIKE)
+    /** 精确 */
+    @Query
     private String deviceIdentifier;
 
     /** 模糊 */
     @Query(type = Query.Type.INNER_LIKE)
     private String deviceName;
+
+    /** 精确 */
+    @Query
+    private String status;
 }

eladmin-system/src/main/java/me/zhengjie/modules/dm/envmonitor/peptdevicenew/service/impl/DmEnvPeptDeciveNewServiceImpl.java

@@ -42,8 +42,8 @@ import java.util.LinkedHashMap;
 /**
 * @website https://el-admin.vip
 * @description 服务实现
-* @author yang
-* @date 2021-05-08
+* @author wanglongda
+* @date 2022-05-13
 **/
 @Service
 @RequiredArgsConstructor
@@ -102,14 +102,14 @@ public class DmEnvPeptDeciveNewServiceImpl implements DmEnvPeptDeciveNewService
             Map<String,Object> map = new LinkedHashMap<>();
             map.put("设备编码", dmEnvPeptDeciveNew.getDeviceIdentifier());
             map.put("设备名称", dmEnvPeptDeciveNew.getDeviceName());
-            map.put("所在区域", dmEnvPeptDeciveNew.getRegion());
-            map.put("监控对象", dmEnvPeptDeciveNew.getMonitorObject());
-            map.put("通信方式", dmEnvPeptDeciveNew.getChannel());
             map.put("状态", dmEnvPeptDeciveNew.getStatus());
             map.put("注册时间", dmEnvPeptDeciveNew.getCreateTime());
             map.put("更新时间", dmEnvPeptDeciveNew.getUpdateTime());
             map.put("创建人", dmEnvPeptDeciveNew.getCreateBy());
             map.put("更新人", dmEnvPeptDeciveNew.getUpdateBy());
+            map.put("所在楼层", dmEnvPeptDeciveNew.getDeviceFloor());
+            map.put("所在位置", dmEnvPeptDeciveNew.getDeviceAddress());
+            map.put("关联通信设备", dmEnvPeptDeciveNew.getDmEnvIcDeciveNew());
             list.add(map);
         }
         FileUtil.downloadExcel(list, response);

eladmin-system/src/main/java/me/zhengjie/modules/dm/envmonitor/peptdevicenew/service/mapstruct/DmEnvPeptDeciveNewMapper.java

@@ -23,8 +23,8 @@ import org.mapstruct.ReportingPolicy;
 
 /**
 * @website https://el-admin.vip
-* @author yang
-* @date 2021-05-08
+* @author wanglongda
+* @date 2022-05-13
 **/
 @Mapper(componentModel = "spring", unmappedTargetPolicy = ReportingPolicy.IGNORE)
 public interface DmEnvPeptDeciveNewMapper extends BaseMapper<DmEnvPeptDeciveNewDto, DmEnvPeptDeciveNew> {

eladmin-system/src/main/java/me/zhengjie/modules/dm/floor/service/impl/DmFloorServiceImpl.java

@@ -106,7 +106,7 @@ public class DmFloorServiceImpl implements DmFloorService {
             map.put("联系方式", dmFloor.getContacts());
             map.put("排序", dmFloor.getSortIndex());
             map.put("创建者", dmFloor.getCreateBy());
-            map.put("更新者", dmFloor.getUpdatedBy());
+            map.put("更新者", dmFloor.getUpdateBy());
             map.put("创建日期", dmFloor.getCreateTime());
             map.put("更新时间", dmFloor.getUpdateTime());
             list.add(map);

eladmin-system/src/main/java/me/zhengjie/modules/dm/user/service/impl/DmUserServiceImpl.java

@@ -120,7 +120,7 @@ public class DmUserServiceImpl implements DmUserService {
             map.put("部门", dmUser.getDept() != null ? dmUser.getDept().getName() : "");
             map.put("是否是审批人", dmUser.getIsApprover());
             map.put("创建者", dmUser.getCreateBy());
-            map.put("更新者", dmUser.getUpdatedBy());
+            map.put("更新者", dmUser.getUpdateBy());
             /*map.put("创建日期", dmUser.getCreateTime());
             map.put("更新时间", dmUser.getUpdateTime());*/
             list.add(map);