Merge remote-tracking branch 'origin/master' into pim_yys

maven

2025-08-12 b0765ec5be45d6db1993064d5261bf42e94d161f

Merge remote-tracking branch 'origin/master' into pim_yys

 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 , "用电区域数据");
    }

}

 src/main/java/com/ruoyi/equipmentenergyconsumption/controller/EnergyPeriodController.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,73 @@
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.equipmentenergyconsumption.pojo.ElectricityConsumptionArea;
import com.ruoyi.equipmentenergyconsumption.pojo.EnergyPeriod;
import com.ruoyi.equipmentenergyconsumption.service.EnergyPeriodService;
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
@RequestMapping("/energyPeriod")
@Api(tags = "用电时段")
public class EnergyPeriodController extends BaseController {
    @Autowired
    private EnergyPeriodService energyPeriodService;
    @GetMapping("/listPage")
    @ApiOperation("用电时段-分页查询")
    @Log(title = "用电时段-分页查询", businessType = BusinessType.OTHER)
    public AjaxResult listPage(Page page, EnergyPeriod energyPeriod) {
        IPage<EnergyPeriod> listPage = energyPeriodService.listPage(page, energyPeriod);
        return AjaxResult.success(listPage);
    }

    @PostMapping("/add")
    @ApiOperation("用电时段-新增")
    @Log(title = "用电时段-新增", businessType = BusinessType.INSERT)
    public AjaxResult add(@RequestBody EnergyPeriod energyPeriod) {
        boolean save = energyPeriodService.save(energyPeriod);
        return save ? AjaxResult.success() : AjaxResult.error();
    }

    @PostMapping("/update")
    @ApiOperation("用电时段-修改")
    @Log(title = "用电时段-修改", businessType = BusinessType.UPDATE)
    public AjaxResult update(@RequestBody EnergyPeriod energyPeriod) {
        boolean update = energyPeriodService.updateById(energyPeriod);
        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 = energyPeriodService.removeBatchByIds(ids);
        return remove ? AjaxResult.success() : AjaxResult.error("删除失败");
    }


    /**
     * å¯¼å‡ºç”¨ç”µæ—¶æ®µ
     */
    @Log(title = "导出用电时段", businessType = BusinessType.EXPORT)
    @PostMapping("/export")
    @ApiOperation("导出用电时段")
    public void export(HttpServletResponse response) {
        ExcelUtil<EnergyPeriod> util = new ExcelUtil<EnergyPeriod>(EnergyPeriod.class);
        util.exportExcel(response, null , "用电时段数据");
    }

}

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

 src/main/java/com/ruoyi/equipmentenergyconsumption/mapper/EnergyPeriodMapper.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,12 @@
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.EnergyPeriod;
import org.apache.ibatis.annotations.Mapper;

@Mapper
public interface EnergyPeriodMapper extends BaseMapper<EnergyPeriod> {
    IPage<EnergyPeriod> listPage(Page page, EnergyPeriod energyPeriod);
}

 src/main/java/com/ruoyi/equipmentenergyconsumption/pojo/ElectricityConsumptionArea.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,47 @@
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;
        /**
         * æŽ’序
         */
        @TableField(fill = FieldFill.INSERT)
        private Long sort;

        /**
         * çˆ¶ç±»id
         */
        @TableField(fill = FieldFill.INSERT)
        private Long fuId;
        /**
         * ç§Ÿæˆ·id
         */
        @TableField(fill = FieldFill.INSERT)
        private Long tenantId;
}

 src/main/java/com/ruoyi/equipmentenergyconsumption/pojo/EnergyPeriod.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,59 @@
package com.ruoyi.equipmentenergyconsumption.pojo;
import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.util.Date;

@Data
@TableName("energy_period")
@ApiModel
public class EnergyPeriod {
    @TableId(value = "id", type = IdType.AUTO)
    private Long id;
    /**
     * æ—¥æœŸ
     */
    @ApiModelProperty("日期")
    @Excel(name = "日期")
    @JsonFormat(pattern = "yyyy-MM-dd")
    private Date date;
    /**
     * å•ä»·
     */
    @ApiModelProperty("单价")
    @Excel(name = "单价")
    private Double price;
    /**
     * ç§Ÿæˆ·id
     */
    @TableField(fill = FieldFill.INSERT)
    private Long tenantId;
    /**
     * å³°æ®µ
     */
    @ApiModelProperty("峰段")
    @Excel(name = "峰段")
    private Double peak;
    /**
     * è°·æ®µ
     */
    @ApiModelProperty("谷段")
    @Excel(name = "谷段")
    private Double valley;
    /**
     * å¹³æ®µ
     */
    @ApiModelProperty("平段")
    @Excel(name = "平段")
    private Double flat;
    /**
     * å°–段
     */
    @ApiModelProperty("尖段")
    @Excel(name = "尖段")
    private Double sharp;
}

 src/main/java/com/ruoyi/equipmentenergyconsumption/pojo/EquipmentEnergyConsumption.java

@@ -135,5 +135,9 @@
     */
    @TableField(fill = FieldFill.INSERT)
    private Long tenantId;

    /**
     *所属用电区域id
     */
    @TableField(fill = FieldFill.INSERT)
    private Long electricityConsumptionAreaId;
}

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

 src/main/java/com/ruoyi/equipmentenergyconsumption/service/EnergyPeriodService.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.EnergyPeriod;

public interface EnergyPeriodService extends IService<EnergyPeriod> {
    IPage<EnergyPeriod> listPage(Page page, EnergyPeriod energyPeriod);
}

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

 src/main/java/com/ruoyi/equipmentenergyconsumption/service/impl/EnergyPeriodServiceImpl.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,24 @@
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.EnergyPeriodMapper;
import com.ruoyi.equipmentenergyconsumption.pojo.EnergyPeriod;
import com.ruoyi.equipmentenergyconsumption.service.EnergyPeriodService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

@Service
@Slf4j
public class EnergyPeriodServiceImpl extends ServiceImpl<EnergyPeriodMapper, EnergyPeriod> implements EnergyPeriodService {
    @Autowired
    private EnergyPeriodMapper energyPeriodMapper;

    @Override
    public IPage<EnergyPeriod> listPage(Page page, EnergyPeriod energyPeriod) {
        IPage<EnergyPeriod> listPage = energyPeriodMapper.listPage(page, energyPeriod);
        return listPage;
    }
}

 src/main/java/com/ruoyi/staff/controller/StaffOnJobController.java

@@ -1,6 +1,8 @@
package com.ruoyi.staff.controller;

import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.staff.pojo.StaffJoinLeaveRecord;
import com.ruoyi.staff.pojo.StaffOnJob;
@@ -8,6 +10,7 @@
import com.ruoyi.staff.service.IStaffOnJobService;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;

import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
@@ -53,6 +56,18 @@
    public AjaxResult staffOnJobDetail(String staffNo) {
        return AjaxResult.success(staffOnJobService.staffOnJobDetail(staffNo));
    }
    /**
     * åœ¨èŒå‘˜å·¥å¯¼å…¥
     */
    @PostMapping("/import")
    @Log(title = "在职员工导入", businessType = BusinessType.IMPORT)
    public AjaxResult importData(@RequestPart("file") MultipartFile file) {
        Boolean b = staffOnJobService.importData(file);
        if (b) {
            return AjaxResult.success("导入成功");
        }
        return AjaxResult.error("导入失败");
    }

    /**
     * åœ¨èŒå‘˜å·¥å¯¼å‡º

 src/main/java/com/ruoyi/staff/pojo/StaffOnJob.java

@@ -35,7 +35,7 @@
    /**
     * å‘˜å·¥ç¼–号
     */
    @Excel(name = "员工编号")
    @Excel(name = "员工编号", type = Excel.Type.EXPORT, cellType = Excel.ColumnType.STRING)
    private String staffNo;

    /**

 src/main/java/com/ruoyi/staff/service/IStaffOnJobService.java

@@ -5,6 +5,7 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.staff.pojo.StaffJoinLeaveRecord;
import com.ruoyi.staff.pojo.StaffOnJob;
import org.springframework.web.multipart.MultipartFile;

import javax.servlet.http.HttpServletResponse;
import java.util.List;
@@ -19,4 +20,6 @@
    void staffOnJobExport(HttpServletResponse response, StaffOnJob staffOnJob);

    List<StaffJoinLeaveRecord> staffOnJobList();

    Boolean importData(MultipartFile file);
}

 src/main/java/com/ruoyi/staff/service/impl/StaffOnJobServiceImpl.java

@@ -14,6 +14,7 @@
import com.ruoyi.staff.service.IStaffOnJobService;
import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;
import org.springframework.web.multipart.MultipartFile;

import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
@@ -55,5 +56,17 @@
        return staffJoinLeaveRecordMapper.staffOnJobList();
    }

    @Override
    public Boolean importData(MultipartFile file) {
        try {
            ExcelUtil<StaffOnJob> util = new ExcelUtil<>(StaffOnJob.class);
            List<StaffOnJob> staffOnJobs = util.importExcel(file.getInputStream());
            return saveOrUpdateBatch(staffOnJobs);
        } catch (Exception e) {
            e.printStackTrace();
            return false;
        }
    }


}

 src/main/resources/mapper/equipmentenergyconsumption/EnergyPeriodMapper.xml

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,30 @@
<?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.EnergyPeriodMapper">


    <select id="listPage" resultType="com.ruoyi.equipmentenergyconsumption.pojo.EnergyPeriod">
        select * from energy_period
        <where>
            <if test="energyPeriod.date != null">
                date = #{energyPeriod.date}
            </if>
            <if test="energyPeriod.price != null">
                and price = #{energyPeriod.price}
            </if>
            <if test="energyPeriod.peak != null">
                and peak = #{energyPeriod.peak}
            </if>
            <if test="energyPeriod.valley != null">
                and valley = #{energyPeriod.valley}
            </if>
            <if test="energyPeriod.flat != null">
                and flat = #{energyPeriod.flat}
            </if>
            <if test="energyPeriod.sharp != null">
                and sharp = #{energyPeriod.sharp}
            </if>
        </where>
    </select>
</mapper>

 src/main/resources/mapper/equipmentenergyconsumption/electricityConsumptionAreaMapper.xml

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,27 @@
<?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.id != null">
                id = #{electricityConsumptionArea.id}
            </if>
            <if test="electricityConsumptionArea.areaName != null and electricityConsumptionArea.areaName != ''">
                and 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.sort != null">
                and sort = #{electricityConsumptionArea.sort}
            </if>
            <if test="electricityConsumptionArea.fuId != null">
                and fu_id = #{electricityConsumptionArea.fuId}
            </if>
        </where>
    </select>

</mapper>