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; 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>
@@ -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> <!--查询某段时间内是否有维修休班数据--> 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 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; 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); } 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));
