opensource/RuoYi-Vue-Plus
2
0
Fork 1
mirror of https://gitee.com/dromara/RuoYi-Vue-Plus.git synced 2026-09-19 01:48:47 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

统计命名优化

Browse Source
This commit is contained in:
zhangzhicheng 2024-08-22 16:18:12 +08:00
parent 089216bf58
commit a294cfb859
5 changed files with 9 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
ruoyi-admin/src/main/java/org/dromara/web/controller/show/EqShowEquipmentLogController.java
View File

@ -1,24 +1,14 @@
package org.dromara.web.controller.show;
import java.util.List;
import lombok.RequiredArgsConstructor;
import jakarta.servlet.http.HttpServletResponse;
import jakarta.validation.constraints.*;
import cn.dev33.satoken.annotation.SaCheckPermission;
import org.dromara.web.domain.vo.EqEquipmentStatisticsVo;
import org.dromara.web.service.IEqEquipmentService;
import org.springframework.web.bind.annotation.*;
import org.springframework.validation.annotation.Validated;
import org.dromara.common.idempotent.annotation.RepeatSubmit;
import org.dromara.common.log.annotation.Log;
import org.dromara.common.web.core.BaseController;
import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.core.domain.R;
import org.dromara.common.core.validate.AddGroup;
import org.dromara.common.core.validate.EditGroup;
import org.dromara.common.log.enums.BusinessType;
import org.dromara.common.excel.utils.ExcelUtil;
import org.dromara.web.domain.vo.EqEquipmentLogVo;
import org.dromara.web.domain.bo.EqEquipmentLogBo;
import org.dromara.web.service.IEqEquipmentLogService;
@ -53,10 +43,10 @@ public class EqShowEquipmentLogController extends BaseController {
/**
* 设备类型统计
*/
@SaCheckPermission("device:showEquipmentLog:list")
@GetMapping("/statisticEquipmentList")
public R<EqEquipmentStatisticsVo> statisticEquipmentList(Integer type, String startTime, String endTime) {
return R.ok(eqEquipmentService.statisticEquipmentList(type,startTime,endTime));
// @SaCheckPermission("device:showEquipmentLog:list")
@GetMapping("/selectEquipmentStatistic")
public R<EqEquipmentStatisticsVo> selectEquipmentStatistic(Integer type, String startTime, String endTime) {
return R.ok(eqEquipmentService.selectEquipmentStatistic(type,startTime,endTime));
}

5
ruoyi-admin/src/main/java/org/dromara/web/mapper/EqEquipmentMapper.java
View File

@ -2,15 +2,12 @@ package org.dromara.web.mapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.web.domain.EqEquipment;
import org.dromara.web.domain.vo.EqEquipmentStatisticsVo;
import org.dromara.web.domain.vo.EqEquipmentVo;
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
import org.dromara.web.domain.vo.EqUserEquipmentVo;
import java.util.List;
/**
* 设备信息Mapper接口
*
@ -26,5 +23,5 @@ public interface EqEquipmentMapper extends BaseMapperPlus<EqEquipment, EqEquipme
* @param type
* @return
*/
EqEquipmentStatisticsVo selectStatisticEquipmentList(Integer type, String startTime, String endTime);
EqEquipmentStatisticsVo selectEquipmentStatistic(Integer type, String startTime, String endTime);
}

2
ruoyi-admin/src/main/java/org/dromara/web/service/IEqEquipmentService.java
View File

@ -105,5 +105,5 @@ public interface IEqEquipmentService {
* @param type
* @return
*/
EqEquipmentStatisticsVo statisticEquipmentList(Integer type, String startTime, String endTime);
EqEquipmentStatisticsVo selectEquipmentStatistic(Integer type, String startTime, String endTime);
}

5
ruoyi-admin/src/main/java/org/dromara/web/service/impl/EqEquipmentServiceImpl.java
View File

@ -1,7 +1,6 @@
package org.dromara.web.service.impl;
import cn.hutool.core.collection.CollUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.dromara.common.core.utils.MapstructUtils;
import org.dromara.common.core.utils.MessageUtils;
@ -329,8 +328,8 @@ public class EqEquipmentServiceImpl implements IEqEquipmentService {
}
@Override
public EqEquipmentStatisticsVo statisticEquipmentList(Integer type, String startTime, String endTime) {
EqEquipmentStatisticsVo result = baseMapper.selectStatisticEquipmentList(type, startTime, endTime);
public EqEquipmentStatisticsVo selectEquipmentStatistic(Integer type, String startTime, String endTime) {
EqEquipmentStatisticsVo result = baseMapper.selectEquipmentStatistic(type, startTime, endTime);
result.setType(type);
return result;
}

2
ruoyi-admin/src/main/resources/mapper/device/EqEquipmentMapper.xml
View File

@ -47,7 +47,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
e.user_id,e.user_name, s.nick_name
</select>
<select id="selectStatisticEquipmentList" resultType="org.dromara.web.domain.vo.EqEquipmentStatisticsVo">
<select id="selectEquipmentStatistic" resultType="org.dromara.web.domain.vo.EqEquipmentStatisticsVo">
SELECT
COUNT(*) AS bind_num, -- 设备总数
SUM(CASE WHEN line_status = 0 THEN 1 ELSE 0 END) AS offline_num, -- 离线个数