From 651dfb24aa82ea28e6348907bc02dc8c84a6e13f Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期四, 29 六月 2023 19:33:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
igds-inout/src/main/java/com/ld/igds/m/service/impl/InoutCommonServiceImpl.java | 145 ++++++++---------------------------------------
1 files changed, 26 insertions(+), 119 deletions(-)
diff --git a/igds-inout/src/main/java/com/ld/igds/m/service/impl/InoutCommonServiceImpl.java b/igds-inout/src/main/java/com/ld/igds/m/service/impl/InoutCommonServiceImpl.java
index 7146260..96f94fa 100644
--- a/igds-inout/src/main/java/com/ld/igds/m/service/impl/InoutCommonServiceImpl.java
+++ b/igds-inout/src/main/java/com/ld/igds/m/service/impl/InoutCommonServiceImpl.java
@@ -1,5 +1,7 @@
package com.ld.igds.m.service.impl;
+import java.util.List;
+
import com.ld.igds.constant.RedisConst;
import com.ld.igds.inout.InoutConstant;
import com.ld.igds.inout.dto.InoutParam;
@@ -14,10 +16,9 @@
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Repository;
-import java.util.*;
+import javax.annotation.Resource;
/**
* 鍑哄叆搴撳紑濮嬪墠鐨勫悇绉嶉厤缃� --- 鍖呭惈娴佺▼閰嶇疆銆佸嚭鍏ュ簱璁惧閰嶇疆銆侀�氱煡鍗曠瓑
@@ -28,71 +29,37 @@
@Repository(InoutCommonService.BEAN_ID)
public class InoutCommonServiceImpl implements InoutCommonService {
- @Autowired
+ @Resource
private RedisUtil redisUtil;
- @Autowired
- private InoutCommonMapper inoutManagerMapper;
+ @Resource
+ private InoutCommonMapper inoutCommonMapper;
@Override
public void flushInoutSysConfCache(InoutSysConf data) {
-
- String key = RedisConst.buildKey(data.getCompanyId(), InoutConstant.CACHE_INOUT_SYS_CONF, data.getDeptId());
-
+ String key = RedisConst.buildKey(data.getDeptId(), InoutConstant.CACHE_INOUT_SYS_CONF);
redisUtil.set(key, data);
}
@Override
public InoutSysConf getCacheInoutSysConf(String companyId, String deptId) {
- if (null == companyId || null == deptId) {
- return null;
- }
- // 浠庣紦瀛樹腑鑾峰彇宸叉湁鐨勭粍缁囩紪鐮�
- String key = RedisConst.buildKey(companyId, InoutConstant.CACHE_INOUT_SYS_CONF, deptId);
-
+ String key = RedisConst.buildKey(deptId, InoutConstant.CACHE_INOUT_SYS_CONF);
return (InoutSysConf) redisUtil.get(key);
}
- @Override
- public List<InoutSysConf> getCacheInoutSysConf(String companyId) {
- if (StringUtils.isEmpty(companyId)) {
- return null;
- }
-
- String pattern = RedisConst.buildKey(companyId, InoutConstant.CACHE_INOUT_SYS_CONF);
-
- Set<String> keys = redisUtil.keys(pattern);
- if (null == keys || keys.isEmpty()) {
- return null;
- }
-
- List<InoutSysConf> list = new ArrayList<>();
- for (String key : keys) {
- list.add((InoutSysConf) redisUtil.get(key));
- }
- return list;
- }
@Override
public void flushInoutConfCache(String companyId, String deptId) {
- List<InoutConf> list = inoutManagerMapper.listInoutConf(companyId, deptId);
-
+ List<InoutConf> list = inoutCommonMapper.listInoutConf(companyId, deptId);
+
String key = RedisConst.buildKey(companyId, InoutConstant.CACHE_INOUT_CONF_LIST, deptId);
-
redisUtil.set(key, list);
-
- log.debug("---鏇存柊鍑哄叆搴撻厤缃俊鎭紦瀛�----");
}
- @Override
@SuppressWarnings("unchecked")
+ @Override
public List<InoutConf> getCacheInoutConf(String companyId, String deptId) {
- if (null == companyId || null == deptId) {
- return null;
- }
- String key = RedisConst.buildKey(companyId,
- InoutConstant.CACHE_INOUT_CONF_LIST, deptId);
-
+ String key = RedisConst.buildKey(companyId, InoutConstant.CACHE_INOUT_CONF_LIST, deptId);
return (List<InoutConf>) redisUtil.get(key);
}
@@ -117,7 +84,7 @@
@Override
public void updateInoutConfStatus(String ip, Integer port, String status) {
- inoutManagerMapper.updateInoutConfStatus(ip, port, status);
+ inoutCommonMapper.updateInoutConfStatus(ip, port, status);
}
@Override
@@ -128,53 +95,12 @@
if (StringUtils.isNotEmpty(param.getKey())) {
param.setKey("%" + param.getKey() + "%");
}
- return inoutManagerMapper.listCustomer(param);
+ return inoutCommonMapper.listCustomer(param);
}
-
-// @Override
-// public List<InoutCustomer> listCustomerByNoticeIn(InoutParam param) {
-// if (StringUtils.isEmpty(param.getCompanyId())) {
-// param.setCompanyId(ContextUtil.getCompanyId());
-// }
-// //璁剧疆褰撳墠骞翠唤
-// Date date = new Date();
-// if (null != param.getStart()) {
-// date = param.getStart();
-// }
-// param.setYear(DateFormatUtils.format(date, "yyyy"));
-//
-// if (StringUtils.isNotEmpty(param.getKey())) {
-// param.setKey("%" + param.getKey() + "%");
-// }
-// //璁剧疆閫氱煡鍗曞畬鎴愮姸鎬�
-// param.setType(InoutConstant.COMPLETE_STATUS_NONE);
-// return inoutManagerMapper.listCustomerByNoticeIn(param);
-// }
-
-// @Override
-// public List<InoutCustomer> listCustomerByNoticeOut(InoutParam param) {
-// if (StringUtils.isEmpty(param.getCompanyId())) {
-// param.setCompanyId(ContextUtil.getCompanyId());
-// }
-//
-// //璁剧疆褰撳墠骞翠唤
-// Date date = new Date();
-// if (null != param.getStart()) {
-// date = param.getStart();
-// }
-// param.setYear(DateFormatUtils.format(date, "yyyy"));
-//
-// if (StringUtils.isNotEmpty(param.getKey())) {
-// param.setKey("%" + param.getKey() + "%");
-// }
-// //璁剧疆閫氱煡鍗曞畬鎴愮姸鎬�
-// param.setType(InoutConstant.COMPLETE_STATUS_NONE);
-// return inoutManagerMapper.listCustomerByNoticeOut(param);
-// }
@Override
public int updateCustomer(NoticeInData data) {
- return inoutManagerMapper.updateCustomer(data);
+ return inoutCommonMapper.updateCustomer(data);
}
@Override
@@ -183,22 +109,13 @@
companyId = ContextUtil.getCompanyId();
}
- return inoutManagerMapper.getMaxCustomerId(companyId);
+ return inoutCommonMapper.getMaxCustomerId(companyId);
}
-
-// @Override
-// public InoutNoticeIn getInoutNoticeIn(NoticeInParam param) {
-// List<InoutNoticeIn> list = inoutManagerMapper.listNoticeIn(param);
-// if (null == list || list.isEmpty()) {
-// return null;
-// }
-// return list.get(0);
-// }
@Override
public int updateNoticeIn(NoticeInData data) {
- int i = inoutManagerMapper.updateNoticeIn(data);
+ int i = inoutCommonMapper.updateNoticeIn(data);
if (i == 0) {
log.info("绯荤粺涓病鏈夋洿鏂板埌褰撳墠鐢ㄦ埛浠诲姟淇℃伅锛屾柊澧炰竴涓鎴蜂换鍔★紒");
@@ -214,14 +131,14 @@
param.setName("鍏ュ簱閫氱煡鍗�");
param.setCreateUser(data.getCreateUser());
param.setId(data.getId());
- inoutManagerMapper.addNoticeIn(param);
+ inoutCommonMapper.addNoticeIn(param);
}
return i;
}
@Override
public List<InoutNoticeIn> getUnComNoticeIn(String companyId) {
- return inoutManagerMapper.getUnComNoticeIn(companyId);
+ return inoutCommonMapper.getUnComNoticeIn(companyId);
}
@Override
@@ -238,32 +155,24 @@
if (StringUtils.isEmpty(param.getDeptId())) {
param.setDeptId(ContextUtil.subDeptId(null));
}
- inoutManagerMapper.reSumNoticeInComplete(param);
+ inoutCommonMapper.reSumNoticeInComplete(param);
return null;
}
@Override
public Integer queryNoticeOut(NoticeParam param) {
- return inoutManagerMapper.queryNoticeOut(param);
+ return inoutCommonMapper.queryNoticeOut(param);
}
@Override
public Integer queryNoticeIn(NoticeParam param) {
- return inoutManagerMapper.queryNoticeIn(param);
+ return inoutCommonMapper.queryNoticeIn(param);
}
-// @Override
-// public InoutNoticeOut getInoutNoticeOut(NoticeOutParam param) {
-// List<InoutNoticeOut> list = inoutManagerMapper.getNoticeOut(param);
-// if (null == list || list.isEmpty()) {
-// return null;
-// }
-// return list.get(0);
-// }
@Override
public List<InoutNoticeOut> getUnComNoticeOut(String companyId) {
- return inoutManagerMapper.getUnComNoticeOut(companyId);
+ return inoutCommonMapper.getUnComNoticeOut(companyId);
}
@@ -284,7 +193,7 @@
if (StringUtils.isEmpty(param.getDeptId())) {
param.setDeptId(ContextUtil.subDeptId(null));
}
- inoutManagerMapper.reSumNoticeOutComplete(param);
+ inoutCommonMapper.reSumNoticeOutComplete(param);
return null;
}
@@ -344,13 +253,11 @@
@Override
public List<InoutNoticeIn> listNoticeIn(NoticeParam param) {
- return inoutManagerMapper.listNoticeIn(param);
+ return inoutCommonMapper.listNoticeIn(param);
}
@Override
public List<InoutNoticeOut> listNoticeOut(NoticeParam param) {
- return inoutManagerMapper.listNoticeOut(param);
+ return inoutCommonMapper.listNoticeOut(param);
}
-
-
}
--
Gitblit v1.9.3