diff --git a/nursing-unit-common/src/main/java/com/nu/dto/DevicePreviewMqDto.java b/nursing-unit-common/src/main/java/com/nu/dto/DevicePreviewMqDto.java new file mode 100644 index 00000000..ded718f1 --- /dev/null +++ b/nursing-unit-common/src/main/java/com/nu/dto/DevicePreviewMqDto.java @@ -0,0 +1,33 @@ +package com.nu.dto; + +import lombok.Data; + +import java.util.Date; + +@Data +public class DevicePreviewMqDto { + private Integer id; + private String orgCode; + private String departName; + private String nuId; + private String nuName; + private String batchNo; + private String dimension; + private String sn; + private String deviceName; + private String deviceType; + private String deviceModel; + private String factory; + private String deviceStatus; + private Date createTime;//更新时间 + private String createBy;//创建人 + private Date updateTime;//更新时间 + private String updateBy;//更新人 + private String izSync;//是否同步 + private Date syncTime;//同步时间 + private String syncBy;//同步人 +// private Integer purchaseQuantity; + private String logId;//日志ID + private String remarks;//备注 + private Integer ywId;//运维ID +} diff --git a/nursing-unit-common/src/main/java/com/nu/dto/IotSyncPreviewMQDto.java b/nursing-unit-common/src/main/java/com/nu/dto/IotSyncPreviewMQDto.java new file mode 100644 index 00000000..929546ac --- /dev/null +++ b/nursing-unit-common/src/main/java/com/nu/dto/IotSyncPreviewMQDto.java @@ -0,0 +1,10 @@ +package com.nu.dto; + +import lombok.Data; + +import java.util.List; + +@Data +public class IotSyncPreviewMQDto { + private List previewList; +} diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/manager/controller/DeviceManagerController.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/manager/controller/DeviceManagerController.java index bdca005a..8f29d614 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/manager/controller/DeviceManagerController.java +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/manager/controller/DeviceManagerController.java @@ -108,12 +108,12 @@ public class DeviceManagerController extends JeecgController edit(@RequestBody DeviceManager DeviceManager) { - service.updateById(DeviceManager); + public Result edit(@RequestBody DeviceManager deviceManager) { + service.updateManager(deviceManager); return Result.OK("编辑成功!"); } diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/manager/entity/DeviceBindLog.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/manager/entity/DeviceBindLog.java index c9fb97b4..d31ec88d 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/manager/entity/DeviceBindLog.java +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/manager/entity/DeviceBindLog.java @@ -32,4 +32,5 @@ public class DeviceBindLog implements Serializable { private Date optDate; private String optType; private String remarks; + private Integer ywId; } diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/manager/entity/DeviceManager.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/manager/entity/DeviceManager.java index 9ccadea4..68b2ffda 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/manager/entity/DeviceManager.java +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/manager/entity/DeviceManager.java @@ -26,6 +26,9 @@ public class DeviceManager implements Serializable { private String nuId; @TableField(exist = false) private String nuName; + private String batchNo;//批次号 + @Excel(name = "设备名称", width = 15) + private String deviceName; @Excel(name = "设备类型", width = 15, dicCode = "tplink_device_type") @Dict(dicCode = "tplink_device_type") private String deviceType; @@ -48,5 +51,6 @@ public class DeviceManager implements Serializable { @TableField(exist = false) private String onlineStatus;//在线状态 private String deviceStatus;//设备状态 + private Integer ywId;//运维ID } diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/manager/mapper/xml/DeviceManagerMapper.xml b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/manager/mapper/xml/DeviceManagerMapper.xml index bd93ba1a..38e7b224 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/manager/mapper/xml/DeviceManagerMapper.xml +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/manager/mapper/xml/DeviceManagerMapper.xml @@ -8,6 +8,7 @@ a.nu_id, c.nu_name, a.dimension, + a.device_name, a.device_type, a.device_model, a.factory, @@ -16,7 +17,8 @@ a.update_time, a.remarks, a.device_status, - ifnull(t.online_status,'待集成') as online_status + ifnull(t.online_status,'待集成') as online_status, + a.yw_id from nu_iot_device_preview a left join nu_base_info c on a.nu_id = c.nu_id left join ( @@ -37,6 +39,7 @@ from nu_iot_yiweilian_humid_device ) t on a.sn = t.sn where a.sn is not null + and ifnull(a.device_status,'') != '损坏' AND c.nu_name LIKE concat('%',#{params.nuName},'%') @@ -53,6 +56,7 @@ select a.id, a.dimension, + a.device_name, a.device_type, a.device_model, a.factory, @@ -60,16 +64,16 @@ a.create_time, a.update_time, a.remarks, - a.device_status + a.device_status, + a.yw_id from nu_iot_device_preview a - + where ifnull(a.device_status,'') != '损坏' AND a.dimension = #{params.dimension} AND a.device_type = #{params.deviceType} - order by a.dimension,a.device_type,a.device_model,a.sn diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/manager/service/IDeviceManagerService.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/manager/service/IDeviceManagerService.java index 1b8e6f4a..f397b21c 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/manager/service/IDeviceManagerService.java +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/manager/service/IDeviceManagerService.java @@ -23,6 +23,7 @@ public interface IDeviceManagerService extends IService { IPage findPage(Page page, DeviceManager deviceManager); IPage findAllPage(Page page, DeviceManager deviceManager); IPage findBingLogPage(Page page, DeviceBindLog deviceBindLog); + void updateManager(DeviceManager deviceManager); void addLog(DeviceBindLog deviceBindLog); List queryNuList(DeviceManager deviceManager); diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/manager/service/impl/DeviceManagerServiceImpl.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/manager/service/impl/DeviceManagerServiceImpl.java index d772edf9..7915de1b 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/manager/service/impl/DeviceManagerServiceImpl.java +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/manager/service/impl/DeviceManagerServiceImpl.java @@ -1,9 +1,11 @@ package com.nu.modules.manager.service.impl; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.alibaba.fastjson.JSONObject; 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.nu.dto.DevicePreviewMqDto; +import com.nu.dto.ElderTagTypeMQDto; import com.nu.modules.manager.entity.DeviceBindLog; import com.nu.modules.manager.entity.DeviceManager; import com.nu.modules.manager.mapper.DeviceManagerMapper; @@ -12,7 +14,11 @@ import com.nu.modules.tplink.camera.entity.CameraInfo; import com.nu.modules.tq.electricity.entity.ElectricityMeter; import com.nu.modules.tq.water.entity.WaterMeter; import com.nu.modules.yiweilian.humid.entity.HumidDevice; +import com.nu.utils.RabbitMQUtil; import lombok.extern.slf4j.Slf4j; +import org.jeecg.common.system.api.ISysBaseAPI; +import org.springframework.beans.BeanUtils; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.List; @@ -28,6 +34,12 @@ import java.util.Map; @Slf4j public class DeviceManagerServiceImpl extends ServiceImpl implements IDeviceManagerService { + @Autowired + private RabbitMQUtil rabbitMQUtil; + + @Autowired + private ISysBaseAPI sysBaseAPI; + @Override public IPage findPage(Page page, DeviceManager deviceManager){ return baseMapper.findPage(page,deviceManager); @@ -43,6 +55,15 @@ public class DeviceManagerServiceImpl extends ServiceImpl statusList = new ArrayList<>(); + List previewList = dto.getPreviewList(); + if(previewList!=null&&previewList.size()>0){ + for(int i=0;i dmQw = new QueryWrapper<>(); + dmQw.eq("yw_id",preview.getYwId()); + DeviceManager entity = deviceManagerService.getOne(dmQw); + if(entity==null){ + DeviceManager dm = new DeviceManager(); + BeanUtils.copyProperties(preview, dm); + dm.setId(null); + dm.setCreateTime(new Date()); + deviceManagerService.save(dm); + statusList.add(statusMQDto); + } + }catch (Exception e) { + StatusMQDto statusMQDto = new StatusMQDto(); + statusMQDto.setAsyncId(preview.getId().toString()); + statusMQDto.setMessage("失败"); + statusMQDto.setPrimaryKey(preview.getLogId()); + statusList.add(statusMQDto); + e.printStackTrace(); + } + } + } + StatusListMQDto statusListMQDto = new StatusListMQDto(); + statusListMQDto.setStatusList(statusList); + rabbitMQUtil.sendToExchange("hldy.iotsyncbiz", "iotsyncbiz.addpreview.result", statusListMQDto); + } + +}