lxzn-module-mdc/src/main/java/org/jeecg/modules/board/controller/DtBoardController.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
lxzn-module-mdc/src/main/java/org/jeecg/modules/board/mapper/DtBoardMapper.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
lxzn-module-mdc/src/main/java/org/jeecg/modules/board/mapper/xml/DtBoardMapper.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
lxzn-module-mdc/src/main/java/org/jeecg/modules/board/service/IDtBoardService.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
lxzn-module-mdc/src/main/java/org/jeecg/modules/board/service/impl/DtBoardServiceImpl.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
lxzn-module-mdc/src/main/java/org/jeecg/modules/board/vo/EquRepair.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
lxzn-module-msi/src/main/java/org/jeecg/modules/msi/utils/WebServiceUtil.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
lxzn-module-mdc/src/main/java/org/jeecg/modules/board/controller/DtBoardController.java
@@ -85,11 +85,12 @@ return Result.OK(result); } // @ApiOperation(value = "鏁板瓧瀛敓鐪嬫澘-璁惧鏁呴殰", notes = "鏁板瓧瀛敓鐪嬫澘-璁惧鏁呴殰") // @GetMapping("/equAlarmList") // public Result<?> equAlarmList(@ApiParam(value = "productionId", required = true) String productionId) { // dtBoardService. // } @ApiOperation(value = "鏁板瓧瀛敓鐪嬫澘-璁惧鏁呴殰", notes = "鏁板瓧瀛敓鐪嬫澘-璁惧鏁呴殰") @GetMapping("/equRepairList") public Result<?> equRepairList(@ApiParam(value = "productionId", required = true) String productionId) { List<EquRepair> result = dtBoardService.equRepairList(productionId); return Result.OK(result); } } lxzn-module-mdc/src/main/java/org/jeecg/modules/board/mapper/DtBoardMapper.java
对比新文件 @@ -0,0 +1,17 @@ package org.jeecg.modules.board.mapper; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.jeecg.modules.board.vo.EquRepair; import java.util.List; /** * @Author: Lius * @CreateTime: 2025-06-11 * @Description: */ @Mapper public interface DtBoardMapper { List<EquRepair> equRepairList(@Param("equipmentIdList") List<String> equipmentIdList, @Param("date") String date); } lxzn-module-mdc/src/main/java/org/jeecg/modules/board/mapper/xml/DtBoardMapper.xml
对比新文件 @@ -0,0 +1,27 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <mapper namespace="org.jeecg.modules.board.mapper.DtBoardMapper"> <select id="equRepairList" resultType="org.jeecg.modules.board.vo.EquRepair"> SELECT t3.equipment_code equipmentId, COUNT(*) faultNum, ROUND( SUM(DATEDIFF(MINUTE, t2.fault_start_time, t1.actual_end_time)) / 60.0, 2 ) faultTime FROM eam_repair_order t1 LEFT JOIN eam_report_repair t2 ON t1.report_id = t2.id LEFT JOIN eam_equipment t3 ON t1.equipment_id = t3.id WHERE t1.repair_status = 'COMPLETE' AND t2.fault_start_time > #{date} AND t3.equipment_code IN <foreach collection="equipmentIdList" item="id" index="index" open="(" close=")" separator=","> #{ id } </foreach> GROUP BY t3.equipment_code </select> </mapper> lxzn-module-mdc/src/main/java/org/jeecg/modules/board/service/IDtBoardService.java
@@ -27,4 +27,6 @@ List<EquDowntimeInfo> equDowntimeStatistics(String productionId); List<EquAlarm> equAlarmList(String productionId); List<EquRepair> equRepairList(String productionId); } lxzn-module-mdc/src/main/java/org/jeecg/modules/board/service/impl/DtBoardServiceImpl.java
@@ -5,8 +5,10 @@ import org.apache.commons.lang3.StringUtils; import org.jeecg.common.constant.CommonConstant; import org.jeecg.common.system.vo.DictModel; import org.jeecg.modules.board.mapper.DtBoardMapper; import org.jeecg.modules.board.service.IDtBoardService; import org.jeecg.modules.board.vo.*; import org.jeecg.modules.eam.service.IEamRepairOrderService; import org.jeecg.modules.mdc.constant.MdcConstant; import org.jeecg.modules.mdc.entity.*; import org.jeecg.modules.mdc.service.*; @@ -20,6 +22,8 @@ import java.math.BigDecimal; import java.math.RoundingMode; import java.time.LocalDate; import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; import java.util.*; import java.util.stream.Collectors; @@ -63,6 +67,9 @@ @Resource private IMdcAlarmInfoService mdcAlarmInfoService; @Resource private DtBoardMapper dtBoardMapper; /** * 杞﹂棿淇℃伅 @@ -337,4 +344,25 @@ return result; } /** * 璁惧鏁呴殰 * @param productionId * @return */ @Override public List<EquRepair> equRepairList(String productionId) { List<String> proIds = mdcProductionService.findChildByProId(productionId); if (proIds == null || proIds.isEmpty()) { return null; } List<String> equipmentIdList = mdcEquipmentService.getEquIdsByProIds(proIds); if (equipmentIdList == null || equipmentIdList.isEmpty()) { return null; } LocalDateTime currentDate = LocalDate.now().minusMonths(1).atStartOfDay(); String format = currentDate.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")); List<EquRepair> result = dtBoardMapper.equRepairList(equipmentIdList, format); return result; } } lxzn-module-mdc/src/main/java/org/jeecg/modules/board/vo/EquRepair.java
对比新文件 @@ -0,0 +1,26 @@ package org.jeecg.modules.board.vo; import lombok.Data; import java.math.BigDecimal; /** * @Author: Lius * @CreateTime: 2025-06-10 * @Description: 璁惧鏁呴殰 */ @Data public class EquRepair { /** * 璁惧缂栧彿 */ private String equipmentId; /** * 鏁呴殰娆℃暟 */ private BigDecimal faultNum; /** * 鏁呴殰鏃堕暱 */ private BigDecimal faultTime; } lxzn-module-msi/src/main/java/org/jeecg/modules/msi/utils/WebServiceUtil.java
文件已删除