From cf7bc2d68e7d86e7d4b896acf1400f534d594daa Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期二, 10 三月 2026 17:59:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_宁夏_中盛建材' into dev_宁夏_中盛建材
---
src/main/resources/mapper/energy/EnergyConsumptionDetailFileMapper.xml | 18 ++++
src/main/java/com/ruoyi/energy/service/EnergyConsumptionDetailFileService.java | 16 ++++
doc/宁夏-中盛建材.sql | 13 +++
src/main/java/com/ruoyi/energy/controller/EnergyConsumptionDetailController.java | 9 ++
src/main/java/com/ruoyi/energy/mapper/EnergyConsumptionDetailFileMapper.java | 18 ++++
src/main/java/com/ruoyi/energy/service/impl/EnergyConsumptionDetailFileServiceImpl.java | 20 +++++
src/main/java/com/ruoyi/energy/controller/EnergyConsumptionDetailFileController.java | 55 +++++++++++++
src/main/java/com/ruoyi/energy/service/EnergyConsumptionDetailService.java | 4 +
src/main/java/com/ruoyi/energy/service/impl/EnergyConsumptionDetailServiceImpl.java | 8 +
src/main/java/com/ruoyi/energy/dto/EnergyStatisticsDto.java | 20 +++++
src/main/java/com/ruoyi/energy/pojo/EnergyConsumptionDetailFile.java | 54 +++++++++++++
11 files changed, 234 insertions(+), 1 deletions(-)
diff --git "a/doc/\345\256\201\345\244\217-\344\270\255\347\233\233\345\273\272\346\235\220.sql" "b/doc/\345\256\201\345\244\217-\344\270\255\347\233\233\345\273\272\346\235\220.sql"
index 1cb4a4f..ba7e338 100644
--- "a/doc/\345\256\201\345\244\217-\344\270\255\347\233\233\345\273\272\346\235\220.sql"
+++ "b/doc/\345\256\201\345\244\217-\344\270\255\347\233\233\345\273\272\346\235\220.sql"
@@ -69,3 +69,16 @@
`update_user` bigint NULL DEFAULT NULL COMMENT '鏇存柊鑰�',
PRIMARY KEY (`id`)
) COMMENT = '鑳芥簮绫诲瀷-鑳借�楁妱琛ㄦ槑缁�';
+
+CREATE TABLE `product-inventory-management-zsjc`.`energy_consumption_detail_file` (
+ `id` int NOT NULL AUTO_INCREMENT,
+ `energy_consumption_detail_id` int NULL COMMENT '鍏宠仈澶栭敭鑳借�楁妱琛╥d',
+ `name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL,
+ `url` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL,
+ `file_size` double NULL DEFAULT NULL,
+ `create_time` timestamp(0) NULL DEFAULT NULL,
+ `create_user` int NULL DEFAULT NULL,
+ `update_time` timestamp(0) NULL DEFAULT NULL,
+ `update_user` int NULL DEFAULT NULL,
+ PRIMARY KEY (`id`)
+ ) COMMENT = '鑳芥簮绫诲瀷-鑳借�楁妱琛ㄦ槑缁哶闄勪欢';
diff --git a/src/main/java/com/ruoyi/energy/controller/EnergyConsumptionDetailController.java b/src/main/java/com/ruoyi/energy/controller/EnergyConsumptionDetailController.java
index 22ef516..d7db119 100644
--- a/src/main/java/com/ruoyi/energy/controller/EnergyConsumptionDetailController.java
+++ b/src/main/java/com/ruoyi/energy/controller/EnergyConsumptionDetailController.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.energy.dto.EnergyConsumptionDetailDto;
+import com.ruoyi.energy.dto.EnergyStatisticsDto;
import com.ruoyi.energy.pojo.Energy;
import com.ruoyi.energy.pojo.EnergyConsumptionDetail;
import com.ruoyi.energy.service.EnergyConsumptionDetailService;
@@ -73,4 +74,12 @@
energyConsumptionDetailService.export(response);
}
+ /*******************************************姹囨�荤粺璁�*****************************************************************************************************************************************************************************/
+
+ @GetMapping("/statistics")
+ @ApiOperation("鎸夋棩鏈堝勾姹囨�荤粺璁�")
+ public R statistics(EnergyStatisticsDto energyStatisticsDto) {
+ return R.ok(energyConsumptionDetailService.statistics(energyStatisticsDto));
+ }
+
}
diff --git a/src/main/java/com/ruoyi/energy/controller/EnergyConsumptionDetailFileController.java b/src/main/java/com/ruoyi/energy/controller/EnergyConsumptionDetailFileController.java
new file mode 100644
index 0000000..6a0ce9f
--- /dev/null
+++ b/src/main/java/com/ruoyi/energy/controller/EnergyConsumptionDetailFileController.java
@@ -0,0 +1,55 @@
+package com.ruoyi.energy.controller;
+
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.energy.dto.EnergyConsumptionDetailDto;
+import com.ruoyi.energy.pojo.EnergyConsumptionDetail;
+import com.ruoyi.energy.pojo.EnergyConsumptionDetailFile;
+import com.ruoyi.energy.service.EnergyConsumptionDetailFileService;
+import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.production.pojo.ProductWorkOrderFile;
+import com.ruoyi.production.service.ProductWorkOrderFileService;
+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 java.util.Arrays;
+import java.util.List;
+
+/**
+ * <p>
+ * 鑳芥簮绫诲瀷-鑳借�楁妱琛ㄦ槑缁哶闄勪欢 鍓嶇鎺у埗鍣�
+ * </p>
+ *
+ * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @since 2026-03-10 05:07:33
+ */
+@RestController
+@RequestMapping("/energyConsumptionDetailFile")
+@Api(tags = "鑳借�楃鐞�-鑳借�楁妱琛ㄦ槑缁�-闄勪欢")
+public class EnergyConsumptionDetailFileController {
+
+ @Autowired
+ private EnergyConsumptionDetailFileService energyConsumptionDetailFileService;
+
+ @ApiOperation("鏂板鑳借�楁妱琛�-闄勪欢")
+ @PostMapping()
+ public R add(@RequestBody EnergyConsumptionDetailFile energyConsumptionDetailFile) {
+ return R.ok(energyConsumptionDetailFileService.save(energyConsumptionDetailFile));
+ }
+
+ @ApiOperation("鍒犻櫎鑳借�楁妱琛�-闄勪欢")
+ @DeleteMapping("/{ids}")
+ public R delete(@PathVariable("ids") Long[] ids) {
+ return R.ok(energyConsumptionDetailFileService.removeBatchByIds(Arrays.asList(ids)));
+ }
+
+ @GetMapping("page")
+ @ApiOperation("鍒嗛〉鏌ヨ")
+ public R page(Page<EnergyConsumptionDetailFile> page, EnergyConsumptionDetailFile energyConsumptionDetailFile) {
+ return R.ok(energyConsumptionDetailFileService.page(page,Wrappers.<EnergyConsumptionDetailFile>lambdaQuery().eq(EnergyConsumptionDetailFile::getEnergyConsumptionDetailId,energyConsumptionDetailFile.getEnergyConsumptionDetailId())));
+ }
+}
diff --git a/src/main/java/com/ruoyi/energy/dto/EnergyStatisticsDto.java b/src/main/java/com/ruoyi/energy/dto/EnergyStatisticsDto.java
new file mode 100644
index 0000000..25764b8
--- /dev/null
+++ b/src/main/java/com/ruoyi/energy/dto/EnergyStatisticsDto.java
@@ -0,0 +1,20 @@
+package com.ruoyi.energy.dto;
+
+
+import lombok.Data;
+
+import java.time.LocalDate;
+
+//鎸夋棩鏈堝勾姹囨�荤粺璁¤兘鑰楃殑浼犲弬
+@Data
+public class EnergyStatisticsDto {
+
+ //寮�濮嬫棩鏈�
+ private LocalDate startDate;
+
+ //缁撴潫鏃ユ湡
+ private LocalDate endDate;
+
+ //鑳借�楀満鏅�(鍔炲叕/鐢熶骇)
+ private String type;
+}
diff --git a/src/main/java/com/ruoyi/energy/mapper/EnergyConsumptionDetailFileMapper.java b/src/main/java/com/ruoyi/energy/mapper/EnergyConsumptionDetailFileMapper.java
new file mode 100644
index 0000000..754aae1
--- /dev/null
+++ b/src/main/java/com/ruoyi/energy/mapper/EnergyConsumptionDetailFileMapper.java
@@ -0,0 +1,18 @@
+package com.ruoyi.energy.mapper;
+
+import com.ruoyi.energy.pojo.EnergyConsumptionDetailFile;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 鑳芥簮绫诲瀷-鑳借�楁妱琛ㄦ槑缁哶闄勪欢 Mapper 鎺ュ彛
+ * </p>
+ *
+ * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @since 2026-03-10 05:07:33
+ */
+@Mapper
+public interface EnergyConsumptionDetailFileMapper extends BaseMapper<EnergyConsumptionDetailFile> {
+
+}
diff --git a/src/main/java/com/ruoyi/energy/pojo/EnergyConsumptionDetailFile.java b/src/main/java/com/ruoyi/energy/pojo/EnergyConsumptionDetailFile.java
new file mode 100644
index 0000000..19774a2
--- /dev/null
+++ b/src/main/java/com/ruoyi/energy/pojo/EnergyConsumptionDetailFile.java
@@ -0,0 +1,54 @@
+package com.ruoyi.energy.pojo;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 鑳芥簮绫诲瀷-鑳借�楁妱琛ㄦ槑缁哶闄勪欢
+ * </p>
+ *
+ * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @since 2026-03-10 05:07:33
+ */
+@Getter
+@Setter
+@TableName("energy_consumption_detail_file")
+@ApiModel(value = "EnergyConsumptionDetailFile瀵硅薄", description = "鑳芥簮绫诲瀷-鑳借�楁妱琛ㄦ槑缁哶闄勪欢")
+public class EnergyConsumptionDetailFile implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+
+ @ApiModelProperty("鍏宠仈澶栭敭鑳借�楁妱琛╥d")
+ private Integer energyConsumptionDetailId;
+
+ private String name;
+
+ private String url;
+
+ private Object fileSize;
+
+ @TableField(fill = FieldFill.INSERT)
+ private LocalDateTime createTime;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Integer createUser;
+
+ @TableField(fill = FieldFill.INSERT_UPDATE)
+ private LocalDateTime updateTime;
+
+ @TableField(fill = FieldFill.INSERT_UPDATE)
+ private Integer updateUser;
+}
diff --git a/src/main/java/com/ruoyi/energy/service/EnergyConsumptionDetailFileService.java b/src/main/java/com/ruoyi/energy/service/EnergyConsumptionDetailFileService.java
new file mode 100644
index 0000000..c66fc43
--- /dev/null
+++ b/src/main/java/com/ruoyi/energy/service/EnergyConsumptionDetailFileService.java
@@ -0,0 +1,16 @@
+package com.ruoyi.energy.service;
+
+import com.ruoyi.energy.pojo.EnergyConsumptionDetailFile;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 鑳芥簮绫诲瀷-鑳借�楁妱琛ㄦ槑缁哶闄勪欢 鏈嶅姟绫�
+ * </p>
+ *
+ * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @since 2026-03-10 05:07:33
+ */
+public interface EnergyConsumptionDetailFileService extends IService<EnergyConsumptionDetailFile> {
+
+}
diff --git a/src/main/java/com/ruoyi/energy/service/EnergyConsumptionDetailService.java b/src/main/java/com/ruoyi/energy/service/EnergyConsumptionDetailService.java
index 86a759d..2e77177 100644
--- a/src/main/java/com/ruoyi/energy/service/EnergyConsumptionDetailService.java
+++ b/src/main/java/com/ruoyi/energy/service/EnergyConsumptionDetailService.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.energy.dto.EnergyConsumptionDetailDto;
+import com.ruoyi.energy.dto.EnergyStatisticsDto;
import com.ruoyi.energy.pojo.EnergyConsumptionDetail;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.framework.web.domain.R;
@@ -25,4 +26,7 @@
R importData(MultipartFile file);
void export(HttpServletResponse response);
+
+ Object statistics(EnergyStatisticsDto energyStatisticsDto);
+
}
diff --git a/src/main/java/com/ruoyi/energy/service/impl/EnergyConsumptionDetailFileServiceImpl.java b/src/main/java/com/ruoyi/energy/service/impl/EnergyConsumptionDetailFileServiceImpl.java
new file mode 100644
index 0000000..33aac78
--- /dev/null
+++ b/src/main/java/com/ruoyi/energy/service/impl/EnergyConsumptionDetailFileServiceImpl.java
@@ -0,0 +1,20 @@
+package com.ruoyi.energy.service.impl;
+
+import com.ruoyi.energy.pojo.EnergyConsumptionDetailFile;
+import com.ruoyi.energy.mapper.EnergyConsumptionDetailFileMapper;
+import com.ruoyi.energy.service.EnergyConsumptionDetailFileService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 鑳芥簮绫诲瀷-鑳借�楁妱琛ㄦ槑缁哶闄勪欢 鏈嶅姟瀹炵幇绫�
+ * </p>
+ *
+ * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @since 2026-03-10 05:07:33
+ */
+@Service
+public class EnergyConsumptionDetailFileServiceImpl extends ServiceImpl<EnergyConsumptionDetailFileMapper, EnergyConsumptionDetailFile> implements EnergyConsumptionDetailFileService {
+
+}
diff --git a/src/main/java/com/ruoyi/energy/service/impl/EnergyConsumptionDetailServiceImpl.java b/src/main/java/com/ruoyi/energy/service/impl/EnergyConsumptionDetailServiceImpl.java
index 305ad75..ec91e5a 100644
--- a/src/main/java/com/ruoyi/energy/service/impl/EnergyConsumptionDetailServiceImpl.java
+++ b/src/main/java/com/ruoyi/energy/service/impl/EnergyConsumptionDetailServiceImpl.java
@@ -7,6 +7,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.energy.dto.EnergyConsumptionDetailDto;
+import com.ruoyi.energy.dto.EnergyStatisticsDto;
import com.ruoyi.energy.mapper.EnergyMapper;
import com.ruoyi.energy.pojo.Energy;
import com.ruoyi.energy.pojo.EnergyConsumptionDetail;
@@ -81,11 +82,16 @@
@Override
public void export(HttpServletResponse response) {
- List<EnergyConsumptionDetailDto> list = energyConsumptionDetailMapper.pageEnergyConsumptionDetail(new Page<>(-1,-1),null).getRecords();
+ List<EnergyConsumptionDetailDto> list = energyConsumptionDetailMapper.pageEnergyConsumptionDetail(new Page<>(-1,-1),new EnergyConsumptionDetailDto()).getRecords();
if(CollectionUtils.isEmpty(list)){
throw new RuntimeException("鏃犲鍑烘暟鎹�");
}
ExcelUtil<EnergyConsumptionDetailDto> util = new ExcelUtil<>(EnergyConsumptionDetailDto.class);
util.exportExcel(response, list, "鑳借�楁妱琛�");
}
+
+ @Override
+ public Object statistics(EnergyStatisticsDto energyStatisticsDto) {
+ return null;
+ }
}
diff --git a/src/main/resources/mapper/energy/EnergyConsumptionDetailFileMapper.xml b/src/main/resources/mapper/energy/EnergyConsumptionDetailFileMapper.xml
new file mode 100644
index 0000000..a9bd67c
--- /dev/null
+++ b/src/main/resources/mapper/energy/EnergyConsumptionDetailFileMapper.xml
@@ -0,0 +1,18 @@
+<?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.energy.mapper.EnergyConsumptionDetailFileMapper">
+
+ <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
+ <resultMap id="BaseResultMap" type="com.ruoyi.energy.pojo.EnergyConsumptionDetailFile">
+ <id column="id" property="id" />
+ <result column="energy_consumption_detail_id" property="energyConsumptionDetailId" />
+ <result column="name" property="name" />
+ <result column="url" property="url" />
+ <result column="file_size" property="fileSize" />
+ <result column="create_time" property="createTime" />
+ <result column="create_user" property="createUser" />
+ <result column="update_time" property="updateTime" />
+ <result column="update_user" property="updateUser" />
+ </resultMap>
+
+</mapper>
--
Gitblit v1.9.3