yangjun
/
hldy_yunwei_java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

物联设备BUG处理

This commit is contained in:
曹磊 2026-04-20 21:12:36 +08:00
parent 53c8194f63
commit 232b1af5b0
6 changed files with 37 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/workorder/controller/WorkOrderController.java
View File

@ -293,7 +293,6 @@ public class WorkOrderController extends JeecgController<WorkOrder, IWorkOrderSe
@ApiOperation(value = "工单表-反馈", notes = "工单表-反馈")
@RequestMapping(value = "/handFk", method = {RequestMethod.PUT, RequestMethod.POST})
public Result<String> handFk(@RequestBody WorkOrder workOrder) {
workOrderService.handFk(workOrder);
return Result.OK("操作成功!");
return workOrderService.handFk(workOrder);
}
}

3
nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/workorder/service/IWorkOrderService.java
View File

@ -2,6 +2,7 @@ package com.nu.modules.workorder.service;
import com.nu.modules.workorder.entity.WorkOrder;
import com.baomidou.mybatisplus.extension.service.IService;
import org.jeecg.common.api.vo.Result;
import javax.servlet.http.HttpServletRequest;
@ -19,5 +20,5 @@ public interface IWorkOrderService extends IService<WorkOrder> {
void saveHjpz(WorkOrder workOrder, HttpServletRequest request);
void handFk(WorkOrder workOrder);
Result<String> handFk(WorkOrder workOrder);
}

54
nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/workorder/service/impl/WorkOrderServiceImpl.java
View File

@ -12,6 +12,7 @@ import com.nu.modules.workorder.mapper.WorkOrderMapper;
import com.nu.modules.workorder.service.IWorkOrderService;
import com.nu.utils.RabbitMQUtil;
import org.apache.shiro.SecurityUtils;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.system.api.ISysBaseAPI;
import org.jeecg.common.system.entity.SysDepartEntity;
import org.jeecg.common.system.vo.LoginUser;
@ -103,29 +104,34 @@ public class WorkOrderServiceImpl extends ServiceImpl<WorkOrderMapper, WorkOrder
}
@Override
public void handFk(WorkOrder workOrder) {
WorkOrder upData = new WorkOrder();
upData.setId(workOrder.getId());
upData.setStatus("3");//平台搭建完成
upData.setReplyTime(new Date());
baseMapper.updateById(upData);
WorkOrder workInfo = baseMapper.selectById(workOrder.getId());
SysDepartEntity orgInfo = sysBaseAPI.queryOrgInfoById(workOrder.getOrgId());
WorkOrderMQDto workOrderMQDto = new WorkOrderMQDto();
BeanUtils.copyProperties(workInfo,workOrderMQDto);
workOrderMQDto.setOrgId(workInfo.getOrgId());
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
workOrderMQDto.setHandleBy(sysUser.getRealname());
workOrderMQDto.setReplyTime(new Date());
workOrderMQDto.setUrl(orgInfo.getUrl());
workOrderMQDto.setMediaUrl(orgInfo.getMediaUrl());
workOrderMQDto.setFrontPath(orgInfo.getFrontPath());
workOrderMQDto.setContextPath(orgInfo.getContextPath());
OrgInfo orgInfo_ = orgInfoService.getById(workOrder.getOrgId());
OrgApplyInfoMQDto orgApplyInfoMQDto = new OrgApplyInfoMQDto();
BeanUtils.copyProperties(orgInfo_, orgApplyInfoMQDto);
workOrderMQDto.setOrgInfo(orgApplyInfoMQDto);
rabbitMQUtil.sendToExchange("nu.workOrder", "nu.workOrder.handFk", workOrderMQDto);
public Result<String> handFk(WorkOrder workOrder) {
try {
WorkOrder upData = new WorkOrder();
upData.setId(workOrder.getId());
upData.setStatus("3");//平台搭建完成
upData.setReplyTime(new Date());
baseMapper.updateById(upData);
WorkOrder workInfo = baseMapper.selectById(workOrder.getId());
SysDepartEntity orgInfo = sysBaseAPI.queryOrgInfoById(workOrder.getOrgId());
WorkOrderMQDto workOrderMQDto = new WorkOrderMQDto();
BeanUtils.copyProperties(workInfo, workOrderMQDto);
workOrderMQDto.setOrgId(workInfo.getOrgId());
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
workOrderMQDto.setHandleBy(sysUser.getRealname());
workOrderMQDto.setReplyTime(new Date());
workOrderMQDto.setUrl(orgInfo.getUrl());
workOrderMQDto.setMediaUrl(orgInfo.getMediaUrl());
workOrderMQDto.setFrontPath(orgInfo.getFrontPath());
workOrderMQDto.setContextPath(orgInfo.getContextPath());
OrgInfo orgInfo_ = orgInfoService.getById(workOrder.getOrgId());
OrgApplyInfoMQDto orgApplyInfoMQDto = new OrgApplyInfoMQDto();
BeanUtils.copyProperties(orgInfo_, orgApplyInfoMQDto);
workOrderMQDto.setOrgInfo(orgApplyInfoMQDto);
rabbitMQUtil.sendToExchange("nu.workOrder", "nu.workOrder.handFk", workOrderMQDto);
}catch (Exception e){
e.printStackTrace();
return Result.error("操作失败，请稍后重试！");
}
return Result.OK("操作成功!");
}
}

3
nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/device/manager/mapper/xml/DeviceManagerMapper.xml
View File

@ -522,7 +522,8 @@
sn,
factory,
opt_date,
opt_type
opt_type,
remarks
from nu_iot_device_bind_log
where org_code = #{params.orgCode}
<if test="params.dimension != null and params.dimension != ''">

2
nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/dingshuo/electricity/service/impl/DsElectricityMeterServiceImpl.java
View File

@ -282,7 +282,6 @@ public class DsElectricityMeterServiceImpl extends ServiceImpl<DsElectricityMete
tqApiLog901.setId(logEntity901.getId());
logService.update(tqApiLog901);
}
syncValueMq(entity901);//抄表同步到业务系统
break;
case "902":
@ -360,6 +359,7 @@ public class DsElectricityMeterServiceImpl extends ServiceImpl<DsElectricityMete
deviceIntegration.setDeviceStatus("正常");
deviceIntegration.setSn(sn);
deviceManagerMapper.editPreviewStatusBySn(deviceIntegration);
this.eleRead(entity905);//抄表
break;
case "601":
// 定时主动上报表计数据

2
nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/service/impl/CameraInfoServiceImpl.java
View File

@ -480,7 +480,7 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
}
}
}else{
errMsg = "拉取设备为空，请检查参数！";
errMsg = "拉取设备失败，请检查设备标识！";
}
}
return errMsg;