From 6d08eec100243e0be59a207d57ab4db7974e51e4 Mon Sep 17 00:00:00 2001
From: yangbin <yangbin@qq.com>
Date: 星期一, 29 七月 2024 15:26:26 +0800
Subject: [PATCH] Merge branch 'master' of http://117.34.109.166:18448/r/mdc_yituo
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IEquipmentSpindleStatisticalService.java | 39 ++
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/EquipmentElectricStatisticalController.java | 99 +++++
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/EquipmentElectricStatistical.java | 113 +++++
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/EquipmentElectricStatisticalServiceImpl.java | 141 +++++++
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/EquipmentSpindleStatisticalController.java | 77 ++++
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/EquipmentElectricStatisticalMapper.xml | 88 ++++
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/vo/EquipmentElectricStatisticalVo.java | 59 +++
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/EquipmentSpindleStatisticalMapper.java | 37 +
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/EquipmentElectricStatisticalMapper.java | 45 ++
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/EquipmentSpindleStatisticalMapper.xml | 54 ++
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/dto/EquipmentElectricStatisticalDto.java | 16
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/EquipmentSpindleStatisticalServiceImpl.java | 136 +++++++
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IEquipmentElectricStatisticalService.java | 50 ++
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/vo/EquipmentSpindleStatisticalVo.java | 44 ++
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/EquipmentSpindleStatistical.java | 115 ++++++
15 files changed, 1,113 insertions(+), 0 deletions(-)
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/EquipmentElectricStatisticalController.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/EquipmentElectricStatisticalController.java
new file mode 100644
index 0000000..e46a2fa
--- /dev/null
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/EquipmentElectricStatisticalController.java
@@ -0,0 +1,99 @@
+package org.jeecg.modules.mdc.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.shiro.SecurityUtils;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.aspect.annotation.AutoLog;
+import org.jeecg.common.system.base.controller.JeecgController;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.system.vo.LoginUser;
+import org.jeecg.modules.mdc.dto.EquipmentElectricStatisticalDto;
+import org.jeecg.modules.mdc.entity.EquipmentElectricStatistical;
+import org.jeecg.modules.mdc.service.IEquipmentElectricStatisticalService;
+import org.jeecg.modules.mdc.vo.EquipmentElectricStatisticalVo;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.servlet.ModelAndView;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * @Description: 璁惧鐢垫祦缁熻
+ * @Author: lius
+ * @Date: 2024-07-16
+ * @Version: V1.0
+ */
+@Slf4j
+@Api(tags = "璁惧鐢垫祦缁熻")
+@RestController
+@RequestMapping("/mdc/equipmentElectricStatistical")
+public class EquipmentElectricStatisticalController extends JeecgController<EquipmentElectricStatistical, IEquipmentElectricStatisticalService> {
+
+ @Resource
+ private IEquipmentElectricStatisticalService equipmentElectricStatisticalService;
+
+ /**
+ * 鍒嗛〉鍒楄〃鏌ヨ
+ *
+ * @param equipmentElectricStatisticalVo
+ * @param pageNo
+ * @param pageSize
+ * @param req
+ * @return
+ */
+ @AutoLog(value = "璁惧鐢垫祦缁熻-鍒嗛〉鍒楄〃鏌ヨ")
+ @ApiOperation(value = "璁惧鐢垫祦缁熻-鍒嗛〉鍒楄〃鏌ヨ", notes = "璁惧鐢垫祦缁熻-鍒嗛〉鍒楄〃鏌ヨ")
+ @GetMapping(value = "/list")
+ public Result<?> queryPageList(EquipmentElectricStatisticalVo equipmentElectricStatisticalVo,
+ @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+ @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+ HttpServletRequest req) {
+ LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+ String userId = user.getId();
+ Page<EquipmentElectricStatistical> page = new Page<EquipmentElectricStatistical>(pageNo, pageSize);
+ IPage<EquipmentElectricStatistical> pageList = equipmentElectricStatisticalService.pageList(userId, page, equipmentElectricStatisticalVo, req);
+ return Result.OK(pageList);
+ }
+
+
+ /**
+ * 瀵煎嚭excel
+ *
+ * @param request
+ * @param equipmentElectricStatisticalVo
+ */
+ @AutoLog(value = "璁惧鐢垫祦缁熻-瀵煎嚭")
+ @ApiOperation(value = "璁惧鐢垫祦缁熻-瀵煎嚭", notes = "璁惧鐢垫祦缁熻-瀵煎嚭")
+ @RequestMapping(value = "/exportXls")
+ public ModelAndView exportXls(HttpServletRequest request, EquipmentElectricStatisticalVo equipmentElectricStatisticalVo) {
+ LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+ String userId = user.getId();
+ return equipmentElectricStatisticalService.exportXls(userId, equipmentElectricStatisticalVo);
+ }
+
+ /**
+ * 鐢垫祦璐熻浇瀵规瘮
+ *
+ * @param equipmentElectricStatisticalVo
+ * @return
+ */
+ @AutoLog(value = "璁惧鐢垫祦缁熻-鐢垫祦璐熻浇瀵规瘮")
+ @ApiOperation(value = "璁惧鐢垫祦缁熻-鐢垫祦璐熻浇瀵规瘮", notes = "璁惧鐢垫祦缁熻-鐢垫祦璐熻浇瀵规瘮")
+ @GetMapping(value = "/getElectricValue")
+ public Result<?> getElectricValue(EquipmentElectricStatisticalVo equipmentElectricStatisticalVo) {
+ LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+ String userId = user.getId();
+ List<EquipmentElectricStatisticalDto> resultList = equipmentElectricStatisticalService.getElectricValue(userId, equipmentElectricStatisticalVo);
+ return Result.OK(resultList);
+ }
+
+
+}
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/EquipmentSpindleStatisticalController.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/EquipmentSpindleStatisticalController.java
new file mode 100644
index 0000000..0d83436
--- /dev/null
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/EquipmentSpindleStatisticalController.java
@@ -0,0 +1,77 @@
+package org.jeecg.modules.mdc.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.shiro.SecurityUtils;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.aspect.annotation.AutoLog;
+import org.jeecg.common.system.base.controller.JeecgController;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.system.vo.LoginUser;
+import org.jeecg.modules.mdc.entity.EquipmentSpindleStatistical;
+import org.jeecg.modules.mdc.service.IEquipmentSpindleStatisticalService;
+import org.jeecg.modules.mdc.vo.EquipmentSpindleStatisticalVo;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.servlet.ModelAndView;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+
+/**
+ * @Description: 璁惧璐熻浇
+ * @Author: lius
+ * @Date: 2024-07-16
+ * @Version: V1.0
+ */
+@Slf4j
+@Api(tags = "璁惧璐熻浇")
+@RestController
+@RequestMapping("/mdc/equipmentSpindleStatistical")
+public class EquipmentSpindleStatisticalController extends JeecgController<EquipmentSpindleStatistical, IEquipmentSpindleStatisticalService> {
+
+ @Resource
+ private IEquipmentSpindleStatisticalService equipmentSpindleStatisticalService;
+
+ /**
+ * 鍒嗛〉鍒楄〃鏌ヨ
+ *
+ * @param equipmentSpindleStatisticalVo
+ * @param pageNo
+ * @param pageSize
+ * @param req
+ * @return
+ */
+ @AutoLog(value = "璁惧璐熻浇-鍒嗛〉鍒楄〃鏌ヨ")
+ @ApiOperation(value = "璁惧璐熻浇-鍒嗛〉鍒楄〃鏌ヨ", notes = "璁惧璐熻浇-鍒嗛〉鍒楄〃鏌ヨ")
+ @GetMapping(value = "/list")
+ public Result<?> queryPageList(EquipmentSpindleStatisticalVo equipmentSpindleStatisticalVo,
+ @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+ @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+ HttpServletRequest req) {
+ LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+ String userId = user.getId();
+ Page<EquipmentSpindleStatistical> page = new Page<EquipmentSpindleStatistical>(pageNo, pageSize);
+ IPage<EquipmentSpindleStatistical> pageList = equipmentSpindleStatisticalService.pageList(userId, page, equipmentSpindleStatisticalVo, req);
+ return Result.OK(pageList);
+ }
+
+ /**
+ * 瀵煎嚭excel
+ *
+ * @param request
+ * @param equipmentSpindleStatisticalVo
+ */
+ @AutoLog(value = "璁惧璐熻浇-瀵煎嚭")
+ @ApiOperation(value = "璁惧璐熻浇-瀵煎嚭", notes = "璁惧璐熻浇-瀵煎嚭")
+ @RequestMapping(value = "/exportXls")
+ public ModelAndView exportXls(HttpServletRequest request, EquipmentSpindleStatisticalVo equipmentSpindleStatisticalVo) {
+ LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+ String userId = user.getId();
+ return equipmentSpindleStatisticalService.exportXls(userId, equipmentSpindleStatisticalVo);
+ }
+
+}
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/dto/EquipmentElectricStatisticalDto.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/dto/EquipmentElectricStatisticalDto.java
new file mode 100644
index 0000000..27c4458
--- /dev/null
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/dto/EquipmentElectricStatisticalDto.java
@@ -0,0 +1,16 @@
+package org.jeecg.modules.mdc.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.jeecg.modules.mdc.entity.EquipmentElectricStatistical;
+
+/**
+ * @author Lius
+ * @date 2024/7/16 16:11
+ */
+@Data
+public class EquipmentElectricStatisticalDto extends EquipmentElectricStatistical {
+
+ @ApiModelProperty(value = "鏃ユ湡")
+ private String dayDate;
+}
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/EquipmentElectricStatistical.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/EquipmentElectricStatistical.java
new file mode 100644
index 0000000..59090f6
--- /dev/null
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/EquipmentElectricStatistical.java
@@ -0,0 +1,113 @@
+package org.jeecg.modules.mdc.entity;
+
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @Description: 璁惧鐢垫祦缁熻
+ * @Author: lius
+ * @Date: 2024-07-16
+ * @Version: V1.0
+ */
+@Data
+@TableName("equipment_electric_statistical")
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "equipment_electric_statistical瀵硅薄", description = "璁惧鐢垫祦缁熻")
+public class EquipmentElectricStatistical implements Serializable {
+
+ private static final long serialVersionUID = -7635486686927678464L;
+
+ /**
+ * id
+ */
+ @TableId(type = IdType.ASSIGN_ID)
+ private String id;
+ /**
+ * 璁惧缂栧彿
+ */
+ @Excel(name = "璁惧缂栧彿", width = 15)
+ @ApiModelProperty(value = "璁惧缂栧彿")
+ private String equipmentid;
+ /**
+ * 璁惧鍚嶇О
+ */
+ @Excel(name = "璁惧鍚嶇О", width = 15)
+ @ApiModelProperty(value = "璁惧鍚嶇О")
+ private String equipmentname;
+ /**
+ * 鍧愭爣绫诲瀷 1,X;2,Y;3,Z;4,A;5,B;
+ */
+ @Excel(name = "鍧愭爣绫诲瀷", width = 15)
+ @ApiModelProperty(value = "鍧愭爣绫诲瀷 1,X;2,Y;3,Z;4,A;5,B;")
+ private Integer axistype;
+ /**
+ * 鍧愭爣鍊�
+ */
+ @Excel(name = "鍧愭爣鍊�", width = 15)
+ @ApiModelProperty(value = "鍧愭爣鍊�")
+ private String axisvalue;
+ /**
+ * 鏈�澶х數娴佸��
+ */
+ @Excel(name = "鏈�澶х數娴�", width = 15)
+ @ApiModelProperty(value = "鏈�澶х數娴�")
+ private String electricvalue;
+ /**
+ * 瀵瑰簲涓昏酱璐熻浇
+ */
+ @Excel(name = "涓昏酱璐熻浇", width = 15)
+ @ApiModelProperty(value = "涓昏酱璐熻浇")
+ private String spindleload;
+ /**
+ * 瀵瑰簲涓昏酱杞��
+ */
+ @Excel(name = "涓昏酱杞��", width = 15)
+ @ApiModelProperty(value = "涓昏酱杞��")
+ private String spindlespeed;
+ /**
+ * 鏈�澶х數娴佺殑閲囬泦鏃堕棿
+ */
+ @Excel(name = "鏈�澶х數娴佺殑閲囬泦鏃堕棿", width = 20, format = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @ApiModelProperty(value = "鏈�澶х數娴佺殑閲囬泦鏃堕棿")
+ private Date electrictime;
+ /**
+ * 鏈�澶х數娴佸搴斿潗鏍囩殑閲囬泦鏃堕棿
+ */
+ @Excel(name = "鏈�澶х數娴佸搴斿潗鏍囩殑閲囬泦鏃堕棿", width = 20, format = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @ApiModelProperty(value = "鏈�澶х數娴佸搴斿潗鏍囩殑閲囬泦鏃堕棿")
+ private Date axistime;
+ /**
+ * 鏈�澶х數娴佸搴斾富杞磋浆閫熺殑閲囬泦鏃堕棿
+ */
+ @Excel(name = "鏈�澶х數娴佸搴斾富杞磋浆閫熺殑閲囬泦鏃堕棿", width = 20, format = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @ApiModelProperty(value = "鏈�澶х數娴佸搴斾富杞磋浆閫熺殑閲囬泦鏃堕棿")
+ private Date spindletime;
+ /**
+ * 缁熻鏃ユ湡
+ */
+ @Excel(name = "缁熻鏃ユ湡", width = 20, format = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @ApiModelProperty(value = "缁熻鏃ユ湡")
+ private Date createdate;
+}
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/EquipmentSpindleStatistical.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/EquipmentSpindleStatistical.java
new file mode 100644
index 0000000..87136f9
--- /dev/null
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/EquipmentSpindleStatistical.java
@@ -0,0 +1,115 @@
+package org.jeecg.modules.mdc.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+
+/**
+ * @Description: 璁惧璐熻浇
+ * @Author: lius
+ * @Date: 2024-07-16
+ * @Version: V1.0
+ */
+@Data
+@TableName("equipment_spindle_statistical")
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "equipment_spindle_statistical瀵硅薄", description = "璁惧璐熻浇")
+public class EquipmentSpindleStatistical {
+
+ private static final long serialVersionUID = 685063684783288830L;
+
+ /**
+ * id
+ */
+ @TableId(type = IdType.ASSIGN_ID)
+ private String id;
+ /**
+ * 璁惧缂栧彿
+ */
+ @Excel(name = "璁惧缂栧彿", width = 15)
+ @ApiModelProperty(value = "璁惧缂栧彿")
+ private String equipmentid;
+ /**
+ * 璁惧鍚嶇О
+ */
+ @Excel(name = "璁惧鍚嶇О", width = 15)
+ @ApiModelProperty(value = "璁惧鍚嶇О")
+ private String equipmentname;
+ /**
+ * 涓昏酱璐熻浇
+ */
+ @Excel(name = "涓昏酱璐熻浇", width = 15)
+ @ApiModelProperty(value = "涓昏酱璐熻浇")
+ private String spindleload;
+ /**
+ * 涓昏酱杞��
+ */
+ @Excel(name = "涓昏酱杞��", width = 15)
+ @ApiModelProperty(value = "涓昏酱杞��")
+ private String spindlespeed;
+ /**
+ * X鍧愭爣鍊�
+ */
+ @Excel(name = "X鍧愭爣鍊�", width = 15)
+ @ApiModelProperty(value = "X鍧愭爣鍊�")
+ private String axisx;
+ /**
+ * Y鍧愭爣鍊�
+ */
+ @Excel(name = "Y鍧愭爣鍊�", width = 15)
+ @ApiModelProperty(value = "Y鍧愭爣鍊�")
+ private String axisy;
+ /**
+ * Z鍧愭爣鍊�
+ */
+ @Excel(name = "Z鍧愭爣鍊�", width = 15)
+ @ApiModelProperty(value = "Z鍧愭爣鍊�")
+ private String axisz;
+ /**
+ * A鍧愭爣鍊�
+ */
+ @Excel(name = "A鍧愭爣鍊�", width = 15)
+ @ApiModelProperty(value = "A鍧愭爣鍊�")
+ private String axisa;
+ /**
+ * B鍧愭爣鍊�
+ */
+ @Excel(name = "B鍧愭爣鍊�", width = 15)
+ @ApiModelProperty(value = "B鍧愭爣鍊�")
+ private String axisb;
+ /**
+ * 涓昏酱璐熻浇閲囬泦鏃堕棿
+ */
+ @Excel(name = "涓昏酱璐熻浇閲囬泦鏃堕棿", width = 20, format = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @ApiModelProperty(value = "涓昏酱璐熻浇閲囬泦鏃堕棿")
+ private Date spindletime;
+ /**
+ * 鍧愭爣閲囬泦鏃堕棿
+ */
+ @Excel(name = "鍧愭爣閲囬泦鏃堕棿", width = 20, format = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @ApiModelProperty(value = "鍧愭爣閲囬泦鏃堕棿")
+ private Date axistime;
+ /**
+ * 缁熻鏃ユ湡
+ */
+ @Excel(name = "缁熻鏃ユ湡", width = 20, format = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @ApiModelProperty(value = "缁熻鏃ユ湡")
+ private Date createdate;
+}
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/EquipmentElectricStatisticalMapper.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/EquipmentElectricStatisticalMapper.java
new file mode 100644
index 0000000..33cf4eb
--- /dev/null
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/EquipmentElectricStatisticalMapper.java
@@ -0,0 +1,45 @@
+package org.jeecg.modules.mdc.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.apache.ibatis.annotations.Param;
+import org.jeecg.modules.mdc.dto.EquipmentElectricStatisticalDto;
+import org.jeecg.modules.mdc.entity.EquipmentElectricStatistical;
+import org.jeecg.modules.mdc.vo.EquipmentElectricStatisticalVo;
+
+import java.util.List;
+
+/**
+ * @Description: 璁惧鐢垫祦缁熻
+ * @Author: lius
+ * @Date: 2024-07-16
+ * @Version: V1.0
+ */
+public interface EquipmentElectricStatisticalMapper extends BaseMapper<EquipmentElectricStatistical> {
+
+ /**
+ * 鍒嗛〉鍒楄〃
+ *
+ * @param page
+ * @param equipmentElectricStatisticalVo
+ * @return
+ */
+ IPage<EquipmentElectricStatistical> pageList(Page<EquipmentElectricStatistical> page, @Param("equipmentElectricStatisticalVo") EquipmentElectricStatisticalVo equipmentElectricStatisticalVo);
+
+ /**
+ * 瀵煎嚭
+ *
+ * @param equipmentElectricStatisticalVo
+ * @return
+ */
+ List<EquipmentElectricStatistical> list(@Param("equipmentElectricStatisticalVo") EquipmentElectricStatisticalVo equipmentElectricStatisticalVo);
+
+ /**
+ * 鐢垫祦璐熻浇瀵规瘮
+ *
+ * @param equipmentElectricStatisticalVo
+ * @return
+ */
+ List<EquipmentElectricStatisticalDto> getElectricValue(@Param("equipmentElectricStatisticalVo") EquipmentElectricStatisticalVo equipmentElectricStatisticalVo);
+}
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/EquipmentSpindleStatisticalMapper.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/EquipmentSpindleStatisticalMapper.java
new file mode 100644
index 0000000..0d0bddc
--- /dev/null
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/EquipmentSpindleStatisticalMapper.java
@@ -0,0 +1,37 @@
+package org.jeecg.modules.mdc.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.apache.ibatis.annotations.Param;
+import org.jeecg.modules.mdc.entity.EquipmentSpindleStatistical;
+import org.jeecg.modules.mdc.vo.EquipmentSpindleStatisticalVo;
+
+import java.util.List;
+
+/**
+ * @Description: 璁惧璐熻浇
+ * @Author: lius
+ * @Date: 2024-07-16
+ * @Version: V1.0
+ */
+public interface EquipmentSpindleStatisticalMapper extends BaseMapper<EquipmentSpindleStatistical> {
+
+ /**
+ * 鍒嗛〉鍒楄〃
+ *
+ * @param page
+ * @param equipmentSpindleStatisticalVo
+ * @return
+ */
+ IPage<EquipmentSpindleStatistical> pageList(Page<EquipmentSpindleStatistical> page, @Param("equipmentSpindleStatisticalVo") EquipmentSpindleStatisticalVo equipmentSpindleStatisticalVo);
+
+ /**
+ * 瀵煎嚭
+ *
+ * @param equipmentSpindleStatisticalVo
+ * @return
+ */
+ List<EquipmentSpindleStatistical> list(@Param("equipmentSpindleStatisticalVo") EquipmentSpindleStatisticalVo equipmentSpindleStatisticalVo);
+
+}
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/EquipmentElectricStatisticalMapper.xml b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/EquipmentElectricStatisticalMapper.xml
new file mode 100644
index 0000000..a32dcdc
--- /dev/null
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/EquipmentElectricStatisticalMapper.xml
@@ -0,0 +1,88 @@
+<?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="org.jeecg.modules.mdc.mapper.EquipmentElectricStatisticalMapper">
+
+ <select id="pageList" resultType="org.jeecg.modules.mdc.entity.EquipmentElectricStatistical">
+ SELECT
+ *
+ FROM
+ equipment_electric_statistical
+ <where>
+ <if test="equipmentElectricStatisticalVo.equipmentId != null and equipmentElectricStatisticalVo.equipmentId != ''">
+ AND equipmentID LIKE CONCAT(CONCAT('%',#{equipmentElectricStatisticalVo.equipmentId}),'%')
+ </if>
+ <if test="equipmentElectricStatisticalVo.equipmentName != null and equipmentElectricStatisticalVo.equipmentName != ''">
+ AND equipmentName LIKE CONCAT(CONCAT('%',#{equipmentElectricStatisticalVo.equipmentName}),'%')
+ </if>
+ <if test="equipmentElectricStatisticalVo.axistype != null and equipmentElectricStatisticalVo.axistype != ''">
+ AND axisType = #{equipmentElectricStatisticalVo.axistype}
+ </if>
+ <if test="equipmentElectricStatisticalVo.createDate != null and equipmentElectricStatisticalVo.createDate != ''">
+ AND createDate = #{equipmentElectricStatisticalVo.createDate}
+ </if>
+ <if test="equipmentElectricStatisticalVo.equipmentIdList != null and equipmentElectricStatisticalVo.equipmentIdList.size() > 0">
+ AND equipmentID IN
+ <foreach collection="equipmentElectricStatisticalVo.equipmentIdList" index="index" item="id" open="(" separator="," close=")">
+ #{id}
+ </foreach>
+ </if>
+ </where>
+ ORDER BY id ASC
+ </select>
+
+ <select id="list" resultType="org.jeecg.modules.mdc.entity.EquipmentElectricStatistical">
+ SELECT
+ *
+ FROM
+ equipment_electric_statistical
+ <where>
+ <if test="equipmentElectricStatisticalVo.equipmentId != null and equipmentElectricStatisticalVo.equipmentId != ''">
+ AND equipmentID LIKE CONCAT(CONCAT('%',#{equipmentElectricStatisticalVo.equipmentId}),'%')
+ </if>
+ <if test="equipmentElectricStatisticalVo.equipmentName != null and equipmentElectricStatisticalVo.equipmentName != ''">
+ AND equipmentName LIKE CONCAT(CONCAT('%',#{equipmentElectricStatisticalVo.equipmentName}),'%')
+ </if>
+ <if test="equipmentElectricStatisticalVo.axistype != null and equipmentElectricStatisticalVo.axistype != ''">
+ AND axisType = #{equipmentElectricStatisticalVo.axistype}
+ </if>
+ <if test="equipmentElectricStatisticalVo.createDate != null and equipmentElectricStatisticalVo.createDate != ''">
+ AND createDate = #{equipmentElectricStatisticalVo.createDate}
+ </if>
+ <if test="equipmentElectricStatisticalVo.equipmentIdList != null and equipmentElectricStatisticalVo.equipmentIdList.size() > 0">
+ AND equipmentID IN
+ <foreach collection="equipmentElectricStatisticalVo.equipmentIdList" index="index" item="id" open="(" separator="," close=")">
+ #{id}
+ </foreach>
+ </if>
+ </where>
+ ORDER BY id ASC
+ </select>
+
+ <select id="getElectricValue" resultType="org.jeecg.modules.mdc.dto.EquipmentElectricStatisticalDto">
+ SELECT
+ *
+ FROM
+ equipment_electric_statistical
+ <where>
+ <if test="equipmentElectricStatisticalVo.equipmentId != null and equipmentElectricStatisticalVo.equipmentId != ''">
+ AND equipmentID LIKE CONCAT(CONCAT('%',#{equipmentElectricStatisticalVo.equipmentId}),'%')
+ </if>
+ <if test="equipmentElectricStatisticalVo.equipmentName != null and equipmentElectricStatisticalVo.equipmentName != ''">
+ AND equipmentName LIKE CONCAT(CONCAT('%',#{equipmentElectricStatisticalVo.equipmentName}),'%')
+ </if>
+ <if test="equipmentElectricStatisticalVo.axistype != null and equipmentElectricStatisticalVo.axistype != ''">
+ AND axisType = #{equipmentElectricStatisticalVo.axistype}
+ </if>
+ <if test="equipmentElectricStatisticalVo.startDate != null and equipmentElectricStatisticalVo.startDate != '' and equipmentElectricStatisticalVo.endDate != null and equipmentElectricStatisticalVo.endDate != ''">
+ AND createDate BETWEEN #{equipmentElectricStatisticalVo.startDate} AND #{ equipmentElectricStatisticalVo.endDate }
+ </if>
+ <if test="equipmentElectricStatisticalVo.equipmentIdList != null and equipmentElectricStatisticalVo.equipmentIdList.size() > 0">
+ AND equipmentID IN
+ <foreach collection="equipmentElectricStatisticalVo.equipmentIdList" index="index" item="id" open="(" separator="," close=")">
+ #{id}
+ </foreach>
+ </if>
+ </where>
+ ORDER BY id ASC
+ </select>
+</mapper>
\ No newline at end of file
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/EquipmentSpindleStatisticalMapper.xml b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/EquipmentSpindleStatisticalMapper.xml
new file mode 100644
index 0000000..2623242
--- /dev/null
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/EquipmentSpindleStatisticalMapper.xml
@@ -0,0 +1,54 @@
+<?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="org.jeecg.modules.mdc.mapper.EquipmentSpindleStatisticalMapper">
+
+ <select id="pageList" resultType="org.jeecg.modules.mdc.entity.EquipmentSpindleStatistical">
+ SELECT
+ *
+ FROM
+ equipment_spindle_statistical
+ <where>
+ <if test="equipmentSpindleStatisticalVo.equipmentId != null and equipmentSpindleStatisticalVo.equipmentId != ''">
+ AND equipmentID LIKE CONCAT(CONCAT('%',#{equipmentSpindleStatisticalVo.equipmentId}),'%')
+ </if>
+ <if test="equipmentSpindleStatisticalVo.equipmentName != null and equipmentSpindleStatisticalVo.equipmentName != ''">
+ AND equipmentName LIKE CONCAT(CONCAT('%',#{equipmentSpindleStatisticalVo.equipmentName}),'%')
+ </if>
+ <if test="equipmentSpindleStatisticalVo.createDate != null and equipmentSpindleStatisticalVo.createDate != ''">
+ AND createDate = #{equipmentSpindleStatisticalVo.createDate}
+ </if>
+ <if test="equipmentSpindleStatisticalVo.equipmentIdList != null and equipmentSpindleStatisticalVo.equipmentIdList.size() > 0">
+ AND equipmentID IN
+ <foreach collection="equipmentSpindleStatisticalVo.equipmentIdList" index="index" item="id" open="(" separator="," close=")">
+ #{id}
+ </foreach>
+ </if>
+ </where>
+ ORDER BY id ASC
+ </select>
+
+ <select id="list" resultType="org.jeecg.modules.mdc.entity.EquipmentSpindleStatistical">
+ SELECT
+ *
+ FROM
+ equipment_spindle_statistical
+ <where>
+ <if test="equipmentSpindleStatisticalVo.equipmentId != null and equipmentSpindleStatisticalVo.equipmentId != ''">
+ AND equipmentID LIKE CONCAT(CONCAT('%',#{equipmentSpindleStatisticalVo.equipmentId}),'%')
+ </if>
+ <if test="equipmentSpindleStatisticalVo.equipmentName != null and equipmentSpindleStatisticalVo.equipmentName != ''">
+ AND equipmentName LIKE CONCAT(CONCAT('%',#{equipmentSpindleStatisticalVo.equipmentName}),'%')
+ </if>
+ <if test="equipmentSpindleStatisticalVo.createDate != null and equipmentSpindleStatisticalVo.createDate != ''">
+ AND createDate = #{equipmentSpindleStatisticalVo.createDate}
+ </if>
+ <if test="equipmentSpindleStatisticalVo.equipmentIdList != null and equipmentSpindleStatisticalVo.equipmentIdList.size() > 0">
+ AND equipmentID IN
+ <foreach collection="equipmentSpindleStatisticalVo.equipmentIdList" index="index" item="id" open="(" separator="," close=")">
+ #{id}
+ </foreach>
+ </if>
+ </where>
+ ORDER BY id ASC
+ </select>
+</mapper>
\ No newline at end of file
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IEquipmentElectricStatisticalService.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IEquipmentElectricStatisticalService.java
new file mode 100644
index 0000000..560d898
--- /dev/null
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IEquipmentElectricStatisticalService.java
@@ -0,0 +1,50 @@
+package org.jeecg.modules.mdc.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.mdc.dto.EquipmentElectricStatisticalDto;
+import org.jeecg.modules.mdc.entity.EquipmentElectricStatistical;
+import org.jeecg.modules.mdc.vo.EquipmentElectricStatisticalVo;
+import org.springframework.web.servlet.ModelAndView;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.List;
+
+/**
+ * @Description: 璁惧鐢垫祦缁熻
+ * @Author: lius
+ * @Date: 2024-07-16
+ * @Version: V1.0
+ */
+public interface IEquipmentElectricStatisticalService extends IService<EquipmentElectricStatistical> {
+
+ /**
+ * 鍒嗛〉鍒楄〃
+ *
+ * @param userId
+ * @param page
+ * @param equipmentElectricStatisticalVo
+ * @param req
+ * @return
+ */
+ IPage<EquipmentElectricStatistical> pageList(String userId, Page<EquipmentElectricStatistical> page, EquipmentElectricStatisticalVo equipmentElectricStatisticalVo, HttpServletRequest req);
+
+ /**
+ * 瀵煎嚭
+ *
+ * @param userId
+ * @param equipmentElectricStatisticalVo
+ * @return
+ */
+ ModelAndView exportXls(String userId, EquipmentElectricStatisticalVo equipmentElectricStatisticalVo);
+
+ /**
+ * 鐢垫祦璐熻浇瀵规瘮
+ *
+ * @param userId
+ * @param equipmentElectricStatisticalVo
+ * @return
+ */
+ List<EquipmentElectricStatisticalDto> getElectricValue(String userId, EquipmentElectricStatisticalVo equipmentElectricStatisticalVo);
+}
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IEquipmentSpindleStatisticalService.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IEquipmentSpindleStatisticalService.java
new file mode 100644
index 0000000..3673cd3
--- /dev/null
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IEquipmentSpindleStatisticalService.java
@@ -0,0 +1,39 @@
+package org.jeecg.modules.mdc.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.mdc.entity.EquipmentSpindleStatistical;
+import org.jeecg.modules.mdc.vo.EquipmentSpindleStatisticalVo;
+import org.springframework.web.servlet.ModelAndView;
+
+import javax.servlet.http.HttpServletRequest;
+
+/**
+ * @Description: 璁惧璐熻浇
+ * @Author: lius
+ * @Date: 2024-07-16
+ * @Version: V1.0
+ */
+public interface IEquipmentSpindleStatisticalService extends IService<EquipmentSpindleStatistical> {
+
+ /**
+ * 鍒嗛〉鍒楄〃
+ *
+ * @param userId
+ * @param page
+ * @param equipmentSpindleStatisticalVo
+ * @param req
+ * @return
+ */
+ IPage<EquipmentSpindleStatistical> pageList(String userId, Page<EquipmentSpindleStatistical> page, EquipmentSpindleStatisticalVo equipmentSpindleStatisticalVo, HttpServletRequest req);
+
+ /**
+ * 瀵煎嚭
+ *
+ * @param userId
+ * @param equipmentSpindleStatisticalVo
+ * @return
+ */
+ ModelAndView exportXls(String userId, EquipmentSpindleStatisticalVo equipmentSpindleStatisticalVo);
+}
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/EquipmentElectricStatisticalServiceImpl.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/EquipmentElectricStatisticalServiceImpl.java
new file mode 100644
index 0000000..73f1ded
--- /dev/null
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/EquipmentElectricStatisticalServiceImpl.java
@@ -0,0 +1,141 @@
+package org.jeecg.modules.mdc.service.impl;
+
+import cn.hutool.core.date.DateUtil;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.apache.commons.lang.StringUtils;
+import org.apache.shiro.SecurityUtils;
+import org.jeecg.common.system.vo.LoginUser;
+import org.jeecg.modules.mdc.dto.EquipmentAlarmDto;
+import org.jeecg.modules.mdc.dto.EquipmentElectricStatisticalDto;
+import org.jeecg.modules.mdc.entity.EquipmentElectricStatistical;
+import org.jeecg.modules.mdc.mapper.EquipmentElectricStatisticalMapper;
+import org.jeecg.modules.mdc.service.IEquipmentElectricStatisticalService;
+import org.jeecg.modules.mdc.service.IMdcEquipmentService;
+import org.jeecg.modules.mdc.util.DateUtils;
+import org.jeecg.modules.mdc.vo.EquipmentElectricStatisticalVo;
+import org.jeecgframework.poi.excel.def.NormalExcelConstants;
+import org.jeecgframework.poi.excel.entity.ExportParams;
+import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
+import org.springframework.stereotype.Service;
+import org.springframework.web.servlet.ModelAndView;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * @Description: 璁惧鐢垫祦缁熻
+ * @Author: jeecg-boot
+ * @Date: 2024-07-16
+ * @Version: V1.0
+ */
+@Service
+public class EquipmentElectricStatisticalServiceImpl extends ServiceImpl<EquipmentElectricStatisticalMapper, EquipmentElectricStatistical> implements IEquipmentElectricStatisticalService {
+
+ @Resource
+ private IMdcEquipmentService mdcEquipmentService;
+
+ @Override
+ public IPage<EquipmentElectricStatistical> pageList(String userId, Page<EquipmentElectricStatistical> page, EquipmentElectricStatisticalVo equipmentElectricStatisticalVo, HttpServletRequest req) {
+ List<String> equipmentIds = new ArrayList<>();
+ if (StringUtils.isNotEmpty(equipmentElectricStatisticalVo.getParentId()) && StringUtils.isEmpty(equipmentElectricStatisticalVo.getEquipmentId())) {
+ if ("2".equals(equipmentElectricStatisticalVo.getTypeTree())) {
+ //閮ㄩ棬灞傜骇
+ equipmentIds = mdcEquipmentService.getEquipmentIdsByDepart(userId, equipmentElectricStatisticalVo.getParentId());
+ } else {
+ //浜х嚎灞傜骇
+ equipmentIds = mdcEquipmentService.getEquipmentIdsProduction(userId, equipmentElectricStatisticalVo.getParentId());
+ }
+ } else if (StringUtils.isNotEmpty(equipmentElectricStatisticalVo.getEquipmentId())) {
+ //鍗曞彴璁惧淇℃伅
+ equipmentElectricStatisticalVo.setEquipmentIdList(Collections.singletonList(equipmentElectricStatisticalVo.getEquipmentId()));
+ } else {
+ //鏌ヨ鐢ㄦ埛鎷ユ湁鐨勬墍鏈夎澶囦俊鎭�
+ if ("2".equals(equipmentElectricStatisticalVo.getTypeTree())) {
+ //閮ㄩ棬灞傜骇
+ equipmentIds = mdcEquipmentService.getEquipmentIdsByDepart(userId, null);
+ } else {
+ //浜х嚎灞傜骇
+ equipmentIds = mdcEquipmentService.getEquipmentIdsProduction(userId, null);
+ }
+ }
+
+ if (equipmentElectricStatisticalVo.getEquipmentIdList() == null || equipmentElectricStatisticalVo.getEquipmentIdList().isEmpty()) {
+ equipmentElectricStatisticalVo.setEquipmentIdList(equipmentIds);
+ }
+
+ if (equipmentElectricStatisticalVo.getEquipmentIdList() == null || equipmentElectricStatisticalVo.getEquipmentIdList().isEmpty()) {
+ return null;
+ }
+ return this.baseMapper.pageList(page, equipmentElectricStatisticalVo);
+ }
+
+ @Override
+ public ModelAndView exportXls(String userId, EquipmentElectricStatisticalVo equipmentElectricStatisticalVo) {
+ List<String> equipmentIds = new ArrayList<>();
+ if (StringUtils.isNotEmpty(equipmentElectricStatisticalVo.getParentId()) && StringUtils.isEmpty(equipmentElectricStatisticalVo.getEquipmentId())) {
+ if ("2".equals(equipmentElectricStatisticalVo.getTypeTree())) {
+ //閮ㄩ棬灞傜骇
+ equipmentIds = mdcEquipmentService.getEquipmentIdsByDepart(userId, equipmentElectricStatisticalVo.getParentId());
+ } else {
+ //浜х嚎灞傜骇
+ equipmentIds = mdcEquipmentService.getEquipmentIdsProduction(userId, equipmentElectricStatisticalVo.getParentId());
+ }
+ } else if (StringUtils.isNotEmpty(equipmentElectricStatisticalVo.getEquipmentId())) {
+ //鍗曞彴璁惧淇℃伅
+ equipmentElectricStatisticalVo.setEquipmentIdList(Collections.singletonList(equipmentElectricStatisticalVo.getEquipmentId()));
+ } else {
+ //鏌ヨ鐢ㄦ埛鎷ユ湁鐨勬墍鏈夎澶囦俊鎭�
+ if ("2".equals(equipmentElectricStatisticalVo.getTypeTree())) {
+ //閮ㄩ棬灞傜骇
+ equipmentIds = mdcEquipmentService.getEquipmentIdsByDepart(userId, null);
+ } else {
+ //浜х嚎灞傜骇
+ equipmentIds = mdcEquipmentService.getEquipmentIdsProduction(userId, null);
+ }
+ }
+
+ if (equipmentElectricStatisticalVo.getEquipmentIdList() == null || equipmentElectricStatisticalVo.getEquipmentIdList().isEmpty()) {
+ equipmentElectricStatisticalVo.setEquipmentIdList(equipmentIds);
+ }
+
+ if (equipmentElectricStatisticalVo.getEquipmentIdList() == null || equipmentElectricStatisticalVo.getEquipmentIdList().isEmpty()) {
+ return null;
+ }
+ // Step.2 AutoPoi 瀵煎嚭Excel
+ ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
+ List<EquipmentElectricStatistical> equipmentElectricStatisticals = this.baseMapper.list(equipmentElectricStatisticalVo);
+ // 瀵煎嚭鏂囦欢鍚嶇О
+ mv.addObject(NormalExcelConstants.FILE_NAME, "璁惧鐢垫祦缁熻鍒楄〃");
+ mv.addObject(NormalExcelConstants.CLASS, EquipmentElectricStatistical.class);
+ //鑾峰彇褰撳墠鐧诲綍鐢ㄦ埛
+ //update-begin---author:wangshuai ---date:20211227 for锛歔JTC-116]瀵煎嚭浜哄啓姝讳簡------------
+ LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+ mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("璁惧鐢垫祦缁熻鍒楄〃鏁版嵁", "瀵煎嚭浜�:" + user.getRealname(), "璁惧鐢垫祦缁熻"));
+ //update-end---author:wangshuai ---date:20211227 for锛歔JTC-116]瀵煎嚭浜哄啓姝讳簡------------
+ mv.addObject(NormalExcelConstants.DATA_LIST, equipmentElectricStatisticals);
+ return mv;
+ }
+
+ /**
+ * 鐢垫祦璐熻浇瀵规瘮
+ *
+ * @param userId
+ * @param equipmentElectricStatisticalVo
+ * @return
+ */
+ @Override
+ public List<EquipmentElectricStatisticalDto> getElectricValue(String userId, EquipmentElectricStatisticalVo equipmentElectricStatisticalVo) {
+ List<EquipmentElectricStatisticalDto> equipmentElectricStatisticals = this.baseMapper.getElectricValue(equipmentElectricStatisticalVo);
+ if (equipmentElectricStatisticals != null && !equipmentElectricStatisticals.isEmpty()) {
+ for (EquipmentElectricStatisticalDto equipmentElectricStatistical : equipmentElectricStatisticals) {
+ equipmentElectricStatistical.setDayDate(DateUtils.format(equipmentElectricStatistical.getCreatedate(), DateUtils.STR_DATE));
+ }
+ }
+ return equipmentElectricStatisticals;
+ }
+}
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/EquipmentSpindleStatisticalServiceImpl.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/EquipmentSpindleStatisticalServiceImpl.java
new file mode 100644
index 0000000..854377f
--- /dev/null
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/EquipmentSpindleStatisticalServiceImpl.java
@@ -0,0 +1,136 @@
+package org.jeecg.modules.mdc.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 org.apache.commons.lang.StringUtils;
+import org.apache.shiro.SecurityUtils;
+import org.jeecg.common.system.vo.LoginUser;
+import org.jeecg.modules.mdc.entity.EquipmentElectricStatistical;
+import org.jeecg.modules.mdc.entity.EquipmentSpindleStatistical;
+import org.jeecg.modules.mdc.mapper.EquipmentSpindleStatisticalMapper;
+import org.jeecg.modules.mdc.service.IEquipmentSpindleStatisticalService;
+import org.jeecg.modules.mdc.service.IMdcEquipmentService;
+import org.jeecg.modules.mdc.vo.EquipmentSpindleStatisticalVo;
+import org.jeecgframework.poi.excel.def.NormalExcelConstants;
+import org.jeecgframework.poi.excel.entity.ExportParams;
+import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
+import org.springframework.stereotype.Service;
+import org.springframework.web.servlet.ModelAndView;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * @Description: 璁惧璐熻浇
+ * @Author: lius
+ * @Date: 2024-07-16
+ * @Version: V1.0
+ */
+@Service
+public class EquipmentSpindleStatisticalServiceImpl extends ServiceImpl<EquipmentSpindleStatisticalMapper, EquipmentSpindleStatistical> implements IEquipmentSpindleStatisticalService {
+
+ @Resource
+ private IMdcEquipmentService mdcEquipmentService;
+
+ /**
+ * 鍒嗛〉鍒楄〃
+ *
+ * @param userId
+ * @param page
+ * @param equipmentSpindleStatisticalVo
+ * @param req
+ * @return
+ */
+ @Override
+ public IPage<EquipmentSpindleStatistical> pageList(String userId, Page<EquipmentSpindleStatistical> page, EquipmentSpindleStatisticalVo equipmentSpindleStatisticalVo, HttpServletRequest req) {
+ List<String> equipmentIds = new ArrayList<>();
+ if (StringUtils.isNotEmpty(equipmentSpindleStatisticalVo.getParentId()) && StringUtils.isEmpty(equipmentSpindleStatisticalVo.getEquipmentId())) {
+ if ("2".equals(equipmentSpindleStatisticalVo.getTypeTree())) {
+ //閮ㄩ棬灞傜骇
+ equipmentIds = mdcEquipmentService.getEquipmentIdsByDepart(userId, equipmentSpindleStatisticalVo.getParentId());
+ } else {
+ //浜х嚎灞傜骇
+ equipmentIds = mdcEquipmentService.getEquipmentIdsProduction(userId, equipmentSpindleStatisticalVo.getParentId());
+ }
+ } else if (StringUtils.isNotEmpty(equipmentSpindleStatisticalVo.getEquipmentId())) {
+ //鍗曞彴璁惧淇℃伅
+ equipmentSpindleStatisticalVo.setEquipmentIdList(Collections.singletonList(equipmentSpindleStatisticalVo.getEquipmentId()));
+ } else {
+ //鏌ヨ鐢ㄦ埛鎷ユ湁鐨勬墍鏈夎澶囦俊鎭�
+ if ("2".equals(equipmentSpindleStatisticalVo.getTypeTree())) {
+ //閮ㄩ棬灞傜骇
+ equipmentIds = mdcEquipmentService.getEquipmentIdsByDepart(userId, null);
+ } else {
+ //浜х嚎灞傜骇
+ equipmentIds = mdcEquipmentService.getEquipmentIdsProduction(userId, null);
+ }
+ }
+
+ if (equipmentSpindleStatisticalVo.getEquipmentIdList() == null || equipmentSpindleStatisticalVo.getEquipmentIdList().isEmpty()) {
+ equipmentSpindleStatisticalVo.setEquipmentIdList(equipmentIds);
+ }
+
+ if (equipmentSpindleStatisticalVo.getEquipmentIdList() == null || equipmentSpindleStatisticalVo.getEquipmentIdList().isEmpty()) {
+ return null;
+ }
+ return this.baseMapper.pageList(page, equipmentSpindleStatisticalVo);
+ }
+
+ /**
+ * 瀵煎嚭
+ *
+ * @param userId
+ * @param equipmentSpindleStatisticalVo
+ * @return
+ */
+ @Override
+ public ModelAndView exportXls(String userId, EquipmentSpindleStatisticalVo equipmentSpindleStatisticalVo) {
+ List<String> equipmentIds = new ArrayList<>();
+ if (StringUtils.isNotEmpty(equipmentSpindleStatisticalVo.getParentId()) && StringUtils.isEmpty(equipmentSpindleStatisticalVo.getEquipmentId())) {
+ if ("2".equals(equipmentSpindleStatisticalVo.getTypeTree())) {
+ //閮ㄩ棬灞傜骇
+ equipmentIds = mdcEquipmentService.getEquipmentIdsByDepart(userId, equipmentSpindleStatisticalVo.getParentId());
+ } else {
+ //浜х嚎灞傜骇
+ equipmentIds = mdcEquipmentService.getEquipmentIdsProduction(userId, equipmentSpindleStatisticalVo.getParentId());
+ }
+ } else if (StringUtils.isNotEmpty(equipmentSpindleStatisticalVo.getEquipmentId())) {
+ //鍗曞彴璁惧淇℃伅
+ equipmentSpindleStatisticalVo.setEquipmentIdList(Collections.singletonList(equipmentSpindleStatisticalVo.getEquipmentId()));
+ } else {
+ //鏌ヨ鐢ㄦ埛鎷ユ湁鐨勬墍鏈夎澶囦俊鎭�
+ if ("2".equals(equipmentSpindleStatisticalVo.getTypeTree())) {
+ //閮ㄩ棬灞傜骇
+ equipmentIds = mdcEquipmentService.getEquipmentIdsByDepart(userId, null);
+ } else {
+ //浜х嚎灞傜骇
+ equipmentIds = mdcEquipmentService.getEquipmentIdsProduction(userId, null);
+ }
+ }
+
+ if (equipmentSpindleStatisticalVo.getEquipmentIdList() == null || equipmentSpindleStatisticalVo.getEquipmentIdList().isEmpty()) {
+ equipmentSpindleStatisticalVo.setEquipmentIdList(equipmentIds);
+ }
+
+ if (equipmentSpindleStatisticalVo.getEquipmentIdList() == null || equipmentSpindleStatisticalVo.getEquipmentIdList().isEmpty()) {
+ return null;
+ }
+ // Step.2 AutoPoi 瀵煎嚭Excel
+ ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
+ List<EquipmentSpindleStatistical> equipmentSpindleStatisticals = this.baseMapper.list(equipmentSpindleStatisticalVo);
+ // 瀵煎嚭鏂囦欢鍚嶇О
+ mv.addObject(NormalExcelConstants.FILE_NAME, "璁惧璐熻浇鍒楄〃");
+ mv.addObject(NormalExcelConstants.CLASS, EquipmentSpindleStatistical.class);
+ //鑾峰彇褰撳墠鐧诲綍鐢ㄦ埛
+ //update-begin---author:wangshuai ---date:20211227 for锛歔JTC-116]瀵煎嚭浜哄啓姝讳簡------------
+ LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+ mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("璁惧璐熻浇鍒楄〃鏁版嵁", "瀵煎嚭浜�:" + user.getRealname(), "璁惧璐熻浇"));
+ //update-end---author:wangshuai ---date:20211227 for锛歔JTC-116]瀵煎嚭浜哄啓姝讳簡------------
+ mv.addObject(NormalExcelConstants.DATA_LIST, equipmentSpindleStatisticals);
+ return mv;
+ }
+}
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/vo/EquipmentElectricStatisticalVo.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/vo/EquipmentElectricStatisticalVo.java
new file mode 100644
index 0000000..96bfcd5
--- /dev/null
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/vo/EquipmentElectricStatisticalVo.java
@@ -0,0 +1,59 @@
+package org.jeecg.modules.mdc.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author Lius
+ * @date 2024/7/16 10:40
+ */
+@Data
+public class EquipmentElectricStatisticalVo {
+ /**
+ * 鏃ユ湡 -> yyyy-MM-dd
+ */
+ @ApiModelProperty(value = "鏃ユ湡(yyyy-MM-dd)")
+ private String createDate;
+ /**
+ * 寮�濮嬫棩鏈� -> yyyy-MM-dd
+ */
+ @ApiModelProperty(value = "鏃ユ湡(yyyy-MM-dd)")
+ private String startDate;
+ /**
+ * 缁撴潫鏃ユ湡 -> yyyy-MM-dd
+ */
+ @ApiModelProperty(value = "鏃ユ湡(yyyy-MM-dd)")
+ private String endDate;
+ /**
+ * 鍧愭爣绫诲瀷 1,X;2,Y;3,Z;4,A;5,B;
+ */
+ @ApiModelProperty(value = "鍧愭爣绫诲瀷 1,X;2,Y;3,Z;4,A;5,B;")
+ private Integer axistype;
+ /**
+ * 鏍戠被鍨� -> 1:杞﹂棿灞傜骇 2:閮ㄩ棬灞傜骇
+ */
+ @ApiModelProperty(value = "鏍戠被鍨�")
+ private String typeTree;
+ /**
+ * 灞傜骇ID
+ */
+ @ApiModelProperty(value = "灞傜骇ID")
+ private String parentId;
+ /**
+ * 璁惧Id
+ */
+ @ApiModelProperty(value = "璁惧Id")
+ private String equipmentId;
+ /**
+ * 璁惧Id
+ */
+ @ApiModelProperty(value = "璁惧鍚嶇О")
+ private String equipmentName;
+ /**
+ * 璁惧ids
+ */
+ @ApiModelProperty(value = "璁惧ids")
+ private List<String> equipmentIdList;
+}
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/vo/EquipmentSpindleStatisticalVo.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/vo/EquipmentSpindleStatisticalVo.java
new file mode 100644
index 0000000..928efd9
--- /dev/null
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/vo/EquipmentSpindleStatisticalVo.java
@@ -0,0 +1,44 @@
+package org.jeecg.modules.mdc.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author Lius
+ * @date 2024/7/16 14:42
+ */
+@Data
+public class EquipmentSpindleStatisticalVo {
+ /**
+ * 鏃ユ湡 -> yyyy-MM-dd
+ */
+ @ApiModelProperty(value = "鏃ユ湡(yyyy-MM-dd)")
+ private String createDate;
+ /**
+ * 鏍戠被鍨� -> 1:杞﹂棿灞傜骇 2:閮ㄩ棬灞傜骇
+ */
+ @ApiModelProperty(value = "鏍戠被鍨�")
+ private String typeTree;
+ /**
+ * 灞傜骇ID
+ */
+ @ApiModelProperty(value = "灞傜骇ID")
+ private String parentId;
+ /**
+ * 璁惧Id
+ */
+ @ApiModelProperty(value = "璁惧Id")
+ private String equipmentId;
+ /**
+ * 璁惧Id
+ */
+ @ApiModelProperty(value = "璁惧鍚嶇О")
+ private String equipmentName;
+ /**
+ * 璁惧ids
+ */
+ @ApiModelProperty(value = "璁惧ids")
+ private List<String> equipmentIdList;
+}
--
Gitblit v1.9.3