From 95cef064268b1c13b32111636c267871b54bb24b Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期日, 08 十月 2023 15:51:37 +0800
Subject: [PATCH] 列表设备排序按设备编号正序
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcEquipment.java | 10 +++++
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEquipmentMapper.xml | 6 ++
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEquipmentRepairMapper.xml | 17 ++++----
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEfficiencyReportServiceImpl.java | 12 ++---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEquipmentRunningSectionMapper.xml | 1
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentServiceImpl.java | 22 ++++++-----
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentAlarmAnalyzeServiceImpl.java | 4 +
7 files changed, 44 insertions(+), 28 deletions(-)
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcEquipment.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcEquipment.java
index 7464415..e84fcfd 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcEquipment.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcEquipment.java
@@ -121,6 +121,16 @@
@Excel(name = "璁惧鍔熺巼", width = 15)
@ApiModelProperty(value = "璁惧鍔熺巼")
private String devicePower;
+ /**
+ * 鍧愭爣-宸�
+ */
+ @ApiModelProperty(value = "鍧愭爣-宸�")
+ private Integer coordinateLeft;
+ /**
+ * 鍧愭爣-涓�
+ */
+ @ApiModelProperty(value = "鍧愭爣-涓�")
+ private Integer coordinateTop;
/**閮ㄩ棬鍚嶇О*/
private transient String orgCodeTxt;
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 15df7d9..880b1ad 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
@@ -58,6 +58,7 @@
WHERE
med.equipment_id = me.id
AND med.dep_id = #{ departId }
+ ORDER BY me.equipment_id
</select>
<!--鏍规嵁浜х嚎id鏌ヨ璁惧-->
@@ -70,6 +71,7 @@
WHERE
mpe.equipment_id = me.id
AND mpe.production_id = #{ productionId }
+ ORDER BY me.equipment_id
</select>
<!--鏍规嵁浜х嚎id鏌ヨ璁惧id闆嗗悎-->
@@ -129,7 +131,7 @@
k.equipment_type,
k.equipment_type_pictures
ORDER BY
- equipmentName
+ EquipmentID
</select>
<!--鏍规嵁閮ㄩ棬id鏌ヨ璁惧id闆嗗悎-->
@@ -166,6 +168,7 @@
#{id}
</foreach>
</where>
+ ORDER BY me.equipment_id
</select>
<!--鏍规嵁璁惧缂栧彿鏌ヨ璁惧淇℃伅鍜屼骇绾夸俊鎭�-->
@@ -188,6 +191,7 @@
#{id}
</foreach>
</where>
+ ORDER BY me.equipment_id
</select>
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEquipmentRepairMapper.xml b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEquipmentRepairMapper.xml
index 553523b..80e6716 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEquipmentRepairMapper.xml
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEquipmentRepairMapper.xml
@@ -5,30 +5,29 @@
<!-- 鏍规嵁杞﹂棿灞傜骇鏌ヨ璁惧缁翠慨鍒楄〃 -->
<select id="pageList" resultType="org.jeecg.modules.mdc.entity.MdcEquipmentRepair">
SELECT
- mer.*
+ *
FROM
- MDC_EQUIPMENT_REPAIR mer
- LEFT JOIN MDC_EQUIPMENT me ON mer.EQUIPMENT_ID = me.EQUIPMENT_ID
+ mdc_equipment_repair
WHERE 1=1
<if test="repair.equipmentName != null and repair.equipmentName != '' ">
- AND mer.EQUIPMENT_NAME LIKE CONCAT(CONCAT('%',#{repair.equipmentName}),'%')
+ AND equipment_name LIKE CONCAT(CONCAT('%',#{repair.equipmentName}),'%')
</if>
<if test="repair.equipmentId != null and repair.equipmentId != '' ">
- AND mer.EQUIPMENT_ID LIKE CONCAT(CONCAT('%',#{repair.equipmentId}),'%')
+ AND equipment_id LIKE CONCAT(CONCAT('%',#{repair.equipmentId}),'%')
</if>
<if test="repair.startTime != null ">
- AND mer.END_TIME >= #{ repair.startTime }
+ AND end_time >= #{ repair.startTime }
</if>
<if test="repair.endTime != null ">
- AND mer.START_TIME <= #{ repair.endTime }
+ AND start_time <= #{ repair.endTime }
</if>
<if test="repair.mdcSectionIds != null and repair.mdcSectionIds.size() > 0 ">
- AND mer.EQUIPMENT_ID IN
+ AND equipment_id IN
<foreach collection="repair.mdcSectionIds" item="id" index="index" open="(" close=")" separator=",">
#{ id }
</foreach>
</if>
- ORDER BY START_TIME ASC
+ ORDER BY start_time ASC,equipment_id ASC
</select>
<!--鏌ヨ鏌愭鏃堕棿鍐呮槸鍚︽湁缁翠慨浼戠彮鏁版嵁-->
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEquipmentRunningSectionMapper.xml b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEquipmentRunningSectionMapper.xml
index a733f7c..003fed6 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEquipmentRunningSectionMapper.xml
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEquipmentRunningSectionMapper.xml
@@ -86,6 +86,7 @@
</if>
AND (start_time <= #{ vo.endDate } AND end_time >= #{ vo.startDate })
AND status = '22'
+ AND alarm != ''
</where>
ORDER BY
start_time
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEfficiencyReportServiceImpl.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEfficiencyReportServiceImpl.java
index 8244246..95e1d70 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEfficiencyReportServiceImpl.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEfficiencyReportServiceImpl.java
@@ -1,9 +1,7 @@
package org.jeecg.modules.mdc.service.impl;
-import com.alipay.api.domain.NewsfeedMediaGiftInfo;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import org.apache.commons.lang3.StringUtils;
-import org.checkerframework.checker.units.qual.A;
import org.jeecg.common.constant.CommonConstant;
import org.jeecg.common.exception.JeecgBootException;
import org.jeecg.modules.mdc.dto.*;
@@ -11,8 +9,8 @@
import org.jeecg.modules.mdc.mapper.MdcEfficiencyReportMapper;
import org.jeecg.modules.mdc.service.*;
import org.jeecg.modules.mdc.util.DateUtils;
-import org.jeecg.modules.mdc.vo.*;
import org.jeecg.modules.mdc.vo.MdcUtilizationRateDto;
+import org.jeecg.modules.mdc.vo.*;
import org.jeecg.modules.system.entity.MdcProduction;
import org.jeecg.modules.system.entity.SysDepart;
import org.jeecg.modules.system.service.IMdcProductionService;
@@ -21,8 +19,7 @@
import javax.annotation.Resource;
import java.math.BigDecimal;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
+import java.text.Collator;
import java.time.LocalDate;
import java.time.format.DateTimeFormatter;
import java.time.temporal.ChronoUnit;
@@ -230,7 +227,7 @@
listDtos.add(mdcEfficiencyListDto);
}
}
-
+ listDtos.sort(((o1, o2) -> Collator.getInstance(Locale.TRADITIONAL_CHINESE).compare(o1.getLevel3(), o2.getLevel3())));
result.setMdcEfficiencyList(listDtos);
}
@@ -410,7 +407,7 @@
listDtos.add(mdcEfficiencyListDto);
}
}
-
+ listDtos.sort(((o1, o2) -> Collator.getInstance(Locale.TRADITIONAL_CHINESE).compare(o1.getLevel3(), o2.getLevel3())));
result.setMdcEfficiencyList(listDtos);
}
@@ -633,6 +630,7 @@
listDtos.add(mdcEfficiencyShiftListDto);
}
}
+ listDtos.sort(((o1, o2) -> Collator.getInstance(Locale.TRADITIONAL_CHINESE).compare(o1.getLevel3(), o2.getLevel3())));
result.setMdcEfficiencyList(listDtos);
}
return result;
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentAlarmAnalyzeServiceImpl.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentAlarmAnalyzeServiceImpl.java
index 23303ef..8a2380f 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentAlarmAnalyzeServiceImpl.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentAlarmAnalyzeServiceImpl.java
@@ -125,7 +125,9 @@
mdcAlarmDto.setKey(equipmentId);
Integer count = mdcEquipmentRunningSectionService.findAlarmCount(equipmentId, startDate, endDate, vo.getAlarmCode());
mdcAlarmDto.setCount(count);
- equipmentCountList.add(mdcAlarmDto);
+ if (count != 0) {
+ equipmentCountList.add(mdcAlarmDto);
+ }
}
result.setEquipmentCountList(equipmentCountList);
}
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 4a9d25f..9dc6fee 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
@@ -70,14 +70,14 @@
private IEquipmentWorkLineService equipmentWorkLineService;
@Resource
private IMdcDriveTypeParamConfigService mdcDriveTypeParamConfigService;
- @Resource
- private XYZAliasesMapper xyzAliasesMapper;
- @Resource
- private IEquipmentXYZService equipmentXYZService;
- @Resource
- private IEquipmentBaseInfoService equipmentBaseInfoService;
- @Resource
- private IEquipmentTemperatureService equipmentTemperatureService;
+// @Resource
+// private XYZAliasesMapper xyzAliasesMapper;
+// @Resource
+// private IEquipmentXYZService equipmentXYZService;
+// @Resource
+// private IEquipmentBaseInfoService equipmentBaseInfoService;
+// @Resource
+// private IEquipmentTemperatureService equipmentTemperatureService;
@Override
public Map<String, String> getDepNamesByEquipmentIds(List<String> equipmentIds) {
@@ -349,10 +349,12 @@
mdcEquipmentDto.setDevicePower(mdcEquipment.getDevicePower());
mdcEquipmentDto.setDeviceType(mdcEquipment.getDriveType());
mdcEquipmentDto.setRemark(mdcEquipment.getRemark());
- mdcEquipmentDto.setEquipmentID(mdcEquipment.getEquipmentId());//璁惧缂栧彿
+ //璁惧缂栧彿
+ mdcEquipmentDto.setEquipmentID(mdcEquipment.getEquipmentId());
mdcEquipmentDto.setEquipmentName(mdcEquipment.getEquipmentName());
mdcEquipmentDto.setEquipmentIP(mdcEquipment.getEquipmentIp());
- mdcEquipmentDto.setEquipmentModel(mdcEquipment.getEquipmentModel());//璁惧鍨嬪彿
+ //璁惧鍨嬪彿
+ mdcEquipmentDto.setEquipmentModel(mdcEquipment.getEquipmentModel());
mdcEquipmentDto.setDriveType(mdcEquipment.getDriveType());
mdcEquipmentDto.setDataPort(mdcEquipment.getDataPort());
mdcEquipmentDto.setDataFlag(Integer.parseInt(CommonConstant.STATUS_1));
--
Gitblit v1.9.3