From 1110e717afecf1cc78950a5f054bfa0c1b159ae1 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 13 十二月 2024 17:20:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/system_service/src/main/java/com/doumee/core/utils/Constants.java | 12 +-
server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/VisitDetailVO.java | 3
server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/platformReport/FightingAdminCenterDataVO.java | 2
server/system_service/src/main/java/com/doumee/core/utils/SmsConstants.java | 2
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/EnergyController.java | 2
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/SmsEmailServiceImpl.java | 17 ++
server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/TemperatureHumidityDataResponse.java | 32 ++++++
server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/TemperatureHumidityDataRequest.java | 12 ++
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Visits.java | 5 +
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveServiceImpl.java | 13 +
server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/platformReport/TemperatureHumidityDataVO.java | 26 +++++
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/SecurityController.java | 2
server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKConstants.java | 1
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java | 58 ++++++++++
server/system_service/src/main/java/com/doumee/dao/system/model/Notices.java | 2
server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/service/HKService.java | 21 ++++
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java | 14 ++
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/FightingAdminController.java | 10 ++
server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKTools.java | 27 +++++
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/HkInterfaceTestCloudController.java | 7 +
server/visits/dmvisit_service/src/main/java/com/doumee/core/wx/wxPlat/WxPlatNotice.java | 1
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/third/BoardService.java | 2
22 files changed, 248 insertions(+), 23 deletions(-)
diff --git a/server/system_service/src/main/java/com/doumee/core/utils/Constants.java b/server/system_service/src/main/java/com/doumee/core/utils/Constants.java
index a894f13..0f1bd6f 100644
--- a/server/system_service/src/main/java/com/doumee/core/utils/Constants.java
+++ b/server/system_service/src/main/java/com/doumee/core/utils/Constants.java
@@ -146,6 +146,8 @@
public static final String MYSQL_BACKUP_DIR ="MYSQL_BACKUP_DIR" ;
public static final String EVENT_FILES_PRIVATE_DOMAIN ="EVENT_FILES_PRIVATE_DOMAIN" ;
public static final String EVENT_FILES_PUBLIC_DOMAIN ="EVENT_FILES_PUBLIC_DOMAIN" ;
+ public static final String TEMPERATURE_HUMIDITY ="TEMPERATURE_HUMIDITY" ;
+
public static final String HK_WXTOKEN_CONFIGID ="HK_WXTOKEN_CONFIGID" ;
public static final String HK_WXTOKEN_TAGID ="HK_WXTOKEN_TAGID" ;
public static final String WMS_TOTAL_STOCK_NUM ="WMS_TOTAL_STOCK_NUM" ;
@@ -211,11 +213,11 @@
*/
public static String getWxUrl(String code, WxUrlParams paramCode, String ywid) {
String url = code.replace("${type}",paramCode.type+"").replace("${yw}",paramCode.yw).replace("${ywid}",ywid);
- try {
- url = URLEncoder.encode(code.replace("${type}",paramCode.type+"").replace("${yw}",paramCode.yw).replace("${ywid}",ywid),"UTF-8");
- }catch (Exception e){
-
- }
+// try {
+// url = URLEncoder.encode(code,"UTF-8");
+// }catch (Exception e){
+//
+// }
return url;
}
diff --git a/server/system_service/src/main/java/com/doumee/core/utils/SmsConstants.java b/server/system_service/src/main/java/com/doumee/core/utils/SmsConstants.java
index 6ccfe1b..a59b385 100644
--- a/server/system_service/src/main/java/com/doumee/core/utils/SmsConstants.java
+++ b/server/system_service/src/main/java/com/doumee/core/utils/SmsConstants.java
@@ -43,6 +43,8 @@
String visitTimeOutSignOut = "visitTimeOutSignOut";
//璁垮鐢宠-鏈绂绘暟閲�-閫氱煡锛堢粰鎸囧畾鎺ユ敹浜猴級
String visitTimeOutSignOutNum = "visitTimeOutSignOutNum";
+ //璁垮鐢宠-瀹℃壒閫氳繃閫氱煡锛堢粰琚闂汉锛�
+ String visitAuditSuccessToVisiter = "visitAuditSuccessToVisiter";
}
diff --git a/server/system_service/src/main/java/com/doumee/dao/system/model/Notices.java b/server/system_service/src/main/java/com/doumee/dao/system/model/Notices.java
index 1e9dfa6..a469a5c 100644
--- a/server/system_service/src/main/java/com/doumee/dao/system/model/Notices.java
+++ b/server/system_service/src/main/java/com/doumee/dao/system/model/Notices.java
@@ -91,7 +91,7 @@
@ExcelColumn(name="鍏宠仈鍙傛暟1")
private String param1;
- @ApiModelProperty(value = "鐢ㄤ簬瀛樺偍 涓氬姟鐘舵�佷俊鎭� 0 =寰呭鐞�;1=宸插悓鎰�/宸插鐞�;2=宸叉嫆缁�/宸查��鍥�;3=宸茶浆浜�;4=宸叉挙閿�",notes = "鐢ㄤ簬瀛樺偍 涓氬姟鐘舵�佷俊鎭� 0 =寰呭鐞�;1=宸插悓鎰�/宸插鐞�;2=宸叉嫆缁�/宸查��鍥�;3=宸茶浆浜�;4=宸叉挙閿�")
+ @ApiModelProperty(value = "鐢ㄤ簬瀛樺偍 涓氬姟鐘舵�佷俊鎭� 0=寰呭鐞�;1=宸插悓鎰�/宸插鐞�;2=宸叉嫆缁�/宸查��鍥�;3=宸茶浆浜�;4=宸叉挙閿�",notes = "鐢ㄤ簬瀛樺偍 涓氬姟鐘舵�佷俊鎭� 0 =寰呭鐞�;1=宸插悓鎰�/宸插鐞�;2=宸叉嫆缁�/宸查��鍥�;3=宸茶浆浜�;4=宸叉挙閿�")
@ExcelColumn(name="鍏宠仈鍙傛暟2")
private String param2;
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/HkInterfaceTestCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/HkInterfaceTestCloudController.java
index 139df94..260731b 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/HkInterfaceTestCloudController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/HkInterfaceTestCloudController.java
@@ -175,4 +175,11 @@
return ApiResponse.success( HKService.findDeviceAlarmPage(param));
}
+ @ApiOperation("銆愭捣搴枫�戞俯婀垮害缁熻")
+ @PostMapping("/getTemperatureHumidityDataPage")
+ @LoginNoRequired
+ public ApiResponse<BaseResponse> getTemperatureHumidityDataPage(@RequestBody TemperatureHumidityDataRequest request, HttpServletResponse response) {
+ return ApiResponse.success( HKService.temperatureHumidityDataStatistic(request));
+ }
+
}
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/EnergyController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/EnergyController.java
index 4fae75e..2a23a82 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/EnergyController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/EnergyController.java
@@ -51,6 +51,8 @@
RegionEnergyListResponse data=boardService.energyRegionData();
return ApiResponse.success(data);
}
+
+
@LoginNoRequired
@ApiOperation("瀹炴椂璐熻嵎鏇茬嚎")
@GetMapping("/loadCurve")
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/FightingAdminController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/FightingAdminController.java
index e727bd7..f3f15b5 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/FightingAdminController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/FightingAdminController.java
@@ -79,4 +79,14 @@
}
+ @LoginNoRequired
+ @ApiOperation("娓╂箍搴︽暟鎹�")
+ @GetMapping("/getTemperatureHumidityData")
+ public ApiResponse<List<TemperatureHumidityDataVO>> getTemperatureHumidityData() {
+ List<TemperatureHumidityDataVO> list = boardService.getTemperatureHumidityData();
+ return ApiResponse.success(list);
+ }
+
+
+
}
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/SecurityController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/SecurityController.java
index c5d6947..c4bbcdc 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/SecurityController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/SecurityController.java
@@ -67,8 +67,6 @@
}
-
-
@LoginNoRequired
@ApiOperation("璁垮婊炵暀鎯呭喌")
@GetMapping("/visitRetentionData")
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKConstants.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKConstants.java
index b69adcd..2993237 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKConstants.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKConstants.java
@@ -620,6 +620,7 @@
String[] minitorDataSearchV1= new String[]{"/api/fem/v1/minitor/data/search","鍒嗛〉鏌ヨ璁惧鐩戞祴鍘嗗彶鏁版嵁"};//鍒嗛〉鏌ヨ璁惧鐩戞祴鍘嗗彶鏁版嵁
String[] minitorDataSearch= new String[]{"/api/fpms/v2/minitor/data/search","鍒嗛〉鏌ヨ璁惧鐩戞祴鍘嗗彶鏁版嵁"};//鍒嗛〉鏌ヨ璁惧鐩戞祴鍘嗗彶鏁版嵁
String[] userOpenidSave= new String[]{"/api/v1/oa/userOpenId/saveV2","淇濆瓨鐢ㄦ埛鍙妎penId缁戝畾淇℃伅寰俊鍏紬鍙�"};//淇濆瓨鐢ㄦ埛鍙妎penId缁戝畾淇℃伅寰俊鍏紬鍙�
+ String[] temperatureHumidityDataStatistic= new String[]{"/api/v2/public/monitor/sensor/list","娑堥槻鐪嬫澘-4娓╂箍搴︾粺璁�"};//娑堥槻鐪嬫澘-娓╂箍搴�
}
/**
* 闄勫綍A.55娑堥槻璁惧绫诲瀷
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKTools.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKTools.java
index 88e2aa9..aad1de4 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKTools.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKTools.java
@@ -312,6 +312,17 @@
public static String getTodoListPage(Map<String, String> body) throws Exception{
return startDoGetStringArtemis(HKConstants.InterfacePath.getTodoListPage,body);
}
+
+ /**
+ *娑堥槻鐪嬫澘-4娓╂箍搴︽暟鎹�
+ * @param body
+ * @return
+ */
+ public static String temperatureHumidityDataStatistic(String body) {
+ return startDoPostStringArtemisAdmin(HKConstants.InterfacePath.temperatureHumidityDataStatistic,body);
+ }
+
+
/**
* 鑾峰彇闂ㄧ鐐瑰垪琛�
* @param body
@@ -387,6 +398,17 @@
saveInterfaceLog(body,result,path,pathStr[1]);
return result;
}
+
+
+ public static String startDoPostStringArtemisAdmin(String[] pathStr,String body){
+ Map<String, String> path = getPath(pathStr[0]);
+ Map<String, String> header = new HashMap<>();
+ header.put("userId", "admin");
+ String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", header);// post璇锋眰application/json绫诲瀷鍙傛暟
+ saveInterfaceLog(body,result,path,pathStr[1]);
+ return result;
+ }
+
public static String startDoGetStringArtemis(String[] pathStr,Map<String,String> body ){
Map<String, String> path = getPath(pathStr[0]);
Map<String, String> header = new HashMap<>();
@@ -409,15 +431,15 @@
String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", header);// post璇锋眰application/json绫诲瀷鍙傛暟
saveInterfaceLog(body,result,path,pathStr[1]);
return result;
-
}
+
+
public static String startDoPostStringArtemis(String[] pathStr,Map<String, String> querys,Map<String, String> header,String body){
Map<String, String> path = getPath(pathStr[0]);
header.put("tagId", UUID.randomUUID().toString().replace("-", ""));
String result = ArtemisHttpUtil.doPostStringArtemis(path, body, querys, null, "application/json", header);// post璇锋眰application/json绫诲瀷鍙傛暟
saveInterfaceLog(body,result,path,pathStr[1]);
return result;
-
}
/**
* 绛剧璁垮棰勭害
@@ -832,6 +854,7 @@
public static String findAlarmBaseDataStatistic(String body) {
return startDoPostStringArtemis(HKConstants.InterfacePath.findAlarmBaseDataStatistic,body);
}
+
/**
*瀹夐槻鐪嬫澘-- b
* @param body
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/TemperatureHumidityDataRequest.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/TemperatureHumidityDataRequest.java
new file mode 100644
index 0000000..e1f5b68
--- /dev/null
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/TemperatureHumidityDataRequest.java
@@ -0,0 +1,12 @@
+package com.doumee.core.haikang.model.param.request;
+
+import lombok.Data;
+
+@Data
+public class TemperatureHumidityDataRequest {
+
+ private Integer pageSize ;// Query Number false 鍒嗛〉澶у皬锛�1~999锛�
+ private Integer pageNo;// Query Number false 褰撳墠椤电爜(1~100000)
+ private String parentIndexCode;// Query String false e74fcf79bebb492bb750a557bfb12ab9
+
+}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/TemperatureHumidityDataResponse.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/TemperatureHumidityDataResponse.java
new file mode 100644
index 0000000..eb978cb
--- /dev/null
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/TemperatureHumidityDataResponse.java
@@ -0,0 +1,32 @@
+package com.doumee.core.haikang.model.param.respose;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class TemperatureHumidityDataResponse {
+
+ @ApiModelProperty(value = "鍚嶇О")
+ private String name ;//String false 璁惧鍚嶇О
+
+ @ApiModelProperty(value = "鏈�浣庢俯搴�")
+ private String alarmLow ;//String false 鏈�浣庢俯搴�
+
+ @ApiModelProperty(value = "鏈�楂樻俯搴�")
+ private String alarmHigh ;//String false 鏈�楂樻俯搴�
+
+ @ApiModelProperty(value = "褰撳墠鍊�")
+ private String latestValue ;//String false 褰撳墠鍊�
+
+ private String indexCode ;//String false
+
+ @ApiModelProperty(value = "绫诲瀷锛歵emp 娓╁害 humidity 婀垮害")
+ private String sensorType ;//String false
+
+ private String parentIndexCode ;//String false
+
+ @ApiModelProperty(value = "鍗曚綅")
+ private String unit ;//String false 鍗曚綅
+
+
+}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/service/HKService.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/service/HKService.java
index bf42ef0..d610bbf 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/service/HKService.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/service/HKService.java
@@ -940,6 +940,26 @@
}
/**
+ *娑堥槻鐪嬫澘-4娓╂箍搴︾粺璁�
+ * @return
+ */
+ public static BaseResponse<BaseListPageResponse<TemperatureHumidityDataResponse>> temperatureHumidityDataStatistic(TemperatureHumidityDataRequest param){
+ log.info("銆愭捣搴锋秷闃茬湅鏉�-4娓╂箍搴︾粺璁°��================寮�濮�===="+JSONObject.toJSONString(param));
+ try {
+ String res = HKTools.temperatureHumidityDataStatistic(JSONObject.toJSONString(param));
+ TypeReference typeReference =
+ new TypeReference< BaseResponse<BaseListPageResponse<TemperatureHumidityDataResponse> >>(){};
+ BaseResponse<BaseListPageResponse<TemperatureHumidityDataResponse>> result = JSONObject.parseObject(res, typeReference.getType());
+ logResult(result,"娴峰悍娑堥槻鐪嬫澘-4娓╂箍搴︾粺璁�");
+ return result;
+ }catch (Exception e){
+ log.error("銆愭捣搴锋秷闃茬湅鏉�-4娓╂箍搴︾粺璁°��================澶辫触====锛歕n"+ e.getMessage());
+ }
+ return null;
+ }
+
+
+ /**
*鍒嗛〉鏌ヨ娑堥槻璁惧閮ㄤ欢鐘舵��
* @return
*/
@@ -1866,6 +1886,7 @@
}
return null;
}
+
/**
*鏍规嵁鐢ㄦ埛鏍囪瘑鑾峰彇瀹㈡埛绔疶GC鎺ュ彛
* @return
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/wx/wxPlat/WxPlatNotice.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/wx/wxPlat/WxPlatNotice.java
index 55eb17d..e0c6a02 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/core/wx/wxPlat/WxPlatNotice.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/wx/wxPlat/WxPlatNotice.java
@@ -134,6 +134,7 @@
paramMap.put("touser", openId);
paramMap.put("data", dataMap);
String response = HttpsUtil.postJson(postUrL, JSONObject.toJSONString(paramMap));
+ log.warn("路==++--路鎺ㄩ�佸井淇℃ā鏉夸俊鎭烦杞湴鍧�锛歿}路--++==路", jumpUrl);
if(StringUtils.isBlank(response)){
log.warn("路==++--路鎺ㄩ�佸井淇℃ā鏉夸俊鎭細{}路--++==路", "澶辫触");
}else{
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Visits.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Visits.java
index 94f4024..5490709 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Visits.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Visits.java
@@ -261,6 +261,11 @@
@ExcelColumn(name="琚浜哄憳濮撳悕")
@TableField(exist = false)
private String receptMemberName;
+
+ @ApiModelProperty(value = "琚浜哄憳鐢佃瘽", example = "1")
+ @ExcelColumn(name="琚浜哄憳鐢佃瘽")
+ @TableField(exist = false)
+ private String receptMemberMobile;
@ApiModelProperty(value = "琚浜哄憳娴峰悍缂栫爜", example = "1")
@ExcelColumn(name="琚浜哄憳濮撳悕")
@TableField(exist = false)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/VisitDetailVO.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/VisitDetailVO.java
index 1b8b013..5434080 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/VisitDetailVO.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/VisitDetailVO.java
@@ -46,6 +46,9 @@
@ApiModelProperty(value = "鎷滆鏃堕棿")
private String visitTime;
+ @ApiModelProperty(value = "鏄剧ず閫氱煡鐘舵��")
+ private String info;
+
@ApiModelProperty(value = "闅忚浜哄憳淇℃伅")
private List<Visits> withVisitsList;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/platformReport/FightingAdminCenterDataVO.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/platformReport/FightingAdminCenterDataVO.java
index 8d31449..1ff17cb 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/platformReport/FightingAdminCenterDataVO.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/platformReport/FightingAdminCenterDataVO.java
@@ -37,7 +37,7 @@
private Integer dangerDealedNum;
- @ApiModelProperty(value = "鎸夎澶囧垎绫荤粺璁″懙鍛�" , hidden = true)
+ @ApiModelProperty(value = "鎸夎澶囧垎绫荤粺璁�" , hidden = true)
private List<DeviceNumByTypeVO> deviceTypeList;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/platformReport/TemperatureHumidityDataVO.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/platformReport/TemperatureHumidityDataVO.java
new file mode 100644
index 0000000..9a8fd71
--- /dev/null
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/platformReport/TemperatureHumidityDataVO.java
@@ -0,0 +1,26 @@
+package com.doumee.dao.web.response.platformReport;
+
+import com.doumee.core.haikang.model.param.respose.TemperatureHumidityDataResponse;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * 娑堥槻绠℃帶澶у睆
+ *
+ * @Author : Rk
+ * @create 2024/10/25 13:53
+ */
+@Data
+public class TemperatureHumidityDataVO {
+
+ @ApiModelProperty(value = "娓╁害")
+ private TemperatureHumidityDataResponse temperatureData;
+
+
+ @ApiModelProperty(value = "婀垮害")
+ private TemperatureHumidityDataResponse humidityData;
+
+
+}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveServiceImpl.java
index 642c52d..cbdaa5b 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveServiceImpl.java
@@ -92,11 +92,9 @@
@Autowired
private CarDriverMapper carDriverMapper;
- @Autowired
- private VisitsMapper visitsMapper;
@Autowired
- private VisitsJoinMapper visitsJoinMapper;
+ private VisitsJoinMapper visitsMapper;
@Autowired
private CarUseBookJoinMapper carUseBookJoinMapper;
@@ -671,7 +669,7 @@
if(Constants.equalsInteger(noticeType,Constants.noticesObjectType.visit)
|| Constants.equalsInteger(noticeType,Constants.noticesObjectType.visitReporting)){
//璁垮璁板綍涓庤瀹㈡姤澶�
- Visits visits = visitsJoinMapper.selectJoinOne(Visits.class,
+ Visits visits = visitsMapper.selectJoinOne(Visits.class,
new MPJLambdaWrapper<Visits>().selectAll(Visits.class)
.selectAs(Member::getName,Visits::getReceptMemberName)
.selectAs(Company::getName,Visits::getReceptMemberDepartment)
@@ -1732,6 +1730,13 @@
SmsConstants.visitContent.visitAuditFail,
approveDTO.getCheckInfo(),null
);
+ if(Constants.equalsInteger(approveDTO.getStatus(),Constants.TWO)){
+ SmsEmailServiceImpl.sendVisitSms(systemDictDataBiz,
+ emayService,smsEmailMapper,smsConfigMapper,visitsMapper,visits.getId(),
+ SmsConstants.visitContent.visitAuditSuccessToVisiter,
+ approveDTO.getCheckInfo(),null
+ );
+ }
objCode = Constants.equalsInteger(approveDTO.getStatus(),Constants.TWO)? WxPlatConstants.visitContent.visitAuditSuccess:
WxPlatConstants.visitContent.visitAuditFail;
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/SmsEmailServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/SmsEmailServiceImpl.java
index be1458c..9fb8713 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/SmsEmailServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/SmsEmailServiceImpl.java
@@ -14,10 +14,13 @@
import com.doumee.dao.business.*;
import com.doumee.dao.business.dao.SmsConfigMapper;
import com.doumee.dao.business.dao.SmsEmailMapper;
+import com.doumee.dao.business.join.VisitsJoinMapper;
import com.doumee.dao.business.model.*;
import com.doumee.dao.business.model.vo.ValidPhoneCodeVO;
+import com.doumee.dao.system.model.SystemUser;
import com.doumee.service.business.SmsEmailService;
import com.doumee.service.business.third.EmayService;
+import com.github.yulichang.wrapper.MPJLambdaWrapper;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
@@ -296,17 +299,21 @@
* @param auditUser
*/
public static void sendVisitSms(SystemDictDataBiz systemDictDataBiz, EmayService emayService , com.doumee.dao.business.dao.SmsEmailMapper smsEmailMapper , SmsConfigMapper smsConfigMapper,
- VisitsMapper visitsMapper, Integer objId, String objCode, String msg, List<String> auditUser){
+ VisitsJoinMapper visitsMapper, Integer objId, String objCode, String msg, List<String> auditUser){
try{
SmsConfig smsConfig = smsConfigMapper.selectOne(new QueryWrapper<SmsConfig>().lambda().eq(SmsConfig::getCode,
objCode).last(" limit 1 "));
//寮�鍚煭淇￠�氱煡
if(Objects.nonNull(smsConfig) || Constants.equalsInteger(smsConfig.getStatus(),Constants.ZERO)){
String content = systemDictDataBiz.queryByCode(Constants.SMS,Constants.SMS_COMNAME).getCode() + smsConfig.getContent();
- Visits visits = visitsMapper.selectById(objId);
+ Visits visits = visitsMapper.selectJoinOne(Visits.class,new MPJLambdaWrapper<Visits>().selectAll(Visits.class)
+ .selectAs(SystemUser::getMobile,Visits::getReceptMemberMobile)
+ .leftJoin(SystemUser.class,SystemUser::getMemberId, Visits::getReceptMemberId)
+ .eq(Visits::getId,objId).last(" limit 1 "));
if(Objects.nonNull(visits)){
if(objCode.equals(SmsConstants.visitContent.visitAuditSuccess)){
//鎮ㄧ殑銆愯瀹㈢敵璇枫�戝凡缁忓鎵归�氳繃锛岃浜巤棰勭害鍏ュ洯寮�濮嬫椂闂磢鍓嶅線闂ㄥ崼瀹よ瀹㈡満绛惧埌鍏ュ洯锛屽鏈夌枒闂紝璇疯仈绯昏璁夸汉
+ //鎮ㄧ殑[璁垮鐢宠]宸茬粡瀹℃壒閫氳繃锛岃閫氱煡璁垮浜巤棰勭害鍏ュ洯寮�濮嬫椂闂磢鍏ュ洯锛屽鏈夌枒闂紝璇疯仈绯昏璁夸汉銆�
content = content.replace("{棰勭害鍏ュ洯寮�濮嬫椂闂磢",DateUtil.getFomartDate(visits.getStarttime(),"yyyy-MM-dd HH:mm"));
sendBusinessSms(emayService,smsEmailMapper,
Arrays.asList(visits.getPhone().split(",")),SmsConstants.visit,content,visits.getId());
@@ -325,6 +332,10 @@
content = content.replace("{鏈绂绘暟閲弣",msg);
sendBusinessSms(emayService,smsEmailMapper,
Arrays.asList(visits.getPhone().split(",")),SmsConstants.visit,content,visits.getId());
+ }else if(objCode.equals(SmsConstants.visitContent.visitAuditSuccessToVisiter)) {
+ content = content.replace("{棰勭害鍏ュ洯寮�濮嬫椂闂磢",DateUtil.getFomartDate(visits.getStarttime(),"yyyy-MM-dd HH:mm"));
+ sendBusinessSms(emayService,smsEmailMapper,
+ Arrays.asList(visits.getReceptMemberMobile().split(",")),SmsConstants.visit,content,visits.getId());
}else{
//鎮ㄦ湁涓�鏉°�愯溅杈嗗叆鍥敵璇枫�戦渶瑕佸鐞嗭紝璇︾粏淇℃伅璇峰墠寰�寰俊鍏紬鍙锋煡鐪嬨��
sendBusinessSms(emayService,smsEmailMapper,
@@ -350,7 +361,7 @@
* @param auditUser
*/
public static void sendVisitReportSms(SystemDictDataBiz systemDictDataBiz, EmayService emayService , com.doumee.dao.business.dao.SmsEmailMapper smsEmailMapper , SmsConfigMapper smsConfigMapper,
- VisitsMapper visitsMapper, Integer objId, String objCode, String msg, List<String> auditUser){
+ VisitsJoinMapper visitsMapper, Integer objId, String objCode, String msg, List<String> auditUser){
try{
SmsConfig smsConfig = smsConfigMapper.selectOne(new QueryWrapper<SmsConfig>().lambda().eq(SmsConfig::getCode,
objCode).last(" limit 1 "));
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java
index b2be85b..9a097fd 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java
@@ -82,7 +82,7 @@
@Autowired
private RetentionMapper retentionMapper;
@Autowired
- private VisitsMapper visitsMapper;
+ private VisitsJoinMapper visitsMapper;
@Autowired
private ApproveMapper approveMapper;
@Autowired
@@ -1409,6 +1409,18 @@
memberId)
);
// }
+
+ Notices notices = noticesJoinMapper.selectOne(new QueryWrapper<Notices>().lambda().eq(Notices::getObjId,visits.getId())
+ .eq(Notices::getType,Constants.equalsInteger(visits.getType(),Constants.TWO)?Constants.noticesObjectType.visitReporting:Constants.noticesObjectType.visit)
+ .eq(Notices::getUserId,memberId)
+ .eq(Notices::getSendacopy,Constants.ZERO)
+ .last(" limit 1 ")
+ );
+ if(Objects.nonNull(notices)){
+ notices.setInfo(notices.getInfo());
+ }else{
+ notices.setInfo("鏆傛棤");
+ }
return visitDetailVO;
}
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 094a5fd..e261bbd 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
@@ -32,6 +32,7 @@
import com.doumee.service.business.impl.VisitsServiceImpl;
import com.doumee.service.business.third.BoardService;
import com.doumee.service.business.third.WmsService;
+import com.github.xiaoymin.knife4j.core.util.CollectionUtils;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
@@ -358,6 +359,7 @@
public CarWorkSituationVO carWorkSituation(int limit){
CarWorkSituationVO carWorkSituationVO = new CarWorkSituationVO();
List<PlatformLog> platformLogList = platformLogMapper.selectList(new QueryWrapper<PlatformLog>().lambda()
+ .like(PlatformLog::getCreateDate,DateUtil.getCurrDate())
.orderByDesc(PlatformLog::getCreateDate)
.last(" limit "+limit)
);
@@ -1004,6 +1006,14 @@
alarmDataVO.setProcessingNum(Constants.formatIntegerNum(response.getData().getUnHandedAlarmNum()));
alarmDataVO.setStartDate(start);
alarmDataVO.setEndDate(end);
+ }else{
+ alarmDataVO.setTotalNum(Constants.ZERO);
+ alarmDataVO.setRealNum(Constants.ZERO);
+ alarmDataVO.setErrNum(Constants.ZERO);
+ alarmDataVO.setLiftNum(Constants.ZERO);
+ alarmDataVO.setProcessingNum(Constants.ZERO);
+ alarmDataVO.setStartDate(start);
+ alarmDataVO.setEndDate(end);
}
return alarmDataVO;
}
@@ -1076,6 +1086,46 @@
data.setDangerDealedNum(totalNum !=null?totalNum.intValue():0);//浠婃棩澶勭悊闅愭偅鏁伴噺
return data;
}
+
+
+ /**
+ * 娑堥槻 娓╂箍搴︽暟鎹�
+ */
+ @Override
+ public List<TemperatureHumidityDataVO> getTemperatureHumidityData(){
+ TemperatureHumidityDataRequest request = new TemperatureHumidityDataRequest();
+ List<TemperatureHumidityDataVO> temperatureHumidityDataVOList = new ArrayList<>();
+ request.setPageNo(1);
+ request.setPageSize(100);
+ request.setParentIndexCode(systemDictDataBiz.queryByCode(Constants.HK_PARAM,Constants.TEMPERATURE_HUMIDITY).getCode());
+ BaseResponse<BaseListPageResponse<TemperatureHumidityDataResponse>> response = HKService.temperatureHumidityDataStatistic(request);
+ if(response != null && StringUtils.equals(response.getCode(), HKConstants.RESPONSE_SUCCEE) && response.getData()!=null ){
+ List<TemperatureHumidityDataResponse> temperatureHumidityDataResponseList = response.getData().getList();
+
+ if(CollectionUtils.isNotEmpty(temperatureHumidityDataResponseList)){
+ Set<String> parentIndexCode = new HashSet<String>(temperatureHumidityDataResponseList.stream().map(
+ i->i.getIndexCode().replace("@0","").replace("@1","")
+ ).collect(Collectors.toList()));
+ for (String code:parentIndexCode) {
+ List<TemperatureHumidityDataResponse> dateList =
+ temperatureHumidityDataResponseList.stream().filter(i->i.getIndexCode().indexOf(code)>=Constants.ZERO).collect(Collectors.toList());
+ TemperatureHumidityDataVO temperatureHumidityDataVO = new TemperatureHumidityDataVO();
+ for (TemperatureHumidityDataResponse data:dateList) {
+ if(data.getSensorType().equals("temp")){
+ temperatureHumidityDataVO.setTemperatureData(data);
+ }else{
+ temperatureHumidityDataVO.setHumidityData(data);
+ }
+ }
+ temperatureHumidityDataVOList.add(temperatureHumidityDataVO);
+ }
+ }
+ }
+ return temperatureHumidityDataVOList;
+ }
+
+
+
/**
* 鐢ㄧ數鎬昏兘鑰楀悓姣斻�佺幆姣斿拰鍖哄煙鐢ㄧ數閲忛泦鍚�
* @return
@@ -1346,15 +1396,15 @@
VisitDataVO result = new VisitDataVO();
result.setWaitVisitNum(visitsJoinMapper.selectCount(new MPJLambdaWrapper<Visits>()
.eq(Visits::getIsdeleted,Constants.ZERO)
- .apply("to_days(create_date)=to_days(now()")
+ .apply("to_days(create_date)=to_days(now())")
.in(Visits::getStatus,Constants.VisitStatus.pass,Constants.VisitStatus.xfSuccess )));//寰呰闂�
result.setWaitVisitNum(visitsJoinMapper.selectCount(new MPJLambdaWrapper<Visits>()
.eq(Visits::getIsdeleted,Constants.ZERO)
- .apply("to_days(create_date)=to_days(now()")
+ .apply("to_days(create_date)=to_days(now())")
.in(Visits::getStatus,Constants.VisitStatus.signout,Constants.VisitStatus.signin )));//宸茬櫥璁�
result.setWaitVisitNum(visitsJoinMapper.selectCount(new MPJLambdaWrapper<Visits>()
.eq(Visits::getIsdeleted,Constants.ZERO)
- .apply("to_days(create_date)=to_days(now()")
+ .apply("to_days(create_date)=to_days(now())")
.in(Visits::getStatus,Constants.VisitStatus.signout )));//宸茬绂�
/*PageWrap<Visits> pageWrap = new PageWrap<>();
pageWrap.setCapacity(10);
@@ -1502,7 +1552,7 @@
.selectAll( PlatformJob.class)
.select("( select pl.CREATE_DATE from platform_log pl where t.id = pl.obj_id and pl.OBJ_TYPE = "+Constants.PlatformJobLogType.WORKING.getKey()+" order by pl.CREATE_DATE desc limit 1 ) as newStartDate")
//.select(" ( select sum(ifnull(pl.IO_QTY , 0 )) from platform_wms_detail pl where pl.job_id = t.id and pl.isdeleted=0 )",PlatformJob::getWorkNum)
- .select(" ( case when t.total_num is null then ( select sum(pwd.IO_QTY) from platform_wms_detail pwd where pwd.JOB_ID = t.id ) else a.total_num end )",PlatformJob::getWorkNum)
+ .select(" ( case when t.total_num is null then ( select sum(pwd.IO_QTY) from platform_wms_detail pwd where pwd.JOB_ID = t.id ) else t.total_num end )",PlatformJob::getWorkNum)
.apply("to_days(t.create_date) = to_days(now())")
.eq(Platform::getIsdeleted, Constants.ZERO)
.in(PlatformJob ::getStatus,new Integer[]{Constants.PlatformJobStatus.WORKING.getKey(),Constants.PlatformJobStatus.CALLED.getKey() })
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/third/BoardService.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/third/BoardService.java
index 9d9bde7..a071a9f 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/third/BoardService.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/third/BoardService.java
@@ -66,6 +66,8 @@
FightingAdminCenterDataVO centerFightingAdminData();
+ List<TemperatureHumidityDataVO> getTemperatureHumidityData();
+
YearDeviceDataVO yearFightingAdminDeviceData();
List<AlarmEventDataVO> fightingAdminAlertList();
--
Gitblit v1.9.3