From cdbd21ea73eef5d7cf4024654e1f31ab7be1ed81 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期四, 10 十月 2024 09:57:00 +0800
Subject: [PATCH] 代码初始化
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveServiceImpl.java | 17 ++++
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformJobServiceImpl.java | 5 +
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/PlatformWaterGasService.java | 3
server/system_service/src/main/java/com/doumee/core/utils/SmsConstants.java | 81 ++++++++++----------
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/openapi/HkOpenApiController.java | 21 ++++
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformWarnEventServiceImpl.java | 2
server/visits/dmvisit_service/src/main/java/com/doumee/dao/openapi/response/PlatformWarnEventListResponse.java | 2
server/system_service/src/main/java/com/doumee/core/utils/DateUtil.java | 49 ++++++++++--
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/SmsEmailServiceImpl.java | 9 +
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformWaterGasServiceImpl.java | 41 ++++++++--
10 files changed, 167 insertions(+), 63 deletions(-)
diff --git a/server/system_service/src/main/java/com/doumee/core/utils/DateUtil.java b/server/system_service/src/main/java/com/doumee/core/utils/DateUtil.java
index 18b274a..ab48930 100644
--- a/server/system_service/src/main/java/com/doumee/core/utils/DateUtil.java
+++ b/server/system_service/src/main/java/com/doumee/core/utils/DateUtil.java
@@ -317,6 +317,35 @@
}
}
+
+ /**
+ * 鑾峰彇X鏈堜唤涔嬪墠鐨勬湀浠芥暟
+ * @param currentDate
+ * @param month
+ * @return
+ */
+ public static List<String> getBeforMonth(Date currentDate , Integer month) {
+ SimpleDateFormat sdfYear = new SimpleDateFormat("yyyy");
+ SimpleDateFormat sdfMonth = new SimpleDateFormat("MM");
+ int currentYear = Integer.parseInt(sdfYear.format(currentDate));
+ int currentMonth = Integer.parseInt(sdfMonth.format(currentDate));
+ List<String> list = new ArrayList<>();
+
+ System.out.println("杩�12涓湀浠斤細");
+ for (int i = 0; i < month; i++) {
+ int tempYear = currentYear;
+ int tempMonth = currentMonth - i;
+
+ if (tempMonth <= 0) {
+ tempYear--;
+ tempMonth += 12;
+ }
+ list.add(tempYear +"-" + StringUtils.leftPad(Integer.toString(tempMonth),2,"0"));
+ }
+ return list;
+ }
+
+
/**
* Descrption:鍙栧緱褰撳墠鏃ユ湡鏃堕棿,鏍煎紡涓�:YYYYMMDDHHMISS
*
@@ -2775,16 +2804,18 @@
// System.out.println(DateUtil.afterMinutesDate(-5));
- Date startTime = DateUtil.StringToDate("2024-05-01 08:00:00" ,"yyyy-MM-dd HH:mm:ss");
- Date endTime = DateUtil.StringToDate("2024-05-01 17:00:00" ,"yyyy-MM-dd HH:mm:ss");
- Long intervalTime = 35L;
+ DateUtil.getBeforMonth(new Date(),12);
-
- DateUtil.checkDateInterval( startTime.toInstant()
- .atZone(ZoneId.systemDefault())
- .toLocalDateTime(), endTime.toInstant()
- .atZone(ZoneId.systemDefault())
- .toLocalDateTime(),intervalTime);
+// Date startTime = DateUtil.StringToDate("2024-05-01 08:00:00" ,"yyyy-MM-dd HH:mm:ss");
+// Date endTime = DateUtil.StringToDate("2024-05-01 17:00:00" ,"yyyy-MM-dd HH:mm:ss");
+// Long intervalTime = 35L;
+//
+//
+// DateUtil.checkDateInterval( startTime.toInstant()
+// .atZone(ZoneId.systemDefault())
+// .toLocalDateTime(), endTime.toInstant()
+// .atZone(ZoneId.systemDefault())
+// .toLocalDateTime(),intervalTime);
} catch (Exception ex) {
ex.printStackTrace();
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 4a0b2ab..e1af26d 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
@@ -19,31 +19,32 @@
public class SmsConstants {
- public interface SmsObjectType{
- String inventCode = "0"; //楠岃瘉鐮�
- String visit= "1"; //璁垮鐢宠
- String visitReport = "2"; //璁垮鎶ュ
- String hiddenDanger ="3";//闅愭偅闅忔墜鎷�
- String carUse ="4";//鐢ㄨ溅鐢宠
- String meeting ="5";//浼氳棰勭害
- String platformBook ="6";//鐗╂祦杞﹂绾�
- String platformJob ="7";//鏈堝彴浣滀笟
- }
+
+
+ public static final String inventCode ="inventCode" ;
+ public static final String visit ="visit" ;
+ public static final String visitReport ="visitReport" ;
+ public static final String hiddenDanger ="hiddenDanger" ;
+ public static final String carUse ="carUse" ;
+ public static final String meeting ="meeting" ;
+ public static final String platformBook ="platformBook" ;
+ public static final String platformJob ="platformJob" ;
+
/**
* 璁垮鐢宠
*/
public interface visitContent{
//璁垮鐢宠-閫氱煡锛堢粰瀹℃壒浜猴級
- String visitNotice = "鎮ㄦ湁涓�鏉°�恵璁垮鐢宠}銆戦渶瑕佸鐞嗭紝璇︾粏淇℃伅璇峰墠寰�寰俊鍏紬鍙锋煡鐪嬨��";
+ String visitNotice = "visitNotice";
//璁垮鐢宠-瀹℃壒閫氳繃閫氱煡锛堢粰鐢宠浜猴級锛氥��
- String visitAuditSuccess = "鎮ㄧ殑銆恵璁垮鐢宠}銆戝凡缁忓鎵归�氳繃锛岃浜巤棰勭害鍏ュ洯寮�濮嬫椂闂磢鍓嶅線闂ㄥ崼瀹よ瀹㈡満绛惧埌鍏ュ洯锛屽鏈夌枒闂紝璇疯仈绯昏璁夸汉";
+ String visitAuditSuccess = "visitAuditSuccess";
//璁垮鐢宠-瀹℃壒椹冲洖閫氱煡锛堢粰鐢宠浜猴級锛氥��
- String visitAuditFail = "鎮ㄧ殑銆恵璁垮鐢宠}銆戝凡琚┏鍥烇紝椹冲洖鍘熷洜涓猴細{椹冲洖鍘熷洜}銆傚鏈夌枒闂紝璇疯仈绯昏璁夸汉銆�";
+ String visitAuditFail = "visitAuditFail";
//璁垮鐢宠-瓒呮椂鏈绂�-閫氱煡锛堢粰鐢宠浜猴級锛�
- String visitTimeOutSignOut = "鎮ㄧ殑銆愯瀹㈢敵璇枫�戝凡浜巤鍒版湡鏃堕棿}鍒版湡锛岃鍙婃椂绂诲満骞跺墠寰�闂ㄥ崼瀹よ瀹㈡満绛剧锛屽鏈夌枒闂紝璇疯仈绯昏璁夸汉";
+ String visitTimeOutSignOut = "visitTimeOutSignOut";
//璁垮鐢宠-瓒呮椂鏈绂�-閫氱煡锛堢粰鎸囧畾鎺ユ敹浜猴級
- String visitTimeOutSignOutNum = "浠婃棩杩樻湁{鏈绂绘暟閲弣涓瀹㈡湭绛剧锛岃鍓嶅線PC绔煡鐪嬭缁嗕俊鎭��";
+ String visitTimeOutSignOutNum = "visitTimeOutSignOutNum";
}
@@ -53,15 +54,15 @@
*/
public interface visitReportingContent{
//璁垮鎶ュ-閫氱煡锛堢粰瀹℃壒浜猴級
- String visitReportingNotice = "鎮ㄦ湁涓�鏉°�恵璁垮鎶ュ}銆戦渶瑕佸鐞嗭紝璇︾粏淇℃伅璇峰墠寰�寰俊鍏紬鍙锋煡鐪嬨��";
+ String visitReportingNotice = "visitReportingNotice";
//璁垮鎶ュ-瀹℃壒閫氳繃閫氱煡锛堢粰鐢宠浜猴級锛氥��
- String visitReportingAuditSuccess = "鎮ㄧ殑銆恵璁垮鎶ュ}銆戝凡缁忓鎵归�氳繃锛岃閫氱煡璁垮浜巤棰勭害鍏ュ洯寮�濮嬫椂闂磢鍚庝箻鍧恵杞︾墝鍙穧鍏ュ洯锛屽鏈夌枒闂紝璇疯仈绯昏璁夸汉銆�";
+ String visitReportingAuditSuccess = "visitReportingAuditSuccess";
//璁垮鎶ュ-瀹℃壒椹冲洖閫氱煡锛堢粰鐢宠浜猴級锛氥��
- String visitReportingAuditFail = "鎮ㄧ殑銆恵璁垮鎶ュ}銆戝凡琚┏鍥烇紝椹冲洖鍘熷洜涓猴細{椹冲洖鍘熷洜}銆傚鏈夌枒闂紝璇疯仈绯诲鎵逛汉銆�";
+ String visitReportingAuditFail = "visitReportingAuditFail";
//璁垮鎶ュ-瓒呮椂鏈鍦�-閫氱煡锛堢粰鐢宠浜猴級锛�
- String visitReportingTimeOutSignOut = "鎮ㄧ殑銆愯瀹㈡姤澶囥�戝凡浜巤棰勭害鍏ュ洯缁撴潫鏃堕棿}鍒版湡锛岃鍙婃椂绂诲満锛屽鏈夌枒闂紝璇疯仈绯昏璁夸汉";
+ String visitReportingTimeOutSignOut = "visitReportingTimeOutSignOut";
//璁垮鎶ュ-瓒呮椂鏈鍦�-閫氱煡锛堢粰鎸囧畾鎺ユ敹浜猴級
- String visitReporting_time_out_sign_out_num = "浠婃棩杩樻湁{鏈绂绘暟閲弣涓瀹㈡姤澶囪溅杈嗘湭绂诲満锛岃鍓嶅線PC绔煡鐪嬭缁嗕俊鎭��";
+ String visitReportingTimeOutSignOutNum = "visitReportingTimeOutSignOutNum";
}
@@ -70,9 +71,9 @@
*/
public interface hiddenDangerContent{
//闅愭偅闅忔墜鎷�-閫氱煡锛堢粰澶勭悊浜猴級
- String hiddenDanger_deal_user = "鎮ㄦ湁涓�鏉°�恵闅愭偅闅忔墜鎷�-娑堥槻闅愭偅}銆戦渶瑕佸鐞嗭紝璇︾粏淇℃伅璇峰墠寰�寰俊鍏紬鍙锋煡鐪�";
+ String hiddenDangerDealUser = "hiddenDangerDealUser";
//闅愭偅闅忔墜鎷�-澶勭悊瀹屾垚锛堢粰鐢宠浜猴級锛氥��
- String hiddenDanger_deal_over = "鎮ㄦ彁浜ょ殑銆恵闅愭偅闅忔墜鎷�-娑堥槻闅愭偅}銆戝凡缁忓鐞嗗畬姣曪紝璇︾粏淇℃伅璇峰墠寰�寰俊鍏紬鍙锋煡鐪嬨��";
+ String hiddenDangerDealOver = "hiddenDangerDealOver";
}
@@ -81,13 +82,13 @@
*/
public interface carUseBookContent{
//鐭俊閫氱煡妯℃澘锛堢粰澶勭悊浜猴級
- String carUseBook_wait_audit = "鎮ㄦ湁涓�鏉°�恵鐢ㄨ溅鐢宠}銆戦渶瑕佸鐞嗭紝璇︾粏淇℃伅璇峰墠寰�寰俊鍏紬鍙锋煡鐪嬨��";
+ String carUseBookWaitAudit = "carUseBookWaitAudit";
//鐢ㄨ溅鐢宠-瀹℃壒閫氳繃閫氱煡锛堢粰鐢宠浜猴級锛氥��
- String carUseBook_audit_success = "鎮ㄧ殑銆恵鐢ㄨ溅鐢宠}銆戝凡缁忓鎵归�氳繃锛屽嚭鍙戞椂闂翠负{鎻愪氦鐨勫嚭鍙戞椂闂磢锛岃鎸夋椂鐢ㄨ溅銆傚鐢ㄨ溅璁″垝鏈夊彉锛岃鍙婃椂鑱旂郴娲捐溅鍛樸��";
+ String carUseBookAuditSuccess = "carUseBookAuditSuccess";
//鐢ㄨ溅鐢宠-瀹℃壒椹冲洖閫氱煡锛堢粰鐢宠浜猴級锛氥��
- String carUseBook_audit_fail = "鎮ㄧ殑銆恵鐢ㄨ溅鐢宠}銆戝凡琚┏鍥烇紝椹冲洖鍘熷洜涓猴細{椹冲洖鍘熷洜}銆傚鏈夌枒闂紝璇疯仈绯绘淳杞﹀憳銆�";
+ String carUseBookAuditFail = "carUseBookAuditFail";
//鐢ㄨ溅鐢宠-瀹℃壒椹冲洖閫氱煡锛堢粰鐢宠浜猴級锛氥��
- String carUseBook_cancel = "鎮ㄧ殑銆恵鐢ㄨ溅鐢宠}銆戝凡琚彇娑堬紝鍙栨秷鍘熷洜涓猴細{鍙栨秷鍘熷洜}銆傚鏈夌枒闂紝璇疯仈绯绘淳杞﹀憳銆�";
+ String carUseBookCancel = "carUseBookCancel";
}
@@ -96,13 +97,13 @@
*/
public interface platformBookContent{
//鐭俊閫氱煡妯℃澘锛堢粰澶勭悊浜猴級
- String platformBook_wait_audit = "鎮ㄦ湁涓�鏉°�愯溅杈嗗叆鍥敵璇枫�戦渶瑕佸鐞嗭紝璇︾粏淇℃伅璇峰墠寰�寰俊鍏紬鍙锋煡鐪嬨��";
+ String platformBookWaitAudit = "platformBookContent";
//鐗╂祦杞﹂绾�-瀹℃壒閫氳繃閫氱煡锛堢粰鐢宠浜猴級锛氥��
- String platformBook_audit_success = "鎮ㄧ殑銆愯溅杈嗗叆鍥敵璇枫�戝凡缁忓鎵归�氳繃锛屽叆鍥椂闂翠负2024-7-19 09:00锛岃鎻愬墠30鍒嗛挓鍓嶅線鐜板満绛惧埌銆傚璁″垝鏈夊彉锛岃鍙婃椂鑱旂郴瀹℃牳浜哄憳銆�";
+ String platformBookAuditSuccess = "platformBookAuditSuccess";
//鐗╂祦杞﹂绾�-瀹℃壒椹冲洖鐭俊閫氱煡妯℃澘锛堢粰鐢宠浜猴級
- String platformBook_audit_fail = "鎮ㄧ殑銆愯溅杈嗗叆鍥敵璇枫�戝凡琚┏鍥烇紝椹冲洖鍘熷洜涓猴細{椹冲洖鍘熷洜}銆傚鏈夌枒闂紝璇疯仈绯诲鏍镐汉鍛樸��";
+ String platformBookAuditFail = "platformBookAuditFail";
//鐗╂祦杞﹂绾�-鍏ュ洯棰勭害鍙栨秷鐭俊閫氱煡妯℃澘锛堢粰鐢宠浜猴級
- String carUseBook_cancel = "鎮ㄧ殑銆愯溅杈嗗叆鍥敵璇枫�戝凡琚彇娑堬紝鍙栨秷鍘熷洜涓猴細{鍙栨秷鍘熷洜}銆傚鏈夌枒闂紝璇疯仈绯诲鏍镐汉鍛樸��";
+ String carUseBookCancel = "carUseBookCancel";
}
@@ -111,25 +112,25 @@
*/
public interface platformJobContent{
// 杩愯緭浠诲姟涓嬭揪 锛堢粰鍙告満锛�
- String platformJob_new_job = "銆愯溅鐗屽彿銆戣溅涓绘偍濂斤紝鎮ㄦ湁涓�涓柊鐨勮繍杈撲换鍔★紝璇︾粏淇℃伅璇峰墠寰�寰俊鍏紬鍙锋煡鐪嬨��";
+ String platformJobNewJob = "platformJobNewJob";
//鐗╂祦杞︿綔涓�-杩愯緭浠诲姟涓鎻愰啋锛堢粰鍙告満锛夛細銆�
- String platformJob_stop_job = "銆愯溅鐗屽彿銆戣溅涓绘偍濂斤紝鎮ㄧ殑杩愯緭浠诲姟宸茶鍙栨秷锛岃缁嗕俊鎭鍓嶅線寰俊鍏紬鍙锋煡鐪嬨��";
+ String platformJobStopJob = "platformJobStopJob";
//鐗╂祦杞﹂绾�-鍙彿鍏ュ洯绛夊緟锛堢粰鍙告満锛�
- String platformBook_call_in = "銆愯溅鐗屽彿銆戣溅涓绘偍濂斤紝璇峰湪10鍒嗛挓鍐咃紝鍓嶅線鍥尯绛夊緟鍖虹瓑寰呭彨鍙蜂綔涓氥��";
+ String platformBookCallIn = "platformBookCallIn";
//鐗╂祦杞﹂绾�-鏈堝彴鍙彿锛堢粰鍙告満锛�
- String platformBook_sing_in = "銆愯溅鐗屽彿銆戣溅涓绘偍濂斤紝璇峰湪10鍒嗛挓鍐咃紝鍓嶅線{鏈堝彴鍚嶇О}杩涜浣滀笟銆�";
+ String platformBookSingIn = "platformBookSingIn";
//鐗╂祦杞﹂绾�-鏈堝彴鍙彿杩囧彿锛堢粰鍙告満锛�
- String platformBook_over_num = "銆愯溅鐗屽彿銆戣溅涓绘偍濂斤紝鎮ㄧ殑浠诲姟宸茶繃鍙凤紝璇烽噸鏂扮鍒版帓闃熺瓑寰呫��";
+ String platformBookOverNum = "platformBookOverNum";
//鐗╂祦杞﹂绾�-浣滀笟寮�濮嬶紙缁欏徃鏈猴級
- String platformBook_working = "銆愯溅鐗屽彿銆戣溅涓绘偍濂斤紝鎮ㄧ殑杞﹁締宸插湪{鏈堝彴鍚嶇О}寮�濮嬩綔涓氾紝璇烽殢鏃跺叧娉ㄤ綔涓氭儏鍐点��";
+ String platformBookWorking = "platformBookWorking";
//鐗╂祦杞﹂绾�-浣滀笟瀹屾垚锛堢粰鍙告満锛�
- String platformBook_finish = "銆愯溅鐗屽彿銆戣溅涓绘偍濂斤紝鎮ㄧ殑杞﹁締宸插湪{鏈堝彴鍚嶇О}瀹屾垚浣滀笟锛岃鍙婃椂椹剁鏈堝彴銆�";
+ String platformBookFinish = "platformBookFinish";
//鐗╂祦杞﹂绾�-浣滀笟寮傚父鎸傝捣锛堢粰鍙告満锛�
- String platformBook_error = "銆愯溅鐗屽彿銆戣溅涓绘偍濂斤紝鎮ㄥ湪{鏈堝彴鍚嶇О}鐨勪綔涓氫换鍔″凡缁忚寮傚父鎸傝捣锛岃鍙婃椂鍏虫敞鍏蜂綋鎯呭喌";
+ String platformBookError = "platformBookError";
//鐗╂祦杞﹂绾�-鏈堝彴杞Щ锛堢粰鍙告満锛�
- String platformBook_move = "銆愯溅鐗屽彿銆戣溅涓绘偍濂斤紝鎮ㄥ湪{鏈堝彴鍚嶇О}鐨勪綔涓氫换鍔″凡缁忓凡琚浆绉昏嚦{杞Щ鍚庢湀鍙板悕绉皚锛岃鍙婃椂鍏虫敞鍙彿鎯呭喌銆�";
+ String platformBookMove = "platformBookMove";
//鐗╂祦杞﹂绾�-鏈堝彴鍋滈潬瓒呮椂锛堢粰鍙告満锛�
- String platformBook_time_out = "銆愯溅鐗屽彿銆戣溅涓绘偍濂斤紝鎮ㄥ湪{鏈堝彴鍚嶇О}宸插仠闈犺秴鏃讹紝璇峰敖蹇┒绂讳互鍏嶅奖鍝嶅悗缁綔涓氥��";
+ String platformBookTimeOut = "platformBookTimeOut";
}
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/openapi/HkOpenApiController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/openapi/HkOpenApiController.java
index f1f9590..b9135cf 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/openapi/HkOpenApiController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/openapi/HkOpenApiController.java
@@ -123,10 +123,27 @@
@LoginNoRequired
@PreventRepeat
+ @ApiOperation("銆愮敤姘撮噺銆戣繎12涓湀鐢ㄦ按閲忎俊鎭垪琛�")
+ @PostMapping("/water/lastMonthsDataList")
+ public ApiResponse<List<PlatformLastMonthListResponse>> lastMonthsWaterList() {
+ return ApiResponse.success(platformWaterGasService.getPlatformLastMonthListResponse(Constants.ZERO));
+ }
+
+ @LoginNoRequired
+ @PreventRepeat
@ApiOperation("銆愮敤姘旈噺銆戞湰鏈堛�佷笂鏈堝拰鍘诲勾鍚屾湀")
@PostMapping("/gas/dataByMonth")
public ApiResponse<GasByMonthResponse> gasDataByMonth(@RequestBody GasByMonthRequest param) {
return ApiResponse.success(platformWaterGasService.gasDataByMonth(param));
+ }
+
+
+ @LoginNoRequired
+ @PreventRepeat
+ @ApiOperation("銆愮敤姘旈噺銆戣繎12涓湀鐢ㄦ皵閲忎俊鎭垪琛�")
+ @PostMapping("/gas/lastMonthsDataList")
+ public ApiResponse<List<PlatformLastMonthListResponse>> lastMonthsGasList () {
+ return ApiResponse.success(platformWaterGasService.getPlatformLastMonthListResponse(Constants.ONE));
}
@LoginNoRequired
@@ -151,7 +168,7 @@
@PreventRepeat
@ApiOperation("銆愭湀鍙般�戞湀鍙板綋鍓嶄綔涓氫俊鎭垪琛�")
@PostMapping("/platform/workingDataList")
- public ApiResponse<List<PlatformDataListResponse>> platformWorkingDataList(@RequestBody PlatformDataListRequest param) {
+ public ApiResponse<List<PlatformDataListResponse>> workingDataList(@RequestBody PlatformDataListRequest param) {
return ApiResponse.success(platformJobService.platformWorkingDataList(param));
}
@@ -159,7 +176,7 @@
@PreventRepeat
@ApiOperation("銆愭湀鍙般�戞湀鍙颁綔涓氳鎯呬俊鎭�")
@PostMapping("/platform/workDataInfo")
- public ApiResponse<PlatformDataInfoResponse> platformWorkingDataList(@RequestBody PlatformDataInfoRequest param) {
+ public ApiResponse<PlatformDataInfoResponse> workDataInfo(@RequestBody PlatformDataInfoRequest param) {
return ApiResponse.success(platformJobService.platformWorkingDataList(param));
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/openapi/response/PlatformWarnEventListResponse.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/openapi/response/PlatformWarnEventListResponse.java
index 035da66..e86a4e8 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/openapi/response/PlatformWarnEventListResponse.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/openapi/response/PlatformWarnEventListResponse.java
@@ -19,6 +19,8 @@
private String title;
@ApiModelProperty(value = "鏃堕棿")
private Date createDate;
+ @ApiModelProperty(value = "杞︾墝鍙�")
+ private String carCode;
@ApiModelProperty(value = "浜嬩欢鍐呭璇存槑")
private String content;
@ApiModelProperty(value = "鏈堝彴鍚嶇О")
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/PlatformWaterGasService.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/PlatformWaterGasService.java
index 100767b..2aa2929 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/PlatformWaterGasService.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/PlatformWaterGasService.java
@@ -8,6 +8,7 @@
import com.doumee.dao.openapi.request.GasByMonthRequest;
import com.doumee.dao.openapi.request.WaterByMonthRequest;
import com.doumee.dao.openapi.response.GasByMonthResponse;
+import com.doumee.dao.openapi.response.PlatformLastMonthListResponse;
import com.doumee.dao.openapi.response.WaterByMonthResponse;
import java.util.List;
@@ -107,4 +108,6 @@
WaterByMonthResponse waterDataByMonth(WaterByMonthRequest param);
GasByMonthResponse gasDataByMonth(GasByMonthRequest param);
+
+ List<PlatformLastMonthListResponse> getPlatformLastMonthListResponse(Integer type);
}
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 9f7d3e3..a5e7686 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
@@ -98,6 +98,8 @@
private PlatformLogMapper platformLogMapper;
@Autowired
private PlatformReasonMapper platformReasonMapper;
+ @Autowired
+ private PlatformGroupMapper platformGroupMapper;
@Autowired
@@ -1513,12 +1515,25 @@
platformBooks.setEditDate(new Date());
platformBooks.setEditor(approveDTO.getLoginUserInfo().getMemberId());
PlatformReason platformReason = platformReasonMapper.selectById(platformBooks.getReasonId());
+ if(Objects.isNull(platformReason)){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏈煡璇㈠埌鍏ュ洯鍘熷洜鏁版嵁");
+ }
+ PlatformGroup platformGroup = platformGroupMapper.selectById(platformReason.getGroupId());
+ if(Objects.isNull(platformGroup)){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏈煡璇㈠埌鍏ュ洯鍘熷洜閰嶇疆鏈堝彴缁勬暟鎹�");
+ }
//鐢熸垚浠诲姟璁板綍
PlatformJob platformJob = platformBooks.toPlatformJob();
platformJob.setId(null);
platformJob.setPlatformGroupId(platformReason.getGroupId().intValue());
- platformJob.setType(Constants.platformJobType.sgscxh);
+ if(Constants.equalsInteger(platformGroup.getType(),Constants.ZERO)){
+ platformJob.setType(Constants.platformJobType.wxcxh);
+ }else if(Constants.equalsInteger(platformGroup.getType(),Constants.ONE)){
+ platformJob.setType(Constants.platformJobType.wxczh);
+ }else{
+ platformJob.setType(Constants.platformJobType.sgscxh);
+ }
platformJob.setStatus(Constants.PlatformJobStatus.WART_SIGN_IN.getKey());
platformJobMapper.insert(platformJob);
platformBooks.setJobId(platformJob.getId());
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformJobServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformJobServiceImpl.java
index 6b1dbb8..9b704bc 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformJobServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformJobServiceImpl.java
@@ -1570,9 +1570,12 @@
);
platformDataListResponse.setWorkStatus(Constants.ONE);
//鏌ヨ浣滀笟鏃堕暱
+// Long workTime = this.getWorkTime(platformJob);
+ Long min = (System.currentTimeMillis() - platformJob.getNewStartDate().getTime())/1000/60;
platformDataListResponse.setWorkTime(
- this.getWorkTime(platformJob)
+ min
);
+
//璁＄畻宸蹭綔涓氭椂闀� 鏍规嵁鏈堝彴宸ヤ綔鏁堢巼 璁＄畻浠诲姟閲忛渶瑕佹椂闂�
if (Objects.isNull(platformJob.getWorkNum()) || Objects.isNull(platformJob.getWorkRate())) {
platformDataListResponse.setFinishTime(null);
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformWarnEventServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformWarnEventServiceImpl.java
index c098f52..51c4937 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformWarnEventServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformWarnEventServiceImpl.java
@@ -120,6 +120,7 @@
platformWarnEventListResponse.setContent(event.getEventContent());
platformWarnEventListResponse.setTitle(event.getTitle());
platformWarnEventListResponse.setPlatfromHkId(event.getPlatfromHkId());
+ platformWarnEventListResponse.setCarCode(event.getCarCode());
list.add(platformWarnEventListResponse);
}
}
@@ -201,6 +202,7 @@
platformWarnEvent.setCreateDate(new Date());
platformWarnEvent.setIsdeleted(Constants.ZERO);
platformWarnEvent.setPlatformId(savePlatformWarnEventDTO.getPlatformId());
+ platformWarnEvent.setCarCode(savePlatformWarnEventDTO.getCarCode());
Constants.PlatformWarnEvent cPl = Constants.PlatformWarnEvent.STOP_TIMEOUT;
if(Constants.equalsInteger(savePlatformWarnEventDTO.getEventType(),Constants.ZERO)){
if(Objects.isNull(savePlatformWarnEventDTO.getPlatformJobId())){
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformWaterGasServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformWaterGasServiceImpl.java
index a3e2a31..55c4e3a 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformWaterGasServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformWaterGasServiceImpl.java
@@ -15,6 +15,7 @@
import com.doumee.dao.openapi.request.GasByMonthRequest;
import com.doumee.dao.openapi.request.WaterByMonthRequest;
import com.doumee.dao.openapi.response.GasByMonthResponse;
+import com.doumee.dao.openapi.response.PlatformLastMonthListResponse;
import com.doumee.dao.openapi.response.WaterByMonthResponse;
import com.doumee.service.business.PlatformWaterGasService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -29,10 +30,7 @@
import org.springframework.web.bind.annotation.RequestBody;
import java.math.BigDecimal;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.List;
-import java.util.Objects;
+import java.util.*;
/**
* 鏈堝彴_鐢ㄦ按鐢ㄦ皵淇℃伅璁板綍琛⊿ervice瀹炵幇
@@ -244,7 +242,7 @@
list = platformWaterGasMapper.selectList(new QueryWrapper<PlatformWaterGas>().lambda()
.eq(PlatformWaterGas::getIsdeleted,Constants.ZERO)
.eq(PlatformWaterGas::getType,Constants.ZERO)
- .like(PlatformWaterGas::getTimeInfo,beforMonth)
+ .like(PlatformWaterGas::getTimeInfo,DateUtil.getDate(beforMonth,"yyyy-MM"))
);
if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(list)){
waterByMonthResponse.setLastMonth(list.stream().map(m->m.getNum()).reduce(BigDecimal.ZERO,BigDecimal::add));
@@ -253,7 +251,7 @@
list = platformWaterGasMapper.selectList(new QueryWrapper<PlatformWaterGas>().lambda()
.eq(PlatformWaterGas::getIsdeleted,Constants.ZERO)
.eq(PlatformWaterGas::getType,Constants.ZERO)
- .like(PlatformWaterGas::getTimeInfo,beforYearMonth)
+ .like(PlatformWaterGas::getTimeInfo,DateUtil.getDate(beforYearMonth,"yyyy-MM"))
);
if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(list)){
waterByMonthResponse.setLastYearMonth(list.stream().map(m->m.getNum()).reduce(BigDecimal.ZERO,BigDecimal::add));
@@ -287,7 +285,7 @@
list = platformWaterGasMapper.selectList(new QueryWrapper<PlatformWaterGas>().lambda()
.eq(PlatformWaterGas::getIsdeleted,Constants.ZERO)
.eq(PlatformWaterGas::getType,Constants.ONE)
- .like(PlatformWaterGas::getTimeInfo,beforMonth)
+ .like(PlatformWaterGas::getTimeInfo,DateUtil.getDate(beforMonth,"yyyy-MM"))
);
if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(list)){
response.setLastMonth(list.stream().map(m->m.getNum()).reduce(BigDecimal.ZERO,BigDecimal::add));
@@ -296,7 +294,7 @@
list = platformWaterGasMapper.selectList(new QueryWrapper<PlatformWaterGas>().lambda()
.eq(PlatformWaterGas::getIsdeleted,Constants.ZERO)
.eq(PlatformWaterGas::getType,Constants.ONE)
- .like(PlatformWaterGas::getTimeInfo,beforYearMonth)
+ .like(PlatformWaterGas::getTimeInfo,DateUtil.getDate(beforYearMonth,"yyyy-MM"))
);
if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(list)){
response.setLastYearMonth(list.stream().map(m->m.getNum()).reduce(BigDecimal.ZERO,BigDecimal::add));
@@ -304,4 +302,31 @@
return response;
}
+
+ /**
+ *
+ * @param type 0鐢ㄦ按 1鐢ㄦ皵
+ * @return
+ */
+ @Override
+ public List<PlatformLastMonthListResponse> getPlatformLastMonthListResponse(Integer type){
+ List<PlatformLastMonthListResponse> lastMonthListResponses = new ArrayList<>();
+
+ List<PlatformWaterGas> platformWaterGasList = platformWaterGasMapper.selectList(new QueryWrapper<PlatformWaterGas>().lambda()
+ .eq(PlatformWaterGas::getIsdeleted,Constants.ZERO)
+ .eq(PlatformWaterGas::getType,type)
+ );
+ List<String> monthList = DateUtil.getBeforMonth(new Date(),12);
+ for (String str:monthList) {
+ PlatformLastMonthListResponse platformLastMonthListResponse = new PlatformLastMonthListResponse();
+ platformLastMonthListResponse.setNum(platformWaterGasList.stream().filter(i->DateUtil.dateToString(i.getTimeInfo(),"yyyy-MM").equals(str)).map(i->i.getNum()).reduce(BigDecimal.ZERO,BigDecimal::add));
+ platformLastMonthListResponse.setTimeInfo(str);
+ lastMonthListResponses.add(platformLastMonthListResponse);
+ }
+ return lastMonthListResponses;
+ }
+
+
+
+
}
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 66cc56e..f87b04b 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
@@ -251,9 +251,14 @@
}
- public static void sendBusiness(EmayService emayService ,SmsEmailMapper smsEmailMapper ,List<String> phoneList,String objType,String content,Integer objId){
- //TODO 鏄惁鍙戦�佺煭淇�
+
+
+
+
+
+
+ public static void sendBusiness(EmayService emayService ,SmsEmailMapper smsEmailMapper ,List<String> phoneList,String objType,String content,Integer objId){
for (String phone:phoneList) {
boolean result= emayService.sendSingleSms(phone,content);
if(!result){
--
Gitblit v1.9.3