update

Lius

2024-09-27 5564c5450bb12bf9f31b0fc12133b34fab9b91f9

update

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

@@ -31,4 +31,14 @@
     * @return
     */
    List<EquipmentAlarmDto> list(@Param("equipmentAlarmVo") EquipmentAlarmVo equipmentAlarmVo);

    /**
     * 报警列表
     *
     * @param productionId
     * @param startDate
     * @param endDate
     * @return
     */
    List<EquipmentAlarm> equipmentAlarm(@Param("productionId") String productionId, @Param("startDate") String startDate, @Param("endDate") String endDate);
}

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

@@ -67,4 +67,16 @@
            , t1.EquipmentID DESC
        </if>
    </select>

    <select id="equipmentAlarm" resultType="org.jeecg.modules.mdc.entity.EquipmentAlarm">
        SELECT
            t1.*
        FROM
            EquipmentAlarm t1
                LEFT JOIN mdc_equipment t2 ON t1.EquipmentID = t2.equipment_id
                LEFT JOIN mdc_production_equipment t3 ON t2.id = t3.equipment_id
        WHERE
            t3.production_id = #{productionId}
          AND t1.collectTime BETWEEN #{startDate} AND #{endDate}
    </select>
</mapper>

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

@@ -4,6 +4,7 @@
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.jeecg.common.api.vo.Result;
import org.jeecg.modules.mdc.entity.EquipmentAlarm;
import org.jeecg.modules.mdc.entity.MdcEquipmentMonitor;
import org.jeecg.modules.mdcJc.entity.MdcProductDayschedule;
import org.jeecg.modules.screen.dto.MdcProductDayscheduleDto;
@@ -42,12 +43,12 @@
        return Result.ok(result);
    }

//    @ApiOperation(value = "分控看板-设备实时状态", notes = "分控看板-设备实时状态")
//    @GetMapping("/equipmentStatus")
//    public Result<?> equipmentStatus(String productionId) {
//        List<MdcEquipmentMonitor> result = mdcSubLargeScreenService.equipmentStatus(productionId);
//        return Result.ok(result);
//    }
    @ApiOperation(value = "分控看板-设备报警", notes = "分控看板-设备报警")
    @GetMapping("/equipmentAlarm")
    public Result<?> equipmentAlarm(String productionId) {
        List<EquipmentAlarm> result = mdcSubLargeScreenService.equipmentAlarm(productionId);
        return Result.ok(result);
    }


}

 lxzn-module-mdc/src/main/java/org/jeecg/modules/screen/service/MdcSubLargeScreenService.java

@@ -1,5 +1,6 @@
package org.jeecg.modules.screen.service;

import org.jeecg.modules.mdc.entity.EquipmentAlarm;
import org.jeecg.modules.mdc.entity.MdcEquipmentMonitor;
import org.jeecg.modules.screen.dto.MdcProductDayscheduleDto;

@@ -26,4 +27,13 @@
     */
    List<MdcEquipmentMonitor> equipmentStatus(String productionId);

    /**
     * 设备报警
     *
     * @param productionId
     * @return
     */
    List<EquipmentAlarm> equipmentAlarm(String productionId);


}

 lxzn-module-mdc/src/main/java/org/jeecg/modules/screen/service/impl/MdcSubLargeScreenServiceImpl.java

@@ -1,6 +1,8 @@
package org.jeecg.modules.screen.service.impl;

import org.jeecg.modules.mdc.entity.EquipmentAlarm;
import org.jeecg.modules.mdc.entity.MdcEquipmentMonitor;
import org.jeecg.modules.mdc.mapper.EquipmentAlarmMapper;
import org.jeecg.modules.screen.dto.MdcProductDayscheduleDto;
import org.jeecg.modules.screen.mapper.MdcSubLargeScreenMapper;
import org.jeecg.modules.screen.service.MdcSubLargeScreenService;
@@ -10,6 +12,9 @@
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.LocalTime;
import java.time.format.DateTimeFormatter;
import java.util.ArrayList;
import java.util.List;

@@ -22,6 +27,9 @@

    @Resource
    private MdcSubLargeScreenMapper mdcSubLargeScreenMapper;

    @Resource
    private EquipmentAlarmMapper equipmentAlarmMapper;

    private final String today = LocalDate.now().toString();

@@ -80,4 +88,17 @@
        }
        return result;
    }

    /**
     * 设备报警
     *
     * @param productionId
     * @return
     */
    @Override
    public List<EquipmentAlarm> equipmentAlarm(String productionId) {
        String startDate = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss").format(LocalDateTime.of(LocalDate.now(), LocalTime.MIN));
        String endDate = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss").format(LocalDateTime.of(LocalDate.now(), LocalTime.MIN).plusDays(1));
        return equipmentAlarmMapper.equipmentAlarm(productionId, startDate, endDate);
    }
}