From ff212e3d6cc57220133aff1d68b6bed02ba8a77b Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期六, 27 五月 2023 14:36:42 +0800
Subject: [PATCH] 调整模块-取消错误代码，添加TODO标记后期处理
---
igds-inout/src/main/java/com/ld/igds/inout/manager/InoutReportManager.java | 58 ++++----
igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1201.java | 7
igds-inout/src/main/java/com/ld/igds/timer/InoutScheduled.java | 4
igds-inout/src/main/java/com/ld/igds/inout/view/InoutSettlePR.java | 30 ++--
igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1304.java | 2
igds-inout/src/main/java/com/ld/igds/inout/manager/InoutManager.java | 14 +-
igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1312.java | 4
igds-api-phone/src/main/java/com/ld/igds/phone/service/impl/ServiceImpl5204.java | 2
igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1301.java | 2
igds-core/src/main/java/com/ld/igds/models/Depot.java | 5
igds-api-inte/src/main/java/com/ld/igds/sh/timer/ShScheduled.java | 4
igds-inout/src/main/java/com/ld/igds/m/service/HLossOverService.java | 2
igds-api-phone/src/main/java/com/ld/igds/phone/service/impl/ServiceImpl5206.java | 2
igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/Phone35ServiceImpl5208.java | 4
igds-core/src/main/java/com/ld/igds/common/impl/CommonDataServiceImpl.java | 2
igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1308.java | 2
igds-core/src/main/java/com/ld/igds/check/service/impl/CoreCheckStandardServiceImpl.java | 14 +-
igds-core/src/main/java/com/ld/igds/view/service/HDepotStoreService.java | 1
igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1311.java | 2
igds-inout/src/main/java/com/ld/igds/inout/service/impl/InoutServiceImpl.java | 16 +-
igds-core/src/main/java/com/ld/igds/view/DepotPR.java | 16 +-
/dev/null | 143 --------------------
igds-api-phone/src/main/java/com/ld/igds/phone/service/impl/ServiceImpl5208.java | 2
igds-core/src/main/java/com/ld/igds/check/service/HCheckStandardService.java | 7
igds-inout/src/main/java/com/ld/igds/inout/view/InoutReportPR.java | 12
igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1202.java | 2
igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1302.java | 2
27 files changed, 111 insertions(+), 250 deletions(-)
diff --git a/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1201.java b/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1201.java
index 396ae25..5b26c40 100644
--- a/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1201.java
+++ b/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1201.java
@@ -110,9 +110,10 @@
dto.setShrxm(StringUtils.isEmpty(data.getUser())?"0":data.getUser());
dto.setQyqy(StringUtils.isEmpty(data.getCheckArea())?"0":data.getCheckArea());
dto.setQyrxm(StringUtils.isEmpty(data.getCheckUser())?"0":data.getCheckUser());
- dto.setYpsl(data.getCheckNum()==null?"0.0":(data.getCheckNum() + ""));
- dto.setDbsl(StringUtils.isEmpty(data.getCheckRepresent())?"0":data.getCheckRepresent());
- dto.setYpdj(StringUtils.isEmpty(data.getCheckLevel())?"0":data.getCheckLevel());
+ // TODO
+// dto.setYpsl(data.getCheckNum()==null?"0.0":(data.getCheckNum() + ""));
+// dto.setDbsl(StringUtils.isEmpty(data.getCheckRepresent())?"0":data.getCheckRepresent());
+// dto.setYpdj(StringUtils.isEmpty(data.getCheckLevel())?"0":data.getCheckLevel());
dto.setSfzcccnx(StringUtils.isEmpty(data.getNormalYear())?"0":data.getNormalYear());
dto.setLsxz(StringUtils.isEmpty(data.getFoodLevel())?"0":data.getFoodLevel());
dto.setBgbh(data.getId());
diff --git a/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1202.java b/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1202.java
index 8b663f3..2802703 100644
--- a/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1202.java
+++ b/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1202.java
@@ -99,7 +99,7 @@
dto.setZjbgdnm(data.getCheckId() + data.getCompanyId() + data.getStandardId());
dto.setZjbgmxnm(data.getCheckId() + data.getCompanyId() + data.getStandardId());
dto.setJyxmnm(data.getStandardId());
- dto.setJybz(data.getStandardValue());
+ // dto.setJybz(data.getStandardValue()); TODO
dto.setJyjl(StringUtils.isEmpty(data.getRemarks())?"0":data.getRemarks());
dto.setBz(StringUtils.isEmpty(data.getRemarks())?"0":data.getRemarks());
diff --git a/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1301.java b/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1301.java
index 40df5ad..c9b9a31 100644
--- a/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1301.java
+++ b/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1301.java
@@ -85,7 +85,7 @@
dto.setWlnm(StringUtils.isEmpty(noticeOut.getFoodVariety())?"0":noticeOut.getFoodVariety());
dto.setWlmc(StringUtils.isEmpty(noticeOut.getFoodVariety())?"0":FoodVariety.getMsg(noticeOut.getFoodVariety()));
dto.setWlbh(StringUtils.isEmpty(noticeOut.getFoodVariety())?"0":noticeOut.getFoodVariety());
- dto.setWldjnm(StringUtils.isEmpty(noticeOut.getFoodLevel())?"0":noticeOut.getFoodLevel());
+ // dto.setWldjnm(StringUtils.isEmpty(noticeOut.getFoodLevel())?"0":noticeOut.getFoodLevel()); TODO
building = hApiShServiceImpl.getBuilding(companyId, noticeOut.getDepotId().substring(0, 25));
if (null != building) {
dto.setCfbh(building.getId());
diff --git a/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1302.java b/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1302.java
index 72a26a2..79a37a4 100644
--- a/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1302.java
+++ b/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1302.java
@@ -98,7 +98,7 @@
dto.setMzjlsj(DateFormatUtils.format(inoutRecord.getFullWeightTime(),"yyyy-MM-dd HH:mm:ss"));
dto.setPz(inoutRecord.getEmptyWeight() + "");
dto.setPzjlsj(DateFormatUtils.format(inoutRecord.getEmptyWeightTime(),"yyyy-MM-dd HH:mm:ss"));
- dto.setZjkl(inoutRecord.getDeSum() + "");
+ // dto.setZjkl(inoutRecord.getDeSum() + ""); TODO
dto.setJz(inoutRecord.getSettleWeight() + "");
dto.setCmsj(DateFormatUtils.format(inoutRecord.getCompleteTime(),"yyyy-MM-dd HH:mm:ss"));
dto.setCmqrmgryxm(StringUtils.isEmpty(inoutRecord.getCompleteUser())?"0":inoutRecord.getCompleteUser());
diff --git a/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1304.java b/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1304.java
index b9ed235..fefae36 100644
--- a/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1304.java
+++ b/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1304.java
@@ -100,7 +100,7 @@
dto.setJsje(String.valueOf(settle.getPaySum()));
dto.setJssj(DateFormatUtils.format(settle.getPayTime()==null?new Date():settle.getPayTime(),"yyyy-MM-dd HH:mm:ss"));
dto.setJsfs(StringUtils.isEmpty(settle.getPayType())?"0":settle.getPayType());
- dto.setSkr(StringUtils.isEmpty(settle.getCustomerName())?"0":settle.getCustomerName());
+ // dto.setSkr(StringUtils.isEmpty(settle.getCustomerName())?"0":settle.getCustomerName()); TODO
dto.setYhkh(StringUtils.isEmpty(settle.getBankNum())?"0":settle.getBankNum());
dto.setSgjsdnm(settle.getId());
diff --git a/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1308.java b/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1308.java
index 64b8569..d9b363a 100644
--- a/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1308.java
+++ b/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1308.java
@@ -107,7 +107,7 @@
dto.setJsyxm(StringUtils.isEmpty(settle.getPayUser())?"0":settle.getPayUser());
dto.setShrxm(StringUtils.isEmpty(settle.getPayUser())?"0":settle.getPayUser());
dto.setShsj(DateFormatUtils.format(settle.getPayTime(),"yyyy-MM-dd HH:mm:ss"));
- dto.setKhmc(StringUtils.isEmpty(settle.getCustomerName())?"0":settle.getCustomerName());
+ // dto.setKhmc(StringUtils.isEmpty(settle.getCustomerName())?"0":settle.getCustomerName()); TODO
dto.setZdrxm(StringUtils.isEmpty(settle.getPayUser())?"0":settle.getPayUser());
dto.setZdsj(DateFormatUtils.format(settle.getPayTime(),"yyyy-MM-dd HH:mm:ss"));
dto.setJsfsmc(StringUtils.isEmpty(settle.getPayType())?"0":settle.getPayType());
diff --git a/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1311.java b/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1311.java
index 2831ee1..072bb42 100644
--- a/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1311.java
+++ b/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1311.java
@@ -99,7 +99,7 @@
dto1311.setNm(data.getDepotId().substring(0, 21));
dto1311.setZznm(data.getDepotId().substring(0, 21));
dto1311.setSydjdbh(data.getId());
- dto1311.setWlbh(StringUtils.isEmpty(data.getFoodVariety()) ? "0" : data.getFoodVariety());
+ // dto1311.setWlbh(StringUtils.isEmpty(data.getFoodVariety()) ? "0" : data.getFoodVariety()); TODO
dto1311.setRknx(DateFormatUtils.format((data.getSubmitTime() == null ? new Date() : data.getSubmitTime()), "yyyy"));
dto1311.setNx(DateFormatUtils.format((data.getSubmitTime() == null ? new Date() : data.getSubmitTime()), "yyyy"));
dto1311.setLrsj(DateFormatUtils.format((data.getSubmitTime() == null ? new Date() : data.getSubmitTime()), "yyyy-MM-dd HH:mm:ss"));
diff --git a/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1312.java b/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1312.java
index 4f06f63..4c49d9c 100644
--- a/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1312.java
+++ b/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1312.java
@@ -3,6 +3,7 @@
import com.alibaba.fastjson.JSONObject;
import com.ld.igds.constant.RedisConst;
import com.ld.igds.log.service.InteStatusLogService;
+import com.ld.igds.models.InoutVarietyChange;
import com.ld.igds.models.InteStatusLog;
import com.ld.igds.sh.dto.ApiResponse;
import com.ld.igds.sh.dto.Dto1312;
@@ -14,12 +15,15 @@
import com.ld.igds.sh.util.RespUtil;
import com.ld.igds.util.ContextUtil;
import com.ld.igds.util.RedisUtil;
+
import lombok.extern.slf4j.Slf4j;
+
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.time.DateFormatUtils;
import org.apache.commons.lang3.time.DateUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+
import java.util.*;
/**
diff --git a/igds-api-inte/src/main/java/com/ld/igds/sh/timer/ShScheduled.java b/igds-api-inte/src/main/java/com/ld/igds/sh/timer/ShScheduled.java
index 425e3f2..29d4eab 100644
--- a/igds-api-inte/src/main/java/com/ld/igds/sh/timer/ShScheduled.java
+++ b/igds-api-inte/src/main/java/com/ld/igds/sh/timer/ShScheduled.java
@@ -69,7 +69,7 @@
dto.setFcqkLldw(data.getCustomerName());
dto.setFcqkLssl(data.getSettleWeight());
dto.setJsqkRksl(data.getSettleWeight());
- dto.setJsqkKszs(data.getDeSum());
+ //dto.setJsqkKszs(data.getDeSum()); TODO
List<CheckItem> checkItems = hApiShService.listInoutChecks(data.getCompanyId(), data.getCheckId());
if(null != checkItems && checkItems.size() > 0){
@@ -114,7 +114,7 @@
dto.setThdw(data.getCustomerName());
dto.setThc(data.getDepotId());
dto.setFcsl(data.getSettleWeight());
- dto.setJcs(data.getCurStorage() - data.getSettleWeight());
+ // dto.setJcs(data.getCurStorage() - data.getSettleWeight()); TODO
dto.setDataDate(DateFormatUtils.format(data.getCompleteTime(), "yyyy-MM-dd"));
dto.setUpdateTime(DateFormatUtils.format(new Date(), "yyyy-MM-dd HH:mm:ss"));
diff --git a/igds-api-phone/src/main/java/com/ld/igds/phone/service/impl/ServiceImpl5204.java b/igds-api-phone/src/main/java/com/ld/igds/phone/service/impl/ServiceImpl5204.java
index 3448d93..4d755e7 100644
--- a/igds-api-phone/src/main/java/com/ld/igds/phone/service/impl/ServiceImpl5204.java
+++ b/igds-api-phone/src/main/java/com/ld/igds/phone/service/impl/ServiceImpl5204.java
@@ -82,7 +82,7 @@
dto.setDepotId(inoutData.getDepotId());
dto.setDepotName(phoneUtil.getDepotName(authUser.getCompanyId(),
inoutData.getDepotId()));
- dto.setCustomerId(inoutData.getCustomerId());
+ // dto.setCustomerId(inoutData.getCustomerId()); TODO
dto.setCustomerName(inoutData.getCustomerName());
dto.setFoodVariety(inoutData.getFoodVariety());
dto.setFoodLevel(inoutData.getFoodLevel());
diff --git a/igds-api-phone/src/main/java/com/ld/igds/phone/service/impl/ServiceImpl5206.java b/igds-api-phone/src/main/java/com/ld/igds/phone/service/impl/ServiceImpl5206.java
index 4bce204..30b74f8 100644
--- a/igds-api-phone/src/main/java/com/ld/igds/phone/service/impl/ServiceImpl5206.java
+++ b/igds-api-phone/src/main/java/com/ld/igds/phone/service/impl/ServiceImpl5206.java
@@ -81,7 +81,7 @@
dto.setDepotId(inoutData.getDepotId());
dto.setDepotName(phoneUtil.getDepotName(authUser.getCompanyId(),
inoutData.getDepotId()));
- dto.setCustomerId(inoutData.getCustomerId());
+ // dto.setCustomerId(inoutData.getCustomerId()); TODO
dto.setCustomerName(inoutData.getCustomerName());
dto.setFoodVariety(inoutData.getFoodVariety());
dto.setFoodLevel(inoutData.getFoodLevel());
diff --git a/igds-api-phone/src/main/java/com/ld/igds/phone/service/impl/ServiceImpl5208.java b/igds-api-phone/src/main/java/com/ld/igds/phone/service/impl/ServiceImpl5208.java
index f495c8f..e2ef6cd 100644
--- a/igds-api-phone/src/main/java/com/ld/igds/phone/service/impl/ServiceImpl5208.java
+++ b/igds-api-phone/src/main/java/com/ld/igds/phone/service/impl/ServiceImpl5208.java
@@ -87,7 +87,7 @@
inoutHandle.setDepotId(inoutData.getDepotId());
inoutHandle.setDepotName(phoneUtil.getDepotName(inoutData.getCompanyId(),inoutData.getDepotId()));
inoutHandle.setDeHandle(inoutData.getDeHandle());
- inoutHandle.setCustomerId(inoutData.getCustomerId());
+ // inoutHandle.setCustomerId(inoutData.getCustomerId()); TODO
inoutHandle.setCustomerName(inoutData.getCustomerName());
inoutHandle.setFoodVariety(inoutData.getFoodVariety());
inoutHandle.setSettleWeight(inoutData.getSettleWeight());
diff --git a/igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/Phone35ServiceImpl5208.java b/igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/Phone35ServiceImpl5208.java
index e8e5f5e..fd3a5d9 100644
--- a/igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/Phone35ServiceImpl5208.java
+++ b/igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/Phone35ServiceImpl5208.java
@@ -76,8 +76,8 @@
inoutHandle.setProgressName(phone35Util.getProgressName(phone35AuthUser.getCompanyId(), inoutData.getProgress()));
inoutHandle.setFoodVarietyName(FoodVariety.getMsg(inoutData.getFoodVariety()));
inoutHandle.setFoodLevelName(FoodLevel.getMsg(inoutData.getFoodLevel()));
- inoutHandle.setHandleStart(inoutData.getHandleStart());
- inoutHandle.setHandelEnd(inoutData.getHandleEnd());
+// inoutHandle.setHandleStart(inoutData.getHandleStart()); TODO
+// inoutHandle.setHandelEnd(inoutData.getHandleEnd()); TODO
inoutHandle.setProgress(inoutData.getProgress());
//鏍规嵁娴佹按id銆佺粍缁囩紪鐮佹煡璇㈠浘鐗囦俊鎭�
diff --git a/igds-core/src/main/java/com/ld/igds/check/service/HCheckStandardService.java b/igds-core/src/main/java/com/ld/igds/check/service/HCheckStandardService.java
index 349d133..c7af9a8 100644
--- a/igds-core/src/main/java/com/ld/igds/check/service/HCheckStandardService.java
+++ b/igds-core/src/main/java/com/ld/igds/check/service/HCheckStandardService.java
@@ -44,9 +44,10 @@
if(null == data.getId()){
data.setId(ContextUtil.getTimeId());
}
- if(null == data.getDeptId()){
- data.setDeptId(ContextUtil.subDeptId(ContextUtil.getLoginUser()));
- }
+// TODO
+// if(null == data.getDeptId()){
+// data.setDeptId(ContextUtil.subDeptId(ContextUtil.getLoginUser()));
+// }
if(null == data.getUpperLimit()) data.setUpperLimit(0.0);
diff --git a/igds-core/src/main/java/com/ld/igds/check/service/impl/CoreCheckStandardServiceImpl.java b/igds-core/src/main/java/com/ld/igds/check/service/impl/CoreCheckStandardServiceImpl.java
index bf21be7..16a2de4 100644
--- a/igds-core/src/main/java/com/ld/igds/check/service/impl/CoreCheckStandardServiceImpl.java
+++ b/igds-core/src/main/java/com/ld/igds/check/service/impl/CoreCheckStandardServiceImpl.java
@@ -68,13 +68,13 @@
item.setRuleAddEnd(data.getRuleAddEnd());
item.setRuleReduce(data.getRuleReduce());
item.setOperaSymbol(data.getOperaSymbol());
-
- if (data.getUpperLimit() > 0.0) {
- item.setStandardValue(data.getUpperLimit() + "");
- if(null != data.getOperaSymbol()){
- item.setStandardValue(data.getOperaSymbol() +" " + data.getUpperLimit());
- }
- }
+// TODO
+// if (data.getUpperLimit() > 0.0) {
+// item.setStandardValue(data.getUpperLimit() + "");
+// if(null != data.getOperaSymbol()){
+// item.setStandardValue(data.getOperaSymbol() +" " + data.getUpperLimit());
+// }
+// }
result.add(item);
}
diff --git a/igds-core/src/main/java/com/ld/igds/common/impl/CommonDataServiceImpl.java b/igds-core/src/main/java/com/ld/igds/common/impl/CommonDataServiceImpl.java
index 92803af..4a46da3 100644
--- a/igds-core/src/main/java/com/ld/igds/common/impl/CommonDataServiceImpl.java
+++ b/igds-core/src/main/java/com/ld/igds/common/impl/CommonDataServiceImpl.java
@@ -349,7 +349,6 @@
} else { //鏈夎褰曪紝浣嗘槸鐘舵�佷笌褰撳墠浣滀笟涓嶄竴鑷达紝涔熼渶瑕佸垵濮嬪寲
depotStore.setDepotStatus(depotStatus);
depotStore.setUpdateDate(new Date());
- depotStore.setCreateDate(new Date());
depotStore.setUpdateUser(null);
}
@@ -378,7 +377,6 @@
@Override
public void addDepotStore(DepotStore store, boolean updateDepot) {
- if (null == store.getCreateDate()) store.setCreateDate(new Date());
if (null == store.getUpdateDate()) store.setUpdateDate(new Date());
if (null == store.getId()) store.setId(ContextUtil.getUUID());
diff --git a/igds-core/src/main/java/com/ld/igds/models/Depot.java b/igds-core/src/main/java/com/ld/igds/models/Depot.java
index 749e422..c1a3c79 100644
--- a/igds-core/src/main/java/com/ld/igds/models/Depot.java
+++ b/igds-core/src/main/java/com/ld/igds/models/Depot.java
@@ -93,7 +93,6 @@
@PropertyDef(label = "绮骞翠唤", description = "涓庡簱瀛樿〃鍏宠仈锛岄�氳繃搴撳瓨鍙樻洿")
private String foodYear;
-
@Column(name = "PER_WET_")
@PropertyDef(label = "姘村垎", description = "鐧惧垎姣旓紝榛樿涓虹┖锛屾潵婧愯川妫�淇℃伅")
private Double perWet;
@@ -113,6 +112,10 @@
@Column(name = "STORE_KEEPER_NAME_", length = 50)
@PropertyDef(label = "淇濈鍛�", description = "涓枃鍚嶇О")
private String storeKeeperName;
+
+ @Column(name = "STORE_DATE_")
+ @PropertyDef(label = "鍏ュ簱鏃堕棿", description = "榛樿绌猴紝閫氳繃搴撳瓨鍙樻洿")
+ private Date storeDate;
@Column(name = "CHECK_DATE_")
@PropertyDef(label = "鏈�鍚庤川妫�鏃堕棿", description = "榛樿绌猴紝鏉ユ簮璐ㄦ淇℃伅")
diff --git a/igds-core/src/main/java/com/ld/igds/view/DepotPR.java b/igds-core/src/main/java/com/ld/igds/view/DepotPR.java
index 295d0d7..e0752c8 100644
--- a/igds-core/src/main/java/com/ld/igds/view/DepotPR.java
+++ b/igds-core/src/main/java/com/ld/igds/view/DepotPR.java
@@ -164,16 +164,14 @@
depotService.saveDepot(depot);
} else {
depotService.updataDepot(depot);
-
- if (StringUtils.isNotEmpty(depot.getEditTag())) {
- // 琛ㄧず淇敼浜嗕粨搴撶姸鎬�
- if (depot.getEditTag().indexOf("depotStatus") >= 0) {
- this.pullDepotStatus(depot.getCompanyId(), depot.getId(), depot.getDepotStatus());
- }
- }
+// TODO
+// if (StringUtils.isNotEmpty(depot.getEditTag())) {
+// // 琛ㄧず淇敼浜嗕粨搴撶姸鎬�
+// if (depot.getEditTag().indexOf("depotStatus") >= 0) {
+// this.pullDepotStatus(depot.getCompanyId(), depot.getId(), depot.getDepotStatus());
+// }
+// }
}
- //鎭㈠鏍囩
- depot.setEditTag(null);
flushCache();
diff --git a/igds-core/src/main/java/com/ld/igds/view/service/HDepotStoreService.java b/igds-core/src/main/java/com/ld/igds/view/service/HDepotStoreService.java
index 406f78d..c179f71 100644
--- a/igds-core/src/main/java/com/ld/igds/view/service/HDepotStoreService.java
+++ b/igds-core/src/main/java/com/ld/igds/view/service/HDepotStoreService.java
@@ -67,7 +67,6 @@
try {
if (StringUtils.isEmpty(data.getId())) {
data.setId(ContextUtil.getUUID());
- data.setCreateDate(new Date());
session.save(data);
} else {
session.update(data);
diff --git a/igds-inout/src/main/java/com/ld/igds/inout/manager/InoutManager.java b/igds-inout/src/main/java/com/ld/igds/inout/manager/InoutManager.java
index b24e026..30f41d0 100644
--- a/igds-inout/src/main/java/com/ld/igds/inout/manager/InoutManager.java
+++ b/igds-inout/src/main/java/com/ld/igds/inout/manager/InoutManager.java
@@ -363,10 +363,10 @@
}
}
progressData.setCheckUser(ContextUtil.getLoginUserCName());
- if (StringUtils.isNotEmpty(data.getCustomerName())) {
- progressData.setCustomerId(data.getCustomerId());
- progressData.setCustomerName(data.getCustomerName());
- }
+// if (StringUtils.isNotEmpty(data.getCustomerName())) {
+// progressData.setCustomerId(data.getCustomerId());
+// progressData.setCustomerName(data.getCustomerName());
+// }
if (StringUtils.isNotEmpty(data.getDepotId())) {
progressData.setDepotId(data.getDepotId());
}
@@ -1012,9 +1012,9 @@
if (StringUtils.isEmpty(data.getDepotId())) {
return "璇峰～鍐欎粨搴撲俊鎭紒";
}
- if (StringUtils.isEmpty(data.getCustomerId())) {
- return "璇峰～鍐欏線鏉ュ崟浣嶄俊鎭紒";
- }
+// if (StringUtils.isEmpty(data.getCustomerId())) {
+// return "璇峰～鍐欏線鏉ュ崟浣嶄俊鎭紒";
+// }
if (StringUtils.isEmpty(data.getFoodYear())) {
return "璇峰～鍐欑伯椋熷勾浠戒俊鎭紒";
}
diff --git a/igds-inout/src/main/java/com/ld/igds/inout/manager/InoutReportManager.java b/igds-inout/src/main/java/com/ld/igds/inout/manager/InoutReportManager.java
index 4219d59..866b61a 100644
--- a/igds-inout/src/main/java/com/ld/igds/inout/manager/InoutReportManager.java
+++ b/igds-inout/src/main/java/com/ld/igds/inout/manager/InoutReportManager.java
@@ -261,7 +261,7 @@
bill.setFullTime(DateFormatUtils.format(data.getFullWeightTime(),
"yyyy-MM-dd HH:mm:ss"));
bill.setSerId(data.getId());
- bill.setSpecType(StringUtils.isEmpty(data.getSpecType())?"鏁ｇ伯":data.getSpecType());
+// bill.setSpecType(StringUtils.isEmpty(data.getSpecType())?"鏁ｇ伯":data.getSpecType());
if ("5016".equals(data.getCompanyId())) {
bill.setCompleteTime(DateFormatUtils.format(data.getCompleteTime(), "yyyy-MM-dd"));
bill.setSerId(data.getId().substring(2));
@@ -269,7 +269,7 @@
}
//瀹㈡埛淇℃伅
- bill.setCustomerId(data.getCustomerId() == null ? "" : data.getCustomerId());
+ // bill.setCustomerId(data.getCustomerId() == null ? "" : data.getCustomerId());
bill.setCustomerName(data.getCustomerName() == null ? "" : data.getCustomerName());
bill.setUserId(data.getUserId() == null ? "" : data.getUserId());
bill.setUserAddress(data.getUserAddress() == null ? "" : data.getUserAddress());
@@ -301,11 +301,11 @@
bill.setEmptyWeight(data.getEmptyWeight());
bill.setNetWeight(data.getNetWeight());
- bill.setDeWet(data.getDeWet());
- bill.setDeImpurity(data.getDeImpurity());
- bill.setDeHandle(data.getDeHandle());
- bill.setDeOther(data.getDeOther());
- bill.setDeSum(data.getDeSum() == null ? 0.0 :data.getDeSum());
+// bill.setDeWet(data.getDeWet());
+// bill.setDeImpurity(data.getDeImpurity());
+// bill.setDeHandle(data.getDeHandle());
+// bill.setDeOther(data.getDeOther());
+// bill.setDeSum(data.getDeSum() == null ? 0.0 :data.getDeSum());
bill.setSettleWeight(data.getSettleWeight());
// if(data.getWet() != null && data.getWet() > 0){
@@ -373,7 +373,7 @@
String key;
for (CheckItemData item : checkLst) {
key = item.getStandardId() + "_ST";
- checkBillItems.put(key, item.getStandardValue());
+ // checkBillItems.put(key, item.getStandardValue());
key = item.getStandardId() + "_VAL";
checkBillItems.put(key, item.getValue());
}
@@ -449,13 +449,13 @@
public String inSettleBill(InoutData data, InoutSettle settle) {
if (null != data) {
- settle.setCompleteTime(data.getCompleteTime());
+ // settle.setCompleteTime(data.getCompleteTime());
settle.setDepotId(data.getDepotId());
settle.setDeptId(data.getDeptId());
- settle.setUserName(data.getUserName());
- settle.setPlateNum(data.getPlateNum());
- settle.setFoodLevel(data.getFoodLevel());
- settle.setFoodVariety(data.getFoodVariety());
+// settle.setUserName(data.getUserName());
+// settle.setPlateNum(data.getPlateNum());
+// settle.setFoodLevel(data.getFoodLevel());
+// settle.setFoodVariety(data.getFoodVariety());
}
// 璋冩暣妯＄増鏁版嵁骞惰繑鍥�
@@ -473,26 +473,26 @@
htmlStr = htmlStr.replace("payTime", time);
htmlStr = htmlStr.replace("serId", settle.getId());
- htmlStr = htmlStr.replace(
- "customerName",
- settle.getCustomerName() == null ? "" : settle
- .getCustomerName());
+// htmlStr = htmlStr.replace(
+// "customerName",
+// settle.getCustomerName() == null ? "" : settle
+// .getCustomerName());
htmlStr = htmlStr.replace("deptName",
dept == null ? "" : dept.getName());
htmlStr = htmlStr.replace("bank", settle.getBank() == null ? ""
: settle.getBank());
- htmlStr = htmlStr.replace("fullWeight",
- new DecimalFormat("0").format(settle.getFullWeight()));
- htmlStr = htmlStr.replace("emptyWeight",
- new DecimalFormat("0").format(settle.getEmptyWeight()));
+// htmlStr = htmlStr.replace("fullWeight",
+// new DecimalFormat("0").format(settle.getFullWeight()));
+// htmlStr = htmlStr.replace("emptyWeight",
+// new DecimalFormat("0").format(settle.getEmptyWeight()));
htmlStr = htmlStr.replace("banNum", settle.getBankNum() == null ? ""
: settle.getBankNum());
- htmlStr = htmlStr.replace("netWeight",
- new DecimalFormat("0").format(settle.getNetWeight()));
- htmlStr = htmlStr.replace("deSum",
- new DecimalFormat("0").format(settle.getDeSum()));
+// htmlStr = htmlStr.replace("netWeight",
+// new DecimalFormat("0").format(settle.getNetWeight()));
+// htmlStr = htmlStr.replace("deSum",
+// new DecimalFormat("0").format(settle.getDeSum()));
// 鑾峰彇浠撳簱淇℃伅
Depot depot = commonService.getCacheDepot(settle.getCompanyId(),
@@ -500,8 +500,8 @@
htmlStr = htmlStr.replace("depotName",
depot == null ? "" : depot.getName());
- htmlStr = htmlStr.replace("foodVariety",
- FoodVariety.getMsg(settle.getFoodVariety()));
+// htmlStr = htmlStr.replace("foodVariety",
+// FoodVariety.getMsg(settle.getFoodVariety()));
htmlStr = htmlStr.replace("payPrice", settle.getPayPrice() + "");
htmlStr = htmlStr.replace("settleWeight",
new DecimalFormat("0").format(settle.getSettleWeight()));
@@ -514,8 +514,8 @@
depot.getStoreKeeperName() == null ? "" : depot
.getStoreKeeperName());
}
- htmlStr = htmlStr.replace("driverName", settle.getUserName() + "");
- htmlStr = htmlStr.replace("otherSum", settle.getOtherSum() + "");
+// htmlStr = htmlStr.replace("driverName", settle.getUserName() + "");
+// htmlStr = htmlStr.replace("otherSum", settle.getOtherSum() + "");
htmlStr = htmlStr.replace("paySum", settle.getPaySum() + "");
htmlStr = htmlStr.replace("remark", settle.getRemarks() == null ? ""
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 4df6212..c1396a9 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
@@ -567,14 +567,14 @@
// 鑾峰彇涓婁竴杞︾殑娴佹按鏁版嵁
InoutData inoutData = this.getLastRecord(data.getCompanyId(), data.getDepotId());
- // 璁剧疆娴佹按鐨勫簱瀛�
- if (InoutConstant.TYPE_IN.equals(inoutData.getType())) {
- data.setCurStorage(inoutData.getCurStorage()
- + inoutData.getSettleWeight());
- } else if (InoutConstant.TYPE_OUT.equals(inoutData.getType())) {
- data.setCurStorage(inoutData.getCurStorage()
- - inoutData.getSettleWeight());
- }
+// // 璁剧疆娴佹按鐨勫簱瀛�
+// if (InoutConstant.TYPE_IN.equals(inoutData.getType())) {
+// data.setCurStorage(inoutData.getCurStorage()
+// + inoutData.getSettleWeight());
+// } else if (InoutConstant.TYPE_OUT.equals(inoutData.getType())) {
+// data.setCurStorage(inoutData.getCurStorage()
+// - inoutData.getSettleWeight());
+// }
// 娣诲姞琛ュ崟鏁版嵁
this.insertData(data);
diff --git a/igds-inout/src/main/java/com/ld/igds/inout/view/InoutReportPR.java b/igds-inout/src/main/java/com/ld/igds/inout/view/InoutReportPR.java
index 2433d52..ab3831e 100644
--- a/igds-inout/src/main/java/com/ld/igds/inout/view/InoutReportPR.java
+++ b/igds-inout/src/main/java/com/ld/igds/inout/view/InoutReportPR.java
@@ -189,11 +189,11 @@
record.setRemarks(String.valueOf(index));
emptyWeightSum += record.getEmptyWeight();
fullWeightSum += record.getFullWeight();
- deWetSum += record.getDeWet();
- deImpuritySum += record.getDeImpurity();
+// deWetSum += record.getDeWet();
+// deImpuritySum += record.getDeImpurity();
deHandleSum += record.getDeHandle();
deOtherSum += record.getDeOther();
- deSumSum += record.getDeSum();
+ // deSumSum += record.getDeSum();
netWeightSum += record.getNetWeight();
settleWeightSum += record.getSettleWeight();
index ++;
@@ -202,11 +202,11 @@
sum.setId("鍚堣");
sum.setEmptyWeight(emptyWeightSum);
sum.setFullWeight(fullWeightSum);
- sum.setDeWet(deWetSum);
- sum.setDeImpurity(deImpuritySum);
+// sum.setDeWet(deWetSum);
+// sum.setDeImpurity(deImpuritySum);
sum.setDeHandle(deHandleSum);
sum.setDeOther(deOtherSum);
- sum.setDeSum(deSumSum);
+ // sum.setDeSum(deSumSum);
sum.setNetWeight(netWeightSum);
sum.setSettleWeight(settleWeightSum);
result.add(sum);
diff --git a/igds-inout/src/main/java/com/ld/igds/inout/view/InoutSettlePR.java b/igds-inout/src/main/java/com/ld/igds/inout/view/InoutSettlePR.java
index 17c6e62..205192b 100644
--- a/igds-inout/src/main/java/com/ld/igds/inout/view/InoutSettlePR.java
+++ b/igds-inout/src/main/java/com/ld/igds/inout/view/InoutSettlePR.java
@@ -137,22 +137,22 @@
private InoutSettle getNewSettle(InoutData data) {
InoutSettle inoutSettle = new InoutSettle();
inoutSettle.setId(data.getId());
- inoutSettle.setType(data.getType());
- inoutSettle.setCustomerId(data.getCustomerId());
- inoutSettle.setCustomerName(data.getCustomerName());
- inoutSettle.setFullWeight(data.getFullWeight());
- inoutSettle.setEmptyWeight(data.getEmptyWeight());
- inoutSettle.setNetWeight(data.getNetWeight());
+ // inoutSettle.setType(data.getType());
+ // inoutSettle.setCustomerId(data.getCustomerId());
+ // inoutSettle.setCustomerName(data.getCustomerName());
+ // inoutSettle.setFullWeight(data.getFullWeight());
+ // inoutSettle.setEmptyWeight(data.getEmptyWeight());
+ // inoutSettle.setNetWeight(data.getNetWeight());
inoutSettle.setSettleWeight(data.getSettleWeight());
- inoutSettle.setDeSum(data.getDeSum());
+ // inoutSettle.setDeSum(data.getDeSum());
- inoutSettle.setCompleteTime(data.getCompleteTime());
+ // inoutSettle.setCompleteTime(data.getCompleteTime());
inoutSettle.setDepotId(data.getDepotId());
inoutSettle.setDeptId(data.getDeptId());
- inoutSettle.setUserName(data.getUserName());
- inoutSettle.setPlateNum(data.getPlateNum());
- inoutSettle.setFoodLevel(data.getFoodLevel());
- inoutSettle.setFoodVariety(data.getFoodVariety());
+ // inoutSettle.setUserName(data.getUserName());
+ // inoutSettle.setPlateNum(data.getPlateNum());
+ // inoutSettle.setFoodLevel(data.getFoodLevel());
+ // inoutSettle.setFoodVariety(data.getFoodVariety());
if (data.getPrice() != null) {
inoutSettle.setPayPrice(data.getPrice());
@@ -167,9 +167,9 @@
@Expose
@Transactional
public String saveData(InoutSettle data) {
- if (null == data.getType()) {
- data.setType(InoutConstant.TYPE_IN);
- }
+// if (null == data.getType()) {
+// data.setType(InoutConstant.TYPE_IN);
+// }
hSettleService.saveOrUpdateData(data);
diff --git a/igds-inout/src/main/java/com/ld/igds/m/service/HLossOverService.java b/igds-inout/src/main/java/com/ld/igds/m/service/HLossOverService.java
index c12d3b6..518e455 100644
--- a/igds-inout/src/main/java/com/ld/igds/m/service/HLossOverService.java
+++ b/igds-inout/src/main/java/com/ld/igds/m/service/HLossOverService.java
@@ -129,7 +129,7 @@
data.setDepotId(lossOver.getDepotId());
data.setDeptId(lossOver.getDeptId());
data.setCompanyId(lossOver.getCompanyId());
- data.setFoodVariety(lossOver.getFoodVariety());
+ //data.setFoodVariety(lossOver.getFoodVariety());
data.setCheckStatus(InoutConstant.STATUS_PASS);
String loginUser = lossOver.getUpdateUser();
diff --git a/igds-inout/src/main/java/com/ld/igds/timer/InoutScheduled.java b/igds-inout/src/main/java/com/ld/igds/timer/InoutScheduled.java
index d147fda..3e863ea 100644
--- a/igds-inout/src/main/java/com/ld/igds/timer/InoutScheduled.java
+++ b/igds-inout/src/main/java/com/ld/igds/timer/InoutScheduled.java
@@ -143,7 +143,7 @@
DepotStatus.STATUS_04.getCode().equals(lastStore.getDepotStatus())) {
param = new InoutParam();
- param.setStart(lastStore.getCreateDate());
+ //param.setStart(lastStore.getCreateDate());
param.setEnd(new Date());
param.setDeptId(data.getDeptId());
param.setDepotId(data.getDepotId());
@@ -158,7 +158,7 @@
lastStore.setId(ContextUtil.getUUID());
lastStore.setUpdateUser(null);
lastStore.setUpdateDate(new Date());
- lastStore.setCreateDate(new Date());
+ // lastStore.setCreateDate(new Date());
if (InoutConstant.TYPE_IN.equals(data.getType())) {
lastStore.setStorageReal(lastStore.getStorageReal() + sumRecordWeight);
diff --git a/igds-manager/src/main/java/com/ld/igds/m/service/HVarietyChangeService.java b/igds-manager/src/main/java/com/ld/igds/m/service/HVarietyChangeService.java
deleted file mode 100644
index 75cf8e3..0000000
--- a/igds-manager/src/main/java/com/ld/igds/m/service/HVarietyChangeService.java
+++ /dev/null
@@ -1,95 +0,0 @@
-package com.ld.igds.m.service;
-
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.commons.lang3.StringUtils;
-import org.hibernate.Session;
-import org.springframework.stereotype.Component;
-
-import com.bstek.bdf2.core.orm.hibernate.HibernateDao;
-import com.bstek.dorado.data.provider.Page;
-import com.ld.igds.util.ContextUtil;
-
-@Component
-public class HVarietyChangeService extends HibernateDao {
-
- public void pageData(Page<InoutVarietyChange> page, Map<String, Object> param)
- throws Exception {
- String hql = " from " + InoutVarietyChange.class.getName()
- + " where companyId=:companyId";
-
- Map<String, Object> args = new HashMap<String, Object>();
- args.put("companyId", ContextUtil.getCompanyId());
-
- if (null != param) {
-
- String str = (String) param.get("depotId");
- if (StringUtils.isNotEmpty(str)) {
- hql += " and depotId =:depotId";
- args.put("depotId", str);
- }
-
- str = (String) param.get("foodVariety");
- if (StringUtils.isNotEmpty(str)) {
- hql += " and foodVariety =:foodVariety";
- args.put("foodVariety", str);
- }
-
- str = (String) param.get("type");
- if (StringUtils.isNotEmpty(str)) {
- hql += " and type =:type";
- args.put("type", str);
- }
- }
-
- String count = "select count(*) " + hql;
-
- hql += " order by changeTime desc";
-
- this.pagingQuery(page, hql, count, args);
-
- }
-
- public void saveData(InoutVarietyChange data) {
- if (null == data.getCompanyId()) {
- data.setCompanyId(ContextUtil.getCompanyId());
- }
- if (null == data.getDeptId()) {
- data.setDeptId(ContextUtil.subDeptId(null));
- }
- Session session = this.getSessionFactory().openSession();
- data.setUpdateTime(new Date());
- data.setUpdateUser(ContextUtil.getLoginUserCName());
- try {
- if (null == data.getId()) {
- data.setId(ContextUtil.getUUID());
- session.save(data);
- } else {
- session.update(data);
- }
- } catch (Exception e) {
- e.printStackTrace();
- } finally {
- session.flush();
- session.close();
- }
- }
-
- public String delData(InoutVarietyChange data) {
- Session session = this.getSessionFactory().openSession();
- try {
- if (null != data.getId()) {
- session.delete(data);
- }
- } catch (Exception e) {
- e.printStackTrace();
- } finally {
- session.flush();
- session.close();
- }
- return null;
- }
-
-}
diff --git a/igds-manager/src/main/java/com/ld/igds/m/view/VarietyChange.view.xml b/igds-manager/src/main/java/com/ld/igds/m/view/VarietyChange.view.xml
deleted file mode 100644
index 38d7c30..0000000
--- a/igds-manager/src/main/java/com/ld/igds/m/view/VarietyChange.view.xml
+++ /dev/null
@@ -1,393 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ViewConfig>
- <Arguments/>
- <Context/>
- <Model>
- <DataType name="dtMain">
- <Property name="creationType">com.ld.igds.models.InoutVarietyChange</Property>
- <PropertyDef name="id">
- <Property></Property>
- <Property name="label">ID</Property>
- </PropertyDef>
- <PropertyDef name="companyId">
- <Property></Property>
- <Property name="label">缁勭粐缂栫爜</Property>
- </PropertyDef>
- <PropertyDef name="approvalId">
- <Property></Property>
- <Property name="label">鎵瑰噯鏂囧彿</Property>
- <Property name="required">false</Property>
- </PropertyDef>
- <PropertyDef name="deptId">
- <Property></Property>
- <Property name="label">鎵�灞炲垎搴�</Property>
- <Property name="mapping">
- <Property name="mapValues">${dorado.getDataProvider("deptPR#loadParents").getResult()}</Property>
- <Property name="keyProperty">id</Property>
- <Property name="valueProperty">name</Property>
- </Property>
- </PropertyDef>
- <PropertyDef name="depotId">
- <Property></Property>
- <Property name="label">鎵�灞炰粨搴�</Property>
- <Property name="required">true</Property>
- <Property name="mapping">
- <Property name="mapValues">${dorado.getDataProvider("depotPR#getAllCache").getResult()}</Property>
- <Property name="keyProperty">id</Property>
- <Property name="valueProperty">name</Property>
- </Property>
- </PropertyDef>
- <PropertyDef name="foodVariety">
- <Property></Property>
- <Property name="label">鍙樻洿鍓嶅搧绉�</Property>
- <Property name="required">false</Property>
- <Property name="mapping">
- <Property name="mapValues">${dorado.getDataProvider("dicTriggerPR#dicTrigger").getResult("FOOD_VARIETY_")}</Property>
- <Property name="keyProperty">code</Property>
- <Property name="valueProperty">name</Property>
- </Property>
- </PropertyDef>
- <PropertyDef name="newFoodVariety">
- <Property></Property>
- <Property name="label">鍙樻洿鍚庡搧绉�</Property>
- <Property name="mapping">
- <Property name="mapValues">${dorado.getDataProvider("dicTriggerPR#dicTrigger").getResult("FOOD_VARIETY_")}</Property>
- <Property name="keyProperty">code</Property>
- <Property name="valueProperty">name</Property>
- </Property>
- <Property name="required">false</Property>
- </PropertyDef>
- <PropertyDef name="foodType">
- <Property></Property>
- <Property name="label">鍙樻洿鍓嶆�ц川</Property>
- <Property name="required">false</Property>
- <Property name="mapping">
- <Property name="mapValues">${dorado.getDataProvider("dicTriggerPR#dicTrigger").getResult("FOOD_TYPE_")}</Property>
- <Property name="keyProperty">code</Property>
- <Property name="valueProperty">name</Property>
- </Property>
- </PropertyDef>
- <PropertyDef name="newFoodType">
- <Property></Property>
- <Property name="label">鍙樻洿鍚庢�ц川</Property>
- <Property name="required">false</Property>
- <Property name="mapping">
- <Property name="mapValues">${dorado.getDataProvider("dicTriggerPR#dicTrigger").getResult("FOOD_TYPE_")}</Property>
- <Property name="keyProperty">code</Property>
- <Property name="valueProperty">name</Property>
- </Property>
- </PropertyDef>
- <PropertyDef name="number">
- <Property></Property>
- <Property name="label">绮鏁伴噺</Property>
- <Property name="dataType">Double</Property>
- <Property name="displayFormat">#,##0.00 kG</Property>
- </PropertyDef>
- <PropertyDef name="changeNumber">
- <Property></Property>
- <Property name="label">鍒掕浆鏁伴噺</Property>
- <Property name="dataType">Double</Property>
- <Property name="displayFormat">#,##0.00 kG</Property>
- </PropertyDef>
- <PropertyDef name="changeTime">
- <Property name="dataType">Date</Property>
- <Property name="label">鍙樻洿鏃堕棿</Property>
- <Property name="required">true</Property>
- </PropertyDef>
- <PropertyDef name="updateTime">
- <Property name="dataType">DateTime</Property>
- <Property name="label">鏇存柊鏃堕棿</Property>
- </PropertyDef>
- <PropertyDef name="updateUser">
- <Property></Property>
- <Property name="label">鏇存柊浜�</Property>
- </PropertyDef>
- <PropertyDef name="remark">
- <Property></Property>
- <Property name="label">澶囨敞</Property>
- </PropertyDef>
- </DataType>
- <DataType name="dtParam">
- <PropertyDef name="deptId">
- <Property></Property>
- <Property name="label">鎵�灞炲垎搴�</Property>
- <Property name="mapping">
- <Property name="mapValues">${dorado.getDataProvider("deptPR#loadParents").getResult()}</Property>
- <Property name="keyProperty">id</Property>
- <Property name="valueProperty">name</Property>
- </Property>
- </PropertyDef>
- <PropertyDef name="depotId">
- <Property></Property>
- <Property name="label">鎵�灞炰粨搴�</Property>
- <Property name="mapping">
- <Property name="mapValues">${dorado.getDataProvider("depotPR#getAllCache").getResult()}</Property>
- <Property name="keyProperty">id</Property>
- <Property name="valueProperty">name</Property>
- </Property>
- </PropertyDef>
- <PropertyDef name="foodVariety">
- <Property></Property>
- <Property name="label">绮鍝佺</Property>
- <Property name="mapping">
- <Property name="mapValues">${dorado.getDataProvider("dicTriggerPR#dicTrigger").getResult("FOOD_VARIETY_")}</Property>
- <Property name="keyProperty">code</Property>
- <Property name="valueProperty">name</Property>
- </Property>
- </PropertyDef>
- </DataType>
- </Model>
- <View layout="padding:5;regionPadding:5">
- <ClientEvent name="onReady">
-view.get("#dsParam").insert({});
-
-
-addMain = function(){
- view.get("#dsMain").insert({
- });
- view.get("#dialogMain").show();
-}</ClientEvent>
- <Property name="packages">font-awesome,css-common</Property>
- <DataSet id="dsMain">
- <Property name="loadMode">lazy</Property>
- <Property name="dataProvider">varietyChangePR#pageData</Property>
- <Property name="dataType">[dtMain]</Property>
- <Property name="pageSize">15</Property>
- <Property name="parameter"></Property>
- </DataSet>
- <DataSet id="dsParam">
- <Property name="dataType">dtParam</Property>
- </DataSet>
- <Container layout="regionPadding:10" layoutConstraint="top">
- <Property name="exClassName">bg-color</Property>
- <Property name="contentOverflow">hidden</Property>
- <Property name="height">55</Property>
- <Label layoutConstraint="left">
- <Property name="text">鑿滃崟鏍忥細</Property>
- </Label>
- <Button layoutConstraint="left">
- <ClientEvent name="onClick">addMain();
-</ClientEvent>
- <Property name="caption">鏂板</Property>
- <Property name="exClassName">btn-default</Property>
- <Property name="iconClass">fa fa-plus</Property>
- </Button>
- <Button layoutConstraint="left">
- <ClientEvent name="onClick">var data = view.get("#dsMain.data:#");
-if(data){
- view.get("#dialogMain").show();
-}</ClientEvent>
- <Property name="caption">璋冩暣</Property>
- <Property name="exClassName">btn-warm</Property>
- <Property name="iconClass">fa fa-pencil</Property>
- </Button>
- <Button layoutConstraint="left">
- <ClientEvent name="onClick">var data = view.get("#dsMain.data:#");
-if(!data){
- return;
-}
-view.get("#ajaxDel").set("parameter",data).execute(function(result){
- if(result){
- $alert(result);
- return;
- }else{
- data.remove();
- }
-});</ClientEvent>
- <Property name="caption">鍒犻櫎</Property>
- <Property name="exClassName">btn-warn</Property>
- <Property name="iconClass">fa fa-minus</Property>
- </Button>
- <Button layoutConstraint="left">
- <ClientEvent name="onClick">view.get("#dsMain").flushAsync();
-</ClientEvent>
- <Property name="caption">鍒锋柊</Property>
- <Property name="exClassName">btn-default</Property>
- <Property name="iconClass">fa fa-refresh</Property>
- </Button>
- </Container>
- <Container layout="regionPadding:10" layoutConstraint="center">
- <Property name="exClassName">bg-color</Property>
- <AutoForm>
- <Property name="cols">*,*,*,*</Property>
- <Property name="dataSet">dsParam</Property>
- <Property name="labelAlign">right</Property>
- <Property name="labelSeparator">锛�</Property>
- <Property name="labelWidth">100</Property>
- <AutoFormElement>
- <Property name="name">depotId</Property>
- <Property name="property">depotId</Property>
- <Property name="trigger">autoMappingDropDown2</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">foodVariety</Property>
- <Property name="property">foodVariety</Property>
- <Property name="trigger">autoMappingDropDown2</Property>
- <Editor/>
- </AutoFormElement>
- <Button layoutConstraint="left">
- <ClientEvent name="onClick">var param = view.get("#dsParam.data");
-view.get("#dsMain").set("parameter",param.toJSON()).flushAsync();</ClientEvent>
- <Property name="caption">鏌ヨ</Property>
- <Property name="exClassName">btn-default</Property>
- <Property name="iconClass">fa fa-refresh</Property>
- </Button>
- </AutoForm>
- <DataGrid layoutConstraint="center padding:5px">
- <ClientEvent name="onDataRowDoubleClick">var data = view.get("#dsMain.data:#");
-if(data){
- view.get("#dialogMain").show();
-}</ClientEvent>
- <Property name="dataSet">dsMain</Property>
- <Property name="readOnly">true</Property>
- <RowNumColumn/>
- <DataColumn name="depotId">
- <Property name="property">depotId</Property>
- <Property name="align">center</Property>
- </DataColumn>
- <DataColumn name="foodVariety">
- <Property name="property">foodVariety</Property>
- <Property name="align">center</Property>
- </DataColumn>
- <DataColumn name="newFoodVariety">
- <Property name="property">newFoodVariety</Property>
- <Property name="align">center</Property>
- </DataColumn>
- <DataColumn name="changeTime">
- <Property name="property">changeTime</Property>
- <Property name="align">center</Property>
- </DataColumn>
- <DataColumn name="updateTime">
- <Property name="property">updateTime</Property>
- <Property name="align">center</Property>
- </DataColumn>
- <DataColumn name="updateUser">
- <Property name="property">updateUser</Property>
- <Property name="align">center</Property>
- </DataColumn>
- <DataColumn name="remark">
- <Property name="property">remark</Property>
- </DataColumn>
- </DataGrid>
- </Container>
- <Container layout="regionPadding:10" layoutConstraint="bottom">
- <Property name="exClassName">bg-color</Property>
- <DataPilot layoutConstraint="right">
- <Property name="itemCodes">pageSize,pages</Property>
- <Property name="dataSet">dsMain</Property>
- </DataPilot>
- </Container>
- <Dialog id="dialogMain" layout="padding:5;regionPadding:10">
- <Property name="width">800</Property>
- <Property name="caption">绮鍝佺鍙樻洿淇℃伅</Property>
- <Property name="iconClass">fa fa-flag-o</Property>
- <Property name="closeable">false</Property>
- <Buttons>
- <Button>
- <ClientEvent name="onClick">var data = view.get("#dsMain.data:#");
-if(data.validate() != 'ok'){
- $notify("鏁版嵁鏍￠獙澶辫触锛侊紒");
- return;
-}
-view.get("#uaAction").set("parameter",data).execute(function(){
- self.get("parent").hide();
-});</ClientEvent>
- <Property name="caption">纭</Property>
- <Property name="iconClass">fa fa-check-circle</Property>
- <Property name="width">90</Property>
- </Button>
- <Button>
- <ClientEvent name="onClick">view.get("#dsMain.data:#").cancel();
-self.get("parent").hide();</ClientEvent>
- <Property name="caption">鍙栨秷</Property>
- <Property name="iconClass">fa fa-times-circle</Property>
- <Property name="width">90</Property>
- </Button>
- </Buttons>
- <Children>
- <AutoForm>
- <Property name="dataSet">dsMain</Property>
- <Property name="cols">*,*</Property>
- <Property name="labelWidth">120</Property>
- <Property name="labelAlign">right</Property>
- <Property name="labelSeparator">锛�</Property>
- <AutoFormElement>
- <Property name="name">depotId</Property>
- <Property name="property">depotId</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">approvalId</Property>
- <Property name="property">approvalId</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">foodVariety</Property>
- <Property name="property">foodVariety</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">newFoodVariety</Property>
- <Property name="property">newFoodVariety</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">foodType</Property>
- <Property name="property">foodType</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">newFoodType</Property>
- <Property name="property">newFoodType</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">number</Property>
- <Property name="property">number</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">changeNumber</Property>
- <Property name="property">changeNumber</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">changeTime</Property>
- <Property name="property">changeTime</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">updateUser</Property>
- <Property name="property">updateUser</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement layoutConstraint="colSpan:2">
- <Property name="name">remark</Property>
- <Property name="property">remark</Property>
- <Property name="editorType">TextArea</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">updateTime</Property>
- <Property name="property">updateTime</Property>
- <Property name="readOnly">true</Property>
- <Editor/>
- </AutoFormElement>
- </AutoForm>
- </Children>
- <Tools/>
- </Dialog>
- <UpdateAction id="uaAction">
- <Property name="dataResolver">varietyChangePR#saveData</Property>
- <UpdateItem>
- <Property name="dataSet">dsMain</Property>
- <Property name="dataPath">[#current]</Property>
- </UpdateItem>
- </UpdateAction>
- <AjaxAction id="ajaxDel">
- <Property name="confirmMessage">纭畾瑕佸垹闄ゅ悧锛�</Property>
- <Property name="service">varietyChangePR#delData</Property>
- </AjaxAction>
- </View>
-</ViewConfig>
diff --git a/igds-manager/src/main/java/com/ld/igds/m/view/VarietyChangePR.java b/igds-manager/src/main/java/com/ld/igds/m/view/VarietyChangePR.java
deleted file mode 100644
index a63d90b..0000000
--- a/igds-manager/src/main/java/com/ld/igds/m/view/VarietyChangePR.java
+++ /dev/null
@@ -1,63 +0,0 @@
-package com.ld.igds.m.view;
-
-import java.util.Map;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-import com.bstek.dorado.annotation.DataProvider;
-import com.bstek.dorado.annotation.DataResolver;
-import com.bstek.dorado.annotation.Expose;
-import com.bstek.dorado.data.provider.Page;
-import com.ld.igds.m.service.HVarietyChangeService;
-
-/**
- * 缁煎悎涓氬姟-绮鍝佺鍙樻洿璁板綍
- *
- * @author: andy.jia
- * @description:
- * @version:
- * @data:2020骞�5鏈�28鏃�
- *
- */
-@Component
-public class VarietyChangePR {
-
- @Autowired
- private HVarietyChangeService service;
-
- /**
- * varietyChangePR#pageData
- *
- * @param page
- * @param param
- * @throws Exception
- */
- @DataProvider
- public void pageData(Page<InoutVarietyChange> page, Map<String, Object> param)
- throws Exception {
- service.pageData(page, param);
- }
-
- /**
- * varietyChangePR#saveData
- *
- * @param data
- */
- @DataResolver
- public void saveData(InoutVarietyChange data) {
- service.saveData(data);
- }
-
- /**
- * varietyChangePR#delData
- *
- * @param data
- * @return
- */
- @Expose
- public String delData(InoutVarietyChange data) {
- return service.delData(data);
- }
-
-}
diff --git a/igds-security/src/main/java/com/ld/igds/sec/service/BlackListWarnService.java b/igds-security/src/main/java/com/ld/igds/sec/service/BlackListWarnService.java
deleted file mode 100644
index b0dc286..0000000
--- a/igds-security/src/main/java/com/ld/igds/sec/service/BlackListWarnService.java
+++ /dev/null
@@ -1,184 +0,0 @@
-package com.ld.igds.sec.service;
-
-import com.bstek.bdf2.core.orm.hibernate.HibernateDao;
-import com.bstek.dorado.data.provider.Page;
-import com.ld.igds.constant.WarnStatus;
-import com.ld.igds.models.MWarnConf;
-import com.ld.igds.util.ContextUtil;
-import com.ld.igds.util.DateUtil;
-import com.ld.igds.warn.service.CoreWarnService;
-import org.apache.commons.lang3.StringUtils;
-import org.hibernate.Session;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-@Component
-public class BlackListWarnService extends HibernateDao {
- @Autowired
- private CoreWarnService coreWarnService;
-
- public void listWarnInfo(Page<BlackListWarnInfo> page, Map<String, Object> param) throws Exception {
- String hql = " from " + BlackListWarnInfo.class.getName()
- + " where companyId =:companyId and deptId =:deptId";
-
- Map<String, Object> args = new HashMap<String, Object>();
- args.put("companyId", ContextUtil.getCompanyId());
- args.put("deptId", ContextUtil.subDeptId(null));
-
- if(param != null){
- String str = (String) param.get("bizType");
- if (StringUtils.isNotEmpty(str)) {
- hql += " and bizType =:bizType";
- args.put("bizType", str);
- }
-
- str = (String) param.get("type");
- if (StringUtils.isNotEmpty(str)) {
- hql += " and type =:type";
- args.put("type", str);
- }
-
- str = (String) param.get("level");
- if (StringUtils.isNotEmpty(str)) {
- hql += " and level =:level";
- args.put("level", str);
- }
-
- str = (String) param.get("status");
- if (StringUtils.isNotEmpty(str)) {
- hql += " and status =:status";
- args.put("status", str);
- }
-
- Date date = (Date) param.get("start");
- if (null != date) {
- hql += " and time >=:start";
- args.put("start", DateUtil.getCurZero(date));
- }
-
- date = (Date) param.get("end");
- if (null != date) {
- hql += " and time <=:end";
- args.put("end", DateUtil.getNextZero(date));
- }
- }
-
- String countHql = " select count(*) " + hql;
- hql += " order by time desc";
-
- this.pagingQuery(page, hql, countHql, args);
- }
-
- public void saveWarnInfo(BlackListWarnInfo data) {
-
- if (StringUtils.isEmpty(data.getCompanyId())) {
- data.setCompanyId(ContextUtil.getCompanyId());
- }
- if(StringUtils.isEmpty(data.getDeptId())){
- data.setDeptId(ContextUtil.subDeptId(null));
- }
- Session session = this.getSessionFactory().openSession();
- try {
- if (StringUtils.isEmpty(data.getId())) {
- data.setId(ContextUtil.getUUID());
- session.save(data);
- } else {
- session.update(data);
- }
- } catch (Exception e) {
- e.printStackTrace();
- } finally {
- session.flush();
- session.close();
- }
- }
-
- public void updateWarnStatus(BlackListWarnInfo data) {
-
- if (StringUtils.isEmpty(data.getCompanyId())) {
- data.setCompanyId(ContextUtil.getCompanyId());
- }
- if(StringUtils.isEmpty(data.getDeptId())){
- data.setDeptId(ContextUtil.subDeptId(null));
- }
- Session session = this.getSessionFactory().openSession();
- try {
- data.setCompleteTime(new Date());
- data.setCompleteUser(ContextUtil.getLoginUserCName());
- data.setStatus(WarnStatus.STATUS_30.getCode());
- session.saveOrUpdate(data);
- } catch (Exception e) {
- e.printStackTrace();
- } finally {
- session.flush();
- session.close();
- }
- }
-
- public String delWarnInfo(BlackListWarnInfo data) {
- Session session = this.getSessionFactory().openSession();
- try {
- session.delete(data);
- } catch (Exception e) {
- e.printStackTrace();
- } finally {
- session.flush();
- session.close();
- }
- return null;
- }
-
-
-
- public MWarnConf getConf(String deptId) {
- String hql = " from " + MWarnConf.class.getName()
- + " where companyId =:companyId and deptId =:deptId";
-
- Map<String, Object> args = new HashMap<String, Object>();
- args.put("companyId", ContextUtil.getCompanyId());
- args.put("deptId", deptId);
-
- List<MWarnConf> list = this.query(hql, args);
-
- if (null == list || list.isEmpty()) return null;
-
- return list.get(0);
- }
-
- public List<MWarnConf> getAllConf() {
- String hql = " from " + MWarnConf.class.getName()
- + " where companyId =:companyId";
-
- Map<String, Object> args = new HashMap<String, Object>();
- args.put("companyId", ContextUtil.getCompanyId());
-
- List<MWarnConf> list = this.query(hql, args);
-
- return list;
- }
-
- public void updateConf(MWarnConf data) {
- Session session = this.getSessionFactory().openSession();
-
- if(StringUtils.isEmpty(data.getCompanyId())){
- data.setCompanyId(ContextUtil.getCompanyId());
- }
-
- try {
- session.saveOrUpdate(data);
-
- //鏇存柊缂撳瓨
- coreWarnService.setCacheWarnConf(getAllConf());
- } catch (Exception e) {
- e.printStackTrace();
- } finally {
- session.flush();
- session.close();
- }
- }
-}
diff --git a/igds-security/src/main/java/com/ld/igds/sec/view/BlackListWarn.view.xml b/igds-security/src/main/java/com/ld/igds/sec/view/BlackListWarn.view.xml
deleted file mode 100644
index 99fd102..0000000
--- a/igds-security/src/main/java/com/ld/igds/sec/view/BlackListWarn.view.xml
+++ /dev/null
@@ -1,689 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ViewConfig>
- <Arguments/>
- <Context/>
- <Model>
- <DataType name="dtParam">
- <Property name="creationType">com.ld.igds.models.BlackListWarnInfo</Property>
- <PropertyDef name="deptId">
- <Property name="label">鎵�灞炲簱鍖�</Property>
- <Property name="mapping">
- <Property name="mapValues">${dorado.getDataProvider("deptPR#loadParents").getResult()}</Property>
- <Property name="keyProperty">id</Property>
- <Property name="valueProperty">name</Property>
- </Property>
- </PropertyDef>
- <PropertyDef name="bizType">
- <Property></Property>
- <Property name="label">涓氬姟绫诲瀷</Property>
- <Property name="mapping">
- <Property name="mapValues">${dorado.getDataProvider("dicTriggerPR#triggerBizType").getResult()}</Property>
- <Property name="keyProperty">code</Property>
- <Property name="valueProperty">name</Property>
- </Property>
- </PropertyDef>
- <PropertyDef name="type">
- <Property></Property>
- <Property name="label">绫诲瀷</Property>
- <Property name="mapping">
- <Property name="mapValues">${dorado.getDataProvider("blackListWarnPR#triggerWarnType").getResult()}</Property>
- <Property name="keyProperty">code</Property>
- <Property name="valueProperty">name</Property>
- </Property>
- </PropertyDef>
- <PropertyDef name="level">
- <Property></Property>
- <Property name="label">璀︽姤绾у埆</Property>
- <Property name="mapping">
- <Property name="mapValues">${dorado.getDataProvider("blackListWarnPR#triggerWarnLevel").getResult()}</Property>
- <Property name="keyProperty">code</Property>
- <Property name="valueProperty">name</Property>
- </Property>
- </PropertyDef>
- <PropertyDef name="start">
- <Property name="dataType">Date</Property>
- <Property name="label">寮�濮嬫椂闂�</Property>
- </PropertyDef>
- <PropertyDef name="end">
- <Property name="dataType">Date</Property>
- <Property name="label">鎴鏃堕棿</Property>
- </PropertyDef>
- <PropertyDef name="status">
- <Property></Property>
- <Property name="label">璀︽姤鐘舵��</Property>
- <Property name="mapping">
- <Property name="mapValues">${dorado.getDataProvider("blackListWarnPR#triggerWarnStatus").getResult()}</Property>
- <Property name="keyProperty">code</Property>
- <Property name="valueProperty">name</Property>
- </Property>
- </PropertyDef>
- <PropertyDef name="perName">
- <Property></Property>
- <Property name="label">浜哄憳鍚嶇О</Property>
- </PropertyDef>
- <PropertyDef name="plateNum">
- <Property></Property>
- <Property name="label">杞︾墝鍙�</Property>
- </PropertyDef>
- </DataType>
- <DataType name="dtMain">
- <Property name="creationType">com.ld.igds.models.BlackListWarnInfo</Property>
- <PropertyDef name="id">
- <Property name="label">Id</Property>
- </PropertyDef>
- <PropertyDef name="companyId">
- <Property name="label">缁勭粐缂栫爜</Property>
- </PropertyDef>
- <PropertyDef name="deptId">
- <Property name="label">鎵�灞炲簱鍖�</Property>
- <Property name="mapping">
- <Property name="mapValues">${dorado.getDataProvider("deptPR#loadParents").getResult()}</Property>
- <Property name="keyProperty">id</Property>
- <Property name="valueProperty">name</Property>
- </Property>
- </PropertyDef>
- <PropertyDef name="depotId">
- <Property name="label">鎵�灞炰粨搴�</Property>
- <Property name="mapping">
- <Property name="mapValues">${dorado.getDataProvider("depotPR#getAllCache").getResult()}</Property>
- <Property name="keyProperty">id</Property>
- <Property name="valueProperty">name</Property>
- </Property>
- </PropertyDef>
- <PropertyDef name="name">
- <Property name="label">璀﹀憡鍚嶇О</Property>
- </PropertyDef>
- <PropertyDef name="bizType">
- <Property name="label">涓氬姟绫诲瀷</Property>
- <Property name="mapping">
- <Property name="mapValues">${dorado.getDataProvider("dicTriggerPR#triggerBizType").getResult()}</Property>
- <Property name="keyProperty">code</Property>
- <Property name="valueProperty">name</Property>
- </Property>
- </PropertyDef>
- <PropertyDef name="type">
- <Property name="label">绫诲瀷</Property>
- <Property name="mapping">
- <Property name="mapValues">${dorado.getDataProvider("blackListWarnPR#triggerWarnType").getResult()}</Property>
- <Property name="keyProperty">code</Property>
- <Property name="valueProperty">name</Property>
- </Property>
- </PropertyDef>
- <PropertyDef name="level">
- <Property name="label">璀﹀憡绾у埆</Property>
- <Property name="mapping">
- <Property name="keyProperty">code</Property>
- <Property name="mapValues">${dorado.getDataProvider("blackListWarnPR#triggerWarnLevel").getResult()}</Property>
- <Property name="valueProperty">name</Property>
- </Property>
- </PropertyDef>
- <PropertyDef name="status">
- <Property name="label">璀﹀憡鐘舵��</Property>
- <Property name="mapping">
- <Property name="mapValues">${dorado.getDataProvider("blackListWarnPR#triggerWarnStatus").getResult()}</Property>
- <Property name="keyProperty">code</Property>
- <Property name="valueProperty">name</Property>
- </Property>
- </PropertyDef>
- <PropertyDef name="info">
- <Property name="label">璀﹀憡鍐呭</Property>
- </PropertyDef>
- <PropertyDef name="time">
- <Property name="label">璀﹀憡鏃堕棿</Property>
- <Property name="dataType">DateTime</Property>
- </PropertyDef>
- <PropertyDef name="noticeResult">
- <Property name="label">閫氱煡缁撴灉</Property>
- </PropertyDef>
- <PropertyDef name="noticeUser">
- <Property name="label">閫氱煡浜�</Property>
- </PropertyDef>
- <PropertyDef name="noticeUserName">
- <Property name="label">閫氱煡浜哄鍚�</Property>
- </PropertyDef>
- <PropertyDef name="completeUser">
- <Property name="label">澶勭悊浜�</Property>
- </PropertyDef>
- <PropertyDef name="completeTime">
- <Property name="label">澶勭悊鏃堕棿</Property>
- <Property name="dataType">DateTime</Property>
- </PropertyDef>
- <PropertyDef name="remark">
- <Property name="label">澶勭悊璇存槑</Property>
- </PropertyDef>
- <PropertyDef name="serId">
- <Property name="label">鎵�灞炶澶�</Property>
- </PropertyDef>
- <Reference name="files">
- <Property name="dataType">[dtFile]</Property>
- <Property name="dataProvider">sys.fileManager#listFile</Property>
- <Property name="parameter">$${this.id}</Property>
- </Reference>
- <PropertyDef name="perName">
- <Property></Property>
- <Property name="label">浜哄憳鍚嶇О</Property>
- </PropertyDef>
- <PropertyDef name="plateNum">
- <Property></Property>
- <Property name="label">杞︾墝鍙�</Property>
- </PropertyDef>
- </DataType>
- <DataType name="dtFile">
- <Property name="creationType">com.ld.igds.models.FileInfo</Property>
- <PropertyDef name="fileId">
- <Property></Property>
- <Property name="label">闄勪欢ID</Property>
- </PropertyDef>
- <PropertyDef name="bizTag">
- <Property></Property>
- <Property name="label">璁惧鍚嶇О</Property>
- </PropertyDef>
- <PropertyDef name="fileName">
- <Property></Property>
- <Property name="label">鏂囦欢鍚嶇О</Property>
- </PropertyDef>
- <PropertyDef name="bizId">
- <Property></Property>
- <Property name="label">涓氬姟ID</Property>
- </PropertyDef>
- <PropertyDef name="createTime">
- <Property name="dataType">DateTime</Property>
- <Property name="label">鎶撴媿鏃堕棿</Property>
- </PropertyDef>
- </DataType>
- <DataType name="dtTest">
- <Property name="creationType">com.ld.igds.warn.data.WarnData</Property>
- <PropertyDef name="phone">
- <Property></Property>
- <Property name="label">鎵嬫満鍙�</Property>
- </PropertyDef>
- <PropertyDef name="bizType">
- <Property></Property>
- <Property name="label">涓氬姟绫诲瀷</Property>
- <Property name="mapping">
- <Property name="mapValues">${dorado.getDataProvider("dicTriggerPR#triggerBizType").getResult()}</Property>
- <Property name="keyProperty">code</Property>
- <Property name="valueProperty">name</Property>
- </Property>
- </PropertyDef>
- <PropertyDef name="type">
- <Property></Property>
- <Property name="label">璀︽姤绫诲瀷</Property>
- <Property name="mapping">
- <Property name="mapValues">${dorado.getDataProvider("blackListWarnPR#triggerWarnType").getResult()}</Property>
- <Property name="keyProperty">code</Property>
- <Property name="valueProperty">name</Property>
- </Property>
- </PropertyDef>
- <PropertyDef name="level">
- <Property></Property>
- <Property name="label">璀︽姤绾у埆</Property>
- <Property name="mapping">
- <Property name="mapValues">${dorado.getDataProvider("blackListWarnPR#triggerWarnLevel").getResult()}</Property>
- <Property name="keyProperty">code</Property>
- <Property name="valueProperty">name</Property>
- </Property>
- </PropertyDef>
- </DataType>
- </Model>
- <View layout="padding:5;regionPadding:5">
- <ClientEvent name="onReady">
-//杩借釜
-showImg = function(){
- view.get("#htmlImg").set("content","");
- view.get("#dialogItem").show();
-};
-
-//鏌ョ湅鐓х墖
-showImg2 = function(data){
- view.get("#ajaxGetImg").set("parameter",data).execute(function(result){
- if(result.code == "ERROR"){
- $alert("褰撳墠璁板綍鍚庡彴鏈彂鐜扮収鐩镐俊鎭紒锛�");
- }else{
- var img = "<img src='"+result.data+"' style='width:100%;padding:10px;' />";
- view.get("#htmlImg").set("content",img);
- }
- });
-}
-
-//璀﹀憡澶勭悊
-handleWarn = function(){
- var data = view.get("#dsMain.data:#");
- if(!data) return;
- view.get("#dialogHandle").show();
- view.get("#textHandle").set("value",null);
-};
-
-//澶勭悊
-updateWarnSatus = function(){
- var data = view.get("#dsMain.data:#");
- if(!data) return;
- 
- var str = view.get("#textHandle.text");
- var remark = data.get("remark") + "銆傚鐞嗚鏄庯細" + str;
- data.set("remark",remark);
- view.get("#updateStatus").execute(function(result){
- if(result){
- $alert(result);
- return;
- }else{
- view.get("#dialogHandle").close();
- view.get("#dsMain").flushAsync();
- }
- });
-};</ClientEvent>
- <Property name="packages">font-awesome,css-common</Property>
- <DataSet id="dsMain">
- <Property name="loadMode">lazy</Property>
- <Property name="dataProvider">blackListWarnPR#listWarn</Property>
- <Property name="dataType">[dtMain]</Property>
- <Property name="pageSize">15</Property>
- </DataSet>
- <DataSet id="dsParam">
- <ClientEvent name="onReady">self.insert({});</ClientEvent>
- <Property name="dataType">dtParam</Property>
- </DataSet>
- <DataSet id="dsTest">
- <ClientEvent name="onReady">self.insert({});</ClientEvent>
- <Property name="dataType">dtTest</Property>
- </DataSet>
- <Container layout="regionPadding:10" layoutConstraint="top">
- <Property name="exClassName">bg-color</Property>
- <Property name="contentOverflow">hidden</Property>
- <Property name="height">55</Property>
- <Label layoutConstraint="left">
- <Property name="text">鑿滃崟鏍忥細</Property>
- </Label>
- <Button layoutConstraint="left">
- <ClientEvent name="onClick">view.get("#dsMain").insert();
-view.get("#dialogMain").show();</ClientEvent>
- <Property name="caption">鏂板</Property>
- <Property name="exClassName">btn-default</Property>
- <Property name="iconClass">fa fa-plus</Property>
- </Button>
- <Button layoutConstraint="left">
- <ClientEvent name="onClick">var data = view.get("#dsMain.data:#");
-if(data){
- view.get("#dialogMain").show();
-}</ClientEvent>
- <Property name="caption">淇敼</Property>
- <Property name="exClassName">btn-warm</Property>
- <Property name="iconClass">fa fa-pencil</Property>
- </Button>
- <Button layoutConstraint="left">
- <ClientEvent name="onClick">var data = view.get("#dsMain.data:#");
-if(!data){
- return;
-}
-view.get("#ajaxDel").set("parameter",data).execute(function(result){
- if(result){
- $alert(result);
- return;
- }else{
- data.remove();
- }
-});</ClientEvent>
- <Property name="caption">鍒犻櫎</Property>
- <Property name="exClassName">btn-warn</Property>
- <Property name="iconClass">fa fa-minus</Property>
- </Button>
- <Button layoutConstraint="left">
- <ClientEvent name="onClick">view.get("#dsMain").flushAsync();
-</ClientEvent>
- <Property name="caption">鍒锋柊</Property>
- <Property name="exClassName">btn-default</Property>
- <Property name="iconClass">fa fa-refresh</Property>
- </Button>
- <Button layoutConstraint="right">
- <ClientEvent name="onClick">view.get("#testWarn").show()</ClientEvent>
- <Property name="caption">璀﹀憡娴嬭瘯</Property>
- <Property name="exClassName">btn-feiyong</Property>
- <Property name="iconClass">fa fa-gavel</Property>
- <Property name="visible">false</Property>
- </Button>
- </Container>
- <Container layout="regionPadding:1" layoutConstraint="center">
- <Property name="exClassName">bg-color</Property>
- <AutoForm>
- <Property name="cols">*,*,*,*</Property>
- <Property name="dataSet">dsParam</Property>
- <Property name="labelAlign">right</Property>
- <Property name="labelSeparator">锛�</Property>
- <Property name="labelWidth">100</Property>
- <AutoFormElement>
- <Property name="name">deptId</Property>
- <Property name="property">deptId</Property>
- <Property name="visible">false</Property>
- <Property name="hideMode">display</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">bizType</Property>
- <Property name="property">bizType</Property>
- <Property name="hideMode">display</Property>
- <Property name="visible">false</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">type</Property>
- <Property name="property">type</Property>
- <Property name="hideMode">display</Property>
- <Property name="visible">true</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">level</Property>
- <Property name="property">level</Property>
- <Property name="hideMode">display</Property>
- <Property name="visible">false</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">perName</Property>
- <Property name="property">perName</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">plateNum</Property>
- <Property name="property">plateNum</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">status</Property>
- <Property name="property">status</Property>
- <Property name="hideMode">display</Property>
- <Property name="visible">false</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">start</Property>
- <Property name="property">start</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">end</Property>
- <Property name="property">end</Property>
- <Editor/>
- </AutoFormElement>
- <Container layout="regionPadding:10">
- <Button layoutConstraint="left">
- <ClientEvent name="onClick">var param = view.get("#dsParam.data");
-view.get("#dsMain").set("parameter",param.toJSON()).flushAsync();</ClientEvent>
- <Property name="caption">鏌ヨ</Property>
- <Property name="exClassName">btn-normal</Property>
- <Property name="iconClass">fa fa-search</Property>
- </Button>
- <Button layoutConstraint="left">
- <ClientEvent name="onClick">view.get("#dsParam").setData({});</ClientEvent>
- <Property name="caption">閲嶇疆</Property>
- <Property name="exClassName">btn-default</Property>
- <Property name="iconClass">fa fa-refresh</Property>
- </Button>
- </Container>
- </AutoForm>
- <DataGrid layoutConstraint="center padding:5px">
- <ClientEvent name="onDataRowDoubleClick">var data = view.get("#dsMain.data:#");
-if(data){
- view.get("#dialogMain").show();
-}</ClientEvent>
- <Property name="dataSet">dsMain</Property>
- <Property name="readOnly">true</Property>
- <RowNumColumn>
- <Property name="width">20px</Property>
- </RowNumColumn>
- <DataColumn name="deptId">
- <Property name="property">deptId</Property>
- <Property name="visible">false</Property>
- </DataColumn>
- <DataColumn name="bizType">
- <Property name="property">bizType</Property>
- <Property name="visible">false</Property>
- </DataColumn>
- <DataColumn>
- <Property name="property">type</Property>
- <Property name="name">type</Property>
- </DataColumn>
- <DataColumn name="perName">
- <Property name="property">perName</Property>
- </DataColumn>
- <DataColumn name="plateNum">
- <Property name="property">plateNum</Property>
- </DataColumn>
- <DataColumn>
- <Property name="property">time</Property>
- <Property name="align">center</Property>
- <Property name="name">time</Property>
- <Property name="width">180px</Property>
- </DataColumn>
- <DataColumn>
- <ClientEvent name="onRenderCell">arg.dom.innerHTML = "<a href='javascript:;' onClick='showImg()'>鎶撴媿璁板綍</a>";</ClientEvent>
- <Property name="width">120</Property>
- <Property name="caption">鎿嶄綔</Property>
- <Property name="align">center</Property>
- <Editor/>
- </DataColumn>
- </DataGrid>
- </Container>
- <Container layoutConstraint="bottom">
- <Property name="exClassName">bg-color</Property>
- <DataPilot layoutConstraint="right">
- <Property name="itemCodes">pageSize,pages</Property>
- <Property name="dataSet">dsMain</Property>
- </DataPilot>
- </Container>
- <Dialog id="dialogMain" layout="padding:10;regionPadding:10">
- <Property name="width">60%</Property>
- <Property name="iconClass">fa fa-flag-o</Property>
- <Property name="closeable">false</Property>
- <Property name="caption">璀﹀憡淇℃伅</Property>
- <Buttons>
- <Button>
- <ClientEvent name="onClick">var data = view.get("#dsMain.data:#");
-if(data.validate() != 'ok'){
- $notify("鏁版嵁鏍￠獙澶辫触锛侊紒");
- return;
-}
-view.get("#uaAction").set("parameter",data).execute(function(){
- self.get("parent").hide();
-});</ClientEvent>
- <Property name="caption">淇濆瓨</Property>
- <Property name="iconClass">fa fa-check</Property>
- <Property name="width">90</Property>
- <Property name="exClassName">btn-normal</Property>
- </Button>
- <Button>
- <ClientEvent name="onClick">view.get("#dsMain.data:#").cancel();
-self.get("parent").hide();</ClientEvent>
- <Property name="caption">鍙栨秷</Property>
- <Property name="iconClass">fa fa-times-circle</Property>
- <Property name="width">90</Property>
- </Button>
- </Buttons>
- <Children>
- <AutoForm>
- <Property name="dataSet">dsMain</Property>
- <Property name="cols">*,*</Property>
- <Property name="labelWidth">110</Property>
- <Property name="labelAlign">right</Property>
- <Property name="labelSeparator">锛�</Property>
- <AutoFormElement>
- <Property name="name">deptId</Property>
- <Property name="property">deptId</Property>
- <Property name="hideMode">display</Property>
- <Property name="visible">false</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">bizType</Property>
- <Property name="property">bizType</Property>
- <Property name="hideMode">display</Property>
- <Property name="visible">false</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">type</Property>
- <Property name="property">type</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">perName</Property>
- <Property name="property">perName</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">plateNum</Property>
- <Property name="property">plateNum</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">time</Property>
- <Property name="property">time</Property>
- <Editor/>
- </AutoFormElement>
- </AutoForm>
- </Children>
- <Tools/>
- </Dialog>
- <Dialog id="testWarn" layout="padding:10;regionPadding:10">
- <Property name="width">40%</Property>
- <Property name="iconClass">fa fa-flag-o</Property>
- <Property name="closeable">false</Property>
- <Property name="caption">璀﹀憡娴嬭瘯</Property>
- <Buttons>
- <Button id="btnOk">
- <ClientEvent name="onClick">var data = view.get("#dsTest.data");
-console.log(data.toJSON());
-view.get("#ajaxTest").set("parameter",data).execute(function(result){
- if(result){
- $alert(result);
- self.get("parent").hide();
- }
-});</ClientEvent>
- <Property name="caption">纭畾鍙戦��</Property>
- <Property name="iconClass">fa fa-check</Property>
- </Button>
- <Button>
- <ClientEvent name="onClick">self.get("parent").hide();</ClientEvent>
- <Property name="caption">鍙栨秷</Property>
- <Property name="iconClass">fa fa-times-circle</Property>
- <Property name="width">90</Property>
- </Button>
- </Buttons>
- <Children>
- <AutoForm>
- <Property name="dataSet">dsTest</Property>
- <Property name="cols">*</Property>
- <Property name="labelWidth">110</Property>
- <Property name="labelAlign">right</Property>
- <Property name="labelSeparator">锛�</Property>
- <AutoFormElement>
- <Property name="name">phone</Property>
- <Property name="property">phone</Property>
- <Property name="label">鎵嬫満鍙�</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">bizType</Property>
- <Property name="property">bizType</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">type</Property>
- <Property name="property">type</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">level</Property>
- <Property name="property">level</Property>
- <Editor/>
- </AutoFormElement>
- <Label layoutConstraint="colSpan:2">
- <Property name="text">璇存槑锛氳鍛婃祴璇曚腑锛屾墜鏈哄彿蹇呴』濉啓锛屼笖濉啓鐨勬墜鏈哄彿蹇呴』鍏虫敞鍏紬鍙峰苟鍦ㄦ櫤鎱х伯搴撲腑缁戝畾鐢ㄦ埛銆傝鍛婃祴璇曚俊鎭彧鎺ㄩ�侊紝涓嶄繚瀛橈紒</Property>
- </Label>
- </AutoForm>
- </Children>
- <Tools/>
- </Dialog>
- <UpdateAction id="uaAction">
- <Property name="dataResolver">blackListWarnPR#saveWarn</Property>
- <UpdateItem>
- <Property name="dataSet">dsMain</Property>
- <Property name="dataPath">[#current]</Property>
- </UpdateItem>
- </UpdateAction>
- <AjaxAction id="ajaxTest">
- <Property name="service">blackListWarnPR#testWarn</Property>
- <Property name="parameter"></Property>
- </AjaxAction>
- <AjaxAction id="ajaxDel">
- <Property name="confirmMessage">纭畾瑕佸垹闄ゅ悧锛�</Property>
- <Property name="service">blackListWarnPR#delWarn</Property>
- </AjaxAction>
- <AjaxAction id="ajaxGetImg">
- <Property name="service">sys.fileManager#getImg</Property>
- </AjaxAction>
- <Dialog id="dialogItem">
- <Property name="width">1300</Property>
- <Property name="height">95%</Property>
- <Property name="iconClass">fa fa-tasks</Property>
- <Property name="caption">鐩稿叧璁板綍锛堝弻鍑诲乏渚у垪琛紝鍙充晶鏄剧ず鍥剧墖锛�</Property>
- <Buttons/>
- <Children>
- <SplitPanel>
- <Property name="position">400</Property>
- <MainControl>
- <HtmlContainer id="htmlImg"/>
- </MainControl>
- <SideControl>
- <Container>
- <DataGrid id="dataGridItem">
- <ClientEvent name="onDataRowDoubleClick">showImg2(arg.data);</ClientEvent>
- <Property name="dataSet">dsMain</Property>
- <Property name="dataPath">#.files</Property>
- <Property name="readOnly">true</Property>
- <RowNumColumn>
- <Property name="width">50</Property>
- </RowNumColumn>
- <DataColumn name="bizTag">
- <Property name="property">bizTag</Property>
- </DataColumn>
- <DataColumn name="createTime">
- <Property name="property">createTime</Property>
- </DataColumn>
- </DataGrid>
- </Container>
- </SideControl>
- </SplitPanel>
- </Children>
- <Tools/>
- </Dialog>
- <Dialog id="dialogHandle" layout="regionPadding:5">
- <Property name="caption">澶勭悊璇存槑</Property>
- <Buttons>
- <Button>
- <ClientEvent name="onClick">updateWarnSatus();</ClientEvent>
- <Property name="caption">澶勭悊</Property>
- </Button>
- <Button>
- <ClientEvent name="onClick">self.get("parent").close();</ClientEvent>
- <Property name="caption">杩斿洖</Property>
- </Button>
- </Buttons>
- <Children>
- <TextArea id="textHandle">
- <Property name="height">165</Property>
- </TextArea>
- </Children>
- <Tools/>
- </Dialog>
- <UpdateAction id="updateStatus">
- <Property name="dataResolver">blackListWarnPR#updateWarnStatus</Property>
- <Property name="confirmMessage">纭畾瑕佸鐞嗗悧锛�</Property>
- <UpdateItem>
- <Property name="dataPath">[#current]</Property>
- <Property name="dataSet">dsMain</Property>
- <Property name="validateData">false</Property>
- </UpdateItem>
- </UpdateAction>
- </View>
-</ViewConfig>
diff --git a/igds-security/src/main/java/com/ld/igds/sec/view/BlackListWarnPR.java b/igds-security/src/main/java/com/ld/igds/sec/view/BlackListWarnPR.java
deleted file mode 100644
index e16e845..0000000
--- a/igds-security/src/main/java/com/ld/igds/sec/view/BlackListWarnPR.java
+++ /dev/null
@@ -1,231 +0,0 @@
-package com.ld.igds.sec.view;
-
-import com.bstek.bdf2.core.model.DefaultUser;
-import com.bstek.dorado.annotation.DataProvider;
-import com.bstek.dorado.annotation.DataResolver;
-import com.bstek.dorado.annotation.Expose;
-import com.bstek.dorado.data.provider.Page;
-import com.ld.igds.constant.NoticeType;
-import com.ld.igds.constant.WarnLevel;
-import com.ld.igds.constant.WarnStatus;
-import com.ld.igds.models.DicTrigger;
-import com.ld.igds.models.MWarnConf;
-import com.ld.igds.sec.service.BlackListWarnService;
-import com.ld.igds.sys.service.SysUserService;
-import com.ld.igds.util.ContextUtil;
-import com.ld.igds.warn.data.WarnData;
-import com.ld.igds.warn.service.CoreWarnService;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * 璀︽姤绠＄悊
- *
- * @author:
- *
- */
-@Component
-public class BlackListWarnPR {
-
- @Autowired
- private BlackListWarnService blackListWarnService;
- @Autowired
- private CoreWarnService coreWarnService;
- @Autowired
- private SysUserService sysUserService;
-
- /**
- * 璀﹀憡绫诲瀷
- * blackListWarnPR
- * ${dorado.getDataProvider("warnPR#triggerWarnType").getResult()}
- *
- * @return
- */
- @DataProvider
- public List<DicTrigger> triggerWarnType() {
- List<DicTrigger> list = new ArrayList<DicTrigger>();
-// for (WarnType w:WarnType.values()) {
-// list.add(new DicTrigger(w.getCode(), w.getMsg()));
-// }
- //list.add(new DicTrigger(WarnType.TYPE_01.getCode(), "璀﹀憡"));
- //list.add(new DicTrigger(WarnType.TYPE_02.getCode(), "棰勮"));
- //list.add(new DicTrigger(WarnType.TYPE_01.getCode(), "閫氱煡"));
-
- list.add(new DicTrigger("01", "浜哄憳"));
- list.add(new DicTrigger("02", "杞﹁締"));
- return list;
- }
-
- /**
- * 璀﹀憡绛夌骇
- *
- * ${dorado.getDataProvider("warnPR#triggerWarnLevel").getResult()}
- *
- * @return
- */
- @DataProvider
- public List<DicTrigger> triggerWarnLevel() {
- List<DicTrigger> list = new ArrayList<DicTrigger>();
- for (WarnLevel w:WarnLevel.values()) {
- list.add(new DicTrigger(w.getCode(), w.getMsg()));
- }
- //list.add(new DicTrigger(WarnLevel.LEVEL_01.getCode(), "涓�绾ц鍛�"));
- // list.add(new DicTrigger(WarnLevel.LEVEL_02.getCode(), "浜岀骇璀﹀憡"));
- // list.add(new DicTrigger(WarnLevel.LEVEL_03.getCode(), "涓夌骇璀﹀憡"));
-
- return list;
- }
-
- /**
- * 璀﹀憡鐘舵��
- *
- * ${dorado.getDataProvider("warnPR#triggerWarnStatus").getResult()}
- *
- * @return
- */
- @DataProvider
- public List<DicTrigger> triggerWarnStatus() {
- List<DicTrigger> list = new ArrayList<DicTrigger>();
-
- list.add(new DicTrigger(WarnStatus.STATUS_10.getCode(), "鏈鐞�"));
- list.add(new DicTrigger(WarnStatus.STATUS_20.getCode(), "寤惰繜澶勭悊"));
- list.add(new DicTrigger(WarnStatus.STATUS_30.getCode(), "宸插鐞�"));
- list.add(new DicTrigger(WarnStatus.STATUS_40.getCode(), "蹇界暐"));
-
- return list;
- }
-
-
- /**
- * warnPR#listWarn
- * @param param
- * @return
- */
- @DataProvider
- public void listWarn(Page<BlackListWarnInfo> page, Map<String,Object> param) throws Exception {
-
- if(null == param){
- param = new HashMap<>();
- }
-
- blackListWarnService.listWarnInfo(page, param);
- }
-
- /**
- * warnPR#saveWarn
- *
- * @param data
- */
- @DataResolver
- public void saveWarn(BlackListWarnInfo data){
- blackListWarnService.saveWarnInfo(data);
- }
-
-
- /**
- * warnPR#updateWarnStatus
- * @param data
- */
- @DataResolver
- public String updateWarnStatus(BlackListWarnInfo data) throws Exception {
- blackListWarnService.updateWarnStatus(data);
- return null;
- }
-
- /**
- * warnPR#delWarn
- * @param data
- * @return
- */
- @Expose
- public String delWarn(BlackListWarnInfo data){
- return blackListWarnService.delWarnInfo(data);
- }
-
-
- /**
- * warnPR#testWarn 璀﹀憡娴嬭瘯
- */
- @Expose
- public String testWarn(WarnData data) {
- if(data == null || StringUtils.isEmpty(data.getPhone())){
- return "鎵嬫満鍙蜂笉鑳戒负绌猴紒";
- }
- return coreWarnService.noticeTestWarn(data.getPhone(),data.getType(),data.getLevel(), data.getBizType());
- }
-
-
- //----------------------------------璀﹀憡閰嶇疆-------------------------------------//
-
-
- /**
- * 璀﹀憡閫氱煡鏂瑰紡
- *
- * ${dorado.getDataProvider("warnPR#triggerNoticeType").getResult()}
- *
- * @return
- */
- @DataProvider
- public List<DicTrigger> triggerNoticeType() {
- List<DicTrigger> list = new ArrayList<DicTrigger>();
-
- list.add(new DicTrigger(NoticeType.NONE.getCode(), NoticeType.NONE.getName()));
- list.add(new DicTrigger(NoticeType.SMS.getCode(), NoticeType.SMS.getName()));
- list.add(new DicTrigger(NoticeType.EMAIL.getCode(), NoticeType.EMAIL.getName()));
- list.add(new DicTrigger(NoticeType.VOICE.getCode(), NoticeType.VOICE.getName()));
- list.add(new DicTrigger(NoticeType.WECHAT.getCode(), NoticeType.WECHAT.getName()));
-
- return list;
- }
-
- /**
- * warnPR#getConf
- * @param deptId
- * @return
- */
- @DataProvider
- public MWarnConf getConf(String deptId){
- if(StringUtils.isEmpty(deptId)){
- deptId = ContextUtil.subDeptId(null);
- }
- MWarnConf result = blackListWarnService.getConf(deptId);
- if(null == result){
- result = new MWarnConf();
- result.setStart(0);
- result.setEnd(24);
- result.setDeptId(deptId);
- }
- return result;
- }
-
- /**
- * warnPR#updateConf
- * @param data
- */
- @DataResolver
- public void updateConf(MWarnConf data){
- blackListWarnService.updateConf(data);
- }
-
- /**
- * warnPR#loadUserByParam
- * 鏍规嵁鍏抽敭瀛楁煡璇紝鍙兘鏄敤鎴疯处鍙凤紝鎴栬�呬腑鏂囧悕
- *
- * @param
- * @return
- */
- @DataProvider
- public List<DefaultUser> loadUserByParam(Map<String, Object> param) {
-
- if(null == param){
- param = new HashMap<String, Object>();
- }
- return sysUserService.loadUsers(param);
- }
-}
diff --git a/igds-web/src/main/java/com/ld/igds/TestService.java b/igds-web/src/main/java/com/ld/igds/TestService.java
deleted file mode 100644
index e49b1fc..0000000
--- a/igds-web/src/main/java/com/ld/igds/TestService.java
+++ /dev/null
@@ -1,143 +0,0 @@
-package com.ld.igds;
-
-import com.bstek.bdf2.core.orm.hibernate.HibernateDao;
-import com.ld.igds.common.CoreCommonService;
-import com.ld.igds.inout.InoutConstant;
-import com.ld.igds.models.InoutRecord;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.time.DateUtils;
-import org.hibernate.Query;
-import org.hibernate.Session;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-@Slf4j
-@Component
-public class TestService extends HibernateDao {
-
- @Autowired
- private CoreCommonService commonService;
-
-
- private void initRecordCurStorage2(List<InoutRecord> listData) {
- if (null == listData || listData.isEmpty()) return;
-
- log.info("----------------寮�濮嬫墽琛岄噸缃嚭鍏ュ簱淇℃伅--------------");
-
- //鏇存柊瀹炴椂搴撳瓨
- Session session = this.getSessionFactory().openSession();
- try {
- InoutRecord perData;
- InoutRecord curData;
- for (int i = 1; i < listData.size(); i++) {
- perData = listData.get(i - 1);
- curData = listData.get(i);
- if ("IN".equals(perData.getType())) {
- curData.setCurStorage(perData.getCurStorage() + perData.getSettleWeight());
- } else if ("OUT".equals(perData.getType())) {
- curData.setCurStorage(perData.getCurStorage() - perData.getSettleWeight());
- } else if ("OVER".equals(perData.getType())) {
- curData.setCurStorage(perData.getCurStorage() + perData.getSettleWeight());
- } else if ("LOSS".equals(perData.getType())) {
- curData.setCurStorage(perData.getCurStorage() - perData.getSettleWeight());
- } else {
- curData.setCurStorage(perData.getCurStorage());
- }
- listData.set(i, curData);
-
- //鏇存柊搴瓨
- String updateHql = "update " + InoutRecord.class.getName() + " set curStorage=:curStorage where companyId=:companyId and id=:id";
- Query query = session.createQuery(updateHql);
- query.setDouble("curStorage", curData.getCurStorage());
- query.setString("companyId", curData.getCompanyId());
- query.setString("id", curData.getId());
- query.executeUpdate();
- log.info("----------------DEPOTID={}----CUR={}----------", curData.getDepotId(), curData.getCurStorage());
- }
-
- log.info("----------------閲嶇疆瀹屾垚--------------");
-
- } catch (Exception e) {
- e.printStackTrace();
- } finally {
- session.clear();
- session.close();
- }
- }
-
-
- public void initRecordCurStorageOUT(String depotId, String startDate) {
- try {
- Date start = DateUtils.parseDate(startDate, "yyyy-MM-dd");
- //鑾峰彇鎵�鏈夌殑璇︾粏
-
- String hql = " from " + InoutRecord.class.getName()
- + " where progress=:progress and recordStatus <>:statusError and recordStatus <>:statusDel and depotId=:depotId"
- + " and completeTime > :start and (type =:typOut or type=:typeOver) "
- + " order by completeTime";
-
- Map<String, Object> param = new HashMap<>();
- param.put("progress", InoutConstant.PROGRESS_RECORD);
- param.put("statusError", InoutConstant.RECORD_STATUS_ERROR);
- param.put("statusDel", InoutConstant.RECORD_STATUS_DEL);
- param.put("depotId", depotId);
- param.put("start", start);
- param.put("typOut", InoutConstant.TYPE_OUT);
- param.put("typeOver", "OVER");
-
- List<InoutRecord> listData = this.query(hql, param);
-
-
- if (null == listData || listData.isEmpty()) return;
-
- //鏇存柊鍑哄叆搴撳垪琛�
- this.initRecordCurStorage2(listData);
-
- InoutRecord lastData = listData.get(listData.size()-1);
-
- commonService.updateDepotStorage(lastData.getCompanyId(), lastData.getDepotId(), lastData.getCurStorage() - lastData.getSettleWeight());
-
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
-
- public void initRecordCurStorageIN(String depotId, String startDate) {
- try {
- Date start = DateUtils.parseDate(startDate, "yyyy-MM-dd");
- //鑾峰彇鎵�鏈夌殑璇︾粏
- String hql = " from " + InoutRecord.class.getName()
- + " where progress=:progress and recordStatus <>:statusError and recordStatus <>:statusDel and depotId=:depotId"
- + " and completeTime > :start and (type =:typIn or type=:typeLOss) "
- + " order by completeTime";
-
- Map<String, Object> param = new HashMap<String, Object>();
- param.put("progress", InoutConstant.PROGRESS_RECORD);
- param.put("statusError", InoutConstant.RECORD_STATUS_ERROR);
- param.put("statusDel", InoutConstant.RECORD_STATUS_DEL);
- param.put("depotId", depotId);
- param.put("start", start);
- param.put("typIn", InoutConstant.TYPE_IN);
- param.put("typeLOss", "LOSS");
-
- List<InoutRecord> listData = this.query(hql, param);
-
- if (null == listData || listData.isEmpty()) return;
-
- this.initRecordCurStorage2(listData);
-
- InoutRecord lastData = listData.get(listData.size() - 1);
-
- // 閲嶆柊璁＄畻瀹㈡埛瀹屾垚閲�
- commonService.updateDepotStorage(lastData.getCompanyId(), lastData.getDepotId(), lastData.getCurStorage() + lastData.getSettleWeight());
-
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
-
-}
--
Gitblit v1.9.3