From 351696c5bc5c6effd89c04874143b9dd3edc3c1b Mon Sep 17 00:00:00 2001 From: zhouhy Date: Wed, 15 May 2024 14:05:00 +0800 Subject: [PATCH] =?UTF-8?q?change=20-=20add=E7=94=B5=E3=80=81=E6=B0=B4?= =?UTF-8?q?=E5=AE=9E=E6=97=B6=E6=95=B0=E6=8D=AE=20change=20-=20update=20?= =?UTF-8?q?=E8=AE=A1=E9=87=8F=E8=AE=BE=E5=A4=87=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../EmsBaseMonitorInfoController.java | 4 +- .../ems/base/domain/EmsBaseMonitorInfo.java | 64 +++--- .../EmsRecordWaterInstantController.java | 106 ++++++++++ .../record/domain/EmsRecordDnbInstant.java | 78 ++++++++ .../record/domain/EmsRecordWaterInstant.java | 182 ++++++++++++++++++ .../mapper/EmsRecordWaterInstantMapper.java | 61 ++++++ .../IEmsRecordWaterInstantService.java | 61 ++++++ .../EmsRecordWaterInstantServiceImpl.java | 93 +++++++++ .../ems/record/EmsRecordDnbInstantMapper.xml | 73 ++++--- .../record/EmsRecordWaterInstantMapper.xml | 98 ++++++++++ 10 files changed, 754 insertions(+), 66 deletions(-) create mode 100644 os-ems/src/main/java/com/os/ems/record/controller/EmsRecordWaterInstantController.java create mode 100644 os-ems/src/main/java/com/os/ems/record/domain/EmsRecordWaterInstant.java create mode 100644 os-ems/src/main/java/com/os/ems/record/mapper/EmsRecordWaterInstantMapper.java create mode 100644 os-ems/src/main/java/com/os/ems/record/service/IEmsRecordWaterInstantService.java create mode 100644 os-ems/src/main/java/com/os/ems/record/service/impl/EmsRecordWaterInstantServiceImpl.java create mode 100644 os-ems/src/main/resources/mapper/ems/record/EmsRecordWaterInstantMapper.xml diff --git a/os-ems/src/main/java/com/os/ems/base/controller/EmsBaseMonitorInfoController.java b/os-ems/src/main/java/com/os/ems/base/controller/EmsBaseMonitorInfoController.java index 7bba90f..6ba9f1e 100644 --- a/os-ems/src/main/java/com/os/ems/base/controller/EmsBaseMonitorInfoController.java +++ b/os-ems/src/main/java/com/os/ems/base/controller/EmsBaseMonitorInfoController.java @@ -24,7 +24,7 @@ import com.os.common.utils.poi.ExcelUtil; /** * 计量设备信息Controller - * + * * @author Yinq * @date 2024-05-08 */ @@ -50,7 +50,7 @@ public class EmsBaseMonitorInfoController extends BaseController * 查询计量设备信息下拉树结构 * */ @PostMapping("/monitorInfoTree") - public AjaxResult getMonitorInfoTree(EmsBaseMonitorInfo baseMonitorInfo) { + public AjaxResult getMonitorInfoTree(@RequestBody EmsBaseMonitorInfo baseMonitorInfo) { List list = emsBaseMonitorInfoService.selectBaseMonitorInfoTreeList(baseMonitorInfo); return success(list); } 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 331ca72..7c2adb9 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 @@ -11,7 +11,7 @@ import java.util.List; /** * 计量设备信息对象 ems_base_monitor_info - * + * * @author Yinq * @date 2024-05-08 */ @@ -42,7 +42,7 @@ public class EmsBaseMonitorInfo extends BaseEntity @Excel(name = "计量设备状态", readConverterExp = "0=启用,1=停用") private Long monitorStatus; - /** 采集设备编号 */ + /** 采集设备编号F */ @Excel(name = "采集设备编号") private String collectDeviceId; @@ -141,7 +141,7 @@ public class EmsBaseMonitorInfo extends BaseEntity this.objId = objId; } - public Long getObjId() + public Long getObjId() { return objId; } @@ -159,133 +159,133 @@ public class EmsBaseMonitorInfo extends BaseEntity this.monitorName = monitorName; } - public String getMonitorName() + public String getMonitorName() { return monitorName; } - public void setMonitorAddr(String monitorAddr) + public void setMonitorAddr(String monitorAddr) { this.monitorAddr = monitorAddr; } - public String getMonitorAddr() + public String getMonitorAddr() { return monitorAddr; } - public void setMonitorType(Long monitorType) + public void setMonitorType(Long monitorType) { this.monitorType = monitorType; } - public Long getMonitorType() + public Long getMonitorType() { return monitorType; } - public void setMonitorStatus(Long monitorStatus) + public void setMonitorStatus(Long monitorStatus) { this.monitorStatus = monitorStatus; } - public Long getMonitorStatus() + public Long getMonitorStatus() { return monitorStatus; } - public void setCollectDeviceId(String collectDeviceId) + public void setCollectDeviceId(String collectDeviceId) { this.collectDeviceId = collectDeviceId; } - public String getCollectDeviceId() + public String getCollectDeviceId() { return collectDeviceId; } - public void setGrade(Long grade) + public void setGrade(Long grade) { this.grade = grade; } - public Long getGrade() + public Long getGrade() { return grade; } - public void setMeterTypeId(String meterTypeId) + public void setMeterTypeId(String meterTypeId) { this.meterTypeId = meterTypeId; } - public String getMeterTypeId() + public String getMeterTypeId() { return meterTypeId; } - public void setCorrectValue(Long correctValue) + public void setCorrectValue(Long correctValue) { this.correctValue = correctValue; } - public Long getCorrectValue() + public Long getCorrectValue() { return correctValue; } - public void setPt(Long pt) + public void setPt(Long pt) { this.pt = pt; } - public Long getPt() + public Long getPt() { return pt; } - public void setCt(Long ct) + public void setCt(Long ct) { this.ct = ct; } - public Long getCt() + public Long getCt() { return ct; } - public void setIsAmmeter(String isAmmeter) + public void setIsAmmeter(String isAmmeter) { this.isAmmeter = isAmmeter; } - public String getIsAmmeter() + public String getIsAmmeter() { return isAmmeter; } - public void setIsKeyMonitor(Long isKeyMonitor) + public void setIsKeyMonitor(Long isKeyMonitor) { this.isKeyMonitor = isKeyMonitor; } - public Long getIsKeyMonitor() + public Long getIsKeyMonitor() { return isKeyMonitor; } - public void setIsCircuit(Long isCircuit) + public void setIsCircuit(Long isCircuit) { this.isCircuit = isCircuit; } - public Long getIsCircuit() + public Long getIsCircuit() { return isCircuit; } - public void setPublicShareType(Long publicShareType) + public void setPublicShareType(Long publicShareType) { this.publicShareType = publicShareType; } - public Long getPublicShareType() + public Long getPublicShareType() { return publicShareType; } - public void setMonitorHierarchy(Long monitorHierarchy) + public void setMonitorHierarchy(Long monitorHierarchy) { this.monitorHierarchy = monitorHierarchy; } - public Long getMonitorHierarchy() + public Long getMonitorHierarchy() { return monitorHierarchy; } diff --git a/os-ems/src/main/java/com/os/ems/record/controller/EmsRecordWaterInstantController.java b/os-ems/src/main/java/com/os/ems/record/controller/EmsRecordWaterInstantController.java new file mode 100644 index 0000000..e451d16 --- /dev/null +++ b/os-ems/src/main/java/com/os/ems/record/controller/EmsRecordWaterInstantController.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.EmsRecordWaterInstant; +import com.os.ems.record.service.IEmsRecordWaterInstantService; +import com.os.common.utils.poi.ExcelUtil; +import com.os.common.core.page.TableDataInfo; + +/** + * 水实时数据Controller + * + * @author Yinq + * @date 2024-05-14 + */ +@RestController +@RequestMapping("/ems/record/recordWaterInstant") +public class EmsRecordWaterInstantController extends BaseController +{ + @Autowired + private IEmsRecordWaterInstantService emsRecordWaterInstantService; + + /** + * 查询水实时数据列表 + */ + @PreAuthorize("@ss.hasPermi('ems/record:recordWaterInstant:list')") + @GetMapping("/list") + public TableDataInfo list(EmsRecordWaterInstant emsRecordWaterInstant) + { + startPage(); + List list = emsRecordWaterInstantService.selectEmsRecordWaterInstantList(emsRecordWaterInstant); + return getDataTable(list); + } + + /** + * 导出水实时数据列表 + */ + @PreAuthorize("@ss.hasPermi('ems/record:recordWaterInstant:export')") + @Log(title = "水实时数据", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, EmsRecordWaterInstant emsRecordWaterInstant) + { + List list = emsRecordWaterInstantService.selectEmsRecordWaterInstantList(emsRecordWaterInstant); + ExcelUtil util = new ExcelUtil(EmsRecordWaterInstant.class); + util.exportExcel(response, list, "水实时数据数据"); + } + + /** + * 获取水实时数据详细信息 + */ + @PreAuthorize("@ss.hasPermi('ems/record:recordWaterInstant:query')") + @GetMapping(value = "/{objId}") + public AjaxResult getInfo(@PathVariable("objId") Long objId) + { + return success(emsRecordWaterInstantService.selectEmsRecordWaterInstantByObjId(objId)); + } + + /** + * 新增水实时数据 + */ + @PreAuthorize("@ss.hasPermi('ems/record:recordWaterInstant:add')") + @Log(title = "水实时数据", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody EmsRecordWaterInstant emsRecordWaterInstant) + { + emsRecordWaterInstant.setCreateBy(getUsername()); + return toAjax(emsRecordWaterInstantService.insertEmsRecordWaterInstant(emsRecordWaterInstant)); + } + + /** + * 修改水实时数据 + */ + @PreAuthorize("@ss.hasPermi('ems/record:recordWaterInstant:edit')") + @Log(title = "水实时数据", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody EmsRecordWaterInstant emsRecordWaterInstant) + { + emsRecordWaterInstant.setUpdateBy(getUsername()); + return toAjax(emsRecordWaterInstantService.updateEmsRecordWaterInstant(emsRecordWaterInstant)); + } + + /** + * 删除水实时数据 + */ + @PreAuthorize("@ss.hasPermi('ems/record:recordWaterInstant:remove')") + @Log(title = "水实时数据", businessType = BusinessType.DELETE) + @DeleteMapping("/{objIds}") + public AjaxResult remove(@PathVariable Long[] objIds) + { + return toAjax(emsRecordWaterInstantService.deleteEmsRecordWaterInstantByObjIds(objIds)); + } +} diff --git a/os-ems/src/main/java/com/os/ems/record/domain/EmsRecordDnbInstant.java b/os-ems/src/main/java/com/os/ems/record/domain/EmsRecordDnbInstant.java index fc61ca7..7522b82 100644 --- a/os-ems/src/main/java/com/os/ems/record/domain/EmsRecordDnbInstant.java +++ b/os-ems/src/main/java/com/os/ems/record/domain/EmsRecordDnbInstant.java @@ -28,12 +28,26 @@ public class EmsRecordDnbInstant extends BaseEntity { @Excel(name = "计量设备编号") private String monitorId; + /** + * 计量设备Code + */ + @Excel(name = "计量设备名称") + private String monitorCode; + /** + * 计量设备名称 + */ + @Excel(name = "计量设备名称") + private String monitorName; + + /** * 采集时间 */ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @Excel(name = "采集时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") private Date collectTime; + private String beginCollectTime; + private String endCollectTime; /** * A项电压 @@ -78,6 +92,9 @@ public class EmsRecordDnbInstant extends BaseEntity { @Excel(name = "记录时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") private Date recordTime; + private String beginRecordTime; + private String endRecordTime; + /** * 功率因数 */ @@ -108,6 +125,67 @@ public class EmsRecordDnbInstant extends BaseEntity { @Excel(name = "采集方式", readConverterExp = "0=自动,1=手动") private Long collectType; + + //统计单元id + private String workUnitCode; + + + public String getBeginRecordTime() { + return beginRecordTime; + } + + public String getMonitorCode() { + return monitorCode; + } + + public void setMonitorCode(String monitorCode) { + this.monitorCode = monitorCode; + } + + public void setBeginRecordTime(String beginRecordTime) { + this.beginRecordTime = beginRecordTime; + } + + public String getEndRecordTime() { + return endRecordTime; + } + + public void setEndRecordTime(String endRecordTime) { + this.endRecordTime = endRecordTime; + } + + public String getBeginCollectTime() { + return beginCollectTime; + } + + public void setBeginCollectTime(String beginCollectTime) { + this.beginCollectTime = beginCollectTime; + } + + public String getEndCollectTime() { + return endCollectTime; + } + + public void setEndCollectTime(String endCollectTime) { + this.endCollectTime = endCollectTime; + } + + public String getWorkUnitCode() { + return workUnitCode; + } + + public void setWorkUnitCode(String workUnitCode) { + this.workUnitCode = workUnitCode; + } + + public String getMonitorName() { + return monitorName; + } + + public void setMonitorName(String monitorName) { + this.monitorName = monitorName; + } + public void setObjId(Long objId) { this.objId = objId; } diff --git a/os-ems/src/main/java/com/os/ems/record/domain/EmsRecordWaterInstant.java b/os-ems/src/main/java/com/os/ems/record/domain/EmsRecordWaterInstant.java new file mode 100644 index 0000000..8662ac4 --- /dev/null +++ b/os-ems/src/main/java/com/os/ems/record/domain/EmsRecordWaterInstant.java @@ -0,0 +1,182 @@ +package com.os.ems.record.domain; + +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; + +/** + * 水实时数据对象 ems_record_water_instant + * + * @author Yinq + * @date 2024-05-14 + */ +public class EmsRecordWaterInstant extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** */ + private Long objId; + + /** 计量设备编号 */ + @Excel(name = "计量设备编号") + private String monitorId; + /** 计量设备编号 */ + @Excel(name = "计量设备名称") + private String monitorName; + private String monitorCode; + + /** 采集时间 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "采集时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") + private Date collectTime; + private String beginTime; + private String endTime; + + /** 瞬时流量 */ + @Excel(name = "瞬时流量") + private Long fluxFlow; + + /** 累计流量 */ + @Excel(name = "累计流量") + private Long waterFlow; + + /** 记录时间 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "记录时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") + private Date recordTime; + private String beginRecordTime; + private String endRecordTime; + + /** 采集方式（0自动 1手动） */ + @Excel(name = "采集方式", readConverterExp = "0=自动,1=手动") + private Long collectType; + + + public String getMonitorCode() { + return monitorCode; + } + + public void setMonitorCode(String monitorCode) { + this.monitorCode = monitorCode; + } + + public String getBeginRecordTime() { + return beginRecordTime; + } + + public void setBeginRecordTime(String beginRecordTime) { + this.beginRecordTime = beginRecordTime; + } + + public String getEndRecordTime() { + return endRecordTime; + } + + public void setEndRecordTime(String endRecordTime) { + this.endRecordTime = endRecordTime; + } + + public String getBeginTime() { + return beginTime; + } + + public void setBeginTime(String beginTime) { + this.beginTime = beginTime; + } + + public String getEndTime() { + return endTime; + } + + public void setEndTime(String endTime) { + this.endTime = endTime; + } + + public String getMonitorName() { + return monitorName; + } + + public void setMonitorName(String monitorName) { + this.monitorName = monitorName; + } + + 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 setFluxFlow(Long fluxFlow) + { + this.fluxFlow = fluxFlow; + } + + public Long getFluxFlow() + { + return fluxFlow; + } + public void setWaterFlow(Long waterFlow) + { + this.waterFlow = waterFlow; + } + + public Long getWaterFlow() + { + return waterFlow; + } + public void setRecordTime(Date recordTime) + { + this.recordTime = recordTime; + } + + public Date getRecordTime() + { + return recordTime; + } + public void setCollectType(Long collectType) + { + this.collectType = collectType; + } + + public Long getCollectType() + { + return collectType; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("objId", getObjId()) + .append("monitorId", getMonitorId()) + .append("collectTime", getCollectTime()) + .append("fluxFlow", getFluxFlow()) + .append("waterFlow", getWaterFlow()) + .append("recordTime", getRecordTime()) + .append("collectType", getCollectType()) + .toString(); + } +} diff --git a/os-ems/src/main/java/com/os/ems/record/mapper/EmsRecordWaterInstantMapper.java b/os-ems/src/main/java/com/os/ems/record/mapper/EmsRecordWaterInstantMapper.java new file mode 100644 index 0000000..39ee4e5 --- /dev/null +++ b/os-ems/src/main/java/com/os/ems/record/mapper/EmsRecordWaterInstantMapper.java @@ -0,0 +1,61 @@ +package com.os.ems.record.mapper; + +import java.util.List; +import com.os.ems.record.domain.EmsRecordWaterInstant; + +/** + * 水实时数据Mapper接口 + * + * @author Yinq + * @date 2024-05-14 + */ +public interface EmsRecordWaterInstantMapper +{ + /** + * 查询水实时数据 + * + * @param objId 水实时数据主键 + * @return 水实时数据 + */ + public EmsRecordWaterInstant selectEmsRecordWaterInstantByObjId(Long objId); + + /** + * 查询水实时数据列表 + * + * @param emsRecordWaterInstant 水实时数据 + * @return 水实时数据集合 + */ + public List selectEmsRecordWaterInstantList(EmsRecordWaterInstant emsRecordWaterInstant); + + /** + * 新增水实时数据 + * + * @param emsRecordWaterInstant 水实时数据 + * @return 结果 + */ + public int insertEmsRecordWaterInstant(EmsRecordWaterInstant emsRecordWaterInstant); + + /** + * 修改水实时数据 + * + * @param emsRecordWaterInstant 水实时数据 + * @return 结果 + */ + public int updateEmsRecordWaterInstant(EmsRecordWaterInstant emsRecordWaterInstant); + + /** + * 删除水实时数据 + * + * @param objId 水实时数据主键 + * @return 结果 + */ + public int deleteEmsRecordWaterInstantByObjId(Long objId); + + /** + * 批量删除水实时数据 + * + * @param objIds 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteEmsRecordWaterInstantByObjIds(Long[] objIds); +} diff --git a/os-ems/src/main/java/com/os/ems/record/service/IEmsRecordWaterInstantService.java b/os-ems/src/main/java/com/os/ems/record/service/IEmsRecordWaterInstantService.java new file mode 100644 index 0000000..4667821 --- /dev/null +++ b/os-ems/src/main/java/com/os/ems/record/service/IEmsRecordWaterInstantService.java @@ -0,0 +1,61 @@ +package com.os.ems.record.service; + +import java.util.List; +import com.os.ems.record.domain.EmsRecordWaterInstant; + +/** + * 水实时数据Service接口 + * + * @author Yinq + * @date 2024-05-14 + */ +public interface IEmsRecordWaterInstantService +{ + /** + * 查询水实时数据 + * + * @param objId 水实时数据主键 + * @return 水实时数据 + */ + public EmsRecordWaterInstant selectEmsRecordWaterInstantByObjId(Long objId); + + /** + * 查询水实时数据列表 + * + * @param emsRecordWaterInstant 水实时数据 + * @return 水实时数据集合 + */ + public List selectEmsRecordWaterInstantList(EmsRecordWaterInstant emsRecordWaterInstant); + + /** + * 新增水实时数据 + * + * @param emsRecordWaterInstant 水实时数据 + * @return 结果 + */ + public int insertEmsRecordWaterInstant(EmsRecordWaterInstant emsRecordWaterInstant); + + /** + * 修改水实时数据 + * + * @param emsRecordWaterInstant 水实时数据 + * @return 结果 + */ + public int updateEmsRecordWaterInstant(EmsRecordWaterInstant emsRecordWaterInstant); + + /** + * 批量删除水实时数据 + * + * @param objIds 需要删除的水实时数据主键集合 + * @return 结果 + */ + public int deleteEmsRecordWaterInstantByObjIds(Long[] objIds); + + /** + * 删除水实时数据信息 + * + * @param objId 水实时数据主键 + * @return 结果 + */ + public int deleteEmsRecordWaterInstantByObjId(Long objId); +} diff --git a/os-ems/src/main/java/com/os/ems/record/service/impl/EmsRecordWaterInstantServiceImpl.java b/os-ems/src/main/java/com/os/ems/record/service/impl/EmsRecordWaterInstantServiceImpl.java new file mode 100644 index 0000000..401ae92 --- /dev/null +++ b/os-ems/src/main/java/com/os/ems/record/service/impl/EmsRecordWaterInstantServiceImpl.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.EmsRecordWaterInstantMapper; +import com.os.ems.record.domain.EmsRecordWaterInstant; +import com.os.ems.record.service.IEmsRecordWaterInstantService; + +/** + * 水实时数据Service业务层处理 + * + * @author Yinq + * @date 2024-05-14 + */ +@Service +public class EmsRecordWaterInstantServiceImpl implements IEmsRecordWaterInstantService +{ + @Autowired + private EmsRecordWaterInstantMapper emsRecordWaterInstantMapper; + + /** + * 查询水实时数据 + * + * @param objId 水实时数据主键 + * @return 水实时数据 + */ + @Override + public EmsRecordWaterInstant selectEmsRecordWaterInstantByObjId(Long objId) + { + return emsRecordWaterInstantMapper.selectEmsRecordWaterInstantByObjId(objId); + } + + /** + * 查询水实时数据列表 + * + * @param emsRecordWaterInstant 水实时数据 + * @return 水实时数据 + */ + @Override + public List selectEmsRecordWaterInstantList(EmsRecordWaterInstant emsRecordWaterInstant) + { + return emsRecordWaterInstantMapper.selectEmsRecordWaterInstantList(emsRecordWaterInstant); + } + + /** + * 新增水实时数据 + * + * @param emsRecordWaterInstant 水实时数据 + * @return 结果 + */ + @Override + public int insertEmsRecordWaterInstant(EmsRecordWaterInstant emsRecordWaterInstant) + { + return emsRecordWaterInstantMapper.insertEmsRecordWaterInstant(emsRecordWaterInstant); + } + + /** + * 修改水实时数据 + * + * @param emsRecordWaterInstant 水实时数据 + * @return 结果 + */ + @Override + public int updateEmsRecordWaterInstant(EmsRecordWaterInstant emsRecordWaterInstant) + { + return emsRecordWaterInstantMapper.updateEmsRecordWaterInstant(emsRecordWaterInstant); + } + + /** + * 批量删除水实时数据 + * + * @param objIds 需要删除的水实时数据主键 + * @return 结果 + */ + @Override + public int deleteEmsRecordWaterInstantByObjIds(Long[] objIds) + { + return emsRecordWaterInstantMapper.deleteEmsRecordWaterInstantByObjIds(objIds); + } + + /** + * 删除水实时数据信息 + * + * @param objId 水实时数据主键 + * @return 结果 + */ + @Override + public int deleteEmsRecordWaterInstantByObjId(Long objId) + { + return emsRecordWaterInstantMapper.deleteEmsRecordWaterInstantByObjId(objId); + } +} diff --git a/os-ems/src/main/resources/mapper/ems/record/EmsRecordDnbInstantMapper.xml b/os-ems/src/main/resources/mapper/ems/record/EmsRecordDnbInstantMapper.xml index b2bc1b9..decfaa7 100644 --- a/os-ems/src/main/resources/mapper/ems/record/EmsRecordDnbInstantMapper.xml +++ b/os-ems/src/main/resources/mapper/ems/record/EmsRecordDnbInstantMapper.xml @@ -7,6 +7,8 @@ + + @@ -23,48 +25,55 @@ - select obj_id, - monitor_id, - collect_time, - v_a, - v_b, - v_c, - i_a, - i_b, - i_c, - record_time, - glys, - zxyg, - active_power, - reactive_power, - collect_type - from ems_record_dnb_instant + select RDI.obj_id, + RDI.monitor_id, + BMI.monitor_name, + BMI.monitor_code, + RDI.collect_time, + RDI.v_a, + RDI.v_b, + RDI.v_c, + RDI.i_a, + RDI.i_b, + RDI.i_c, + RDI.record_time, + RDI.glys, + RDI.zxyg, + RDI.active_power, + RDI.reactive_power, + RDI.collect_type + from ems_record_dnb_instant as RDI + left join ems_base_monitor_info as BMI + on RDI.monitor_id = BMI.obj_id - \ No newline at end of file + diff --git a/os-ems/src/main/resources/mapper/ems/record/EmsRecordWaterInstantMapper.xml b/os-ems/src/main/resources/mapper/ems/record/EmsRecordWaterInstantMapper.xml new file mode 100644 index 0000000..6154b52 --- /dev/null +++ b/os-ems/src/main/resources/mapper/ems/record/EmsRecordWaterInstantMapper.xml @@ -0,0 +1,98 @@ + + + + + + + + + + + + + + + + + + select RWI.obj_id, + RWI.monitor_id, + RWI.collect_time, + RWI.flux_flow, + RWI.water_flow, + RWI.record_time, + RWI.collect_type, + BMI.monitor_name, + BMI.monitor_code + from ems_record_water_instant RWI + left join ems_base_monitor_info BMI on RWI.monitor_id = BMI.obj_id + + + + + + + + insert into ems_record_water_instant + + monitor_id, + collect_time, + flux_flow, + water_flow, + record_time, + collect_type, + + + #{monitorId}, + #{collectTime}, + #{fluxFlow}, + #{waterFlow}, + #{recordTime}, + #{collectType}, + + + + + update ems_record_water_instant + + monitor_id = #{monitorId}, + collect_time = #{collectTime}, + flux_flow = #{fluxFlow}, + water_flow = #{waterFlow}, + record_time = #{recordTime}, + collect_type = #{collectType}, + + where obj_id = #{objId} + + + + delete from ems_record_water_instant where obj_id = #{objId} + + + + delete from ems_record_water_instant where obj_id in + + #{objId} + + +