admin/wisdomisite-java
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

bug修复

Browse Source
This commit is contained in:
guo 2024-01-26 19:00:45 +08:00
parent 39c6041cc6
commit 05d043ad54
8 changed files with 59 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/zhgd/xmgl/modules/discharging/controller/DischargingPlatformCurrentDataController.java
View File

@ -138,7 +138,7 @@ public class DischargingPlatformCurrentDataController {
return Result.success(dischargingPlatformCurrentDataService.countLoadRatioTrend(paramMap));
}
@ApiOperation(value = "统计卸料平台", notes = "统计卸料平台", httpMethod = "POST")
@ApiOperation(value = "统计卸料平台数量", notes = "统计卸料平台数量", httpMethod = "POST")
@ApiImplicitParams({
@ApiImplicitParam(name = "projectSn", value = "项目sn", paramType = "body", required = true, dataType = "String"),
@ApiImplicitParam(name = "devSn", value = "塔机设备编号", paramType = "body", required = false, dataType = "String"),

12
src/main/java/com/zhgd/xmgl/modules/discharging/controller/DischargingPlatformDevController.java
View File

@ -5,6 +5,7 @@ import com.zhgd.annotation.OperLog;
import com.zhgd.jeecg.common.api.vo.Result;
import com.zhgd.jeecg.common.mybatis.EntityMap;
import com.zhgd.xmgl.modules.discharging.entity.DischargingPlatformDev;
import com.zhgd.xmgl.modules.discharging.entity.vo.CountDischargingPlatformDevVo;
import com.zhgd.xmgl.modules.discharging.service.IDischargingPlatformDevService;
import com.zhgd.xmgl.util.MessageUtil;
import io.swagger.annotations.*;
@ -12,8 +13,10 @@ import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections.MapUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import springfox.documentation.annotations.ApiIgnore;
import javax.servlet.http.HttpServletRequest;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@ -137,5 +140,12 @@ public class DischargingPlatformDevController {
return result;
}
@ApiOperation(value = "统计卸料平台", notes = "统计卸料平台", httpMethod = "POST")
@ApiImplicitParams({
@ApiImplicitParam(name = "projectSn", value = "项目sn", paramType = "body", required = true, dataType = "String"),
})
@PostMapping(value = "/countDischargingPlatformDev")
public Result<CountDischargingPlatformDevVo> countDischargingPlatformDev(@ApiIgnore @RequestBody HashMap<String, Object> paramMap) {
return Result.success(dischargingPlatformDevService.countDischargingPlatformDev(paramMap));
}
}

12
src/main/java/com/zhgd/xmgl/modules/discharging/entity/vo/CountDischargingPlatformDevVo.java Normal file
View File

@ -0,0 +1,12 @@
package com.zhgd.xmgl.modules.discharging.entity.vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
public class CountDischargingPlatformDevVo {
@ApiModelProperty(value = "正常设备数量")
private Integer normalNum;
@ApiModelProperty(value = "告警设备数量")
private Integer alarmNum;
}

2
src/main/java/com/zhgd/xmgl/modules/discharging/mapper/DischargingPlatformAlarmMapper.java
View File

@ -41,4 +41,6 @@ public interface DischargingPlatformAlarmMapper extends BaseMapper<DischargingPl
List<SectorOneVo> countAlarmType(HashMap<String, Object> paramMap);
CountAlarmLevelVo countAlarmLevel(HashMap<String, Object> paramMap);
Integer countAlarmNum(HashMap<String, Object> paramMap);
}

8
src/main/java/com/zhgd/xmgl/modules/discharging/mapper/xml/DischargingPlatformAlarmMapper.xml
View File

@ -116,6 +116,7 @@
<if test="devSn != null and devSn != ''">
and dev_sn = #{devSn}
</if>
and add_time >= current_date
group by alarm_type
order by count desc
</select>
@ -133,4 +134,11 @@
and dev_sn = #{devSn}
</if>
</select>
<select id="countAlarmNum" resultType="java.lang.Integer">
select count(distinct dev_sn) from discharging_platform_alarm
where 1=1
and project_sn = #{projectSn}
and add_time > current_date
</select>
</mapper>

3
src/main/java/com/zhgd/xmgl/modules/discharging/mapper/xml/DischargingPlatformCurrentDataMapper.xml
View File

@ -4,7 +4,8 @@
<select id="getNewestDischargingPlatformCurrentData"
resultType="com.zhgd.xmgl.modules.discharging.entity.DischargingPlatformCurrentData" parameterType="map">
SELECT a.*,ifnull(round(a.loading/dpd.max_load*100,2),0) loadRatio
SELECT a.*,ifnull(round(a.loading/dpd.max_load*100,2),0) loadRatio,(if((select count(*) from
discharging_platform_alarm where currentdata_id=a.id)>0,1,0)) isAlarm
from discharging_platform_current_data a
join discharging_platform_dev dpd on a.dev_sn = dpd.dev_sn and a.project_sn = dpd.project_sn
WHERE a.dev_sn=#{devSn}

4
src/main/java/com/zhgd/xmgl/modules/discharging/service/IDischargingPlatformDevService.java
View File

@ -5,8 +5,10 @@ import com.zhgd.jeecg.common.api.vo.Result;
import com.zhgd.jeecg.common.mybatis.EntityMap;
import com.zhgd.xmgl.modules.discharging.entity.DischargingPlatformDev;
import com.baomidou.mybatisplus.extension.service.IService;
import com.zhgd.xmgl.modules.discharging.entity.vo.CountDischargingPlatformDevVo;
import javax.servlet.http.HttpServletRequest;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@ -27,4 +29,6 @@ public interface IDischargingPlatformDevService extends IService<DischargingPlat
void updateDischargingPlatformCoordinate(List<DischargingPlatformDev> list);
Result<IPage<DischargingPlatformDev>> selectDischargingPlatformDevListByPage(DischargingPlatformDev dischargingPlatformDev, Integer pageNo, Integer pageSize, HttpServletRequest req);
CountDischargingPlatformDevVo countDischargingPlatformDev(HashMap<String, Object> paramMap);
}

21
src/main/java/com/zhgd/xmgl/modules/discharging/service/impl/DischargingPlatformDevServiceImpl.java
View File

@ -1,24 +1,27 @@
package com.zhgd.xmgl.modules.discharging.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.zhgd.jeecg.common.api.vo.Result;
import com.zhgd.jeecg.common.execption.OpenAlertException;
import com.zhgd.jeecg.common.mybatis.EntityMap;
import com.zhgd.jeecg.common.system.query.QueryGenerator;
import com.zhgd.xmgl.modules.discharging.entity.DischargingPlatformDev;
import com.zhgd.xmgl.modules.discharging.entity.vo.CountDischargingPlatformDevVo;
import com.zhgd.xmgl.modules.discharging.mapper.DischargingPlatformAlarmMapper;
import com.zhgd.xmgl.modules.discharging.mapper.DischargingPlatformDevMapper;
import com.zhgd.xmgl.modules.discharging.service.IDischargingPlatformDevService;
import com.zhgd.xmgl.util.MessageUtil;
import org.apache.commons.collections.MapUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.StringUtils;
import javax.servlet.http.HttpServletRequest;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.UUID;
@ -34,6 +37,8 @@ import java.util.UUID;
public class DischargingPlatformDevServiceImpl extends ServiceImpl<DischargingPlatformDevMapper, DischargingPlatformDev> implements IDischargingPlatformDevService {
@Autowired
private DischargingPlatformDevMapper dischargingPlatformDevMapper;
@Autowired
private DischargingPlatformAlarmMapper dischargingPlatformAlarmMapper;
@Override
public List<DischargingPlatformDev> selectDischargingPlatformDevList(Map<String, Object> map) {
@ -83,4 +88,16 @@ public class DischargingPlatformDevServiceImpl extends ServiceImpl<DischargingPl
result.setResult(pageList);
return result;
}
@Override
public CountDischargingPlatformDevVo countDischargingPlatformDev(HashMap<String, Object> paramMap) {
String projectSn = MapUtils.getString(paramMap, "projectSn");
Integer count = dischargingPlatformDevMapper.selectCount(new LambdaQueryWrapper<DischargingPlatformDev>()
.eq(DischargingPlatformDev::getProjectSn, projectSn));
Integer an = dischargingPlatformAlarmMapper.countAlarmNum(paramMap);
CountDischargingPlatformDevVo countDischargingPlatformDevVo = new CountDischargingPlatformDevVo();
countDischargingPlatformDevVo.setNormalNum(count - an);
countDischargingPlatformDevVo.setAlarmNum(an);
return countDischargingPlatformDevVo;
}
}