From faa87b7860247e7d748896367b487f7fb7952b94 Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期五, 01 三月 2024 15:33:48 +0800
Subject: [PATCH] mdc设备运行参数超限算法更新
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcOverrunAlarmServiceImpl.java | 9 ++
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/MdcOverrunAlarmMapper.java | 12 +++
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEquipmentMapper.xml | 5 -
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/job/RunMonitoringSpeedJob.java | 6
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcOverrunAlarmController.java | 9 +-
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentServiceImpl.java | 133 ++++++++++++++++++++++-----------
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcOverrunAlarmMapper.xml | 20 +++++
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcOverrunAlarmService.java | 15 +++
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/MdcEquipmentMapper.java | 6 +
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcEquipmentService.java | 2
10 files changed, 157 insertions(+), 60 deletions(-)
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcOverrunAlarmController.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcOverrunAlarmController.java
index d483bc0..441ee91 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcOverrunAlarmController.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcOverrunAlarmController.java
@@ -11,6 +11,7 @@
import org.jeecg.common.aspect.annotation.AutoLog;
import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.modules.mdc.entity.MdcEquipment;
import org.jeecg.modules.mdc.entity.MdcOverrunAlarm;
import org.jeecg.modules.mdc.service.IMdcOverrunAlarmService;
import org.springframework.web.bind.annotation.*;
@@ -39,7 +40,7 @@
/**
* 鍒嗛〉鍒楄〃鏌ヨ
*
- * @param mdcOverrunAlarm
+ * @param mdcEquipment
* @param pageNo
* @param pageSize
* @param req
@@ -48,13 +49,13 @@
@AutoLog(value = "mdc瓒呴檺鎶ヨ-鍒嗛〉鍒楄〃鏌ヨ")
@ApiOperation(value = "mdc瓒呴檺鎶ヨ-鍒嗛〉鍒楄〃鏌ヨ", notes = "mdc瓒呴檺鎶ヨ-鍒嗛〉鍒楄〃鏌ヨ")
@GetMapping(value = "/list")
- public Result<?> queryPageList(MdcOverrunAlarm mdcOverrunAlarm,
+ public Result<?> queryPageList(MdcEquipment mdcEquipment,
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
HttpServletRequest req) {
- QueryWrapper<MdcOverrunAlarm> queryWrapper = QueryGenerator.initQueryWrapper(mdcOverrunAlarm, req.getParameterMap());
+ //QueryWrapper<MdcOverrunAlarm> queryWrapper = QueryGenerator.initQueryWrapper(mdcOverrunAlarm, req.getParameterMap());
Page<MdcOverrunAlarm> page = new Page<MdcOverrunAlarm>(pageNo, pageSize);
- IPage<MdcOverrunAlarm> pageList = mdcOverrunAlarmService.page(page, queryWrapper);
+ IPage<MdcOverrunAlarm> pageList = mdcOverrunAlarmService.pageList(page, mdcEquipment, req);
return Result.OK(pageList);
}
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/job/RunMonitoringSpeedJob.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/job/RunMonitoringSpeedJob.java
index 6e1e457..ae0c2d4 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/job/RunMonitoringSpeedJob.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/job/RunMonitoringSpeedJob.java
@@ -17,7 +17,7 @@
/**
* @author Lius
- * @Description: 鐩戞帶璁惧杞�熶换鍔�
+ * @Description: 鐩戞帶璁惧杩愯鍙傛暟浠诲姟
* @date 2024/1/16 17:36
*/
@PersistJobDataAfterExecution
@@ -45,7 +45,7 @@
if (byJobClassName != null && !byJobClassName.isEmpty()) {
quartzLog.setJobId(byJobClassName.get(0).getId());
}
- log.info("鐩戞帶璁惧杞�熶换鍔� RunMonitoringSpeedJob start! 鏃堕棿:" + DateUtils.now());
+ log.info("鐩戞帶璁惧杩愯鍙傛暟浠诲姟 RunMonitoringSpeedJob start! 鏃堕棿:" + DateUtils.now());
long startTime = System.currentTimeMillis();
try {
mdcEquipmentService.monitoringSpeedProcess();
@@ -54,7 +54,7 @@
quartzLog.setIsSuccess(-1);
quartzLog.setExceptionDetail(ThrowableUtil.getStackTrace(e));
// 鍙戦�佹秷鎭�氱煡
- sysAnnouncementService.jobSendMessage("鐩戞帶璁惧杞�熶换鍔″け璐ワ紒", quartzLog.getExceptionDetail());
+ sysAnnouncementService.jobSendMessage("鐩戞帶璁惧杩愯鍙傛暟浠诲姟锛�", quartzLog.getExceptionDetail());
}
long endTime = System.currentTimeMillis();
quartzLog.setExecutionTime(Integer.parseInt(String.valueOf(endTime - startTime)));
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/MdcEquipmentMapper.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/MdcEquipmentMapper.java
index 12f4455..80a03f4 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/MdcEquipmentMapper.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/MdcEquipmentMapper.java
@@ -5,9 +5,9 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
import org.jeecg.modules.mdc.dto.MdcEquDepDto;
import org.jeecg.modules.mdc.dto.MdcEquProDto;
-import org.jeecg.modules.mdc.dto.MdcEquipmentDto;
import org.jeecg.modules.mdc.entity.MdcEquipment;
import org.jeecg.modules.mdc.entity.MdcEquipmentMonitor;
import org.jeecg.modules.mdc.vo.MdcEquipmentDepVo;
@@ -16,6 +16,7 @@
import org.jeecg.modules.mdc.vo.WorkshopEquipmentVo;
import java.util.List;
+import java.util.Map;
/**
* @Description: 璁惧琛�
@@ -97,7 +98,8 @@
IPage<MdcEquipment> pageList(Page<MdcEquipment> page, @Param("mdcEquipment") MdcEquipmentVo mdcEquipment);
@InterceptorIgnore(tenantLine = "1")
- MdcEquipmentDto getWorkLineLast(@Param("tableName") String saveTableName);
+ @Select("select TOP 1 CollectTime ${columns} from [${tableName}] order by CollectTime desc")
+ Map<String, Object> getWorkLineLast(Map<String, Object> param);
/**
* 瀵煎嚭list
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/MdcOverrunAlarmMapper.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/MdcOverrunAlarmMapper.java
index 11e5f10..6d5acd5 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/MdcOverrunAlarmMapper.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/MdcOverrunAlarmMapper.java
@@ -2,6 +2,10 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.apache.ibatis.annotations.Param;
+import org.jeecg.modules.mdc.entity.MdcEquipment;
import org.jeecg.modules.mdc.entity.MdcOverrunAlarm;
/**
@@ -12,4 +16,12 @@
*/
public interface MdcOverrunAlarmMapper extends BaseMapper<MdcOverrunAlarm> {
+ /**
+ * 鍒嗛〉鏌ヨ
+ *
+ * @param page
+ * @param mdcEquipment
+ * @return
+ */
+ IPage<MdcOverrunAlarm> pageList(Page<MdcOverrunAlarm> page, @Param("mdcEquipment") MdcEquipment mdcEquipment);
}
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEquipmentMapper.xml b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEquipmentMapper.xml
index 1d402c2..657bada 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEquipmentMapper.xml
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEquipmentMapper.xml
@@ -248,11 +248,6 @@
order by t1.sort_no
</select>
-
- <select id="getWorkLineLast" resultType="org.jeecg.modules.mdc.dto.MdcEquipmentDto">
- select top 1 spindlespeed, actualspindlespeed from [${tableName}] order by CollectTime desc
- </select>
-
<select id="exportXlsList" resultType="org.jeecg.modules.mdc.entity.MdcEquipment">
SELECT
t1.*
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcOverrunAlarmMapper.xml b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcOverrunAlarmMapper.xml
index 1e973c5..9fdc3e5 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcOverrunAlarmMapper.xml
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcOverrunAlarmMapper.xml
@@ -2,4 +2,24 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.jeecg.modules.mdc.mapper.MdcOverrunAlarmMapper">
+ <select id="pageList" resultType="org.jeecg.modules.mdc.entity.MdcOverrunAlarm">
+ SELECT
+ t1.*
+ FROM
+ mdc_overrun_alarm t1
+ LEFT JOIN mdc_equipment t2 ON t1.equipment_id = t2.equipment_id
+ <where>
+ <if test="mdcEquipment.equipmentId != null and mdcEquipment.equipmentId != '' ">
+ AND t1.equipment_id LIKE CONCAT(CONCAT('%',#{mdcEquipment.equipmentId}),'%')
+ </if>
+ <if test="mdcEquipment.equipmentType != null and mdcEquipment.equipmentType != '' ">
+ AND t2.equipmentType = #{mdcEquipment.equipmentType}
+ </if>
+ <if test="mdcEquipment.driveType != null and mdcEquipment.driveType != '' ">
+ AND t2.drive_type = #{mdcEquipment.driveType}
+ </if>
+ </where>
+ ORDER BY
+ create_time DESC
+ </select>
</mapper>
\ No newline at end of file
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcEquipmentService.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcEquipmentService.java
index 3e6bd35..92c63bd 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcEquipmentService.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcEquipmentService.java
@@ -178,7 +178,7 @@
IPage<MdcEquipment> pageList(Page<MdcEquipment> page, MdcEquipmentVo mdcEquipment, HttpServletRequest req);
/**
- * 鐩戞帶璁惧杞�熶换鍔�
+ * 鐩戞帶璁惧杩愯鍙傛暟浠诲姟
*/
void monitoringSpeedProcess();
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcOverrunAlarmService.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcOverrunAlarmService.java
index 47054fe..ce75112 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcOverrunAlarmService.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcOverrunAlarmService.java
@@ -1,8 +1,13 @@
package org.jeecg.modules.mdc.service;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.mdc.entity.MdcEquipment;
import org.jeecg.modules.mdc.entity.MdcOverrunAlarm;
+
+import javax.servlet.http.HttpServletRequest;
/**
* @Description: mdc瓒呴檺鎶ヨ
@@ -12,4 +17,14 @@
*/
public interface IMdcOverrunAlarmService extends IService<MdcOverrunAlarm> {
+ /**
+ * 鍒嗛〉鍒楄〃鏌ヨ
+ *
+ * @param page
+ * @param mdcEquipment
+ * @param req
+ * @return
+ */
+ IPage<MdcOverrunAlarm> pageList(Page<MdcOverrunAlarm> page, MdcEquipment mdcEquipment, HttpServletRequest req);
+
}
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentServiceImpl.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentServiceImpl.java
index 9648ae1..5891439 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentServiceImpl.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentServiceImpl.java
@@ -9,7 +9,6 @@
import org.jeecg.common.api.dto.message.MessageDTO;
import org.jeecg.common.constant.CommonConstant;
import org.jeecg.common.system.api.ISysBaseAPI;
-import org.jeecg.common.system.vo.DictModel;
import org.jeecg.common.util.oConvertUtils;
import org.jeecg.modules.mdc.dto.MdcEquDepDto;
import org.jeecg.modules.mdc.dto.MdcEquProDto;
@@ -32,7 +31,10 @@
import org.jeecg.modules.system.entity.SysDepart;
import org.jeecg.modules.system.mapper.MdcEquipmentDepartMapper;
import org.jeecg.modules.system.mapper.MdcProductionEquipmentMapper;
-import org.jeecg.modules.system.service.*;
+import org.jeecg.modules.system.service.IMdcProductionService;
+import org.jeecg.modules.system.service.IMdcUserProductionService;
+import org.jeecg.modules.system.service.ISysDepartService;
+import org.jeecg.modules.system.service.ISysUserDepartService;
import org.springframework.cache.annotation.CacheEvict;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -82,13 +84,16 @@
private IEquipmentBaseInfoService equipmentBaseInfoService;
@Resource
- private ISysDictService sysDictService;
-
- @Resource
private ISysBaseAPI sysBaseApi;
@Resource
private IMdcAlarmInfoService mdcAlarmInfoService;
+
+ @Resource
+ private IMdcEquipmentThresholdService mdcEquipmentThresholdService;
+
+ @Resource
+ private IMdcOverrunAlarmService mdcOverrunAlarmService;
@Override
@@ -735,57 +740,95 @@
}
/**
- * 鐩戞帶璁惧杞�熶换鍔�
+ * 鐩戞帶璁惧杩愯鍙傛暟浠诲姟
*/
@Override
public void monitoringSpeedProcess() {
- List<MdcEquipment> equipmentList = super.list(new LambdaQueryWrapper<MdcEquipment>().eq(MdcEquipment::getDriveType, "FANUC"));
+// List<MdcEquipment> equipmentList = super.list(new LambdaQueryWrapper<MdcEquipment>().eq(MdcEquipment::getDriveType, "FANUC"));
+ List<MdcEquipment> equipmentList = super.list();
//List<MdcEquipment> equipmentList = super.list(new LambdaQueryWrapper<MdcEquipment>().eq(MdcEquipment::getEquipmentId, "2140198"));
- // 鑾峰彇瀛楀吀鏁版嵁
- List<DictModel> dictModelList = sysDictService.queryEnableDictItemsByCode(CommonConstant.DICT_OPERATING_SPEED_RANGE);
- Integer range = 0;
- if (dictModelList != null && !dictModelList.isEmpty()) {
- range = Integer.valueOf(dictModelList.get(0).getValue());
- }
+
for (MdcEquipment mdcEquipment : equipmentList) {
- String saveTableName = mdcEquipment.getSaveTableName();
- //鏌ヨ鍗曡〃鏁版嵁
- MdcEquipmentDto mdcEquipmentDto = this.baseMapper.getWorkLineLast(saveTableName);
- if (mdcEquipmentDto != null) {
- MessageDTO messageDTO = new MessageDTO();
- messageDTO.setTitle("璁惧杩愯杞�熸姤璀︼紒");
- messageDTO.setCategory("棰勮娑堟伅");
- messageDTO.setFromUser("admin");
- messageDTO.setToUser("admin");
- Integer spindlespeed = Integer.valueOf(mdcEquipmentDto.getSpindlespeed());
- Integer actualspindlespeed = Integer.valueOf(mdcEquipmentDto.getActualspindlespeed());
- if (range.equals(0)) {
- if (spindlespeed > actualspindlespeed) {
- // 瀹為檯鍊煎ぇ浜庤瀹氬�� 楂�
- messageDTO.setContent("璁惧缂栧彿涓� [" + mdcEquipment.getEquipmentId() + "] 鐨勮澶囪繍琛岃浆閫熼珮鎶ヨ锛�");
- sysBaseApi.sendSysAnnouncement(messageDTO);
- } else if (spindlespeed < actualspindlespeed) {
- // 瀹為檯鍊煎皬浜庤瀹氬�� 浣�
- messageDTO.setContent("璁惧缂栧彿涓� [" + mdcEquipment.getEquipmentId() + "] 鐨勮澶囪繍琛岃浆閫熶綆鎶ヨ锛�");
- sysBaseApi.sendSysAnnouncement(messageDTO);
- }
- } else {
- int max = actualspindlespeed + actualspindlespeed * (range / 100);
- int min = actualspindlespeed - actualspindlespeed * (range / 100);
- if (spindlespeed > max || spindlespeed < min) {
- if (spindlespeed > actualspindlespeed) {
- // 瀹為檯鍊煎ぇ浜庤瀹氬�� 楂�
- messageDTO.setContent("璁惧缂栧彿涓� [" + mdcEquipment.getEquipmentId() + "] 鐨勮澶囪繍琛岃浆閫熼珮鎶ヨ锛�");
+ List<MdcEquipmentThreshold> mdcEquipmentThresholdList = mdcEquipmentThresholdService.list(new LambdaQueryWrapper<MdcEquipmentThreshold>().eq(MdcEquipmentThreshold::getControlSystemType, mdcEquipment.getDriveType()));
+ if (mdcEquipmentThresholdList != null && !mdcEquipmentThresholdList.isEmpty()) {
+ String saveTableName = mdcEquipment.getSaveTableName();
+ StringBuilder builder = new StringBuilder();
+ for (MdcEquipmentThreshold mdcEquipmentThreshold : mdcEquipmentThresholdList) {
+ builder.append(",").append(mdcEquipmentThreshold.getEnglishName()).append(" as \"").append(mdcEquipmentThreshold.getEnglishName()).append("\" ");
+ }
+ Map<String, Object> param = new HashMap<>();
+ param.put("columns", builder.toString());
+ param.put("tableName", saveTableName);
+ Map<String, Object> map = this.baseMapper.getWorkLineLast(param);
+ if (map != null) {
+ for (MdcEquipmentThreshold mdcEquipmentThreshold : mdcEquipmentThresholdList) {
+ Integer actualValue = Integer.valueOf(map.get(mdcEquipmentThreshold.getEnglishName()).toString());
+ Integer max = mdcEquipmentThreshold.getMaxThreshold();
+ Integer min = mdcEquipmentThreshold.getMinThreshold();
+ MessageDTO messageDTO = new MessageDTO();
+ messageDTO.setTitle("璁惧" + mdcEquipmentThreshold.getChineseName() + "鎶ヨ锛�");
+ messageDTO.setCategory("棰勮娑堟伅");
+ messageDTO.setFromUser("admin");
+ messageDTO.setToUser("admin");
+ MdcOverrunAlarm mdcOverrunAlarm = new MdcOverrunAlarm();
+ mdcOverrunAlarm.setEquipmentId(mdcEquipment.getEquipmentId());
+ mdcOverrunAlarm.setSetValue(min + "-" + max);
+ mdcOverrunAlarm.setRealValue(actualValue.toString());
+ if (actualValue > max) {
+ // 楂�
+ messageDTO.setContent("璁惧缂栧彿涓� [" + mdcEquipment.getEquipmentId() + "] 鐨勮澶�" + mdcEquipmentThreshold.getChineseName() + "楂樻姤璀︼紒");
sysBaseApi.sendSysAnnouncement(messageDTO);
- } else if (spindlespeed < actualspindlespeed) {
- // 瀹為檯鍊煎皬浜庤瀹氬�� 浣�
- messageDTO.setContent("璁惧缂栧彿涓� [" + mdcEquipment.getEquipmentId() + "] 鐨勮澶囪繍琛岃浆閫熶綆鎶ヨ锛�");
+ mdcOverrunAlarm.setAlarmContent(mdcEquipmentThreshold.getChineseName() + "楂樻姤璀�");
+ mdcOverrunAlarmService.save(mdcOverrunAlarm);
+ } else if (actualValue < min) {
+ // 浣�
+ messageDTO.setContent("璁惧缂栧彿涓� [" + mdcEquipment.getEquipmentId() + "] 鐨勮澶�" + mdcEquipmentThreshold.getChineseName() + "浣庢姤璀︼紒");
sysBaseApi.sendSysAnnouncement(messageDTO);
+ mdcOverrunAlarm.setAlarmContent(mdcEquipmentThreshold.getChineseName() + "浣庢姤璀�");
+ mdcOverrunAlarmService.save(mdcOverrunAlarm);
}
}
}
-
}
+
+
+// //鏌ヨ鍗曡〃鏁版嵁
+// MdcEquipmentDto mdcEquipmentDto = this.baseMapper.getWorkLineLast(saveTableName);
+// if (mdcEquipmentDto != null) {
+// MessageDTO messageDTO = new MessageDTO();
+// messageDTO.setTitle("璁惧杩愯杞�熸姤璀︼紒");
+// messageDTO.setCategory("棰勮娑堟伅");
+// messageDTO.setFromUser("admin");
+// messageDTO.setToUser("admin");
+// Integer spindlespeed = Integer.valueOf(mdcEquipmentDto.getSpindlespeed());
+// Integer actualspindlespeed = Integer.valueOf(mdcEquipmentDto.getActualspindlespeed());
+// if (range.equals(0)) {
+// if (spindlespeed > actualspindlespeed) {
+// // 瀹為檯鍊煎ぇ浜庤瀹氬�� 楂�
+// messageDTO.setContent("璁惧缂栧彿涓� [" + mdcEquipment.getEquipmentId() + "] 鐨勮澶囪繍琛岃浆閫熼珮鎶ヨ锛�");
+// sysBaseApi.sendSysAnnouncement(messageDTO);
+// } else if (spindlespeed < actualspindlespeed) {
+// // 瀹為檯鍊煎皬浜庤瀹氬�� 浣�
+// messageDTO.setContent("璁惧缂栧彿涓� [" + mdcEquipment.getEquipmentId() + "] 鐨勮澶囪繍琛岃浆閫熶綆鎶ヨ锛�");
+// sysBaseApi.sendSysAnnouncement(messageDTO);
+// }
+// } else {
+// int max = actualspindlespeed + actualspindlespeed * (range / 100);
+// int min = actualspindlespeed - actualspindlespeed * (range / 100);
+// if (spindlespeed > max || spindlespeed < min) {
+// if (spindlespeed > actualspindlespeed) {
+// // 瀹為檯鍊煎ぇ浜庤瀹氬�� 楂�
+// messageDTO.setContent("璁惧缂栧彿涓� [" + mdcEquipment.getEquipmentId() + "] 鐨勮澶囪繍琛岃浆閫熼珮鎶ヨ锛�");
+// sysBaseApi.sendSysAnnouncement(messageDTO);
+// } else if (spindlespeed < actualspindlespeed) {
+// // 瀹為檯鍊煎皬浜庤瀹氬�� 浣�
+// messageDTO.setContent("璁惧缂栧彿涓� [" + mdcEquipment.getEquipmentId() + "] 鐨勮澶囪繍琛岃浆閫熶綆鎶ヨ锛�");
+// sysBaseApi.sendSysAnnouncement(messageDTO);
+// }
+// }
+// }
+//
+// }
}
}
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcOverrunAlarmServiceImpl.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcOverrunAlarmServiceImpl.java
index 9a7407a..3e46eff 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcOverrunAlarmServiceImpl.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcOverrunAlarmServiceImpl.java
@@ -1,11 +1,16 @@
package org.jeecg.modules.mdc.service.impl;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.jeecg.modules.mdc.entity.MdcEquipment;
import org.jeecg.modules.mdc.entity.MdcOverrunAlarm;
import org.jeecg.modules.mdc.mapper.MdcOverrunAlarmMapper;
import org.jeecg.modules.mdc.service.IMdcOverrunAlarmService;
import org.springframework.stereotype.Service;
+
+import javax.servlet.http.HttpServletRequest;
/**
* @Description: mdc瓒呴檺鎶ヨ
@@ -16,4 +21,8 @@
@Service
public class MdcOverrunAlarmServiceImpl extends ServiceImpl<MdcOverrunAlarmMapper, MdcOverrunAlarm> implements IMdcOverrunAlarmService {
+ @Override
+ public IPage<MdcOverrunAlarm> pageList(Page<MdcOverrunAlarm> page, MdcEquipment mdcEquipment, HttpServletRequest req) {
+ return this.baseMapper.pageList(page, mdcEquipment);
+ }
}
--
Gitblit v1.9.3