设备监控上报设备状态信息接口

Lius

2024-01-15 e87017017b42d5b63ced3be743e2cf57c5bf0280

设备监控上报设备状态信息接口

 lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcEquipmentController.java

@@ -1,5 +1,6 @@
package org.jeecg.modules.mdc.controller;

import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import io.swagger.annotations.Api;
@@ -467,4 +468,32 @@
        MdcEquipment mdcEquipment = mdcEquipmentService.getEquipmentByDepPid(pid, userId);
        return Result.OK(mdcEquipment);
    }

    /**
     * 手动上报设备异常及说明
     * @return
     */
    @AutoLog(value = "设备表-手动上报设备异常及说明")
    @ApiOperation(value = "设备表-手动上报设备异常及说明", notes = "设备表-手动上报设备异常及说明")
    @PostMapping("/updateEquipmentStatus")
    public Result<?> updateEquipmentStatus(@RequestBody MdcEquipmentMonitor mdcEquipmentMonitor) {
        Result result = new Result<>();
        try {
            MdcEquipment mdcEquipment1 = mdcEquipmentService.getById(mdcEquipmentMonitor.getId());
            if (mdcEquipment1 == null) {
                result.error500("未找到对应实体");
            } else {
                LambdaUpdateWrapper<MdcEquipment> updateWrapper = new LambdaUpdateWrapper<MdcEquipment>();
                updateWrapper.eq(MdcEquipment::getId, mdcEquipmentMonitor.getId());
                updateWrapper.set(MdcEquipment::getEquipmentStatus, mdcEquipmentMonitor.getEquipmentStatus());
                updateWrapper.set(MdcEquipment::getEquipmentStatusRemark, mdcEquipmentMonitor.getEquipmentStatusRemark());
                mdcEquipmentService.update(updateWrapper);
                result.success("反馈成功!");
            }
        } catch (Exception e) {
            log.error(e.getMessage(), e);
            result.error500("操作失败");
        }
        return Result.OK("反馈成功！");
    }
}

 lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcEquipment.java

@@ -122,6 +122,20 @@
    @ApiModelProperty(value = "设备功率")
    private String devicePower;

    /**
     * 设备状态
     */
    @Excel(name = "设备状态", width = 15)
    @ApiModelProperty(value = "设备状态")
    private Integer equipmentStatus;

    /**
     * 设备状态说明
     */
    @Excel(name = "设备状态说明", width = 15)
    @ApiModelProperty(value = "设备状态说明")
    private Integer equipmentStatusRemark;

    /**部门名称*/
    private transient String orgCodeTxt;


 lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcEquipmentMonitor.java

@@ -58,6 +58,18 @@
    private String oporationDict;

    /**
     * 设备状态
     */
    @ApiModelProperty(value = "设备状态")
    private Integer equipmentStatus;

    /**
     * 设备状态说明
     */
    @ApiModelProperty(value = "设备状态说明")
    private Integer equipmentStatusRemark;

    /**
     * 采集时间
     */
    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")

 lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEquipmentMapper.xml

@@ -96,6 +96,8 @@
            k.equipmentName,
            MAX ( l.Oporation ) Oporation,
            k.id,
            k.equipment_status,
            k.equipment_status_remark,
            k.equipment_type equipmentType,
            k.equipment_type_pictures
        FROM
@@ -105,13 +107,15 @@
                MAX ( t.equipmentName ) equipmentName,
                MAX ( m.CollectTime ) CollectTime,
                id,
                equipment_status,
                equipment_status_remark,
                equipment_type,
                equipment_type_pictures
            FROM
                ( SELECT equipment_id EquipmentID, equipment_Name equipmentName, id, equipment_type FROM mdc_equipment WHERE equipment_id IN
        <foreach collection="equipmentIds" index="index" item="id" open="(" separator="," close=")">
            #{id}
        </foreach>
                ( SELECT equipment_id EquipmentID, equipment_Name equipmentName, id, equipment_type, equipment_status, equipment_status_remark FROM mdc_equipment WHERE equipment_id IN
                    <foreach collection="equipmentIds" index="index" item="id" open="(" separator="," close=")">
                        #{id}
                    </foreach>
                 ) t
                LEFT JOIN ( SELECT equipment_type_name, equipment_type_pictures FROM mdc_equipment_type) met ON t.equipment_type = met.equipment_type_name
                LEFT JOIN ( SELECT EquipmentID, CollectTime, Oporation FROM EquipmentLog WHERE Oporation <![CDATA[ <> ]]> 23 ) m ON t.EquipmentID= m.EquipmentID
@@ -119,6 +123,8 @@
                t.EquipmentID,
                id,
                equipment_type,
                equipment_status,
                equipment_status_remark,
                equipment_type_pictures
            ) k
            LEFT JOIN ( SELECT EquipmentID, CollectTime, Oporation FROM EquipmentLog WHERE Oporation <![CDATA[ <> ]]> 23 ) l ON k.CollectTime= l.CollectTime
@@ -128,6 +134,8 @@
            k.CollectTime,
            k.equipmentName,
            k.id,
            k.equipment_status,
            k.equipment_status_remark,
            k.equipment_type,
            k.equipment_type_pictures
        ORDER BY