diff --git a/op-api/op-api.iml b/op-api/op-api.iml deleted file mode 100644 index e27a22bf..00000000 --- a/op-api/op-api.iml +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/op-common/op-common-core/op-common-core.iml b/op-common/op-common-core/op-common-core.iml deleted file mode 100644 index f8927566..00000000 --- a/op-common/op-common-core/op-common-core.iml +++ /dev/null @@ -1,104 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/op-common/op-common-core/pom.xml b/op-common/op-common-core/pom.xml index 95274fd2..4791f75b 100644 --- a/op-common/op-common-core/pom.xml +++ b/op-common/op-common-core/pom.xml @@ -112,6 +112,8 @@ io.swagger swagger-annotations + + diff --git a/op-common/op-common-core/src/main/java/com/op/common/core/utils/poi/ExcelUtil.java b/op-common/op-common-core/src/main/java/com/op/common/core/utils/poi/ExcelUtil.java index 13bfbf5d..0af1f9eb 100644 --- a/op-common/op-common-core/src/main/java/com/op/common/core/utils/poi/ExcelUtil.java +++ b/op-common/op-common-core/src/main/java/com/op/common/core/utils/poi/ExcelUtil.java @@ -1,8 +1,10 @@ package com.op.common.core.utils.poi; +import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStream; import java.lang.reflect.Field; +import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.lang.reflect.ParameterizedType; import java.math.BigDecimal; @@ -20,6 +22,8 @@ import java.util.Map; import java.util.Set; import java.util.stream.Collectors; import javax.servlet.http.HttpServletResponse; + +import com.alibaba.ttl.threadpool.agent.internal.javassist.Modifier; import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.lang3.RegExUtils; import org.apache.commons.lang3.reflect.FieldUtils; @@ -49,6 +53,7 @@ import org.apache.poi.util.IOUtils; import org.apache.poi.xssf.streaming.SXSSFWorkbook; import org.apache.poi.xssf.usermodel.XSSFClientAnchor; import org.apache.poi.xssf.usermodel.XSSFDataValidation; +import org.apache.poi.xssf.usermodel.XSSFWorkbook; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import com.op.common.core.annotation.Excel; @@ -246,7 +251,7 @@ public class ExcelUtil { /** * 对excel表单默认第一个索引名转换成list - * + * * @param is 输入流 * @return 转换后集合 */ @@ -256,7 +261,7 @@ public class ExcelUtil { /** * 对excel表单默认第一个索引名转换成list - * + * * @param is 输入流 * @param titleNum 标题占用行数 * @return 转换后集合 @@ -267,7 +272,7 @@ public class ExcelUtil { /** * 对excel表单指定表格索引名转换成list - * + * * @param sheetName 表格索引名 * @param titleNum 标题占用行数 * @param is 输入流 @@ -433,7 +438,7 @@ public class ExcelUtil { /** * 对list数据源将其里面的数据导入到excel表单 - * + * * @return 结果 */ public void exportExcel(HttpServletResponse response) { @@ -481,7 +486,7 @@ public class ExcelUtil { /** * 填充excel数据 - * + * * @param index 序号 * @param row 单元格行 */ @@ -538,7 +543,7 @@ public class ExcelUtil { /** * 创建表格样式 - * + * * @param wb 工作薄对象 * @return 样式列表 */ @@ -590,7 +595,7 @@ public class ExcelUtil { /** * 根据Excel注解创建表格头样式 - * + * * @param wb 工作薄对象 * @return 自定义样式列表 */ @@ -620,7 +625,7 @@ public class ExcelUtil { /** * 根据Excel注解创建表格列样式 - * + * * @param wb 工作薄对象 * @return 自定义样式列表 */ @@ -678,7 +683,7 @@ public class ExcelUtil { /** * 设置单元格信息 - * + * * @param value 单元格值 * @param attr 注解相关 * @param cell 单元格信息 @@ -802,7 +807,7 @@ public class ExcelUtil { /** * 设置 POI XSSFSheet 单元格提示或选择框 - * + * * @param sheet 表单 * @param textlist 下拉框显示的内容 * @param promptContent 提示内容 @@ -835,7 +840,7 @@ public class ExcelUtil { /** * 设置某些列的值只能输入预制的数据,显示下拉框（兼容超出一定数量的下拉框）. - * + * * @param sheet 要设置的sheet. * @param textlist 下拉框显示的内容 * @param promptContent 提示内容 @@ -911,7 +916,7 @@ public class ExcelUtil { /** * 反向解析值 男=0,女=1,未知=2 - * + * * @param propertyValue 参数值 * @param converterExp 翻译注解 * @param separator 分隔符 @@ -1112,7 +1117,7 @@ public class ExcelUtil { /** * 创建工作表 - * + * * @param sheetNo sheet数量 * @param index 序号 */ @@ -1127,7 +1132,7 @@ public class ExcelUtil { /** * 获取单元格值 - * + * * @param row 获取的行 * @param column 获取单元格列号 * @return 单元格值 @@ -1168,7 +1173,7 @@ public class ExcelUtil { /** * 判断是否是空行 - * + * * @param row 判断的行 * @return */ @@ -1187,7 +1192,7 @@ public class ExcelUtil { /** * 格式化不同类型的日期对象 - * + * * @param dateFormat 日期格式 * @param val 被格式化的日期对象 * @return 格式化后的日期字符 @@ -1239,7 +1244,7 @@ public class ExcelUtil { /** * 获取对象的子列表方法 - * + * * @param name 名称 * @param pojoClass 类对象 * @return 子列表方法 @@ -1256,4 +1261,63 @@ public class ExcelUtil { } return method; } + + public static void exportToExcel(String fileName, Class dynamicClass, Map> mapList) + throws IOException, ReflectiveOperationException { + + Workbook workbook = new XSSFWorkbook(); + + // 遍历 mapList 中的每个键值对，每个键对应一个 Sheet + for (Map.Entry> entry : mapList.entrySet()) { + String sheetName = entry.getKey(); + List dataList = entry.getValue(); + + // 创建 Sheet + Sheet sheet = workbook.createSheet(sheetName); + + // 创建 header 行 + Row headerRow = sheet.createRow(0); + Method[] methods = dynamicClass.getDeclaredMethods(); + int colNum = 0; + for (Method method : methods) { + if (method.getName().startsWith("get") && !Modifier.isStatic(method.getModifiers())) { + Cell cell = headerRow.createCell(colNum++); + cell.setCellValue(method.getName().substring(3)); + } + } + + // 填充数据行 + int rowNum = 1; + for (Object obj : dataList) { + if (dynamicClass.isInstance(obj)) { // 确保 obj 是 dynamicClass 的实例 + Row row = sheet.createRow(rowNum++); + colNum = 0; + for (Method method : methods) { + if (method.getName().startsWith("get") && !Modifier.isStatic(method.getModifiers())) { + Cell cell = row.createCell(colNum++); + try { + Object value = method.invoke(obj); + cell.setCellValue(value != null ? value.toString() : ""); + } catch (IllegalAccessException | InvocationTargetException e) { + // 处理反射调用异常 + e.printStackTrace(); + } + } + } + } else { + // 处理 obj 不是 dynamicClass 实例的情况 + System.err.println("对象 " + obj + " 不是 " + dynamicClass.getName() + " 的实例，已跳过处理。"); + // 跳过非实例对象，不抛出异常 + } + } + } + + // 写入到文件 + try (FileOutputStream fileOut = new FileOutputStream(fileName)) { + workbook.write(fileOut); + } finally { + workbook.close(); + } + } + } diff --git a/op-common/op-common-datascope/op-common-datascope.iml b/op-common/op-common-datascope/op-common-datascope.iml index dab4c8af..47270e4b 100644 --- a/op-common/op-common-datascope/op-common-datascope.iml +++ b/op-common/op-common-datascope/op-common-datascope.iml @@ -11,119 +11,4 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + \ No newline at end of file diff --git a/op-modules/op-mes/src/main/java/com/op/mes/domain/H5.java b/op-modules/op-mes/src/main/java/com/op/mes/domain/H5.java index 0ac9de68..dbfe2ce4 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/domain/H5.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/domain/H5.java @@ -17,7 +17,15 @@ public class H5 { private String efficiencyAcRate; private String feedbackTime; private String parentOrder; + private String reason; + public String getReason() { + return reason; + } + + public void setReason(String reason) { + this.reason = reason; + } public int getPlanProduction() { return planProduction; diff --git a/op-modules/op-mes/src/main/java/com/op/mes/mapper/H5ApiMapper.java b/op-modules/op-mes/src/main/java/com/op/mes/mapper/H5ApiMapper.java index 2558ac21..2b476b71 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/mapper/H5ApiMapper.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/mapper/H5ApiMapper.java @@ -2,7 +2,10 @@ package com.op.mes.mapper; import com.op.mes.domain.EnergyExpend; import com.op.mes.domain.H5; +import org.apache.ibatis.annotations.Param; + +import java.time.LocalDateTime; import java.util.List; import java.util.Map; @@ -21,5 +24,5 @@ public interface H5ApiMapper { */ public List
selectMesLineProsdceLists(H5 h5); - List EnergyExpend(); + List EnergyExpend(@Param("startDateTime") String startDateTime, @Param("endDateTime") String endDateTime); } diff --git a/op-modules/op-mes/src/main/java/com/op/mes/mapper/MesReportWorkMapper.java b/op-modules/op-mes/src/main/java/com/op/mes/mapper/MesReportWorkMapper.java index f274db66..35f7ed29 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/mapper/MesReportWorkMapper.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/mapper/MesReportWorkMapper.java @@ -102,8 +102,9 @@ public interface MesReportWorkMapper { @MapKey("equCodeHour") Map getHourProductionList(MesHourReport mesHourReport); - //烘房当日产量00：00-24：00 - List getHFDailyProduction(); + //烘房当班产量 + @MapKey("shiftId") + List getHFDailyProduction(String shiftId); List getEquNames(MesHourReport mesHourReport); @@ -201,5 +202,6 @@ public interface MesReportWorkMapper { List getEquNamess(MesHourReport mesHourReport); - List> getPlanNumber(); + @MapKey("shiftId") + List> getPlanNumber(String shiftId); } diff --git a/op-modules/op-mes/src/main/java/com/op/mes/service/impl/H5ApiServiceImpl.java b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/H5ApiServiceImpl.java index 1fd0f075..d1dc4dab 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/service/impl/H5ApiServiceImpl.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/H5ApiServiceImpl.java @@ -9,6 +9,10 @@ import com.op.mes.service.H5ApiService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.time.LocalDate; +import java.time.LocalDateTime; +import java.time.LocalTime; +import java.time.format.DateTimeFormatter; import java.util.ArrayList; import java.util.Comparator; import java.util.List; @@ -68,6 +72,7 @@ public class H5ApiServiceImpl implements H5ApiService { resultH5.setProductionDuration(totalProductionDuration); // 总和 resultH5.setPlanProduction((int) Math.round(totalPlanProduction)); // 总和 resultH5.setProduction((int) Math.round(totalProduction)); // 总和 + resultH5.setReason(list.get(0).getReason()); return resultH5; } ) @@ -157,7 +162,40 @@ public class H5ApiServiceImpl implements H5ApiService { @Override @DS("#header.poolName") public List EnergyExpend() { - return h5ApiMapper.EnergyExpend(); + LocalDateTime now = LocalDateTime.now(); + LocalTime startTime1 = LocalTime.of(7, 30); // 7:30 + LocalTime endTime1 = LocalTime.of(19, 30); // 19:30 + LocalTime endTime2 = LocalTime.of(7, 30); // 第二天的 7:30 + + LocalDate startDate=null; + LocalDate endDate=null; + + // 当前时间在 7:30 到 19:30 之间 + if (now.toLocalTime().isAfter(startTime1) && now.toLocalTime().isBefore(endTime1)) { + startDate = now.toLocalDate(); + endDate = now.toLocalDate(); + endTime1 = LocalTime.of(19, 30); // 结束时间为当天的 19:30 + } + // 当前时间在 19:30 到第二天 7:30 之间 + else if (now.toLocalTime().isAfter(endTime1) || now.toLocalTime().isBefore(endTime2)) { + startDate = now.toLocalDate(); + endDate = now.toLocalDate().plusDays(1); // 结束时间为第二天的 7:30 + startTime1=endTime1; + endTime1 = LocalTime.of(7, 30); + } else { + // 不在指定时间范围内 + System.out.println("当前时间不在指定范围内。"); + } + + LocalDateTime startDateTime = startDate.atTime(startTime1); // 开始时间 + LocalDateTime endDateTime = endDate.atTime(endTime1); // 结束时间 +// 格式化输出 + DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm"); + return h5ApiMapper.EnergyExpend(startDateTime.format(formatter),endDateTime.format(formatter)); } + + + + } diff --git a/op-modules/op-mes/src/main/java/com/op/mes/service/impl/IWCInterfaceServiceImpl.java b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/IWCInterfaceServiceImpl.java index f936a1f6..dcc9d224 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/service/impl/IWCInterfaceServiceImpl.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/IWCInterfaceServiceImpl.java @@ -37,6 +37,7 @@ import java.math.BigDecimal; import java.math.RoundingMode; import java.time.LocalDate; import java.time.LocalDateTime; +import java.time.LocalTime; import java.time.format.DateTimeFormatter; import java.time.temporal.ChronoUnit; import java.util.*; @@ -923,8 +924,21 @@ public class IWCInterfaceServiceImpl implements IWCSInterfaceService { } map.put("dryingroomList", dryingRoomListInfo); - /***查询 烘房当日产出**/ - List mapperHourProductionList = this.getHFDailyProduction(); + /***查询 烘房当班产出**/ + String shiftId = ""; + LocalTime now = LocalTime.now(); + + // 定义工作时间段 + LocalTime startTime = LocalTime.of(7, 30); // 7:30 + LocalTime endTime = LocalTime.of(19, 30); // 19:30 + + // 检查当前时间是否在工作时间段内 + if (now.isAfter(startTime) && now.isBefore(endTime.plusSeconds(1))) { + shiftId = "5"; // 工作时间 + } else { + shiftId = "2"; // 非工作时间 + } + List mapperHourProductionList = this.getHFDailyProduction(shiftId); for (Map dryingRoomMap : dryingRoomListInfo) { String equipment_code = dryingRoomMap.get("equipment_code"); // Get the attr2 field value @@ -944,12 +958,41 @@ public class IWCInterfaceServiceImpl implements IWCSInterfaceService { /**烘房耗电数据**/ private List EnergyExpend(){ DynamicDataSourceContextHolder.push("ds_" + "1000");// 这是数据源的key - return h5ApiMapper.EnergyExpend(); + LocalDateTime now = LocalDateTime.now(); + LocalTime startTime1 = LocalTime.of(7, 30); // 7:30 + LocalTime endTime1 = LocalTime.of(19, 30); // 19:30 + LocalTime endTime2 = LocalTime.of(7, 30); // 第二天的 7:30 + + LocalDate startDate=null; + LocalDate endDate=null; + + // 当前时间在 7:30 到 19:30 之间 + if (now.toLocalTime().isAfter(startTime1) && now.toLocalTime().isBefore(endTime1)) { + startDate = now.toLocalDate(); + endDate = now.toLocalDate(); + endTime1 = LocalTime.of(19, 30); // 结束时间为当天的 19:30 + } + // 当前时间在 19:30 到第二天 7:30 之间 + else if (now.toLocalTime().isAfter(endTime1) || now.toLocalTime().isBefore(endTime2)) { + startDate = now.toLocalDate(); + endDate = now.toLocalDate().plusDays(1); // 结束时间为第二天的 7:30 + startTime1=endTime1; + endTime1 = LocalTime.of(7, 30); + } else { + // 不在指定时间范围内 + System.out.println("当前时间不在指定范围内。"); + } + + LocalDateTime startDateTime = startDate.atTime(startTime1); // 开始时间 + LocalDateTime endDateTime = endDate.atTime(endTime1); // 结束时间 +// 格式化输出 + DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm"); + return h5ApiMapper.EnergyExpend(startDateTime.format(formatter),endDateTime.format(formatter)); } /***查询 烘房当日产出**/ - private List getHFDailyProduction(){ + private List getHFDailyProduction(String shiftId){ DynamicDataSourceContextHolder.push("ds_" + "999");// 这是数据源的key - return mesReportWorkMapper.getHFDailyProduction(); + return mesReportWorkMapper.getHFDailyProduction(shiftId); } /**白坯工厂，修正设备**/ diff --git a/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesReportWorkServiceImpl.java b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesReportWorkServiceImpl.java index 17272509..b765b465 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesReportWorkServiceImpl.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesReportWorkServiceImpl.java @@ -5,6 +5,7 @@ import java.text.DateFormat; import java.text.ParseException; import java.text.SimpleDateFormat; import java.time.LocalDate; +import java.time.LocalTime; import java.time.format.DateTimeFormatter; import java.util.*; import java.util.stream.Collectors; @@ -934,8 +935,22 @@ public class MesReportWorkServiceImpl implements IMesReportWorkService { @Override @DS("#header.poolName") public AjaxResult PlanAchievementRate() { - List> mapList=mesReportWorkMapper.getPlanNumber(); - List maps=mesReportWorkMapper.getHFDailyProduction(); + String shiftId = ""; + LocalTime now = LocalTime.now(); + + // 定义工作时间段 + LocalTime startTime = LocalTime.of(7, 30); // 7:30 + LocalTime endTime = LocalTime.of(19, 30); // 19:30 + + // 检查当前时间是否在工作时间段内 + if (now.isAfter(startTime) && now.isBefore(endTime.plusSeconds(1))) { + shiftId = "5"; // 工作时间 + } else { + shiftId = "2"; // 非工作时间 + } + List> mapList=mesReportWorkMapper.getPlanNumber(shiftId); + + List maps=mesReportWorkMapper.getHFDailyProduction(shiftId); int sumChe = 0; for (Map map : mapList) { diff --git a/op-modules/op-mes/src/main/resources/mapper/mes/H5ApiMapper.xml b/op-modules/op-mes/src/main/resources/mapper/mes/H5ApiMapper.xml index 5de3d370..38f6e205 100644 --- a/op-modules/op-mes/src/main/resources/mapper/mes/H5ApiMapper.xml +++ b/op-modules/op-mes/src/main/resources/mapper/mes/H5ApiMapper.xml @@ -18,32 +18,34 @@ + @@ -90,7 +92,8 @@ FROM report_point_dnb WHERE monitor_id IN ( 'E0046_1800','E0046_1700','E0046_1600','E0046_1500','E0046_1400','E0046_1300', 'E0046_1200','E0046_1100','E0046_1000','E0046_0900','E0046_0800','E0046_0700','E0046_0600','E0046_0500','E0046_0400','E0046_0300', 'E0046_0200','E0046_0100' ) - AND CAST(end_time AS DATE) = CAST(GETDATE() AS DATE) + and CONVERT(varchar(16), end_time, 120) >= #{startDateTime} + and #{endDateTime} >= CONVERT(varchar(16), end_time, 120) GROUP BY monitor_name, monitor_id, diff --git a/op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkMapper.xml b/op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkMapper.xml index e3308278..172db869 100644 --- a/op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkMapper.xml +++ b/op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkMapper.xml @@ -1036,7 +1036,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" pdate ASC; -- 按日期排序 - SELECT mt.equipmentCode, COUNT(*) AS RecordCount @@ -1047,15 +1047,13 @@ FROM WHERE mt.rfid_status = '1' AND equ.equipment_type_code = 'equ_type_hf' - AND mt.update_time BETWEEN - CAST(CONVERT(date, GETDATE()) AS datetime) -- today's date at 00:00:00 - AND DATEADD(second, -1, DATEADD(day, 1, CAST(CONVERT(date, GETDATE()) AS datetime))) -- today's date at 23:59:59 + AND CONVERT ( DATE, mt.update_time ) = CONVERT ( DATE, GETDATE( ) ) + AND mt.shift_id=#{shiftId} GROUP BY mt.equipmentCode; - - +SELECT c.workorder_code, c.product_code, c.product_name, @@ -1077,6 +1075,7 @@ FROM ) T ON c.product_code= T.item_code WHERE CONVERT ( DATE, product_date ) = CONVERT ( DATE, GETDATE( ) ) + AND c.shift_id=#{shiftId}