From bb696e54a8c537cd9b5aa7fd5f72f322ec5f7d41 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 03 一月 2025 16:27:56 +0800
Subject: [PATCH] 最新版本541200007
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java | 58 +++++++++++++++++++++--------
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/TmsServiceImpl.java | 8 ++--
server/system_service/src/main/java/com/doumee/config/mybatis/MyBatisInterceptor.java | 18 ++++----
3 files changed, 55 insertions(+), 29 deletions(-)
diff --git a/server/system_service/src/main/java/com/doumee/config/mybatis/MyBatisInterceptor.java b/server/system_service/src/main/java/com/doumee/config/mybatis/MyBatisInterceptor.java
index 111543f..aca677e 100644
--- a/server/system_service/src/main/java/com/doumee/config/mybatis/MyBatisInterceptor.java
+++ b/server/system_service/src/main/java/com/doumee/config/mybatis/MyBatisInterceptor.java
@@ -50,13 +50,13 @@
if (target == null)
return invocation.proceed();
// 鍒涘缓璇彞
-// if (SqlCommandType.INSERT == sqlCommandType) {
-// this.handleOperaStatement(target, CREATE_TIME, CREATE_USER);
-// }
-// // 鏇存柊璇彞
-// else if (SqlCommandType.UPDATE == sqlCommandType) {
-// this.handleOperaStatement(target, UPDATE_TIME, UPDATE_USER);
-// }
+ if (SqlCommandType.INSERT == sqlCommandType) {
+ this.handleOperaStatement(target, CREATE_TIME, CREATE_USER);
+ }
+ // 鏇存柊璇彞
+ else if (SqlCommandType.UPDATE == sqlCommandType) {
+ this.handleOperaStatement(target, UPDATE_TIME, UPDATE_USER);
+ }
return invocation.proceed();
}
@@ -79,14 +79,14 @@
this.setFieldValue(operaTimeField, target, new Date());
}
}
- // 鎿嶄綔浜�
+ /* // 鎿嶄綔浜�
Field operaUserField = ReflectionUtils.findField(target.getClass(), fieldNames[1]);
if (operaUserField != null) {
Object operaUser = this.getFieldValue(operaUserField, target);
if (operaUser == null && this.getLoginUser()!=null) {
this.setFieldValue(operaUserField, target, this.getLoginUser().getId());
}
- }
+ }*/
}
/**
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java
index 23fe63a..29d38af 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java
@@ -588,25 +588,46 @@
public List<AlarmEventDataVO> fightingAdminAlertList(){
List<AlarmEventDataVO> data = new ArrayList<>();
- //鏌ヨ24灏忔椂鍐呯殑
+ List<FindHomeAlarmInfoPageResponse> allList = new ArrayList<>();
+ boolean hasNext = true;
+ int curTotal = 0;
+ int curPage = 1;
FindHomeAlarmInfoPageRequest param = new FindHomeAlarmInfoPageRequest();
param.setHour(24);
- param.setPage(1);
param.setUserId("admin");
+ while (hasNext){
+ //鍒嗛〉閬嶅巻寰幆鏌ヨ鎵�鏈夐棬绂佽澶囨暟鎹�
+ param.setPage(curPage);
// param.setRegionIndexCodes("root000000");
- param.setAlarmStartTime(DateUtil.getFomartDate(new Date(),"yyyy-MM-dd") + " 00:00:00");
- param.setAlarmEndTime(DateUtil.getPlusTime2(new Date()));
- param.setPageSize(20);
- BaseResponse<BaseListPageResponse<FindHomeAlarmInfoPageResponse>> response = HKService.findHomeAlarmInfoPage(param);
- if(response != null && StringUtils.equals(response.getCode(), HKConstants.RESPONSE_SUCCEE)
- && response.getData()!=null
- &&response.getData().getList()!=null) {
+ param.setAlarmStartTime(DateUtil.getFomartDate(new Date(),"yyyy-MM-dd") + " 00:00:00");
+ param.setAlarmEndTime(DateUtil.getPlusTime2(new Date()));
+ param.setPageSize(50);
+ BaseResponse<BaseListPageResponse<FindHomeAlarmInfoPageResponse>> response = HKService.findHomeAlarmInfoPage(param);
+ if(response == null || !StringUtils.equals(response.getCode(), HKConstants.RESPONSE_SUCCEE)){
+ throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(), "瀵逛笉璧凤紝娴峰悍鍚屾鏁版嵁澶辫触~");
+ }
for(FindHomeAlarmInfoPageResponse r : response.getData().getList()){
AlarmEventDataVO t = new AlarmEventDataVO();
BeanUtils.copyProperties(r,t);
- data.add(t);
+ try {
+ if(DateUtil.getDateFromString(t.getAlarmTime()).getTime() >= Utils.Date.getStart(new Date()).getTime()){
+ data.add(t);
+ }else{
+ hasNext =false;
+ }
+ }catch (Exception e){
+ }
}
+ curTotal += 50;
+ if(curTotal >= response.getData().getTotal()){
+ hasNext = false;
+ }
+ if(response.getData().getList() == null || response.getData().getList().size()==0){
+ hasNext =false;
+ }
+ curPage++;
}
+
return data;
}
@@ -1380,14 +1401,19 @@
}
if( data.getGasQuantity().getTotalNum().compareTo(new BigDecimal(0)) !=0){
//璁＄畻鐢ㄦ皵鍚屾瘮鐜瘮
- data.getGasQuantity().setSameRate(
- (data.getGasQuantity().getTotalNum().subtract(data.getGasQuantity().getSameNum())).divide(data.getGasQuantity().getSameNum()).doubleValue()*100 +""
+ if(Constants.formatBigdecimal(data.getGasQuantity().getSameNum()).compareTo(new BigDecimal(0))!=0){
+ data.getGasQuantity().setSameRate(
+ (data.getGasQuantity().getTotalNum().subtract(data.getGasQuantity().getSameNum())).divide(data.getGasQuantity().getSameNum(),4,BigDecimal.ROUND_HALF_UP).doubleValue()*100 +""
/*Constants.formatBigdecimal4Float(data.getGasQuantity().getSameNum()
.divide(data.getGasQuantity().getTotalNum(),4,BigDecimal.ROUND_HALF_UP)).doubleValue()*100 +""*/);
- data.getGasQuantity().setRingRate(
- (data.getGasQuantity().getTotalNum().subtract(data.getGasQuantity().getRingNum())).divide(data.getGasQuantity().getRingNum()).doubleValue()*100 +""
- //Constants.formatBigdecimal4Float(data.getGasQuantity().getRingNum().divide(data.getGasQuantity().getTotalNum(),4,BigDecimal.ROUND_HALF_UP)).doubleValue()*100 +""
- );
+ }
+ if(Constants.formatBigdecimal(data.getGasQuantity().getRingNum()).compareTo(new BigDecimal(0))!=0){
+ data.getGasQuantity().setRingRate(
+ (data.getGasQuantity().getTotalNum().subtract(data.getGasQuantity().getRingNum())).divide(data.getGasQuantity().getRingNum(),4,BigDecimal.ROUND_HALF_UP).doubleValue()*100 +""
+ //Constants.formatBigdecimal4Float(data.getGasQuantity().getRingNum().divide(data.getGasQuantity().getTotalNum(),4,BigDecimal.ROUND_HALF_UP)).doubleValue()*100 +""
+ );
+ }
+
}
if( data.getWaterQuantity().getTotalNum().compareTo(new BigDecimal(0)) !=0){
// //璁＄畻鐢ㄦ按鍚屾瘮鐜瘮
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/TmsServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/TmsServiceImpl.java
index 5854665..f6ab64b 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/TmsServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/TmsServiceImpl.java
@@ -220,7 +220,7 @@
String url = systemDictDataBiz.queryByCode(Constants.TSM_PARAM,Constants.TMS_INTERFACE_URL_PREFIX).getCode()
+TMSContants.InterfacePath.getDriverTaskList[0];
- url = "http://10.163.4.56:8088"+TMSContants.InterfacePath.getDriverTaskList[0];
+// url = "http://10.163.4.56:8088"+TMSContants.InterfacePath.getDriverTaskList[0];
TmsBaseResponse<TmsBasePageResponse<TmsDriveTaskListResponse> > response = sendHttpRequest(url,TMSContants.InterfacePath.getDriverTaskList[1],JSONObject.toJSONString(param)
,new TypeReference< TmsBaseResponse<TmsBasePageResponse<TmsDriveTaskListResponse>>>(){});
if(response ==null || response.getData() == null){
@@ -241,7 +241,7 @@
String url = systemDictDataBiz.queryByCode(Constants.TSM_PARAM,Constants.TMS_INTERFACE_URL_PREFIX).getCode()
+TMSContants.InterfacePath.getDriverTaskDetail[0];
- url = "http://10.163.4.56:8088"+TMSContants.InterfacePath.getDriverTaskDetail[0];
+// url = "http://10.163.4.56:8088"+TMSContants.InterfacePath.getDriverTaskDetail[0];
TmsBaseResponse<TmsDriveTaskInfoResponse > response = sendHttpRequest(url,TMSContants.InterfacePath.getDriverTaskDetail[1],JSONObject.toJSONString(param)
,new TypeReference< TmsBaseResponse<TmsDriveTaskInfoResponse>>(){});
if(response ==null || response.getData() == null){
@@ -261,7 +261,7 @@
}
String url = systemDictDataBiz.queryByCode(Constants.TSM_PARAM,Constants.TMS_INTERFACE_URL_PREFIX).getCode()
+TMSContants.InterfacePath.driverStart[0];
- url = "http://10.163.4.56:8088"+TMSContants.InterfacePath.driverStart[0];
+// url = "http://10.163.4.56:8088"+TMSContants.InterfacePath.driverStart[0];
TmsBaseResponse<TmsDriveTaskInfoResponse > response = sendHttpRequest(url,TMSContants.InterfacePath.driverStart[1],JSONObject.toJSONString(param)
,new TypeReference< TmsBaseResponse<TmsDriveTaskInfoResponse>>(){});
if(response ==null || !StringUtils.equals(response.getCode(),"0")){
@@ -283,7 +283,7 @@
}
String url = systemDictDataBiz.queryByCode(Constants.TSM_PARAM,Constants.TMS_INTERFACE_URL_PREFIX).getCode()
+TMSContants.InterfacePath.driverArrival[0];
- url = "http://10.163.4.56:8088"+TMSContants.InterfacePath.driverArrival[0];
+// url = "http://10.163.4.56:8088"+TMSContants.InterfacePath.driverArrival[0];
TmsBaseResponse<TmsDriveTaskInfoResponse > response = sendHttpRequest(url,TMSContants.InterfacePath.driverArrival[1],JSONObject.toJSONString(param)
,new TypeReference< TmsBaseResponse<TmsDriveTaskInfoResponse>>(){});
if(response ==null ||!StringUtils.equals(response.getCode(),"0")){
--
Gitblit v1.9.3