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

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<PayCompanyMan
 	private Environment env;
 	@Autowired
 	private ProjectCountService projectCountService;
+
+	@Resource
+	private ISysUserService sysUserService;
+	@Resource
+	private SendMessageService sendMessageService;
 	
 	/**
 	 * 分页列表查询
@@ -69,6 +85,7 @@ public class PayCompanyManagementController extends JeroController<PayCompanyMan
 	 * @param req
 	 * @return
 	 */
+	@RequiresPermissions("company:search")
 	@ApiOperation(value="企业管理-分页列表查询", notes="企业管理-分页列表查询")
 	@GetMapping(value = "/list")
 	public Result<?> queryPageList(PayCompanyManagement payCompanyManagement,
@@ -181,6 +198,7 @@ public class PayCompanyManagementController extends JeroController<PayCompanyMan
 			 }
 		 }
 		 payCompanyManagementService.save(payCompanyManagement);
+
 		 return Result.OK("添加成功！",payCompanyManagement);
 	 }
 	
@@ -190,6 +208,8 @@ public class PayCompanyManagementController extends JeroController<PayCompanyMan
 	 * @param payCompanyManagement 企业管理
 	 * @return
 	 */
+	@AutoLog(value = "企业管理-添加")
+	@RequiresPermissions("company:add")
 	@ApiOperation(value="企业管理-添加", notes="企业管理-添加")
 	@PostMapping(value = "/add")
 	public Result<?> add(@RequestBody PayCompanyManagement payCompanyManagement) {
@@ -241,6 +261,26 @@ public class PayCompanyManagementController extends JeroController<PayCompanyMan
 			}
 		}
 		payCompanyManagementService.save(payCompanyManagement);
+		if(Objects.equals(dataSource,PayCompanyManagementCommon.DATA_SOURCE2)){
+			// 获取项目负责人，发送消息
+			List<SysUser> 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<String,String> 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<PayCompanyMan
 	 * @param payCompanyManagement 企业管理
 	 * @return
 	 */
+	@AutoLog(value = "企业管理-编辑")
+	@RequiresPermissions("company:edit")
 	@ApiOperation(value="企业管理-编辑", notes="企业管理-编辑")
 	@PostMapping(value = "/edit")
 	public Result<?> edit(@RequestBody PayCompanyManagement payCompanyManagement) {
@@ -294,6 +336,8 @@ public class PayCompanyManagementController extends JeroController<PayCompanyMan
 	  * @param id 企业管理id
 	  * @return
 	  */
+	 @AutoLog(value = "企业管理-确认")
+	 @RequiresPermissions("company:confirm")
 	 @ApiOperation(value="企业管理-确认", notes="企业管理-确认")
 	 @GetMapping(value = "/audit")
 	 public Result<?> audit(@RequestParam(name="id") String id) {
@@ -315,6 +359,8 @@ public class PayCompanyManagementController extends JeroController<PayCompanyMan
 	 * @param id 企业管理id
 	 * @return
 	 */
+	@AutoLog(value = "企业管理-删除")
+	@RequiresPermissions("company:delete")
 	@ApiOperation(value="企业管理-通过id删除", notes="企业管理-通过id删除")
 	@GetMapping(value = "/delete")
 	public Result<?> delete(@RequestParam(name="id") String id) {
@@ -332,6 +378,8 @@ public class PayCompanyManagementController extends JeroController<PayCompanyMan
 	 * @param ids 企业管理ids 逗号分隔
 	 * @return
 	 */
+	@AutoLog(value = "企业管理-批量删除")
+	@RequiresPermissions("company:batchDel")
 	@ApiOperation(value="企业管理-批量删除", notes="企业管理-批量删除")
 	@GetMapping(value = "/deleteBatch")
 	public Result<?> deleteBatch(@RequestParam(name="ids") String ids) {
@@ -355,6 +403,7 @@ public class PayCompanyManagementController extends JeroController<PayCompanyMan
 	  * @param dutyCode 信用代码
 	  * @return
 	  */
+	 @AutoLog(value = "企业管理-通过信用代码查询")
 	 @ApiOperation(value="企业管理-通过信用代码查询", notes="企业管理-通过信用代码查询")
 	 @GetMapping(value = "/queryByDutyCode")
 	 public Result<?> queryByDutyCode(@RequestParam(name="dutyCode") String dutyCode) {
@@ -385,6 +434,7 @@ public class PayCompanyManagementController extends JeroController<PayCompanyMan
 	* @param companyName 企业名称
 	* @return
 	*/
+	@AutoLog(value = "企业管理-通过企业名称查询")
 	@ApiOperation(value="企业管理-通过企业名称查询", notes="企业管理-通过企业名称查询")
 	@GetMapping(value = "/queryByCompanyName")
 	public Result<?> queryByCompanyName(@RequestParam(name="companyName") String companyName) {
@@ -415,6 +465,7 @@ public class PayCompanyManagementController extends JeroController<PayCompanyMan
 	 * @param id 企业管理id
 	 * @return
 	 */
+	@AutoLog(value = "企业管理-查询详情")
 	@ApiOperation(value="企业管理-通过id查询", notes="企业管理-通过id查询")
 	@GetMapping(value = "/queryById")
 	public Result<?> queryById(@RequestParam(name="id") String id) {
@@ -431,6 +482,8 @@ public class PayCompanyManagementController extends JeroController<PayCompanyMan
     * @param request
     * @param payCompanyManagement 企业管理
     */
+	@AutoLog(value = "企业管理-导出excel")
+	@RequiresPermissions("company:export")
 	@ApiOperation(value="企业管理-导出excel", notes="企业管理-导出excel")
     @GetMapping(value = "/exportXls")
     public ModelAndView exportXls(HttpServletRequest request, PayCompanyManagement payCompanyManagement) {
@@ -474,6 +527,8 @@ public class PayCompanyManagementController extends JeroController<PayCompanyMan
 	  *
 	  * @return
 	  */
+	 @AutoLog(value = "企业管理-模板下载")
+	 @RequiresPermissions("company:downTemplate")
 	 @ApiOperation(value="企业管理-模板下载", notes="企业管理-模板下载")
 	 @GetMapping(value = "/downloadExcelModel")
 	 public ModelAndView downloadExcelModel() {
@@ -486,6 +541,8 @@ public class PayCompanyManagementController extends JeroController<PayCompanyMan
     * @param request
     * @return
     */
+	@AutoLog(value = "企业管理-excel导入数据")
+	@RequiresPermissions("company:import")
 	@ApiOperation(value="企业管理-excel导入数据", notes="企业管理-excel导入数据")
     @PostMapping(value = "/importExcel")
     public Result<?> importExcel(HttpServletRequest request) {

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<PayContactsM
 	private Environment env;
 	@Autowired
 	private ProjectCountService projectCountService;
-	 @Value("${defaultPassword}")
-	 private String defaultPassword;
+	@Value("${defaultPassword}")
+	private String defaultPassword;
 
-	// todo 缺少联系人加入到用户表，可以登录
-	
 	/**
 	 * 分页列表查询
 	 *
@@ -76,6 +76,7 @@ public class PayContactsManagementController extends JeroController<PayContactsM
 	 * @param pageSize 条数
 	 * @return
 	 */
+	@RequiresPermissions("contact:search")
 	@ApiOperation(value="联系人管理-分页列表查询", notes="联系人管理-分页列表查询")
 	@GetMapping(value = "/list")
 	public Result<?> queryPageList(PayContactsManagement payContactsManagement,
@@ -181,6 +182,8 @@ public class PayContactsManagementController extends JeroController<PayContactsM
 	 * @param payContactsManagement 联系人管理
 	 * @return
 	 */
+	@AutoLog(value = "联系人管理-添加")
+	@RequiresPermissions("contact:add")
 	@ApiOperation(value="联系人管理-添加", notes="联系人管理-添加")
 	@PostMapping(value = "/add")
 	public Result<?> add(@RequestBody PayContactsManagement payContactsManagement) {
@@ -242,6 +245,8 @@ public class PayContactsManagementController extends JeroController<PayContactsM
 	 * @param payContactsManagement
 	 * @return
 	 */
+	@AutoLog(value = "联系人管理-编辑")
+	@RequiresPermissions("contact:edit")
 	@ApiOperation(value="联系人管理-编辑", notes="联系人管理-编辑")
 	@PostMapping(value = "/edit")
 	public Result<?> edit(@RequestBody PayContactsManagement payContactsManagement) {
@@ -302,6 +307,8 @@ public class PayContactsManagementController extends JeroController<PayContactsM
 	 * @param id
 	 * @return
 	 */
+	@AutoLog(value = "联系人管理-删除")
+	@RequiresPermissions("contact:delete")
 	@ApiOperation(value="联系人管理-通过id删除", notes="联系人管理-通过id删除")
 	@GetMapping(value = "/delete")
 	public Result<?> delete(@RequestParam(name="id") String id) {
@@ -319,6 +326,8 @@ public class PayContactsManagementController extends JeroController<PayContactsM
 	 * @param ids
 	 * @return
 	 */
+	@AutoLog(value = "联系人管理-批量删除")
+	@RequiresPermissions("contact:batchDel")
 	@ApiOperation(value="联系人管理-批量删除", notes="联系人管理-批量删除")
 	@GetMapping(value = "/deleteBatch")
 	public Result<?> deleteBatch(@RequestParam(name="ids") String ids) {
@@ -342,6 +351,7 @@ public class PayContactsManagementController extends JeroController<PayContactsM
 	  * @param phone 手机号
 	  * @return
 	  */
+	 @AutoLog(value = "联系人管理-通过手机号查询")
 	 @ApiOperation(value="联系人管理-通过手机号查询", notes="联系人管理-通过手机号查询")
 	 @GetMapping(value = "/queryByCompanyName")
 	 public Result<?> queryByCompanyName(@RequestParam(name="phone") String phone) {
@@ -374,6 +384,7 @@ public class PayContactsManagementController extends JeroController<PayContactsM
 	  * @param name 联系人姓名
 	  * @return
 	  */
+	 @AutoLog(value = "联系人管理-通过联系人姓名查询")
 	 @ApiOperation(value="联系人管理-通过联系人姓名查询", notes="联系人管理-通过联系人姓名查询")
 	 @GetMapping(value = "/queryByName")
 	 public Result<?> queryByName(@RequestParam(name="name") String name,@RequestParam(name="companyId") String companyId) {
@@ -429,6 +440,7 @@ public class PayContactsManagementController extends JeroController<PayContactsM
 	 * @param id
 	 * @return
 	 */
+	@AutoLog(value = "联系人管理-查询详情")
 	@ApiOperation(value="联系人管理-通过id查询", notes="联系人管理-通过id查询")
 	@GetMapping(value = "/queryById")
 	public Result<?> queryById(@RequestParam(name="id") String id) {
@@ -476,6 +488,7 @@ public class PayContactsManagementController extends JeroController<PayContactsM
 	  * @param companyId 企业id
 	  * @return
 	  */
+	 @AutoLog(value = "联系人管理-通过企业id查询用户")
 	 @ApiOperation(value="联系人管理-通过企业id查询用户", notes="联系人管理-通过企业id查询用户")
 	 @GetMapping(value = "/queryByCompany")
 	 public Result<?> queryByCompany(@RequestParam(name="companyId") String companyId) {
@@ -501,6 +514,8 @@ public class PayContactsManagementController extends JeroController<PayContactsM
     * @param request
     * @param payContactsManagement 联系人管理
     */
+	@AutoLog(value = "联系人管理-导出excel")
+	@RequiresPermissions("contact:export")
 	@ApiOperation(value="联系人管理-导出excel", notes="联系人管理-导出excel")
     @GetMapping(value = "/exportXls")
     public ModelAndView exportXls(HttpServletRequest request, PayContactsManagement payContactsManagement) {
@@ -548,6 +563,8 @@ public class PayContactsManagementController extends JeroController<PayContactsM
 	  *
 	  * @return
 	  */
+	 @AutoLog(value = "联系人管理-模板下载")
+	 @RequiresPermissions("contact:downTemplate")
 	 @ApiOperation(value="联系人管理-模板下载", notes="联系人管理-模板下载")
 	 @GetMapping(value = "/downloadExcelModel")
 	 public ModelAndView downloadExcelModel() {
@@ -561,6 +578,8 @@ public class PayContactsManagementController extends JeroController<PayContactsM
     * @param response
     * @return
     */
+	@AutoLog(value = "联系人管理-excel导入数据")
+	@RequiresPermissions("contact:import")
 	@ApiOperation(value="联系人管理-excel导入数据", notes="联系人管理-excel导入数据")
     @PostMapping(value = "/importExcel")
     public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {

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);
 }