From 4bfd46889c5590b7c07b8291deb7d444c4b46fdd Mon Sep 17 00:00:00 2001 From: haha Date: Wed, 14 Aug 2024 01:13:37 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=9F=BA=E5=9D=91=E7=9B=91?= =?UTF-8?q?=E6=B5=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application.yml | 2 +- .../domain/DevPitmonitSouthsmosDevSp.java | 112 +++ .../domain/DevPitmonitSouthsmosDevice.java | 407 +++++++++++ .../DevPitmonitSouthsmosSurveypoint.java | 14 + .../DevPitmonitSouthsmosDevSpMapper.java | 61 ++ .../DevPitmonitSouthsmosDeviceMapper.java | 61 ++ .../IDevPitmonitSouthsmosDevSpService.java | 63 ++ .../IDevPitmonitSouthsmosDeviceService.java | 64 ++ .../DevPitmonitSouthsmosDevSpServiceImpl.java | 121 ++++ ...DevPitmonitSouthsmosDeviceServiceImpl.java | 128 ++++ ...evPitmonitSouthsmosElementServiceImpl.java | 6 +- .../quartz/task/PitmonitSouthsmosTask.java | 23 +- .../DevPitmonitSouthsmosDevSpMapper.xml | 96 +++ .../DevPitmonitSouthsmosDeviceMapper.xml | 196 ++++++ .../DevPitmonitSouthsmosSurveypointMapper.xml | 7 +- ruoyi-ui/package.json | 7 +- ruoyi-ui/src/api/device/pitAlarm.js | 44 ++ ruoyi-ui/src/api/device/pitConfig.js | 49 ++ ruoyi-ui/src/api/device/pitData.js | 44 ++ ruoyi-ui/src/api/device/pitDevice.js | 44 ++ .../src/api/device/pitDeviceSurveyPoint.js | 44 ++ ruoyi-ui/src/api/device/pitElement.js | 44 ++ ruoyi-ui/src/api/device/pitElementItem.js | 44 ++ ruoyi-ui/src/api/device/pitSurveyPoint.js | 44 ++ ruoyi-ui/src/api/device/pitThreshold.js | 44 ++ ruoyi-ui/src/views/device/pitAlarm/index.vue | 655 ++++++++++++++++++ ruoyi-ui/src/views/device/pitConfig/index.vue | 262 +++++++ ruoyi-ui/src/views/device/pitData/index.vue | 462 ++++++++++++ ruoyi-ui/src/views/device/pitDevice/index.vue | 547 +++++++++++++++ .../device/pitDeviceSurveyPoint/index.vue | 310 +++++++++ .../src/views/device/pitElement/index.vue | 344 +++++++++ .../src/views/device/pitElementItem/index.vue | 394 +++++++++++ .../src/views/device/pitSurveyPoint/index.vue | 457 ++++++++++++ .../src/views/device/pitThreshold/index.vue | 453 ++++++++++++ .../PitmonitSouthsmosAlarmController.java | 104 +++ .../PitmonitSouthsmosDataController.java | 104 +++ .../PitmonitSouthsmosDevSpController.java | 104 +++ .../PitmonitSouthsmosDeviceController.java | 104 +++ .../PitmonitSouthsmosElementController.java | 104 +++ ...itmonitSouthsmosElementItemController.java | 104 +++ ...itmonitSouthsmosSurveypointController.java | 104 +++ .../PitmonitSouthsmosThresholdController.java | 104 +++ .../ProjectPitMonitCfgController.java | 112 +++ .../device/domain/PitmonitSouthsmosAlarm.java | 440 ++++++++++++ .../device/domain/PitmonitSouthsmosData.java | 270 ++++++++ .../device/domain/PitmonitSouthsmosDevSp.java | 112 +++ .../domain/PitmonitSouthsmosDevice.java | 395 +++++++++++ .../domain/PitmonitSouthsmosElement.java | 168 +++++ .../domain/PitmonitSouthsmosElementItem.java | 196 ++++++ .../domain/PitmonitSouthsmosSurveypoint.java | 256 +++++++ .../domain/PitmonitSouthsmosThreshold.java | 266 +++++++ .../jh/device/domain/ProjectPitMonitCfg.java | 141 ++++ .../mapper/PitmonitSouthsmosAlarmMapper.java | 61 ++ .../mapper/PitmonitSouthsmosDataMapper.java | 61 ++ .../mapper/PitmonitSouthsmosDevSpMapper.java | 61 ++ .../mapper/PitmonitSouthsmosDeviceMapper.java | 61 ++ .../PitmonitSouthsmosElementItemMapper.java | 61 ++ .../PitmonitSouthsmosElementMapper.java | 61 ++ .../PitmonitSouthsmosSurveypointMapper.java | 61 ++ .../PitmonitSouthsmosThresholdMapper.java | 61 ++ .../mapper/ProjectPitMonitCfgMapper.java | 75 ++ .../IPitmonitSouthsmosAlarmService.java | 61 ++ .../IPitmonitSouthsmosDataService.java | 61 ++ .../IPitmonitSouthsmosDevSpService.java | 61 ++ .../IPitmonitSouthsmosDeviceService.java | 61 ++ .../IPitmonitSouthsmosElementItemService.java | 61 ++ .../IPitmonitSouthsmosElementService.java | 61 ++ .../IPitmonitSouthsmosSurveypointService.java | 61 ++ .../IPitmonitSouthsmosThresholdService.java | 61 ++ .../service/IProjectPitMonitCfgService.java | 76 ++ .../PitmonitSouthsmosAlarmServiceImpl.java | 98 +++ .../PitmonitSouthsmosDataServiceImpl.java | 98 +++ .../PitmonitSouthsmosDevSpServiceImpl.java | 98 +++ .../PitmonitSouthsmosDeviceServiceImpl.java | 98 +++ ...tmonitSouthsmosElementItemServiceImpl.java | 98 +++ .../PitmonitSouthsmosElementServiceImpl.java | 98 +++ ...tmonitSouthsmosSurveypointServiceImpl.java | 98 +++ ...PitmonitSouthsmosThresholdServiceImpl.java | 98 +++ .../impl/ProjectPitMonitCfgServiceImpl.java | 113 +++ .../device/PitmonitSouthsmosAlarmMapper.xml | 211 ++++++ .../device/PitmonitSouthsmosDataMapper.xml | 151 ++++ .../device/PitmonitSouthsmosDevSpMapper.xml | 96 +++ .../device/PitmonitSouthsmosDeviceMapper.xml | 196 ++++++ .../PitmonitSouthsmosElementItemMapper.xml | 126 ++++ .../device/PitmonitSouthsmosElementMapper.xml | 116 ++++ .../PitmonitSouthsmosSurveypointMapper.xml | 146 ++++ .../PitmonitSouthsmosThresholdMapper.xml | 151 ++++ .../device/ProjectPitMonitCfgMapper.xml | 106 +++ 88 files changed, 12155 insertions(+), 9 deletions(-) create mode 100644 ruoyi-quartz/src/main/java/com/ruoyi/quartz/domain/DevPitmonitSouthsmosDevSp.java create mode 100644 ruoyi-quartz/src/main/java/com/ruoyi/quartz/domain/DevPitmonitSouthsmosDevice.java create mode 100644 ruoyi-quartz/src/main/java/com/ruoyi/quartz/mapper/DevPitmonitSouthsmosDevSpMapper.java create mode 100644 ruoyi-quartz/src/main/java/com/ruoyi/quartz/mapper/DevPitmonitSouthsmosDeviceMapper.java create mode 100644 ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/IDevPitmonitSouthsmosDevSpService.java create mode 100644 ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/IDevPitmonitSouthsmosDeviceService.java create mode 100644 ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/DevPitmonitSouthsmosDevSpServiceImpl.java create mode 100644 ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/DevPitmonitSouthsmosDeviceServiceImpl.java create mode 100644 ruoyi-quartz/src/main/resources/mapper/quartz/DevPitmonitSouthsmosDevSpMapper.xml create mode 100644 ruoyi-quartz/src/main/resources/mapper/quartz/DevPitmonitSouthsmosDeviceMapper.xml create mode 100644 ruoyi-ui/src/api/device/pitAlarm.js create mode 100644 ruoyi-ui/src/api/device/pitConfig.js create mode 100644 ruoyi-ui/src/api/device/pitData.js create mode 100644 ruoyi-ui/src/api/device/pitDevice.js create mode 100644 ruoyi-ui/src/api/device/pitDeviceSurveyPoint.js create mode 100644 ruoyi-ui/src/api/device/pitElement.js create mode 100644 ruoyi-ui/src/api/device/pitElementItem.js create mode 100644 ruoyi-ui/src/api/device/pitSurveyPoint.js create mode 100644 ruoyi-ui/src/api/device/pitThreshold.js create mode 100644 ruoyi-ui/src/views/device/pitAlarm/index.vue create mode 100644 ruoyi-ui/src/views/device/pitConfig/index.vue create mode 100644 ruoyi-ui/src/views/device/pitData/index.vue create mode 100644 ruoyi-ui/src/views/device/pitDevice/index.vue create mode 100644 ruoyi-ui/src/views/device/pitDeviceSurveyPoint/index.vue create mode 100644 ruoyi-ui/src/views/device/pitElement/index.vue create mode 100644 ruoyi-ui/src/views/device/pitElementItem/index.vue create mode 100644 ruoyi-ui/src/views/device/pitSurveyPoint/index.vue create mode 100644 ruoyi-ui/src/views/device/pitThreshold/index.vue create mode 100644 yanzhu-jh/src/main/java/com/yanzhu/jh/device/controller/PitmonitSouthsmosAlarmController.java create mode 100644 yanzhu-jh/src/main/java/com/yanzhu/jh/device/controller/PitmonitSouthsmosDataController.java create mode 100644 yanzhu-jh/src/main/java/com/yanzhu/jh/device/controller/PitmonitSouthsmosDevSpController.java create mode 100644 yanzhu-jh/src/main/java/com/yanzhu/jh/device/controller/PitmonitSouthsmosDeviceController.java create mode 100644 yanzhu-jh/src/main/java/com/yanzhu/jh/device/controller/PitmonitSouthsmosElementController.java create mode 100644 yanzhu-jh/src/main/java/com/yanzhu/jh/device/controller/PitmonitSouthsmosElementItemController.java create mode 100644 yanzhu-jh/src/main/java/com/yanzhu/jh/device/controller/PitmonitSouthsmosSurveypointController.java create mode 100644 yanzhu-jh/src/main/java/com/yanzhu/jh/device/controller/PitmonitSouthsmosThresholdController.java create mode 100644 yanzhu-jh/src/main/java/com/yanzhu/jh/device/controller/ProjectPitMonitCfgController.java create mode 100644 yanzhu-jh/src/main/java/com/yanzhu/jh/device/domain/PitmonitSouthsmosAlarm.java create mode 100644 yanzhu-jh/src/main/java/com/yanzhu/jh/device/domain/PitmonitSouthsmosData.java create mode 100644 yanzhu-jh/src/main/java/com/yanzhu/jh/device/domain/PitmonitSouthsmosDevSp.java create mode 100644 yanzhu-jh/src/main/java/com/yanzhu/jh/device/domain/PitmonitSouthsmosDevice.java create mode 100644 yanzhu-jh/src/main/java/com/yanzhu/jh/device/domain/PitmonitSouthsmosElement.java create mode 100644 yanzhu-jh/src/main/java/com/yanzhu/jh/device/domain/PitmonitSouthsmosElementItem.java create mode 100644 yanzhu-jh/src/main/java/com/yanzhu/jh/device/domain/PitmonitSouthsmosSurveypoint.java create mode 100644 yanzhu-jh/src/main/java/com/yanzhu/jh/device/domain/PitmonitSouthsmosThreshold.java create mode 100644 yanzhu-jh/src/main/java/com/yanzhu/jh/device/domain/ProjectPitMonitCfg.java create mode 100644 yanzhu-jh/src/main/java/com/yanzhu/jh/device/mapper/PitmonitSouthsmosAlarmMapper.java create mode 100644 yanzhu-jh/src/main/java/com/yanzhu/jh/device/mapper/PitmonitSouthsmosDataMapper.java create mode 100644 yanzhu-jh/src/main/java/com/yanzhu/jh/device/mapper/PitmonitSouthsmosDevSpMapper.java create mode 100644 yanzhu-jh/src/main/java/com/yanzhu/jh/device/mapper/PitmonitSouthsmosDeviceMapper.java create mode 100644 yanzhu-jh/src/main/java/com/yanzhu/jh/device/mapper/PitmonitSouthsmosElementItemMapper.java create mode 100644 yanzhu-jh/src/main/java/com/yanzhu/jh/device/mapper/PitmonitSouthsmosElementMapper.java create mode 100644 yanzhu-jh/src/main/java/com/yanzhu/jh/device/mapper/PitmonitSouthsmosSurveypointMapper.java create mode 100644 yanzhu-jh/src/main/java/com/yanzhu/jh/device/mapper/PitmonitSouthsmosThresholdMapper.java create mode 100644 yanzhu-jh/src/main/java/com/yanzhu/jh/device/mapper/ProjectPitMonitCfgMapper.java create mode 100644 yanzhu-jh/src/main/java/com/yanzhu/jh/device/service/IPitmonitSouthsmosAlarmService.java create mode 100644 yanzhu-jh/src/main/java/com/yanzhu/jh/device/service/IPitmonitSouthsmosDataService.java create mode 100644 yanzhu-jh/src/main/java/com/yanzhu/jh/device/service/IPitmonitSouthsmosDevSpService.java create mode 100644 yanzhu-jh/src/main/java/com/yanzhu/jh/device/service/IPitmonitSouthsmosDeviceService.java create mode 100644 yanzhu-jh/src/main/java/com/yanzhu/jh/device/service/IPitmonitSouthsmosElementItemService.java create mode 100644 yanzhu-jh/src/main/java/com/yanzhu/jh/device/service/IPitmonitSouthsmosElementService.java create mode 100644 yanzhu-jh/src/main/java/com/yanzhu/jh/device/service/IPitmonitSouthsmosSurveypointService.java create mode 100644 yanzhu-jh/src/main/java/com/yanzhu/jh/device/service/IPitmonitSouthsmosThresholdService.java create mode 100644 yanzhu-jh/src/main/java/com/yanzhu/jh/device/service/IProjectPitMonitCfgService.java create mode 100644 yanzhu-jh/src/main/java/com/yanzhu/jh/device/service/impl/PitmonitSouthsmosAlarmServiceImpl.java create mode 100644 yanzhu-jh/src/main/java/com/yanzhu/jh/device/service/impl/PitmonitSouthsmosDataServiceImpl.java create mode 100644 yanzhu-jh/src/main/java/com/yanzhu/jh/device/service/impl/PitmonitSouthsmosDevSpServiceImpl.java create mode 100644 yanzhu-jh/src/main/java/com/yanzhu/jh/device/service/impl/PitmonitSouthsmosDeviceServiceImpl.java create mode 100644 yanzhu-jh/src/main/java/com/yanzhu/jh/device/service/impl/PitmonitSouthsmosElementItemServiceImpl.java create mode 100644 yanzhu-jh/src/main/java/com/yanzhu/jh/device/service/impl/PitmonitSouthsmosElementServiceImpl.java create mode 100644 yanzhu-jh/src/main/java/com/yanzhu/jh/device/service/impl/PitmonitSouthsmosSurveypointServiceImpl.java create mode 100644 yanzhu-jh/src/main/java/com/yanzhu/jh/device/service/impl/PitmonitSouthsmosThresholdServiceImpl.java create mode 100644 yanzhu-jh/src/main/java/com/yanzhu/jh/device/service/impl/ProjectPitMonitCfgServiceImpl.java create mode 100644 yanzhu-jh/src/main/resources/mapper/device/PitmonitSouthsmosAlarmMapper.xml create mode 100644 yanzhu-jh/src/main/resources/mapper/device/PitmonitSouthsmosDataMapper.xml create mode 100644 yanzhu-jh/src/main/resources/mapper/device/PitmonitSouthsmosDevSpMapper.xml create mode 100644 yanzhu-jh/src/main/resources/mapper/device/PitmonitSouthsmosDeviceMapper.xml create mode 100644 yanzhu-jh/src/main/resources/mapper/device/PitmonitSouthsmosElementItemMapper.xml create mode 100644 yanzhu-jh/src/main/resources/mapper/device/PitmonitSouthsmosElementMapper.xml create mode 100644 yanzhu-jh/src/main/resources/mapper/device/PitmonitSouthsmosSurveypointMapper.xml create mode 100644 yanzhu-jh/src/main/resources/mapper/device/PitmonitSouthsmosThresholdMapper.xml create mode 100644 yanzhu-jh/src/main/resources/mapper/device/ProjectPitMonitCfgMapper.xml diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml index 8cdba68b..73a50cfe 100644 --- a/ruoyi-admin/src/main/resources/application.yml +++ b/ruoyi-admin/src/main/resources/application.yml @@ -24,7 +24,7 @@ spring: # 国际化资源文件路径 basename: i18n/messages profiles: - active: prod + active: druid # 文件上传 servlet: multipart: diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/domain/DevPitmonitSouthsmosDevSp.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/domain/DevPitmonitSouthsmosDevSp.java new file mode 100644 index 00000000..45ae0062 --- /dev/null +++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/domain/DevPitmonitSouthsmosDevSp.java @@ -0,0 +1,112 @@ +package com.ruoyi.quartz.domain; + +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.common.core.domain.BaseEntity; + +/** + * 基坑监测-南方测绘-设备-测点关系对象 dev_pitmonit_southsmos_dev_sp + * + * @author ruoyi + * @date 2024-08-11 + */ +public class DevPitmonitSouthsmosDevSp extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** $column.columnComment */ + private Long id; + + /** 配置ID */ + @Excel(name = "配置ID") + private Long cfgId; + + /** 设备ID */ + @Excel(name = "设备ID") + private Long devId; + + /** 测点ID */ + @Excel(name = "测点ID") + private Long spId; + + /** $column.columnComment */ + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Long state; + + /** $column.columnComment */ + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Long isDel; + + public void setId(Long id) + { + this.id = id; + } + + public Long getId() + { + return id; + } + public void setCfgId(Long cfgId) + { + this.cfgId = cfgId; + } + + public Long getCfgId() + { + return cfgId; + } + public void setDevId(Long devId) + { + this.devId = devId; + } + + public Long getDevId() + { + return devId; + } + public void setSpId(Long spId) + { + this.spId = spId; + } + + public Long getSpId() + { + return spId; + } + public void setState(Long state) + { + this.state = state; + } + + public Long getState() + { + return state; + } + public void setIsDel(Long isDel) + { + this.isDel = isDel; + } + + public Long getIsDel() + { + return isDel; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("id", getId()) + .append("cfgId", getCfgId()) + .append("devId", getDevId()) + .append("spId", getSpId()) + .append("state", getState()) + .append("remark", getRemark()) + .append("isDel", getIsDel()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .toString(); + } +} diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/domain/DevPitmonitSouthsmosDevice.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/domain/DevPitmonitSouthsmosDevice.java new file mode 100644 index 00000000..546d8efe --- /dev/null +++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/domain/DevPitmonitSouthsmosDevice.java @@ -0,0 +1,407 @@ +package com.ruoyi.quartz.domain; + +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +import com.fasterxml.jackson.annotation.JsonFormat; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.common.core.domain.BaseEntity; + +/** + * 基坑监测-南方测绘-设备对象 dev_pitmonit_southsmos_device + * + * @author ruoyi + * @date 2024-08-11 + */ +public class DevPitmonitSouthsmosDevice extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** $column.columnComment */ + private Long id; + + /** 配置ID */ + @Excel(name = "配置ID") + private Long cfgId; + + /** 设备ID */ + @Excel(name = "设备ID") + private Long devId; + + /** $column.columnComment */ + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String autoType; + + /** $column.columnComment */ + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String certUrl; + + /** $column.columnComment */ + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Date checkDate; + + /** 设备名称 */ + @Excel(name = "设备名称") + private String devCode; + + /** $column.columnComment */ + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String devShadow; + + /** $column.columnComment */ + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String devType; + + /** $column.columnComment */ + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String devTypeName; + + /** $column.columnComment */ + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String key; + + /** $column.columnComment */ + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String manufacturer; + + /** 设备名称 */ + @Excel(name = "设备名称") + private String name; + + /** $column.columnComment */ + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Long orgId; + + /** $column.columnComment */ + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String parent; + + /** $column.columnComment */ + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String parentIds; + + /** $column.columnComment */ + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String productType; + + /** 位置 */ + @Excel(name = "位置") + private String position; + + /** */ + @Excel(name = "") + private String status; + + /** 工程ID */ + @Excel(name = "工程ID") + private Long structureId; + + /** $column.columnComment */ + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String structureName; + + /** $column.columnComment */ + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String typeCategory; + + /** $column.columnComment */ + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String typeName; + + /** $column.columnComment */ + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String verifyDate; + + /** $column.columnComment */ + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Long state; + + /** $column.columnComment */ + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Long isDel; + + public List getSpDevices() { + return spDevices; + } + + public void setSpDevices(List spDevices) { + this.spDevices = spDevices; + } + + private List spDevices=new ArrayList<>(); + + public void setId(Long id) + { + this.id = id; + } + + public Long getId() + { + return id; + } + public void setCfgId(Long cfgId) + { + this.cfgId = cfgId; + } + + public Long getCfgId() + { + return cfgId; + } + public void setDevId(Long devId) + { + this.devId = devId; + } + + public Long getDevId() + { + return devId; + } + public void setAutoType(String autoType) + { + this.autoType = autoType; + } + + public String getAutoType() + { + return autoType; + } + public void setCertUrl(String certUrl) + { + this.certUrl = certUrl; + } + + public String getCertUrl() + { + return certUrl; + } + public void setCheckDate(Date checkDate) + { + this.checkDate = checkDate; + } + + public Date getCheckDate() + { + return checkDate; + } + public void setDevCode(String devCode) + { + this.devCode = devCode; + } + + public String getDevCode() + { + return devCode; + } + public void setDevShadow(String devShadow) + { + this.devShadow = devShadow; + } + + public String getDevShadow() + { + return devShadow; + } + public void setDevType(String devType) + { + this.devType = devType; + } + + public String getDevType() + { + return devType; + } + public void setDevTypeName(String devTypeName) + { + this.devTypeName = devTypeName; + } + + public String getDevTypeName() + { + return devTypeName; + } + public void setKey(String key) + { + this.key = key; + } + + public String getKey() + { + return key; + } + public void setManufacturer(String manufacturer) + { + this.manufacturer = manufacturer; + } + + public String getManufacturer() + { + return manufacturer; + } + public void setName(String name) + { + this.name = name; + } + + public String getName() + { + return name; + } + public void setOrgId(Long orgId) + { + this.orgId = orgId; + } + + public Long getOrgId() + { + return orgId; + } + public void setParent(String parent) + { + this.parent = parent; + } + + public String getParent() + { + return parent; + } + public void setParentIds(String parentIds) + { + this.parentIds = parentIds; + } + + public String getParentIds() + { + return parentIds; + } + public void setProductType(String productType) + { + this.productType = productType; + } + + public String getProductType() + { + return productType; + } + public void setPosition(String position) + { + this.position = position; + } + + public String getPosition() + { + return position; + } + public void setStatus(String status) + { + this.status = status; + } + + public String getStatus() + { + return status; + } + public void setStructureId(Long structureId) + { + this.structureId = structureId; + } + + public Long getStructureId() + { + return structureId; + } + public void setStructureName(String structureName) + { + this.structureName = structureName; + } + + public String getStructureName() + { + return structureName; + } + public void setTypeCategory(String typeCategory) + { + this.typeCategory = typeCategory; + } + + public String getTypeCategory() + { + return typeCategory; + } + public void setTypeName(String typeName) + { + this.typeName = typeName; + } + + public String getTypeName() + { + return typeName; + } + public void setVerifyDate(String verifyDate) + { + this.verifyDate = verifyDate; + } + + public String getVerifyDate() + { + return verifyDate; + } + public void setState(Long state) + { + this.state = state; + } + + public Long getState() + { + return state; + } + public void setIsDel(Long isDel) + { + this.isDel = isDel; + } + + public Long getIsDel() + { + return isDel; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("id", getId()) + .append("cfgId", getCfgId()) + .append("devId", getDevId()) + .append("autoType", getAutoType()) + .append("certUrl", getCertUrl()) + .append("checkDate", getCheckDate()) + .append("devCode", getDevCode()) + .append("devShadow", getDevShadow()) + .append("devType", getDevType()) + .append("devTypeName", getDevTypeName()) + .append("key", getKey()) + .append("manufacturer", getManufacturer()) + .append("name", getName()) + .append("orgId", getOrgId()) + .append("parent", getParent()) + .append("parentIds", getParentIds()) + .append("productType", getProductType()) + .append("position", getPosition()) + .append("status", getStatus()) + .append("structureId", getStructureId()) + .append("structureName", getStructureName()) + .append("typeCategory", getTypeCategory()) + .append("typeName", getTypeName()) + .append("verifyDate", getVerifyDate()) + .append("state", getState()) + .append("remark", getRemark()) + .append("isDel", getIsDel()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .toString(); + } +} diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/domain/DevPitmonitSouthsmosSurveypoint.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/domain/DevPitmonitSouthsmosSurveypoint.java index ba6fbbad..aeda6462 100644 --- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/domain/DevPitmonitSouthsmosSurveypoint.java +++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/domain/DevPitmonitSouthsmosSurveypoint.java @@ -61,6 +61,10 @@ public class DevPitmonitSouthsmosSurveypoint extends BaseEntity @Excel(name = "测点名称") private String name; + /** 位置 */ + @Excel(name = "位置") + private String position; + /** 数据来源形式0：人工上传；1：设备 */ @Excel(name = "数据来源形式0：人工上传；1：设备") private Long dataSource; @@ -173,6 +177,15 @@ public class DevPitmonitSouthsmosSurveypoint extends BaseEntity { return name; } + public void setPosition(String position) + { + this.position = position; + } + + public String getPosition() + { + return position; + } public void setDataSource(Long dataSource) { this.dataSource = dataSource; @@ -232,6 +245,7 @@ public class DevPitmonitSouthsmosSurveypoint extends BaseEntity .append("meNameEn", getMeNameEn()) .append("modifyDate", getModifyDate()) .append("name", getName()) + .append("position", getPosition()) .append("dataSource", getDataSource()) .append("createDate", getCreateDate()) .append("status", getStatus()) diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/mapper/DevPitmonitSouthsmosDevSpMapper.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/mapper/DevPitmonitSouthsmosDevSpMapper.java new file mode 100644 index 00000000..592d8c8b --- /dev/null +++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/mapper/DevPitmonitSouthsmosDevSpMapper.java @@ -0,0 +1,61 @@ +package com.ruoyi.quartz.mapper; + +import java.util.List; +import com.ruoyi.quartz.domain.DevPitmonitSouthsmosDevSp; + +/** + * 基坑监测-南方测绘-设备-测点关系Mapper接口 + * + * @author ruoyi + * @date 2024-08-11 + */ +public interface DevPitmonitSouthsmosDevSpMapper +{ + /** + * 查询基坑监测-南方测绘-设备-测点关系 + * + * @param id 基坑监测-南方测绘-设备-测点关系主键 + * @return 基坑监测-南方测绘-设备-测点关系 + */ + public DevPitmonitSouthsmosDevSp selectDevPitmonitSouthsmosDevSpById(Long id); + + /** + * 查询基坑监测-南方测绘-设备-测点关系列表 + * + * @param devPitmonitSouthsmosDevSp 基坑监测-南方测绘-设备-测点关系 + * @return 基坑监测-南方测绘-设备-测点关系集合 + */ + public List selectDevPitmonitSouthsmosDevSpList(DevPitmonitSouthsmosDevSp devPitmonitSouthsmosDevSp); + + /** + * 新增基坑监测-南方测绘-设备-测点关系 + * + * @param devPitmonitSouthsmosDevSp 基坑监测-南方测绘-设备-测点关系 + * @return 结果 + */ + public int insertDevPitmonitSouthsmosDevSp(DevPitmonitSouthsmosDevSp devPitmonitSouthsmosDevSp); + + /** + * 修改基坑监测-南方测绘-设备-测点关系 + * + * @param devPitmonitSouthsmosDevSp 基坑监测-南方测绘-设备-测点关系 + * @return 结果 + */ + public int updateDevPitmonitSouthsmosDevSp(DevPitmonitSouthsmosDevSp devPitmonitSouthsmosDevSp); + + /** + * 删除基坑监测-南方测绘-设备-测点关系 + * + * @param id 基坑监测-南方测绘-设备-测点关系主键 + * @return 结果 + */ + public int deleteDevPitmonitSouthsmosDevSpById(Long id); + + /** + * 批量删除基坑监测-南方测绘-设备-测点关系 + * + * @param ids 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteDevPitmonitSouthsmosDevSpByIds(Long[] ids); +} diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/mapper/DevPitmonitSouthsmosDeviceMapper.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/mapper/DevPitmonitSouthsmosDeviceMapper.java new file mode 100644 index 00000000..fbbc4235 --- /dev/null +++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/mapper/DevPitmonitSouthsmosDeviceMapper.java @@ -0,0 +1,61 @@ +package com.ruoyi.quartz.mapper; + +import java.util.List; +import com.ruoyi.quartz.domain.DevPitmonitSouthsmosDevice; + +/** + * 基坑监测-南方测绘-设备Mapper接口 + * + * @author ruoyi + * @date 2024-08-11 + */ +public interface DevPitmonitSouthsmosDeviceMapper +{ + /** + * 查询基坑监测-南方测绘-设备 + * + * @param id 基坑监测-南方测绘-设备主键 + * @return 基坑监测-南方测绘-设备 + */ + public DevPitmonitSouthsmosDevice selectDevPitmonitSouthsmosDeviceById(Long id); + + /** + * 查询基坑监测-南方测绘-设备列表 + * + * @param devPitmonitSouthsmosDevice 基坑监测-南方测绘-设备 + * @return 基坑监测-南方测绘-设备集合 + */ + public List selectDevPitmonitSouthsmosDeviceList(DevPitmonitSouthsmosDevice devPitmonitSouthsmosDevice); + + /** + * 新增基坑监测-南方测绘-设备 + * + * @param devPitmonitSouthsmosDevice 基坑监测-南方测绘-设备 + * @return 结果 + */ + public int insertDevPitmonitSouthsmosDevice(DevPitmonitSouthsmosDevice devPitmonitSouthsmosDevice); + + /** + * 修改基坑监测-南方测绘-设备 + * + * @param devPitmonitSouthsmosDevice 基坑监测-南方测绘-设备 + * @return 结果 + */ + public int updateDevPitmonitSouthsmosDevice(DevPitmonitSouthsmosDevice devPitmonitSouthsmosDevice); + + /** + * 删除基坑监测-南方测绘-设备 + * + * @param id 基坑监测-南方测绘-设备主键 + * @return 结果 + */ + public int deleteDevPitmonitSouthsmosDeviceById(Long id); + + /** + * 批量删除基坑监测-南方测绘-设备 + * + * @param ids 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteDevPitmonitSouthsmosDeviceByIds(Long[] ids); +} diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/IDevPitmonitSouthsmosDevSpService.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/IDevPitmonitSouthsmosDevSpService.java new file mode 100644 index 00000000..3a94b6c3 --- /dev/null +++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/IDevPitmonitSouthsmosDevSpService.java @@ -0,0 +1,63 @@ +package com.ruoyi.quartz.service; + +import java.util.List; +import com.ruoyi.quartz.domain.DevPitmonitSouthsmosDevSp; + +/** + * 基坑监测-南方测绘-设备-测点关系Service接口 + * + * @author ruoyi + * @date 2024-08-11 + */ +public interface IDevPitmonitSouthsmosDevSpService +{ + /** + * 查询基坑监测-南方测绘-设备-测点关系 + * + * @param id 基坑监测-南方测绘-设备-测点关系主键 + * @return 基坑监测-南方测绘-设备-测点关系 + */ + public DevPitmonitSouthsmosDevSp selectDevPitmonitSouthsmosDevSpById(Long id); + public DevPitmonitSouthsmosDevSp selectDevPitmonitSouthsmosDevSpByDevId(Long devId,Long spId); + /** + * 查询基坑监测-南方测绘-设备-测点关系列表 + * + * @param devPitmonitSouthsmosDevSp 基坑监测-南方测绘-设备-测点关系 + * @return 基坑监测-南方测绘-设备-测点关系集合 + */ + public List selectDevPitmonitSouthsmosDevSpList(DevPitmonitSouthsmosDevSp devPitmonitSouthsmosDevSp); + + /** + * 新增基坑监测-南方测绘-设备-测点关系 + * + * @param devPitmonitSouthsmosDevSp 基坑监测-南方测绘-设备-测点关系 + * @return 结果 + */ + public int insertDevPitmonitSouthsmosDevSp(DevPitmonitSouthsmosDevSp devPitmonitSouthsmosDevSp); + + /** + * 修改基坑监测-南方测绘-设备-测点关系 + * + * @param devPitmonitSouthsmosDevSp 基坑监测-南方测绘-设备-测点关系 + * @return 结果 + */ + public int updateDevPitmonitSouthsmosDevSp(DevPitmonitSouthsmosDevSp devPitmonitSouthsmosDevSp); + + /** + * 批量删除基坑监测-南方测绘-设备-测点关系 + * + * @param ids 需要删除的基坑监测-南方测绘-设备-测点关系主键集合 + * @return 结果 + */ + public int deleteDevPitmonitSouthsmosDevSpByIds(Long[] ids); + + /** + * 删除基坑监测-南方测绘-设备-测点关系信息 + * + * @param id 基坑监测-南方测绘-设备-测点关系主键 + * @return 结果 + */ + public int deleteDevPitmonitSouthsmosDevSpById(Long id); + + public void addDevPitmonitSouthsmosDevSp(DevPitmonitSouthsmosDevSp item); +} diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/IDevPitmonitSouthsmosDeviceService.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/IDevPitmonitSouthsmosDeviceService.java new file mode 100644 index 00000000..c79790a9 --- /dev/null +++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/IDevPitmonitSouthsmosDeviceService.java @@ -0,0 +1,64 @@ +package com.ruoyi.quartz.service; + +import java.util.List; +import com.ruoyi.quartz.domain.DevPitmonitSouthsmosDevice; +import com.ruoyi.quartz.domain.SurProjectPitMonitCfg; + +/** + * 基坑监测-南方测绘-设备Service接口 + * + * @author ruoyi + * @date 2024-08-11 + */ +public interface IDevPitmonitSouthsmosDeviceService +{ + /** + * 查询基坑监测-南方测绘-设备 + * + * @param id 基坑监测-南方测绘-设备主键 + * @return 基坑监测-南方测绘-设备 + */ + public DevPitmonitSouthsmosDevice selectDevPitmonitSouthsmosDeviceById(Long id); + public DevPitmonitSouthsmosDevice selectDevPitmonitSouthsmosDeviceByDevId(Long devId); + /** + * 查询基坑监测-南方测绘-设备列表 + * + * @param devPitmonitSouthsmosDevice 基坑监测-南方测绘-设备 + * @return 基坑监测-南方测绘-设备集合 + */ + public List selectDevPitmonitSouthsmosDeviceList(DevPitmonitSouthsmosDevice devPitmonitSouthsmosDevice); + + /** + * 新增基坑监测-南方测绘-设备 + * + * @param devPitmonitSouthsmosDevice 基坑监测-南方测绘-设备 + * @return 结果 + */ + public int insertDevPitmonitSouthsmosDevice(DevPitmonitSouthsmosDevice devPitmonitSouthsmosDevice); + + /** + * 修改基坑监测-南方测绘-设备 + * + * @param devPitmonitSouthsmosDevice 基坑监测-南方测绘-设备 + * @return 结果 + */ + public int updateDevPitmonitSouthsmosDevice(DevPitmonitSouthsmosDevice devPitmonitSouthsmosDevice); + + /** + * 批量删除基坑监测-南方测绘-设备 + * + * @param ids 需要删除的基坑监测-南方测绘-设备主键集合 + * @return 结果 + */ + public int deleteDevPitmonitSouthsmosDeviceByIds(Long[] ids); + + /** + * 删除基坑监测-南方测绘-设备信息 + * + * @param id 基坑监测-南方测绘-设备主键 + * @return 结果 + */ + public int deleteDevPitmonitSouthsmosDeviceById(Long id); + + public void addList(List items, SurProjectPitMonitCfg cfg); +} diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/DevPitmonitSouthsmosDevSpServiceImpl.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/DevPitmonitSouthsmosDevSpServiceImpl.java new file mode 100644 index 00000000..eae67f32 --- /dev/null +++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/DevPitmonitSouthsmosDevSpServiceImpl.java @@ -0,0 +1,121 @@ +package com.ruoyi.quartz.service.impl; + +import java.util.ArrayList; +import java.util.List; + +import cn.hutool.core.util.StrUtil; +import com.ruoyi.common.utils.DateUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.ruoyi.quartz.mapper.DevPitmonitSouthsmosDevSpMapper; +import com.ruoyi.quartz.domain.DevPitmonitSouthsmosDevSp; +import com.ruoyi.quartz.service.IDevPitmonitSouthsmosDevSpService; +import com.ruoyi.common.utils.SecurityUtils; +/** + * 基坑监测-南方测绘-设备-测点关系Service业务层处理 + * + * @author ruoyi + * @date 2024-08-11 + */ +@Service +public class DevPitmonitSouthsmosDevSpServiceImpl implements IDevPitmonitSouthsmosDevSpService +{ + @Autowired + private DevPitmonitSouthsmosDevSpMapper devPitmonitSouthsmosDevSpMapper; + + /** + * 查询基坑监测-南方测绘-设备-测点关系 + * + * @param id 基坑监测-南方测绘-设备-测点关系主键 + * @return 基坑监测-南方测绘-设备-测点关系 + */ + @Override + public DevPitmonitSouthsmosDevSp selectDevPitmonitSouthsmosDevSpById(Long id) + { + return devPitmonitSouthsmosDevSpMapper.selectDevPitmonitSouthsmosDevSpById(id); + } + + @Override + public DevPitmonitSouthsmosDevSp selectDevPitmonitSouthsmosDevSpByDevId(Long devId, Long spId) { + DevPitmonitSouthsmosDevSp where=new DevPitmonitSouthsmosDevSp(); + where.setSpId(spId); + where.setDevId(devId); + List list=new ArrayList<>(); + return list.size()>0?list.get(0):null; + } + + /** + * 查询基坑监测-南方测绘-设备-测点关系列表 + * + * @param devPitmonitSouthsmosDevSp 基坑监测-南方测绘-设备-测点关系 + * @return 基坑监测-南方测绘-设备-测点关系 + */ + @Override + public List selectDevPitmonitSouthsmosDevSpList(DevPitmonitSouthsmosDevSp devPitmonitSouthsmosDevSp) + { + return devPitmonitSouthsmosDevSpMapper.selectDevPitmonitSouthsmosDevSpList(devPitmonitSouthsmosDevSp); + } + + /** + * 新增基坑监测-南方测绘-设备-测点关系 + * + * @param devPitmonitSouthsmosDevSp 基坑监测-南方测绘-设备-测点关系 + * @return 结果 + */ + @Override + public int insertDevPitmonitSouthsmosDevSp(DevPitmonitSouthsmosDevSp devPitmonitSouthsmosDevSp) + { + String userName=SecurityUtils.getUsername(); + devPitmonitSouthsmosDevSp.setCreateBy(StrUtil.isEmpty(userName)?"task":userName); + devPitmonitSouthsmosDevSp.setCreateTime(DateUtils.getNowDate()); + devPitmonitSouthsmosDevSp.setIsDel(0l); + return devPitmonitSouthsmosDevSpMapper.insertDevPitmonitSouthsmosDevSp(devPitmonitSouthsmosDevSp); + } + + /** + * 修改基坑监测-南方测绘-设备-测点关系 + * + * @param devPitmonitSouthsmosDevSp 基坑监测-南方测绘-设备-测点关系 + * @return 结果 + */ + @Override + public int updateDevPitmonitSouthsmosDevSp(DevPitmonitSouthsmosDevSp devPitmonitSouthsmosDevSp) + { + String userName=SecurityUtils.getUsername(); + devPitmonitSouthsmosDevSp.setUpdateBy(StrUtil.isEmpty(userName)?"task":userName); + devPitmonitSouthsmosDevSp.setUpdateTime(DateUtils.getNowDate()); + return devPitmonitSouthsmosDevSpMapper.updateDevPitmonitSouthsmosDevSp(devPitmonitSouthsmosDevSp); + } + + /** + * 批量删除基坑监测-南方测绘-设备-测点关系 + * + * @param ids 需要删除的基坑监测-南方测绘-设备-测点关系主键 + * @return 结果 + */ + @Override + public int deleteDevPitmonitSouthsmosDevSpByIds(Long[] ids) + { + return devPitmonitSouthsmosDevSpMapper.deleteDevPitmonitSouthsmosDevSpByIds(ids); + } + + /** + * 删除基坑监测-南方测绘-设备-测点关系信息 + * + * @param id 基坑监测-南方测绘-设备-测点关系主键 + * @return 结果 + */ + @Override + public int deleteDevPitmonitSouthsmosDevSpById(Long id) + { + return devPitmonitSouthsmosDevSpMapper.deleteDevPitmonitSouthsmosDevSpById(id); + } + + @Override + public void addDevPitmonitSouthsmosDevSp(DevPitmonitSouthsmosDevSp item) { + DevPitmonitSouthsmosDevSp old=selectDevPitmonitSouthsmosDevSpByDevId(item.getDevId(),item.getSpId()); + if(old==null){ + insertDevPitmonitSouthsmosDevSp(item); + } + } +} diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/DevPitmonitSouthsmosDeviceServiceImpl.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/DevPitmonitSouthsmosDeviceServiceImpl.java new file mode 100644 index 00000000..5f5c7534 --- /dev/null +++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/DevPitmonitSouthsmosDeviceServiceImpl.java @@ -0,0 +1,128 @@ +package com.ruoyi.quartz.service.impl; + +import java.util.List; + +import cn.hutool.core.util.StrUtil; +import com.ruoyi.common.utils.DateUtils; +import com.ruoyi.quartz.domain.DevPitmonitSouthsmosDevSp; +import com.ruoyi.quartz.domain.SurProjectPitMonitCfg; +import com.ruoyi.quartz.service.IDevPitmonitSouthsmosDevSpService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.ruoyi.quartz.mapper.DevPitmonitSouthsmosDeviceMapper; +import com.ruoyi.quartz.domain.DevPitmonitSouthsmosDevice; +import com.ruoyi.quartz.service.IDevPitmonitSouthsmosDeviceService; +import com.ruoyi.common.utils.SecurityUtils; +/** + * 基坑监测-南方测绘-设备Service业务层处理 + * + * @author ruoyi + * @date 2024-08-11 + */ +@Service +public class DevPitmonitSouthsmosDeviceServiceImpl implements IDevPitmonitSouthsmosDeviceService +{ + @Autowired + private DevPitmonitSouthsmosDeviceMapper devPitmonitSouthsmosDeviceMapper; + @Autowired + private IDevPitmonitSouthsmosDevSpService devSpService; + /** + * 查询基坑监测-南方测绘-设备 + * + * @param id 基坑监测-南方测绘-设备主键 + * @return 基坑监测-南方测绘-设备 + */ + @Override + public DevPitmonitSouthsmosDevice selectDevPitmonitSouthsmosDeviceById(Long id) + { + return devPitmonitSouthsmosDeviceMapper.selectDevPitmonitSouthsmosDeviceById(id); + } + + @Override + public DevPitmonitSouthsmosDevice selectDevPitmonitSouthsmosDeviceByDevId(Long devId) { + DevPitmonitSouthsmosDevice where=new DevPitmonitSouthsmosDevice(); + where.setDevId(devId); + List list=selectDevPitmonitSouthsmosDeviceList(where); + return list.size()>0?list.get(0):null; + } + + /** + * 查询基坑监测-南方测绘-设备列表 + * + * @param devPitmonitSouthsmosDevice 基坑监测-南方测绘-设备 + * @return 基坑监测-南方测绘-设备 + */ + @Override + public List selectDevPitmonitSouthsmosDeviceList(DevPitmonitSouthsmosDevice devPitmonitSouthsmosDevice) + { + return devPitmonitSouthsmosDeviceMapper.selectDevPitmonitSouthsmosDeviceList(devPitmonitSouthsmosDevice); + } + + /** + * 新增基坑监测-南方测绘-设备 + * + * @param devPitmonitSouthsmosDevice 基坑监测-南方测绘-设备 + * @return 结果 + */ + @Override + public int insertDevPitmonitSouthsmosDevice(DevPitmonitSouthsmosDevice devPitmonitSouthsmosDevice) + { + String userName=SecurityUtils.getUsername(); + devPitmonitSouthsmosDevice.setCreateBy(StrUtil.isEmpty(userName)?"task":userName); + devPitmonitSouthsmosDevice.setCreateTime(DateUtils.getNowDate()); + devPitmonitSouthsmosDevice.setIsDel(0l); + return devPitmonitSouthsmosDeviceMapper.insertDevPitmonitSouthsmosDevice(devPitmonitSouthsmosDevice); + } + + /** + * 修改基坑监测-南方测绘-设备 + * + * @param devPitmonitSouthsmosDevice 基坑监测-南方测绘-设备 + * @return 结果 + */ + @Override + public int updateDevPitmonitSouthsmosDevice(DevPitmonitSouthsmosDevice devPitmonitSouthsmosDevice) + { + String userName=SecurityUtils.getUsername(); + devPitmonitSouthsmosDevice.setUpdateBy(StrUtil.isEmpty(userName)?"task":userName); + devPitmonitSouthsmosDevice.setUpdateTime(DateUtils.getNowDate()); + return devPitmonitSouthsmosDeviceMapper.updateDevPitmonitSouthsmosDevice(devPitmonitSouthsmosDevice); + } + + /** + * 批量删除基坑监测-南方测绘-设备 + * + * @param ids 需要删除的基坑监测-南方测绘-设备主键 + * @return 结果 + */ + @Override + public int deleteDevPitmonitSouthsmosDeviceByIds(Long[] ids) + { + return devPitmonitSouthsmosDeviceMapper.deleteDevPitmonitSouthsmosDeviceByIds(ids); + } + + /** + * 删除基坑监测-南方测绘-设备信息 + * + * @param id 基坑监测-南方测绘-设备主键 + * @return 结果 + */ + @Override + public int deleteDevPitmonitSouthsmosDeviceById(Long id) + { + return devPitmonitSouthsmosDeviceMapper.deleteDevPitmonitSouthsmosDeviceById(id); + } + + @Override + public void addList(List items, SurProjectPitMonitCfg cfg) { + items.forEach(it->{ + it.setCfgId(cfg.getId()); + insertDevPitmonitSouthsmosDevice(it); + it.getSpDevices().forEach(item->{ + item.setCfgId(cfg.getId()); + devSpService.addDevPitmonitSouthsmosDevSp(item); + }); + + }); + } +} diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/DevPitmonitSouthsmosElementServiceImpl.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/DevPitmonitSouthsmosElementServiceImpl.java index 85fc5797..cef2ac1d 100644 --- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/DevPitmonitSouthsmosElementServiceImpl.java +++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/DevPitmonitSouthsmosElementServiceImpl.java @@ -6,6 +6,7 @@ import cn.hutool.core.util.StrUtil; import com.ruoyi.common.utils.DateUtils; import com.ruoyi.quartz.domain.SurProjectPitMonitCfg; import com.ruoyi.quartz.mapper.DevPitmonitSouthsmosElementItemMapper; +import com.ruoyi.quartz.service.IDevPitmonitSouthsmosElementItemService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.ruoyi.quartz.mapper.DevPitmonitSouthsmosElementMapper; @@ -24,7 +25,7 @@ public class DevPitmonitSouthsmosElementServiceImpl implements IDevPitmonitSouth @Autowired private DevPitmonitSouthsmosElementMapper devPitmonitSouthsmosElementMapper; @Autowired - private DevPitmonitSouthsmosElementItemMapper elementItemMapper; + private IDevPitmonitSouthsmosElementItemService elementItemService; /** * 查询基坑监测-南方测绘-监测项 * @@ -122,7 +123,8 @@ public class DevPitmonitSouthsmosElementServiceImpl implements IDevPitmonitSouth } if(el.getItems()!=null){ el.getItems().forEach(item->{ - elementItemMapper.insertDevPitmonitSouthsmosElementItem(item); + item.setCfgId(cfg.getId()); + elementItemService.insertDevPitmonitSouthsmosElementItem(item); }); } }); diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/PitmonitSouthsmosTask.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/PitmonitSouthsmosTask.java index 79263528..f7df439e 100644 --- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/PitmonitSouthsmosTask.java +++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/PitmonitSouthsmosTask.java @@ -27,7 +27,8 @@ public class PitmonitSouthsmosTask { private IDevPitmonitSouthsmosSurveypointService surveypointService; @Autowired private IDevPitmonitSouthsmosThresholdService thresholdService; - + @Autowired + private IDevPitmonitSouthsmosDeviceService deviceService; static String APIBASEURL="https://www.southsmos.com/api/"; /** @@ -35,6 +36,7 @@ public class PitmonitSouthsmosTask { * 4.获取监测项列表 * 5.获取测点列表 * 7.获取报警阈值 + * 9.获取设备 */ public void syncBaseInfo() { SurProjectPitMonitCfg cfgWhere=new SurProjectPitMonitCfg(); @@ -62,6 +64,9 @@ public class PitmonitSouthsmosTask { List thList=getThreshold(""+d.getSpId(),token); thresholdService.addList(thList,cfg); }); + //9.获取设备 + List devList=getDevices(token,orgId); + deviceService.addList(devList,cfg); }); } @@ -170,10 +175,22 @@ public class PitmonitSouthsmosTask { //List thList=getThreshold("53245",token); //System.out.println(thList); //8.获取报警信息 - List alarmList=getAlarm(orgId,token,DateUtil.parse("2024-01-01")); - System.out.println(alarmList); + //List alarmList=getAlarm(orgId,token,DateUtil.parse("2024-01-01")); + //System.out.println(alarmList); + //9.获取设备 + List devList=getDevices(token,orgId); + System.out.println(devList); } + private static List getDevices(String token,String orgId){ + String url="instrument/device"; + Map params = new HashMap<>(); + params.put("structureId",orgId); + String data=getJSON(APIBASEURL+url,token,params); + JSONObject jo=JSON.parseObject(data); + List list=jo.getList("data",DevPitmonitSouthsmosDevice.class); + return list; + } /** * 4.获取监测项列表 * @param token diff --git a/ruoyi-quartz/src/main/resources/mapper/quartz/DevPitmonitSouthsmosDevSpMapper.xml b/ruoyi-quartz/src/main/resources/mapper/quartz/DevPitmonitSouthsmosDevSpMapper.xml new file mode 100644 index 00000000..9b5e16db --- /dev/null +++ b/ruoyi-quartz/src/main/resources/mapper/quartz/DevPitmonitSouthsmosDevSpMapper.xml @@ -0,0 +1,96 @@ + + + + + + + + + + + + + + + + + + + + select id, cfgId, devId, spId, state, remark, is_del, create_by, create_time, update_by, update_time from dev_pitmonit_southsmos_dev_sp + + + + + + + + insert into dev_pitmonit_southsmos_dev_sp + + cfgId, + devId, + spId, + state, + remark, + is_del, + create_by, + create_time, + update_by, + update_time, + + + #{cfgId}, + #{devId}, + #{spId}, + #{state}, + #{remark}, + #{isDel}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + + + + + update dev_pitmonit_southsmos_dev_sp + + cfgId = #{cfgId}, + devId = #{devId}, + spId = #{spId}, + state = #{state}, + remark = #{remark}, + is_del = #{isDel}, + create_by = #{createBy}, + create_time = #{createTime}, + update_by = #{updateBy}, + update_time = #{updateTime}, + + where id = #{id} + + + + delete from dev_pitmonit_southsmos_dev_sp where id = #{id} + + + + delete from dev_pitmonit_southsmos_dev_sp where id in + + #{id} + + + \ No newline at end of file diff --git a/ruoyi-quartz/src/main/resources/mapper/quartz/DevPitmonitSouthsmosDeviceMapper.xml b/ruoyi-quartz/src/main/resources/mapper/quartz/DevPitmonitSouthsmosDeviceMapper.xml new file mode 100644 index 00000000..4ac0fa30 --- /dev/null +++ b/ruoyi-quartz/src/main/resources/mapper/quartz/DevPitmonitSouthsmosDeviceMapper.xml @@ -0,0 +1,196 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + select id, cfgId, devId, autoType, certUrl, checkDate, devCode, devShadow, devType, devTypeName, `key`, manufacturer, name, orgId, parent, parentIds, productType, position, status, structureId, structureName, typeCategory, typeName, verifyDate, state, remark, is_del, create_by, create_time, update_by, update_time from dev_pitmonit_southsmos_device + + + + + + + + insert into dev_pitmonit_southsmos_device + + cfgId, + devId, + autoType, + certUrl, + checkDate, + devCode, + devShadow, + devType, + devTypeName, + `key`, + manufacturer, + name, + orgId, + parent, + parentIds, + productType, + position, + status, + structureId, + structureName, + typeCategory, + typeName, + verifyDate, + state, + remark, + is_del, + create_by, + create_time, + update_by, + update_time, + + + #{cfgId}, + #{devId}, + #{autoType}, + #{certUrl}, + #{checkDate}, + #{devCode}, + #{devShadow}, + #{devType}, + #{devTypeName}, + #{key}, + #{manufacturer}, + #{name}, + #{orgId}, + #{parent}, + #{parentIds}, + #{productType}, + #{position}, + #{status}, + #{structureId}, + #{structureName}, + #{typeCategory}, + #{typeName}, + #{verifyDate}, + #{state}, + #{remark}, + #{isDel}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + + + + + update dev_pitmonit_southsmos_device + + cfgId = #{cfgId}, + devId = #{devId}, + autoType = #{autoType}, + certUrl = #{certUrl}, + checkDate = #{checkDate}, + devCode = #{devCode}, + devShadow = #{devShadow}, + devType = #{devType}, + devTypeName = #{devTypeName}, + `key` = #{key}, + manufacturer = #{manufacturer}, + name = #{name}, + orgId = #{orgId}, + parent = #{parent}, + parentIds = #{parentIds}, + productType = #{productType}, + position = #{position}, + status = #{status}, + structureId = #{structureId}, + structureName = #{structureName}, + typeCategory = #{typeCategory}, + typeName = #{typeName}, + verifyDate = #{verifyDate}, + state = #{state}, + remark = #{remark}, + is_del = #{isDel}, + create_by = #{createBy}, + create_time = #{createTime}, + update_by = #{updateBy}, + update_time = #{updateTime}, + + where id = #{id} + + + + delete from dev_pitmonit_southsmos_device where id = #{id} + + + + delete from dev_pitmonit_southsmos_device where id in + + #{id} + + + \ No newline at end of file diff --git a/ruoyi-quartz/src/main/resources/mapper/quartz/DevPitmonitSouthsmosSurveypointMapper.xml b/ruoyi-quartz/src/main/resources/mapper/quartz/DevPitmonitSouthsmosSurveypointMapper.xml index 39af5c75..bb2cfc0b 100644 --- a/ruoyi-quartz/src/main/resources/mapper/quartz/DevPitmonitSouthsmosSurveypointMapper.xml +++ b/ruoyi-quartz/src/main/resources/mapper/quartz/DevPitmonitSouthsmosSurveypointMapper.xml @@ -15,6 +15,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + @@ -28,7 +29,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select id, cfgId, spId, groupId, groupName, meId, meName, meNameEn, modifyDate, name, dataSource, createDate, status, state, remark, is_del, create_by, create_time, update_by, update_time from dev_pitmonit_southsmos_surveypoint + select id, cfgId, spId, groupId, groupName, meId, meName, meNameEn, modifyDate, name, position, dataSource, createDate, status, state, remark, is_del, create_by, create_time, update_by, update_time from dev_pitmonit_southsmos_surveypoint + + + and cfgId = #{cfgId} + and srvId = #{srvId} + and alarmInfo = #{alarmInfo} + and alarmSource = #{alarmSource} + and gmtAlarm = #{gmtAlarm} + and gmtAlarmOver = #{gmtAlarmOver} + and gmtAlarmStart = #{gmtAlarmStart} + and gmtCreate = #{gmtCreate} + and gmtModified = #{gmtModified} + and level = #{level} + and meId = #{meId} + and meName like concat('%', #{meName}, '%') + and monitorItemId = #{monitorItemId} + and numbers = #{numbers} + and result = #{result} + and resultUrl = #{resultUrl} + and spId = #{spId} + and spName like concat('%', #{spName}, '%') + and staff = #{staff} + and staffPhone = #{staffPhone} + and status = #{status} + and structureId = #{structureId} + and structureName like concat('%', #{structureName}, '%') + and threshold = #{threshold} + and type = #{type} + and variety = #{variety} + and state = #{state} + and is_del = #{isDel} + + + + + + + insert into dev_pitmonit_southsmos_alarm + + cfgId, + srvId, + alarmInfo, + alarmSource, + gmtAlarm, + gmtAlarmOver, + gmtAlarmStart, + gmtCreate, + gmtModified, + level, + meId, + meName, + monitorItemId, + numbers, + result, + resultUrl, + spId, + spName, + staff, + staffPhone, + status, + structureId, + structureName, + threshold, + type, + variety, + state, + remark, + is_del, + create_by, + create_time, + update_by, + update_time, + + + #{cfgId}, + #{srvId}, + #{alarmInfo}, + #{alarmSource}, + #{gmtAlarm}, + #{gmtAlarmOver}, + #{gmtAlarmStart}, + #{gmtCreate}, + #{gmtModified}, + #{level}, + #{meId}, + #{meName}, + #{monitorItemId}, + #{numbers}, + #{result}, + #{resultUrl}, + #{spId}, + #{spName}, + #{staff}, + #{staffPhone}, + #{status}, + #{structureId}, + #{structureName}, + #{threshold}, + #{type}, + #{variety}, + #{state}, + #{remark}, + #{isDel}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + + + + + update dev_pitmonit_southsmos_alarm + + cfgId = #{cfgId}, + srvId = #{srvId}, + alarmInfo = #{alarmInfo}, + alarmSource = #{alarmSource}, + gmtAlarm = #{gmtAlarm}, + gmtAlarmOver = #{gmtAlarmOver}, + gmtAlarmStart = #{gmtAlarmStart}, + gmtCreate = #{gmtCreate}, + gmtModified = #{gmtModified}, + level = #{level}, + meId = #{meId}, + meName = #{meName}, + monitorItemId = #{monitorItemId}, + numbers = #{numbers}, + result = #{result}, + resultUrl = #{resultUrl}, + spId = #{spId}, + spName = #{spName}, + staff = #{staff}, + staffPhone = #{staffPhone}, + status = #{status}, + structureId = #{structureId}, + structureName = #{structureName}, + threshold = #{threshold}, + type = #{type}, + variety = #{variety}, + state = #{state}, + remark = #{remark}, + is_del = #{isDel}, + create_by = #{createBy}, + create_time = #{createTime}, + update_by = #{updateBy}, + update_time = #{updateTime}, + + where id = #{id} + + + + delete from dev_pitmonit_southsmos_alarm where id = #{id} + + + + delete from dev_pitmonit_southsmos_alarm where id in + + #{id} + + + \ No newline at end of file diff --git a/yanzhu-jh/src/main/resources/mapper/device/PitmonitSouthsmosDataMapper.xml b/yanzhu-jh/src/main/resources/mapper/device/PitmonitSouthsmosDataMapper.xml new file mode 100644 index 00000000..ccf8bc5f --- /dev/null +++ b/yanzhu-jh/src/main/resources/mapper/device/PitmonitSouthsmosDataMapper.xml @@ -0,0 +1,151 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + select id, cfgId, dataType, dataId, spId, spName, collectTime, changeRate, changeRate2, displace, displace2, totalize, totalize2, variation, variation2, state, remark, is_del, create_by, create_time, update_by, update_time from dev_pitmonit_southsmos_data + + + + + + + + insert into dev_pitmonit_southsmos_data + + cfgId, + dataType, + dataId, + spId, + spName, + collectTime, + changeRate, + changeRate2, + displace, + displace2, + totalize, + totalize2, + variation, + variation2, + state, + remark, + is_del, + create_by, + create_time, + update_by, + update_time, + + + #{cfgId}, + #{dataType}, + #{dataId}, + #{spId}, + #{spName}, + #{collectTime}, + #{changeRate}, + #{changeRate2}, + #{displace}, + #{displace2}, + #{totalize}, + #{totalize2}, + #{variation}, + #{variation2}, + #{state}, + #{remark}, + #{isDel}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + + + + + update dev_pitmonit_southsmos_data + + cfgId = #{cfgId}, + dataType = #{dataType}, + dataId = #{dataId}, + spId = #{spId}, + spName = #{spName}, + collectTime = #{collectTime}, + changeRate = #{changeRate}, + changeRate2 = #{changeRate2}, + displace = #{displace}, + displace2 = #{displace2}, + totalize = #{totalize}, + totalize2 = #{totalize2}, + variation = #{variation}, + variation2 = #{variation2}, + state = #{state}, + remark = #{remark}, + is_del = #{isDel}, + create_by = #{createBy}, + create_time = #{createTime}, + update_by = #{updateBy}, + update_time = #{updateTime}, + + where id = #{id} + + + + delete from dev_pitmonit_southsmos_data where id = #{id} + + + + delete from dev_pitmonit_southsmos_data where id in + + #{id} + + + \ No newline at end of file diff --git a/yanzhu-jh/src/main/resources/mapper/device/PitmonitSouthsmosDevSpMapper.xml b/yanzhu-jh/src/main/resources/mapper/device/PitmonitSouthsmosDevSpMapper.xml new file mode 100644 index 00000000..a38d96fc --- /dev/null +++ b/yanzhu-jh/src/main/resources/mapper/device/PitmonitSouthsmosDevSpMapper.xml @@ -0,0 +1,96 @@ + + + + + + + + + + + + + + + + + + + + select id, cfgId, devId, spId, state, remark, is_del, create_by, create_time, update_by, update_time from dev_pitmonit_southsmos_dev_sp + + + + + + + + insert into dev_pitmonit_southsmos_dev_sp + + cfgId, + devId, + spId, + state, + remark, + is_del, + create_by, + create_time, + update_by, + update_time, + + + #{cfgId}, + #{devId}, + #{spId}, + #{state}, + #{remark}, + #{isDel}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + + + + + update dev_pitmonit_southsmos_dev_sp + + cfgId = #{cfgId}, + devId = #{devId}, + spId = #{spId}, + state = #{state}, + remark = #{remark}, + is_del = #{isDel}, + create_by = #{createBy}, + create_time = #{createTime}, + update_by = #{updateBy}, + update_time = #{updateTime}, + + where id = #{id} + + + + delete from dev_pitmonit_southsmos_dev_sp where id = #{id} + + + + delete from dev_pitmonit_southsmos_dev_sp where id in + + #{id} + + + \ No newline at end of file diff --git a/yanzhu-jh/src/main/resources/mapper/device/PitmonitSouthsmosDeviceMapper.xml b/yanzhu-jh/src/main/resources/mapper/device/PitmonitSouthsmosDeviceMapper.xml new file mode 100644 index 00000000..59bbefb7 --- /dev/null +++ b/yanzhu-jh/src/main/resources/mapper/device/PitmonitSouthsmosDeviceMapper.xml @@ -0,0 +1,196 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + select id, cfgId, devId, autoType, certUrl, checkDate, devCode, devShadow, devType, devTypeName, key, manufacturer, name, orgId, parent, parentIds, productType, position, status, structureId, structureName, typeCategory, typeName, verifyDate, state, remark, is_del, create_by, create_time, update_by, update_time from dev_pitmonit_southsmos_device + + + + + + + + insert into dev_pitmonit_southsmos_device + + cfgId, + devId, + autoType, + certUrl, + checkDate, + devCode, + devShadow, + devType, + devTypeName, + key, + manufacturer, + name, + orgId, + parent, + parentIds, + productType, + position, + status, + structureId, + structureName, + typeCategory, + typeName, + verifyDate, + state, + remark, + is_del, + create_by, + create_time, + update_by, + update_time, + + + #{cfgId}, + #{devId}, + #{autoType}, + #{certUrl}, + #{checkDate}, + #{devCode}, + #{devShadow}, + #{devType}, + #{devTypeName}, + #{key}, + #{manufacturer}, + #{name}, + #{orgId}, + #{parent}, + #{parentIds}, + #{productType}, + #{position}, + #{status}, + #{structureId}, + #{structureName}, + #{typeCategory}, + #{typeName}, + #{verifyDate}, + #{state}, + #{remark}, + #{isDel}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + + + + + update dev_pitmonit_southsmos_device + + cfgId = #{cfgId}, + devId = #{devId}, + autoType = #{autoType}, + certUrl = #{certUrl}, + checkDate = #{checkDate}, + devCode = #{devCode}, + devShadow = #{devShadow}, + devType = #{devType}, + devTypeName = #{devTypeName}, + key = #{key}, + manufacturer = #{manufacturer}, + name = #{name}, + orgId = #{orgId}, + parent = #{parent}, + parentIds = #{parentIds}, + productType = #{productType}, + position = #{position}, + status = #{status}, + structureId = #{structureId}, + structureName = #{structureName}, + typeCategory = #{typeCategory}, + typeName = #{typeName}, + verifyDate = #{verifyDate}, + state = #{state}, + remark = #{remark}, + is_del = #{isDel}, + create_by = #{createBy}, + create_time = #{createTime}, + update_by = #{updateBy}, + update_time = #{updateTime}, + + where id = #{id} + + + + delete from dev_pitmonit_southsmos_device where id = #{id} + + + + delete from dev_pitmonit_southsmos_device where id in + + #{id} + + + \ No newline at end of file diff --git a/yanzhu-jh/src/main/resources/mapper/device/PitmonitSouthsmosElementItemMapper.xml b/yanzhu-jh/src/main/resources/mapper/device/PitmonitSouthsmosElementItemMapper.xml new file mode 100644 index 00000000..df2b58a9 --- /dev/null +++ b/yanzhu-jh/src/main/resources/mapper/device/PitmonitSouthsmosElementItemMapper.xml @@ -0,0 +1,126 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + select id, cfgId, srvId, monitorElementId, name, step, unit, valueRange, gmtCreate, gmtModified, state, remark, is_del, create_by, create_time, update_by, update_time from dev_pitmonit_southsmos_element_item + + + + + + + + insert into dev_pitmonit_southsmos_element_item + + cfgId, + srvId, + monitorElementId, + name, + step, + unit, + valueRange, + gmtCreate, + gmtModified, + state, + remark, + is_del, + create_by, + create_time, + update_by, + update_time, + + + #{cfgId}, + #{srvId}, + #{monitorElementId}, + #{name}, + #{step}, + #{unit}, + #{valueRange}, + #{gmtCreate}, + #{gmtModified}, + #{state}, + #{remark}, + #{isDel}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + + + + + update dev_pitmonit_southsmos_element_item + + cfgId = #{cfgId}, + srvId = #{srvId}, + monitorElementId = #{monitorElementId}, + name = #{name}, + step = #{step}, + unit = #{unit}, + valueRange = #{valueRange}, + gmtCreate = #{gmtCreate}, + gmtModified = #{gmtModified}, + state = #{state}, + remark = #{remark}, + is_del = #{isDel}, + create_by = #{createBy}, + create_time = #{createTime}, + update_by = #{updateBy}, + update_time = #{updateTime}, + + where id = #{id} + + + + delete from dev_pitmonit_southsmos_element_item where id = #{id} + + + + delete from dev_pitmonit_southsmos_element_item where id in + + #{id} + + + \ No newline at end of file diff --git a/yanzhu-jh/src/main/resources/mapper/device/PitmonitSouthsmosElementMapper.xml b/yanzhu-jh/src/main/resources/mapper/device/PitmonitSouthsmosElementMapper.xml new file mode 100644 index 00000000..f0634f77 --- /dev/null +++ b/yanzhu-jh/src/main/resources/mapper/device/PitmonitSouthsmosElementMapper.xml @@ -0,0 +1,116 @@ + + + + + + + + + + + + + + + + + + + + + + + + select id, cfgId, srvId, maxSp, monitorStatus, name, nameEn, type, state, remark, is_del, create_by, create_time, update_by, update_time from dev_pitmonit_southsmos_element + + + + + + + + insert into dev_pitmonit_southsmos_element + + cfgId, + srvId, + maxSp, + monitorStatus, + name, + nameEn, + type, + state, + remark, + is_del, + create_by, + create_time, + update_by, + update_time, + + + #{cfgId}, + #{srvId}, + #{maxSp}, + #{monitorStatus}, + #{name}, + #{nameEn}, + #{type}, + #{state}, + #{remark}, + #{isDel}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + + + + + update dev_pitmonit_southsmos_element + + cfgId = #{cfgId}, + srvId = #{srvId}, + maxSp = #{maxSp}, + monitorStatus = #{monitorStatus}, + name = #{name}, + nameEn = #{nameEn}, + type = #{type}, + state = #{state}, + remark = #{remark}, + is_del = #{isDel}, + create_by = #{createBy}, + create_time = #{createTime}, + update_by = #{updateBy}, + update_time = #{updateTime}, + + where id = #{id} + + + + delete from dev_pitmonit_southsmos_element where id = #{id} + + + + delete from dev_pitmonit_southsmos_element where id in + + #{id} + + + \ No newline at end of file diff --git a/yanzhu-jh/src/main/resources/mapper/device/PitmonitSouthsmosSurveypointMapper.xml b/yanzhu-jh/src/main/resources/mapper/device/PitmonitSouthsmosSurveypointMapper.xml new file mode 100644 index 00000000..2e5ebfe1 --- /dev/null +++ b/yanzhu-jh/src/main/resources/mapper/device/PitmonitSouthsmosSurveypointMapper.xml @@ -0,0 +1,146 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + select id, cfgId, spId, groupId, groupName, meId, meName, meNameEn, modifyDate, name, position, dataSource, createDate, status, state, remark, is_del, create_by, create_time, update_by, update_time from dev_pitmonit_southsmos_surveypoint + + + + + + + + insert into dev_pitmonit_southsmos_surveypoint + + cfgId, + spId, + groupId, + groupName, + meId, + meName, + meNameEn, + modifyDate, + name, + position, + dataSource, + createDate, + status, + state, + remark, + is_del, + create_by, + create_time, + update_by, + update_time, + + + #{cfgId}, + #{spId}, + #{groupId}, + #{groupName}, + #{meId}, + #{meName}, + #{meNameEn}, + #{modifyDate}, + #{name}, + #{position}, + #{dataSource}, + #{createDate}, + #{status}, + #{state}, + #{remark}, + #{isDel}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + + + + + update dev_pitmonit_southsmos_surveypoint + + cfgId = #{cfgId}, + spId = #{spId}, + groupId = #{groupId}, + groupName = #{groupName}, + meId = #{meId}, + meName = #{meName}, + meNameEn = #{meNameEn}, + modifyDate = #{modifyDate}, + name = #{name}, + position = #{position}, + dataSource = #{dataSource}, + createDate = #{createDate}, + status = #{status}, + state = #{state}, + remark = #{remark}, + is_del = #{isDel}, + create_by = #{createBy}, + create_time = #{createTime}, + update_by = #{updateBy}, + update_time = #{updateTime}, + + where id = #{id} + + + + delete from dev_pitmonit_southsmos_surveypoint where id = #{id} + + + + delete from dev_pitmonit_southsmos_surveypoint where id in + + #{id} + + + \ No newline at end of file diff --git a/yanzhu-jh/src/main/resources/mapper/device/PitmonitSouthsmosThresholdMapper.xml b/yanzhu-jh/src/main/resources/mapper/device/PitmonitSouthsmosThresholdMapper.xml new file mode 100644 index 00000000..9a24adfd --- /dev/null +++ b/yanzhu-jh/src/main/resources/mapper/device/PitmonitSouthsmosThresholdMapper.xml @@ -0,0 +1,151 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + select id, cfgId, srvId, alarmInfo, alarmName, intervalA, intervalB, level, monitorElementId, monitorItemId, monitorItemName, tgId, threshold, type, unit, state, remark, is_del, create_by, create_time, update_by, update_time from dev_pitmonit_southsmos_threshold + + + + + + + + insert into dev_pitmonit_southsmos_threshold + + cfgId, + srvId, + alarmInfo, + alarmName, + intervalA, + intervalB, + level, + monitorElementId, + monitorItemId, + monitorItemName, + tgId, + threshold, + type, + unit, + state, + remark, + is_del, + create_by, + create_time, + update_by, + update_time, + + + #{cfgId}, + #{srvId}, + #{alarmInfo}, + #{alarmName}, + #{intervalA}, + #{intervalB}, + #{level}, + #{monitorElementId}, + #{monitorItemId}, + #{monitorItemName}, + #{tgId}, + #{threshold}, + #{type}, + #{unit}, + #{state}, + #{remark}, + #{isDel}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + + + + + update dev_pitmonit_southsmos_threshold + + cfgId = #{cfgId}, + srvId = #{srvId}, + alarmInfo = #{alarmInfo}, + alarmName = #{alarmName}, + intervalA = #{intervalA}, + intervalB = #{intervalB}, + level = #{level}, + monitorElementId = #{monitorElementId}, + monitorItemId = #{monitorItemId}, + monitorItemName = #{monitorItemName}, + tgId = #{tgId}, + threshold = #{threshold}, + type = #{type}, + unit = #{unit}, + state = #{state}, + remark = #{remark}, + is_del = #{isDel}, + create_by = #{createBy}, + create_time = #{createTime}, + update_by = #{updateBy}, + update_time = #{updateTime}, + + where id = #{id} + + + + delete from dev_pitmonit_southsmos_threshold where id = #{id} + + + + delete from dev_pitmonit_southsmos_threshold where id in + + #{id} + + + \ No newline at end of file diff --git a/yanzhu-jh/src/main/resources/mapper/device/ProjectPitMonitCfgMapper.xml b/yanzhu-jh/src/main/resources/mapper/device/ProjectPitMonitCfgMapper.xml new file mode 100644 index 00000000..f0fe3cf1 --- /dev/null +++ b/yanzhu-jh/src/main/resources/mapper/device/ProjectPitMonitCfgMapper.xml @@ -0,0 +1,106 @@ + + + + + + + + + + + + + + + + + + + + + + select id, project_id, sub_dept_id, vendor_code, vendor_paramter, enabled, state, remark, is_del, create_by, create_time, update_by, update_time from sur_project_pit_monit_cfg + + + + + + + + insert into sur_project_pit_monit_cfg + + project_id, + sub_dept_id, + vendor_code, + vendor_paramter, + enabled, + state, + remark, + is_del, + create_by, + create_time, + update_by, + update_time, + + + #{projectId}, + #{subDeptId}, + #{vendorCode}, + #{vendorParamter}, + #{enabled}, + #{state}, + #{remark}, + #{isDel}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + + + + + update sur_project_pit_monit_cfg + + project_id = #{projectId}, + sub_dept_id = #{subDeptId}, + vendor_code = #{vendorCode}, + vendor_paramter = #{vendorParamter}, + enabled = #{enabled}, + state = #{state}, + remark = #{remark}, + is_del = #{isDel}, + create_by = #{createBy}, + create_time = #{createTime}, + update_by = #{updateBy}, + update_time = #{updateTime}, + + where id = #{id} + + + + delete from sur_project_pit_monit_cfg where id = #{id} + + + + delete from sur_project_pit_monit_cfg where id in + + #{id} + + + \ No newline at end of file