联调socketio

taphole-admin/src/main/resources/application-dev.yml

@@ -39,7 +39,7 @@ camera:
   rtmp:
     rtmphost: 127.0.0.1:1935
     httphost: 127.0.0.1:80
-    webrtchost: 150.158.22.179:8000
+    webrtchost: 117.72.49.153:8000
 
 socketio:
  # host: 127.0.0.1		#主机名，默认是 0.0.0.0 （这个设不设置无所谓，因为后面的 SocketConfig 类一般不用设置这个）

taphole-iron/src/main/java/com/sckj/iron/controller/TIronVisualScreenController.java

@@ -99,9 +99,12 @@ public class TIronVisualScreenController {
     @NotLogin
     @PostMapping("/getIronElement")
     @ApiOperation(value = "获取铁水成分数据")
-    public AjaxResult<List<TL2DataDTO>> getIronElement(@RequestBody TrendRequest queryDateType) {
+    public AjaxResult<TrendDTO> getIronElement(@RequestBody TrendRequest queryDateType) {
         List<TL2DataDTO> tl2DataList = tl2DataService.getTrendDataByDiffDays(queryDateType);
-        return AjaxResult.success(tl2DataList);
+        TrendDTO trendDTO = new TrendDTO();
+        trendDTO.setList(tl2DataList);
+        trendDTO.setUnitName("100%");
+        return AjaxResult.success(trendDTO);
     }
 
     /***
@@ -110,9 +113,12 @@ public class TIronVisualScreenController {
      */
     @PostMapping("/getIronSpeed")
     @ApiOperation(value = "获取铁水流速数据")
-    public AjaxResult<List<TL2DataDTO>> getIronSpeed(@RequestBody TrendRequest queryDateType) {
+    public AjaxResult<TrendDTO> getIronSpeed(@RequestBody TrendRequest queryDateType) {
         List<TL2DataDTO> tl2DataList = tl2DataService.getTrendDataByDiffDays(queryDateType);
-        return AjaxResult.success(tl2DataList);
+        TrendDTO trendDTO = new TrendDTO();
+        trendDTO.setList(tl2DataList);
+        trendDTO.setUnitName("t/min");
+        return AjaxResult.success(trendDTO);
     }
 
     /***
@@ -121,9 +127,12 @@ public class TIronVisualScreenController {
      */
     @PostMapping("/getIronWeight")
     @ApiOperation(value = "获取铁流量数据")
-    public AjaxResult<List<TL2DataDTO>> getIronWeight(@RequestBody TrendRequest queryDateType) {
+    public AjaxResult<TrendDTO> getIronWeight(@RequestBody TrendRequest queryDateType) {
         List<TL2DataDTO> tl2DataList = tl2DataService.getTrendDataByDiffDays(queryDateType);
-        return AjaxResult.success(tl2DataList);
+        TrendDTO trendDTO = new TrendDTO();
+        trendDTO.setList(tl2DataList);
+        trendDTO.setUnitName("t");
+        return AjaxResult.success(trendDTO);
     }
 
     /***
@@ -132,9 +141,12 @@ public class TIronVisualScreenController {
      */
     @PostMapping("/getIronTemp")
     @ApiOperation(value = "获取铁水温度数据")
-    public AjaxResult<List<TL2DataDTO>> getIronTemp(@RequestBody TrendRequest queryDateType) {
+    public AjaxResult<TrendDTO> getIronTemp(@RequestBody TrendRequest queryDateType) {
         List<TL2DataDTO> tl2DataList = tl2DataService.getTrendDataByDiffDays(queryDateType);
-        return AjaxResult.success(tl2DataList);
+        TrendDTO trendDTO = new TrendDTO();
+        trendDTO.setList(tl2DataList);
+        trendDTO.setUnitName("℃");
+        return AjaxResult.success(trendDTO);
     }
 
 
@@ -209,9 +221,9 @@ public class TIronVisualScreenController {
 
     @PostMapping("/getIronParams")
     @ApiOperation(value = "获取出铁参数设置:paramType=>[(出铁诊断模型参数:iron_judge),(摄像头轮播时长参数:camera_param),(趋势图轮播项:iron_trend]")
-    public AjaxResult<List<IronParamDTO>> getIronParam(String paramType) {
+    public AjaxResult<List<IronParamDTO>> getIronParam(@RequestBody IronParamDTO paramType) {
         List<TIronParam> list = iTIronParamService.lambdaQuery().eq(TIronParam::getStatus, "1")
-                .eq(TIronParam::getParamType, paramType).orderByAsc(TIronParam::getSort).list();
+                .eq(TIronParam::getParamType, paramType.getParamType()).orderByAsc(TIronParam::getSort).list();
         List<IronParamDTO> collect = list.stream().flatMap((item) -> {
             IronParamDTO dto = new IronParamDTO();
             BeanUtils.copyProperties(item, dto);

taphole-iron/src/main/java/com/sckj/iron/dto/CameraInfo.java

@@ -17,7 +17,7 @@ public class CameraInfo {
     private List<CameraDTO> cameraList;
 
     @ApiModelProperty("RTC播放地址")
-    private String rtmpUrl;
+    private String rtcUrl;
 
 
 }

taphole-iron/src/main/java/com/sckj/iron/dto/IronParamDTO.java

@@ -32,5 +32,8 @@ public class IronParamDTO implements Serializable {
     @ApiModelProperty(value = "参数类型")
     private String paramType;
 
+    @ApiModelProperty(value = "参数单位")
+    private String paramUnit;
+
 
 }

taphole-iron/src/main/java/com/sckj/iron/dto/IronStepDTO.java

@@ -18,9 +18,6 @@ public class IronStepDTO extends TIronStep {
 //
 //    private String stepName;
 
-    @ApiModelProperty(value = "是否通过（1是 0否）")
-    private boolean pass;
-
     @ApiModelProperty(value = "数据")
     private Object data;
 

taphole-iron/src/main/java/com/sckj/iron/dto/TrendDTO.java

@@ -0,0 +1,26 @@
+package com.sckj.iron.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.annotations.ApiOperation;
+import lombok.Data;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/***
+ * 实时数据
+ * 铁水温度、铁水流速、铁水成分、铁水流量
+ *
+ */
+@Data
+@ApiOperation("趋势返回信息")
+public class TrendDTO {
+
+    @ApiModelProperty(value = "数据列表",required = true)
+    List<TL2DataDTO> list;
+
+    @ApiModelProperty(value = "单位名称",required = true)
+    private String unitName;
+
+
+}

taphole-iron/src/main/java/com/sckj/iron/dto/WarnData.java

@@ -22,22 +22,24 @@ public class WarnData {
 
     private String desc;
 
-    public static WarnData of(String type, String desc) {
+    private String alarmUrl;
+
+    public static WarnData of(String type, String desc,String alarmUrl) {
         return WarnData.builder().type(type).desc(desc).build();
     }
 
     //开口预警
-    public static WarnData warnOpen(String desc) {
+    public static WarnData warnOpen(String desc,String alarmUrl) {
         return WarnData.builder().type(TASKNAME_OPEN_WARN).desc(desc).build();
     }
 
     //出铁预警
-    public static WarnData warnTapping(String desc) {
+    public static WarnData warnTapping(String desc,String alarmUrl) {
         return WarnData.builder().type(TASKNAME_TAPPING_WARN).desc(desc).build();
     }
 
     //堵口预警
-    public static WarnData warnClose(String desc) {
+    public static WarnData warnClose(String desc,String alarmUrl) {
         return WarnData.builder().type(TASKNAME_CLOSE_WARN).desc(desc).build();
     }
 

taphole-iron/src/main/java/com/sckj/iron/entity/TIronParam.java

@@ -52,6 +52,9 @@ public class TIronParam implements Serializable {
     @ApiModelProperty(value = "参数说明")
     private String paramDesc;
 
+    @ApiModelProperty(value = "参数单位")
+    private String paramUnit;
+
     @ApiModelProperty(value = "状态（1正常 0停用）")
     private String status;
 

taphole-iron/src/main/java/com/sckj/iron/service/impl/TCameraServiceImpl.java

@@ -237,9 +237,8 @@ public class TCameraServiceImpl extends ServiceImpl<TCameraMapper, TCamera> {
                 bannerList.add(cameraDTO);
             }
         }
-        cameraParamInfo.setBannerList(collect);
-        cameraParamInfo.setRtmpUrl("http://" + cameraProperties.getRtmp().getWebrtchost());
-//        map.put("rtmpUrl", "http://" + cameraProperties.getRtmp().getWebrtchost());
+        cameraParamInfo.setBannerList(bannerList);
+        cameraParamInfo.setRtcUrl("http://" + cameraProperties.getRtmp().getWebrtchost());
         return cameraParamInfo;
     }
 

taphole-iron/src/main/java/com/sckj/iron/service/impl/TIronParamServiceImpl.java

@@ -180,6 +180,12 @@ public class TIronParamServiceImpl extends ServiceImpl<TIronParamMapper, TIronPa
             if (ObjectUtils.isNotEmpty(ironParam.getParamValue())) {
                 wrapper.set(TIronParam::getParamValue, ironParam.getParamValue());
             }
+            if (ObjectUtils.isNotEmpty(ironParam.getParamName())) {
+                wrapper.set(TIronParam::getParamName, ironParam.getParamName());
+            }
+            if (ObjectUtils.isNotEmpty(ironParam.getParamDesc())) {
+                wrapper.set(TIronParam::getParamDesc, ironParam.getParamDesc());
+            }
             update(wrapper);
         }
     }

taphole-iron/src/main/java/com/sckj/iron/socketio/DeviceEventListener.java

@@ -23,11 +23,14 @@ import com.sckj.opc.entity.OPCData;
 import com.sckj.opc.opcua.L2DataServiceImpl;
 import com.sckj.opc.service.OPCDataServiceImpl;
 import com.sckj.opc.utils.CustomUtil;
+import com.sckj.warn.entity.TAudio;
 import com.sckj.warn.service.ITExceptionLogService;
+import com.sckj.warn.service.impl.TAudioServiceImpl;
 import com.sckj.warn.validate.TExceptionLogCreateValidate;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.ObjectUtils;
 import org.springframework.beans.BeanUtils;
+import org.springframework.boot.autoconfigure.web.ServerProperties;
 import org.springframework.expression.spel.standard.SpelExpressionParser;
 import org.springframework.expression.spel.support.StandardEvaluationContext;
 import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
@@ -51,7 +54,7 @@ import java.util.stream.Collectors;
  */
 @Component
 @Slf4j
-public class DeviceEventListener extends EventListener {
+public class DeviceEventListener extends EventListener { // implements ApplicationListener<ApplicationStartedEvent>
 
     //步骤数据
     @Resource
@@ -90,6 +93,9 @@ public class DeviceEventListener extends EventListener {
     @Resource
     ITExceptionLogService exceptionLogService;
 
+    @Resource
+    TAudioServiceImpl audioService;
+
     //1号出铁状态标记
     private static final String TAG_TAPHOLE1_STATUS = "AOD25606.PV";
     //2号出铁状态标记
@@ -180,6 +186,15 @@ public class DeviceEventListener extends EventListener {
     //出铁参数
     private Map<String, TIronParam> mIronParamMap;
 
+    //出铁参数
+    private Map<String, TAudio> mIronAlarmMap;
+
+    private String alarmUrlOpen;
+
+    private String alarmUrlClose;
+
+    private String alramUrlTapping;
+
     //节点标记
     private static final String NODE = "node";
 
@@ -213,6 +228,64 @@ public class DeviceEventListener extends EventListener {
     //redis保存最多数量数据
     private static final int MAX_REDIS_COUNT = 50;
 
+    @Resource
+    private ServerProperties serverProperties;
+
+    private String getSchema() {
+        if (serverProperties.getSsl() != null && serverProperties.getSsl().isEnabled()) {
+            return "https";
+        }
+        return "http";
+    }
+
+//    @Override
+//    public void onApplicationEvent(ApplicationStartedEvent event) {
+//        try {
+//            // 获取服务器IP地址
+//            InetAddress localhost = InetAddress.getLocalHost();
+//            String ip = localhost.getHostAddress();
+//
+//            String host = localhost.getHostName();
+//
+//            // 获取服务器端口号
+//            int port = serverProperties.getPort() != null ? serverProperties.getPort() : 8080;
+//
+//            // 获取 schema
+//            String schema = getSchema();
+//            // 获取服务器端口号
+
+    /// /            int port = event.getApplicationContext()
+    /// /                    .getEnvironment()
+    /// /                    .getProperty("server.port", Integer.class, 8080);
+//
+//            System.out.println("Server IP: " + ip);
+//            System.out.println("Server Port: " + port);
+//            System.out.println("Server Schema: " + schema);
+//
+//            //预警的铃声
+//            List<TAudio> audioList = audioService.lambdaQuery().eq(TAudio::getDelFlag, "1").eq(TAudio::getStatus, "1").list();
+//            if (ObjectUtils.isNotEmpty(audioList)) {
+//                mIronAlarmMap = audioList.stream()
+//                        .collect(Collectors.toMap(TAudio::getExceptionType, ironAudio -> ironAudio, (existing, replacement) -> existing));
+//
+//                String uploadUrl = GlobalConfig.publicPrefix;
+//
+//                uploadUrl = schema + "://" + host + ":" + port + "/" + uploadUrl + "/";
+//
+//                log.info("uploadUrl:{}", uploadUrl);
+//
+//                alarmUrlOpen = UrlUtils.toAbsoluteUrl(mIronAlarmMap.get(TASKNAME_OPEN_WARN).getPath());
+//                alarmUrlClose = UrlUtils.toAbsoluteUrl(mIronAlarmMap.get(TASKNAME_CLOSE_WARN).getPath());
+//                alramUrlTapping = UrlUtils.toAbsoluteUrl(mIronAlarmMap.get(TASKNAME_TAPPING_WARN).getPath());
+//
+//                log.info("alarmUrlOpen:{}", alarmUrlOpen);
+//                log.info("alarmUrlClose:{}", alarmUrlClose);
+//                log.info("alramUrlTapping:{}", alramUrlTapping);
+//            }
+//        } catch (Exception e) {
+//            e.printStackTrace();
+//        }
+//    }
     @PostConstruct
     public void init() {
         //程序启动后隔断时间启动订阅
@@ -223,14 +296,16 @@ public class DeviceEventListener extends EventListener {
         });
 
         mSteps = ironStepService.getTreeSteps();
-        List<TIronParam> mIronParams = ironParamService.lambdaQuery().eq(TIronParam::getStatus, "1").eq(TIronParam::getParamType, "iron_judge").orderByAsc(TIronParam::getSort).list();
+        List<TIronParam> mIronParams = ironParamService.lambdaQuery().eq(TIronParam::getStatus, "1").in(TIronParam::getParamType, "iron_judge", "iron_judge2").orderByAsc(TIronParam::getSort).list();
         if (ObjectUtils.isNotEmpty(mIronParams)) {
             mIronParamMap = mIronParams.stream()
                     .collect(Collectors.toMap(TIronParam::getParamName, ironParam -> ironParam, (existing, replacement) -> existing));
             STANDARD_SPEED = new BigDecimal(mIronParamMap.get("iron_speed").getParamValue());
             PRESSURE_DIFF_VALUE = new BigDecimal(mIronParamMap.get("pressure_diff_value").getParamValue());
+            log.info("STANDARD_SPEED: {},PRESSURE_DIFF_VALUE:{}", STANDARD_SPEED, PRESSURE_DIFF_VALUE);
         }
 
+
     }
 
     /***
@@ -266,6 +341,7 @@ public class DeviceEventListener extends EventListener {
         taskExecutor.submit(() -> {
             tl2DataService.saveOrUpdate(tl2Data);
         });
+
         //将L2实时数据保存到Redis
         taskExecutor.submit(() -> {
             RedisUtils.addFixedElement(IRON_ELEMENT, l2Data, MAX_REDIS_COUNT);
@@ -355,7 +431,6 @@ public class DeviceEventListener extends EventListener {
             mTotalDry = BigDecimal.ZERO;
         }
 
-        RedisUtils.addFixedElement(IRON_TOTAL_DRY, mTotalDry, MAX_REDIS_COUNT);
 
     }
 
@@ -409,15 +484,15 @@ public class DeviceEventListener extends EventListener {
             log.info("堵口预警:{},speed1:{},speed2:{},STANDARD_SPEED:{}", speed1, speed2, TASKNAME_CLOSE_WARN);
             if (speed1.compareTo(STANDARD_SPEED) > 0 || speed2.compareTo(STANDARD_SPEED) > 0) {
                 //流速过大可能是由于铁口深度不足或发生跑大流问题，则提示将当前铁口堵口
-                PushData.send2Warn(WarnData.warnClose("流速过快,请将当前铁口堵口"));
+                PushData.send2Warn(WarnData.warnClose("流速过快,请将当前铁口堵口", alarmUrlClose));
                 exceptionLogService.add(TExceptionLogCreateValidate.builder().exceptionType(4).exceptionDesc("流速过快,请将当前铁口堵口").build());
             } else if ((speed1.compareTo(STANDARD_SPEED) < 0 || speed2.compareTo(STANDARD_SPEED) < 0) && (ironLoading2.get() || ironLoading3.get() || ironLoading4.get())) {
                 //若流速过小，但其它铁口正在出铁，则提示将当前铁口堵口
-                PushData.send2Warn(WarnData.warnClose("流速过小,请将当前铁口堵口"));
+                PushData.send2Warn(WarnData.warnClose("流速过小,请将当前铁口堵口", alarmUrlClose));
                 exceptionLogService.add(TExceptionLogCreateValidate.builder().exceptionType(4).exceptionDesc("流速过小,请将当前铁口堵口").build());
             } else if ((speed1.compareTo(STANDARD_SPEED) < 0 || speed2.compareTo(STANDARD_SPEED) < 0) && (!ironLoading2.get() && !ironLoading3.get() && !ironLoading4.get())) {
                 //若流速过小且其他铁口均未出铁，则提示先将其它铁口打开，再进行堵口
-                PushData.send2Warn(WarnData.warnClose("请先打开其它铁口,再堵口"));
+                PushData.send2Warn(WarnData.warnClose("请先打开其它铁口,再堵口", alarmUrlClose));
                 exceptionLogService.add(TExceptionLogCreateValidate.builder().exceptionType(4).exceptionDesc("请先打开其它铁口,再堵口").build());
             }
         });
@@ -442,7 +517,14 @@ public class DeviceEventListener extends EventListener {
             String elapsedTime = String.format("%02d:%02d:%02d", hours, minutes, seconds);
             log.info("elapsedTime:{}", elapsedTime);
             RedisUtils.addFixedElement(TASKNAME_TAPPING_CONSTTIME, elapsedTime, MAX_REDIS_COUNT);
-            PushData.send2CostTime(elapsedTime);
+
+
+            RealtimeData realtimeData = new RealtimeData();
+            realtimeData.setValue(elapsedTime);
+            realtimeData.setDesc("出铁计时");
+
+
+            PushData.send2CostTime(realtimeData);
             mSecondsElapsed.incrementAndGet();
         });
 
@@ -473,7 +555,7 @@ public class DeviceEventListener extends EventListener {
             //平均温度
             String mudWeight = fixedLatestElement.getAvgTemp();
             //出铁时间
-            String ironCosttime = fixedLatestElement.getIronCosttime();
+            //String ironCosttime = fixedLatestElement.getI
             //实际出铁量
             String ironWeight = fixedLatestElement.getIronWeight();
 
@@ -515,9 +597,7 @@ public class DeviceEventListener extends EventListener {
                 realtimeData.setDesc("铁水温度");
                 realtimeData.setTime(LocalDateUtils.formatDate(opcData.getServerTime()));
                 mRealtimeData.put(IRON_TEMP, realtimeData);
-                //redis添加数据
-                RedisUtils.addFixedElement(IRON_TEMP, realtimeData, MAX_REDIS_COUNT);
-                PushData.send2TrendIronTemp(RedisUtils.getFixedElement(IRON_TEMP, MAX_REDIS_COUNT));
+
             } else if (opcData.getPointName().contains(TAG_CAR11) || opcData.getPointName().contains(TAG_CAR12)) {
 //            1TH-1号车受铁速度
                 RealtimeData realtimeData = new RealtimeData();
@@ -552,8 +632,7 @@ public class DeviceEventListener extends EventListener {
                         && ObjectUtils.isNotEmpty(speeds[1]) && ObjectUtils.isNotEmpty(speeds[1].getValue())
                 ) {
                     ironSpeed.setTime(LocalDateUtils.formatDate(opcData.getServerTime()));
-                    RedisUtils.addFixedElement(IRON_SPEED, ironSpeed, MAX_REDIS_COUNT);
-                    PushData.send2TrendIronSpeed(RedisUtils.getFixedElement(IRON_SPEED, MAX_REDIS_COUNT));
+
                 }
             } else if (opcData.getPointName().contains(TAG_TAPHOLE1_STATUS)) {
                 RealtimeData realtimeData = new RealtimeData();
@@ -596,8 +675,7 @@ public class DeviceEventListener extends EventListener {
 //                log.info(">>>>>>>>>>>>>{}:{},total:{}", opcData.getPointName(), opcData.getData(), totalWeight.toPlainString());
 
                 ironWeight.setTime(LocalDateUtils.formatDate(opcData.getServerTime()));
-                RedisUtils.addFixedElement(IRON_WEIGHT, ironWeight, MAX_REDIS_COUNT);
-                PushData.send2TrendIronWeight(RedisUtils.getFixedElement(IRON_WEIGHT, MAX_REDIS_COUNT));
+
 
             } else if (opcData.getPointName().contains(FLUSH_STATUS)) {
                 RealtimeData realtimeData = new RealtimeData();
@@ -613,7 +691,7 @@ public class DeviceEventListener extends EventListener {
                 scheduledTaskManager.addTask(TASKNAME_TAPPING_WARN, 0, 3, TimeUnit.SECONDS, () -> {
                     //堵口预警
                     log.info("出铁预警:{}", TASKNAME_TAPPING_WARN);
-                    PushData.send2Warn(WarnData.warnTapping("压差超过阈值,请出铁"));
+                    PushData.send2Warn(WarnData.warnTapping("压差超过阈值,请出铁", alramUrlTapping));
                     exceptionLogService.add(TExceptionLogCreateValidate.builder().exceptionType(4).exceptionDesc("压差超过阈值,请出铁").build());
                 });
             } else {
@@ -623,11 +701,13 @@ public class DeviceEventListener extends EventListener {
 
         }
 
-        if (ObjectUtils.isNotEmpty(l2Data)) {
+        L2Data fixedLatestElement = (L2Data) RedisUtils.getFixedLatestElement(IRON_ELEMENT);
+
+        if (ObjectUtils.isNotEmpty(fixedLatestElement)) {
             //铁水成分
             //预计出铁结束时间
-            String elementSi = l2Data.getElementSi();
-            String elementS = l2Data.getElementS();
+            String elementSi = fixedLatestElement.getElementSi();
+            String elementS = fixedLatestElement.getElementS();
 
             RealtimeData realtimeData = new RealtimeData();
             realtimeData.setValue(elementSi);
@@ -796,7 +876,6 @@ public class DeviceEventListener extends EventListener {
             return;
         }
 
-
         log.info("--->userId : {}", userId);
         for (IronStepVO stepDTO : mSteps) {
             for (IronStepVO child : stepDTO.getChilds()) {
@@ -840,7 +919,7 @@ public class DeviceEventListener extends EventListener {
             stepDTO.setData(message.getData());
 
             //这里手动记录时间
-            log.info("userId:{},stepId:{},identifier:{},data:{},pass:{}", userId, message.getStepId(), message.getIdentifier(), message.getData(), message.isPass());
+            log.info("userId:{},stepId:{},identifier:{},data:{},pass:{}", userId, message.getStepId(), message.getIdentifier(), message.getData());
 
             return true;
         }

taphole-iron/src/main/java/com/sckj/iron/socketio/IronRealtimeListener.java

@@ -1,77 +0,0 @@
-package com.sckj.iron.socketio;
-
-import com.google.common.eventbus.Subscribe;
-import com.sckj.common.eventbus.EventListener;
-import com.sckj.common.socketio.SocketUtil;
-import com.sckj.iron.service.impl.TIronStepServiceImpl;
-import com.sckj.opc.entity.OPCData;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Component;
-
-import javax.annotation.Resource;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-
-/**
- * @Author feng
- * @Date 2024-11-19 上午 11:05
- * @Description 实时数据推送
- */
-@Component
-@Slf4j
-public class IronRealtimeListener extends EventListener {
-
-    @Resource
-    TIronStepServiceImpl ironStepService;
-
-
-
-    @Subscribe
-    public void onMessageEvent(OPCData opcData) {
-        if (SocketUtil.clientUserIds.isEmpty()) {
-            return;
-        }
-        realtime(opcData);
-    }
-
-    private Map<String,Object> mRealtimeMap = new ConcurrentHashMap<>();
-
-     {
-         //流速
-         mRealtimeMap.put("speed",0);
-         //流量
-         mRealtimeMap.put("flow",0);
-         //温度
-         mRealtimeMap.put("temp",0);
-         //成分
-         mRealtimeMap.put("element",0);
-
-         //开口或堵口  AOD25606.PV=0
-         //出铁时及拔炮 AOD25606.PV=1
-         //鱼雷罐车到位
-         //溜咀摆动
-         //冲渣启动           渣流量（L1）>0 下渣；渣流量（L1）= 0 下渣
-
-    }
-
-    /***
-     * 铁水成分
-     * 铁水流速
-     * 铁水流量
-     * 铁水温度
-     * @param opcData
-     */
-    private void realtime(OPCData opcData) {
-        String pointName = opcData.getPointName();
-        Object data = opcData.getData();
-
-        PushData.send2RealtimeData("");
-    }
-
-
-
-
-
-
-
-}

taphole-iron/src/main/java/com/sckj/iron/vo/IronStepVO.java

@@ -64,16 +64,5 @@ public class IronStepVO {
 
     private Map<String,Object>[] extraInfo;
 
-    public void setPass(){
-        this.passResult = 1;
-    }
-
-    public void setNotPass(){
-        this.passResult = 0;
-    }
-
-    public boolean ispass(){
-        return 1 == passResult;
-    }
 
 }

taphole-iron/src/main/resources/mapper/TL2DataMapper.xml

@@ -44,7 +44,7 @@
         FROM
             t_l2_data
         WHERE
-            create_time BETWEEN CURDATE() - INTERVAL (#{diffDays}-1) DAY AND NOW();
+            create_time BETWEEN CURDATE() - INTERVAL (#{diffDays}-1) DAY AND NOW()
         GROUP BY DATE(create_time)
         order by create_time asc
     </select>

taphole-warn/src/main/java/com/sckj/warn/service/impl/TAudioServiceImpl.java

@@ -1,6 +1,7 @@
 package com.sckj.warn.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.yulichang.query.MPJQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -34,7 +35,7 @@ import java.util.*;
  * @author zhanghao
  */
 @Service
-public class TAudioServiceImpl implements ITAudioService {
+public class TAudioServiceImpl extends ServiceImpl<TAudioMapper,TAudio> implements ITAudioService {
 
     @Resource
     TAudioMapper tAudioMapper;