|
|
|
@ -33,8 +33,6 @@ public class DepositoryRecordController { |
|
|
|
@Autowired |
|
|
|
private CompanyService companyService; |
|
|
|
@Autowired |
|
|
|
private RedisTemplate<Object,Object> redisTemplate; |
|
|
|
@Autowired |
|
|
|
private RedisTemplate<String,String> redisTemplateForHash; |
|
|
|
@Autowired |
|
|
|
private PlaceService placeService; |
|
|
|
@ -620,19 +618,19 @@ public class DepositoryRecordController { |
|
|
|
List<Integer> mids = (List<Integer>) map.get("mids"); |
|
|
|
List<Integer> depositoryIds = (List<Integer>) map.get("depositoryIds"); |
|
|
|
List<String> placeCodes = (List<String>) map.get("placeCodes"); |
|
|
|
List<Object> nowmids = redisTemplate.opsForList().range("mids"+userToken.getId(), 0, -1); |
|
|
|
List<String> nowmids = redisTemplateForHash.opsForList().range("mids"+userToken.getId(), 0, -1); |
|
|
|
for (int i = 0; i < mids.size(); i++) { |
|
|
|
if(nowmids.contains(mids.get(i))){ |
|
|
|
continue; |
|
|
|
} |
|
|
|
redisTemplate.opsForList().leftPush("mids"+userToken.getId(), mids.get(i)); |
|
|
|
redisTemplate.opsForList().leftPush("depositoryIds"+userToken.getId(), depositoryIds.get(i)); |
|
|
|
redisTemplate.opsForList().leftPush("placeCodes"+userToken.getId(), placeCodes.get(i)); |
|
|
|
redisTemplateForHash.opsForList().leftPush("mids"+userToken.getId(), mids.get(i).toString()); |
|
|
|
redisTemplateForHash.opsForList().leftPush("depositoryIds"+userToken.getId(), depositoryIds.get(i).toString()); |
|
|
|
redisTemplateForHash.opsForList().leftPush("placeCodes"+userToken.getId(), placeCodes.get(i).toString()); |
|
|
|
|
|
|
|
} |
|
|
|
redisTemplate.expire("mids"+userToken.getId(),24 * 60 * 60, TimeUnit.SECONDS); |
|
|
|
redisTemplate.expire("depositoryIds"+userToken.getId(),24 * 60 * 60, TimeUnit.SECONDS); |
|
|
|
redisTemplate.expire("placeCodes"+userToken.getId(),24 * 60 * 60, TimeUnit.SECONDS); |
|
|
|
redisTemplateForHash.expire("mids"+userToken.getId(),24 * 60 * 60, TimeUnit.SECONDS); |
|
|
|
redisTemplateForHash.expire("depositoryIds"+userToken.getId(),24 * 60 * 60, TimeUnit.SECONDS); |
|
|
|
redisTemplateForHash.expire("placeCodes"+userToken.getId(),24 * 60 * 60, TimeUnit.SECONDS); |
|
|
|
return CrudUtil.postHandle(1,1); |
|
|
|
} |
|
|
|
|
|
|
|
@ -645,17 +643,17 @@ public class DepositoryRecordController { |
|
|
|
@PostMapping("/deleteApplicationToRedis") |
|
|
|
public RestResponse deleteApplicationToRedis(@RequestBody Map<String,Object> map,HttpServletRequest request){ |
|
|
|
UserByPort userToken= (UserByPort) request.getAttribute("userToken"); |
|
|
|
List<Integer> mids = (List<Integer>) map.get("mids"); |
|
|
|
List<Integer> mids = (List<Integer>) map.get("iids"); |
|
|
|
List<Integer> depositoryIds = (List<Integer>) map.get("depositoryIds"); |
|
|
|
List<String> placeCodes = (List<String>) map.get("placeCodes"); |
|
|
|
for (int i = 0; i < mids.size(); i++) { |
|
|
|
redisTemplate.opsForList().remove("mids"+userToken.getId(),1,mids.get(i)); |
|
|
|
redisTemplateForHash.opsForList().remove("mids"+userToken.getId(),1,mids.get(i).toString()); |
|
|
|
} |
|
|
|
for (int i = 0; i < depositoryIds.size(); i++) { |
|
|
|
redisTemplate.opsForList().remove("depositoryIds"+userToken.getId(),1,depositoryIds.get(i)); |
|
|
|
redisTemplateForHash.opsForList().remove("depositoryIds"+userToken.getId(),1,depositoryIds.get(i).toString()); |
|
|
|
} |
|
|
|
for (int i = 0; i < placeCodes.size(); i++) { |
|
|
|
redisTemplate.opsForList().remove("placeCodes"+userToken.getId(),1,placeCodes.get(i)); |
|
|
|
redisTemplateForHash.opsForList().remove("placeCodes"+userToken.getId(),1,placeCodes.get(i).toString()); |
|
|
|
} |
|
|
|
return CrudUtil.postHandle(1,1); |
|
|
|
} |
|
|
|
@ -833,18 +831,18 @@ public class DepositoryRecordController { |
|
|
|
Integer start = (page - 1) * pagesize; |
|
|
|
Integer end = page * 10; |
|
|
|
UserByPort userToken= (UserByPort) request.getAttribute("userToken"); |
|
|
|
Long size = redisTemplate.boundListOps("mids"+userToken.getId()).size(); |
|
|
|
Long size = redisTemplateForHash.boundListOps("mids"+userToken.getId()).size(); |
|
|
|
if(end > size){ |
|
|
|
end = ObjectFormatUtil.toInteger(size); |
|
|
|
} |
|
|
|
List<ApplicationModel> list = new ArrayList<>(); |
|
|
|
for (int i = start; i < end; i++) { |
|
|
|
// 获取物料编号
|
|
|
|
Integer mid =ObjectFormatUtil.toInteger(redisTemplate.opsForList().index("mids"+userToken.getId(),i)); |
|
|
|
Integer mid =ObjectFormatUtil.toInteger(redisTemplateForHash.opsForList().index("mids"+userToken.getId(),i)); |
|
|
|
// 获取仓库编号
|
|
|
|
Integer depositoryId =ObjectFormatUtil.toInteger(redisTemplate.opsForList().index("depositoryIds"+userToken.getId(),i)); |
|
|
|
Integer depositoryId =ObjectFormatUtil.toInteger(redisTemplateForHash.opsForList().index("depositoryIds"+userToken.getId(),i)); |
|
|
|
// 获取库位编码
|
|
|
|
String placeCode =(String)(redisTemplate.opsForList().index("placeCodes"+userToken.getId(),i)); |
|
|
|
String placeCode =(String)(redisTemplateForHash.opsForList().index("placeCodes"+userToken.getId(),i)); |
|
|
|
// 获取物料信息
|
|
|
|
Inventory materialById = materialService.findInventoryByMid(mid); |
|
|
|
// 获取仓库信息
|
|
|
|
|