LK/income_payments_management
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

消息修改

Browse Source
This commit is contained in:
梁琦涛
2021-09-23 15:51:29 +08:00
parent 916ec71b55
commit 58b8a8bc49
8 changed files with 178 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-incoming-payment/src/main/java/com/jero/common/enums/CompanyMessageEnums.java
+76
View File
@@ -0,0 +1,76 @@
package com.jero.common.enums;
import org.apache.commons.lang3.StringUtils;
/**
* @Description 企业端消息
* @Author lqt
* @Date 2021/9/22
* @Param
* @Return
* @Exception
*/
public enum CompanyMessageEnums {
MSG1("HYTZ_WORK_GROUP_CREATE","会议提醒","点击跳转到报名页面"),
MSG2("HYTZ_WORK_GROUP_SIGN_UP","会议提醒","弹窗：查看该会议详情"),
MSG3("HYTZ_WORK_GROUP_UPLOAD","会议提醒","弹窗：查看该会议详情"),
MSG4("HYTZ_WORK_GROUP_NOT_UPLOAD","会议提醒","弹窗：查看该会议详情"),
MSG5("HYTZ_NOT_AUDIT","会议提醒","弹窗：上传汇款凭证"),
MSG6("HYTZ_AUDIT","会议提醒","弹窗：查看该会议详情"),
MSG7("WJTZ_MEETING_SEND","文件提醒","弹窗：查看该会议详情"),
MSG8("HTTZ_PHASE","合同提醒","无"),
MSG9("YJTZ_MAIL","邮寄提醒","查看该物流信息"),
MSG10("YJTZ_MAIL_CONTRACT","邮寄提醒","查看该物流信息"),
MSG11("CKTZ_PAY","催款提醒","弹窗：查看该项目详情"),
MSG12("WJTZ_WORK_GROUP_SEND","文件提醒","弹窗：查看该项目详情");
private String code;
private String value;
private String detail;
CompanyMessageEnums(String code, String value, String detail){
this.code = code;
this.value = value;
this.detail = detail;
}
public String getCode() {
return code;
}
public void setCode(String code) {
this.code = code;
}
public String getValue() {
return value;
}
public void setValue(String value) {
this.value = value;
}
public String getDetail() {
return detail;
}
public void setDetail(String detail) {
this.detail = detail;
}
public static CompanyMessageEnums getByCode(String code) {
if (StringUtils.isBlank(code)) {
return null;
}
for (CompanyMessageEnums val : values()) {
if (val.code.equals(code)) {
return val;
}
}
return null;
}
}
jero-boot-incoming-payment/src/main/java/com/jero/common/enums/ManagementMessageEnums.java
+71
View File
@@ -0,0 +1,71 @@
package com.jero.common.enums;
import org.apache.commons.lang3.StringUtils;
/**
* @Description 管理端消息
* @Author lqt
* @Date 2021/9/22
* @Param
* @Return
* @Exception
*/
public enum ManagementMessageEnums {
MSG1("HTTZ_CREATE_PROJECT","项目提醒","查看详情"),
MSG2("HTTZ_SUBMIT","合同提醒","跳转到合同的详情页面"),
MSG3("HTTZ_AUDIT","合同提醒","跳转到合同的详情页面"),
MSG4("HTTZ_NOT_AUDIT","合同提醒","跳转到合同的详情页面"),
MSG5("HYTZ_SIGN_UP_UPLOAD","会议提醒","审核弹窗"),
MSG6("DBTZ_ADD","打包提醒","查看该项目详情"),
MSG7("DBTZ_CONTRACT","打包提醒","查看项目详情"),
MSG8("HYTZ_ON_ACCESS_UPDATE","会议提醒","查看该参会人详情"),
MSG9("QYTZ_CREATE","企业提醒","企业列表页");
private String code;
private String value;
private String detail;
ManagementMessageEnums(String code, String value, String detail){
this.code = code;
this.value = value;
this.detail = detail;
}
public String getCode() {
return code;
}
public void setCode(String code) {
this.code = code;
}
public String getValue() {
return value;
}
public void setValue(String value) {
this.value = value;
}
public String getDetail() {
return detail;
}
public void setDetail(String detail) {
this.detail = detail;
}
public static ManagementMessageEnums getByCode(String code) {
if (StringUtils.isBlank(code)) {
return null;
}
for (ManagementMessageEnums val : values()) {
if (val.code.equals(code)) {
return val;
}
}
return null;
}
}
jero-boot-incoming-payment/src/main/java/com/jero/common/enums/MessageEnums.java
-76
View File
@@ -1,76 +0,0 @@
package com.jero.common.enums;
import java.util.Objects;
/**
* @Description 企业端消息
* @Author lqt
* @Date 2021/9/22
* @Param
* @Return
* @Exception
*/
public enum MessageEnums {
MSG1(1,"项目通知","查看详情"),//项目通知- 查看详情
MSG2(2,"合同通知","跳转到合同的详情页面"),//合同通知-跳转到合同的详情页面
MSG3(3,"会议通知","审核弹窗"),//会议通知-审核弹窗
MSG4(4,"打包通知","查看该项目详情"),//打包通知-查看该项目详情
MSG5(5,"会议通知","查看该参会人详情"),//会议通知-查看该参会人详情
MSG6(6,"企业通知","企业列表页"),//企业通知-企业列表页
MSG7(7,"会议通知","点击跳转到报名页面"),//会议通知-点击跳转到报名页面
MSG8(8,"会议通知","弹窗：查看该会议详情"),//会议通知-弹窗：查看该会议详情
MSG9(9,"会议通知","弹窗：上传汇款凭证"),//会议通知-弹窗：上传汇款凭证
MSG10(10,"文件通知","弹窗：查看该会议详情"),//文件通知-弹窗：查看该会议详情
MSG11(11,"合同通知","无"),//合同通知-无
MSG12(12,"邮寄通知","查看该物流信息"),//邮寄通知-查看该物流信息
MSG13(13,"邮寄通知","查看该物流信息"),//邮寄通知-查看该物流信息
MSG14(14,"催款通知","弹窗：查看该项目详情"),//催款通知-弹窗：查看该项目详情
MSG15(15,"文件通知","弹窗：查看该项目详情");//文件通知-弹窗：查看该项目详情
private Integer code;
private String value;
private String detail;
MessageEnums(Integer code, String value, String detail){
this.code = code;
this.value = value;
this.detail = detail;
}
public Integer getCode() {
return code;
}
public void setCode(Integer code) {
this.code = code;
}
public String getValue() {
return value;
}
public void setValue(String value) {
this.value = value;
}
public String getDetail() {
return detail;
}
public void setDetail(String detail) {
this.detail = detail;
}
public static MessageEnums getByCode(Integer code) {
if (Objects.isNull(code)) {
return null;
}
for (MessageEnums val : values()) {
if (val.code.equals(code)) {
return val;
}
}
return null;
}
}
jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupSubItemController.java
+21 -18
View File
@@ -4,11 +4,11 @@ import java.util.*;
import java.util.stream.Collectors;
import javax.servlet.http.HttpServletRequest;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.jero.common.api.dto.message.MessageDTO;
import com.jero.common.api.dto.message.BusTemplateMessageDTO;
import com.jero.common.api.dto.message.TemplateMessageDTO;
import com.jero.common.api.vo.Result;
import com.jero.message.entity.PayAnnouncementMessage;
import com.jero.common.enums.MessageEnums;
import com.jero.common.enums.CompanyMessageEnums;
import com.jero.common.enums.ManagementMessageEnums;
import com.jero.common.service.ProjectDetailService;
import com.jero.common.system.api.ISysBaseAPI;
import com.jero.common.system.base.controller.JeroController;
@@ -161,23 +161,26 @@ public class PayWorkingGroupSubItemController extends JeroController<PayWorkingG
}
String msg = "中汽数据中心提醒您，贵公司与中汽数据签订的" + payWorkingGroup.getWorkingGroupProject()
+ "项目款项仍未结余，请及时汇款，如已经汇款，请忽略此条通知。谢谢合作";
// sysBaseAPI.sendEmailMsg(PasswordUtil.decrypt(listContactsEmail.get(0).getEmail()), "", msg);
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
PayAnnouncementMessage payAnnouncementMessage = new PayAnnouncementMessage();
payAnnouncementMessage.setTitile(MessageEnums.MSG14.getValue());
payAnnouncementMessage.setMsgContent(msg);
payAnnouncementMessage.setSender(sysUser.getId());
payAnnouncementMessage.setRecipient(sysUser.getId());
payAnnouncementMessage.setMsgCategory(MessageEnums.MSG14.getCode());
payAnnouncementMessage.setOperation(MessageEnums.MSG14.getDetail());
payAnnouncementMessage.setBusId(p.getId());
payAnnouncementMessageService.sendMessage(payAnnouncementMessage);
TemplateMessageDTO templateMessageDTO = new TemplateMessageDTO();
templateMessageDTO.setTitle(MessageEnums.MSG14.getValue());
templateMessageDTO.setFromUser(sysUser.getId());
templateMessageDTO.setToUser(sysUser.getUsername());
templateMessageDTO.setTemplateCode("sys_ts_note");
sysBaseAPI.sendTemplateAnnouncement(templateMessageDTO);
// PayAnnouncementMessage payAnnouncementMessage = new PayAnnouncementMessage();
// payAnnouncementMessage.setTitile(MessageEnums.MSG14.getValue());
// payAnnouncementMessage.setMsgContent(msg);
// payAnnouncementMessage.setSender(sysUser.getId());
// payAnnouncementMessage.setRecipient(sysUser.getId());
// payAnnouncementMessage.setMsgCategory(MessageEnums.MSG14.getCode());
// payAnnouncementMessage.setOperation(MessageEnums.MSG14.getDetail());
// payAnnouncementMessage.setBusId(p.getId());
// payAnnouncementMessageService.sendMessage(payAnnouncementMessage);
BusTemplateMessageDTO busTemplateMessageDTO = new BusTemplateMessageDTO();
busTemplateMessageDTO.setTitle(CompanyMessageEnums.MSG11.getValue());
busTemplateMessageDTO.setFromUser(sysUser.getId());
busTemplateMessageDTO.setToUser(sysUser.getUsername());
busTemplateMessageDTO.setTemplateCode(CompanyMessageEnums.MSG11.getCode());
busTemplateMessageDTO.setTemplateParam(null);
busTemplateMessageDTO.setBusId(p.getId());
sysBaseAPI.sendBusTemplateAnnouncement(busTemplateMessageDTO);
});
// todo 缺少发送消息
return Result.OK("添加成功！");
jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayCommonProject.java
-1
View File
@@ -41,7 +41,6 @@ public class PayCommonProject implements Serializable {
/**来款项目*/
@Excel(name = "来款项目", width = 20,orderNum = "0")
@ApiModelProperty(value = "来款项目")
@TableField(exist = false)
private String chargeProject;
/**来款用途（字典表）*/
@ApiModelProperty(value = "来款用途")
jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroupSubItem.java
+1 -1
View File
@@ -39,7 +39,7 @@ public class PayWorkingGroupSubItem implements Serializable {
private java.lang.String id;
/**来款项目*/
@ApiModelProperty(value = "来款项目")
@Size(max = 100,message = "来款项目长度不能大于100个字符")
@TableField(exist = false)
private java.lang.String chargeProject;
/**工作组id*/
@ApiModelProperty(value = "工作组id")
jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupSubItemMapper.xml
-1
View File
@@ -16,7 +16,6 @@
<select id="queryPageList" resultType="com.jero.project.entity.PayWorkingGroupSubItem">
SELECT
pwgs.id,
pwgs.charge_project AS chargeProject,
pwgs.working_group_id AS workingGroupId,
pwgs.charge_company_id AS chargeCompanyId,
pwgs.charge_company_temporary_id AS chargeCompanyTemporaryId,
jero-boot-module-system/src/main/java/com/jero/modules/message/controller/SysMessageTemplateController.java
+9 -1
View File
@@ -74,7 +74,7 @@ public class SysMessageTemplateController extends JeroController<SysMessageTempl
public Result<?> add(@RequestBody SysMessageTemplate sysMessageTemplate) {
try {
if(!StringUtils.isBlank(sysMessageTemplate.getTemplateContent())){
sysMessageTemplate.setTemplateContent(AesEncryptUtil.desEncrypt(sysMessageTemplate.getTemplateContent()));
sysMessageTemplate.setTemplateContent(AesEncryptUtil.desEncrypt(sysMessageTemplate.getTemplateContent()).trim());
}
}catch (Exception e){
log.error("解密异常",e);
@@ -92,6 +92,14 @@ public class SysMessageTemplateController extends JeroController<SysMessageTempl
*/
@PostMapping(value = "/edit")
public Result<?> edit(@RequestBody SysMessageTemplate sysMessageTemplate) {
try {
if(!StringUtils.isBlank(sysMessageTemplate.getTemplateContent())){
sysMessageTemplate.setTemplateContent(AesEncryptUtil.desEncrypt(sysMessageTemplate.getTemplateContent()).trim());
}
}catch (Exception e){
log.error("解密异常",e);
return Result.error("添加失败！");
}
sysMessageTemplateService.updateById(sysMessageTemplate);
return Result.OK("更新成功！");
}