From 03dcd27f41f614dbe9b62b622a94f4635779cc8b Mon Sep 17 00:00:00 2001 From: sfd <sun.sunshine@163.com> Date: 星期四, 15 五月 2025 13:22:35 +0800 Subject: [PATCH] 增加ID值 --- aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsMaterialStorageManagementServiceImpl.java | 115 +++++++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 111 insertions(+), 4 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 2cef867..79015ad 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 @@ -1,12 +1,24 @@ package com.aps.core.service.impl; +import java.math.BigDecimal; import java.util.List; +import java.util.Optional; + +import com.alibaba.fastjson2.JSON; +import com.alibaba.fastjson2.JSONObject; import com.aps.common.core.utils.DateUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import com.aps.core.mapper.ApsMaterialStorageManagementMapper; +import com.aps.common.core.utils.StringUtils; import com.aps.core.domain.ApsMaterialStorageManagement; +import com.aps.core.mapper.ApsMaterialStorageManagementMapper; import com.aps.core.service.IApsMaterialStorageManagementService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.redis.core.RedisTemplate; +import org.springframework.stereotype.Service; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Optional; /** * 鐗╂枡搴撳瓨绠$悊Service涓氬姟灞傚鐞� @@ -19,7 +31,8 @@ { @Autowired private ApsMaterialStorageManagementMapper apsMaterialStorageManagementMapper; - + @Autowired + public RedisTemplate redisTemplate; /** * 鏌ヨ鐗╂枡搴撳瓨绠$悊 * @@ -93,4 +106,98 @@ { return apsMaterialStorageManagementMapper.deleteApsMaterialStorageManagementById(id); } + /** + * 鑾峰彇鐗╂枡搴撳瓨淇℃伅 + * */ + @Override + public Optional<ApsMaterialStorageManagement> getItemStorage(String plant, String itemNumber) { + ApsMaterialStorageManagement storageParam = new ApsMaterialStorageManagement(); + storageParam.setItemNumber(itemNumber); + storageParam.setApplicableFactories(plant); + return apsMaterialStorageManagementMapper.selectApsMaterialStorageManagementList(storageParam).stream() + .findFirst(); + } + + /** + * 浠嶳edis涓幏鍙栧簱瀛樹俊鎭� + * + * 姝ゆ柟娉曢鍏堝皾璇曚粠Redis涓幏鍙栨寚瀹氬伐鍘傚拰鐗╂枡浠g爜鐨勫簱瀛樹俊鎭鏋淩edis涓笉瀛樺湪鐩稿叧鏁版嵁锛� + * 鍒欎粠鏁版嵁搴撲腑鏌ヨ锛屽苟灏嗙粨鏋滅紦瀛樺埌Redis涓互鎻愰珮涓嬫鏌ヨ鐨勬晥鐜� + * + * @param plant 宸ュ巶浠g爜锛岀敤浜庢寚瀹氬簱瀛樹俊鎭墍灞炵殑宸ュ巶 + * @param itemCode 鐗╂枡浠g爜锛岀敤浜庢寚瀹氶渶瑕佹煡璇㈢殑鐗╂枡 + * @return ApsMaterialStorageManagement 杩斿洖鑾峰彇鍒扮殑搴撳瓨淇℃伅瀵硅薄锛屽鏋滄病鏈夋壘鍒帮紝鍒欒繑鍥瀗ull + */ + @Override + public ApsMaterialStorageManagement getRdsStorage(String plant, String itemCode){ + ApsMaterialStorageManagement ams=null; + // 灏濊瘯浠嶳edis涓幏鍙栧簱瀛樹俊鎭� + JSONObject materialStorage = (JSONObject)redisTemplate.opsForValue().get("MaterialStorage:Material_"+plant+"_"+itemCode); + if(materialStorage!=null){ + // 濡傛灉Redis涓湁缂撳瓨锛屽皢鍏惰浆鎹负ApsMaterialStorageManagement瀵硅薄骞惰繑鍥� + ams = materialStorage.toJavaObject(ApsMaterialStorageManagement.class); + return ams; + }else { + // 濡傛灉Redis涓病鏈夌紦瀛橈紝鍒涘缓鏌ヨ鍙傛暟瀵硅薄 + ApsMaterialStorageManagement storageParam = new ApsMaterialStorageManagement(); + storageParam.setItemNumber(itemCode); + storageParam.setApplicableFactories(plant); + // 浠庢暟鎹簱涓煡璇㈠簱瀛樹俊鎭� + Optional<ApsMaterialStorageManagement> first = apsMaterialStorageManagementMapper.selectApsMaterialStorageManagementList(storageParam).stream() + .findFirst(); + if (first.isPresent()){ + // 濡傛灉鏌ヨ鍒板簱瀛樹俊鎭紝灏嗗叾缂撳瓨鍒癛edis涓� + ams = first.get(); + redisTemplate.opsForValue().set("MaterialStorage:Material_"+plant+"_"+itemCode,JSONObject.parseObject(JSON.toJSONString(ams))); + } + } + // 杩斿洖搴撳瓨淇℃伅瀵硅薄 + return ams; + } + + /** + * 璁剧疆搴撳瓨鏁版嵁鍒皉edis + * @param orgCode + * @return + */ + @Override + public boolean setStorageDataToRedis(String orgCode) { + try { + ApsMaterialStorageManagement temp = new ApsMaterialStorageManagement(); + if(!StringUtils.isEmpty(orgCode)){ + temp.setApplicableFactories(orgCode); + } + List<ApsMaterialStorageManagement> list = apsMaterialStorageManagementMapper.selectApsMaterialStorageManagementList(temp); + Map<String, Object> bulkData = new HashMap<>(); + list.forEach(apsMaterialStorageManagement -> { + JSONObject jsonObject = new JSONObject(); + jsonObject.put("id", apsMaterialStorageManagement.getId()); + jsonObject.put("itemNumber", apsMaterialStorageManagement.getItemNumber()); + jsonObject.put("remainderStock", apsMaterialStorageManagement.getRemainderStock()); + jsonObject.put("applicableFactories", apsMaterialStorageManagement.getApplicableFactories()); + bulkData.put("MaterialStorage:Material_"+apsMaterialStorageManagement.getApplicableFactories()+"_"+apsMaterialStorageManagement.getItemNumber(), jsonObject); + }); + redisTemplate.opsForValue().multiSet(bulkData); + } catch (Exception e) { + e.printStackTrace(); + return false; + } +// Set<String> keys = redisTemplate.keys("MaterialStorage:Material_*"); +// if (keys != null && !keys.isEmpty()) { +// redisTemplate.delete(keys); +// } + return true; + } + + /** + * 鏇存柊搴撳瓨淇℃伅 + * */ + public int updateMaterialStorageByVersion(String id, BigDecimal remainderStock, Integer version) { + return apsMaterialStorageManagementMapper.updateMaterialStorageByVersion(id, remainderStock, version); + } + + @Override + public int updateRemainderStock(String id, BigDecimal remainderStock, Integer version){ + return apsMaterialStorageManagementMapper.updateRemainderStock(id, remainderStock, version); + } } -- Gitblit v1.9.3