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

@@ -37,6 +37,8 @@
import javax.servlet.http.HttpServletRequest;
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.*;
import java.util.stream.Collectors;
import java.util.stream.Stream;
@@ -367,8 +369,9 @@
                        Object object = mapData.get(englishName);
                        String value = "";
                        if ("CollectTime".equals(englishName)) {
                            Date date = object == null ? null : (Date) object;
                            value = DateUtils.format(date, DateUtils.STR_DATE_TIME_SMALL);
                            LocalDateTime date = object == null ? null : (LocalDateTime) object;
                            DateTimeFormatter customFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
                            value = date.format(customFormatter);
                        } else if ("ZUOLAN".equals(mdcEquipmentDetailedDto.getDriveType()) && "AI01".equals(englishName) && oporation == 3) {
                            // ZUOLAN设备电流字段AI01
                            value = BigDecimal.valueOf(Math.random() * 15 + 0).setScale(1, RoundingMode.HALF_UP).toString();

 lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/iot/mdc/mapper/xml/EquipmentLogMapper.xml

@@ -3,21 +3,25 @@
<mapper namespace="org.jeecg.modules.iot.mdc.mapper.EquipmentLogMapper">

    <select id="getRow" resultType="org.jeecg.modules.iot.mdc.entity.EquipmentLog">
        SELECT top 1 * FROM EquipmentLog WHERE EquipmentID = #{ equipmentid } AND CollectTime &lt;= #{ startTime } AND Oporation in ('0','1','2','3') ORDER BY CollectTime ASC
        SELECT * FROM EquipmentLog WHERE EquipmentID = #{ equipmentid } AND CollectTime &lt;= #{ startTime } AND Oporation in ('0','1','2','3') ORDER BY CollectTime ASC LIMIT 1
    </select>

    <select id="selectEquipmentOporation" resultType="org.jeecg.modules.iot.mdc.entity.EquipmentLog">
        SELECT TOP 1 * FROM EquipmentLog WHERE EquipmentID = #{ equipmentId } ORDER BY CollectTime DESC
        SELECT * FROM EquipmentLog WHERE EquipmentID = #{ equipmentId } ORDER BY CollectTime DESC LIMIT 1
    </select>

    <!--查询设备最新一条数据-->
    <select id="getEquipmentStatusList" resultType="org.jeecg.modules.iot.mdc.entity.EquipmentLog">
        SELECT
            t1.*
        t1.*
        FROM
            EquipmentLog t1
        INNER JOIN ( SELECT MAX ( CollectTime ) AS CollectTime, EquipmentID FROM EquipmentLog GROUP BY EquipmentID ) t2 ON t1.CollectTime= t2.CollectTime
        AND t1.EquipmentID= t2.EquipmentID
        EquipmentLog t1
        INNER JOIN (
        SELECT MAX(CollectTime) AS CollectTime, EquipmentID
        FROM EquipmentLog
        GROUP BY EquipmentID
        ) t2 ON t1.CollectTime = t2.CollectTime
        AND t1.EquipmentID = t2.EquipmentID
        <if test="equipmentIdList != null and equipmentIdList.size() > 0">
            AND t1.EquipmentID IN
            <foreach collection="equipmentIdList" index="index" item="id" open="(" separator="," close=")">

 lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/quartz/job/SampleJob.java

@@ -15,7 +15,7 @@
import java.util.List;

/**
 * 示例不带参定时任务
 * 心跳发送定时任务
 *
 * @Author Scott
 */

 lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/quartz/job/SampleParamJob.java

@@ -36,7 +36,7 @@
import java.util.stream.Collectors;

/**
 * 示例带参定时任务
 * influxdb定时任务
 *
 * @Author Scott
 */