From 71d171bf38ba16dcfbc70b330644c06665597a73 Mon Sep 17 00:00:00 2001 From: zhouhy Date: Tue, 10 Oct 2023 17:25:35 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E4=BF=A1=E6=81=AF=E6=A0=91?= =?UTF-8?q?=E5=90=8E=E7=AB=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/BaseMonitorInfoController.java | 16 ++ .../aucma/base/domain/BaseMonitorInfo.java | 58 ++++- .../com/aucma/base/domain/TreeSelects.java | 83 +++++++ .../base/mapper/BaseMonitorInfoMapper.java | 19 +- .../base/service/IBaseMonitorInfoService.java | 26 ++- .../impl/BaseMonitorInfoServiceImpl.java | 114 +++++++++- .../mapper/base/BaseMonitorInfoMapper.xml | 6 +- .../controller/ReportDayDnbController.java | 103 +++++++++ .../controller/ReportPointDnbController.java | 104 +++++++++ .../com/aucma/report/domain/ReportDayDnb.java | 195 +++++++++++++++++ .../aucma/report/domain/ReportPointDnb.java | 207 ++++++++++++++++++ .../report/mapper/ReportDayDnbMapper.java | 61 ++++++ .../report/mapper/ReportPointDnbMapper.java | 61 ++++++ .../report/service/IReportDayDnbService.java | 61 ++++++ .../service/IReportPointDnbService.java | 61 ++++++ .../service/impl/ReportDayDnbServiceImpl.java | 93 ++++++++ .../impl/ReportPointDnbServiceImpl.java | 93 ++++++++ .../mapper/report/ReportDayDnbMapper.xml | 111 ++++++++++ .../mapper/report/ReportPointDnbMapper.xml | 113 ++++++++++ 19 files changed, 1558 insertions(+), 27 deletions(-) create mode 100644 aucma-base/src/main/java/com/aucma/base/domain/TreeSelects.java create mode 100644 aucma-report/src/main/java/com/aucma/report/controller/ReportDayDnbController.java create mode 100644 aucma-report/src/main/java/com/aucma/report/controller/ReportPointDnbController.java create mode 100644 aucma-report/src/main/java/com/aucma/report/domain/ReportDayDnb.java create mode 100644 aucma-report/src/main/java/com/aucma/report/domain/ReportPointDnb.java create mode 100644 aucma-report/src/main/java/com/aucma/report/mapper/ReportDayDnbMapper.java create mode 100644 aucma-report/src/main/java/com/aucma/report/mapper/ReportPointDnbMapper.java create mode 100644 aucma-report/src/main/java/com/aucma/report/service/IReportDayDnbService.java create mode 100644 aucma-report/src/main/java/com/aucma/report/service/IReportPointDnbService.java create mode 100644 aucma-report/src/main/java/com/aucma/report/service/impl/ReportDayDnbServiceImpl.java create mode 100644 aucma-report/src/main/java/com/aucma/report/service/impl/ReportPointDnbServiceImpl.java create mode 100644 aucma-report/src/main/resources/mapper/report/ReportDayDnbMapper.xml create mode 100644 aucma-report/src/main/resources/mapper/report/ReportPointDnbMapper.xml diff --git a/aucma-base/src/main/java/com/aucma/base/controller/BaseMonitorInfoController.java b/aucma-base/src/main/java/com/aucma/base/controller/BaseMonitorInfoController.java index bbb7b09..3a1606a 100644 --- a/aucma-base/src/main/java/com/aucma/base/controller/BaseMonitorInfoController.java +++ b/aucma-base/src/main/java/com/aucma/base/controller/BaseMonitorInfoController.java @@ -3,6 +3,7 @@ package com.aucma.base.controller; import java.util.List; import javax.servlet.http.HttpServletResponse; +import com.aucma.base.domain.TreeSelects; import com.aucma.common.utils.DateUtils; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.beans.factory.annotation.Autowired; @@ -43,6 +44,11 @@ public class BaseMonitorInfoController extends BaseController { List list = baseMonitorInfoService.selectBaseMonitorInfoList(baseMonitorInfo); return success(list); } + @PostMapping("/monitorInfoTree") + public AjaxResult getMonitorInfoTree(BaseMonitorInfo baseMonitorInfo) { + List list = baseMonitorInfoService.selectBaseMonitorInfoTreeList(baseMonitorInfo); + return success(list); + } /** * 导出计量设备信息列表 @@ -98,4 +104,14 @@ public class BaseMonitorInfoController extends BaseController { public AjaxResult remove(@PathVariable Long[] objIds) { return toAjax(baseMonitorInfoService.deleteBaseMonitorInfoByObjIds(objIds)); } + + //根据名字模糊查询 + @GetMapping("/like/{monitorName}") + public AjaxResult like(@PathVariable("monitorName")String monitorName){ + if (monitorName.isEmpty()){ + + return null; + } + return success(baseMonitorInfoService.selectBaseMonitorInfoByNameLike(monitorName)); + } } diff --git a/aucma-base/src/main/java/com/aucma/base/domain/BaseMonitorInfo.java b/aucma-base/src/main/java/com/aucma/base/domain/BaseMonitorInfo.java index 0e4a715..435d5ce 100644 --- a/aucma-base/src/main/java/com/aucma/base/domain/BaseMonitorInfo.java +++ b/aucma-base/src/main/java/com/aucma/base/domain/BaseMonitorInfo.java @@ -1,12 +1,14 @@ package com.aucma.base.domain; +import java.util.ArrayList; import java.util.Date; +import java.util.List; +import com.aucma.common.core.domain.BaseEntity; import com.fasterxml.jackson.annotation.JsonFormat; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.aucma.common.annotation.Excel; -import com.aucma.common.core.domain.TreeEntity; /** * 计量设备信息对象 base_monitorinfo @@ -14,7 +16,7 @@ import com.aucma.common.core.domain.TreeEntity; * @author Yinq * @date 2023-09-21 */ -public class BaseMonitorInfo extends TreeEntity { +public class BaseMonitorInfo extends BaseEntity { private static final long serialVersionUID = 1L; /** @@ -113,6 +115,56 @@ public class BaseMonitorInfo extends TreeEntity { @Excel(name = "是否虚拟设备", readConverterExp = "0=-是；1-否") private Long isAmmeter; + private List children = new ArrayList(); + + private String parentName; + + private Long parentId; + + private Integer orderNum; + + private String ancestors; + + public List getChildren() { + return children; + } + + public void setChildren(List children) { + this.children = children; + } + + public String getParentName() { + return parentName; + } + + public void setParentName(String parentName) { + this.parentName = parentName; + } + + public Long getParentId() { + return parentId; + } + + public void setParentId(Long parentId) { + this.parentId = parentId; + } + + public Integer getOrderNum() { + return orderNum; + } + + public void setOrderNum(Integer orderNum) { + this.orderNum = orderNum; + } + + public String getAncestors() { + return ancestors; + } + + public void setAncestors(String ancestors) { + this.ancestors = ancestors; + } + public void setObjId(Long objId) { this.objId = objId; } @@ -246,6 +298,7 @@ public class BaseMonitorInfo extends TreeEntity { return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE) .append("objId", getObjId()) .append("parentId", getParentId()) + .append("ancestors", getAncestors()) .append("monitorCode", getMonitorCode()) .append("monitorName", getMonitorName()) .append("monitorAddress", getMonitorAddress()) @@ -261,6 +314,7 @@ public class BaseMonitorInfo extends TreeEntity { .append("updatedBy", getUpdatedBy()) .append("updatedTime", getUpdatedTime()) .append("isAmmeter", getIsAmmeter()) + .append("children", getChildren()) .toString(); } } diff --git a/aucma-base/src/main/java/com/aucma/base/domain/TreeSelects.java b/aucma-base/src/main/java/com/aucma/base/domain/TreeSelects.java new file mode 100644 index 0000000..0bde6e8 --- /dev/null +++ b/aucma-base/src/main/java/com/aucma/base/domain/TreeSelects.java @@ -0,0 +1,83 @@ +package com.aucma.base.domain; + +import com.aucma.common.core.domain.entity.SysDept; +import com.aucma.common.core.domain.entity.SysMenu; +import com.fasterxml.jackson.annotation.JsonInclude; + +import java.io.Serializable; +import java.util.List; +import java.util.stream.Collectors; + +/** + * Treeselect树结构实体类 + * + * @author ruoyi + */ +public class TreeSelects implements Serializable +{ + private static final long serialVersionUID = 1L; + + /** 节点ID */ + private Long id; + + /** 节点名称 */ + private String label; + + /** 子节点 */ + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List children; + + public TreeSelects() + { + + } + + public TreeSelects(SysDept dept) + { + this.id = dept.getDeptId(); + this.label = dept.getDeptName(); + this.children = dept.getChildren().stream().map(TreeSelects::new).collect(Collectors.toList()); + } + public TreeSelects(BaseMonitorInfo baseMonitorInfo){ + this.id = baseMonitorInfo.getObjId(); + this.label = baseMonitorInfo.getMonitorName(); + this.children = baseMonitorInfo.getChildren().stream().map(TreeSelects::new).collect(Collectors.toList()); + } + + public TreeSelects(SysMenu menu) + { + this.id = menu.getMenuId(); + this.label = menu.getMenuName(); + this.children = menu.getChildren().stream().map(TreeSelects::new).collect(Collectors.toList()); + } + + public Long getId() + { + return id; + } + + public void setId(Long id) + { + this.id = id; + } + + public String getLabel() + { + return label; + } + + public void setLabel(String label) + { + this.label = label; + } + + public List getChildren() + { + return children; + } + + public void setChildren(List children) + { + this.children = children; + } +} diff --git a/aucma-base/src/main/java/com/aucma/base/mapper/BaseMonitorInfoMapper.java b/aucma-base/src/main/java/com/aucma/base/mapper/BaseMonitorInfoMapper.java index 803fc32..c2eba4b 100644 --- a/aucma-base/src/main/java/com/aucma/base/mapper/BaseMonitorInfoMapper.java +++ b/aucma-base/src/main/java/com/aucma/base/mapper/BaseMonitorInfoMapper.java @@ -1,19 +1,20 @@ package com.aucma.base.mapper; +import java.lang.management.MonitorInfo; import java.util.List; import com.aucma.base.domain.BaseMonitorInfo; /** * 计量设备信息Mapper接口 - * + * * @author Yinq * @date 2023-09-21 */ -public interface BaseMonitorInfoMapper +public interface BaseMonitorInfoMapper { /** * 查询计量设备信息 - * + * * @param objId 计量设备信息主键 * @return 计量设备信息 */ @@ -21,7 +22,7 @@ public interface BaseMonitorInfoMapper /** * 查询计量设备信息列表 - * + * * @param baseMonitorInfo 计量设备信息 * @return 计量设备信息集合 */ @@ -29,7 +30,7 @@ public interface BaseMonitorInfoMapper /** * 新增计量设备信息 - * + * * @param baseMonitorInfo 计量设备信息 * @return 结果 */ @@ -37,7 +38,7 @@ public interface BaseMonitorInfoMapper /** * 修改计量设备信息 - * + * * @param baseMonitorInfo 计量设备信息 * @return 结果 */ @@ -45,7 +46,7 @@ public interface BaseMonitorInfoMapper /** * 删除计量设备信息 - * + * * @param objId 计量设备信息主键 * @return 结果 */ @@ -53,9 +54,11 @@ public interface BaseMonitorInfoMapper /** * 批量删除计量设备信息 - * + * * @param objIds 需要删除的数据主键集合 * @return 结果 */ public int deleteBaseMonitorInfoByObjIds(Long[] objIds); + + List selectBaseMonitorInfoByNameLike(String monitorName); } diff --git a/aucma-base/src/main/java/com/aucma/base/service/IBaseMonitorInfoService.java b/aucma-base/src/main/java/com/aucma/base/service/IBaseMonitorInfoService.java index 3a381aa..72ceaca 100644 --- a/aucma-base/src/main/java/com/aucma/base/service/IBaseMonitorInfoService.java +++ b/aucma-base/src/main/java/com/aucma/base/service/IBaseMonitorInfoService.java @@ -2,18 +2,19 @@ package com.aucma.base.service; import java.util.List; import com.aucma.base.domain.BaseMonitorInfo; +import com.aucma.base.domain.TreeSelects; /** * 计量设备信息Service接口 - * + * * @author Yinq * @date 2023-09-21 */ -public interface IBaseMonitorInfoService +public interface IBaseMonitorInfoService { /** * 查询计量设备信息 - * + * * @param objId 计量设备信息主键 * @return 计量设备信息 */ @@ -21,15 +22,22 @@ public interface IBaseMonitorInfoService /** * 查询计量设备信息列表 - * + * * @param baseMonitorInfo 计量设备信息 * @return 计量设备信息集合 */ public List selectBaseMonitorInfoList(BaseMonitorInfo baseMonitorInfo); + List selectBaseMonitorInfoTreeList(BaseMonitorInfo baseMonitorInfo); + + public List buildMonitorInfoTreeSelect(List baseMonitorInfos); + + public List buildMonitorInfoTree(List baseMonitorInfos); + + /** * 新增计量设备信息 - * + * * @param baseMonitorInfo 计量设备信息 * @return 结果 */ @@ -37,7 +45,7 @@ public interface IBaseMonitorInfoService /** * 修改计量设备信息 - * + * * @param baseMonitorInfo 计量设备信息 * @return 结果 */ @@ -45,7 +53,7 @@ public interface IBaseMonitorInfoService /** * 批量删除计量设备信息 - * + * * @param objIds 需要删除的计量设备信息主键集合 * @return 结果 */ @@ -53,9 +61,11 @@ public interface IBaseMonitorInfoService /** * 删除计量设备信息信息 - * + * * @param objId 计量设备信息主键 * @return 结果 */ public int deleteBaseMonitorInfoByObjId(Long objId); + + List selectBaseMonitorInfoByNameLike(String monitorName); } diff --git a/aucma-base/src/main/java/com/aucma/base/service/impl/BaseMonitorInfoServiceImpl.java b/aucma-base/src/main/java/com/aucma/base/service/impl/BaseMonitorInfoServiceImpl.java index 461a2ad..929999c 100644 --- a/aucma-base/src/main/java/com/aucma/base/service/impl/BaseMonitorInfoServiceImpl.java +++ b/aucma-base/src/main/java/com/aucma/base/service/impl/BaseMonitorInfoServiceImpl.java @@ -1,6 +1,13 @@ package com.aucma.base.service.impl; + +import java.util.ArrayList; +import java.util.Iterator; import java.util.List; +import java.util.stream.Collectors; + +import com.aucma.base.domain.TreeSelects; +import com.aucma.common.utils.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.aucma.base.mapper.BaseMonitorInfoMapper; @@ -9,19 +16,19 @@ import com.aucma.base.service.IBaseMonitorInfoService; /** * 计量设备信息Service业务层处理 - * + * * @author Yinq * @date 2023-09-21 */ @Service -public class BaseMonitorInfoServiceImpl implements IBaseMonitorInfoService +public class BaseMonitorInfoServiceImpl implements IBaseMonitorInfoService { @Autowired private BaseMonitorInfoMapper baseMonitorInfoMapper; /** * 查询计量设备信息 - * + * * @param objId 计量设备信息主键 * @return 计量设备信息 */ @@ -33,7 +40,7 @@ public class BaseMonitorInfoServiceImpl implements IBaseMonitorInfoService /** * 查询计量设备信息列表 - * + * * @param baseMonitorInfo 计量设备信息 * @return 计量设备信息 */ @@ -43,9 +50,95 @@ public class BaseMonitorInfoServiceImpl implements IBaseMonitorInfoService return baseMonitorInfoMapper.selectBaseMonitorInfoList(baseMonitorInfo); } + @Override + public List selectBaseMonitorInfoTreeList(BaseMonitorInfo baseMonitorInfo) { + List baseMonitorInfos = selectBaseMonitorInfoList(baseMonitorInfo); + return buildMonitorInfoTreeSelect(baseMonitorInfos); + } + /** + * 构建前端所需要下拉树结构 + * + * @param + * @return 下拉树结构列表 + */ + @Override + public List buildMonitorInfoTreeSelect(List baseMonitorInfos) + { + List deptTrees = buildMonitorInfoTree(baseMonitorInfos); + return deptTrees.stream().map(TreeSelects::new).collect(Collectors.toList()); + } + /** + * 构建前端所需要树结构 + * + * @param + * @return 树结构列表 + */ + @Override + public List buildMonitorInfoTree(List baseMonitorInfos) + { + List returnList = new ArrayList(); + List tempList = baseMonitorInfos.stream().map(BaseMonitorInfo::getObjId).collect(Collectors.toList()); + for (BaseMonitorInfo baseMonitorInfo : baseMonitorInfos) + { + // 如果是顶级节点, 遍历该父节点的所有子节点 + if (!tempList.contains(baseMonitorInfo.getParentId())) + { + recursionFn(baseMonitorInfos, baseMonitorInfo); + returnList.add(baseMonitorInfo); + } + } + if (returnList.isEmpty()) + { + returnList = baseMonitorInfos; + } + return returnList; + } + /** + * 递归列表 + */ + private void recursionFn(List list, BaseMonitorInfo t) + { + // 得到子节点列表 + List childList = getChildList(list, t); + t.setChildren(childList); + for (BaseMonitorInfo tChild : childList) + { + if (hasChild(list, tChild)) + { + recursionFn(list, tChild); + } + } + } + /** + * 得到子节点列表 + */ + private List getChildList(List list, BaseMonitorInfo t) + { + List tlist = new ArrayList(); + Iterator it = list.iterator(); + while (it.hasNext()) + { + BaseMonitorInfo n = (BaseMonitorInfo) it.next(); + if (StringUtils.isNotNull(n.getParentId()) && n.getParentId().longValue() == t.getObjId().longValue()) + { + tlist.add(n); + } + } + return tlist; + } + + /** + * 判断是否有子节点 + */ + private boolean hasChild(List list, BaseMonitorInfo t) + { + return getChildList(list, t).size() > 0; + } + + /** * 新增计量设备信息 - * + * * @param baseMonitorInfo 计量设备信息 * @return 结果 */ @@ -57,7 +150,7 @@ public class BaseMonitorInfoServiceImpl implements IBaseMonitorInfoService /** * 修改计量设备信息 - * + * * @param baseMonitorInfo 计量设备信息 * @return 结果 */ @@ -69,7 +162,7 @@ public class BaseMonitorInfoServiceImpl implements IBaseMonitorInfoService /** * 批量删除计量设备信息 - * + * * @param objIds 需要删除的计量设备信息主键 * @return 结果 */ @@ -81,7 +174,7 @@ public class BaseMonitorInfoServiceImpl implements IBaseMonitorInfoService /** * 删除计量设备信息信息 - * + * * @param objId 计量设备信息主键 * @return 结果 */ @@ -90,4 +183,9 @@ public class BaseMonitorInfoServiceImpl implements IBaseMonitorInfoService { return baseMonitorInfoMapper.deleteBaseMonitorInfoByObjId(objId); } + + @Override + public List selectBaseMonitorInfoByNameLike(String monitorName) { + return baseMonitorInfoMapper.selectBaseMonitorInfoByNameLike(monitorName); + } } diff --git a/aucma-base/src/main/resources/mapper/base/BaseMonitorInfoMapper.xml b/aucma-base/src/main/resources/mapper/base/BaseMonitorInfoMapper.xml index fc1e3b5..0a8283f 100644 --- a/aucma-base/src/main/resources/mapper/base/BaseMonitorInfoMapper.xml +++ b/aucma-base/src/main/resources/mapper/base/BaseMonitorInfoMapper.xml @@ -72,6 +72,10 @@ where obj_id = #{objId} + @@ -153,4 +157,4 @@ #{objId} - \ No newline at end of file + diff --git a/aucma-report/src/main/java/com/aucma/report/controller/ReportDayDnbController.java b/aucma-report/src/main/java/com/aucma/report/controller/ReportDayDnbController.java new file mode 100644 index 0000000..a48d713 --- /dev/null +++ b/aucma-report/src/main/java/com/aucma/report/controller/ReportDayDnbController.java @@ -0,0 +1,103 @@ +package com.aucma.report.controller; + +import java.util.List; +import javax.servlet.http.HttpServletResponse; + +import com.aucma.common.utils.DateUtils; +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.aucma.common.annotation.Log; +import com.aucma.common.core.controller.BaseController; +import com.aucma.common.core.domain.AjaxResult; +import com.aucma.common.enums.BusinessType; +import com.aucma.report.domain.ReportDayDnb; +import com.aucma.report.service.IReportDayDnbService; +import com.aucma.common.utils.poi.ExcelUtil; +import com.aucma.common.core.page.TableDataInfo; + +/** + * 电日耗报Controller + * + * @author ruoyi + * @date 2023-10-09 + */ +@RestController +@RequestMapping("/report/DayDnb" ) +public class ReportDayDnbController extends BaseController { + @Autowired + private IReportDayDnbService reportDayDnbService; + + /** + * 查询电日耗报列表 + */ + @PreAuthorize("@ss.hasPermi('report:DayDnb:list')" ) + @GetMapping("/list" ) + public TableDataInfo list(ReportDayDnb reportDayDnb) { + startPage(); + List list = reportDayDnbService.selectReportDayDnbList(reportDayDnb); + return getDataTable(list); + } + + /** + * 导出电日耗报列表 + */ + @PreAuthorize("@ss.hasPermi('report:DayDnb:export')" ) + @Log(title = "电日耗报" , businessType = BusinessType.EXPORT) + @PostMapping("/export" ) + public void export(HttpServletResponse response, ReportDayDnb reportDayDnb) { + List list = reportDayDnbService.selectReportDayDnbList(reportDayDnb); + ExcelUtil util = new ExcelUtil(ReportDayDnb. class); + util.exportExcel(response, list, "电日耗报数据" ); + } + + /** + * 获取电日耗报详细信息 + */ + @PreAuthorize("@ss.hasPermi('report:DayDnb:query')" ) + @GetMapping(value = "/{objId}" ) + public AjaxResult getInfo(@PathVariable("objId" ) Long objId) { + return success(reportDayDnbService.selectReportDayDnbByObjId(objId)); + } + + /** + * 新增电日耗报 + */ + @PreAuthorize("@ss.hasPermi('report:DayDnb:add')" ) + @Log(title = "电日耗报" , businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody ReportDayDnb reportDayDnb) { + reportDayDnb.setCreatedBy(getUsername()); + reportDayDnb.setCreatedTime(DateUtils.getNowDate()); + return toAjax(reportDayDnbService.insertReportDayDnb(reportDayDnb)); + } + + /** + * 修改电日耗报 + */ + @PreAuthorize("@ss.hasPermi('report:DayDnb:edit')" ) + @Log(title = "电日耗报" , businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody ReportDayDnb reportDayDnb) { + reportDayDnb.setUpdatedBy(getUsername()); + reportDayDnb.setUpdatedTime(DateUtils.getNowDate()); + return toAjax(reportDayDnbService.updateReportDayDnb(reportDayDnb)); + } + + /** + * 删除电日耗报 + */ + @PreAuthorize("@ss.hasPermi('report:DayDnb:remove')" ) + @Log(title = "电日耗报" , businessType = BusinessType.DELETE) + @DeleteMapping("/{objIds}" ) + public AjaxResult remove(@PathVariable Long[] objIds) { + return toAjax(reportDayDnbService.deleteReportDayDnbByObjIds(objIds)); + } +} diff --git a/aucma-report/src/main/java/com/aucma/report/controller/ReportPointDnbController.java b/aucma-report/src/main/java/com/aucma/report/controller/ReportPointDnbController.java new file mode 100644 index 0000000..cf8d893 --- /dev/null +++ b/aucma-report/src/main/java/com/aucma/report/controller/ReportPointDnbController.java @@ -0,0 +1,104 @@ +package com.aucma.report.controller; + +import java.util.List; +import javax.servlet.http.HttpServletResponse; + +import com.aucma.common.utils.DateUtils; +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.aucma.common.annotation.Log; +import com.aucma.common.core.controller.BaseController; +import com.aucma.common.core.domain.AjaxResult; +import com.aucma.common.enums.BusinessType; +import com.aucma.report.domain.ReportPointDnb; +import com.aucma.report.service.IReportPointDnbService; +import com.aucma.common.utils.poi.ExcelUtil; +import com.aucma.common.core.page.TableDataInfo; + +/** + * 电整点耗量报表Controller + * + * @author ruoyi + * @date 2023-10-09 + */ +@RestController +@RequestMapping("/report/pointDnb" ) +public class ReportPointDnbController extends BaseController { + @Autowired + private IReportPointDnbService reportPointDnbService; + + /** + * 查询电整点耗量报表列表 + */ + @PreAuthorize("@ss.hasPermi('report:pointDnb:list')" ) + @GetMapping("/list" ) + public TableDataInfo list(ReportPointDnb reportPointDnb) { + startPage(); + List list = reportPointDnbService.selectReportPointDnbList(reportPointDnb); + return getDataTable(list); + } + + + /** + * 导出电整点耗量报表列表 + */ + @PreAuthorize("@ss.hasPermi('report:pointDnb:export')" ) + @Log(title = "电整点耗量报表" , businessType = BusinessType.EXPORT) + @PostMapping("/export" ) + public void export(HttpServletResponse response, ReportPointDnb reportPointDnb) { + List list = reportPointDnbService.selectReportPointDnbList(reportPointDnb); + ExcelUtil util = new ExcelUtil(ReportPointDnb. class); + util.exportExcel(response, list, "电整点耗量报表数据" ); + } + + /** + * 获取电整点耗量报表详细信息 + */ + @PreAuthorize("@ss.hasPermi('report:pointDnb:query')" ) + @GetMapping(value = "/{objId}" ) + public AjaxResult getInfo(@PathVariable("objId" ) Long objId) { + return success(reportPointDnbService.selectReportPointDnbByObjId(objId)); + } + + /** + * 新增电整点耗量报表 + */ + @PreAuthorize("@ss.hasPermi('report:pointDnb:add')" ) + @Log(title = "电整点耗量报表" , businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody ReportPointDnb reportPointDnb) { + reportPointDnb.setCreatedBy(getUsername()); + reportPointDnb.setCreatedTime(DateUtils.getNowDate()); + return toAjax(reportPointDnbService.insertReportPointDnb(reportPointDnb)); + } + + /** + * 修改电整点耗量报表 + */ + @PreAuthorize("@ss.hasPermi('report:pointDnb:edit')" ) + @Log(title = "电整点耗量报表" , businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody ReportPointDnb reportPointDnb) { + reportPointDnb.setUpdatedBy(getUsername()); + reportPointDnb.setUpdatedTime(DateUtils.getNowDate()); + return toAjax(reportPointDnbService.updateReportPointDnb(reportPointDnb)); + } + + /** + * 删除电整点耗量报表 + */ + @PreAuthorize("@ss.hasPermi('report:pointDnb:remove')" ) + @Log(title = "电整点耗量报表" , businessType = BusinessType.DELETE) + @DeleteMapping("/{objIds}" ) + public AjaxResult remove(@PathVariable Long[] objIds) { + return toAjax(reportPointDnbService.deleteReportPointDnbByObjIds(objIds)); + } +} diff --git a/aucma-report/src/main/java/com/aucma/report/domain/ReportDayDnb.java b/aucma-report/src/main/java/com/aucma/report/domain/ReportDayDnb.java new file mode 100644 index 0000000..10be648 --- /dev/null +++ b/aucma-report/src/main/java/com/aucma/report/domain/ReportDayDnb.java @@ -0,0 +1,195 @@ +package com.aucma.report.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.aucma.common.annotation.Excel; +import com.aucma.common.core.domain.BaseEntity; + +/** + * 电日耗报对象 report_day_dnb + * + * @author ruoyi + * @date 2023-10-09 + */ +public class ReportDayDnb extends BaseEntity + { +private static final long serialVersionUID=1L; + + /** 主键标识 */ + private Long objId; + + /** 计量设备编号 */ + @Excel(name = "计量设备编号") + private String monitorCode; + + /** 仪表值 */ + @Excel(name = "仪表值") + private Long instrumentValue; + + /** 耗量 */ + @Excel(name = "耗量") + private Long expend; + + /** 报表日期 */ + @Excel(name = "报表日期") + private String reportDate; + + /** 开始时间 */ + @Excel(name = "开始时间") + private String beginTime; + + /** 结束时间 */ + @Excel(name = "结束时间") + private String endTime; + + /** 是否标识 */ + @Excel(name = "是否标识") + private Long isFlag; + + /** 创建人 */ + @Excel(name = "创建人") + private String createdBy; + + /** 创建时间 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") + private Date createdTime; + + /** 更新人 */ + @Excel(name = "更新人") + private String updatedBy; + + /** 更新时间 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "更新时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") + private Date updatedTime; + + public void setObjId(Long objId) + { + this.objId = objId; + } + + public Long getObjId() + { + return objId; + } + public void setMonitorCode(String monitorCode) + { + this.monitorCode = monitorCode; + } + + public String getMonitorCode() + { + return monitorCode; + } + public void setInstrumentValue(Long instrumentValue) + { + this.instrumentValue = instrumentValue; + } + + public Long getInstrumentValue() + { + return instrumentValue; + } + public void setExpend(Long expend) + { + this.expend = expend; + } + + public Long getExpend() + { + return expend; + } + public void setReportDate(String reportDate) + { + this.reportDate = reportDate; + } + + public String getReportDate() + { + return reportDate; + } + public void setBeginTime(String beginTime) + { + this.beginTime = beginTime; + } + + public String getBeginTime() + { + return beginTime; + } + public void setEndTime(String endTime) + { + this.endTime = endTime; + } + + public String getEndTime() + { + return endTime; + } + public void setIsFlag(Long isFlag) + { + this.isFlag = isFlag; + } + + public Long getIsFlag() + { + return isFlag; + } + public void setCreatedBy(String createdBy) + { + this.createdBy = createdBy; + } + + public String getCreatedBy() + { + return createdBy; + } + public void setCreatedTime(Date createdTime) + { + this.createdTime = createdTime; + } + + public Date getCreatedTime() + { + return createdTime; + } + public void setUpdatedBy(String updatedBy) + { + this.updatedBy = updatedBy; + } + + public String getUpdatedBy() + { + return updatedBy; + } + public void setUpdatedTime(Date updatedTime) + { + this.updatedTime = updatedTime; + } + + public Date getUpdatedTime() + { + return updatedTime; + } + +@Override +public String toString(){ + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("objId",getObjId()) + .append("monitorCode",getMonitorCode()) + .append("instrumentValue",getInstrumentValue()) + .append("expend",getExpend()) + .append("reportDate",getReportDate()) + .append("beginTime",getBeginTime()) + .append("endTime",getEndTime()) + .append("isFlag",getIsFlag()) + .append("createdBy",getCreatedBy()) + .append("createdTime",getCreatedTime()) + .append("updatedBy",getUpdatedBy()) + .append("updatedTime",getUpdatedTime()) + .toString(); + } + } diff --git a/aucma-report/src/main/java/com/aucma/report/domain/ReportPointDnb.java b/aucma-report/src/main/java/com/aucma/report/domain/ReportPointDnb.java new file mode 100644 index 0000000..a639007 --- /dev/null +++ b/aucma-report/src/main/java/com/aucma/report/domain/ReportPointDnb.java @@ -0,0 +1,207 @@ +package com.aucma.report.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.aucma.common.annotation.Excel; +import com.aucma.common.core.domain.BaseEntity; + +/** + * 电整点耗量报表对象 report_point_dnb + * + * @author ruoyi + * @date 2023-10-09 + */ +public class ReportPointDnb extends BaseEntity { + private static final long serialVersionUID = 1L; + + /** + * 主键标识 + */ + @Excel(name = "主键标识") + private Long objId; + + /** + * 计量设备编号 + */ + @Excel(name = "计量设备编号") + private String monitorCode; + + /** + * 仪表值 + */ + @Excel(name = "仪表值") + private Long instrumentValue; + + /** + * 耗量 + */ + @Excel(name = "耗量") + private Long expend; + + /** + * 记录时间 + */ + @Excel(name = "记录时间") + private String recordTime; + + /** + * 开始时间 + */ + @Excel(name = "开始时间") + private String beginTime; + + /** + * 结束时间 + */ + @Excel(name = "结束时间") + private String endTime; + + /** + * 是否标识 + */ + @Excel(name = "是否标识") + private Long isFlag; + + /** + * 创建人 + */ + @Excel(name = "创建人") + private String createdBy; + + /** + * 创建时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") + private Date createdTime; + + /** + * 更新人 + */ + @Excel(name = "更新人") + private String updatedBy; + + /** + * 更新时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "更新时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") + private Date updatedTime; + + public void setObjId(Long objId) { + this.objId = objId; + } + + public Long getObjId() { + return objId; + } + + public void setMonitorCode(String monitorCode) { + this.monitorCode = monitorCode; + } + + public String getMonitorCode() { + return monitorCode; + } + + public void setInstrumentValue(Long instrumentValue) { + this.instrumentValue = instrumentValue; + } + + public Long getInstrumentValue() { + return instrumentValue; + } + + public void setExpend(Long expend) { + this.expend = expend; + } + + public Long getExpend() { + return expend; + } + + public void setRecordTime(String recordTime) { + this.recordTime = recordTime; + } + + public String getRecordTime() { + return recordTime; + } + + public void setBeginTime(String beginTime) { + this.beginTime = beginTime; + } + + public String getBeginTime() { + return beginTime; + } + + public void setEndTime(String endTime) { + this.endTime = endTime; + } + + public String getEndTime() { + return endTime; + } + + public void setIsFlag(Long isFlag) { + this.isFlag = isFlag; + } + + public Long getIsFlag() { + return isFlag; + } + + public void setCreatedBy(String createdBy) { + this.createdBy = createdBy; + } + + public String getCreatedBy() { + return createdBy; + } + + public void setCreatedTime(Date createdTime) { + this.createdTime = createdTime; + } + + public Date getCreatedTime() { + return createdTime; + } + + public void setUpdatedBy(String updatedBy) { + this.updatedBy = updatedBy; + } + + public String getUpdatedBy() { + return updatedBy; + } + + public void setUpdatedTime(Date updatedTime) { + this.updatedTime = updatedTime; + } + + public Date getUpdatedTime() { + return updatedTime; + } + + @Override + public String toString() { + return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE) + .append("objId", getObjId()) + .append("monitorCode", getMonitorCode()) + .append("instrumentValue", getInstrumentValue()) + .append("expend", getExpend()) + .append("recordTime", getRecordTime()) + .append("beginTime", getBeginTime()) + .append("endTime", getEndTime()) + .append("isFlag", getIsFlag()) + .append("createdBy", getCreatedBy()) + .append("createdTime", getCreatedTime()) + .append("updatedBy", getUpdatedBy()) + .append("updatedTime", getUpdatedTime()) + .toString(); + } +} diff --git a/aucma-report/src/main/java/com/aucma/report/mapper/ReportDayDnbMapper.java b/aucma-report/src/main/java/com/aucma/report/mapper/ReportDayDnbMapper.java new file mode 100644 index 0000000..1f78c1e --- /dev/null +++ b/aucma-report/src/main/java/com/aucma/report/mapper/ReportDayDnbMapper.java @@ -0,0 +1,61 @@ +package com.aucma.report.mapper; + +import java.util.List; +import com.aucma.report.domain.ReportDayDnb; + +/** + * 电日耗报Mapper接口 + * + * @author ruoyi + * @date 2023-10-09 + */ +public interface ReportDayDnbMapper +{ + /** + * 查询电日耗报 + * + * @param objId 电日耗报主键 + * @return 电日耗报 + */ + public ReportDayDnb selectReportDayDnbByObjId(Long objId); + + /** + * 查询电日耗报列表 + * + * @param reportDayDnb 电日耗报 + * @return 电日耗报集合 + */ + public List selectReportDayDnbList(ReportDayDnb reportDayDnb); + + /** + * 新增电日耗报 + * + * @param reportDayDnb 电日耗报 + * @return 结果 + */ + public int insertReportDayDnb(ReportDayDnb reportDayDnb); + + /** + * 修改电日耗报 + * + * @param reportDayDnb 电日耗报 + * @return 结果 + */ + public int updateReportDayDnb(ReportDayDnb reportDayDnb); + + /** + * 删除电日耗报 + * + * @param objId 电日耗报主键 + * @return 结果 + */ + public int deleteReportDayDnbByObjId(Long objId); + + /** + * 批量删除电日耗报 + * + * @param objIds 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteReportDayDnbByObjIds(Long[] objIds); +} diff --git a/aucma-report/src/main/java/com/aucma/report/mapper/ReportPointDnbMapper.java b/aucma-report/src/main/java/com/aucma/report/mapper/ReportPointDnbMapper.java new file mode 100644 index 0000000..eed1afd --- /dev/null +++ b/aucma-report/src/main/java/com/aucma/report/mapper/ReportPointDnbMapper.java @@ -0,0 +1,61 @@ +package com.aucma.report.mapper; + +import java.util.List; +import com.aucma.report.domain.ReportPointDnb; + +/** + * 电整点耗量报表Mapper接口 + * + * @author ruoyi + * @date 2023-10-09 + */ +public interface ReportPointDnbMapper +{ + /** + * 查询电整点耗量报表 + * + * @param objId 电整点耗量报表主键 + * @return 电整点耗量报表 + */ + public ReportPointDnb selectReportPointDnbByObjId(Long objId); + + /** + * 查询电整点耗量报表列表 + * + * @param reportPointDnb 电整点耗量报表 + * @return 电整点耗量报表集合 + */ + public List selectReportPointDnbList(ReportPointDnb reportPointDnb); + + /** + * 新增电整点耗量报表 + * + * @param reportPointDnb 电整点耗量报表 + * @return 结果 + */ + public int insertReportPointDnb(ReportPointDnb reportPointDnb); + + /** + * 修改电整点耗量报表 + * + * @param reportPointDnb 电整点耗量报表 + * @return 结果 + */ + public int updateReportPointDnb(ReportPointDnb reportPointDnb); + + /** + * 删除电整点耗量报表 + * + * @param objId 电整点耗量报表主键 + * @return 结果 + */ + public int deleteReportPointDnbByObjId(Long objId); + + /** + * 批量删除电整点耗量报表 + * + * @param objIds 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteReportPointDnbByObjIds(Long[] objIds); +} diff --git a/aucma-report/src/main/java/com/aucma/report/service/IReportDayDnbService.java b/aucma-report/src/main/java/com/aucma/report/service/IReportDayDnbService.java new file mode 100644 index 0000000..5c1273d --- /dev/null +++ b/aucma-report/src/main/java/com/aucma/report/service/IReportDayDnbService.java @@ -0,0 +1,61 @@ +package com.aucma.report.service; + +import java.util.List; +import com.aucma.report.domain.ReportDayDnb; + +/** + * 电日耗报Service接口 + * + * @author ruoyi + * @date 2023-10-09 + */ +public interface IReportDayDnbService +{ + /** + * 查询电日耗报 + * + * @param objId 电日耗报主键 + * @return 电日耗报 + */ + public ReportDayDnb selectReportDayDnbByObjId(Long objId); + + /** + * 查询电日耗报列表 + * + * @param reportDayDnb 电日耗报 + * @return 电日耗报集合 + */ + public List selectReportDayDnbList(ReportDayDnb reportDayDnb); + + /** + * 新增电日耗报 + * + * @param reportDayDnb 电日耗报 + * @return 结果 + */ + public int insertReportDayDnb(ReportDayDnb reportDayDnb); + + /** + * 修改电日耗报 + * + * @param reportDayDnb 电日耗报 + * @return 结果 + */ + public int updateReportDayDnb(ReportDayDnb reportDayDnb); + + /** + * 批量删除电日耗报 + * + * @param objIds 需要删除的电日耗报主键集合 + * @return 结果 + */ + public int deleteReportDayDnbByObjIds(Long[] objIds); + + /** + * 删除电日耗报信息 + * + * @param objId 电日耗报主键 + * @return 结果 + */ + public int deleteReportDayDnbByObjId(Long objId); +} diff --git a/aucma-report/src/main/java/com/aucma/report/service/IReportPointDnbService.java b/aucma-report/src/main/java/com/aucma/report/service/IReportPointDnbService.java new file mode 100644 index 0000000..9cfe13a --- /dev/null +++ b/aucma-report/src/main/java/com/aucma/report/service/IReportPointDnbService.java @@ -0,0 +1,61 @@ +package com.aucma.report.service; + +import java.util.List; +import com.aucma.report.domain.ReportPointDnb; + +/** + * 电整点耗量报表Service接口 + * + * @author ruoyi + * @date 2023-10-09 + */ +public interface IReportPointDnbService +{ + /** + * 查询电整点耗量报表 + * + * @param objId 电整点耗量报表主键 + * @return 电整点耗量报表 + */ + public ReportPointDnb selectReportPointDnbByObjId(Long objId); + + /** + * 查询电整点耗量报表列表 + * + * @param reportPointDnb 电整点耗量报表 + * @return 电整点耗量报表集合 + */ + public List selectReportPointDnbList(ReportPointDnb reportPointDnb); + + /** + * 新增电整点耗量报表 + * + * @param reportPointDnb 电整点耗量报表 + * @return 结果 + */ + public int insertReportPointDnb(ReportPointDnb reportPointDnb); + + /** + * 修改电整点耗量报表 + * + * @param reportPointDnb 电整点耗量报表 + * @return 结果 + */ + public int updateReportPointDnb(ReportPointDnb reportPointDnb); + + /** + * 批量删除电整点耗量报表 + * + * @param objIds 需要删除的电整点耗量报表主键集合 + * @return 结果 + */ + public int deleteReportPointDnbByObjIds(Long[] objIds); + + /** + * 删除电整点耗量报表信息 + * + * @param objId 电整点耗量报表主键 + * @return 结果 + */ + public int deleteReportPointDnbByObjId(Long objId); +} diff --git a/aucma-report/src/main/java/com/aucma/report/service/impl/ReportDayDnbServiceImpl.java b/aucma-report/src/main/java/com/aucma/report/service/impl/ReportDayDnbServiceImpl.java new file mode 100644 index 0000000..aafa3d3 --- /dev/null +++ b/aucma-report/src/main/java/com/aucma/report/service/impl/ReportDayDnbServiceImpl.java @@ -0,0 +1,93 @@ +package com.aucma.report.service.impl; + +import java.util.List; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.aucma.report.mapper.ReportDayDnbMapper; +import com.aucma.report.domain.ReportDayDnb; +import com.aucma.report.service.IReportDayDnbService; + +/** + * 电日耗报Service业务层处理 + * + * @author ruoyi + * @date 2023-10-09 + */ +@Service +public class ReportDayDnbServiceImpl implements IReportDayDnbService +{ + @Autowired + private ReportDayDnbMapper reportDayDnbMapper; + + /** + * 查询电日耗报 + * + * @param objId 电日耗报主键 + * @return 电日耗报 + */ + @Override + public ReportDayDnb selectReportDayDnbByObjId(Long objId) + { + return reportDayDnbMapper.selectReportDayDnbByObjId(objId); + } + + /** + * 查询电日耗报列表 + * + * @param reportDayDnb 电日耗报 + * @return 电日耗报 + */ + @Override + public List selectReportDayDnbList(ReportDayDnb reportDayDnb) + { + return reportDayDnbMapper.selectReportDayDnbList(reportDayDnb); + } + + /** + * 新增电日耗报 + * + * @param reportDayDnb 电日耗报 + * @return 结果 + */ + @Override + public int insertReportDayDnb(ReportDayDnb reportDayDnb) + { + return reportDayDnbMapper.insertReportDayDnb(reportDayDnb); + } + + /** + * 修改电日耗报 + * + * @param reportDayDnb 电日耗报 + * @return 结果 + */ + @Override + public int updateReportDayDnb(ReportDayDnb reportDayDnb) + { + return reportDayDnbMapper.updateReportDayDnb(reportDayDnb); + } + + /** + * 批量删除电日耗报 + * + * @param objIds 需要删除的电日耗报主键 + * @return 结果 + */ + @Override + public int deleteReportDayDnbByObjIds(Long[] objIds) + { + return reportDayDnbMapper.deleteReportDayDnbByObjIds(objIds); + } + + /** + * 删除电日耗报信息 + * + * @param objId 电日耗报主键 + * @return 结果 + */ + @Override + public int deleteReportDayDnbByObjId(Long objId) + { + return reportDayDnbMapper.deleteReportDayDnbByObjId(objId); + } +} diff --git a/aucma-report/src/main/java/com/aucma/report/service/impl/ReportPointDnbServiceImpl.java b/aucma-report/src/main/java/com/aucma/report/service/impl/ReportPointDnbServiceImpl.java new file mode 100644 index 0000000..dee56c6 --- /dev/null +++ b/aucma-report/src/main/java/com/aucma/report/service/impl/ReportPointDnbServiceImpl.java @@ -0,0 +1,93 @@ +package com.aucma.report.service.impl; + +import java.util.List; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.aucma.report.mapper.ReportPointDnbMapper; +import com.aucma.report.domain.ReportPointDnb; +import com.aucma.report.service.IReportPointDnbService; + +/** + * 电整点耗量报表Service业务层处理 + * + * @author ruoyi + * @date 2023-10-09 + */ +@Service +public class ReportPointDnbServiceImpl implements IReportPointDnbService +{ + @Autowired + private ReportPointDnbMapper reportPointDnbMapper; + + /** + * 查询电整点耗量报表 + * + * @param objId 电整点耗量报表主键 + * @return 电整点耗量报表 + */ + @Override + public ReportPointDnb selectReportPointDnbByObjId(Long objId) + { + return reportPointDnbMapper.selectReportPointDnbByObjId(objId); + } + + /** + * 查询电整点耗量报表列表 + * + * @param reportPointDnb 电整点耗量报表 + * @return 电整点耗量报表 + */ + @Override + public List selectReportPointDnbList(ReportPointDnb reportPointDnb) + { + return reportPointDnbMapper.selectReportPointDnbList(reportPointDnb); + } + + /** + * 新增电整点耗量报表 + * + * @param reportPointDnb 电整点耗量报表 + * @return 结果 + */ + @Override + public int insertReportPointDnb(ReportPointDnb reportPointDnb) + { + return reportPointDnbMapper.insertReportPointDnb(reportPointDnb); + } + + /** + * 修改电整点耗量报表 + * + * @param reportPointDnb 电整点耗量报表 + * @return 结果 + */ + @Override + public int updateReportPointDnb(ReportPointDnb reportPointDnb) + { + return reportPointDnbMapper.updateReportPointDnb(reportPointDnb); + } + + /** + * 批量删除电整点耗量报表 + * + * @param objIds 需要删除的电整点耗量报表主键 + * @return 结果 + */ + @Override + public int deleteReportPointDnbByObjIds(Long[] objIds) + { + return reportPointDnbMapper.deleteReportPointDnbByObjIds(objIds); + } + + /** + * 删除电整点耗量报表信息 + * + * @param objId 电整点耗量报表主键 + * @return 结果 + */ + @Override + public int deleteReportPointDnbByObjId(Long objId) + { + return reportPointDnbMapper.deleteReportPointDnbByObjId(objId); + } +} diff --git a/aucma-report/src/main/resources/mapper/report/ReportDayDnbMapper.xml b/aucma-report/src/main/resources/mapper/report/ReportDayDnbMapper.xml new file mode 100644 index 0000000..369b151 --- /dev/null +++ b/aucma-report/src/main/resources/mapper/report/ReportDayDnbMapper.xml @@ -0,0 +1,111 @@ + + + + + + + + + + + + + + + + + + + + + select obj_id, monitor_code, instrument_value, expend, report_date, begin_time, end_time, is_flag, created_by, created_time, updated_by, updated_time from report_day_dnb + + + + + + + + + SELECT seq_report_day_dnb.NEXTVAL as objId FROM DUAL + + insert into report_day_dnb + + obj_id, + monitor_code, + instrument_value, + expend, + report_date, + begin_time, + end_time, + is_flag, + created_by, + created_time, + updated_by, + updated_time, + + + #{objId}, + #{monitorCode}, + #{instrumentValue}, + #{expend}, + #{reportDate}, + #{beginTime}, + #{endTime}, + #{isFlag}, + #{createdBy}, + #{createdTime}, + #{updatedBy}, + #{updatedTime}, + + + + + update report_day_dnb + + monitor_code = #{monitorCode}, + instrument_value = #{instrumentValue}, + expend = #{expend}, + report_date = #{reportDate}, + begin_time = #{beginTime}, + end_time = #{endTime}, + is_flag = #{isFlag}, + created_by = #{createdBy}, + created_time = #{createdTime}, + updated_by = #{updatedBy}, + updated_time = #{updatedTime}, + + where obj_id = #{objId} + + + + delete from report_day_dnb where obj_id = #{objId} + + + + delete from report_day_dnb where obj_id in + + #{objId} + + + \ No newline at end of file diff --git a/aucma-report/src/main/resources/mapper/report/ReportPointDnbMapper.xml b/aucma-report/src/main/resources/mapper/report/ReportPointDnbMapper.xml new file mode 100644 index 0000000..8bd7f40 --- /dev/null +++ b/aucma-report/src/main/resources/mapper/report/ReportPointDnbMapper.xml @@ -0,0 +1,113 @@ + + + + + + + + + + + + + + + + + + + + + select obj_id, monitor_code, instrument_value, expend, record_time, begin_time, end_time, is_flag, created_by, created_time, updated_by, updated_time from report_point_dnb + + + + + + + + + SELECT seq_base_deviceledger.NEXTVAL as objId FROM DUAL + + insert into report_point_dnb + + obj_id, + monitor_code, + instrument_value, + expend, + record_time, + begin_time, + end_time, + is_flag, + created_by, + created_time, + updated_by, + updated_time, + + + #{objId}, + #{monitorCode}, + #{instrumentValue}, + #{expend}, + #{recordTime}, + #{beginTime}, + #{endTime}, + #{isFlag}, + #{createdBy}, + #{createdTime}, + #{updatedBy}, + #{updatedTime}, + + + + + update report_point_dnb + + monitor_code = #{monitorCode}, + instrument_value = #{instrumentValue}, + expend = #{expend}, + record_time = #{recordTime}, + begin_time = #{beginTime}, + end_time = #{endTime}, + is_flag = #{isFlag}, + created_by = #{createdBy}, + created_time = #{createdTime}, + updated_by = #{updatedBy}, + updated_time = #{updatedTime}, + + where obj_id = #{objId} + + + + delete from report_point_dnb where obj_id = #{objId} + + + + delete from report_point_dnb where obj_id in + + #{objId} + + +