消息修改,添加日志，权限

jero-boot-incoming-payment/src/main/java/com/jero/pack/controller/PayPackCompanyController.java

@@ -32,6 +32,7 @@ import com.jero.temporary.service.IPayContactsManagementTemporaryService;
 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.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.ModelAndView;
@@ -67,7 +68,7 @@ public class PayPackCompanyController extends JeroController<PayPackCompany, IPa
 	 * @param req
 	 * @return
 	 */
-	@AutoLog(value = "打包企业管理-分页列表查询")
+	@RequiresPermissions("packCompany:search")
 	@ApiOperation(value="打包企业管理-分页列表查询", notes="打包企业管理-分页列表查询")
 	@GetMapping(value = "/list")
 	public Result<?> queryPageList(PayPackCompany payPackCompany,
@@ -106,6 +107,7 @@ public class PayPackCompanyController extends JeroController<PayPackCompany, IPa
 	 * @return
 	 */
 	@AutoLog(value = "打包企业管理-添加")
+	@RequiresPermissions("packCompany:add")
 	@ApiOperation(value="打包企业管理-添加", notes="打包企业管理-添加")
 	@PostMapping(value = "/add")
 	public Result<?> add(@RequestBody PayPackCompany payPackCompany) {
@@ -124,6 +126,7 @@ public class PayPackCompanyController extends JeroController<PayPackCompany, IPa
 	 * @return
 	 */
 	@AutoLog(value = "打包企业管理-编辑")
+	@RequiresPermissions("packCompany:edit")
 	@ApiOperation(value="打包企业管理-编辑", notes="打包企业管理-编辑")
 	@PostMapping(value = "/edit")
 	public Result<?> edit(@RequestBody PayPackCompany payPackCompany) {
@@ -141,7 +144,8 @@ public class PayPackCompanyController extends JeroController<PayPackCompany, IPa
 	 * @param id
 	 * @return
 	 */
-	@AutoLog(value = "打包关联-通过id删除")
+	@AutoLog(value = "打包关联-删除")
+	@RequiresPermissions("packCompany:delete")
 	@ApiOperation(value="打包关联-通过id删除", notes="打包关联-通过id删除")
 	@GetMapping(value = "/delete")
 	public Result<?> delete(@RequestParam(name="id") String id) {
@@ -165,6 +169,7 @@ public class PayPackCompanyController extends JeroController<PayPackCompany, IPa
 	 * @return
 	 */
 	@AutoLog(value = "打包企业管理-批量删除")
+	@RequiresPermissions("packCompany:batchDel")
 	@ApiOperation(value="打包企业管理-批量删除", notes="打包企业管理-批量删除")
 	@GetMapping(value = "/deleteBatch")
 	public Result<?> deleteBatch(@RequestParam(name="ids") String ids) {
@@ -193,7 +198,6 @@ public class PayPackCompanyController extends JeroController<PayPackCompany, IPa
 	 * @param id
 	 * @return
 	 */
-	@AutoLog(value = "打包企业管理-通过id查询")
 	@ApiOperation(value="打包企业管理-通过id查询", notes="打包企业管理-通过id查询")
 	@GetMapping(value = "/queryById")
 	public Result<?> queryById(@RequestParam(name="id") String id) {
@@ -247,7 +251,7 @@ public class PayPackCompanyController extends JeroController<PayPackCompany, IPa
     * @param request
     * @param payPackCompany
     */
-    @GetMapping(value = "/exportXls")
+//    @GetMapping(value = "/exportXls")
     public ModelAndView exportXls(HttpServletRequest request, PayPackCompany payPackCompany) {
         return super.exportXls(request, payPackCompany, PayPackCompany.class, "打包企业管理");
     }
@@ -259,7 +263,7 @@ public class PayPackCompanyController extends JeroController<PayPackCompany, IPa
     * @param response
     * @return
     */
-    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+//    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
     public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
         return super.importExcel(request, response, PayPackCompany.class);
     }

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<PayPackCompa
 	 */
 	@AutoLog(value = "打包项目维护-分页列表查询")
 //	@ApiOperation(value="打包项目维护-分页列表查询", notes="打包项目维护-分页列表查询")
-	@GetMapping(value = "/list")
+//	@GetMapping(value = "/list")
 	public Result<?> 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<PayPackCompa
 	  * @param input 参数
 	  * @return
 	  */
-	 @AutoLog(value = "打包项目维护-列表查询")
+	 @RequiresPermissions("packProject:search")
 	 @ApiOperation(value="打包项目维护-列表查询", notes="打包项目维护-列表查询")
 	 @GetMapping(value = "/listAll")
 	 public Result<?> queryListAll(PayPackCompanyProjectInput input) {
@@ -129,7 +130,6 @@ public class PayPackCompanyProjectController extends JeroController<PayPackCompa
 	  * @param input 参数
 	  * @return
 	  */
-	 @AutoLog(value = "打包项目维护-未打包列表查询")
 	 @ApiOperation(value="打包项目维护-未打包列表查询", notes="打包项目维护-未打包列表查询")
 	 @GetMapping(value = "/queryNotPackListAll")
 	 public Result<?> queryNotPackListAll(PayPackCompanyProjectInput input) {
@@ -164,6 +164,7 @@ public class PayPackCompanyProjectController extends JeroController<PayPackCompa
 	 * @return
 	 */
 	@AutoLog(value = "打包项目维护-添加打包")
+	@RequiresPermissions("packProject:pack")
 	@ApiOperation(value="打包项目维护-添加打包", notes="打包项目维护-添加打包")
 	@PostMapping(value = "/add")
 	public Result<?> add(@RequestBody PayPackCompanyProject payPackCompanyProject) {
@@ -177,6 +178,7 @@ public class PayPackCompanyProjectController extends JeroController<PayPackCompa
 	  * @return
 	  */
 	 @AutoLog(value = "打包项目维护-取消打包")
+	 @RequiresPermissions("packProject:cancelPack")
 	 @ApiOperation(value="打包项目维护-取消打包", notes="打包项目维护-取消打包")
 	 @PostMapping(value = "/remove")
 	 public Result<?> remove(@RequestBody PayPackCompanyProject payPackCompanyProject) {
@@ -193,6 +195,7 @@ public class PayPackCompanyProjectController extends JeroController<PayPackCompa
 	  * @return
 	  */
 	 @AutoLog(value = "打包项目维护-批量取消打包")
+	 @RequiresPermissions("packProject:batchCancelPack")
 	 @ApiOperation(value="打包项目维护-批量取消打包", notes="打包项目维护-批量取消打包")
 	 @PostMapping(value = "/removeBatch")
 	 public Result<?> removeBatch(@RequestBody PayPackCompanyProject payPackCompanyProject) {
@@ -209,9 +212,9 @@ public class PayPackCompanyProjectController extends JeroController<PayPackCompa
 	 * @param payPackCompanyProject
 	 * @return
 	 */
-	@AutoLog(value = "pay_pack_company_project-编辑")
+//	@AutoLog(value = "pay_pack_company_project-编辑")
 //	@ApiOperation(value="pay_pack_company_project-编辑", notes="pay_pack_company_project-编辑")
-	@PostMapping(value = "/edit")
+//	@PostMapping(value = "/edit")
 	public Result<?> edit(@RequestBody PayPackCompanyProject payPackCompanyProject) {
 		payPackCompanyProjectService.updateById(payPackCompanyProject);
 		return Result.OK("编辑成功!");
@@ -223,9 +226,9 @@ public class PayPackCompanyProjectController extends JeroController<PayPackCompa
 	 * @param id
 	 * @return
 	 */
-	@AutoLog(value = "pay_pack_company_project-通过id删除")
+//	@AutoLog(value = "pay_pack_company_project-通过id删除")
 //	@ApiOperation(value="pay_pack_company_project-通过id删除", notes="pay_pack_company_project-通过id删除")
-	@GetMapping(value = "/delete")
+//	@GetMapping(value = "/delete")
 	public Result<?> delete(@RequestParam(name="id",required=true) String id) {
 		payPackCompanyProjectService.removeById(id);
 		return Result.OK("删除成功!");
@@ -239,7 +242,7 @@ public class PayPackCompanyProjectController extends JeroController<PayPackCompa
 	 */
 	@AutoLog(value = "pay_pack_company_project-批量删除")
 //	@ApiOperation(value="pay_pack_company_project-批量删除", notes="pay_pack_company_project-批量删除")
-	@GetMapping(value = "/deleteBatch")
+//	@GetMapping(value = "/deleteBatch")
 	public Result<?> 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<PayPackCompa
 	 */
 	@AutoLog(value = "pay_pack_company_project-通过id查询")
 //	@ApiOperation(value="pay_pack_company_project-通过id查询", notes="pay_pack_company_project-通过id查询")
-	@GetMapping(value = "/queryById")
+//	@GetMapping(value = "/queryById")
 	public Result<?> 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<PayPackCompa
     * @param request
     * @param payPackCompanyProject
     */
+	@AutoLog(value = "打包项目维护-导出excel")
+	@RequiresPermissions("packProject:export")
     @GetMapping(value = "/exportXls")
 	@ApiOperation(value="打包项目维护-导出excel", notes="打包项目维护-导出excel")
     public ModelAndView exportXls(HttpServletRequest request, PayPackCompanyProject payPackCompanyProject) {
@@ -323,7 +328,7 @@ public class PayPackCompanyProjectController extends JeroController<PayPackCompa
     * @param response
     * @return
     */
-    @PostMapping(value = "/importExcel")
+//    @PostMapping(value = "/importExcel")
     public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
         return super.importExcel(request, response, PayPackCompanyProject.class);
     }

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<PayPackCompany
     private IPayPackCompanyService payPackCompanyService;
     @Autowired
     private ProjectPackService projectPackService;
+    @Resource
+    private ISysUserService sysUserService;
+    @Resource
+    private ProjectDetailMapper projectDetailMapper;
+    @Resource
+    private SendMessageService sendMessageService;
 
 
     @Override
@@ -108,6 +122,39 @@ public class PayPackCompanyProjectServiceImpl extends ServiceImpl<PayPackCompany
             });
             payPackCompanyProjectService.saveBatch(listPayPackCompanyProject);
         }
+        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+        // 获取项目负责人，发送消息
+        List<SysUser> 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<String,String> 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