yuyang/XH-Power-Cloud
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

更新工单运维模块对工单状态和发送短信的判断

Browse Source
This commit is contained in:
panshuling321 2022-05-13 15:25:11 +08:00
parent 62fb13609f
commit 3870cd5b56
2 changed files with 39 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/service/impl/WorkOrderServiceImpl.java
View File

@ -79,19 +79,23 @@ public class WorkOrderServiceImpl implements WorkOrderService {
imageMapper.deleteByImageIds(imageIds); imageMapper.deleteByImageIds(imageIds);
} }
// 更新处理人 // 更新处理人
String phoneList = "";
orderMapper.deleteOrderUserByOrderId(domain.getWorkOrderId()); orderMapper.deleteOrderUserByOrderId(domain.getWorkOrderId());
List<XhpcWorkOrderUserDomain> orderUserDomainList = new ArrayList<>(); List<XhpcWorkOrderUserDomain> orderUserDomainList = new ArrayList<>();
for(XhpcWorkUserDomain userDomain: domain.getUserList()){ for(XhpcWorkUserDomain userDomain: domain.getUserList()){
XhpcWorkOrderUserDomain orderUserDomain = new XhpcWorkOrderUserDomain(); XhpcWorkOrderUserDomain orderUserDomain = new XhpcWorkOrderUserDomain();
orderUserDomain.setOrderId(domain.getWorkOrderId()); orderUserDomain.setOrderId(domain.getWorkOrderId());
orderUserDomain.setUserId(userDomain.getWorkUserId()); orderUserDomain.setUserId(userDomain.getWorkUserId());
orderUserDomainList.add(orderUserDomain); orderUserDomainList.add(orderUserDomain);
phoneList = userDomain.getPhone() + "," + phoneList;
} }
orderMapper.insertOrderUser(orderUserDomainList); orderMapper.insertOrderUser(orderUserDomainList);
if(StringUtils.isNotEmpty(phoneList) && domain.getStatus() != null && domain.getStatus()==1){
sendSms(phoneList, domain.getWorkOrderId().toString());
}
return true; return true;
} }
@ -131,7 +135,6 @@ public class WorkOrderServiceImpl implements WorkOrderService {
domain.setUserList(userDomains); domain.setUserList(userDomains);
} }
if(StringUtils.isNotEmpty(domain.getSerialNumber())){ if(StringUtils.isNotEmpty(domain.getSerialNumber())){
XhpcStationDeviceDomain deviceDomain = deviceMapper.selectStationGunDeviceBySerialNumber(domain.getSerialNumber()); XhpcStationDeviceDomain deviceDomain = deviceMapper.selectStationGunDeviceBySerialNumber(domain.getSerialNumber());
if (deviceDomain == null){ if (deviceDomain == null){
@ -164,25 +167,9 @@ public class WorkOrderServiceImpl implements WorkOrderService {
orderMapper.insertOrderUser(orderUserDomainList); orderMapper.insertOrderUser(orderUserDomainList);
} }
// todo 发送多人短信 // todo 发送多人短信
HashMap<String, String> paramMap = new HashMap<>(); if(StringUtils.isNotEmpty(phoneList) && domain.getStatus() != null && domain.getStatus()==1){
paramMap.put("orderNo", domain.getWorkOrderId().toString()); sendSms(phoneList, domain.getWorkOrderId().toString());
paramMap.put("phone", phoneList);
paramMap.put("content", "【小华充电】您好，您有新的工单(工单号:"+ domain.getWorkOrderId() +")待处理，请及时登陆后台查看并处理，谢谢。");
R r = smsService.sendNotice(paramMap);
XhpcWorkOrderPushMessageDomain messageDomain = new XhpcWorkOrderPushMessageDomain();
messageDomain.setContent(paramMap.get("content"));
messageDomain.setTarget(phoneList);
messageDomain.setType(Short.valueOf("1"));
if (r!= null && r.getCode() != 200){
messageDomain.setFailMsg("发送失败");
messageDomain.setStatus(Short.valueOf("2"));
} else {
messageDomain.setFailMsg("发送成功");
messageDomain.setStatus(Short.valueOf("1"));
} }
messageMapper.insertSelective(messageDomain);
return true; return true;
} }
@ -198,4 +185,26 @@ public class WorkOrderServiceImpl implements WorkOrderService {
return true; return true;
} }
private void sendSms(String phoneList, String orderId){
HashMap<String, String> paramMap = new HashMap<>();
paramMap.put("orderNo", orderId);
paramMap.put("phone", phoneList);
paramMap.put("content", "【小华充电】您好，您有新的工单(工单号:"+ orderId +")待处理，请及时登陆后台查看并处理，谢谢。");
R r = smsService.sendNotice(paramMap);
XhpcWorkOrderPushMessageDomain messageDomain = new XhpcWorkOrderPushMessageDomain();
messageDomain.setContent(paramMap.get("content"));
messageDomain.setTarget(phoneList);
messageDomain.setType(Short.valueOf("1"));
if (r!= null && r.getCode() != 200){
messageDomain.setFailMsg("发送失败");
messageDomain.setStatus(Short.valueOf("2"));
} else {
messageDomain.setFailMsg("发送成功");
messageDomain.setStatus(Short.valueOf("1"));
}
messageMapper.insertSelective(messageDomain);
}
} }

7
xhpc-modules/xhpc-activity/src/main/resources/mapper/XhpcWorkOrderMapper.xml
View File

@ -176,7 +176,14 @@
<if test="disposalMethod != null"> <if test="disposalMethod != null">
#{disposalMethod,jdbcType=VARCHAR}, #{disposalMethod,jdbcType=VARCHAR},
</if> </if>
<choose>
<when test="status == null">
1, 1,
</when>
<otherwise>
#{status}
</otherwise>
</choose>
0, 0,
<if test="tenantId != null"> <if test="tenantId != null">
#{tenantId,jdbcType=VARCHAR}, #{tenantId,jdbcType=VARCHAR},