From 0a4c32ca70dd7543596ac7234b06db343917f65e Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期一, 19 六月 2023 14:53:58 +0800
Subject: [PATCH] 新建接口
---
igds-inout/src/main/java/com/ld/igds/inout/service/impl/InoutServiceImpl.java | 271 +++++++++++++++++++++++++++++++----------------------
1 files changed, 159 insertions(+), 112 deletions(-)
diff --git a/igds-inout/src/main/java/com/ld/igds/inout/service/impl/InoutServiceImpl.java b/igds-inout/src/main/java/com/ld/igds/inout/service/impl/InoutServiceImpl.java
index 88ab4fd..263c996 100644
--- a/igds-inout/src/main/java/com/ld/igds/inout/service/impl/InoutServiceImpl.java
+++ b/igds-inout/src/main/java/com/ld/igds/inout/service/impl/InoutServiceImpl.java
@@ -11,10 +11,14 @@
import com.ld.igds.inout.InoutConstant;
import com.ld.igds.inout.dto.InoutData;
import com.ld.igds.inout.dto.InoutParam;
+import com.ld.igds.inout.dto.InoutCheckData;
+import com.ld.igds.inout.dto.InoutCheckParam;
+import com.ld.igds.inout.mapper.InoutCheckMapper;
import com.ld.igds.inout.mapper.InoutRecordMapper;
import com.ld.igds.inout.service.InoutService;
import com.ld.igds.io.constant.OrderRespEnum;
import com.ld.igds.models.Depot;
+import com.ld.igds.models.InoutPrice;
import com.ld.igds.util.ContextUtil;
import com.ld.igds.util.DateUtil;
import com.ld.igds.util.RedisUtil;
@@ -39,6 +43,8 @@
@Resource
private InoutRecordMapper inoutMapper;
@Resource
+ private InoutCheckMapper inoutCheckMapper;
+ @Resource
private RedisUtil redisUtil;
@Resource
private CoreCommonService commonService;
@@ -48,11 +54,14 @@
if (StringUtils.isEmpty(param.getCompanyId())) {
param.setCompanyId(ContextUtil.getCompanyId());
}
+
// 棣栧厛浠庣紦瀛樹腑鑾峰彇锛屽鏋滄病鏈夊垯浠庢暟鎹簱鑾峰彇
InoutData result = this.getFromInoutCache(param);
if (null != result) {
return result;
}
+
+
List<InoutData> list = inoutMapper.inoutProgressQuery(param);
if (null == list || list.size() == 0)
return null;
@@ -92,10 +101,9 @@
return "娌℃湁鑾峰彇鍒拌鍒犻櫎鏁版嵁鐨処D锛屾棤娉曞垹闄わ紒";
}
- // 缂撳瓨涓垹闄�
- this.delInoutFromCache(param.getDeptId(), param.getType(), param.getId(), false);
-
inoutMapper.deleteData(param);
+
+ delInoutFromCache(param.getDeptId(), param.getType(), param.getId());
return null;
}
@@ -105,8 +113,9 @@
if (StringUtils.isEmpty(param.getCompanyId())) {
param.setCompanyId(ContextUtil.getCompanyId());
}
+
// 缂撳瓨涓垹闄�
- this.delInoutFromCache(param.getDeptId(), param.getType(), param.getId(), false);
+ delInoutFromCache(param.getDeptId(), param.getType(), param.getId());
param.setProgress(InoutConstant.PROGRESS_RECORD);
param.setRecordStatus(InoutConstant.RECORD_STATUS_ERROR);
@@ -149,7 +158,7 @@
inoutMapper.insertData(data);
- this.addInoutCache(data);
+ updateInoutCache(data);
} catch (Exception e) {
log.error("------------鍑哄叆搴撴墽琛屼繚瀛樺嚭閿�---{}", e);
@@ -162,6 +171,8 @@
@Override
public String updateData(InoutData data) throws Exception {
+
+ data.setUpdateTime(new Date());
if (StringUtils.isEmpty(data.getCompanyId())) {
data.setCompanyId(ContextUtil.getCompanyId());
}
@@ -175,18 +186,31 @@
inoutMapper.updateData(newData);
- //濡傛灉鏄畬鎴愮姸鎬佷笉鍦ㄨ繘琛屽悗鏈熷鐞嗭紝鍗曠嫭璧癱omplete鏂规硶
- if (InoutConstant.PROGRESS_RECORD.equals(newData.getProgress())) {
- return null;
- }
+ //鏇存柊缂撳瓨
+ updateInoutCache(newData);
- // 鏇存柊绶╁瓨
- if (InoutConstant.PROGRESS_RECORD.equals(newData.getProgress())) {
- this.delInoutFromCache(newData.getDeptId(), newData.getType(), newData.getId(), true);
+ return null;
+ }
+
+ @Override
+ public String updateDataByHandle(InoutData data) {
+ data.setUpdateTime(new Date());
+ if (StringUtils.isEmpty(data.getCompanyId())) {
+ data.setCompanyId(ContextUtil.getCompanyId());
+ }
+ InoutData newData;
+ if (EntityUtils.isEntity(data)) {
+ newData = new InoutData();
+ BeanUtils.copyProperties(data, newData, new String[]{"checkItems", "files"});
} else {
- this.updateInoutCache(newData);
+ newData = data;
}
+ inoutMapper.updateDataByHandle(newData);
+
+ //鏇存柊缂撳瓨
+ updateInoutCache(newData);
+
return null;
}
@@ -241,16 +265,6 @@
return records;
}
-// @Override
-// public InoutData getLastRecord(InoutParam param) {
-// return inoutMapper.getLastRecord(param);
-// }
-
-// @Override
-// public int updateCuStorage(InoutParam param) {
-// return inoutMapper.updateCuStorage(param);
-// }
-
@Override
public String validate(String intelCard, String plateNum) {
InoutParam param = new InoutParam();
@@ -273,16 +287,11 @@
param.setCompanyId(ContextUtil.getCompanyId());
}
- if (null == param.getFoodType()) {
- // 鏍规嵁浠撳簱淇℃伅鑾峰彇缂撳瓨
- Depot depot = commonService.getCacheDepot(param.getCompanyId(), param.getDepotId());
- param.setFoodType(depot.getFoodType());
- }
-
// 娓呴櫎缂撳瓨
- this.delInoutFromCache(param.getDeptId(), param.getType(), param.getId(), true);
+ this.delInoutFromCache(param.getDeptId(), param.getType(), param.getId());
inoutMapper.toComplete(param);
+
return null;
}
@@ -336,43 +345,34 @@
data.setFoodType(depot.getFoodType());
}
- // 娓呴櫎缂撳瓨
- this.delInoutFromCache(data.getDeptId(), data.getType(), data.getId(), false);
-
inoutMapper.updateData(data);
+
+ updateInoutCache(data);
return null;
}
@Override
- public void addInoutCache(InoutData data) {
- data.setFiles(null);
- data.setCheckItems(null);
-
- this.setInoutCache(data.getDeptId(), data);
-
- // 鎺ㄩ�佸埌澶у睆
- List<InoutData> list = this.getListInoutCache(data.getDeptId());
-
- this.notifyToScreen(data.getDeptId(), list, null);
- }
-
- @Override
public void updateInoutCache(InoutData data) {
+
data.setFiles(null);
data.setCheckItems(null);
- this.setInoutCache(data.getDeptId(), data);
+ if (InoutConstant.PROGRESS_RECORD.equals(data.getProgress())) {
- // 鎺ㄩ�佸埌澶у睆
- List<InoutData> list = this.getListInoutCache(data.getDeptId());
- List<InoutData> completeList = this.getCompleteListInoutCache(data.getDeptId());
+ delInoutFromCache(data.getDeptId(), data.getType(), data.getId());
- this.notifyToScreen(data.getCompanyId(), list, completeList);
+ setCompleteInoutCache(data.getDeptId(), data);
+
+ } else {
+ setInoutCache(data.getDeptId(), data);
+ }
+ //鎺ㄩ�佸ぇ灞�
+ notifyToScreen(data.getCompanyId(), data.getDeptId(), data.getProgress());
}
- @Override
- public void delInoutFromCache(String deptId, String type, String id, boolean addToComplete) {
+
+ public void delInoutFromCache(String deptId, String type, String id) {
if (StringUtils.isEmpty(deptId)) {
return;
}
@@ -382,44 +382,14 @@
if (StringUtils.isEmpty(id)) {
return;
}
- //鍒犻櫎鏈畬鎴愭祦绋嬬殑缂撳瓨
+ //浠庢湭瀹屾垚鍒楄〃涓垹闄�
String key = this.buildInoutKey(deptId, InoutConstant.KEY_INOUT_LIST, type, id);
- InoutData inoutData = (InoutData) redisUtil.get(key);
redisUtil.del(key);
- List<InoutData> list = this.getListInoutCache(deptId);
-
- //鍒犻櫎宸插畬鎴愭祦绋嬬殑缂撳瓨
- key = this.buildInoutKey(deptId, InoutConstant.KEY_INOUT_COMPLETE_LIST, type, id);
- redisUtil.del(key);
- List<InoutData> completeList = this.getCompleteListInoutCache(deptId);
-
- if (addToComplete) {
- addInoutCompleteCache(inoutData);
- completeList = this.getCompleteListInoutCache(deptId);
- }
-
- // 閫氱煡鍒板ぇ灞�
- notifyToScreen(deptId, list, completeList);
- }
-
- /**
- * 娣诲姞鍒板凡缁忓畬鎴愮殑闃熷垪涓�
- *
- * @param data
- */
- public void addInoutCompleteCache(InoutData data) {
-
- if (null == data.getCompleteTime()) {
- data.setCompleteTime(new Date());
- }
- if (!InoutConstant.PROGRESS_RECORD.equals(data.getProgress())) {
- data.setProgress(InoutConstant.PROGRESS_RECORD);
- }
- this.setCompleteInoutCache(data.getDeptId(), data);
}
@Override
public List<InoutData> getListInoutCache(String deptId) {
+
String pattern = RedisConst.buildKey(deptId, InoutConstant.KEY_INOUT_LIST);
Set<String> keys = redisUtil.keys(pattern);
if (null == keys || keys.isEmpty()) {
@@ -452,6 +422,7 @@
if (StringUtils.isEmpty(param.getDeptId())) {
param.setDeptId(ContextUtil.subDeptId(null));
}
+
List<InoutData> list = getListInoutCache(param.getDeptId());
if (null == list || list.isEmpty())
return null;
@@ -475,19 +446,6 @@
}
}
return null;
- }
-
- @Override
- public void initInoutScreen(String deptId) {
- if (null == deptId) {
- deptId = ContextUtil.subDeptId(null);
- }
-
- List<InoutData> curList = this.getListInoutCache(deptId);
- List<InoutData> complateList = this.getCompleteListInoutCache(deptId);
-
- notifyToScreen(deptId, curList, complateList);
-
}
@Override
@@ -674,9 +632,7 @@
* @param data
*/
private void setInoutCache(String deptId, InoutData data) {
- String key = this.buildInoutKey(deptId,
- InoutConstant.KEY_INOUT_LIST, data.getType(), data.getId());
-
+ String key = this.buildInoutKey(deptId, InoutConstant.KEY_INOUT_LIST, data.getType(), data.getId());
redisUtil.set(key, data, InoutConstant.KEY_INOUT_LIST_TIME);
}
@@ -688,7 +644,6 @@
*/
private void setCompleteInoutCache(String deptId, InoutData data) {
String key = this.buildInoutKey(deptId, InoutConstant.KEY_INOUT_COMPLETE_LIST, data.getType(), data.getId());
-
//璁剧疆缂撳瓨鍒扮浜屽ぉ鍑屾櫒(璁＄畻褰撳墠鏃堕棿鍒扮浜屽ぉ鍑屾櫒鐨勬椂闂村樊绉掓暟)
redisUtil.set(key, data, DateUtil.getNowToNextDaySeconds());
}
@@ -696,12 +651,17 @@
/**
* 鎺ㄩ�佸埌澶у睆锛屽垽鏂彧鏈夊綋澶у睆鍦ㄧ嚎鏃跺�欐墠澶勭悊褰撳墠閫昏緫锛岄伩鍏嶉〉闈㈠崱椤匡紝璋冪敤瀛愪换鍔″畬鎴愭帹閫�
*
- * @param deptId
- * @param curList 鏈畬鎴愭祦绋嬩釜鏁�
- * @param completeList 宸茬粡瀹屾垚娴佺▼涓暟
+ * @param companyId 缁勭粐缂栧彿
+ * @param deptId 鍒嗗簱缂栧彿
+ * @param progress 娴佽浆鑺傜偣
*/
- private void notifyToScreen(String deptId, List<InoutData> curList,
- List<InoutData> completeList) {
+ public void notifyToScreen(String companyId, String deptId, String progress) {
+
+ // 鎺ㄩ�佸埌澶у睆
+ List<InoutData> curList = this.getListInoutCache(deptId);
+
+ List<InoutData> completeList = this.getCompleteListInoutCache(deptId);
+
if (null == WebSocketServer.contextOnLineMap.get(BizType.SCREEN
.getCode())) {
@@ -725,13 +685,10 @@
|| WebSocketServer.contextOnLineMap.get(BizType.SCREEN_CHECK
.getCode())) {
- if (null == completeList) {
- completeList = this.getCompleteListInoutCache(deptId);
- }
// 鍒涘缓涓�涓瓙浠诲姟杩涜鎺ㄩ�佷俊鎭�
- FutureTask<String> futureTask = new FutureTask<>(
- new NotifyScreenTask(curList, completeList, deptId));
+ FutureTask<String> futureTask = new FutureTask<>(new NotifyScreenTask(curList, completeList, deptId));
+
ExecutorService executorService = Executors.newCachedThreadPool();
executorService.submit(futureTask);
executorService.shutdown();
@@ -750,4 +707,94 @@
public String buildInoutKey(String deptId, String key, String type, String bizId) {
return Constant.APP_NAME + ":" + deptId + ":" + key + ":" + type + ":" + bizId;
}
+
+ @Override
+ public Page<InoutCheckData> pageSampleData(InoutCheckParam param) {
+
+ //璁剧疆璧峰鍜屾埅姝㈡椂闂�
+ if (null != param.getStart()) {
+ param.setStart(DateUtil.getCurZero(param.getStart()));
+ }
+ if (null != param.getEnd()) {
+ param.setEnd(DateUtil.getNextZero(param.getEnd()));
+ }
+
+ // 璁剧疆杞︾墝鍜屾楠屽崟鎹殑妯＄硦鏌ヨ
+ if (StringUtils.isNotEmpty(param.getPlateNum())) {
+ param.setPlateNum("%" + param.getPlateNum() + "%");
+ }
+ if (StringUtils.isNotEmpty(param.getCheckId())) {
+ param.setCheckId("%" + param.getCheckId() + "%");
+ }
+
+ Page<InoutCheckData> page = new Page<>(param.getPage(), param.getLimit());
+ page.setSearchCount(true);
+
+ List<InoutCheckData> records = inoutCheckMapper.pageSampleData(page, param);
+ page.setRecords(records);
+
+ return page;
+ }
+
+ @Override
+ public String updateSampleData(InoutCheckData data) {
+ if (StringUtils.isEmpty(data.getCompanyId())) {
+ data.setCompanyId(ContextUtil.getCompanyId());
+ }
+ if (StringUtils.isEmpty(data.getDeptId())) {
+ data.setCompanyId(ContextUtil.subDeptId(null));
+ }
+
+ int num = inoutCheckMapper.updateSampleData(data);
+ return null;
+ }
+
+ @Override
+ public Page<InoutCheckData> pageCheckData(InoutCheckParam param) {
+
+ //璁剧疆璧峰鍜屾埅姝㈡椂闂�
+ if (null != param.getStart()) {
+ param.setStart(DateUtil.getCurZero(param.getStart()));
+ }
+ if (null != param.getEnd()) {
+ param.setEnd(DateUtil.getNextZero(param.getEnd()));
+ }
+
+ // 璁剧疆妫�楠屽崟鎹殑妯＄硦鏌ヨ
+ if (StringUtils.isNotEmpty(param.getCheckId())) {
+ param.setCheckId("%" + param.getCheckId() + "%");
+ }
+
+ Page<InoutCheckData> page = new Page<>(param.getPage(), param.getLimit());
+ page.setSearchCount(true);
+
+ List<InoutCheckData> records = inoutCheckMapper.pageCheckData(page, param);
+ page.setRecords(records);
+
+ return page;
+ }
+
+ @Override
+ public String updateCheckData(InoutCheckData data) {
+ if (StringUtils.isEmpty(data.getCompanyId())) {
+ data.setCompanyId(ContextUtil.getCompanyId());
+ }
+ if (StringUtils.isEmpty(data.getDeptId())) {
+ data.setCompanyId(ContextUtil.subDeptId(null));
+ }
+
+ int num = inoutCheckMapper.updateCheckData(data);
+ return null;
+ }
+
+ @Override
+ public List<InoutPrice> getPrice(InoutCheckParam param) {
+ if(null == param.getStart()){
+ param.setStart(new Date());
+ }
+ if(null == param.getEnd()){
+ param.setEnd(new Date());
+ }
+ return inoutCheckMapper.getPrice(param);
+ }
}
--
Gitblit v1.9.3