diff --git a/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/util/SysAnnmentTypeEnum.java b/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/util/SysAnnmentTypeEnum.java index eaf0ed9e..93fc313f 100644 --- a/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/util/SysAnnmentTypeEnum.java +++ b/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/util/SysAnnmentTypeEnum.java @@ -11,35 +11,7 @@ public enum SysAnnmentTypeEnum { /** * 工作流跳转链接我的办公 */ - BPM("bpm", "url", "/bpm/task/MyTaskList"), - - // 管理端 - M_OPEN_TYPE1("M_OPEN_TYPE1","component","@comp/ProjectDetailModal"), - M_OPEN_TYPE2("M_OPEN_TYPE2","url","/contractManagement/RevenueContractDetail"), - M_OPEN_TYPE3("M_OPEN_TYPE3","url","/contractManagement/RevenueContractDetail"), - M_OPEN_TYPE4("M_OPEN_TYPE4","url","/contractManagement/RevenueContractDetail"), - M_OPEN_TYPE5("M_OPEN_TYPE5","component","@views/incomePayments/meetManage/modules/AuditModal"), - M_OPEN_TYPE6("M_OPEN_TYPE6","component","@comp/ProjectDetailModal"), - M_OPEN_TYPE7("M_OPEN_TYPE7","component","@comp/ProjectDetailModal"), - M_OPEN_TYPE8("M_OPEN_TYPE8","url","/incomePayments/meetManage/SignUpInfoDetail"), - M_OPEN_TYPE9("M_OPEN_TYPE9","url","/businessManagement/BusinessManagement"), - // todo 待定企业端 - C_OPEN_TYPE1("C_OPEN_TYPE1","url",""), - C_OPEN_TYPE2("C_OPEN_TYPE2","component",""), - C_OPEN_TYPE3("C_OPEN_TYPE3","component",""), - C_OPEN_TYPE4("C_OPEN_TYPE4","component",""), - C_OPEN_TYPE5("C_OPEN_TYPE5","component",""), - C_OPEN_TYPE6("C_OPEN_TYPE6","component",""), - C_OPEN_TYPE7("C_OPEN_TYPE7","component",""), - C_OPEN_TYPE8("C_OPEN_TYPE8","none",""), - C_OPEN_TYPE9("C_OPEN_TYPE9","",""), - C_OPEN_TYPE10("C_OPEN_TYPE10","",""), - C_OPEN_TYPE11("C_OPEN_TYPE11","component",""), - C_OPEN_TYPE12("C_OPEN_TYPE12","component",""); - - - - + BPM("bpm", "url", "/bpm/task/MyTaskList"); /** * 业务类型(email:邮件 bpm:流程) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/common/common/RoleCommon.java b/jero-boot-incoming-payment/src/main/java/com/jero/common/common/RoleCommon.java index 6faffdc9..5d055584 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/common/common/RoleCommon.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/common/common/RoleCommon.java @@ -10,4 +10,12 @@ public class RoleCommon { * 财务人员 */ public final static String CWRY = "cwry"; + /** + * 合同负责人 + */ + public final static String HTFZR = "htfzr"; + /** + * 企业信息维护人员 + */ + public final static String QYXXWHRY = "qyxxwhry"; } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/common/dto/SendMessageDTO.java b/jero-boot-incoming-payment/src/main/java/com/jero/common/dto/SendMessageDTO.java index 413c0b1e..6ce37a55 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/common/dto/SendMessageDTO.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/common/dto/SendMessageDTO.java @@ -4,6 +4,7 @@ import lombok.Data; import java.io.Serializable; import java.util.HashMap; +import java.util.List; /** * @Description 发送短信，消息，邮件 @@ -44,4 +45,8 @@ public class SendMessageDTO implements Serializable { * 模板参数 */ private HashMap templateParam; + /** + * 文件名集合(邮箱发送附件) + */ + private List listFile; } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/common/enums/MessageUrlEnums.java b/jero-boot-incoming-payment/src/main/java/com/jero/common/enums/MessageUrlEnums.java new file mode 100644 index 00000000..75b249b5 --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/common/enums/MessageUrlEnums.java @@ -0,0 +1,85 @@ +package com.jero.common.enums; + +import com.jero.common.util.oConvertUtils; + +public enum MessageUrlEnums { + + // 管理端 + M_OPEN_TYPE1("M_OPEN_TYPE1","component","/ProjectDetailModal"), + M_OPEN_TYPE2("M_OPEN_TYPE2","url","/contractManagement/RevenueContractDetail"), + M_OPEN_TYPE3("M_OPEN_TYPE3","url","/contractManagement/RevenueContractDetail"), + M_OPEN_TYPE4("M_OPEN_TYPE4","url","/contractManagement/RevenueContractDetail"), + M_OPEN_TYPE5("M_OPEN_TYPE5","component","@views/incomePayments/meetManage/modules/AuditModal"), + M_OPEN_TYPE6("M_OPEN_TYPE6","component","@comp/ProjectDetailModal"), + M_OPEN_TYPE7("M_OPEN_TYPE7","component","@comp/ProjectDetailModal"), + M_OPEN_TYPE8("M_OPEN_TYPE8","url","/incomePayments/meetManage/SignUpInfoDetail"), + M_OPEN_TYPE9("M_OPEN_TYPE9","url","/businessManagement/BusinessManagement"), + // todo 待定企业端 + C_OPEN_TYPE1("C_OPEN_TYPE1","url",""), + C_OPEN_TYPE2("C_OPEN_TYPE2","component",""), + C_OPEN_TYPE3("C_OPEN_TYPE3","component",""), + C_OPEN_TYPE4("C_OPEN_TYPE4","component",""), + C_OPEN_TYPE5("C_OPEN_TYPE5","component",""), + C_OPEN_TYPE6("C_OPEN_TYPE6","component",""), + C_OPEN_TYPE7("C_OPEN_TYPE7","component",""), + C_OPEN_TYPE8("C_OPEN_TYPE8","none",""), + C_OPEN_TYPE9("C_OPEN_TYPE9","",""), + C_OPEN_TYPE10("C_OPEN_TYPE10","",""), + C_OPEN_TYPE11("C_OPEN_TYPE11","component",""), + C_OPEN_TYPE12("C_OPEN_TYPE12","component",""); + + /** + * 业务类型(email:邮件 bpm:流程) + */ + private String type; + /** + * 打开方式 组件：component 路由：url + */ + private String openType; + /** + * 组件/路由 地址 + */ + private String openPage; + + MessageUrlEnums(String type, String openType, String openPage) { + this.type = type; + this.openType = openType; + this.openPage = openPage; + } + + public String getType() { + return type; + } + + public void setType(String type) { + this.type = type; + } + + public String getOpenType() { + return openType; + } + + public void setOpenType(String openType) { + this.openType = openType; + } + + public String getOpenPage() { + return openPage; + } + + public void setOpenPage(String openPage) { + this.openPage = openPage; + } + + public static MessageUrlEnums getByType(String type) { + if (oConvertUtils.isEmpty(type)) { + return null; + } + for (MessageUrlEnums val : values()) { + if (val.getType().equals(type)) { + return val; + } + } + return null; + } +} diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/common/service/ContractCreateProjectSendMessageService.java b/jero-boot-incoming-payment/src/main/java/com/jero/common/service/ContractCreateProjectSendMessageService.java index 692c380e..7bb86770 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/common/service/ContractCreateProjectSendMessageService.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/common/service/ContractCreateProjectSendMessageService.java @@ -6,8 +6,9 @@ public interface ContractCreateProjectSendMessageService { * @Author lqt * @Date 2021/9/24 * @Param projectName 项目名称 + * @Param projectId 项目id * @Return * @Exception */ - void ContractCreateProjectSendMessageService(String projectName); + void ContractCreateProjectSendMessageService(String projectName,String projectId); } 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 b9501319..1440a657 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 @@ -30,7 +30,7 @@ public class ContractCreateProjectSendMessageServiceImpl implements ContractCrea private SendMessageService sendMessageService; @Override - public void ContractCreateProjectSendMessageService(String projectName) { + public void ContractCreateProjectSendMessageService(String projectName,String projectId) { // 获取项目负责人，发送消息 List list = sysUserService.getRolesUser(Arrays.asList(RoleCommon.XMFZR)); if(!CollectionUtils.isEmpty(list)){ @@ -43,13 +43,13 @@ public class ContractCreateProjectSendMessageServiceImpl implements ContractCrea } HashMap map = new HashMap<>(); map.put("projectName",projectName); - sendMessageDTO.setFromUser(sysUser.getId()); + sendMessageDTO.setFromUser(sysUser.getUsername()); sendMessageDTO.setToUser(p.getUsername()); sendMessageDTO.setTemplateCode(ManagementMessageEnums.MSG1.getCode()); sendMessageDTO.setTemplateParam(map); sendMessageDTO.setBusType("M_OPEN_TYPE1"); JSONObject json = new JSONObject(); - json.put("id",p.getId()); + json.put("id",projectId); sendMessageDTO.setBusId(json.toJSONString()); sendMessageService.SendMessageService(sendMessageDTO); }); diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/common/service/impl/SendMessageServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/common/service/impl/SendMessageServiceImpl.java index ca083468..24ae8239 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/common/service/impl/SendMessageServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/common/service/impl/SendMessageServiceImpl.java @@ -5,6 +5,7 @@ import com.jero.common.common.ProjectCommon; import com.jero.common.constant.CommonConstant; import com.jero.common.constant.WebsocketConst; import com.jero.common.dto.SendMessageDTO; +import com.jero.common.enums.MessageUrlEnums; import com.jero.common.exception.JeroBootException; import com.jero.common.service.SendMessageService; import com.jero.common.system.api.ISysBaseAPI; @@ -86,7 +87,12 @@ public class SendMessageServiceImpl implements SendMessageService { if(templateType.contains(ProjectCommon.MESSAGE_TYPE2) && !StringUtils.isEmpty(sendMessageDTO.getEmail())){ try { EmailSendMsgHandle emailHandle = new EmailSendMsgHandle(); - emailHandle.SendMsg(sendMessageDTO.getEmail(), title, content); + // 发送带附件邮箱 + if(!CollectionUtils.isEmpty(sendMessageDTO.getListFile())){ + emailHandle.SendMsgAndFile(sendMessageDTO.getEmail(), title, content,sendMessageDTO.getListFile()); + }else{ + emailHandle.SendMsg(sendMessageDTO.getEmail(), title, content); + } }catch (Exception e){ log.error("发送邮件异常",e); } @@ -112,8 +118,8 @@ public class SendMessageServiceImpl implements SendMessageService { announcement.setBusId(busId); announcement.setBusType(busType); if(!StringUtils.isEmpty(busType)){ - announcement.setOpenType(SysAnnmentTypeEnum.getByType(busType).getOpenType()); - announcement.setOpenPage(SysAnnmentTypeEnum.getByType(busType).getOpenPage()); + announcement.setOpenType(MessageUrlEnums.getByType(busType).getOpenType()); + announcement.setOpenPage(MessageUrlEnums.getByType(busType).getOpenPage()); } announcement.setTemplateCode(sendMessageDTO.getTemplateCode()); sysAnnouncementService.save(announcement); diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayCompanyManagementController.java b/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayCompanyManagementController.java index ea40b6aa..4b5af316 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayCompanyManagementController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayCompanyManagementController.java @@ -2,16 +2,23 @@ package com.jero.company.controller; import java.util.*; import java.util.stream.Collectors; +import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; 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.common.RoleCommon; +import com.jero.common.dto.SendMessageDTO; +import com.jero.common.enums.ManagementMessageEnums; +import com.jero.common.service.SendMessageService; import com.jero.common.system.base.controller.JeroController; import com.jero.common.system.query.QueryGenerator; import com.jero.common.system.vo.LoginUser; @@ -23,10 +30,14 @@ import com.jero.company.common.PayContactsManagementCommon; import com.jero.company.entity.PayCompanyManagement; import com.jero.company.service.IPayCompanyManagementService; import com.jero.company.service.ProjectCountService; +import com.jero.modules.system.entity.SysUser; +import com.jero.modules.system.service.ISysUserService; +import com.jero.pack.common.PackCommon; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.StringUtils; import lombok.extern.slf4j.Slf4j; import org.apache.shiro.SecurityUtils; +import org.apache.shiro.authz.annotation.RequiresPermissions; import org.jeecgframework.poi.excel.ExcelImportCheckUtil; import org.jeecgframework.poi.excel.ExcelImportUtil; import org.jeecgframework.poi.excel.def.NormalExcelConstants; @@ -59,6 +70,11 @@ public class PayCompanyManagementController extends JeroController queryPageList(PayCompanyManagement payCompanyManagement, @@ -181,6 +198,7 @@ public class PayCompanyManagementController extends JeroController add(@RequestBody PayCompanyManagement payCompanyManagement) { @@ -241,6 +261,26 @@ public class PayCompanyManagementController extends JeroController list = sysUserService.getRolesUser(Arrays.asList(RoleCommon.QYXXWHRY)); + if(!CollectionUtils.isEmpty(list)){ + list.forEach(item->{ + // 发送消息 + SendMessageDTO sendMessageDTO = new SendMessageDTO(); + if(!StringUtils.isBlank(item.getEmail())){ + sendMessageDTO.setEmail(PasswordUtil.decrypt(item.getEmail())); + } + HashMap map = new HashMap<>(); + sendMessageDTO.setFromUser(sysUser.getUsername()); + sendMessageDTO.setToUser(item.getUsername()); + sendMessageDTO.setTemplateCode(ManagementMessageEnums.MSG9.getCode()); + sendMessageDTO.setTemplateParam(map); + sendMessageDTO.setBusType("M_OPEN_TYPE9"); + sendMessageService.SendMessageService(sendMessageDTO); + }); + } + } return Result.OK("添加成功！",payCompanyManagement); } @@ -250,6 +290,8 @@ public class PayCompanyManagementController extends JeroController edit(@RequestBody PayCompanyManagement payCompanyManagement) { @@ -294,6 +336,8 @@ public class PayCompanyManagementController extends JeroController audit(@RequestParam(name="id") String id) { @@ -315,6 +359,8 @@ public class PayCompanyManagementController extends JeroController delete(@RequestParam(name="id") String id) { @@ -332,6 +378,8 @@ public class PayCompanyManagementController extends JeroController deleteBatch(@RequestParam(name="ids") String ids) { @@ -355,6 +403,7 @@ public class PayCompanyManagementController extends JeroController queryByDutyCode(@RequestParam(name="dutyCode") String dutyCode) { @@ -385,6 +434,7 @@ public class PayCompanyManagementController extends JeroController queryByCompanyName(@RequestParam(name="companyName") String companyName) { @@ -415,6 +465,7 @@ public class PayCompanyManagementController extends JeroController queryById(@RequestParam(name="id") String id) { @@ -431,6 +482,8 @@ public class PayCompanyManagementController extends JeroController importExcel(HttpServletRequest request) { diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayContactsManagementController.java b/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayContactsManagementController.java index c1e4b054..c5ad73f0 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayContactsManagementController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayContactsManagementController.java @@ -14,6 +14,7 @@ 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; import com.jero.common.system.query.QueryGenerator; import com.jero.common.util.PasswordUtil; @@ -28,6 +29,7 @@ import com.jero.company.service.ProjectCountService; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.StringUtils; +import org.apache.shiro.authz.annotation.RequiresPermissions; import org.jeecgframework.poi.excel.ExcelImportCheckUtil; import org.jeecgframework.poi.excel.ExcelImportUtil; import org.jeecgframework.poi.excel.def.NormalExcelConstants; @@ -63,11 +65,9 @@ public class PayContactsManagementController extends JeroController queryPageList(PayContactsManagement payContactsManagement, @@ -181,6 +182,8 @@ public class PayContactsManagementController extends JeroController add(@RequestBody PayContactsManagement payContactsManagement) { @@ -242,6 +245,8 @@ public class PayContactsManagementController extends JeroController edit(@RequestBody PayContactsManagement payContactsManagement) { @@ -302,6 +307,8 @@ public class PayContactsManagementController extends JeroController delete(@RequestParam(name="id") String id) { @@ -319,6 +326,8 @@ public class PayContactsManagementController extends JeroController deleteBatch(@RequestParam(name="ids") String ids) { @@ -342,6 +351,7 @@ public class PayContactsManagementController extends JeroController queryByCompanyName(@RequestParam(name="phone") String phone) { @@ -374,6 +384,7 @@ public class PayContactsManagementController extends JeroController queryByName(@RequestParam(name="name") String name,@RequestParam(name="companyId") String companyId) { @@ -429,6 +440,7 @@ public class PayContactsManagementController extends JeroController queryById(@RequestParam(name="id") String id) { @@ -476,6 +488,7 @@ public class PayContactsManagementController extends JeroController queryByCompany(@RequestParam(name="companyId") String companyId) { @@ -501,6 +514,8 @@ public class PayContactsManagementController extends JeroController importExcel(HttpServletRequest request, HttpServletResponse response) { diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/company/service/ProjectCountService.java b/jero-boot-incoming-payment/src/main/java/com/jero/company/service/ProjectCountService.java index b0ce3a17..79fb6406 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/company/service/ProjectCountService.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/company/service/ProjectCountService.java @@ -10,6 +10,5 @@ public interface ProjectCountService { * @Return * @Exception */ - // todo 缺少标协会员的联系人id void getProjectCount(String companyId,String contactsId); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PayIncomeContractAssociatedController.java b/jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PayIncomeContractAssociatedController.java index 44ae8053..9920ef8c 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PayIncomeContractAssociatedController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PayIncomeContractAssociatedController.java @@ -42,9 +42,9 @@ public class PayIncomeContractAssociatedController extends JeroController queryPageList(PayIncomeContractAssociated payIncomeContractAssociated, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, @@ -61,9 +61,9 @@ public class PayIncomeContractAssociatedController extends JeroController add(@RequestBody PayIncomeContractAssociated payIncomeContractAssociated) { payIncomeContractAssociatedService.save(payIncomeContractAssociated); return Result.OK("添加成功！"); @@ -75,9 +75,9 @@ public class PayIncomeContractAssociatedController extends JeroController edit(@RequestBody PayIncomeContractAssociated payIncomeContractAssociated) { payIncomeContractAssociatedService.updateById(payIncomeContractAssociated); return Result.OK("编辑成功!"); @@ -89,9 +89,9 @@ public class PayIncomeContractAssociatedController extends JeroController delete(@RequestParam(name="id",required=true) String id) { payIncomeContractAssociatedService.removeById(id); return Result.OK("删除成功!"); @@ -103,9 +103,9 @@ public class PayIncomeContractAssociatedController extends JeroController deleteBatch(@RequestParam(name="ids",required=true) String ids) { this.payIncomeContractAssociatedService.removeByIds(Arrays.asList(ids.split(","))); return Result.OK("批量删除成功!"); @@ -117,9 +117,9 @@ public class PayIncomeContractAssociatedController extends JeroController queryById(@RequestParam(name="id",required=true) String id) { PayIncomeContractAssociated payIncomeContractAssociated = payIncomeContractAssociatedService.getById(id); if(payIncomeContractAssociated==null) { @@ -134,7 +134,7 @@ public class PayIncomeContractAssociatedController extends JeroController importExcel(HttpServletRequest request, HttpServletResponse response) { return super.importExcel(request, response, PayIncomeContractAssociated.class); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PayIncomeContractAuditController.java b/jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PayIncomeContractAuditController.java index fec642a6..2b894b75 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PayIncomeContractAuditController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PayIncomeContractAuditController.java @@ -41,9 +41,9 @@ public class PayIncomeContractAuditController extends JeroController queryPageList(PayIncomeContractAudit payIncomeContractAudit, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, @@ -60,9 +60,9 @@ public class PayIncomeContractAuditController extends JeroController add(@RequestBody PayIncomeContractAudit payIncomeContractAudit) { payIncomeContractAuditService.save(payIncomeContractAudit); return Result.OK("添加成功！"); @@ -74,9 +74,9 @@ public class PayIncomeContractAuditController extends JeroController edit(@RequestBody PayIncomeContractAudit payIncomeContractAudit) { payIncomeContractAuditService.updateById(payIncomeContractAudit); return Result.OK("编辑成功!"); @@ -88,9 +88,9 @@ public class PayIncomeContractAuditController extends JeroController delete(@RequestParam(name="id",required=true) String id) { payIncomeContractAuditService.removeById(id); return Result.OK("删除成功!"); @@ -102,9 +102,9 @@ public class PayIncomeContractAuditController extends JeroController deleteBatch(@RequestParam(name="ids",required=true) String ids) { this.payIncomeContractAuditService.removeByIds(Arrays.asList(ids.split(","))); return Result.OK("批量删除成功!"); @@ -116,9 +116,9 @@ public class PayIncomeContractAuditController extends JeroController queryById(@RequestParam(name="id",required=true) String id) { PayIncomeContractAudit payIncomeContractAudit = payIncomeContractAuditService.getById(id); if(payIncomeContractAudit==null) { @@ -133,7 +133,7 @@ public class PayIncomeContractAuditController extends JeroController importExcel(HttpServletRequest request, HttpServletResponse response) { return super.importExcel(request, response, PayIncomeContractAudit.class); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PayIncomeContractController.java b/jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PayIncomeContractController.java index 40b573ed..c32f14e6 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PayIncomeContractController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PayIncomeContractController.java @@ -30,6 +30,7 @@ import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.StringUtils; +import org.apache.shiro.authz.annotation.RequiresPermissions; import org.jeecgframework.poi.excel.def.MapExcelConstants; import org.jeecgframework.poi.excel.entity.ExportParams; import org.jeecgframework.poi.excel.entity.params.ExcelExportEntity; @@ -78,7 +79,7 @@ public class PayIncomeContractController extends JeroController queryPageList(PayIncomeContract payIncomeContract, @@ -107,7 +108,9 @@ public class PayIncomeContractController extends JeroController add(@RequestBody PayIncomeContractInput input) { @@ -121,6 +124,7 @@ public class PayIncomeContractController extends JeroController getContractNum(@RequestParam(name="contractNum") String contractNum) { @@ -146,6 +150,7 @@ public class PayIncomeContractController extends JeroController getContractName(@RequestParam(name="contractName") String contractName) { @@ -172,6 +177,7 @@ public class PayIncomeContractController extends JeroController getContractById(@RequestParam(name="id") String id) { @@ -197,7 +203,9 @@ public class PayIncomeContractController extends JeroController edit(@RequestBody PayIncomeContractInput input) { @@ -211,7 +219,7 @@ public class PayIncomeContractController extends JeroController getAssociated(@RequestParam("contractId") String contractId) { @@ -233,6 +241,7 @@ public class PayIncomeContractController extends JeroController associated(@RequestBody List listPayIncomeContractAssociated) { @@ -247,6 +256,7 @@ public class PayIncomeContractController extends JeroController cancelAssociated(@RequestBody PayIncomeContractAssociated payIncomeContractAssociated) { @@ -273,6 +283,7 @@ public class PayIncomeContractController extends JeroController audit(@RequestBody PayIncomeContractAudit payIncomeContractAudit) { @@ -289,6 +300,7 @@ public class PayIncomeContractController extends JeroController archive(@RequestBody PayIncomeContractAudit payIncomeContractAudit) { @@ -304,7 +316,8 @@ public class PayIncomeContractController extends JeroController delete(@RequestParam(name="id") String id) { @@ -321,6 +334,7 @@ public class PayIncomeContractController extends JeroController deleteBatch(@RequestParam(name="ids") String ids) { @@ -342,7 +356,6 @@ public class PayIncomeContractController extends JeroController queryById(@RequestParam(name="id") String id) { @@ -414,6 +427,8 @@ public class PayIncomeContractController extends JeroController importExcel(HttpServletRequest request, HttpServletResponse response) { return super.importExcel(request, response, PayIncomeContract.class); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PayIncomeContractInstallmentController.java b/jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PayIncomeContractInstallmentController.java index 6366bf15..05b48808 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PayIncomeContractInstallmentController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PayIncomeContractInstallmentController.java @@ -43,9 +43,9 @@ public class PayIncomeContractInstallmentController extends JeroController queryPageList(PayIncomeContractInstallment payIncomeContractInstallment, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, @@ -62,9 +62,9 @@ public class PayIncomeContractInstallmentController extends JeroController add(@RequestBody PayIncomeContractInstallment payIncomeContractInstallment) { payIncomeContractInstallmentService.save(payIncomeContractInstallment); return Result.OK("添加成功！"); @@ -76,9 +76,9 @@ public class PayIncomeContractInstallmentController extends JeroController edit(@RequestBody PayIncomeContractInstallment payIncomeContractInstallment) { payIncomeContractInstallmentService.updateById(payIncomeContractInstallment); return Result.OK("编辑成功!"); @@ -90,9 +90,9 @@ public class PayIncomeContractInstallmentController extends JeroController delete(@RequestParam(name="id",required=true) String id) { payIncomeContractInstallmentService.removeById(id); return Result.OK("删除成功!"); @@ -104,9 +104,9 @@ public class PayIncomeContractInstallmentController extends JeroController deleteBatch(@RequestParam(name="ids",required=true) String ids) { this.payIncomeContractInstallmentService.removeByIds(Arrays.asList(ids.split(","))); return Result.OK("批量删除成功!"); @@ -118,9 +118,9 @@ public class PayIncomeContractInstallmentController extends JeroController queryById(@RequestParam(name="id",required=true) String id) { PayIncomeContractInstallment payIncomeContractInstallment = payIncomeContractInstallmentService.getById(id); if(payIncomeContractInstallment==null) { @@ -135,7 +135,7 @@ public class PayIncomeContractInstallmentController extends JeroController importExcel(HttpServletRequest request, HttpServletResponse response) { return super.importExcel(request, response, PayIncomeContractInstallment.class); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PaySpendingContractController.java b/jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PaySpendingContractController.java index d1240b35..b7d73183 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PaySpendingContractController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PaySpendingContractController.java @@ -29,6 +29,7 @@ import com.jero.contract.vo.*; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.StringUtils; +import org.apache.shiro.authz.annotation.RequiresPermissions; import org.jeecgframework.poi.excel.def.MapExcelConstants; import org.jeecgframework.poi.excel.entity.ExportParams; import org.jeecgframework.poi.excel.entity.params.ExcelExportEntity; @@ -71,7 +72,7 @@ public class PaySpendingContractController extends JeroController queryPageList(PaySpendingContract paySpendingContract, @@ -99,6 +100,7 @@ public class PaySpendingContractController extends JeroController add(@RequestBody PaySpendingContractInput input) { @@ -113,6 +115,7 @@ public class PaySpendingContractController extends JeroController edit(@RequestBody PaySpendingContractInput input) { @@ -125,6 +128,7 @@ public class PaySpendingContractController extends JeroController getContractNum(@RequestParam(name="contractNum") String contractNum) { @@ -150,7 +154,8 @@ public class PaySpendingContractController extends JeroController delete(@RequestParam(name="id") String id) { @@ -168,6 +173,7 @@ public class PaySpendingContractController extends JeroController deleteBatch(@RequestParam(name="ids") String ids) { @@ -190,7 +196,7 @@ public class PaySpendingContractController extends JeroController queryById(@RequestParam(name="id") String id) { @@ -223,6 +229,8 @@ public class PaySpendingContractController extends JeroController importExcel(HttpServletRequest request, HttpServletResponse response) { paySpendingContractService.importExcel(request); return Result.OK("文件导入成功！"); diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PaySpendingContractInstallmentController.java b/jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PaySpendingContractInstallmentController.java index 23eae046..05a30c13 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PaySpendingContractInstallmentController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PaySpendingContractInstallmentController.java @@ -41,9 +41,9 @@ public class PaySpendingContractInstallmentController extends JeroController queryPageList(PaySpendingContractInstallment paySpendingContractInstallment, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, @@ -60,9 +60,9 @@ public class PaySpendingContractInstallmentController extends JeroController add(@RequestBody PaySpendingContractInstallment paySpendingContractInstallment) { paySpendingContractInstallmentService.save(paySpendingContractInstallment); return Result.OK("添加成功！"); @@ -76,7 +76,7 @@ public class PaySpendingContractInstallmentController extends JeroController edit(@RequestBody PaySpendingContractInstallment paySpendingContractInstallment) { paySpendingContractInstallmentService.updateById(paySpendingContractInstallment); return Result.OK("编辑成功!"); @@ -90,7 +90,7 @@ public class PaySpendingContractInstallmentController extends JeroController delete(@RequestParam(name="id",required=true) String id) { paySpendingContractInstallmentService.removeById(id); return Result.OK("删除成功!"); @@ -104,7 +104,7 @@ public class PaySpendingContractInstallmentController extends JeroController deleteBatch(@RequestParam(name="ids",required=true) String ids) { this.paySpendingContractInstallmentService.removeByIds(Arrays.asList(ids.split(","))); return Result.OK("批量删除成功!"); @@ -118,7 +118,7 @@ public class PaySpendingContractInstallmentController extends JeroController queryById(@RequestParam(name="id",required=true) String id) { PaySpendingContractInstallment paySpendingContractInstallment = paySpendingContractInstallmentService.getById(id); if(paySpendingContractInstallment==null) { @@ -133,7 +133,7 @@ public class PaySpendingContractInstallmentController extends JeroController importExcel(HttpServletRequest request, HttpServletResponse response) { return super.importExcel(request, response, PaySpendingContractInstallment.class); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PayIncomeContractInstallmentServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PayIncomeContractInstallmentServiceImpl.java index 772531e6..77b384be 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PayIncomeContractInstallmentServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PayIncomeContractInstallmentServiceImpl.java @@ -1,7 +1,13 @@ package com.jero.contract.service.impl; +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.jero.common.dto.SendMessageDTO; +import com.jero.common.enums.CompanyMessageEnums; +import com.jero.common.enums.ManagementMessageEnums; +import com.jero.common.service.SendMessageService; import com.jero.common.system.api.ISysBaseAPI; +import com.jero.common.system.vo.LoginUser; import com.jero.common.util.HuaWeiSmsUtil; import com.jero.common.util.PasswordUtil; import com.jero.contract.entity.PayIncomeContractInstallment; @@ -10,10 +16,13 @@ import com.jero.contract.service.IPayIncomeContractInstallmentService; import com.jero.modules.message.handle.impl.EmailSendMsgHandle; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.StringUtils; +import org.apache.shiro.SecurityUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import javax.annotation.Resource; +import java.math.BigDecimal; +import java.util.HashMap; import java.util.List; /** @@ -26,26 +35,31 @@ import java.util.List; public class PayIncomeContractInstallmentServiceImpl extends ServiceImpl implements IPayIncomeContractInstallmentService { @Resource private PayIncomeContractInstallmentMapper payIncomeContractInstallmentMapper; - @Autowired - private HuaWeiSmsUtil huaWeiSmsUtil; - @Autowired - private ISysBaseAPI sysBaseAPI; + @Resource + private SendMessageService sendMessageService; @Override public void sendSMSIncomeContract() { List list = payIncomeContractInstallmentMapper.getIncomeContract(); list.forEach(p->{ + // 发送消息 + SendMessageDTO sendMessageDTO = new SendMessageDTO(); if(!StringUtils.isBlank(p.getPhone())){ - String msg = "中汽数据中心提醒您，贵公司与中汽数据签订的" + p.getContractName() + "合同" + p.getPhaseName() - + "期款项时间即将到达，汇款金额" + p.getAccountsReceivableAmount() + "元，请及时汇款，如已经汇款，请忽略此条通知。谢谢合作"; - // huaWeiSmsUtil.sendVerificationCode(PasswordUtil.decrypt(p.getPhone()),"5","60",msg); + sendMessageDTO.setPhone(PasswordUtil.decrypt(p.getPhone())); + sendMessageDTO.setToUser(PasswordUtil.decrypt(p.getPhone())); } if(!StringUtils.isBlank(p.getEmail())){ - String msg = "中汽数据中心提醒您，贵公司与中汽数据签订的" + p.getContractName() + "合同" + p.getPhaseName() - + "期款项时间即将到达，汇款金额" + p.getAccountsReceivableAmount() + "元，请及时汇款，如已经汇款，请忽略此条通知。谢谢合作"; - sysBaseAPI.sendEmailMsg(PasswordUtil.decrypt(p.getEmail()), "", msg); + sendMessageDTO.setEmail(PasswordUtil.decrypt(p.getEmail())); } - // todo 缺少发消息 + HashMap map = new HashMap<>(); + map.put("contract",p.getContractName()); + map.put("num",p.getPhaseName()); + map.put("amount", String.valueOf(p.getAccountsReceivableAmount())); + sendMessageDTO.setFromUser("admin"); + sendMessageDTO.setTemplateCode(CompanyMessageEnums.MSG8.getCode()); + sendMessageDTO.setTemplateParam(map); + sendMessageDTO.setBusType("C_OPEN_TYPE8"); + sendMessageService.SendMessageService(sendMessageDTO); }); } } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PayIncomeContractServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PayIncomeContractServiceImpl.java index c5d330c5..543a5a70 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PayIncomeContractServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PayIncomeContractServiceImpl.java @@ -1,5 +1,6 @@ package com.jero.contract.service.impl; +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -29,16 +30,21 @@ import com.jero.contract.service.IPayIncomeContractService; import com.jero.contract.vo.PayIncomeContractInput; import com.jero.contract.vo.ProjectOutput; import com.jero.meeting.common.MeetingSubitemCommon; +import com.jero.meeting.entity.PayMeeting; import com.jero.meeting.entity.PayMeetingSituation; +import com.jero.meeting.service.IPayMeetingService; import com.jero.meeting.service.IPayMeetingSituationService; import com.jero.member.entity.PayMemberProject; import com.jero.member.entity.PayMemberProjectSubitem; +import com.jero.member.entity.TbMemberProject; import com.jero.member.entity.TbMemberProjectSubitem; import com.jero.member.service.IPayMemberProjectService; import com.jero.member.service.IPayMemberProjectSubitemService; +import com.jero.member.service.ITbMemberProjectService; import com.jero.member.service.ITbMemberProjectSubitemService; import com.jero.modules.system.entity.SysUser; import com.jero.modules.system.service.ISysUserService; +import com.jero.pack.common.PackCommon; import com.jero.pack.entity.PayPackCompanyProject; import com.jero.pack.service.IPayPackCompanyProjectService; import com.jero.project.common.PayProjectCommon; @@ -107,6 +113,10 @@ public class PayIncomeContractServiceImpl extends ServiceImpl queryPageList(Page page, PayIncomeContract payIncomeContract, String chargeStatus,String projectName, String startTime, String endTime) { @@ -296,6 +306,7 @@ public class PayIncomeContractServiceImpl extends ServiceImpl{ + String projectName = ""; ProjectOutput projectOutput = new ProjectOutput(); StringBuilder msgPayIncomeContractAssociated = ValidUtil.validateAll(p); if(!StringUtils.isBlank(msgPayIncomeContractAssociated)){ @@ -338,6 +349,7 @@ public class PayIncomeContractServiceImpl extends ServiceImpl list = sysUserService.getRolesUser(Arrays.asList(RoleCommon.XMFZR)); + if(!CollectionUtils.isEmpty(list)){ + String finalProjectName = projectName; + list.forEach(item->{ + // 发送消息 + SendMessageDTO sendMessageDTO = new SendMessageDTO(); + if(!StringUtils.isBlank(item.getEmail())){ + sendMessageDTO.setEmail(PasswordUtil.decrypt(item.getEmail())); + } + HashMap map = new HashMap<>(); + map.put("projectName", finalProjectName); + sendMessageDTO.setFromUser(sysUser.getUsername()); + sendMessageDTO.setToUser(item.getUsername()); + sendMessageDTO.setTemplateCode(ManagementMessageEnums.MSG7.getCode()); + sendMessageDTO.setTemplateParam(map); + sendMessageDTO.setBusType("M_OPEN_TYPE7"); + JSONObject json = new JSONObject(); + json.put("id",p.getProjectId()); + sendMessageDTO.setBusId(json.toJSONString()); + sendMessageService.SendMessageService(sendMessageDTO); + }); + } + } }); } /** @@ -667,7 +717,6 @@ public class PayIncomeContractServiceImpl extends ServiceImpl list = sysUserService.getRolesUser(Arrays.asList(RoleCommon.CWRY)); if(!CollectionUtils.isEmpty(list)){ @@ -680,12 +729,14 @@ public class PayIncomeContractServiceImpl extends ServiceImpl map = new HashMap<>(); map.put("contractNum",payIncomeContractNew.getContractNum()); map.put("contractName",payIncomeContractNew.getContractName()); - sendMessageDTO.setFromUser(sysUser.getId()); + sendMessageDTO.setFromUser(sysUser.getUsername()); sendMessageDTO.setToUser(p.getUsername()); sendMessageDTO.setTemplateCode(ManagementMessageEnums.MSG2.getCode()); sendMessageDTO.setTemplateParam(map); - sendMessageDTO.setBusType("email"); - sendMessageDTO.setBusId(p.getId()); + sendMessageDTO.setBusType("M_OPEN_TYPE2"); + JSONObject json = new JSONObject(); + json.put("revenueId",payIncomeContractNew.getId()); + sendMessageDTO.setBusId(json.toJSONString()); sendMessageService.SendMessageService(sendMessageDTO); }); } @@ -799,6 +850,46 @@ public class PayIncomeContractServiceImpl extends ServiceImpl list = sysUserService.getRolesUser(Arrays.asList(role)); + if(!CollectionUtils.isEmpty(list)){ + String finalType = type; + String finalCode = code; + list.forEach(p->{ + // 发送消息 + SendMessageDTO sendMessageDTO = new SendMessageDTO(); + if(!StringUtils.isBlank(p.getEmail())){ + sendMessageDTO.setEmail(PasswordUtil.decrypt(p.getEmail())); + } + HashMap map = new HashMap<>(); + map.put("contractNum",payIncomeContractStatus.getContractNum()); + map.put("contractName",payIncomeContractStatus.getContractName()); + sendMessageDTO.setFromUser(sysUser.getUsername()); + sendMessageDTO.setToUser(p.getUsername()); + sendMessageDTO.setTemplateCode(finalCode); + sendMessageDTO.setTemplateParam(map); + sendMessageDTO.setBusType(finalType); + JSONObject json = new JSONObject(); + json.put("revenueId",payIncomeContractStatus.getId()); + sendMessageDTO.setBusId(json.toJSONString()); + sendMessageService.SendMessageService(sendMessageDTO); + }); + } } @Override diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PaySpendingContractInstallmentServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PaySpendingContractInstallmentServiceImpl.java index 7147f65b..12070f90 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PaySpendingContractInstallmentServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PaySpendingContractInstallmentServiceImpl.java @@ -1,6 +1,9 @@ package com.jero.contract.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.jero.common.dto.SendMessageDTO; +import com.jero.common.enums.CompanyMessageEnums; +import com.jero.common.service.SendMessageService; import com.jero.common.system.api.ISysBaseAPI; import com.jero.common.util.HuaWeiSmsUtil; import com.jero.common.util.PasswordUtil; @@ -13,6 +16,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import javax.annotation.Resource; +import java.util.HashMap; import java.util.List; /** @@ -23,31 +27,34 @@ import java.util.List; */ @Service public class PaySpendingContractInstallmentServiceImpl extends ServiceImpl implements IPaySpendingContractInstallmentService { - - @Autowired - private HuaWeiSmsUtil huaWeiSmsUtil; - @Autowired - private ISysBaseAPI sysBaseAPI; - + @Resource + private SendMessageService sendMessageService; @Resource private PaySpendingContractInstallmentMapper paySpendingContractInstallmentMapper; + @Override public void sendSMSSpendingContract() { List list = paySpendingContractInstallmentMapper.getSpendingContract(); if(!CollectionUtils.isEmpty(list)){ - // todo 发短信 list.forEach(p->{ + // 发送消息 + SendMessageDTO sendMessageDTO = new SendMessageDTO(); if(!StringUtils.isBlank(p.getPhone())){ - String msg = "中汽数据中心提醒您，贵公司与中汽数据签订的" + p.getContractName() + "合同" + p.getPhaseName() - + "期款项时间即将到达，汇款金额" + p.getAccountsReceivableAmount() + "元，请及时汇款，如已经汇款，请忽略此条通知。谢谢合作"; - // huaWeiSmsUtil.sendVerificationCode(PasswordUtil.decrypt(p.getPhone()),"5","60",msg); + sendMessageDTO.setPhone(PasswordUtil.decrypt(p.getPhone())); + sendMessageDTO.setToUser(PasswordUtil.decrypt(p.getPhone())); } if(!StringUtils.isBlank(p.getEmail())){ - String msg = "中汽数据中心提醒您，贵公司与中汽数据签订的" + p.getContractName() + "合同" + p.getPhaseName() - + "期款项时间即将到达，汇款金额" + p.getAccountsReceivableAmount() + "元，请及时汇款，如已经汇款，请忽略此条通知。谢谢合作"; - sysBaseAPI.sendEmailMsg(PasswordUtil.decrypt(p.getEmail()), "", msg); + sendMessageDTO.setEmail(PasswordUtil.decrypt(p.getEmail())); } - // todo 缺少发消息 + HashMap map = new HashMap<>(); + map.put("contract",p.getContractName()); + map.put("num",p.getPhaseName()); + map.put("amount", String.valueOf(p.getAccountsReceivableAmount())); + sendMessageDTO.setFromUser("admin"); + sendMessageDTO.setTemplateCode(CompanyMessageEnums.MSG8.getCode()); + sendMessageDTO.setTemplateParam(map); + sendMessageDTO.setBusType("C_OPEN_TYPE8"); + sendMessageService.SendMessageService(sendMessageDTO); }); } } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/home/HomeController.java b/jero-boot-incoming-payment/src/main/java/com/jero/home/HomeController.java deleted file mode 100644 index bbbf2d24..00000000 --- a/jero-boot-incoming-payment/src/main/java/com/jero/home/HomeController.java +++ /dev/null @@ -1,40 +0,0 @@ -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; - - -/** - * @Description: 首页 - * @Author: jeecg-boot - * @Date: 2021-09-24 - * @Version: V1.0 - */ -@Api(tags="首页") -@RestController -@RequestMapping("/home") -@Slf4j -public class HomeController { - - @Autowired - private IPayPaymentRecordService payPaymentRecordService; - - /** - * 首页-数据统计 - * - * @return - */ - @ApiOperation(value="首页-数据统计", notes="首页-数据统计") - @GetMapping(value = "/dataStatistics") - public Result dataStatistics() { - - return null; - } -} diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/home/controller/HomeController.java b/jero-boot-incoming-payment/src/main/java/com/jero/home/controller/HomeController.java new file mode 100644 index 00000000..ed04a133 --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/home/controller/HomeController.java @@ -0,0 +1,69 @@ +package com.jero.home.controller; + +import com.jero.common.api.vo.Result; +import com.jero.home.vo.DataStatisticsVO; +import com.jero.mail.service.IPayMailBillService; +import com.jero.payment.service.IPayPaymentRecordService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import javax.annotation.Resource; +import java.math.BigDecimal; +import java.time.LocalDate; +import java.time.format.DateTimeFormatter; +import java.util.Objects; + + +/** + * @Description: 首页 + * @Author: jeecg-boot + * @Date: 2021-09-24 + * @Version: V1.0 + */ +@Api(tags="首页") +@RestController +@RequestMapping("/home") +@Slf4j +public class HomeController { + + @Resource + private IPayPaymentRecordService payPaymentRecordService; + + @Resource + private IPayMailBillService payMailBillService; + + /** + * 首页-数据统计 + * + * @return + */ + @ApiOperation(value="首页-数据统计", notes="首页-数据统计") + @GetMapping(value = "/dataStatistics") + public Result dataStatistics() { + DataStatisticsVO dataStatisticsVO = new DataStatisticsVO(); + DateTimeFormatter formatters = DateTimeFormatter.ofPattern("yyyy-MM"); + LocalDate today = LocalDate.now(); + // 本月 + String d1 = formatters.format(today); + // 上月 + String d2 = formatters.format(today.minusMonths(1)); + // 本月应收总额 + BigDecimal b1 = payPaymentRecordService.getMonthAmountCount(d1); + if(Objects.isNull(b1)){ + b1 = new BigDecimal("0.00"); + } + // 上月应收总额 + BigDecimal b2 = payPaymentRecordService.getMonthAmountCount(d2); + if(Objects.isNull(b2)){ + b2 = new BigDecimal("0.00"); + } + dataStatisticsVO.setNowMonthAddAmount(b1.subtract(b2)); + dataStatisticsVO.setNowMonthAmount(b1.divide(new BigDecimal("10000"))); + int m = payMailBillService.getMonthMailCount(d1); + dataStatisticsVO.setNowMonthMail(m); + return Result.OK(dataStatisticsVO); + } +} diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/home/vo/DataStatisticsVO.java b/jero-boot-incoming-payment/src/main/java/com/jero/home/vo/DataStatisticsVO.java new file mode 100644 index 00000000..0722d4b3 --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/home/vo/DataStatisticsVO.java @@ -0,0 +1,33 @@ +package com.jero.home.vo; + +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.DecimalMax; +import java.io.Serializable; +import java.math.BigDecimal; + +@Data +public class DataStatisticsVO implements Serializable { + /** + * 本月新增收款项 + */ + @ApiModelProperty(value = "本月新增收款项") + @DecimalMax(value = "9999999999.99",message = "本月新增收款项格式错误") + @JsonFormat(shape = JsonFormat.Shape.STRING) + private BigDecimal nowMonthAddAmount; + /** + * 本月到账（万元） + */ + @ApiModelProperty(value = "本月到账（万元）") + @DecimalMax(value = "9999999999.99",message = "本月到账（万元）格式错误") + @JsonFormat(shape = JsonFormat.Shape.STRING) + private BigDecimal nowMonthAmount; + /** + * 本月邮寄项 + */ + @ApiModelProperty(value = "本月邮寄项") + private Integer nowMonthMail; + +} diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/mail/mapper/PayMailBillMapper.java b/jero-boot-incoming-payment/src/main/java/com/jero/mail/mapper/PayMailBillMapper.java index 01276058..aca847a9 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/mail/mapper/PayMailBillMapper.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/mail/mapper/PayMailBillMapper.java @@ -32,6 +32,13 @@ public interface PayMailBillMapper extends BaseMapper { List selectInvoicingStage(@Param("projectId")String projectId); - - + /** + * @Description 查询月份邮寄数量 + * @Author lqt + * @Date 2021/9/25 + * @Param time 年月 + * @Return + * @Exception + */ + Integer getMonthMailCount(String time); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/mail/mapper/xml/PayMailBillMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/mail/mapper/xml/PayMailBillMapper.xml index 974a10b9..5da755f2 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/mail/mapper/xml/PayMailBillMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/mail/mapper/xml/PayMailBillMapper.xml @@ -49,6 +49,7 @@ inner JOIN pay_mail_bill_project pmbp on pmb.id = pmbp.bill_id where pmbp.project_id=#{projectId} - - + \ No newline at end of file diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/mail/service/IPayMailBillService.java b/jero-boot-incoming-payment/src/main/java/com/jero/mail/service/IPayMailBillService.java index 644acc57..287ff0fe 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/mail/service/IPayMailBillService.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/mail/service/IPayMailBillService.java @@ -1,14 +1,9 @@ package com.jero.mail.service; -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.baomidou.mybatisplus.extension.service.IService; import com.jero.common.api.vo.Result; import com.jero.mail.PayMailBillVO; import com.jero.mail.entity.PayMailBill; -import com.jero.mail.entity.PayMailBillProject; -import com.jero.mail.entity.PayMailBillSearch; import java.util.List; @@ -56,4 +51,13 @@ public interface IPayMailBillService extends IService { * @param payMailBill */ void addFromStandards(PayMailBill payMailBill); + /** + * @Description 查询月份邮寄数量 + * @Author lqt + * @Date 2021/9/25 + * @Param time 年月 + * @Return + * @Exception + */ + Integer getMonthMailCount(String time); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/mail/service/impl/PayMailBillServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/mail/service/impl/PayMailBillServiceImpl.java index 7c34364f..2a746884 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/mail/service/impl/PayMailBillServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/mail/service/impl/PayMailBillServiceImpl.java @@ -242,6 +242,11 @@ public class PayMailBillServiceImpl extends ServiceImpl bmpList) { diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java index 103bf8e9..3942f202 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java @@ -123,7 +123,7 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl queryPageList(PayPackCompany payPackCompany, @@ -106,6 +107,7 @@ public class PayPackCompanyController extends JeroController add(@RequestBody PayPackCompany payPackCompany) { @@ -124,6 +126,7 @@ public class PayPackCompanyController extends JeroController edit(@RequestBody PayPackCompany payPackCompany) { @@ -141,7 +144,8 @@ public class PayPackCompanyController extends JeroController delete(@RequestParam(name="id") String id) { @@ -165,6 +169,7 @@ public class PayPackCompanyController extends JeroController deleteBatch(@RequestParam(name="ids") String ids) { @@ -193,7 +198,6 @@ public class PayPackCompanyController extends JeroController queryById(@RequestParam(name="id") String id) { @@ -247,7 +251,7 @@ public class PayPackCompanyController extends JeroController importExcel(HttpServletRequest request, HttpServletResponse response) { return super.importExcel(request, response, PayPackCompany.class); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/pack/controller/PayPackCompanyProjectController.java b/jero-boot-incoming-payment/src/main/java/com/jero/pack/controller/PayPackCompanyProjectController.java index 0c10e127..4f00ed92 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/pack/controller/PayPackCompanyProjectController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/pack/controller/PayPackCompanyProjectController.java @@ -37,6 +37,7 @@ import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.apache.shiro.SecurityUtils; +import org.apache.shiro.authz.annotation.RequiresPermissions; import org.jeecgframework.poi.excel.def.NormalExcelConstants; import org.jeecgframework.poi.excel.entity.ExportParams; import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; @@ -78,7 +79,7 @@ public class PayPackCompanyProjectController extends JeroController queryPageList(PayPackCompanyProject payPackCompanyProject, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, @@ -95,7 +96,7 @@ public class PayPackCompanyProjectController extends JeroController queryListAll(PayPackCompanyProjectInput input) { @@ -129,7 +130,6 @@ public class PayPackCompanyProjectController extends JeroController queryNotPackListAll(PayPackCompanyProjectInput input) { @@ -164,6 +164,7 @@ public class PayPackCompanyProjectController extends JeroController add(@RequestBody PayPackCompanyProject payPackCompanyProject) { @@ -177,6 +178,7 @@ public class PayPackCompanyProjectController extends JeroController remove(@RequestBody PayPackCompanyProject payPackCompanyProject) { @@ -193,6 +195,7 @@ public class PayPackCompanyProjectController extends JeroController removeBatch(@RequestBody PayPackCompanyProject payPackCompanyProject) { @@ -209,9 +212,9 @@ public class PayPackCompanyProjectController extends JeroController edit(@RequestBody PayPackCompanyProject payPackCompanyProject) { payPackCompanyProjectService.updateById(payPackCompanyProject); return Result.OK("编辑成功!"); @@ -223,9 +226,9 @@ public class PayPackCompanyProjectController extends JeroController delete(@RequestParam(name="id",required=true) String id) { payPackCompanyProjectService.removeById(id); return Result.OK("删除成功!"); @@ -239,7 +242,7 @@ public class PayPackCompanyProjectController extends JeroController deleteBatch(@RequestParam(name="ids",required=true) String ids) { this.payPackCompanyProjectService.removeByIds(Arrays.asList(ids.split(","))); return Result.OK("批量删除成功!"); @@ -253,7 +256,7 @@ public class PayPackCompanyProjectController extends JeroController queryById(@RequestParam(name="id",required=true) String id) { PayPackCompanyProject payPackCompanyProject = payPackCompanyProjectService.getById(id); if(payPackCompanyProject==null) { @@ -268,6 +271,8 @@ public class PayPackCompanyProjectController extends JeroController importExcel(HttpServletRequest request, HttpServletResponse response) { return super.importExcel(request, response, PayPackCompanyProject.class); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/pack/service/impl/PayPackCompanyProjectServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/pack/service/impl/PayPackCompanyProjectServiceImpl.java index 646a72ab..3f32c882 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/pack/service/impl/PayPackCompanyProjectServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/pack/service/impl/PayPackCompanyProjectServiceImpl.java @@ -1,11 +1,21 @@ package com.jero.pack.service.impl; +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.jero.common.api.vo.Result; +import com.jero.common.common.RoleCommon; +import com.jero.common.dto.SendMessageDTO; +import com.jero.common.enums.ManagementMessageEnums; import com.jero.common.exception.JeroBootException; +import com.jero.common.mapper.ProjectDetailMapper; import com.jero.common.service.ProjectPackService; +import com.jero.common.service.SendMessageService; +import com.jero.common.system.vo.LoginUser; +import com.jero.common.util.PasswordUtil; import com.jero.contract.common.PayIncomeContractCommon; +import com.jero.modules.system.entity.SysUser; +import com.jero.modules.system.service.ISysUserService; import com.jero.pack.common.PackCommon; import com.jero.pack.entity.PayPackCompany; import com.jero.pack.entity.PayPackCompanyProject; @@ -17,16 +27,14 @@ import com.jero.pack.vo.PayProjectExcel; import com.jero.project.entity.PayCommonProject; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.StringUtils; +import org.apache.shiro.SecurityUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Isolation; import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.Objects; +import java.util.*; /** * @Description: pay_pack_company_project @@ -45,6 +53,12 @@ public class PayPackCompanyProjectServiceImpl extends ServiceImpl list = sysUserService.getRolesUser(Arrays.asList(RoleCommon.XMFZR)); + for (String s1 : s) { + if (StringUtils.isBlank(s1)) { + continue; + } + // 获取项目信息 + PayCommonProject payCommonProject = projectDetailMapper.queryProject(s1); + if(Objects.isNull(payCommonProject)){ + continue; + } + if(!CollectionUtils.isEmpty(list)){ + list.forEach(p->{ + // 发送消息 + SendMessageDTO sendMessageDTO = new SendMessageDTO(); + if(!StringUtils.isBlank(p.getEmail())){ + sendMessageDTO.setEmail(PasswordUtil.decrypt(p.getEmail())); + } + HashMap map = new HashMap<>(); + map.put("projectName",payCommonProject.getChargeProject()); + sendMessageDTO.setFromUser(sysUser.getUsername()); + sendMessageDTO.setToUser(p.getUsername()); + sendMessageDTO.setTemplateCode(ManagementMessageEnums.MSG6.getCode()); + sendMessageDTO.setTemplateParam(map); + sendMessageDTO.setBusType("M_OPEN_TYPE6"); + JSONObject json = new JSONObject(); + json.put("id",payCommonProject.getId()); + sendMessageDTO.setBusId(json.toJSONString()); + sendMessageService.SendMessageService(sendMessageDTO); + }); + } + } } @Override diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/payment/mapper/PayPaymentRecordMapper.java b/jero-boot-incoming-payment/src/main/java/com/jero/payment/mapper/PayPaymentRecordMapper.java index b0fe893e..0cba2dab 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/payment/mapper/PayPaymentRecordMapper.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/payment/mapper/PayPaymentRecordMapper.java @@ -2,11 +2,13 @@ package com.jero.payment.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.jero.home.vo.DataStatisticsVO; import com.jero.payment.entity.PayPaymentRecord; import com.jero.project.entity.PayCommonProject; import com.jero.project.vo.PayCommonProjectOutput; import io.lettuce.core.dynamic.annotation.Param; +import java.math.BigDecimal; import java.util.List; /** @@ -36,4 +38,14 @@ public interface PayPaymentRecordMapper extends BaseMapper { @Param("payCommonProject")PayCommonProject payCommonProject, @Param("projectType") String projectType, @Param("paymentDate") String paymentDate); + + /** + * @Description 查询月份应收总额 + * @Author lqt + * @Date 2021/9/25 + * @Param time 年-月 + * @Return + * @Exception + */ + BigDecimal getMonthAmountCount(String time); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/payment/mapper/xml/PayPaymentRecordMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/payment/mapper/xml/PayPaymentRecordMapper.xml index febf32c7..f8bc21c1 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/payment/mapper/xml/PayPaymentRecordMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/payment/mapper/xml/PayPaymentRecordMapper.xml @@ -201,4 +201,7 @@ GROUP BY p.id ORDER BY p.create_time + \ No newline at end of file diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/IPayPaymentRecordService.java b/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/IPayPaymentRecordService.java index 731a39e2..1734c74b 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/IPayPaymentRecordService.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/IPayPaymentRecordService.java @@ -1,9 +1,9 @@ package com.jero.payment.service; -import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.jero.common.api.vo.Result; +import com.jero.home.vo.DataStatisticsVO; import com.jero.payment.entity.PayPaymentRecord; import com.jero.payment.vo.TbCheckVo; import com.jero.project.entity.PayCommonProject; @@ -11,6 +11,7 @@ import com.jero.project.vo.PayCommonProjectOutput; import org.springframework.web.servlet.ModelAndView; import javax.servlet.http.HttpServletRequest; +import java.math.BigDecimal; import java.util.List; /** @@ -55,4 +56,13 @@ public interface IPayPaymentRecordService extends IService { * @return */ public ModelAndView exportXls(HttpServletRequest request, PayCommonProject payCommonProject,String projectType, String paymentDate, Class clazz, String title); + /** + * @Description 查询月份应收总额 + * @Author lqt + * @Date 2021/9/25 + * @Param time 年-月 + * @Return + * @Exception + */ + BigDecimal getMonthAmountCount(String time); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayPaymentRecordServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayPaymentRecordServiceImpl.java index 4e6e2441..9f38f6f5 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayPaymentRecordServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayPaymentRecordServiceImpl.java @@ -1,6 +1,5 @@ package com.jero.payment.service.impl; -import cn.hutool.http.HttpUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -9,6 +8,7 @@ import com.jero.common.exception.JeroBootException; import com.jero.common.system.api.ISysBaseAPI; import com.jero.common.util.oConvertUtils; import com.jero.contract.common.PayIncomeContractCommon; +import com.jero.home.vo.DataStatisticsVO; import com.jero.meeting.entity.PayMeetingSituation; import com.jero.meeting.mapper.PayMeetingSituationMapper; import com.jero.member.entity.PayMemberProjectSubitem; @@ -25,7 +25,6 @@ import com.jero.project.mapper.PayCommonProjectMapper; import com.jero.project.mapper.PayWorkingGroupSubItemMapper; import com.jero.common.util.AuthenticationUtils; import com.jero.project.vo.PayCommonProjectOutput; -import io.lettuce.core.dynamic.annotation.Param; import org.apache.commons.beanutils.PropertyUtils; import org.jeecgframework.poi.excel.def.NormalExcelConstants; import org.jeecgframework.poi.excel.entity.ExportParams; @@ -38,7 +37,6 @@ import org.springframework.web.servlet.ModelAndView; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; -import java.beans.Transient; import java.math.BigDecimal; import java.util.*; import java.util.stream.Collectors; @@ -424,6 +422,11 @@ public class PayPaymentRecordServiceImpl extends ServiceImpl queryPageList(PayCommonProject payCommonProject, @@ -185,6 +188,8 @@ public class PayCommonProjectController extends JeroController add(@RequestBody PayCommonProject payCommonProject) { @@ -202,6 +207,8 @@ public class PayCommonProjectController extends JeroController edit(@RequestBody PayCommonProject payCommonProject) { @@ -221,6 +228,8 @@ public class PayCommonProjectController extends JeroController delete(@RequestParam(name="id") String id) { @@ -234,6 +243,8 @@ public class PayCommonProjectController extends JeroController deleteBatch(@RequestParam(name="ids") String ids) { @@ -298,7 +309,7 @@ public class PayCommonProjectController extends JeroController importExcel(HttpServletRequest request, HttpServletResponse response) { return super.importExcel(request, response, PayCommonProject.class); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupController.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupController.java index 1e2a2e7f..4c5fb920 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupController.java @@ -33,6 +33,7 @@ import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.apache.shiro.SecurityUtils; +import org.apache.shiro.authz.annotation.RequiresPermissions; import org.jeecgframework.poi.excel.def.NormalExcelConstants; import org.jeecgframework.poi.excel.entity.ExportParams; import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; @@ -62,8 +63,6 @@ public class PayWorkingGroupController extends JeroController queryPageList(PayWorkingGroup payWorkingGroup, @@ -101,7 +102,7 @@ public class PayWorkingGroupController extends JeroController queryList(PayWorkingGroup payWorkingGroup,HttpServletRequest req) { @@ -116,7 +117,7 @@ public class PayWorkingGroupController extends JeroController checkoutOperation(@RequestParam("id") String id) { @@ -143,7 +144,7 @@ public class PayWorkingGroupController extends JeroController queryListByCompany(@RequestParam(name = "companyId") String companyId, @@ -187,7 +188,7 @@ public class PayWorkingGroupController extends JeroController queryListByNotCompany(@RequestParam(name = "companyId") String companyId) { @@ -247,6 +248,8 @@ public class PayWorkingGroupController extends JeroController copy(@RequestBody PayWorkingGroup payWorkingGroup) { @@ -263,6 +266,8 @@ public class PayWorkingGroupController extends JeroController add(@RequestBody PayWorkingGroup payWorkingGroup) { @@ -294,6 +299,8 @@ public class PayWorkingGroupController extends JeroController edit(@RequestBody PayWorkingGroup payWorkingGroup) { @@ -324,6 +331,8 @@ public class PayWorkingGroupController extends JeroController delete(@RequestParam(name="id") String id) { @@ -340,6 +349,8 @@ public class PayWorkingGroupController extends JeroController deleteBatch(@RequestParam(name="ids") String ids) { @@ -378,7 +389,7 @@ public class PayWorkingGroupController extends JeroController importExcel(HttpServletRequest request, HttpServletResponse response) { return super.importExcel(request, response, PayWorkingGroup.class); diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupDataFileController.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupDataFileController.java index 24de636c..a8c9bf62 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupDataFileController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupDataFileController.java @@ -20,6 +20,7 @@ import com.jero.project.service.IPayWorkingGroupDataFileService; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.StringUtils; +import org.apache.shiro.authz.annotation.RequiresPermissions; import org.jeecgframework.poi.excel.def.NormalExcelConstants; import org.jeecgframework.poi.excel.entity.ExportParams; import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; @@ -55,7 +56,7 @@ public class PayWorkingGroupDataFileController extends JeroController queryPageList(PayWorkingGroupDataFile payWorkingGroupDataFile, @@ -80,7 +81,9 @@ public class PayWorkingGroupDataFileController extends JeroController add(@RequestBody PayWorkingGroupDataFile payWorkingGroupDataFile) { @@ -136,7 +139,8 @@ public class PayWorkingGroupDataFileController extends JeroController delete(@RequestParam(name="id") String id) { @@ -154,6 +158,7 @@ public class PayWorkingGroupDataFileController extends JeroController deleteBatch(@RequestParam(name="ids") String ids) { @@ -194,6 +199,7 @@ public class PayWorkingGroupDataFileController extends JeroController list(@RequestParam("projectId") String projectId,@RequestParam("projectType") Integer projectType) { @@ -129,6 +129,7 @@ public class PayWorkingGroupDistributionRecordController extends JeroController< * @return */ @AutoLog(value = "资料分发-分发") + @RequiresPermissions("fileMaintenance:distribute") @ApiOperation(value="资料分发-分发", notes="资料分发-分发") @PostMapping(value = "/add") public Result add(@RequestBody PayWorkingGroupDistributionRecord payWorkingGroupDistributionRecord) { @@ -143,6 +144,7 @@ public class PayWorkingGroupDistributionRecordController extends JeroController< * @return */ @AutoLog(value = "资料分发-批量分发") + @RequiresPermissions("fileMaintenance:batchDistribute") @ApiOperation(value="资料分发-分发", notes="资料分发-批量分发") @PostMapping(value = "/addBatch") public Result addBatch(@RequestBody PayWorkingGroupDistributionRecord payWorkingGroupDistributionRecord) { diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupSubItemController.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupSubItemController.java index 475d5147..9e40b79f 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupSubItemController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupSubItemController.java @@ -6,6 +6,7 @@ import javax.servlet.http.HttpServletRequest; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.jero.common.api.dto.message.BusTemplateMessageDTO; import com.jero.common.api.vo.Result; +import com.jero.common.aspect.annotation.AutoLog; import com.jero.common.common.ProjectCommon; import com.jero.common.dto.SendMessageDTO; import com.jero.common.enums.CompanyMessageEnums; @@ -31,6 +32,7 @@ import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.apache.shiro.SecurityUtils; +import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import org.springframework.web.servlet.ModelAndView; @@ -69,6 +71,7 @@ public class PayWorkingGroupSubItemController extends JeroController queryPageList(PayWorkingGroupSubItem payWorkingGroupSubItem, @@ -94,6 +97,8 @@ public class PayWorkingGroupSubItemController extends JeroController add(@RequestBody PayWorkingGroupSubItem payWorkingGroupSubItem) { @@ -111,6 +116,8 @@ public class PayWorkingGroupSubItemController extends JeroController edit(@RequestBody PayWorkingGroupSubItem payWorkingGroupSubItem) { @@ -128,6 +135,8 @@ public class PayWorkingGroupSubItemController extends JeroController reminders(@RequestBody PayWorkingGroupSubItem payWorkingGroupSubItem) { @@ -170,11 +179,10 @@ public class PayWorkingGroupSubItemController extends JeroController map = new HashMap<>(); map.put("projectName",payWorkingGroup.getWorkingGroupProject()); - sendMessageDTO.setFromUser(sysUser.getId()); + sendMessageDTO.setFromUser(sysUser.getUsername()); sendMessageDTO.setTemplateCode(CompanyMessageEnums.MSG11.getCode()); sendMessageDTO.setTemplateParam(map); - sendMessageDTO.setBusType("email"); - sendMessageDTO.setBusId(p.getId()); + sendMessageDTO.setBusType("C_OPEN_TYPE11"); sendMessageService.SendMessageService(sendMessageDTO); }); return Result.OK("添加成功！"); @@ -186,6 +194,8 @@ public class PayWorkingGroupSubItemController extends JeroController delete(@RequestParam(name = "id") String id) { @@ -199,6 +209,8 @@ public class PayWorkingGroupSubItemController extends JeroController deleteBatch(@RequestParam(name = "ids") String ids) { @@ -246,6 +258,8 @@ public class PayWorkingGroupSubItemController extends JeroController setCharge(@RequestBody SetChargeInput input) { @@ -286,6 +300,8 @@ public class PayWorkingGroupSubItemController extends JeroController importExcel(HttpServletRequest request) { diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayCommonProjectServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayCommonProjectServiceImpl.java index bb1ec480..8a126f42 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayCommonProjectServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayCommonProjectServiceImpl.java @@ -134,7 +134,7 @@ public class PayCommonProjectServiceImpl extends ServiceImpl list = new ArrayList<>(); + List list = new ArrayList<>(); String msg = ""; if(payWorkingGroupDistributionRecord.getProjectType() == PayProjectCommon.PROJECT_TYPE_FILE1){ LambdaQueryWrapper queryPayContactsManagementTemporary = new LambdaQueryWrapper<>(); queryPayContactsManagementTemporary.in(PayContactsManagementTemporary::getId, Arrays.asList(s)); List listContacts = payContactsManagementTemporaryService.list(queryPayContactsManagementTemporary); if(!CollectionUtils.isEmpty(listContacts)){ - list = listContacts.stream().map(PayContactsManagementTemporary::getEmail).collect(Collectors.toList()); + list = listContacts; } PayWorkingGroup payWorkingGroup = payWorkingGroupService.getById(payWorkingGroupDistributionRecord.getProjectId()); if(Objects.isNull(payWorkingGroup)){ @@ -106,7 +114,8 @@ public class PayWorkingGroupDistributionRecordServiceImpl extends ServiceImpl listContacts = payContactsManagementService.list(queryPayContactsManagement); if(!CollectionUtils.isEmpty(listContacts)){ - list = listContacts.stream().map(PayContactsManagement::getEmail).collect(Collectors.toList()); + String str = JSON.toJSONString(listContacts); + list = JSONArray.parseArray(str,PayContactsManagementTemporary.class); } PayCaseCommittee payCaseCommittee = payCaseCommitteeService.getById(payWorkingGroupDistributionRecord.getProjectId()); if(Objects.isNull(payCaseCommittee)){ @@ -119,14 +128,28 @@ public class PayWorkingGroupDistributionRecordServiceImpl extends ServiceImpl{ - if(StringUtils.isBlank(p)){ - return; + // 发送消息 + SendMessageDTO sendMessageDTO = new SendMessageDTO(); + if(!StringUtils.isBlank(p.getEmail())){ + sendMessageDTO.setEmail(PasswordUtil.decrypt(p.getEmail())); } - sysBaseAPI.sendEmailMsgAndFile(PasswordUtil.decrypt(p), "", content, listFile); + if(!StringUtils.isEmpty(p.getPhone())){ + sendMessageDTO.setToUser(PasswordUtil.encrypt(p.getPhone())); + sendMessageDTO.setPhone(PasswordUtil.encrypt(p.getPhone())); + } + HashMap map = new HashMap<>(); + map.put("workGroupName", finalMsg); + sendMessageDTO.setFromUser(sysUser.getUsername()); + sendMessageDTO.setTemplateCode(CompanyMessageEnums.MSG12.getCode()); + sendMessageDTO.setTemplateParam(map); + sendMessageDTO.setListFile(listFile); + sendMessageDTO.setBusType("C_OPEN_TYPE12"); + sendMessageService.SendMessageService(sendMessageDTO); }); - // todo 缺少发送消息 } @Override @@ -163,13 +186,13 @@ public class PayWorkingGroupDistributionRecordServiceImpl extends ServiceImpl list = new ArrayList<>(); + List list = new ArrayList<>(); if(payWorkingGroupDistributionRecord.getProjectType() == PayProjectCommon.PROJECT_TYPE_FILE1){ LambdaQueryWrapper queryPayContactsManagementTemporary = new LambdaQueryWrapper<>(); queryPayContactsManagementTemporary.in(PayContactsManagementTemporary::getId, Arrays.asList(s)); List listContacts = payContactsManagementTemporaryService.list(queryPayContactsManagementTemporary); if(!CollectionUtils.isEmpty(listContacts)){ - list = listContacts.stream().map(PayContactsManagementTemporary::getEmail).collect(Collectors.toList()); + list = listContacts; } PayWorkingGroup payWorkingGroup = payWorkingGroupService.getById(payWorkingGroupDistributionRecord.getProjectId()); if(Objects.isNull(payWorkingGroup)){ @@ -181,7 +204,8 @@ public class PayWorkingGroupDistributionRecordServiceImpl extends ServiceImpl listContacts = payContactsManagementService.list(queryPayContactsManagement); if(!CollectionUtils.isEmpty(listContacts)){ - list = listContacts.stream().map(PayContactsManagement::getEmail).collect(Collectors.toList()); + String str = JSON.toJSONString(listContacts); + list = JSONArray.parseArray(str,PayContactsManagementTemporary.class); } PayCaseCommittee payCaseCommittee = payCaseCommitteeService.getById(payWorkingGroupDistributionRecord.getProjectId()); if(Objects.isNull(payCaseCommittee)){ @@ -194,13 +218,27 @@ public class PayWorkingGroupDistributionRecordServiceImpl extends ServiceImpl{ - if(StringUtils.isBlank(p)){ - return; + // 发送消息 + SendMessageDTO sendMessageDTO = new SendMessageDTO(); + if(!StringUtils.isBlank(p.getEmail())){ + sendMessageDTO.setEmail(PasswordUtil.decrypt(p.getEmail())); } - sysBaseAPI.sendEmailMsgAndFile(PasswordUtil.decrypt(p), "", content, listFile); + if(!StringUtils.isEmpty(p.getPhone())){ + sendMessageDTO.setToUser(PasswordUtil.encrypt(p.getPhone())); + sendMessageDTO.setPhone(PasswordUtil.encrypt(p.getPhone())); + } + HashMap map = new HashMap<>(); + map.put("workGroupName", finalMsg); + sendMessageDTO.setFromUser(sysUser.getUsername()); + sendMessageDTO.setTemplateCode(CompanyMessageEnums.MSG12.getCode()); + sendMessageDTO.setTemplateParam(map); + sendMessageDTO.setListFile(listFile); + sendMessageDTO.setBusType("C_OPEN_TYPE12"); + sendMessageService.SendMessageService(sendMessageDTO); }); - // todo 缺少发送消息 } } 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 f32c2862..750a7698 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 @@ -186,7 +186,7 @@ public class PayWorkingGroupSubItemServiceImpl extends ServiceImpl queryPageList(PayCompanyManagementTemporary payCompanyManagementTemporary, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, @@ -61,7 +61,7 @@ public class PayCompanyManagementTemporaryController extends JeroController add(@RequestBody PayCompanyManagementTemporary payCompanyManagementTemporary) { payCompanyManagementTemporaryService.save(payCompanyManagementTemporary); return Result.OK("添加成功！"); @@ -74,7 +74,7 @@ public class PayCompanyManagementTemporaryController extends JeroController edit(@RequestBody PayCompanyManagementTemporary payCompanyManagementTemporary) { payCompanyManagementTemporaryService.updateById(payCompanyManagementTemporary); return Result.OK("编辑成功!"); @@ -87,7 +87,7 @@ public class PayCompanyManagementTemporaryController extends JeroController delete(@RequestParam(name="id",required=true) String id) { payCompanyManagementTemporaryService.removeById(id); return Result.OK("删除成功!"); @@ -100,7 +100,7 @@ public class PayCompanyManagementTemporaryController extends JeroController deleteBatch(@RequestParam(name="ids",required=true) String ids) { this.payCompanyManagementTemporaryService.removeByIds(Arrays.asList(ids.split(","))); return Result.OK("批量删除成功!"); @@ -113,7 +113,7 @@ public class PayCompanyManagementTemporaryController extends JeroController queryById(@RequestParam(name="id",required=true) String id) { PayCompanyManagementTemporary payCompanyManagementTemporary = payCompanyManagementTemporaryService.getById(id); if(payCompanyManagementTemporary==null) { @@ -128,7 +128,7 @@ public class PayCompanyManagementTemporaryController extends JeroController importExcel(HttpServletRequest request, HttpServletResponse response) { return super.importExcel(request, response, PayCompanyManagementTemporary.class); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/temporary/controller/PayContactsManagementTemporaryController.java b/jero-boot-incoming-payment/src/main/java/com/jero/temporary/controller/PayContactsManagementTemporaryController.java index 200b4657..e9cb68c7 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/temporary/controller/PayContactsManagementTemporaryController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/temporary/controller/PayContactsManagementTemporaryController.java @@ -43,7 +43,7 @@ public class PayContactsManagementTemporaryController extends JeroController queryPageList(PayContactsManagementTemporary payContactsManagementTemporary, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, @@ -61,7 +61,7 @@ public class PayContactsManagementTemporaryController extends JeroController add(@RequestBody PayContactsManagementTemporary payContactsManagementTemporary) { payContactsManagementTemporaryService.save(payContactsManagementTemporary); return Result.OK("添加成功！"); @@ -74,7 +74,7 @@ public class PayContactsManagementTemporaryController extends JeroController edit(@RequestBody PayContactsManagementTemporary payContactsManagementTemporary) { payContactsManagementTemporaryService.updateById(payContactsManagementTemporary); return Result.OK("编辑成功!"); @@ -87,7 +87,7 @@ public class PayContactsManagementTemporaryController extends JeroController delete(@RequestParam(name="id",required=true) String id) { payContactsManagementTemporaryService.removeById(id); return Result.OK("删除成功!"); @@ -100,7 +100,7 @@ public class PayContactsManagementTemporaryController extends JeroController deleteBatch(@RequestParam(name="ids",required=true) String ids) { this.payContactsManagementTemporaryService.removeByIds(Arrays.asList(ids.split(","))); return Result.OK("批量删除成功!"); @@ -113,7 +113,7 @@ public class PayContactsManagementTemporaryController extends JeroController queryById(@RequestParam(name="id",required=true) String id) { PayContactsManagementTemporary payContactsManagementTemporary = payContactsManagementTemporaryService.getById(id); if(payContactsManagementTemporary==null) { @@ -128,7 +128,7 @@ public class PayContactsManagementTemporaryController extends JeroController importExcel(HttpServletRequest request, HttpServletResponse response) { return super.importExcel(request, response, PayContactsManagementTemporary.class); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/util/CronUtil.java b/jero-boot-incoming-payment/src/main/java/com/jero/util/CronUtil.java new file mode 100644 index 00000000..a9670e86 --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/util/CronUtil.java @@ -0,0 +1,108 @@ +package com.jero.util; + + +import cn.hutool.core.date.DateUtil; + +import java.text.SimpleDateFormat; +import java.util.Date; + +/** + * @author Lxq + * @version 1.0 + * @date 2020/9/11 9:48 + * java日期转cron表达式工具类 + */ +public class CronUtil { + + /** + * 每年时间format格式 + */ + private static final String DATEFORMAT_YEAR = "ss mm HH dd MM ? yyyy"; + + /** + * 每天时间format格式 + */ + private static final String DATEFORMAT_EVERYDAY = "ss mm HH * * ?"; + + /** + * 每周时间format格式 + */ + private static final String DATEFORMAT_SUN = "ss mm HH ? * 1"; + private static final String DATEFORMAT_MON = "ss mm HH ? * 2"; + private static final String DATEFORMAT_TUE = "ss mm HH ? * 3"; + private static final String DATEFORMAT_WED = "ss mm HH ? * 4"; + private static final String DATEFORMAT_THU = "ss mm HH ? * 5"; + private static final String DATEFORMAT_FRI = "ss mm HH ? * 6"; + private static final String DATEFORMAT_SAT = "ss mm HH ? * 7"; + + + /*** + * + * @param date + * @param dateFormat : e.g:yyyy-MM-dd HH:mm:ss + * @return + */ + public static String formatDateByPattern(Date date, String dateFormat) { + SimpleDateFormat sdf = new SimpleDateFormat(dateFormat); + String formatTimeStr = null; + if (date != null) { + formatTimeStr = sdf.format(date); + } + return formatTimeStr; + } + + + /** + * 时间转换时间表达式 + * convert Date to cron ,eg. "0 06 10 15 1 ? 2020" + * + * @param date : 时间点 + * @param dateFormat + * @return + */ + public static String getCron(Date date, String dateFormat) { + return formatDateByPattern(date, dateFormat); + } + + /** + * 时间字符串转换时间表达式 + * + * @param date HH:mm:ss + * @param dateFormat + * @return + */ + public static String getCron(String date, String dateFormat) { + Date parse = DateUtil.parse(date, "HH:mm:ss"); + return formatDateByPattern(parse, dateFormat); + } + + /** + * 时间字符串转时间表达式（年） + * + * @param date + * @param dateFormat + * @return + */ + public static String getCronByYear(String date, String dateFormat) { + Date parse = DateUtil.parse(date, "yyyy-MM-dd HH:mm:ss"); + return formatDateByPattern(parse, dateFormat); + } + + + public static void main(String[] args) { + String cron = getCron(new Date(), DATEFORMAT_TUE); + System.out.println(cron); + + String cron1 = getCron(new Date(), DATEFORMAT_EVERYDAY); + System.out.println(cron1); + + String cron2 = getCron(new Date(), DATEFORMAT_YEAR); + System.out.println(cron2); + + String cron4 = getCron("12:12:12", DATEFORMAT_EVERYDAY); + System.out.println(cron4); + + String cron5 = getCronByYear("2020-9-11 12:12:12", DATEFORMAT_YEAR); + System.out.println(cron5); + } +} \ No newline at end of file