From b0765ec5be45d6db1993064d5261bf42e94d161f Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期二, 12 八月 2025 16:38:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into pim_yys

---
 src/main/java/com/ruoyi/equipmentenergyconsumption/service/impl/EnergyPeriodServiceImpl.java               |   24 +++
 src/main/java/com/ruoyi/staff/service/impl/StaffOnJobServiceImpl.java                                      |   13 +
 src/main/resources/mapper/equipmentenergyconsumption/electricityConsumptionAreaMapper.xml                  |   27 +++
 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/staff/service/IStaffOnJobService.java                                              |    3 
 src/main/java/com/ruoyi/equipmentenergyconsumption/mapper/EnergyPeriodMapper.java                          |   12 +
 src/main/java/com/ruoyi/equipmentenergyconsumption/pojo/EquipmentEnergyConsumption.java                    |    6 
 src/main/java/com/ruoyi/staff/controller/StaffOnJobController.java                                         |   15 +
 src/main/java/com/ruoyi/staff/pojo/StaffOnJob.java                                                         |    2 
 src/main/java/com/ruoyi/equipmentenergyconsumption/pojo/ElectricityConsumptionArea.java                    |   47 +++++
 src/main/java/com/ruoyi/equipmentenergyconsumption/controller/EnergyPeriodController.java                  |   73 +++++++++
 src/main/java/com/ruoyi/equipmentenergyconsumption/service/ElectricityConsumptionAreaService.java          |   10 +
 src/main/java/com/ruoyi/equipmentenergyconsumption/service/EnergyPeriodService.java                        |   10 +
 src/main/java/com/ruoyi/equipmentenergyconsumption/pojo/EnergyPeriod.java                                  |   59 +++++++
 src/main/java/com/ruoyi/equipmentenergyconsumption/service/impl/ElectricityConsumptionAreaServiceImpl.java |   26 +++
 src/main/resources/mapper/equipmentenergyconsumption/EnergyPeriodMapper.xml                                |   30 +++
 17 files changed, 444 insertions(+), 2 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/controller/EnergyPeriodController.java b/src/main/java/com/ruoyi/equipmentenergyconsumption/controller/EnergyPeriodController.java
new file mode 100644
index 0000000..ddda227
--- /dev/null
+++ b/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 , "鐢ㄧ數鏃舵鏁版嵁");
+    }
+
+}
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/mapper/EnergyPeriodMapper.java b/src/main/java/com/ruoyi/equipmentenergyconsumption/mapper/EnergyPeriodMapper.java
new file mode 100644
index 0000000..468c7c0
--- /dev/null
+++ b/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);
+}
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..e022468
--- /dev/null
+++ b/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;
+}
diff --git a/src/main/java/com/ruoyi/equipmentenergyconsumption/pojo/EnergyPeriod.java b/src/main/java/com/ruoyi/equipmentenergyconsumption/pojo/EnergyPeriod.java
new file mode 100644
index 0000000..baba550
--- /dev/null
+++ b/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;
+}
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/EnergyPeriodService.java b/src/main/java/com/ruoyi/equipmentenergyconsumption/service/EnergyPeriodService.java
new file mode 100644
index 0000000..9da49fb
--- /dev/null
+++ b/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);
+}
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/java/com/ruoyi/equipmentenergyconsumption/service/impl/EnergyPeriodServiceImpl.java b/src/main/java/com/ruoyi/equipmentenergyconsumption/service/impl/EnergyPeriodServiceImpl.java
new file mode 100644
index 0000000..4eabf91
--- /dev/null
+++ b/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;
+    }
+}
diff --git a/src/main/java/com/ruoyi/staff/controller/StaffOnJobController.java b/src/main/java/com/ruoyi/staff/controller/StaffOnJobController.java
index 4230695..7d73759 100644
--- a/src/main/java/com/ruoyi/staff/controller/StaffOnJobController.java
+++ b/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("瀵煎叆澶辫触");
+    }
 
     /**
      * 鍦ㄨ亴鍛樺伐瀵煎嚭
diff --git a/src/main/java/com/ruoyi/staff/pojo/StaffOnJob.java b/src/main/java/com/ruoyi/staff/pojo/StaffOnJob.java
index ca54c4c..dc17ed2 100644
--- a/src/main/java/com/ruoyi/staff/pojo/StaffOnJob.java
+++ b/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;
 
     /**
diff --git a/src/main/java/com/ruoyi/staff/service/IStaffOnJobService.java b/src/main/java/com/ruoyi/staff/service/IStaffOnJobService.java
index d32c69c..2cef9f2 100644
--- a/src/main/java/com/ruoyi/staff/service/IStaffOnJobService.java
+++ b/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);
 }
diff --git a/src/main/java/com/ruoyi/staff/service/impl/StaffOnJobServiceImpl.java b/src/main/java/com/ruoyi/staff/service/impl/StaffOnJobServiceImpl.java
index 8aaa840..9fc8c43 100644
--- a/src/main/java/com/ruoyi/staff/service/impl/StaffOnJobServiceImpl.java
+++ b/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;
+        }
+    }
+
 
 }
diff --git a/src/main/resources/mapper/equipmentenergyconsumption/EnergyPeriodMapper.xml b/src/main/resources/mapper/equipmentenergyconsumption/EnergyPeriodMapper.xml
new file mode 100644
index 0000000..c026425
--- /dev/null
+++ b/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>
diff --git a/src/main/resources/mapper/equipmentenergyconsumption/electricityConsumptionAreaMapper.xml b/src/main/resources/mapper/equipmentenergyconsumption/electricityConsumptionAreaMapper.xml
new file mode 100644
index 0000000..aed220c
--- /dev/null
+++ b/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>

--
Gitblit v1.9.3