消息修改
This commit is contained in:
+2
-2
@@ -1,9 +1,9 @@
|
||||
package com.jero.common.service.impl;
|
||||
|
||||
import com.jero.common.common.ProjectCommon;
|
||||
import com.jero.common.common.RoleCommon;
|
||||
import com.jero.common.dto.SendMessageDTO;
|
||||
import com.jero.common.enums.CompanyMessageEnums;
|
||||
import com.jero.common.enums.ManagementMessageEnums;
|
||||
import com.jero.common.service.ContractCreateProjectSendMessageService;
|
||||
import com.jero.common.service.SendMessageService;
|
||||
import com.jero.common.system.vo.LoginUser;
|
||||
@@ -44,7 +44,7 @@ public class ContractCreateProjectSendMessageServiceImpl implements ContractCrea
|
||||
map.put("projectName",projectName);
|
||||
sendMessageDTO.setFromUser(sysUser.getId());
|
||||
sendMessageDTO.setToUser(p.getUsername());
|
||||
sendMessageDTO.setTemplateCode(CompanyMessageEnums.MSG11.getCode());
|
||||
sendMessageDTO.setTemplateCode(ManagementMessageEnums.MSG1.getCode());
|
||||
sendMessageDTO.setTemplateParam(map);
|
||||
sendMessageDTO.setBusType("email");
|
||||
sendMessageDTO.setBusId(p.getId());
|
||||
|
||||
+2
-2
@@ -93,7 +93,7 @@ public class SendMessageServiceImpl implements SendMessageService {
|
||||
String busType = sendMessageDTO.getBusType();
|
||||
|
||||
SysAnnouncement announcement = new SysAnnouncement();
|
||||
announcement.setTitile(title);
|
||||
announcement.setTitile(sysSmsTemplate.getTemplateName());
|
||||
announcement.setMsgContent(content);
|
||||
announcement.setSender(fromUser);
|
||||
announcement.setPriority(CommonConstant.PRIORITY_M);
|
||||
@@ -127,7 +127,7 @@ public class SendMessageServiceImpl implements SendMessageService {
|
||||
obj.put(WebsocketConst.MSG_CMD, WebsocketConst.CMD_USER);
|
||||
obj.put(WebsocketConst.MSG_USER_ID, sysUser.getId());
|
||||
obj.put(WebsocketConst.MSG_ID, announcement.getId());
|
||||
obj.put(WebsocketConst.MSG_TXT, announcement.getTitile());
|
||||
obj.put(WebsocketConst.MSG_TXT, title);
|
||||
webSocket.sendMessage(sysUser.getId(), obj.toJSONString());
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,9 +1,11 @@
|
||||
package com.jero.home;
|
||||
|
||||
import com.jero.common.api.vo.Result;
|
||||
import com.jero.payment.service.IPayPaymentRecordService;
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiOperation;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
@@ -21,6 +23,9 @@ import org.springframework.web.bind.annotation.RestController;
|
||||
@Slf4j
|
||||
public class HomeController {
|
||||
|
||||
@Autowired
|
||||
private IPayPaymentRecordService payPaymentRecordService;
|
||||
|
||||
/**
|
||||
* 首页-数据统计
|
||||
*
|
||||
@@ -29,6 +34,7 @@ public class HomeController {
|
||||
@ApiOperation(value="首页-数据统计", notes="首页-数据统计")
|
||||
@GetMapping(value = "/dataStatistics")
|
||||
public Result<?> dataStatistics() {
|
||||
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user