From 093ab70acf7635e58576a2db290485083b2c2d87 Mon Sep 17 00:00:00 2001 From: zhanghl <253316343@qq.com> Date: 星期四, 22 五月 2025 16:23:57 +0800 Subject: [PATCH] 优化JOB任务相关代码:增加注释 --- aps-modules/aps-job/src/main/java/com/aps/job/service/impl/ApsMaterialManagementJobServiceImpl.java | 10 +++++ aps-modules/aps-job/src/main/java/com/aps/job/mapper/ApsBomLineJobMapper.java | 2 + aps-modules/aps-job/src/main/java/com/aps/job/service/impl/ApsStandardProcessRouteHeaderJobServiceImpl.java | 7 +++ aps-modules/aps-job/src/main/java/com/aps/job/service/impl/ApsMaterialStorageManagementJobServiceImpl.java | 11 +++++ aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsStandardProcessRouteHeaderServiceImpl.java | 5 ++ aps-modules/aps-job/src/main/java/com/aps/job/service/impl/ApsBomHeaderJobServiceImpl.java | 15 +++++++ aps-modules/aps-job/src/main/java/com/aps/job/service/impl/ApsWeldSeamStandardJobServiceImpl.java | 3 + aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsMaterialStorageManagementServiceImpl.java | 9 ++-- aps-modules/aps-job/src/main/java/com/aps/job/mapper/ApsBomHeaderJobMapper.java | 2 + aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlate/ApsPlatePlanServiceImpl.java | 5 ++ 10 files changed, 64 insertions(+), 5 deletions(-) diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsMaterialStorageManagementServiceImpl.java b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsMaterialStorageManagementServiceImpl.java index 20bdf34..01c6621 100644 --- a/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsMaterialStorageManagementServiceImpl.java +++ b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsMaterialStorageManagementServiceImpl.java @@ -7,6 +7,7 @@ import com.aps.core.domain.ApsMaterialStorageManagement; import com.aps.core.mapper.ApsMaterialStorageManagementMapper; import com.aps.core.service.IApsMaterialStorageManagementService; +import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.redis.core.RedisTemplate; import org.springframework.stereotype.Service; @@ -21,6 +22,7 @@ * @date 2025-04-17 */ @Service +@Slf4j public class ApsMaterialStorageManagementServiceImpl implements IApsMaterialStorageManagementService { @Autowired @@ -150,6 +152,7 @@ @Override public boolean setStorageDataToRedis(String orgCode) { try { + log.info("寮�濮嬪悓姝� 鐗╂枡搴撳瓨鑷砇edis!"); Set<String> keys = redisTemplate.keys("MaterialStorage:Material_*"); if (keys != null && !keys.isEmpty()) { redisTemplate.delete(keys); @@ -169,14 +172,12 @@ bulkData.put("MaterialStorage:Material_"+apsMaterialStorageManagement.getApplicableFactories()+"_"+apsMaterialStorageManagement.getItemNumber(), jsonObject); }); redisTemplate.opsForValue().multiSet(bulkData); + log.info("瀹屾垚鍚屾 鐗╂枡搴撳瓨鑷砇edis!"); } catch (Exception e) { e.printStackTrace(); + log.error("鍚屾鐗╂枡搴撳瓨鑷砇edis澶辫触!"+e.getMessage()); return false; } -// Set<String> keys = redisTemplate.keys("MaterialStorage:Material_*"); -// if (keys != null && !keys.isEmpty()) { -// redisTemplate.delete(keys); -// } return true; } diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlate/ApsPlatePlanServiceImpl.java b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlate/ApsPlatePlanServiceImpl.java index bb8550a..59914e9 100644 --- a/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlate/ApsPlatePlanServiceImpl.java +++ b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlate/ApsPlatePlanServiceImpl.java @@ -13,6 +13,7 @@ import com.aps.core.mapper.ApsPlatePlanTempMapper; import com.aps.core.service.ApsPlate.IApsPlatePlanService; import com.aps.system.api.domain.SysDictData; +import lombok.extern.slf4j.Slf4j; import org.apache.logging.log4j.util.Strings; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -29,6 +30,7 @@ * @author ruoyi * @date 2025-04-08 */ +@Slf4j @Service public class ApsPlatePlanServiceImpl implements IApsPlatePlanService { @@ -221,6 +223,7 @@ @Override public boolean setSubPlansToRedis() { try { + log.info("寮�濮嬭缃挘閲戝瓙璁″垝鍒皉edis"); Set<String> keys = redisTemplate.keys("PLATE_SUB_PLAN:*"); if (keys != null && !keys.isEmpty()) { redisTemplate.delete(keys); @@ -235,9 +238,11 @@ bulkData.put("PLATE_SUB_PLAN:"+key, value); } redisTemplate.opsForValue().multiSet(bulkData); + log.info("璁剧疆閽i噾瀛愯鍒掑埌redis瀹屾垚"); return true; } catch (Exception e) { e.printStackTrace(); + log.error("璁剧疆閽i噾瀛愯鍒掑埌redis澶辫触"+e.getMessage()); return false; } } diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsStandardProcessRouteHeaderServiceImpl.java b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsStandardProcessRouteHeaderServiceImpl.java index 56fedf2..e5a5776 100644 --- a/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsStandardProcessRouteHeaderServiceImpl.java +++ b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsStandardProcessRouteHeaderServiceImpl.java @@ -5,6 +5,7 @@ import com.aps.core.domain.ApsStandardProcessRouteHeader; import com.aps.core.mapper.ApsStandardProcessRouteHeaderMapper; import com.aps.core.service.IApsStandardProcessRouteHeaderService; +import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.redis.core.RedisTemplate; import org.springframework.stereotype.Service; @@ -21,6 +22,7 @@ * @date 2025-05-06 */ @Service +@Slf4j public class ApsStandardProcessRouteHeaderServiceImpl implements IApsStandardProcessRouteHeaderService { @Autowired @@ -106,6 +108,7 @@ @Override public boolean setProcessRouteDataToRedis(String orgCode) { try { + log.info("寮�濮嬪悓姝ユ爣鍑嗗伐鑹鸿矾绾挎暟鎹嚦Redis"); Set<String> keys = redisTemplate.keys("ROUTE:ROUTE_*"); if (keys != null && !keys.isEmpty()) { redisTemplate.delete(keys); @@ -116,9 +119,11 @@ bulkData.put("ROUTE:ROUTE_"+jsonObject.getString("org_code")+"_"+jsonObject.getString("item_code"), jsonObject.getBigDecimal("standardtime")); } redisTemplate.opsForValue().multiSet(bulkData); + log.info("瀹屾垚鍚屾鏍囧噯宸ヨ壓璺嚎鏁版嵁鑷砇edis"); return true; } catch (Exception e) { e.printStackTrace(); + log.error("鍚屾鏍囧噯宸ヨ壓璺嚎鏁版嵁鑷砇edis澶辫触"+e.getMessage()); return false; } } diff --git a/aps-modules/aps-job/src/main/java/com/aps/job/mapper/ApsBomHeaderJobMapper.java b/aps-modules/aps-job/src/main/java/com/aps/job/mapper/ApsBomHeaderJobMapper.java index e2302d9..1c600bc 100644 --- a/aps-modules/aps-job/src/main/java/com/aps/job/mapper/ApsBomHeaderJobMapper.java +++ b/aps-modules/aps-job/src/main/java/com/aps/job/mapper/ApsBomHeaderJobMapper.java @@ -1,6 +1,7 @@ package com.aps.job.mapper; import com.aps.job.domain.ApsBomHeaderJob; +import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import java.util.List; @@ -11,6 +12,7 @@ * @author hjy * @date 2025-05-08 */ +@Mapper public interface ApsBomHeaderJobMapper { /** diff --git a/aps-modules/aps-job/src/main/java/com/aps/job/mapper/ApsBomLineJobMapper.java b/aps-modules/aps-job/src/main/java/com/aps/job/mapper/ApsBomLineJobMapper.java index 6990931..5025d34 100644 --- a/aps-modules/aps-job/src/main/java/com/aps/job/mapper/ApsBomLineJobMapper.java +++ b/aps-modules/aps-job/src/main/java/com/aps/job/mapper/ApsBomLineJobMapper.java @@ -1,6 +1,7 @@ package com.aps.job.mapper; import com.aps.job.domain.ApsBomLineJob; +import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import java.util.List; @@ -11,6 +12,7 @@ * @author hjy * @date 2025-05-08 */ +@Mapper public interface ApsBomLineJobMapper { /** diff --git a/aps-modules/aps-job/src/main/java/com/aps/job/service/impl/ApsBomHeaderJobServiceImpl.java b/aps-modules/aps-job/src/main/java/com/aps/job/service/impl/ApsBomHeaderJobServiceImpl.java index 5f71212..2906f0c 100644 --- a/aps-modules/aps-job/src/main/java/com/aps/job/service/impl/ApsBomHeaderJobServiceImpl.java +++ b/aps-modules/aps-job/src/main/java/com/aps/job/service/impl/ApsBomHeaderJobServiceImpl.java @@ -3,6 +3,7 @@ import cn.hutool.core.util.IdUtil; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson2.JSON; import com.aps.common.core.constant.SecurityConstants; import com.aps.common.core.utils.DateUtils; import com.aps.common.core.utils.StringUtils; @@ -15,6 +16,7 @@ import com.aps.job.mapper.ApsWorkOrderJobLogMapper; import com.aps.job.service.IApsBomHeaderJobService; import com.aps.system.api.RemoteCoreService; +import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.http.HttpEntity; @@ -35,6 +37,7 @@ * @date 2025-05-08 */ @Service +@Slf4j public class ApsBomHeaderJobServiceImpl implements IApsBomHeaderJobService { @Autowired @@ -213,6 +216,8 @@ jobLog.setResult("header:"+headerList.size() + " line:"+lineList.size()); jobLog.setCreateBy(batchNum); jobLogMapper.insertApsWorkOrderJobLog(jobLog); + log.info("BOM鍚屾锛�"+ JSON.toJSONString(jobLog)); + pageIndex++; }else{ break; @@ -227,6 +232,7 @@ jobLog.setResult("error"); jobLog.setCreateBy(batchNum); jobLogMapper.insertApsWorkOrderJobLog(jobLog); + log.info("BOM鍚屾锛�"+ JSON.toJSONString(jobLog)); break; } } @@ -241,6 +247,7 @@ jobLog.setResult("error"); jobLog.setCreateBy(batchNum); jobLogMapper.insertApsWorkOrderJobLog(jobLog); + log.info("BOM鍚屾寮傚父淇℃伅锛�"+ JSON.toJSONString(jobLog)); return false; } return true; @@ -258,16 +265,24 @@ @Override public boolean syncBomDataJob(Integer pageIndex, Integer pageSize, String orgCode, String itemCodeList){ try { + log.info("鍏ㄩ噺鍚屾BOM鏁版嵁瀹氭椂浠诲姟寮�濮�"); + log.info(" DELETE FROM aps_bom_header_job"); apsBomHeaderJobMapper.deleteApsBomHeaderJob(); + log.info(" DELETE FROM aps_bom_line_job"); apsBomLineJobMapper.deleteApsBomLineJob(); boolean res = syncBomData(pageIndex, pageSize, orgCode, itemCodeList); if(!res){ return false; } + log.info("灏咮OM鍚屾鍒癛edis"); remoteCoreService.setBomDataToRedis(SecurityConstants.INNER); + log.info("deleteApsBomHeader"); apsBomHeaderJobMapper.deleteApsBomHeader(); + log.info("deleteApsBomLine"); apsBomLineJobMapper.deleteApsBomLine(); + log.info("insertIntoApsBomHeader"); apsBomHeaderJobMapper.insertIntoApsBomHeader(); + log.info("insertIntoApsBomLine"); apsBomLineJobMapper.insertIntoApsBomLine(); } catch (Exception e) { e.printStackTrace(); diff --git a/aps-modules/aps-job/src/main/java/com/aps/job/service/impl/ApsMaterialManagementJobServiceImpl.java b/aps-modules/aps-job/src/main/java/com/aps/job/service/impl/ApsMaterialManagementJobServiceImpl.java index cae8691..754d359 100644 --- a/aps-modules/aps-job/src/main/java/com/aps/job/service/impl/ApsMaterialManagementJobServiceImpl.java +++ b/aps-modules/aps-job/src/main/java/com/aps/job/service/impl/ApsMaterialManagementJobServiceImpl.java @@ -3,6 +3,7 @@ import cn.hutool.core.util.IdUtil; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson2.JSON; import com.aps.common.core.utils.DateUtils; import com.aps.common.core.utils.StringUtils; import com.aps.common.core.utils.uuid.IdUtils; @@ -11,6 +12,7 @@ import com.aps.job.mapper.ApsMaterialManagementJobMapper; import com.aps.job.mapper.ApsWorkOrderJobLogMapper; import com.aps.job.service.IApsMaterialManagementJobService; +import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.http.HttpEntity; @@ -31,6 +33,7 @@ * @date 2025-05-10 */ @Service +@Slf4j public class ApsMaterialManagementJobServiceImpl implements IApsMaterialManagementJobService { @Autowired @@ -182,6 +185,7 @@ jobLog.setResult("material:"+materialList.size()); jobLog.setCreateBy(batchNum); jobLogMapper.insertApsWorkOrderJobLog(jobLog); + log.info("鐗╂枡鍚屾锛�"+ JSON.toJSONString(jobLog)); pageIndex++; }else{ break; @@ -196,6 +200,7 @@ jobLog.setResult("error"); jobLog.setCreateBy(batchNum); jobLogMapper.insertApsWorkOrderJobLog(jobLog); + log.info("鐗╂枡鍚屾锛�"+ JSON.toJSONString(jobLog)); break; } } @@ -210,6 +215,7 @@ jobLog.setResult("error"); jobLog.setCreateBy(batchNum); jobLogMapper.insertApsWorkOrderJobLog(jobLog); + log.info("鐗╂枡鍚屾锛�"+ JSON.toJSONString(jobLog)); return false; } return true; @@ -219,12 +225,16 @@ @Override public boolean syncApsMaterialDataJob(int pageIndex, int pageSize, String orgCode, String itemCodeList) { try { + log.info("寮�濮嬫竻闄ょ墿鏂欎腑闂磋〃aps_material_management_job"); apsMaterialManagementJobMapper.deleteApsMaterialJob(); + log.info("寮�濮嬪悓姝ョ墿鏂欎俊鎭�"); boolean res = syncApsMaterialData(pageIndex, pageSize, orgCode, itemCodeList); if(!res){ return false; } + log.info("寮�濮嬫竻闄ょ墿鏂欒〃 aps_material_management"); apsMaterialManagementJobMapper.deleteApsMaterial(); + log.info("鎻掑叆鏁版嵁鍒� aps_material_management"); apsMaterialManagementJobMapper.insertIntoApsMaterialManagement(); return true; } catch (Exception e) { diff --git a/aps-modules/aps-job/src/main/java/com/aps/job/service/impl/ApsMaterialStorageManagementJobServiceImpl.java b/aps-modules/aps-job/src/main/java/com/aps/job/service/impl/ApsMaterialStorageManagementJobServiceImpl.java index 8999522..10e1953 100644 --- a/aps-modules/aps-job/src/main/java/com/aps/job/service/impl/ApsMaterialStorageManagementJobServiceImpl.java +++ b/aps-modules/aps-job/src/main/java/com/aps/job/service/impl/ApsMaterialStorageManagementJobServiceImpl.java @@ -1,6 +1,7 @@ package com.aps.job.service.impl; import cn.hutool.core.util.IdUtil; +import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.aps.common.core.utils.DateUtils; @@ -11,6 +12,7 @@ import com.aps.job.mapper.ApsMaterialStorageManagementJobMapper; import com.aps.job.mapper.ApsWorkOrderJobLogMapper; import com.aps.job.service.IApsMaterialStorageManagementJobService; +import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.http.HttpEntity; @@ -31,6 +33,7 @@ * @date 2025-05-08 */ @Service +@Slf4j public class ApsMaterialStorageManagementJobServiceImpl implements IApsMaterialStorageManagementJobService { @Autowired @@ -174,6 +177,7 @@ jobLog.setResult("storage:"+storageList.size()); jobLog.setCreateBy(batchNum); jobLogMapper.insertApsWorkOrderJobLog(jobLog); + log.info("鐗╂枡鍚屾锛�"+ JSON.toJSONString(jobLog)); pageIndex++; }else{ break; @@ -188,6 +192,7 @@ jobLog.setResult("error"); jobLog.setCreateBy(batchNum); jobLogMapper.insertApsWorkOrderJobLog(jobLog); + log.info("鐗╂枡鍚屾寮傚父锛�"+ JSON.toJSONString(jobLog)); break; } } @@ -202,6 +207,7 @@ jobLog.setResult("error"); jobLog.setCreateBy(batchNum); jobLogMapper.insertApsWorkOrderJobLog(jobLog); + log.info("鐗╂枡鍚屾寮傚父锛�"+ JSON.toJSONString(jobLog)); return false; } return true; @@ -211,12 +217,17 @@ @Override public boolean syncApsMaterialStorageDataJob(int pageIndex, int pageSize, String orgCode, String itemCodeList) { try { + log.info("寮�濮嬪悓姝ュ簱瀛樻暟鎹�"); + log.info("delete ApsMaterialStorageJob"); apsMaterialStorageManagementJobMapper.deleteApsMaterialStorageJob(); + log.info("sync ApsMaterialStorageData"); boolean res = syncApsMaterialStorageData(pageIndex, pageSize, orgCode, itemCodeList); if(!res){ return false; } + log.info("delete ApsMaterialStorage"); apsMaterialStorageManagementJobMapper.deleteApsMaterialStorage(); + log.info("insertInto ApsMaterialStorage "); apsMaterialStorageManagementJobMapper.insertIntoApsMaterialStorage(); return true; } catch (Exception e) { diff --git a/aps-modules/aps-job/src/main/java/com/aps/job/service/impl/ApsStandardProcessRouteHeaderJobServiceImpl.java b/aps-modules/aps-job/src/main/java/com/aps/job/service/impl/ApsStandardProcessRouteHeaderJobServiceImpl.java index 00d6248..25332a9 100644 --- a/aps-modules/aps-job/src/main/java/com/aps/job/service/impl/ApsStandardProcessRouteHeaderJobServiceImpl.java +++ b/aps-modules/aps-job/src/main/java/com/aps/job/service/impl/ApsStandardProcessRouteHeaderJobServiceImpl.java @@ -1,6 +1,7 @@ package com.aps.job.service.impl; import cn.hutool.core.util.IdUtil; +import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.aps.common.core.constant.SecurityConstants; @@ -15,6 +16,7 @@ import com.aps.job.mapper.ApsWorkOrderJobLogMapper; import com.aps.job.service.IApsStandardProcessRouteHeaderJobService; import com.aps.system.api.RemoteCoreService; +import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.http.HttpEntity; @@ -34,6 +36,7 @@ * @author hjy * @date 2025-05-09 */ +@Slf4j @Service public class ApsStandardProcessRouteHeaderJobServiceImpl implements IApsStandardProcessRouteHeaderJobService { @@ -213,6 +216,7 @@ jobLog.setResult("header:"+headerList.size() + " line:"+lineList.size()); jobLog.setCreateBy(batchNum); jobLogMapper.insertApsWorkOrderJobLog(jobLog); + log.info("鏍囧噯宸ヨ壓璺嚎鍚屾锛�"+ JSON.toJSONString(jobLog)); pageIndex++; }else{ break; @@ -226,6 +230,7 @@ jobLog.setBizType("processRoute"); jobLog.setResult("error"); jobLog.setCreateBy(batchNum); + log.info("鏍囧噯宸ヨ壓璺嚎鍚屾锛�"+ JSON.toJSONString(jobLog)); jobLogMapper.insertApsWorkOrderJobLog(jobLog); break; } @@ -240,6 +245,7 @@ jobLog.setBizType("processRoute"); jobLog.setResult("error"); jobLog.setCreateBy(batchNum); + log.info("鏍囧噯宸ヨ壓璺嚎鍚屾锛�"+ JSON.toJSONString(jobLog)); jobLogMapper.insertApsWorkOrderJobLog(jobLog); return false; } @@ -250,6 +256,7 @@ @Override public boolean syncProcessRouteDataJob(Integer pageIndex, Integer pageSize, String orgCode, String itemCodeList) { try { + apsStandardProcessRouteHeaderJobMapper.deleteProcessRouteHeaderJob(); apsStandardProcessRouteLineJobMapper.deleteProcessRouteLineJob(); boolean res = syncProcessRouteData(pageIndex, pageSize, orgCode, itemCodeList); diff --git a/aps-modules/aps-job/src/main/java/com/aps/job/service/impl/ApsWeldSeamStandardJobServiceImpl.java b/aps-modules/aps-job/src/main/java/com/aps/job/service/impl/ApsWeldSeamStandardJobServiceImpl.java index 49daf90..3a6c233 100644 --- a/aps-modules/aps-job/src/main/java/com/aps/job/service/impl/ApsWeldSeamStandardJobServiceImpl.java +++ b/aps-modules/aps-job/src/main/java/com/aps/job/service/impl/ApsWeldSeamStandardJobServiceImpl.java @@ -96,6 +96,7 @@ public boolean syncWeldSeamStandardData() { try { + log.info("寮�濮嬪悓姝ョ墿鏂欐爣鍑嗙剨缂濇暟鎹�"); // 浣跨敤POST鏂规硶璋冪敤鎺ュ彛 HttpHeaders headers = new HttpHeaders(); headers.setContentType(MediaType.APPLICATION_JSON); @@ -175,7 +176,7 @@ if (jobList.isEmpty()) { return false; } - + log.info("娓呯┖鏃ф暟鎹� deleteAllApsWeldSeamStandardJob"); // 娓呯┖鏃ф暟鎹� deleteAllApsWeldSeamStandardJob(); -- Gitblit v1.9.3