Merge branch 'master' of http://117.34.109.166:18448/r/mdc_yituo

yangbin

2024-07-29 6d08eec100243e0be59a207d57ab4db7974e51e4

Merge branch 'master' of http://117.34.109.166:18448/r/mdc_yituo

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


}

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

}

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

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

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

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

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

}

 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>

 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>

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

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

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

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

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

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