diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/common/dto/PaySendContactsMessageDTO.java b/jero-boot-incoming-payment/src/main/java/com/jero/common/dto/PaySendContactsMessageDTO.java index 5d956b07..7ee035a6 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/common/dto/PaySendContactsMessageDTO.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/common/dto/PaySendContactsMessageDTO.java @@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONObject; import lombok.Data; import java.io.Serializable; +import java.util.List; @Data public class PaySendContactsMessageDTO implements Serializable { @@ -35,4 +36,8 @@ public class PaySendContactsMessageDTO implements Serializable { * 前端需要的参数值 */ private JSONObject json; + /** + * 文件 + */ + private List listFile; } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/common/service/impl/ContractCreateProjectSendMessageServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/common/service/impl/ContractCreateProjectSendMessageServiceImpl.java index 207327bd..6043ef36 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/common/service/impl/ContractCreateProjectSendMessageServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/common/service/impl/ContractCreateProjectSendMessageServiceImpl.java @@ -12,6 +12,7 @@ import com.jero.common.system.vo.LoginUser; import com.jero.common.util.PasswordUtil; import com.jero.modules.system.entity.SysUser; import com.jero.modules.system.service.ISysUserService; +import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.apache.shiro.SecurityUtils; import org.springframework.stereotype.Service; @@ -81,6 +82,9 @@ public class ContractCreateProjectSendMessageServiceImpl implements ContractCrea sendMessageDTO.setPhone(PasswordUtil.decrypt(paySendContactsMessageDTO.getPhone())); sendMessageDTO.setToUser(PasswordUtil.decrypt(paySendContactsMessageDTO.getPhone())); } + if(!CollectionUtils.isEmpty(paySendContactsMessageDTO.getListFile())){ + sendMessageDTO.setListFile(paySendContactsMessageDTO.getListFile()); + } HashMap map = new HashMap<>(); map.put("projectName",paySendContactsMessageDTO.getProjectName()); sendMessageDTO.setFromUser(sysUser.getUsername()); diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupSubItemServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupSubItemServiceImpl.java index c44eeb52..ee319f4c 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupSubItemServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupSubItemServiceImpl.java @@ -237,6 +237,9 @@ public class PayWorkingGroupSubItemServiceImpl extends ServiceImpl 0){ @@ -245,30 +248,6 @@ public class PayWorkingGroupSubItemServiceImpl extends ServiceImpl map = new HashMap<>(); - map.put("projectName",payWorkingGroup.getWorkingGroupProject()); - sendMessageDTO.setFromUser(sysUserInfo.getUsername()); - sendMessageDTO.setTemplateCode(CompanyMessageEnums.MSG22.getCode()); - sendMessageDTO.setTemplateParam(map); - sendMessageDTO.setBusType("C_OPEN_TYPE22"); - sendMessageDTO.setListFile(listFile); - JSONObject jsonNew = new JSONObject(); - jsonNew.put("id",payWorkingGroupSubItem.getId()); - sendMessageDTO.setBusId(jsonNew.toJSONString()); - sendMessageService.SendMessageService(sendMessageDTO); - } - } // 新建项目 给企业联系人2发送消息 if(!StringUtils.isBlank(payWorkingGroupSubItem.getContactsIdTwo())){ @@ -280,6 +259,9 @@ public class PayWorkingGroupSubItemServiceImpl extends ServiceImpl 0){ @@ -288,28 +270,6 @@ public class PayWorkingGroupSubItemServiceImpl extends ServiceImpl map = new HashMap<>(); - map.put("projectName",payWorkingGroup.getWorkingGroupProject()); - sendMessageDTO.setFromUser(sysUserInfo.getUsername()); - sendMessageDTO.setTemplateCode(CompanyMessageEnums.MSG22.getCode()); - sendMessageDTO.setTemplateParam(map); - sendMessageDTO.setBusType("C_OPEN_TYPE22"); - sendMessageDTO.setListFile(listFile); - JSONObject jsonNew = new JSONObject(); - jsonNew.put("id",payWorkingGroupSubItem.getId()); - sendMessageDTO.setBusId(jsonNew.toJSONString()); - sendMessageService.SendMessageService(sendMessageDTO); - } } // 新建项目 给企业联系人3发送消息 if(!StringUtils.isBlank(payWorkingGroupSubItem.getContactsIdThree())){ @@ -321,6 +281,9 @@ public class PayWorkingGroupSubItemServiceImpl extends ServiceImpl 0){ @@ -329,28 +292,6 @@ public class PayWorkingGroupSubItemServiceImpl extends ServiceImpl map = new HashMap<>(); - map.put("projectName",payWorkingGroup.getWorkingGroupProject()); - sendMessageDTO.setFromUser(sysUserInfo.getUsername()); - sendMessageDTO.setTemplateCode(CompanyMessageEnums.MSG22.getCode()); - sendMessageDTO.setTemplateParam(map); - sendMessageDTO.setBusType("C_OPEN_TYPE22"); - sendMessageDTO.setListFile(listFile); - JSONObject jsonNew = new JSONObject(); - jsonNew.put("id",payWorkingGroupSubItem.getId()); - sendMessageDTO.setBusId(jsonNew.toJSONString()); - sendMessageService.SendMessageService(sendMessageDTO); - } } } diff --git a/jero-boot-module-system/src/main/java/com/jero/modules/message/controller/SysMessageTemplateController.java b/jero-boot-module-system/src/main/java/com/jero/modules/message/controller/SysMessageTemplateController.java index c40de05b..2c9975ed 100644 --- a/jero-boot-module-system/src/main/java/com/jero/modules/message/controller/SysMessageTemplateController.java +++ b/jero-boot-module-system/src/main/java/com/jero/modules/message/controller/SysMessageTemplateController.java @@ -1,11 +1,9 @@ package com.jero.modules.message.controller; -import java.util.Arrays; -import java.util.Map; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - +import com.alibaba.fastjson.JSON; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.jero.common.api.vo.Result; import com.jero.common.aspect.annotation.AutoLog; import com.jero.common.system.base.controller.JeroController; @@ -15,23 +13,17 @@ import com.jero.modules.message.entity.MsgParams; import com.jero.modules.message.entity.SysMessageTemplate; import com.jero.modules.message.service.ISysMessageTemplateService; import com.jero.modules.message.util.PushMsgUtil; +import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import org.springframework.web.servlet.ModelAndView; -import com.alibaba.fastjson.JSON; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; - -import lombok.extern.slf4j.Slf4j; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.util.Arrays; +import java.util.Map; /** * @Description: 消息模板 @@ -50,7 +42,7 @@ public class SysMessageTemplateController extends JeroController queryPageList(SysMessageTemplate sysMessageTemplate, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) { QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(sysMessageTemplate, req.getParameterMap()); + if(!StringUtils.isBlank(req.getParameter("templateName"))){ + queryWrapper.eq("template_name",req.getParameter("templateName")); + } Page page = new Page(pageNo, pageSize); IPage pageList = sysMessageTemplateService.page(page, queryWrapper); return Result.OK(pageList); @@ -69,7 +64,7 @@ public class SysMessageTemplateController extends JeroController