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 16:03:38 +08:00
parent f59bf0a8b6
commit dfe27308ba
8 changed files with 30 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/zhgd/xmgl/modules/discharging/entity/DischargingPlatformCurrentData.java
View File

@ -96,4 +96,10 @@ public class DischargingPlatformCurrentData implements Serializable {
@TableField(exist = false)
@ApiModelProperty(value = "devName")
private String devName;
@TableField(exist = false)
@ApiModelProperty(value = "1严重2较重3一般")
private Integer status;
}

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

@ -3,7 +3,9 @@
<mapper namespace="com.zhgd.xmgl.modules.discharging.mapper.DischargingPlatformAlarmMapper">
<select id="queryDischargingPlatformAlarmPageList"
resultType="com.zhgd.xmgl.modules.discharging.entity.DischargingPlatformCurrentData">
SELECT b.*,a.alarm_type,a.add_time alarm_time,c.dev_name
SELECT b.*,a.alarm_type,a.add_time alarm_time,c.dev_name,
a.alarm_level,
CASE WHEN alarm_level=1 THEN 1 WHEN alarm_level=2 or alarm_level=3 THEN 2 ELSE 3 END as status
from discharging_platform_alarm a INNER JOIN discharging_platform_current_data b ON a.currentdata_id=b.id
LEFT JOIN discharging_platform_dev c ON c.dev_sn=b.dev_sn
where a.project_sn=#{param.projectSn}

2
src/main/java/com/zhgd/xmgl/modules/frontierprotectionnonet/controller/FrontierProtectionNoNetDataController.java
View File

@ -1,7 +1,7 @@
package com.zhgd.xmgl.modules.frontierprotectionnonet.controller;
import com.zhgd.xmgl.modules.frontierprotectionnonet.entity.FrontierProtectionNoNetData;
import com.zhgd.xmgl.modules.frontierprotectionnonet.entity.FrontierProtectionNoNetDataDto;
import com.zhgd.xmgl.modules.frontierprotectionnonet.entity.dto.FrontierProtectionNoNetDataDto;
import com.zhgd.xmgl.modules.frontierprotectionnonet.service.IFrontierProtectionNoNetDataService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;

2
src/main/java/com/zhgd/xmgl/modules/frontierprotectionnonet/entity/FrontierProtectionNoNetDataDto.java → src/main/java/com/zhgd/xmgl/modules/frontierprotectionnonet/entity/dto/FrontierProtectionNoNetDataDto.java
View File

@ -1,4 +1,4 @@
package com.zhgd.xmgl.modules.frontierprotectionnonet.entity;
package com.zhgd.xmgl.modules.frontierprotectionnonet.entity.dto;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Data;

2
src/main/java/com/zhgd/xmgl/modules/frontierprotectionnonet/service/IFrontierProtectionNoNetDataService.java
View File

@ -3,7 +3,7 @@ package com.zhgd.xmgl.modules.frontierprotectionnonet.service;
import com.zhgd.xmgl.modules.frontierprotectionnonet.entity.FrontierProtectionNoNetData;
import com.baomidou.mybatisplus.extension.service.IService;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.zhgd.xmgl.modules.frontierprotectionnonet.entity.FrontierProtectionNoNetDataDto;
import com.zhgd.xmgl.modules.frontierprotectionnonet.entity.dto.FrontierProtectionNoNetDataDto;
import java.util.HashMap;
import java.util.List;

4
src/main/java/com/zhgd/xmgl/modules/frontierprotectionnonet/service/impl/FrontierProtectionNoNetDataServiceImpl.java
View File

@ -1,16 +1,14 @@
package com.zhgd.xmgl.modules.frontierprotectionnonet.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.zhgd.jeecg.common.execption.OpenAlertException;
import com.zhgd.xmgl.modules.frontierprotectionnonet.entity.FrontierProtectionNoNetData;
import com.zhgd.xmgl.modules.frontierprotectionnonet.entity.FrontierProtectionNoNetDataDto;
import com.zhgd.xmgl.modules.frontierprotectionnonet.entity.dto.FrontierProtectionNoNetDataDto;
import com.zhgd.xmgl.modules.frontierprotectionnonet.entity.FrontierProtectionNoNetDev;
import com.zhgd.xmgl.modules.frontierprotectionnonet.mapper.FrontierProtectionNoNetDataMapper;
import com.zhgd.xmgl.modules.frontierprotectionnonet.mapper.FrontierProtectionNoNetDevMapper;
import com.zhgd.xmgl.modules.frontierprotectionnonet.service.IFrontierProtectionNoNetDataService;
import com.zhgd.xmgl.security.entity.UserInfo;
import com.zhgd.xmgl.security.util.SecurityUtils;
import io.swagger.models.auth.In;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;

14
src/main/java/com/zhgd/xmgl/modules/frontierprotectionnonet/service/impl/FrontierProtectionNoNetDevServiceImpl.java
View File

@ -1,5 +1,7 @@
package com.zhgd.xmgl.modules.frontierprotectionnonet.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.zhgd.jeecg.common.execption.OpenAlertException;
import com.zhgd.xmgl.modules.frontierprotectionnonet.entity.FrontierProtectionNoNetDev;
import com.zhgd.xmgl.modules.frontierprotectionnonet.mapper.FrontierProtectionNoNetDevMapper;
import com.zhgd.xmgl.modules.frontierprotectionnonet.service.IFrontierProtectionNoNetDevService;
@ -58,12 +60,24 @@ public class FrontierProtectionNoNetDevServiceImpl extends ServiceImpl<FrontierP
@Override
public void add(FrontierProtectionNoNetDev frontierProtectionNoNetDev) {
FrontierProtectionNoNetDev dev = frontierProtectionNoNetDevMapper.selectOne(new LambdaQueryWrapper<FrontierProtectionNoNetDev>()
.eq(FrontierProtectionNoNetDev::getDevSn, frontierProtectionNoNetDev.getDevSn()));
if (dev != null) {
throw new OpenAlertException("设备SN已存在");
}
frontierProtectionNoNetDev.setId(null);
baseMapper.insert(frontierProtectionNoNetDev);
}
@Override
public void edit(FrontierProtectionNoNetDev frontierProtectionNoNetDev) {
FrontierProtectionNoNetDev dev = frontierProtectionNoNetDevMapper.selectOne(new LambdaQueryWrapper<FrontierProtectionNoNetDev>()
.eq(FrontierProtectionNoNetDev::getDevSn, frontierProtectionNoNetDev.getDevSn())
.ne(FrontierProtectionNoNetDev::getId, frontierProtectionNoNetDev.getId())
);
if (dev != null) {
throw new OpenAlertException("设备SN已存在");
}
baseMapper.updateById(frontierProtectionNoNetDev);
}
}

6
src/main/java/com/zhgd/xmgl/modules/pressuretest/entity/PressureTestMachineDev.java
View File

@ -64,9 +64,9 @@ public class PressureTestMachineDev implements Serializable {
/**
* 进场时间
*/
@Excel(name = "进场时间", width = 15, format = "yyyy-MM-dd")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
@Excel(name = "进场时间", width = 15, 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 java.util.Date entryDate;
@ApiModelProperty(value = "负责人")