diff --git a/src/main/java/com/xujie/sys/modules/pms/mapper/EamMapper.java b/src/main/java/com/xujie/sys/modules/pms/mapper/EamMapper.java index 0e3307a7..f5e9f63f 100644 --- a/src/main/java/com/xujie/sys/modules/pms/mapper/EamMapper.java +++ b/src/main/java/com/xujie/sys/modules/pms/mapper/EamMapper.java @@ -1164,10 +1164,6 @@ public interface EamMapper { String getOrderNo(EamWorkOrderInData feedBackData); - void saveDefectRecordCount(EamDefectFeedBackData feedBackData); - - void saveDefectRecordCount2(EamWorkOrderInData inData); - List queryDepartmentByObjectId(EamDefectFeedBackData inData); List queryPhoneByDepartmentId(EamObjectAdminData data); @@ -1238,4 +1234,6 @@ public interface EamMapper { List getFeedBackInfo(EamDefectFeedBackInData feedBackData); List getObjectInfo(@Param("site") String site, @Param("buNo") String buNo, @Param("objectID") String objectID); + + String getResourceByObject(@Param("site") String site, @Param("objectID") String objectID); } diff --git a/src/main/java/com/xujie/sys/modules/pms/service/Impl/EamServiceImpl.java b/src/main/java/com/xujie/sys/modules/pms/service/Impl/EamServiceImpl.java index 459e0c41..70a23750 100644 --- a/src/main/java/com/xujie/sys/modules/pms/service/Impl/EamServiceImpl.java +++ b/src/main/java/com/xujie/sys/modules/pms/service/Impl/EamServiceImpl.java @@ -1943,8 +1943,19 @@ public class EamServiceImpl implements EamService { feedBackData.setOrderNo(orderNo); // 创建维修工单 eamMapper.saveWorkOrder(feedBackData); - // 创建count表 - eamMapper.saveDefectRecordCount(feedBackData); + // 根据设备查机台 + String resourceId = eamMapper.getResourceByObject(feedBackData.getSite(), feedBackData.getObjectID()); + // 将记录新增到 redis + // 检查是否已创建 key + String key = feedBackData.getSite() + "_" + resourceId; + Integer val = (Integer) redisTemplate.opsForValue().get(key); + if (val == null) { + // 如果 key 不存在,则新建 key 并设置 value 为 1 + redisTemplate.opsForValue().set(key, 1); + } else { + // 如果 key 已经存在,则获取当前 value 并加 1 + redisTemplate.opsForValue().set(key, val + 1); + } } // 根据设备查所属部门 List deptData = eamMapper.queryDepartmentByObjectId(feedBackData); @@ -2105,8 +2116,20 @@ public class EamServiceImpl implements EamService { inData.setDocumentSource("维修失败"); // 创建工单 eamMapper.saveDefectWorkOrder(inData); - // 创建count表 - eamMapper.saveDefectRecordCount2(inData); + // 根据设备查机台 + String resourceId = eamMapper.getResourceByObject(inData.getSite(), inData.getObjectID()); + // 将记录新增到 redis + // 检查是否已创建 key + String key = inData.getSite() + "_" + resourceId; + Integer val = (Integer) redisTemplate.opsForValue().get(key); + if (val == null) { + // 如果 key 不存在,则新建 key 并设置 value 为 1 + redisTemplate.opsForValue().set(key, 1); + } else { + // 如果 key 已经存在,则获取当前 value 并加 1 + redisTemplate.opsForValue().set(key, val + 1); + } + // 保存故障信息 EamDefectFeedBackData feedBackData = new EamDefectFeedBackData(); feedBackData.setSite(inData.getSite()); @@ -2921,8 +2944,19 @@ public class EamServiceImpl implements EamService { inData.setDocumentSource("设备维修"); // 创建维修工单 eamMapper.saveWorkOrder(inData); - // 创建count表 - eamMapper.saveDefectRecordCount(inData); + // 根据设备查机台 + String resourceId = eamMapper.getResourceByObject(inData.getSite(), inData.getObjectID()); + // 将记录新增到 redis + // 检查是否已创建 key + String key = inData.getSite() + "_" + resourceId; + Integer val = (Integer) redisTemplate.opsForValue().get(key); + if (val == null) { + // 如果 key 不存在,则新建 key 并设置 value 为 1 + redisTemplate.opsForValue().set(key, 1); + } else { + // 如果 key 已经存在,则获取当前 value 并加 1 + redisTemplate.opsForValue().set(key, val + 1); + } } // 根据设备查所属部门 List deptData = eamMapper.queryDepartmentByObjectId(inData); diff --git a/src/main/resources/mapper/part/PartInformationMapper.xml b/src/main/resources/mapper/part/PartInformationMapper.xml index 1d9a162e..eb419332 100644 --- a/src/main/resources/mapper/part/PartInformationMapper.xml +++ b/src/main/resources/mapper/part/PartInformationMapper.xml @@ -161,11 +161,11 @@ diff --git a/src/main/resources/mapper/pms/EamMapper.xml b/src/main/resources/mapper/pms/EamMapper.xml index 51f1380f..7ab6e64a 100644 --- a/src/main/resources/mapper/pms/EamMapper.xml +++ b/src/main/resources/mapper/pms/EamMapper.xml @@ -1861,13 +1861,6 @@ VALUES (#{site}, #{buNo}, #{orderNo}, #{planID}, '', #{objectID}, '未开工', getDate(), 'C', getDate(), #{createBy}, #{checkWorkPlanId}, #{checkItemNo}, #{documentSource}) - - - INSERT INTO eam_workOrder_count - (Site, bu_no, OrderNo, PlanID, PropertiesCode, ObjectID, Status, PlanDate, FunctionType, CreateDate, CreateBy, check_work_plan_id, check_item_no) - VALUES (#{site}, #{buNo}, #{orderNo}, #{planID}, '', #{objectID}, '未开工', getDate(), 'C', getDate(), #{createBy}, #{checkWorkPlanId}, #{checkItemNo}) - - + +