From 7d6ae5fec0f8cc9e39f60a6f61aaf1ec8ca6668c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=BE=B0=E6=B5=A9=20=E8=87=A7?= Date: Wed, 21 Aug 2024 17:47:40 +0800 Subject: [PATCH] =?UTF-8?q?change=20-=E6=B7=BB=E5=8A=A0=E9=9C=87=E5=8A=A8?= =?UTF-8?q?=E5=AE=9E=E6=97=B6=E6=95=B0=E6=8D=AE=E7=9A=84=E5=90=8E=E7=AB=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ems/base/domain/EmsBaseMonitorInfo.java | 12 +- .../EmsVibrationInstanceController.java | 106 +++++++++ .../TWTempertureDataController.java | 106 +++++++++ .../record/domain/EmsVibrationInstance.java | 141 ++++++++++++ .../ems/record/domain/TWTempertureData.java | 211 ++++++++++++++++++ .../mapper/EmsVibrationInstanceMapper.java | 61 +++++ .../record/mapper/TWTempertureDataMapper.java | 61 +++++ .../service/IEmsVibrationInstanceService.java | 61 +++++ .../service/ITWTempertureDataService.java | 61 +++++ .../impl/EmsVibrationInstanceServiceImpl.java | 93 ++++++++ .../impl/TWTempertureDataServiceImpl.java | 93 ++++++++ .../ems/base/EmsBaseMonitorInfoMapper.xml | 6 + .../ems/record/EmsVibrationInstanceMapper.xml | 90 ++++++++ .../ems/record/TWTempertureDataMapper.xml | 111 +++++++++ 14 files changed, 1212 insertions(+), 1 deletion(-) create mode 100644 os-ems/src/main/java/com/os/ems/record/controller/EmsVibrationInstanceController.java create mode 100644 os-ems/src/main/java/com/os/ems/record/controller/TWTempertureDataController.java create mode 100644 os-ems/src/main/java/com/os/ems/record/domain/EmsVibrationInstance.java create mode 100644 os-ems/src/main/java/com/os/ems/record/domain/TWTempertureData.java create mode 100644 os-ems/src/main/java/com/os/ems/record/mapper/EmsVibrationInstanceMapper.java create mode 100644 os-ems/src/main/java/com/os/ems/record/mapper/TWTempertureDataMapper.java create mode 100644 os-ems/src/main/java/com/os/ems/record/service/IEmsVibrationInstanceService.java create mode 100644 os-ems/src/main/java/com/os/ems/record/service/ITWTempertureDataService.java create mode 100644 os-ems/src/main/java/com/os/ems/record/service/impl/EmsVibrationInstanceServiceImpl.java create mode 100644 os-ems/src/main/java/com/os/ems/record/service/impl/TWTempertureDataServiceImpl.java create mode 100644 os-ems/src/main/resources/mapper/ems/record/EmsVibrationInstanceMapper.xml create mode 100644 os-ems/src/main/resources/mapper/ems/record/TWTempertureDataMapper.xml diff --git a/os-ems/src/main/java/com/os/ems/base/domain/EmsBaseMonitorInfo.java b/os-ems/src/main/java/com/os/ems/base/domain/EmsBaseMonitorInfo.java index 7c2adb9..7aaf0e4 100644 --- a/os-ems/src/main/java/com/os/ems/base/domain/EmsBaseMonitorInfo.java +++ b/os-ems/src/main/java/com/os/ems/base/domain/EmsBaseMonitorInfo.java @@ -35,7 +35,7 @@ public class EmsBaseMonitorInfo extends BaseEntity private String monitorAddr; /** 计量设备类型 */ - @Excel(name = "计量设备类型") + @Excel(name = "能源类型") private Long monitorType; /** 计量设备状态（0启用 1停用） */ @@ -96,6 +96,16 @@ public class EmsBaseMonitorInfo extends BaseEntity private String ancestors; + private List monitorTypeList; + + public List getMonitorTypeList() { + return monitorTypeList; + } + + public void setMonitorTypeList(List monitorTypeList) { + this.monitorTypeList = monitorTypeList; + } + public List getChildren() { return children; } diff --git a/os-ems/src/main/java/com/os/ems/record/controller/EmsVibrationInstanceController.java b/os-ems/src/main/java/com/os/ems/record/controller/EmsVibrationInstanceController.java new file mode 100644 index 0000000..144d79c --- /dev/null +++ b/os-ems/src/main/java/com/os/ems/record/controller/EmsVibrationInstanceController.java @@ -0,0 +1,106 @@ +package com.os.ems.record.controller; + +import java.util.List; +import javax.servlet.http.HttpServletResponse; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import com.os.common.annotation.Log; +import com.os.common.core.controller.BaseController; +import com.os.common.core.domain.AjaxResult; +import com.os.common.enums.BusinessType; +import com.os.ems.record.domain.EmsVibrationInstance; +import com.os.ems.record.service.IEmsVibrationInstanceService; +import com.os.common.utils.poi.ExcelUtil; +import com.os.common.core.page.TableDataInfo; + +/** + * 震动实时数据Controller + * + * @author ZangCH + * @date 2024-08-21 + */ +@RestController +@RequestMapping("/ems/record/recordVibrateInstance") +public class EmsVibrationInstanceController extends BaseController +{ + @Autowired + private IEmsVibrationInstanceService emsVibrationInstanceService; + + /** + * 查询震动实时数据列表 + */ + @PreAuthorize("@ss.hasPermi('ems/record:recordVibrateInstance:list')") + @GetMapping("/list") + public TableDataInfo list(EmsVibrationInstance emsVibrationInstance) + { + startPage(); + List list = emsVibrationInstanceService.selectEmsVibrationInstanceList(emsVibrationInstance); + return getDataTable(list); + } + + /** + * 导出震动实时数据列表 + */ + @PreAuthorize("@ss.hasPermi('ems/record:recordVibrateInstance:export')") + @Log(title = "震动实时数据", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, EmsVibrationInstance emsVibrationInstance) + { + List list = emsVibrationInstanceService.selectEmsVibrationInstanceList(emsVibrationInstance); + ExcelUtil util = new ExcelUtil(EmsVibrationInstance.class); + util.exportExcel(response, list, "震动实时数据数据"); + } + + /** + * 获取震动实时数据详细信息 + */ + @PreAuthorize("@ss.hasPermi('ems/record:recordVibrateInstance:query')") + @GetMapping(value = "/{objId}") + public AjaxResult getInfo(@PathVariable("objId") Long objId) + { + return success(emsVibrationInstanceService.selectEmsVibrationInstanceByObjId(objId)); + } + + /** + * 新增震动实时数据 + */ + @PreAuthorize("@ss.hasPermi('ems/record:recordVibrateInstance:add')") + @Log(title = "震动实时数据", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody EmsVibrationInstance emsVibrationInstance) + { + emsVibrationInstance.setCreateBy(getUsername()); + return toAjax(emsVibrationInstanceService.insertEmsVibrationInstance(emsVibrationInstance)); + } + + /** + * 修改震动实时数据 + */ + @PreAuthorize("@ss.hasPermi('ems/record:recordVibrateInstance:edit')") + @Log(title = "震动实时数据", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody EmsVibrationInstance emsVibrationInstance) + { + emsVibrationInstance.setUpdateBy(getUsername()); + return toAjax(emsVibrationInstanceService.updateEmsVibrationInstance(emsVibrationInstance)); + } + + /** + * 删除震动实时数据 + */ + @PreAuthorize("@ss.hasPermi('ems/record:recordVibrateInstance:remove')") + @Log(title = "震动实时数据", businessType = BusinessType.DELETE) + @DeleteMapping("/{objIds}") + public AjaxResult remove(@PathVariable Long[] objIds) + { + return toAjax(emsVibrationInstanceService.deleteEmsVibrationInstanceByObjIds(objIds)); + } +} diff --git a/os-ems/src/main/java/com/os/ems/record/controller/TWTempertureDataController.java b/os-ems/src/main/java/com/os/ems/record/controller/TWTempertureDataController.java new file mode 100644 index 0000000..30edc8d --- /dev/null +++ b/os-ems/src/main/java/com/os/ems/record/controller/TWTempertureDataController.java @@ -0,0 +1,106 @@ +package com.os.ems.record.controller; + +import java.util.List; +import javax.servlet.http.HttpServletResponse; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import com.os.common.annotation.Log; +import com.os.common.core.controller.BaseController; +import com.os.common.core.domain.AjaxResult; +import com.os.common.enums.BusinessType; +import com.os.ems.record.domain.TWTempertureData; +import com.os.ems.record.service.ITWTempertureDataService; +import com.os.common.utils.poi.ExcelUtil; +import com.os.common.core.page.TableDataInfo; + +/** + * 物联网实时数据Controller + * + * @author Caoql + * @date 2024-08-21 + */ +@RestController +@RequestMapping("/ems/record/recordIOTInstant") +public class TWTempertureDataController extends BaseController +{ + @Autowired + private ITWTempertureDataService tWTempertureDataService; + + /** + * 查询物联网实时数据列表 + */ + @PreAuthorize("@ss.hasPermi('ems/record:recordIOTInstant:list')") + @GetMapping("/list") + public TableDataInfo list(TWTempertureData tWTempertureData) + { + startPage(); + List list = tWTempertureDataService.selectTWTempertureDataList(tWTempertureData); + return getDataTable(list); + } + + /** + * 导出物联网实时数据列表 + */ + @PreAuthorize("@ss.hasPermi('ems/record:recordIOTInstant:export')") + @Log(title = "物联网实时数据", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, TWTempertureData tWTempertureData) + { + List list = tWTempertureDataService.selectTWTempertureDataList(tWTempertureData); + ExcelUtil util = new ExcelUtil(TWTempertureData.class); + util.exportExcel(response, list, "物联网实时数据数据"); + } + + /** + * 获取物联网实时数据详细信息 + */ + @PreAuthorize("@ss.hasPermi('ems/record:recordIOTInstant:query')") + @GetMapping(value = "/{objid}") + public AjaxResult getInfo(@PathVariable("objid") Long objid) + { + return success(tWTempertureDataService.selectTWTempertureDataByObjid(objid)); + } + + /** + * 新增物联网实时数据 + */ + @PreAuthorize("@ss.hasPermi('ems/record:recordIOTInstant:add')") + @Log(title = "物联网实时数据", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody TWTempertureData tWTempertureData) + { + tWTempertureData.setCreateBy(getUsername()); + return toAjax(tWTempertureDataService.insertTWTempertureData(tWTempertureData)); + } + + /** + * 修改物联网实时数据 + */ + @PreAuthorize("@ss.hasPermi('ems/record:recordIOTInstant:edit')") + @Log(title = "物联网实时数据", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody TWTempertureData tWTempertureData) + { + tWTempertureData.setUpdateBy(getUsername()); + return toAjax(tWTempertureDataService.updateTWTempertureData(tWTempertureData)); + } + + /** + * 删除物联网实时数据 + */ + @PreAuthorize("@ss.hasPermi('ems/record:recordIOTInstant:remove')") + @Log(title = "物联网实时数据", businessType = BusinessType.DELETE) + @DeleteMapping("/{objids}") + public AjaxResult remove(@PathVariable Long[] objids) + { + return toAjax(tWTempertureDataService.deleteTWTempertureDataByObjids(objids)); + } +} diff --git a/os-ems/src/main/java/com/os/ems/record/domain/EmsVibrationInstance.java b/os-ems/src/main/java/com/os/ems/record/domain/EmsVibrationInstance.java new file mode 100644 index 0000000..be55067 --- /dev/null +++ b/os-ems/src/main/java/com/os/ems/record/domain/EmsVibrationInstance.java @@ -0,0 +1,141 @@ +package com.os.ems.record.domain; + +import java.math.BigDecimal; +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.os.common.annotation.Excel; +import com.os.common.core.domain.BaseEntity; + +/** + * 震动实时数据对象 T_VibrationSensor_Data + * + * @author ZangCH + * @date 2024-08-21 + */ +public class EmsVibrationInstance extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 主键标识 */ + private Long objId; + + /** 采集时间 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "采集时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") + private Date collectTime; + + /** 振动传感器编号 */ + @Excel(name = "振动传感器编号") + private String sensorId; + + /** 速度(mm/s) */ + @Excel(name = "速度(mm/s)") + private BigDecimal speed; + + /** 位移(um) */ + @Excel(name = "位移(um)") + private BigDecimal displacement; + + /** 加速度(g) */ + @Excel(name = "加速度(g)") + private BigDecimal acceleration; + + /** 温度(℃) */ + @Excel(name = "温度(℃)") + private BigDecimal temperature; + + /** 记录时间 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "记录时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") + private Date recodeTime; + + public void setObjId(Long objId) + { + this.objId = objId; + } + + public Long getObjId() + { + return objId; + } + public void setCollectTime(Date collectTime) + { + this.collectTime = collectTime; + } + + public Date getCollectTime() + { + return collectTime; + } + public void setSensorId(String sensorId) + { + this.sensorId = sensorId; + } + + public String getSensorId() + { + return sensorId; + } + public void setSpeed(BigDecimal speed) + { + this.speed = speed; + } + + public BigDecimal getSpeed() + { + return speed; + } + public void setDisplacement(BigDecimal displacement) + { + this.displacement = displacement; + } + + public BigDecimal getDisplacement() + { + return displacement; + } + public void setAcceleration(BigDecimal acceleration) + { + this.acceleration = acceleration; + } + + public BigDecimal getAcceleration() + { + return acceleration; + } + public void setTemperature(BigDecimal temperature) + { + this.temperature = temperature; + } + + public BigDecimal getTemperature() + { + return temperature; + } + public void setRecodeTime(Date recodeTime) + { + this.recodeTime = recodeTime; + } + + public Date getRecodeTime() + { + return recodeTime; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("objId", getObjId()) + .append("collectTime", getCollectTime()) + .append("sensorId", getSensorId()) + .append("speed", getSpeed()) + .append("displacement", getDisplacement()) + .append("acceleration", getAcceleration()) + .append("temperature", getTemperature()) + .append("recodeTime", getRecodeTime()) + .append("remark", getRemark()) + .toString(); + } +} diff --git a/os-ems/src/main/java/com/os/ems/record/domain/TWTempertureData.java b/os-ems/src/main/java/com/os/ems/record/domain/TWTempertureData.java new file mode 100644 index 0000000..a1d8492 --- /dev/null +++ b/os-ems/src/main/java/com/os/ems/record/domain/TWTempertureData.java @@ -0,0 +1,211 @@ +package com.os.ems.record.domain; + +import java.math.BigDecimal; +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.os.common.annotation.Excel; +import com.os.common.core.domain.BaseEntity; + +/** + * 物联网实时数据对象 T_W_TempertureData + * + * @author Caoql + * @date 2024-08-21 + */ +public class TWTempertureData extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 主键标识 */ + private Long objid; + + /** 计量设备编号 */ + @Excel(name = "计量设备编号") + private String monitorId; + + /** 采集时间 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "采集时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") + private Date collectTime; + + /** 温度 */ + @Excel(name = "温度") + private BigDecimal tempreture; + + /** 湿度 */ + @Excel(name = "湿度") + private BigDecimal humidity; + + /** 照度 */ + @Excel(name = "照度") + private BigDecimal illuminance; + + /** 噪声 */ + @Excel(name = "噪声") + private BigDecimal noise; + + /** 硫化氢浓度 */ + @Excel(name = "硫化氢浓度") + private BigDecimal concentration; + + /** 记录时间 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "记录时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") + private Date recodeTime; + + /** 报警类型 */ + @Excel(name = "报警类型") + private Long alarmType; + + /** */ + @Excel(name = " ") + private Long confirmPersonID; + + /** */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @Excel(name = " ", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") + private Date confirmTime; + + /** */ + @Excel(name = " ") + private Long confirmFlag; + + public void setObjid(Long objid) + { + this.objid = objid; + } + + public Long getObjid() + { + return objid; + } + public void setMonitorId(String monitorId) + { + this.monitorId = monitorId; + } + + public String getMonitorId() + { + return monitorId; + } + public void setCollectTime(Date collectTime) + { + this.collectTime = collectTime; + } + + public Date getCollectTime() + { + return collectTime; + } + public void setTempreture(BigDecimal tempreture) + { + this.tempreture = tempreture; + } + + public BigDecimal getTempreture() + { + return tempreture; + } + public void setHumidity(BigDecimal humidity) + { + this.humidity = humidity; + } + + public BigDecimal getHumidity() + { + return humidity; + } + public void setIlluminance(BigDecimal illuminance) + { + this.illuminance = illuminance; + } + + public BigDecimal getIlluminance() + { + return illuminance; + } + public void setNoise(BigDecimal noise) + { + this.noise = noise; + } + + public BigDecimal getNoise() + { + return noise; + } + public void setConcentration(BigDecimal concentration) + { + this.concentration = concentration; + } + + public BigDecimal getConcentration() + { + return concentration; + } + public void setRecodeTime(Date recodeTime) + { + this.recodeTime = recodeTime; + } + + public Date getRecodeTime() + { + return recodeTime; + } + public void setAlarmType(Long alarmType) + { + this.alarmType = alarmType; + } + + public Long getAlarmType() + { + return alarmType; + } + public void setConfirmPersonID(Long confirmPersonID) + { + this.confirmPersonID = confirmPersonID; + } + + public Long getConfirmPersonID() + { + return confirmPersonID; + } + public void setConfirmTime(Date confirmTime) + { + this.confirmTime = confirmTime; + } + + public Date getConfirmTime() + { + return confirmTime; + } + public void setConfirmFlag(Long confirmFlag) + { + this.confirmFlag = confirmFlag; + } + + public Long getConfirmFlag() + { + return confirmFlag; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("objid", getObjid()) + .append("monitorId", getMonitorId()) + .append("collectTime", getCollectTime()) + .append("tempreture", getTempreture()) + .append("humidity", getHumidity()) + .append("illuminance", getIlluminance()) + .append("noise", getNoise()) + .append("concentration", getConcentration()) + .append("recodeTime", getRecodeTime()) + .append("alarmType", getAlarmType()) + .append("confirmPersonID", getConfirmPersonID()) + .append("confirmTime", getConfirmTime()) + .append("confirmFlag", getConfirmFlag()) + .toString(); + } +} diff --git a/os-ems/src/main/java/com/os/ems/record/mapper/EmsVibrationInstanceMapper.java b/os-ems/src/main/java/com/os/ems/record/mapper/EmsVibrationInstanceMapper.java new file mode 100644 index 0000000..e3a66c5 --- /dev/null +++ b/os-ems/src/main/java/com/os/ems/record/mapper/EmsVibrationInstanceMapper.java @@ -0,0 +1,61 @@ +package com.os.ems.record.mapper; + +import java.util.List; +import com.os.ems.record.domain.EmsVibrationInstance; + +/** + * 震动实时数据Mapper接口 + * + * @author ZangCH + * @date 2024-08-21 + */ +public interface EmsVibrationInstanceMapper +{ + /** + * 查询震动实时数据 + * + * @param objId 震动实时数据主键 + * @return 震动实时数据 + */ + public EmsVibrationInstance selectEmsVibrationInstanceByObjId(Long objId); + + /** + * 查询震动实时数据列表 + * + * @param emsVibrationInstance 震动实时数据 + * @return 震动实时数据集合 + */ + public List selectEmsVibrationInstanceList(EmsVibrationInstance emsVibrationInstance); + + /** + * 新增震动实时数据 + * + * @param emsVibrationInstance 震动实时数据 + * @return 结果 + */ + public int insertEmsVibrationInstance(EmsVibrationInstance emsVibrationInstance); + + /** + * 修改震动实时数据 + * + * @param emsVibrationInstance 震动实时数据 + * @return 结果 + */ + public int updateEmsVibrationInstance(EmsVibrationInstance emsVibrationInstance); + + /** + * 删除震动实时数据 + * + * @param objId 震动实时数据主键 + * @return 结果 + */ + public int deleteEmsVibrationInstanceByObjId(Long objId); + + /** + * 批量删除震动实时数据 + * + * @param objIds 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteEmsVibrationInstanceByObjIds(Long[] objIds); +} diff --git a/os-ems/src/main/java/com/os/ems/record/mapper/TWTempertureDataMapper.java b/os-ems/src/main/java/com/os/ems/record/mapper/TWTempertureDataMapper.java new file mode 100644 index 0000000..0c08c87 --- /dev/null +++ b/os-ems/src/main/java/com/os/ems/record/mapper/TWTempertureDataMapper.java @@ -0,0 +1,61 @@ +package com.os.ems.record.mapper; + +import java.util.List; +import com.os.ems.record.domain.TWTempertureData; + +/** + * 物联网实时数据Mapper接口 + * + * @author Caoql + * @date 2024-08-21 + */ +public interface TWTempertureDataMapper +{ + /** + * 查询物联网实时数据 + * + * @param objid 物联网实时数据主键 + * @return 物联网实时数据 + */ + public TWTempertureData selectTWTempertureDataByObjid(Long objid); + + /** + * 查询物联网实时数据列表 + * + * @param tWTempertureData 物联网实时数据 + * @return 物联网实时数据集合 + */ + public List selectTWTempertureDataList(TWTempertureData tWTempertureData); + + /** + * 新增物联网实时数据 + * + * @param tWTempertureData 物联网实时数据 + * @return 结果 + */ + public int insertTWTempertureData(TWTempertureData tWTempertureData); + + /** + * 修改物联网实时数据 + * + * @param tWTempertureData 物联网实时数据 + * @return 结果 + */ + public int updateTWTempertureData(TWTempertureData tWTempertureData); + + /** + * 删除物联网实时数据 + * + * @param objid 物联网实时数据主键 + * @return 结果 + */ + public int deleteTWTempertureDataByObjid(Long objid); + + /** + * 批量删除物联网实时数据 + * + * @param objids 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteTWTempertureDataByObjids(Long[] objids); +} diff --git a/os-ems/src/main/java/com/os/ems/record/service/IEmsVibrationInstanceService.java b/os-ems/src/main/java/com/os/ems/record/service/IEmsVibrationInstanceService.java new file mode 100644 index 0000000..9d8dab5 --- /dev/null +++ b/os-ems/src/main/java/com/os/ems/record/service/IEmsVibrationInstanceService.java @@ -0,0 +1,61 @@ +package com.os.ems.record.service; + +import java.util.List; +import com.os.ems.record.domain.EmsVibrationInstance; + +/** + * 震动实时数据Service接口 + * + * @author ZangCH + * @date 2024-08-21 + */ +public interface IEmsVibrationInstanceService +{ + /** + * 查询震动实时数据 + * + * @param objId 震动实时数据主键 + * @return 震动实时数据 + */ + public EmsVibrationInstance selectEmsVibrationInstanceByObjId(Long objId); + + /** + * 查询震动实时数据列表 + * + * @param emsVibrationInstance 震动实时数据 + * @return 震动实时数据集合 + */ + public List selectEmsVibrationInstanceList(EmsVibrationInstance emsVibrationInstance); + + /** + * 新增震动实时数据 + * + * @param emsVibrationInstance 震动实时数据 + * @return 结果 + */ + public int insertEmsVibrationInstance(EmsVibrationInstance emsVibrationInstance); + + /** + * 修改震动实时数据 + * + * @param emsVibrationInstance 震动实时数据 + * @return 结果 + */ + public int updateEmsVibrationInstance(EmsVibrationInstance emsVibrationInstance); + + /** + * 批量删除震动实时数据 + * + * @param objIds 需要删除的震动实时数据主键集合 + * @return 结果 + */ + public int deleteEmsVibrationInstanceByObjIds(Long[] objIds); + + /** + * 删除震动实时数据信息 + * + * @param objId 震动实时数据主键 + * @return 结果 + */ + public int deleteEmsVibrationInstanceByObjId(Long objId); +} diff --git a/os-ems/src/main/java/com/os/ems/record/service/ITWTempertureDataService.java b/os-ems/src/main/java/com/os/ems/record/service/ITWTempertureDataService.java new file mode 100644 index 0000000..5b63223 --- /dev/null +++ b/os-ems/src/main/java/com/os/ems/record/service/ITWTempertureDataService.java @@ -0,0 +1,61 @@ +package com.os.ems.record.service; + +import java.util.List; +import com.os.ems.record.domain.TWTempertureData; + +/** + * 物联网实时数据Service接口 + * + * @author Caoql + * @date 2024-08-21 + */ +public interface ITWTempertureDataService +{ + /** + * 查询物联网实时数据 + * + * @param objid 物联网实时数据主键 + * @return 物联网实时数据 + */ + public TWTempertureData selectTWTempertureDataByObjid(Long objid); + + /** + * 查询物联网实时数据列表 + * + * @param tWTempertureData 物联网实时数据 + * @return 物联网实时数据集合 + */ + public List selectTWTempertureDataList(TWTempertureData tWTempertureData); + + /** + * 新增物联网实时数据 + * + * @param tWTempertureData 物联网实时数据 + * @return 结果 + */ + public int insertTWTempertureData(TWTempertureData tWTempertureData); + + /** + * 修改物联网实时数据 + * + * @param tWTempertureData 物联网实时数据 + * @return 结果 + */ + public int updateTWTempertureData(TWTempertureData tWTempertureData); + + /** + * 批量删除物联网实时数据 + * + * @param objids 需要删除的物联网实时数据主键集合 + * @return 结果 + */ + public int deleteTWTempertureDataByObjids(Long[] objids); + + /** + * 删除物联网实时数据信息 + * + * @param objid 物联网实时数据主键 + * @return 结果 + */ + public int deleteTWTempertureDataByObjid(Long objid); +} diff --git a/os-ems/src/main/java/com/os/ems/record/service/impl/EmsVibrationInstanceServiceImpl.java b/os-ems/src/main/java/com/os/ems/record/service/impl/EmsVibrationInstanceServiceImpl.java new file mode 100644 index 0000000..623e356 --- /dev/null +++ b/os-ems/src/main/java/com/os/ems/record/service/impl/EmsVibrationInstanceServiceImpl.java @@ -0,0 +1,93 @@ +package com.os.ems.record.service.impl; + +import java.util.List; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.os.ems.record.mapper.EmsVibrationInstanceMapper; +import com.os.ems.record.domain.EmsVibrationInstance; +import com.os.ems.record.service.IEmsVibrationInstanceService; + +/** + * 震动实时数据Service业务层处理 + * + * @author ZangCH + * @date 2024-08-21 + */ +@Service +public class EmsVibrationInstanceServiceImpl implements IEmsVibrationInstanceService +{ + @Autowired + private EmsVibrationInstanceMapper emsVibrationInstanceMapper; + + /** + * 查询震动实时数据 + * + * @param objId 震动实时数据主键 + * @return 震动实时数据 + */ + @Override + public EmsVibrationInstance selectEmsVibrationInstanceByObjId(Long objId) + { + return emsVibrationInstanceMapper.selectEmsVibrationInstanceByObjId(objId); + } + + /** + * 查询震动实时数据列表 + * + * @param emsVibrationInstance 震动实时数据 + * @return 震动实时数据 + */ + @Override + public List selectEmsVibrationInstanceList(EmsVibrationInstance emsVibrationInstance) + { + return emsVibrationInstanceMapper.selectEmsVibrationInstanceList(emsVibrationInstance); + } + + /** + * 新增震动实时数据 + * + * @param emsVibrationInstance 震动实时数据 + * @return 结果 + */ + @Override + public int insertEmsVibrationInstance(EmsVibrationInstance emsVibrationInstance) + { + return emsVibrationInstanceMapper.insertEmsVibrationInstance(emsVibrationInstance); + } + + /** + * 修改震动实时数据 + * + * @param emsVibrationInstance 震动实时数据 + * @return 结果 + */ + @Override + public int updateEmsVibrationInstance(EmsVibrationInstance emsVibrationInstance) + { + return emsVibrationInstanceMapper.updateEmsVibrationInstance(emsVibrationInstance); + } + + /** + * 批量删除震动实时数据 + * + * @param objIds 需要删除的震动实时数据主键 + * @return 结果 + */ + @Override + public int deleteEmsVibrationInstanceByObjIds(Long[] objIds) + { + return emsVibrationInstanceMapper.deleteEmsVibrationInstanceByObjIds(objIds); + } + + /** + * 删除震动实时数据信息 + * + * @param objId 震动实时数据主键 + * @return 结果 + */ + @Override + public int deleteEmsVibrationInstanceByObjId(Long objId) + { + return emsVibrationInstanceMapper.deleteEmsVibrationInstanceByObjId(objId); + } +} diff --git a/os-ems/src/main/java/com/os/ems/record/service/impl/TWTempertureDataServiceImpl.java b/os-ems/src/main/java/com/os/ems/record/service/impl/TWTempertureDataServiceImpl.java new file mode 100644 index 0000000..840194e --- /dev/null +++ b/os-ems/src/main/java/com/os/ems/record/service/impl/TWTempertureDataServiceImpl.java @@ -0,0 +1,93 @@ +package com.os.ems.record.service.impl; + +import java.util.List; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.os.ems.record.mapper.TWTempertureDataMapper; +import com.os.ems.record.domain.TWTempertureData; +import com.os.ems.record.service.ITWTempertureDataService; + +/** + * 物联网实时数据Service业务层处理 + * + * @author Caoql + * @date 2024-08-21 + */ +@Service +public class TWTempertureDataServiceImpl implements ITWTempertureDataService +{ + @Autowired + private TWTempertureDataMapper tWTempertureDataMapper; + + /** + * 查询物联网实时数据 + * + * @param objid 物联网实时数据主键 + * @return 物联网实时数据 + */ + @Override + public TWTempertureData selectTWTempertureDataByObjid(Long objid) + { + return tWTempertureDataMapper.selectTWTempertureDataByObjid(objid); + } + + /** + * 查询物联网实时数据列表 + * + * @param tWTempertureData 物联网实时数据 + * @return 物联网实时数据 + */ + @Override + public List selectTWTempertureDataList(TWTempertureData tWTempertureData) + { + return tWTempertureDataMapper.selectTWTempertureDataList(tWTempertureData); + } + + /** + * 新增物联网实时数据 + * + * @param tWTempertureData 物联网实时数据 + * @return 结果 + */ + @Override + public int insertTWTempertureData(TWTempertureData tWTempertureData) + { + return tWTempertureDataMapper.insertTWTempertureData(tWTempertureData); + } + + /** + * 修改物联网实时数据 + * + * @param tWTempertureData 物联网实时数据 + * @return 结果 + */ + @Override + public int updateTWTempertureData(TWTempertureData tWTempertureData) + { + return tWTempertureDataMapper.updateTWTempertureData(tWTempertureData); + } + + /** + * 批量删除物联网实时数据 + * + * @param objids 需要删除的物联网实时数据主键 + * @return 结果 + */ + @Override + public int deleteTWTempertureDataByObjids(Long[] objids) + { + return tWTempertureDataMapper.deleteTWTempertureDataByObjids(objids); + } + + /** + * 删除物联网实时数据信息 + * + * @param objid 物联网实时数据主键 + * @return 结果 + */ + @Override + public int deleteTWTempertureDataByObjid(Long objid) + { + return tWTempertureDataMapper.deleteTWTempertureDataByObjid(objid); + } +} diff --git a/os-ems/src/main/resources/mapper/ems/base/EmsBaseMonitorInfoMapper.xml b/os-ems/src/main/resources/mapper/ems/base/EmsBaseMonitorInfoMapper.xml index 988c4b9..a08a63b 100644 --- a/os-ems/src/main/resources/mapper/ems/base/EmsBaseMonitorInfoMapper.xml +++ b/os-ems/src/main/resources/mapper/ems/base/EmsBaseMonitorInfoMapper.xml @@ -40,6 +40,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and parent_id = #{parentId} and monitor_code = #{monitorCode} and monitor_name like concat('%', #{monitorName}, '%') + + and monitor_type IN + + #{monitorId} + + and monitor_addr = #{monitorAddr} and monitor_type = #{monitorType} and monitor_status = #{monitorStatus} diff --git a/os-ems/src/main/resources/mapper/ems/record/EmsVibrationInstanceMapper.xml b/os-ems/src/main/resources/mapper/ems/record/EmsVibrationInstanceMapper.xml new file mode 100644 index 0000000..29a600c --- /dev/null +++ b/os-ems/src/main/resources/mapper/ems/record/EmsVibrationInstanceMapper.xml @@ -0,0 +1,90 @@ + + + + + + + + + + + + + + + + + + select objId, collectTime, sensor_id, speed, displacement, acceleration, temperature, recodeTime, remark from T_VibrationSensor_Data + + + + + + + + insert into T_VibrationSensor_Data + + collectTime, + sensor_id, + speed, + displacement, + acceleration, + temperature, + recodeTime, + remark, + + + #{collectTime}, + #{sensorId}, + #{speed}, + #{displacement}, + #{acceleration}, + #{temperature}, + #{recodeTime}, + #{remark}, + + + + + update T_VibrationSensor_Data + + collectTime = #{collectTime}, + sensor_id = #{sensorId}, + speed = #{speed}, + displacement = #{displacement}, + acceleration = #{acceleration}, + temperature = #{temperature}, + recodeTime = #{recodeTime}, + remark = #{remark}, + + where objId = #{objId} + + + + delete from T_VibrationSensor_Data where objId = #{objId} + + + + delete from T_VibrationSensor_Data where objId in + + #{objId} + + + \ No newline at end of file diff --git a/os-ems/src/main/resources/mapper/ems/record/TWTempertureDataMapper.xml b/os-ems/src/main/resources/mapper/ems/record/TWTempertureDataMapper.xml new file mode 100644 index 0000000..cbfa671 --- /dev/null +++ b/os-ems/src/main/resources/mapper/ems/record/TWTempertureDataMapper.xml @@ -0,0 +1,111 @@ + + + + + + + + + + + + + + + + + + + + + + select objid, monitorId, collectTime, tempreture, humidity, illuminance, noise, concentration, recodeTime, alarmType, confirmPersonID, confirmTime, confirmFlag from T_W_TempertureData + + + + + + + + insert into T_W_TempertureData + + monitorId, + collectTime, + tempreture, + humidity, + illuminance, + noise, + concentration, + recodeTime, + alarmType, + confirmPersonID, + confirmTime, + confirmFlag, + + + #{monitorId}, + #{collectTime}, + #{tempreture}, + #{humidity}, + #{illuminance}, + #{noise}, + #{concentration}, + #{recodeTime}, + #{alarmType}, + #{confirmPersonID}, + #{confirmTime}, + #{confirmFlag}, + + + + + update T_W_TempertureData + + monitorId = #{monitorId}, + collectTime = #{collectTime}, + tempreture = #{tempreture}, + humidity = #{humidity}, + illuminance = #{illuminance}, + noise = #{noise}, + concentration = #{concentration}, + recodeTime = #{recodeTime}, + alarmType = #{alarmType}, + confirmPersonID = #{confirmPersonID}, + confirmTime = #{confirmTime}, + confirmFlag = #{confirmFlag}, + + where objid = #{objid} + + + + delete from T_W_TempertureData where objid = #{objid} + + + + delete from T_W_TempertureData where objid in + + #{objid} + + + \ No newline at end of file