Merge remote-tracking branch 'origin/dev_宁夏_中盛建材' into dev_宁夏_中盛建材

gongchunyi

4 天以前 cf7bc2d68e7d86e7d4b896acf1400f534d594daa

Merge remote-tracking branch 'origin/dev_宁夏_中盛建材' into dev_宁夏_中盛建材

 doc/ÄþÏÄ-ÖÐÊ¢½¨²Ä.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 '关联外键能耗抄表id',
    `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 = '能源类型-能耗抄表明细_附件';

 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));
    }

}

 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())));
    }
}

 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;
}

 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> {

}

 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("关联外键能耗抄表id")
    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;
}

 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> {

}

 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);

}

 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 {

}

 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;
    }
}

 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>