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-20 11:18:37 +08:00
parent 36dd8ee92a
commit ba289e38d7
2 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
ruoyi-admin/src/main/java/org/dromara/web/controller/app/EqDeviceController.java
View File

@ -16,6 +16,7 @@ import org.dromara.system.domain.vo.SysDictDataVo;
import org.dromara.system.domain.vo.SysUserVo; import org.dromara.system.domain.vo.SysUserVo;
import org.dromara.system.service.ISysDictTypeService; import org.dromara.system.service.ISysDictTypeService;
import org.dromara.system.service.ISysUserService; import org.dromara.system.service.ISysUserService;
import org.dromara.web.device.iot.DeviceByDeviceName;
import org.dromara.web.device.iot.DeviceDto; import org.dromara.web.device.iot.DeviceDto;
import org.dromara.web.domain.bo.*; import org.dromara.web.domain.bo.*;
import org.dromara.web.domain.vo.*; import org.dromara.web.domain.vo.*;
@ -178,13 +179,21 @@ public class EqDeviceController extends BaseController {
*/ */
@PostMapping("/saveDeviceLogs") @PostMapping("/saveDeviceLogs")
public void saveDeviceLogs(@RequestBody EqEquipmentLogBo eqEquipmentLogBo){ public void saveDeviceLogs(@RequestBody EqEquipmentLogBo eqEquipmentLogBo){
String equipmentName = eqEquipmentLogBo.getEquipmentName();
Integer status = eqEquipmentLogBo.getStatus();
//设备id查询
DeviceByDeviceName deviceByNameDto = iotService.apiTenantDevicesByName(equipmentName);//无信息会抛异常 无需判断
if (deviceByNameDto==null) throw new RuntimeException("设备不存在");
String equipmentCode = deviceByNameDto.getId().getId();
//设备查询
EqEquipmentBo eqEquipmentBo = new EqEquipmentBo(); EqEquipmentBo eqEquipmentBo = new EqEquipmentBo();
eqEquipmentBo.setEquipmentCode(eqEquipmentLogBo.getEquipmentCode()); eqEquipmentBo.setEquipmentCode(equipmentCode);
List<EqEquipmentVo> eqEquipmentVos = eqEquipmentService.queryList(eqEquipmentBo); List<EqEquipmentVo> eqEquipmentVos = eqEquipmentService.queryList(eqEquipmentBo);
if (CollectionUtils.isEmpty(eqEquipmentVos)) return; if (CollectionUtils.isEmpty(eqEquipmentVos)) return;
EqEquipmentVo eqEquipmentVo = eqEquipmentVos.get(0); EqEquipmentVo eqEquipmentVo = eqEquipmentVos.get(0);
eqEquipmentBo.setEquipmentId(eqEquipmentVo.getEquipmentId()); //日志数据组装
eqEquipmentLogBo.setEquipmentCode(equipmentCode);
eqEquipmentLogBo.setEquipmentName(equipmentName);
eqEquipmentLogBo.setUserId(eqEquipmentVo.getUserId()); eqEquipmentLogBo.setUserId(eqEquipmentVo.getUserId());
eqEquipmentLogBo.setUserName(eqEquipmentVo.getUserName()); eqEquipmentLogBo.setUserName(eqEquipmentVo.getUserName());
eqEquipmentLogBo.setNickName(eqEquipmentVo.getNickName()); eqEquipmentLogBo.setNickName(eqEquipmentVo.getNickName());
@ -199,6 +208,7 @@ public class EqDeviceController extends BaseController {
String[] timeStr = formattedDate.split(" "); String[] timeStr = formattedDate.split(" ");
eqEquipmentLogBo.setCreatedYearDay(timeStr[0]);//年月日 eqEquipmentLogBo.setCreatedYearDay(timeStr[0]);//年月日
eqEquipmentLogBo.setCreatedHourSecond(timeStr[1]);//时分秒 eqEquipmentLogBo.setCreatedHourSecond(timeStr[1]);//时分秒
eqEquipmentLogBo.setStatus(status);//状态
//星期 //星期
Calendar calendar = Calendar.getInstance(); Calendar calendar = Calendar.getInstance();
calendar.setTime(createTime); calendar.setTime(createTime);
@ -209,6 +219,7 @@ public class EqDeviceController extends BaseController {
logService.insertByBo(eqEquipmentLogBo); logService.insertByBo(eqEquipmentLogBo);
//更新开合度状态到设备 //更新开合度状态到设备
eqEquipmentBo.setEquipmentId(eqEquipmentVo.getEquipmentId());
eqEquipmentBo.setStatus(eqEquipmentLogBo.getOpenStatus()); eqEquipmentBo.setStatus(eqEquipmentLogBo.getOpenStatus());
eqEquipmentBo.setFaultStatus(eqEquipmentBo.getFaultStatus()); eqEquipmentBo.setFaultStatus(eqEquipmentBo.getFaultStatus());
eqEquipmentBo.setLineStatus(eqEquipmentBo.getLineStatus()); eqEquipmentBo.setLineStatus(eqEquipmentBo.getLineStatus());

2
ruoyi-admin/src/main/java/org/dromara/web/domain/bo/EqEquipmentBo.java
View File

@ -74,7 +74,7 @@ public class EqEquipmentBo extends BaseEntity {
/** /**
* 设备状态 * 设备状态
*/ */
@NotNull(message = "设备状态不能为空", groups = { AddGroup.class, EditGroup.class }) @NotNull(message = "设备运行状态不能为空", groups = { AddGroup.class, EditGroup.class })
private Integer status; private Integer status;
/** /**