From 9c406234f3b7373f7906e9685eb19af58646add3 Mon Sep 17 00:00:00 2001
From: yaowanxin <3588231647@qq.com>
Date: 星期五, 08 八月 2025 10:43:04 +0800
Subject: [PATCH] 增添用电区域功能
---
src/main/java/com/ruoyi/equipmentenergyconsumption/pojo/ElectricityConsumptionArea.java | 42 ++++++++++
src/main/java/com/ruoyi/equipmentenergyconsumption/service/ElectricityConsumptionAreaService.java | 10 ++
src/main/resources/mapper/equipmentenergyconsumption/electricityConsumptionAreaMapper.xml | 21 +++++
src/main/java/com/ruoyi/equipmentenergyconsumption/mapper/ElectricityConsumptionAreaMapper.java | 14 +++
src/main/java/com/ruoyi/equipmentenergyconsumption/controller/ElectricityConsumptionAreaController.java | 75 ++++++++++++++++++
src/main/java/com/ruoyi/equipmentenergyconsumption/service/impl/ElectricityConsumptionAreaServiceImpl.java | 26 ++++++
src/main/java/com/ruoyi/equipmentenergyconsumption/pojo/EquipmentEnergyConsumption.java | 6 +
7 files changed, 193 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/ruoyi/equipmentenergyconsumption/controller/ElectricityConsumptionAreaController.java b/src/main/java/com/ruoyi/equipmentenergyconsumption/controller/ElectricityConsumptionAreaController.java
new file mode 100644
index 0000000..8381c9d
--- /dev/null
+++ b/src/main/java/com/ruoyi/equipmentenergyconsumption/controller/ElectricityConsumptionAreaController.java
@@ -0,0 +1,75 @@
+package com.ruoyi.equipmentenergyconsumption.controller;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.device.pojo.DeviceLedger;
+import com.ruoyi.equipmentenergyconsumption.pojo.ElectricityConsumptionArea;
+import com.ruoyi.equipmentenergyconsumption.service.ElectricityConsumptionAreaService;
+import com.ruoyi.framework.aspectj.lang.annotation.Log;
+import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
+import com.ruoyi.framework.web.controller.BaseController;
+import com.ruoyi.framework.web.domain.AjaxResult;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+
+@RestController
+@Api(tags = "鐢ㄧ數鍖哄煙")
+@RequestMapping("/electricityConsumptionArea")
+public class ElectricityConsumptionAreaController extends BaseController {
+
+ @Autowired
+ private ElectricityConsumptionAreaService electricityConsumptionAreaService;
+
+ @GetMapping("/listPage")
+ @ApiOperation("鐢ㄧ數鍖哄煙-鍒嗛〉鏌ヨ")
+ @Log(title = "鐢ㄧ數鍖哄煙-鍒嗛〉鏌ヨ", businessType = BusinessType.OTHER)
+ public AjaxResult listPage(Page page, ElectricityConsumptionArea electricityConsumptionArea) {
+ IPage<ElectricityConsumptionArea> listPage = electricityConsumptionAreaService.listPage(page, electricityConsumptionArea);
+ return AjaxResult.success(listPage);
+ }
+
+ @PostMapping("/add")
+ @ApiOperation("鐢ㄧ數鍖哄煙-鏂板")
+ @Log(title = "鐢ㄧ數鍖哄煙-鏂板", businessType = BusinessType.INSERT)
+ public AjaxResult add(@RequestBody ElectricityConsumptionArea electricityConsumptionArea) {
+ boolean save = electricityConsumptionAreaService.save(electricityConsumptionArea);
+ return save ? AjaxResult.success() : AjaxResult.error();
+ }
+
+ @PostMapping("/update")
+ @ApiOperation("鐢ㄧ數鍖哄煙-淇敼")
+ @Log(title = "鐢ㄧ數鍖哄煙-淇敼", businessType = BusinessType.UPDATE)
+ public AjaxResult update(@RequestBody ElectricityConsumptionArea electricityConsumptionArea) {
+ boolean update = electricityConsumptionAreaService.updateById(electricityConsumptionArea);
+ return update ? AjaxResult.success() : AjaxResult.error();
+ }
+
+ @DeleteMapping("/delete")
+ @ApiOperation("鐢ㄧ數鍖哄煙-鍒犻櫎")
+ @Log(title = "鐢ㄧ數鍖哄煙-鍒犻櫎", businessType = BusinessType.DELETE)
+ public AjaxResult delete(@RequestBody List<Long> ids) {
+ if(CollectionUtils.isEmpty(ids)) return AjaxResult.error("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
+ boolean remove = electricityConsumptionAreaService.removeBatchByIds(ids);
+ return remove ? AjaxResult.success() : AjaxResult.error();
+ }
+
+
+ /**
+ * 瀵煎嚭鐢ㄧ數鍖哄煙
+ */
+ @Log(title = "瀵煎嚭鐢ㄧ數鍖哄煙", businessType = BusinessType.EXPORT)
+ @PostMapping("/export")
+ @ApiOperation("瀵煎嚭鐢ㄧ數鍖哄煙")
+ public void export(HttpServletResponse response) {
+ ExcelUtil<ElectricityConsumptionArea> util = new ExcelUtil<ElectricityConsumptionArea>(ElectricityConsumptionArea.class);
+ util.exportExcel(response, null , "鐢ㄧ數鍖哄煙鏁版嵁");
+ }
+
+}
diff --git a/src/main/java/com/ruoyi/equipmentenergyconsumption/mapper/ElectricityConsumptionAreaMapper.java b/src/main/java/com/ruoyi/equipmentenergyconsumption/mapper/ElectricityConsumptionAreaMapper.java
new file mode 100644
index 0000000..d9bd3c6
--- /dev/null
+++ b/src/main/java/com/ruoyi/equipmentenergyconsumption/mapper/ElectricityConsumptionAreaMapper.java
@@ -0,0 +1,14 @@
+package com.ruoyi.equipmentenergyconsumption.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.equipmentenergyconsumption.pojo.ElectricityConsumptionArea;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+@Mapper
+public interface ElectricityConsumptionAreaMapper extends BaseMapper<ElectricityConsumptionArea> {
+
+ IPage<ElectricityConsumptionArea> listPage(Page page, ElectricityConsumptionArea electricityConsumptionArea);
+}
diff --git a/src/main/java/com/ruoyi/equipmentenergyconsumption/pojo/ElectricityConsumptionArea.java b/src/main/java/com/ruoyi/equipmentenergyconsumption/pojo/ElectricityConsumptionArea.java
new file mode 100644
index 0000000..408a13f
--- /dev/null
+++ b/src/main/java/com/ruoyi/equipmentenergyconsumption/pojo/ElectricityConsumptionArea.java
@@ -0,0 +1,42 @@
+package com.ruoyi.equipmentenergyconsumption.pojo;
+
+import com.baomidou.mybatisplus.annotation.*;
+import com.ruoyi.framework.aspectj.lang.annotation.Excel;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+
+@Data
+@TableName("electricity_consumption_area")
+@ApiModel
+public class ElectricityConsumptionArea {
+
+ @TableId(value = "id", type = IdType.AUTO)
+ private Long id;
+
+ /**
+ * 鍖哄煙鍚嶇О
+ */
+ @ApiModelProperty("鍖哄煙鍚嶇О")
+ @Excel(name = "鍖哄煙鍚嶇О")
+ private String areaName;
+
+ /**
+ * 鍖哄煙绫诲瀷
+ */
+ @ApiModelProperty("鍖哄煙绫诲瀷")
+ @Excel(name = "鍖哄煙绫诲瀷")
+ private String areaType;
+
+ /**
+ * 鐖剁被id
+ */
+ @TableField(fill = FieldFill.INSERT)
+ private Long fuId;
+ /**
+ * 绉熸埛id
+ */
+ @TableField(fill = FieldFill.INSERT)
+ private Long tenantId;
+}
diff --git a/src/main/java/com/ruoyi/equipmentenergyconsumption/pojo/EquipmentEnergyConsumption.java b/src/main/java/com/ruoyi/equipmentenergyconsumption/pojo/EquipmentEnergyConsumption.java
index c6562aa..856edd1 100644
--- a/src/main/java/com/ruoyi/equipmentenergyconsumption/pojo/EquipmentEnergyConsumption.java
+++ b/src/main/java/com/ruoyi/equipmentenergyconsumption/pojo/EquipmentEnergyConsumption.java
@@ -135,5 +135,9 @@
*/
@TableField(fill = FieldFill.INSERT)
private Long tenantId;
-
+ /**
+ *鎵�灞炵敤鐢靛尯鍩焛d
+ */
+ @TableField(fill = FieldFill.INSERT)
+ private Long electricityConsumptionAreaId;
}
diff --git a/src/main/java/com/ruoyi/equipmentenergyconsumption/service/ElectricityConsumptionAreaService.java b/src/main/java/com/ruoyi/equipmentenergyconsumption/service/ElectricityConsumptionAreaService.java
new file mode 100644
index 0000000..e303be9
--- /dev/null
+++ b/src/main/java/com/ruoyi/equipmentenergyconsumption/service/ElectricityConsumptionAreaService.java
@@ -0,0 +1,10 @@
+package com.ruoyi.equipmentenergyconsumption.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.equipmentenergyconsumption.pojo.ElectricityConsumptionArea;
+
+public interface ElectricityConsumptionAreaService extends IService<ElectricityConsumptionArea> {
+ IPage<ElectricityConsumptionArea> listPage(Page page, ElectricityConsumptionArea electricityConsumptionArea);
+}
diff --git a/src/main/java/com/ruoyi/equipmentenergyconsumption/service/impl/ElectricityConsumptionAreaServiceImpl.java b/src/main/java/com/ruoyi/equipmentenergyconsumption/service/impl/ElectricityConsumptionAreaServiceImpl.java
new file mode 100644
index 0000000..2874fc1
--- /dev/null
+++ b/src/main/java/com/ruoyi/equipmentenergyconsumption/service/impl/ElectricityConsumptionAreaServiceImpl.java
@@ -0,0 +1,26 @@
+package com.ruoyi.equipmentenergyconsumption.service.impl;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.equipmentenergyconsumption.mapper.ElectricityConsumptionAreaMapper;
+import com.ruoyi.equipmentenergyconsumption.pojo.ElectricityConsumptionArea;
+import com.ruoyi.equipmentenergyconsumption.service.ElectricityConsumptionAreaService;
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+
+@Service
+@Slf4j
+public class ElectricityConsumptionAreaServiceImpl extends ServiceImpl<ElectricityConsumptionAreaMapper, ElectricityConsumptionArea> implements ElectricityConsumptionAreaService {
+
+ @Autowired
+ private ElectricityConsumptionAreaMapper electricityConsumptionAreaMapper;
+
+ @Override
+ public IPage<ElectricityConsumptionArea> listPage(Page page, ElectricityConsumptionArea electricityConsumptionArea) {
+ return electricityConsumptionAreaMapper.listPage(page,electricityConsumptionArea);
+ }
+}
diff --git a/src/main/resources/mapper/equipmentenergyconsumption/electricityConsumptionAreaMapper.xml b/src/main/resources/mapper/equipmentenergyconsumption/electricityConsumptionAreaMapper.xml
new file mode 100644
index 0000000..1018813
--- /dev/null
+++ b/src/main/resources/mapper/equipmentenergyconsumption/electricityConsumptionAreaMapper.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+ "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.equipmentenergyconsumption.mapper.ElectricityConsumptionAreaMapper">
+
+ <select id="listPage" resultType="com.ruoyi.equipmentenergyconsumption.pojo.ElectricityConsumptionArea">
+ select * from electricity_consumption_area
+ <where>
+ <if test="electricityConsumptionArea.areaName != null and electricityConsumptionArea.areaName != ''">
+ area_name like CONCAT('%', #{electricityConsumptionArea.areaName}, '%')
+ </if>
+ <if test="electricityConsumptionArea.areaType != null and electricityConsumptionArea.areaType != ''">
+ and area_type like CONCAT('%', #{electricityConsumptionArea.areaType}, '%')
+ </if>
+ <if test="electricityConsumptionArea.fuId != null">
+ and fu_id = #{electricityConsumptionArea.fuId}
+ </if>
+ </where>
+ </select>
+
+</mapper>
--
Gitblit v1.9.3