From 6c5165f73c90fbd4e22e4f9a39497b5a25ee37f9 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 26 十二月 2024 09:53:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/BookingsServiceImpl.java | 16 ++
server/system_service/src/main/java/com/doumee/core/utils/Constants.java | 3
server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/platformReport/MonitorParentDataVO.java | 24 ++++
server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/platformReport/AlarmDataVO.java | 3
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/SmsEmailServiceImpl.java | 37 ++++-
server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/TemperatureHumidityDataResponse.java | 2
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformJobServiceImpl.java | 13 ++
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/PlatformJobRunActController.java | 4
server/system_service/src/main/java/com/doumee/dao/business/model/SmsEmail.java | 4
server/system_service/src/main/java/com/doumee/service/system/SystemLoginService.java | 2
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformBooksServiceImpl.java | 10 +
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java | 14 +
server/meeting/meeting_service/src/main/java/com/doumee/core/wx/WxPlatNotice.java | 110 ++++++++++++++++++
server/system_service/src/main/java/com/doumee/service/system/impl/SystemLoginServiceImpl.java | 50 ++++++++
server/system_gateway/src/main/java/com/doumee/api/gateway/JwtAuthController.java | 22 +++
server/system_service/src/main/resources/mappers/SystemUserMapper.xml | 3
server/visits/dmvisit_service/src/main/java/com/doumee/core/wx/wxPlat/WxPlatNotice.java | 19 +++
17 files changed, 314 insertions(+), 22 deletions(-)
diff --git a/server/meeting/meeting_service/src/main/java/com/doumee/core/wx/WxPlatNotice.java b/server/meeting/meeting_service/src/main/java/com/doumee/core/wx/WxPlatNotice.java
index 1fdb5d8..85565d8 100644
--- a/server/meeting/meeting_service/src/main/java/com/doumee/core/wx/WxPlatNotice.java
+++ b/server/meeting/meeting_service/src/main/java/com/doumee/core/wx/WxPlatNotice.java
@@ -6,12 +6,15 @@
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.DateUtil;
import com.doumee.core.utils.HttpsUtil;
+import com.doumee.dao.business.dao.SmsEmailMapper;
import com.doumee.dao.business.model.Bookings;
+import com.doumee.dao.business.model.SmsEmail;
import com.github.xiaoymin.knife4j.core.util.CollectionUtils;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Component;
+import java.awt.print.Book;
import java.util.*;
/**
@@ -116,6 +119,113 @@
}
}
+ public void createBeginWxNotice(SystemDictDataBiz systemDictDataBiz, SmsEmailMapper smsEmailMapper, Bookings bookings, String openId){
+ Map<String,Object> map = new HashMap<>();
+
+ //鏁翠綋鍙傛暟map
+ Map<String, Object> paramMap = new HashMap<String, Object>();
+ //娑堟伅涓婚鏄剧ず鐩稿叧map
+ Map<String, Object> dataMap = new HashMap<String, Object>();
+ //浼氳鍚嶇О
+ Map<String, Object> thing1 = new HashMap<String,Object>();
+ thing1.put("value",bookings.getName());
+ //浼氳鍦扮偣
+ Map<String, Object> thing2 = new HashMap<String,Object>();
+ thing2.put("value",bookings.getRoomName());
+ //浼氳鏃堕棿
+ Map<String, Object> thing3 = new HashMap<String,Object>();
+ thing3.put("value", DateUtil.getFomartDate(bookings.getStartTime(),"yyyy骞碝M鏈坉d鏃H:mm")+"鑷�"+DateUtil.getFomartDate(bookings.getEndTime(),"HH:mm"));
+
+ Integer earlyMin= Integer.valueOf(systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.EARLY_START_WX_NOTICE).getCode());
+
+ Map<String, Object> thing5 = new HashMap<String,Object>();
+ thing5.put("value","鎮ㄦ墍棰勫畾鐨勪細璁鍗冲皢鍦�"+earlyMin+"鍒嗛挓鍚庡紑濮嬶紝璇峰噯鏃跺弬鍔�");
+
+ dataMap.put("thing1",thing1);
+ dataMap.put("thing2",thing2);
+ dataMap.put("thing3",thing3);
+ dataMap.put("thing5",thing5);
+ paramMap.put("data", dataMap);
+
+ paramMap.put("template_id", "xGFnbHwe8W9sIGlD75XROrbKpzV-6HSRqfRHRfxRR6k");
+ paramMap.put("touser", openId);
+ paramMap.put("data", dataMap);
+
+ smsEmailMapper.delete(new QueryWrapper<SmsEmail>().lambda()
+ .eq(SmsEmail::getObjType,Constants.FIVE.toString())
+ .eq(SmsEmail::getStatus,Constants.TWO)
+ .eq(SmsEmail::getType,Constants.TWO)
+ .eq(SmsEmail::getObjId,bookings.getId())
+ );
+
+ SmsEmail smsEmail = new SmsEmail();
+ smsEmail.setPhone(openId);
+ smsEmail.setRemark("绛夊緟鍙戦��");
+ smsEmail.setStatus(Constants.TWO);
+ smsEmail.setIsdeleted(Constants.ZERO);
+ smsEmail.setType(Constants.TWO);
+ smsEmail.setObjType(Constants.FIVE.toString());
+ smsEmail.setObjId(bookings.getId());
+ smsEmail.setCreateDate(new Date());
+ smsEmail.setTitle("浼氳鍗冲皢寮�濮嬫彁閱�");
+ smsEmail.setInfo(DateUtil.getFomartDate(DateUtil.getXMinuteAfterDate(bookings.getStartTime(),-earlyMin),"yyyy-MM-dd HH:mm:ss"));
+ smsEmail.setContent(JSONObject.toJSONString(map));
+ }
+
+
+ public void createEndWxNotice(SystemDictDataBiz systemDictDataBiz, SmsEmailMapper smsEmailMapper, Bookings bookings, String openId){
+ Map<String,Object> map = new HashMap<>();
+
+ //鏁翠綋鍙傛暟map
+ Map<String, Object> paramMap = new HashMap<String, Object>();
+ //娑堟伅涓婚鏄剧ず鐩稿叧map
+ Map<String, Object> dataMap = new HashMap<String, Object>();
+ //浼氳鍚嶇О
+ Map<String, Object> thing1 = new HashMap<String,Object>();
+ thing1.put("value",bookings.getName());
+ //浼氳鍦扮偣
+ Map<String, Object> thing6 = new HashMap<String,Object>();
+ thing6.put("value",bookings.getRoomName());
+ //浼氳鏃堕棿
+ Map<String, Object> date4 = new HashMap<String,Object>();
+ date4.put("value", DateUtil.getFomartDate(bookings.getEndTime(),"yyyy骞碝M鏈坉d鏃H:mm"));
+
+ Map<String, Object> thing7 = new HashMap<String,Object>();
+ thing7.put("value","鎮ㄧ殑浼氳鍗冲皢缁撴潫锛屽闇�缁х画浣跨敤璇峰嵆浣跨画璁�");
+
+ dataMap.put("thing1",thing1);
+ dataMap.put("thing6",thing6);
+ dataMap.put("date4",date4);
+ dataMap.put("thing7",thing7);
+ paramMap.put("data", dataMap);
+
+ paramMap.put("template_id", "vdIPfwvDCrXOHgQnB6sdE1lGEsJm1oUURfLx6SoLdk0");
+ paramMap.put("touser", openId);
+ paramMap.put("data", dataMap);
+
+ smsEmailMapper.delete(new QueryWrapper<SmsEmail>().lambda()
+ .eq(SmsEmail::getObjType,Constants.FIVE.toString())
+ .eq(SmsEmail::getStatus,Constants.TWO)
+ .eq(SmsEmail::getType,Constants.TWO)
+ .eq(SmsEmail::getObjId,bookings.getId())
+ );
+
+ SmsEmail smsEmail = new SmsEmail();
+ smsEmail.setPhone(openId);
+ smsEmail.setRemark("绛夊緟鍙戦��");
+ smsEmail.setStatus(Constants.TWO);
+ smsEmail.setIsdeleted(Constants.ZERO);
+ smsEmail.setType(Constants.TWO);
+ smsEmail.setObjType(Constants.FIVE.toString());
+ smsEmail.setObjId(bookings.getId());
+ smsEmail.setCreateDate(new Date());
+ smsEmail.setTitle("浼氳鍗冲皢寮�濮嬫彁閱�");
+ Integer endMin= Integer.valueOf(systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.OVER_NOTICE_WX).getCode());
+ smsEmail.setInfo(DateUtil.getFomartDate(DateUtil.getXMinuteAfterDate(bookings.getEndTime(),-endMin),"yyyy-MM-dd HH:mm:ss"));
+ smsEmail.setContent(JSONObject.toJSONString(map));
+ }
+
+
/**
* 浼氳瀹ゅ彇娑堥�氱煡
diff --git a/server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/BookingsServiceImpl.java b/server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/BookingsServiceImpl.java
index 283990d..91afe23 100644
--- a/server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/BookingsServiceImpl.java
+++ b/server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/BookingsServiceImpl.java
@@ -155,6 +155,16 @@
this.sendNotice(bookings, MeetConstants.TWO);
SystemUser systemUser = systemUserMapper.selectById(user.getId());
this.sendWxNotice(bookings,Objects.isNull(systemUser)||StringUtils.isBlank(systemUser.getOpenid())?null:systemUser.getOpenid(),Constants.ZERO);
+ //鍒涘缓浼氳鍗冲皢鍒版湡涓庝細璁嵆灏嗙粨鏉熺殑閫氱煡
+ if(Objects.nonNull(systemUser)&&StringUtils.isNotBlank(systemUser.getOpenid())){
+ WxPlatNotice wxPlatNotice = new WxPlatNotice();
+ wxPlatNotice.createBeginWxNotice(systemDictDataBiz,smsEmailMapper,bookings,systemUser.getOpenid());
+ wxPlatNotice.createEndWxNotice(systemDictDataBiz,smsEmailMapper,bookings,systemUser.getOpenid());
+ }
+
+
+
+
}
return bookings.getId();
@@ -399,6 +409,11 @@
this.sendNotice(bookings, MeetConstants.TWO);
SystemUser systemUser = systemUserMapper.selectById(bookings.getCreator());
this.sendWxNotice(bookings,Objects.isNull(systemUser)||StringUtils.isBlank(systemUser.getOpenid())?null:systemUser.getOpenid(),Constants.ZERO);
+ if(Objects.nonNull(systemUser)&&StringUtils.isNotBlank(systemUser.getOpenid())){
+ WxPlatNotice wxPlatNotice = new WxPlatNotice();
+ wxPlatNotice.createBeginWxNotice(systemDictDataBiz,smsEmailMapper,bookings,systemUser.getOpenid());
+ wxPlatNotice.createEndWxNotice(systemDictDataBiz,smsEmailMapper,bookings,systemUser.getOpenid());
+ }
}
}
@@ -1391,6 +1406,7 @@
smsEmail.setStatus(Constants.TWO);//
smsEmail.setIsdeleted(Constants.ZERO);
smsEmail.setType(Constants.ZERO);
+ smsEmail.setObjType(Constants.FIVE.toString());
smsEmail.setObjId(bookings.getId());
smsEmail.setCreateDate(new Date());
smsEmail.setTitle("浼氳瀹ょ敵璇峰弬浼氶�氱煡");
diff --git a/server/system_gateway/src/main/java/com/doumee/api/gateway/JwtAuthController.java b/server/system_gateway/src/main/java/com/doumee/api/gateway/JwtAuthController.java
index 045f486..3ccf2be 100644
--- a/server/system_gateway/src/main/java/com/doumee/api/gateway/JwtAuthController.java
+++ b/server/system_gateway/src/main/java/com/doumee/api/gateway/JwtAuthController.java
@@ -102,7 +102,27 @@
try {
ServerHttpRequest request = serverWebExchange.getRequest();
dto.setCheckCode(false);
- LoginUserInfo user = systemLoginService.loginByPasswordNew(dto,request);
+ LoginUserInfo user = systemLoginService.loginByPasswordNew(dto,request);
+ String token = jwtTokenUtil.generateToken(user);
+ return ApiResponse.success(token);
+ }catch (BusinessException e){
+ return ApiResponse.failed(e.getCode(),e.getMessage());
+ }catch (Exception e){
+ e.printStackTrace();
+ return ApiResponse.failed(ResponseStatus.SERVER_ERROR);
+ }
+ }
+
+
+ @PreventRepeat(limit = 10, lockTime = 10000)
+ @ApiOperation("PDA涓氬姟鐧诲綍")
+ @PostMapping("/loginPDA")
+ @LoginNoRequired
+ public ApiResponse<String> loginPDA (@Validated @RequestBody LoginDTO dto, ServerWebExchange serverWebExchange) {
+ try {
+ ServerHttpRequest request = serverWebExchange.getRequest();
+ dto.setCheckCode(false);
+ LoginUserInfo user = systemLoginService.loginByPasswordForPda(dto,request);
String token = jwtTokenUtil.generateToken(user);
return ApiResponse.success(token);
}catch (BusinessException e){
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 cdb161c..f336a1e 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
@@ -158,6 +158,9 @@
public static final String CITY_XH_REASON_ID ="CITY_XH_REASON_ID" ;
public static final String ATWL_XH_PLATFORM_ID ="ATWL_XH_PLATFORM_ID" ;
public static final String SCREEN_SEVENT_ARRIVAL_STARTDATE = "SCREEN_SEVENT_ARRIVAL_STARTDATE";
+ public static final String EARLY_START_WX_NOTICE = "EARLY_START_WX_NOTICE";
+ public static final String OVER_NOTICE_WX = "OVER_NOTICE_WX";
+
public static boolean DEALING_HK_SYNCPRIVILEGE= false;
public static boolean DEALING_HK_SYNCDEVICE = false;
public static boolean DEALING_HK_SYNCPLATFORM = false;
diff --git a/server/system_service/src/main/java/com/doumee/dao/business/model/SmsEmail.java b/server/system_service/src/main/java/com/doumee/dao/business/model/SmsEmail.java
index 40ce406..a8f68d5 100644
--- a/server/system_service/src/main/java/com/doumee/dao/business/model/SmsEmail.java
+++ b/server/system_service/src/main/java/com/doumee/dao/business/model/SmsEmail.java
@@ -78,8 +78,8 @@
@ExcelColumn(name="鐘舵�� 0鏈娇鐢� 1宸蹭娇鐢� 2绛夊緟鍙戦��")
private Integer status;
- @ApiModelProperty(value = "绫诲瀷 0鐭俊 1閭欢 ")
- @ExcelColumn(name="绫诲瀷 0鐭俊 1閭欢")
+ @ApiModelProperty(value = "绫诲瀷 0鐭俊 1閭欢 2寰俊鍏紬鍙烽�氱煡")
+ @ExcelColumn(name="绫诲瀷 0鐭俊 1閭欢 2寰俊鍏紬鍙烽�氱煡")
private Integer type;
@ApiModelProperty(value = "鍏宠仈瀵硅薄缂栫爜", example = "1")
diff --git a/server/system_service/src/main/java/com/doumee/service/system/SystemLoginService.java b/server/system_service/src/main/java/com/doumee/service/system/SystemLoginService.java
index dc28a94..c55524f 100644
--- a/server/system_service/src/main/java/com/doumee/service/system/SystemLoginService.java
+++ b/server/system_service/src/main/java/com/doumee/service/system/SystemLoginService.java
@@ -24,6 +24,8 @@
LoginUserInfo loginByPasswordNew (LoginDTO dto, ServerHttpRequest request);
+ LoginUserInfo loginByPasswordForPda(LoginDTO dto, ServerHttpRequest request);
+
LoginUserInfo loginByPhone(LoginPhoneDTO dto, ServerHttpRequest request);
diff --git a/server/system_service/src/main/java/com/doumee/service/system/impl/SystemLoginServiceImpl.java b/server/system_service/src/main/java/com/doumee/service/system/impl/SystemLoginServiceImpl.java
index d3c77df..91a5fb8 100644
--- a/server/system_service/src/main/java/com/doumee/service/system/impl/SystemLoginServiceImpl.java
+++ b/server/system_service/src/main/java/com/doumee/service/system/impl/SystemLoginServiceImpl.java
@@ -182,6 +182,56 @@
return userInfo;
}
+
+
+ @Override
+ public LoginUserInfo loginByPasswordForPda(LoginDTO dto, ServerHttpRequest request) {
+ SystemLoginLog loginLog = new SystemLoginLog();
+ loginLog.setLoginUsername(dto.getUsername());
+ loginLog.setLoginTime(new Date());
+ loginLog.setSystemVersion(systemVersion);
+// loginLog.setLocation(Utils.Location.getLocationString(loginLog.getIp()));
+ if(request!=null&&request.getHeaders()!=null && request.getHeaders().size()>0){
+ loginLog.setIp(Utils.User_Client.getIP(request));
+ loginLog.setPlatform(Utils.User_Client.getPlatform(request));
+ loginLog.setClientInfo(Utils.User_Client.getBrowser(request));
+ loginLog.setOsInfo(Utils.User_Client.getOS(request));
+ }
+ loginLog.setServerIp(Utils.Server.getIP());
+ // 鏍规嵁鐢ㄦ埛鍚嶆煡璇㈢敤鎴峰璞�
+ SystemUser queryDto = new SystemUser();
+ queryDto.setUsername(dto.getUsername());
+ queryDto.setDeleted(Boolean.FALSE);
+ SystemUser user = systemUserService.findOne(queryDto);
+ if (user == null) {
+ throw new BusinessException(ResponseStatus.ACCOUNT_INCORRECT);
+ }
+ if(!Constants.equalsInteger(user.getSource(),Constants.ZERO)){
+ throw new BusinessException(ResponseStatus.NO_ALLOW_LOGIN);
+ }
+ String pwd = Utils.Secure.encryptPassword(new String(dto.getPassword()), user.getSalt());
+ // 姣旇緝瀵嗙爜
+ if( !StringUtils.equals(pwd, user.getPassword())){
+ throw new BusinessException(ResponseStatus.ACCOUNT_INCORRECT);
+ }
+ dealOpenIdBiz(user,dto.getOpenid());
+ Company company = new Company();
+ if(Objects.nonNull(user.getCompanyId())){
+ company = companyMapper.selectById(user.getCompanyId());
+ }
+ // 鑾峰彇鐧诲綍鐢ㄦ埛淇℃伅
+ List<SystemRole> roles = systemRoleService.findByUserId(user.getId());
+ List<SystemPermission> permissions = systemPermissionService.findByUserId(user.getId());
+
+ SystemRole rt = new SystemRole();
+ rt.setDeleted(Boolean.FALSE);
+ //鏁版嵁閮ㄩ棬鏉冮檺闆嗗悎
+ user.setCompanyIdList(systemDataPermissionService.selectHighRole(new SystemDataPermission(),rt,user));
+
+ LoginUserInfo userInfo = LoginUserInfo.from(user, roles, permissions,company,null);
+ return userInfo;
+ }
+
private void dealOpenIdBiz(SystemUser user, String openid) {
if(StringUtils.isNotBlank(openid)){
//濡傛灉openId涓嶄负绌�,缁戝畾璇ョ敤鎴穙penid
diff --git a/server/system_service/src/main/resources/mappers/SystemUserMapper.xml b/server/system_service/src/main/resources/mappers/SystemUserMapper.xml
index 30f6359..262a4b3 100644
--- a/server/system_service/src/main/resources/mappers/SystemUserMapper.xml
+++ b/server/system_service/src/main/resources/mappers/SystemUserMapper.xml
@@ -69,6 +69,9 @@
<if test="dto.memberType != null ">
AND usr.`type` = #{dto.memberType}
</if>
+ <if test="dto.memberType != null ">
+ AND usr.`type` = #{dto.memberType}
+ </if>
<if test="dto.workStatus != null ">
AND m.WORK_STATUS = #{dto.workStatus}
</if>
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/PlatformJobRunActController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/PlatformJobRunActController.java
index 49f08c6..93c3104 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/PlatformJobRunActController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/PlatformJobRunActController.java
@@ -53,8 +53,6 @@
return ApiResponse.success(data);
}
-
-
@LoginNoRequired
@ApiOperation("杩愯緭浠诲姟鍒嗘瀽")
@GetMapping("/transportMeasure")
@@ -65,6 +63,7 @@
List<TransportMeasureVO> list = boardService.transportMeasure(queryType);
return ApiResponse.success(list);
}
+
@LoginNoRequired
@ApiOperation("姹借溅鐘舵�併�佺粡绾害闆嗗悎鏁版嵁")
@GetMapping("/carsList")
@@ -72,6 +71,7 @@
BoardCarsListVO data = boardService.platformJobCarsList();
return ApiResponse.success(data);
}
+
@LoginNoRequired
@ApiOperation("姹借溅鍛婅浜嬩欢闆嗗悎鏁版嵁")
@GetMapping("/carsEventList")
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
index eb978cb..9d061a9 100644
--- 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
@@ -20,7 +20,7 @@
private String indexCode ;//String false
- @ApiModelProperty(value = "绫诲瀷锛歵emp 娓╁害 humidity 婀垮害")
+ @ApiModelProperty(value = "绫诲瀷锛歝urrTemperature 娓╁害 currHumidity 婀垮害")
private String sensorType ;//String false
private String parentIndexCode ;//String false
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 80aae19..166742b 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
@@ -643,7 +643,26 @@
}
+ public void sendMeetTemplateNotice(SystemDictDataBiz systemDictDataBiz,SmsEmail smsEmail,String token){
+ try{
+ String jumpUrl = Constants.getWxUrl(systemDictDataBiz.queryByCode(Constants.PLATFORM,Constants.WX_REDIRECT_URL).getCode(),
+ Constants.WxUrlParams.MEETING,smsEmail.getObjId().toString());
+ String postUrL = "https://api.weixin.qq.com/cgi-bin/message/template/send?access_token="+token;
+ JSONObject jsonObject = JSONObject.parseObject(smsEmail.getContent());
+ jsonObject.put("url",jumpUrl);
+ String response = HttpsUtil.postJson(postUrL, JSONObject.toJSONString(jsonObject));
+ log.warn("路==++--路鎺ㄩ�佸井淇℃ā鏉夸俊鎭唴瀹癸細{}", JSONObject.toJSONString(jsonObject));
+ if(StringUtils.isBlank(response)){
+ log.warn("路==++--路鎺ㄩ�佸井淇℃ā鏉夸俊鎭細{}路--++==路", "澶辫触");
+ }else{
+ JSONObject json = JSONObject.parseObject(response);
+ log.warn("路==++--路鎺ㄩ�佸井淇℃ā鏉夸俊鎭細{}路--++==路", Constants.equalsInteger(json.getInteger("errcode"),Constants.ZERO)?"鎴愬姛":"澶辫触"+json.getString("errmsg"));
+ }
+ }catch (Exception e){
+ }
+
+ }
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/platformReport/AlarmDataVO.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/platformReport/AlarmDataVO.java
index 40ccf43..b52d799 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/platformReport/AlarmDataVO.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/platformReport/AlarmDataVO.java
@@ -12,7 +12,6 @@
@Data
public class AlarmDataVO {
-
@ApiModelProperty(value = "鎬绘暟")
private Integer totalNum;
@@ -27,8 +26,10 @@
@ApiModelProperty(value = "澶勭悊涓暟閲�")
private Integer processingNum;
+
@ApiModelProperty(value = "缁熻鏃堕棿寮�濮�")
private String startDate;
+
@ApiModelProperty(value = "缁熻鏃堕棿缁撴潫")
private String endDate;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/platformReport/MonitorParentDataVO.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/platformReport/MonitorParentDataVO.java
new file mode 100644
index 0000000..3ec84cb
--- /dev/null
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/platformReport/MonitorParentDataVO.java
@@ -0,0 +1,24 @@
+package com.doumee.dao.web.response.platformReport;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * 鏈勾娑堥槻璁惧/璁炬柦缁存姢鎯呭喌
+ *
+ * @Author : Rk
+ * @create 2024/10/25 14:26
+ */
+@Data
+public class MonitorParentDataVO {
+
+
+ @ApiModelProperty(value = "宸︿晶鏁版嵁")
+ private MonitorDataVO leftData;
+
+ @ApiModelProperty(value = "鍙充晶鏁版嵁")
+ private MonitorDataVO rightData;
+
+}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformBooksServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformBooksServiceImpl.java
index 42e1c16..fe68667 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformBooksServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformBooksServiceImpl.java
@@ -443,6 +443,16 @@
.eq(Approve::getObjId,revokeDTO.getId())
);
+ noticesJoinMapper.update(null,new UpdateWrapper<Notices>().lambda()
+ .set(Notices::getEditDate,new Date())
+ .set(Notices::getInfo,"鐗╂祦杞﹂绾︾敵璇峰彇娑�")
+ .set(Notices::getReaded,Constants.ONE)
+ .set(Notices::getParam2,Constants.TWO)
+ .set(Notices::getStatus,Constants.ONE)
+ .eq(Notices::getType,Constants.noticesObjectType.reason)
+ .eq(Notices::getObjId,model.getId())
+ );
+
//鍙戦�佺煭淇￠�氱煡
SmsEmailServiceImpl.sendPlatformBookSms(systemDictDataBiz,
emayService,smsEmailMapper,smsConfigMapper,platformBooksMapper,model.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 01c5d7b..a5e76bf 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
@@ -517,6 +517,14 @@
.leftJoin(Platform.class,Platform::getId,PlatformJob::getPlatformId)
.eq(PlatformJob::getIsdeleted,Constants.ZERO)
.eq(PlatformJob::getDrivierPhone,loginUserInfo.getMobile())
+ .and(i->i.like(PlatformJob::getDoneDate,DateUtil.getCurrDate())
+ .or().in(PlatformJob::getStatus,Constants.PlatformJobStatus.WAIT_CALL.getKey()
+ ,Constants.PlatformJobStatus.WAIT_CONFIRM.getKey(),
+ Constants.PlatformJobStatus.WART_SIGN_IN.getKey(),
+ Constants.PlatformJobStatus.IN_WAIT.getKey(),
+ Constants.PlatformJobStatus.CALLED.getKey(),
+ Constants.PlatformJobStatus.WORKING.getKey())
+ )
.orderByDesc(PlatformJob::getId)
);
for (PlatformJob platformJob:platformJobList) {
@@ -527,7 +535,6 @@
}
driverHomeVO.setPlatformJobList(platformJobList);
-
// 鍥尯瀵艰鍥� 鍥剧墖
driverHomeVO.setReservationMap(systemDictDataBiz.queryByCode(Constants.PLATFORM,Constants.PLATFORM_GUIDEMAP).getCode());
// 棰勭害鎸囧崡 鏂囨湰
@@ -737,6 +744,7 @@
,PlatformJob::getId,lineUpDetailDTO.getJobId())
.in(PlatformJob::getStatus,Constants.PlatformJobStatus.WAIT_CALL.getKey(),
Constants.PlatformJobStatus.IN_WAIT.getKey(),
+ Constants.PlatformJobStatus.WORKING.getKey(),
Constants.PlatformJobStatus.CALLED.getKey())
.orderByDesc(PlatformJob::getStatus)
.orderByAsc(PlatformJob::getSignDate)
@@ -909,6 +917,9 @@
}
}
+
+
+
private Logger logger = LoggerFactory.getLogger(PlatformJobServiceImpl.class);
@Override
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 4b577ff..914e063 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
@@ -11,6 +11,7 @@
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.*;
+import com.doumee.core.wx.wxPlat.WxPlatNotice;
import com.doumee.dao.business.*;
import com.doumee.dao.business.dao.SmsConfigMapper;
import com.doumee.dao.business.dao.SmsEmailMapper;
@@ -91,7 +92,7 @@
@Override
public Integer sendSms(SmsEmail smsEmail) {
- if(StringUtils.isBlank(smsEmail.getPhone())){
+ if(StringUtils.isBlank(smsEmail.getPhone()) || smsEmail.getPhone().length() != 11 ){
throw new BusinessException(ResponseStatus.BAD_REQUEST);
}
String nowDate = DateUtil.getFomartDate(new Date(),"yyyy-MM-dd HH:mm:ss");
@@ -267,18 +268,32 @@
List<SmsEmail> smsEmails = smsEmailMapper.selectList(wrapper);
if(smsEmails!=null && smsEmails.size()>0){
for(SmsEmail model : smsEmails){
- if(model.getPhone() == null){
- model.setStatus(Constants.THREE);//鍙戦�佸け璐�
- model.setRemark("鎵嬫満鍙蜂负绌猴紝鍙栨秷浠诲姟鍙戦�侊紒");
- }else{
- try {
- emayService.sendSmsByHk(model.getPhone(),model.getContent());
- model.setStatus(Constants.ONE);//鍙戦�佹垚鍔�
- model.setRemark("鐭俊浠诲姟鍙戦�佹垚鍔�");
- }catch (Exception e){
+ if(Constants.equalsInteger(model.getType(),Constants.ONE)){
+ if(model.getPhone() == null){
model.setStatus(Constants.THREE);//鍙戦�佸け璐�
- model.setRemark("鐭俊浠诲姟鍙戦�佸け璐ワ紒"+e.getMessage());
+ model.setRemark("鎵嬫満鍙蜂负绌猴紝鍙栨秷浠诲姟鍙戦�侊紒");
+ }else{
+ try {
+ emayService.sendSmsByHk(model.getPhone(),model.getContent());
+ model.setStatus(Constants.ONE);//鍙戦�佹垚鍔�
+ model.setRemark("鐭俊浠诲姟鍙戦�佹垚鍔�");
+ }catch (Exception e){
+ model.setStatus(Constants.THREE);//鍙戦�佸け璐�
+ model.setRemark("鐭俊浠诲姟鍙戦�佸け璐ワ紒"+e.getMessage());
+ }
}
+ }else if(Constants.equalsInteger(model.getType(),Constants.TWO)){
+ if(DateUtil.fromStringToDate("yyyy-MM-dd HH:mm:ss",model.getInfo()).getTime() < System.currentTimeMillis()){
+ WxPlatNotice wxPlatNotice = new WxPlatNotice();
+ wxPlatNotice.sendMeetTemplateNotice(systemDictDataBiz,model,systemDictDataBiz.queryByCode(Constants.WX_PLATFORM, Constants.WX_PLATFORM_ACCESS_TOKEN).getCode());
+ model.setStatus(Constants.ONE);//鍙戦�佹垚鍔�
+ model.setRemark("寰俊閫氱煡鍙戦�佹垚鍔�");
+ }else{
+ model.setStatus(Constants.THREE);//鍙戦�佹垚鍔�
+ model.setRemark("寰俊閫氱煡鍙戦�佸け璐�");
+ }
+ }else{
+ continue;
}
model.setEditDate(new Date());
smsEmailMapper.updateById(model);
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 33d49b2..7bb3f9e 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
@@ -1271,7 +1271,13 @@
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")){
+ if(StringUtils.isNotBlank(data.getName())){
+ Integer index = data.getName().indexOf("-");
+ if(index>=0){
+ data.setName(data.getName().substring(0,index));
+ }
+ }
+ if(data.getSensorType().equals("currTemperature")){
temperatureHumidityDataVO.setTemperatureData(data);
}else{
temperatureHumidityDataVO.setHumidityData(data);
@@ -1783,11 +1789,13 @@
.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 t.total_num end )",PlatformJob::getWorkNum)
- .apply("to_days(t.create_date) = to_days(now())")
+// .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() })
// .leftJoin(Platform.class,Platform::getId,PlatformJob::getPlatformId)
- .orderByDesc(PlatformJob::getStatus ));
+ .orderByDesc(PlatformJob::getStatus )
+ .orderByAsc(PlatformJob::getId )
+ );
//鏈堝彴鐘舵�侊細0=浣滀笟涓紱1=绌洪棽涓紱2=浣滀笟瓒呮椂;3=鍙彿
for(Platform model : platformList){
PlatformWorkDataVO platformDurationVO = new PlatformWorkDataVO();
--
Gitblit v1.9.3