add 会员管理日志，权限

jero-boot-incoming-payment/src/main/java/com/jero/common/mapper/xml/ProjectDetailMapper.xml

@@ -43,7 +43,7 @@
         </where>
         <!-- 标协会员项目-->
         UNION ALL
-        select tmsub.id,tmember.project_name,tmsub.charge_use,'','','',tmsub.liaison_man,tmsub.company_name,tmsub.amount_receivable,tmsub.paid_amount,tmsub.invoice_requirements,tmsub.pack,tmsub.in_account,tmsub.make_invoice,tmsub.mail,tmsub.create_time,5,tmsub.mobile,tmsub.email,'','',tmsub.company_id,tmsub.payment_method,''
+        select tmsub.id,tmember.project_name,tmsub.charge_use,'','',tmsub.liaison_man_id,tmsub.liaison_man,tmsub.company_name,tmsub.amount_receivable,tmsub.paid_amount,tmsub.invoice_requirements,tmsub.pack,tmsub.in_account,tmsub.make_invoice,tmsub.mail,tmsub.create_time,5,tmsub.mobile,tmsub.email,'','',tmsub.company_id,tmsub.payment_method,''
         from tb_member_project tmember
         inner join tb_member_project_subitem tmsub on tmember.id=tmsub.project_id
         <where>

jero-boot-incoming-payment/src/main/java/com/jero/member/controller/PayMemberProjectController.java

@@ -29,6 +29,7 @@ import lombok.extern.slf4j.Slf4j;
 import com.jero.common.system.base.controller.JeroController;
 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.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -62,7 +63,7 @@ public class PayMemberProjectController extends JeroController<PayMemberProject,
 	/**
 	 * 分页列表查询
 	 */
-	@AutoLog(value = "会员项目表-根据成员单位列表查询")
+	@RequiresPermissions("memberProject:search")
 	@ApiOperation(value="会员项目表-根据成员单位列表查询", notes="会员项目表-根据成员单位列表查询")
 	@GetMapping(value = "/page")
 	public Result<?> queryPageList(PayMemberProject payMemberProject,
@@ -86,7 +87,7 @@ public class PayMemberProjectController extends JeroController<PayMemberProject,
 	 * @Return
 	 * @Exception
 	 */
-	 @AutoLog(value = "会员项目表-收入合同列表分页查询")
+	 @RequiresPermissions("memberProject:search")
 	 @ApiOperation(value="会员项目表-收入合同列表分页查询", notes="会员项目表-收入合同列表分页查询")
 	 @GetMapping(value = "/queryListByCompany")
 	 public Result<?> queryListByCompany(
@@ -134,7 +135,7 @@ public class PayMemberProjectController extends JeroController<PayMemberProject,
 	 /**
 	  * 收入合同-查询非企业id的项目
 	  */
-	 @AutoLog(value = "会员项目表-收入合同-查询非企业id的项目")
+	 @RequiresPermissions("memberProject:search")
 	 @ApiOperation(value="会员项目表-收入合同-查询非企业id的项目", notes="会员项目表-收入合同-查询非企业id的项目")
 	 @GetMapping(value = "/queryListByNotCompany")
 	 public Result<?> queryListByNotCompany(@RequestParam(name = "companyId") String companyId) {
@@ -159,7 +160,7 @@ public class PayMemberProjectController extends JeroController<PayMemberProject,
     /**
 	 * 列表查询
 	 */
-	@AutoLog(value = "会员项目表-列表查询")
+	@RequiresPermissions("memberProject:search")
     @ApiOperation(value="会员项目表-列表查询", notes="会员项目表-列表查询")
 	@GetMapping(value = "/list")
 	public Result<List<PayMemberProject>> queryList() {
@@ -170,6 +171,7 @@ public class PayMemberProjectController extends JeroController<PayMemberProject,
 	/**
 	 *   添加
 	 */
+	@RequiresPermissions("memberProject:add")
 	@AutoLog(value = "会员项目表-添加")
 	@ApiOperation(value="会员项目表-添加", notes="会员项目表-添加")
 	@PostMapping(value = "/add")
@@ -181,6 +183,7 @@ public class PayMemberProjectController extends JeroController<PayMemberProject,
 	/**
 	 *  编辑
 	 */
+	@RequiresPermissions("memberProject:edit")
 	@AutoLog(value = "会员项目表-编辑")
 	@ApiOperation(value="会员项目表-编辑", notes="会员项目表-编辑")
 	@PostMapping(value = "/edit")
@@ -192,6 +195,7 @@ public class PayMemberProjectController extends JeroController<PayMemberProject,
 	/**
 	 *   通过id删除
 	 */
+	@RequiresPermissions("memberProject:delete")
 	@AutoLog(value = "会员项目表-通过id删除")
 	@ApiOperation(value="会员项目表-通过id删除", notes="会员项目表-通过id删除")
 	@GetMapping(value = "/delete")
@@ -203,6 +207,7 @@ public class PayMemberProjectController extends JeroController<PayMemberProject,
 	/**
 	 *  批量删除
 	 */
+	@RequiresPermissions("memberProject:batchDel")
 	@AutoLog(value = "会员项目表-批量删除")
 	@ApiOperation(value="会员项目表-批量删除", notes="会员项目表-批量删除")
 	@GetMapping(value = "/deleteBatch")
@@ -214,7 +219,7 @@ public class PayMemberProjectController extends JeroController<PayMemberProject,
 	/**
 	 * 通过id查询
 	 */
-	@AutoLog(value = "会员项目表-通过id查询")
+	@RequiresPermissions("memberProject:search")
 	@ApiOperation(value="会员项目表-通过id查询", notes="会员项目表-通过id查询")
 	@GetMapping(value = "/queryById")
 	public Result<?> queryById(@RequestParam(name="id") String id) {
@@ -228,6 +233,7 @@ public class PayMemberProjectController extends JeroController<PayMemberProject,
     /**
     * 导出excel
     */
+	@RequiresPermissions("memberProject:export")
     @RequestMapping(value = "/exportXls")
     public ModelAndView exportXls(HttpServletRequest request, PayMemberProject payMemberProject) {
         return super.exportXls(request, payMemberProject, PayMemberProject.class, "会员项目表");
@@ -236,9 +242,9 @@ public class PayMemberProjectController extends JeroController<PayMemberProject,
     /**
       * 通过excel导入数据
     */
-    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    /*@RequestMapping(value = "/importExcel", method = RequestMethod.POST)
     public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
         return super.importExcel(request, response, PayMemberProject.class);
-    }
+    }*/
 
 }

jero-boot-incoming-payment/src/main/java/com/jero/member/controller/PayMemberProjectSubitemController.java

@@ -6,6 +6,7 @@ import java.util.stream.Collectors;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+
 import cn.hutool.core.util.NumberUtil;
 import com.jero.common.api.vo.Result;
 import com.jero.common.exception.JeroBootException;
@@ -21,6 +22,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.jero.member.vo.PayMemberProjectSubitemExcel;
 import lombok.extern.slf4j.Slf4j;
 import com.jero.common.system.base.controller.JeroController;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.BeanUtils;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.ModelAndView;
@@ -48,7 +50,7 @@ public class PayMemberProjectSubitemController extends JeroController<PayMemberP
     /**
      * 分页列表查询
      */
-	@AutoLog(value = "会员项目成员表-分页列表查询")
+    @RequiresPermissions("safeguardMember:search")
     @ApiOperation(value = "会员项目成员表-分页列表查询", notes = "会员项目成员表-分页列表查询")
     @GetMapping(value = "/page")
     public Result<?> queryPageList(PayMemberProjectSubitem payMemberProjectSubitem,
@@ -64,7 +66,7 @@ public class PayMemberProjectSubitemController extends JeroController<PayMemberP
     /**
      * 列表查询
      */
-	@AutoLog(value = "会员项目成员表-列表查询")
+    @RequiresPermissions("safeguardMember:search")
     @ApiOperation(value = "会员项目成员表-列表查询", notes = "会员项目成员表-列表查询")
     @GetMapping(value = "/list")
     public Result<List<PayMemberProjectSubitem>> queryList() {
@@ -75,6 +77,7 @@ public class PayMemberProjectSubitemController extends JeroController<PayMemberP
     /**
      * 添加
      */
+    @RequiresPermissions("safeguardMember:add")
     @AutoLog(value = "会员项目成员表-添加")
     @ApiOperation(value = "会员项目成员表-添加", notes = "会员项目成员表-添加")
     @PostMapping(value = "/add")
@@ -87,6 +90,7 @@ public class PayMemberProjectSubitemController extends JeroController<PayMemberP
     /**
      * 编辑
      */
+    @RequiresPermissions("safeguardMember:edit")
     @AutoLog(value = "会员项目成员表-编辑")
     @ApiOperation(value = "会员项目成员表-编辑", notes = "会员项目成员表-编辑")
     @PostMapping(value = "/edit")
@@ -99,6 +103,7 @@ public class PayMemberProjectSubitemController extends JeroController<PayMemberP
     /**
      * 通过id删除
      */
+    @RequiresPermissions("safeguardMember:delete")
     @AutoLog(value = "会员项目成员表-通过id删除")
     @ApiOperation(value = "会员项目成员表-通过id删除", notes = "会员项目成员表-通过id删除")
     @GetMapping(value = "/delete")
@@ -110,6 +115,7 @@ public class PayMemberProjectSubitemController extends JeroController<PayMemberP
     /**
      * 批量删除
      */
+    @RequiresPermissions("safeguardMember:batchDel")
     @AutoLog(value = "会员项目成员表-批量删除")
     @ApiOperation(value = "会员项目成员表-批量删除", notes = "会员项目成员表-批量删除")
     @GetMapping(value = "/deleteBatch")
@@ -121,7 +127,7 @@ public class PayMemberProjectSubitemController extends JeroController<PayMemberP
     /**
      * 通过id查询
      */
-	@AutoLog(value = "会员项目成员表-通过id查询")
+    @RequiresPermissions("safeguardMember:search")
     @ApiOperation(value = "会员项目成员表-通过id查询", notes = "会员项目成员表-通过id查询")
     @GetMapping(value = "/queryById")
     public Result<?> queryById(@RequestParam(name = "id") String id) {
@@ -135,6 +141,8 @@ public class PayMemberProjectSubitemController extends JeroController<PayMemberP
     /**
      * 导出excel
      */
+    @RequiresPermissions("safeguardMember:export")
+    @AutoLog(value = "会员项目成员表-导出数据")
     @RequestMapping(value = "/exportXls")
     public ModelAndView exportXls(HttpServletRequest request, PayMemberProjectSubitem payMemberProjectSubitem) {
         return super.exportXls(request, payMemberProjectSubitem, PayMemberProjectSubitem.class, "会员项目成员表");
@@ -143,6 +151,8 @@ public class PayMemberProjectSubitemController extends JeroController<PayMemberP
     /**
      * 导出excel模板
      */
+    @RequiresPermissions("safeguardMember:downTemplate")
+    @AutoLog(value = "会员项目成员表-导出excel模板")
     @RequestMapping(value = "/exportTemplate")
     public ModelAndView exportTemplate() {
         return super.exportTemplate(PayMemberProjectSubitem.class, "会员项目成员表");
@@ -151,6 +161,9 @@ public class PayMemberProjectSubitemController extends JeroController<PayMemberP
     /**
      * 通过excel导入数据
      */
+    @RequiresPermissions("safeguardMember:import")
+    @AutoLog(value = "会员项目成员表-导入数据")
+    @ApiOperation(value = "会员项目成员表-导入数据", notes = "会员项目成员表-通过id查询")
     @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
     public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
         List<Object> excelData = super.getExcelData(request, PayMemberProjectSubitemExcel.class);

jero-boot-incoming-payment/src/main/java/com/jero/member/controller/TbMemberProjectController.java

@@ -14,6 +14,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.extern.slf4j.Slf4j;
 import com.jero.common.system.base.controller.JeroController;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.ModelAndView;
@@ -39,7 +40,7 @@ public class TbMemberProjectController extends JeroController<TbMemberProject, I
 	/**
 	 * 分页列表查询
 	 */
-	@AutoLog(value = "标协会员项目表-分页列表查询")
+	@RequiresPermissions("stardsMember:search")
 	@ApiOperation(value="标协会员项目表-分页列表查询", notes="标协会员项目表-分页列表查询")
 	@GetMapping(value = "/page")
 	public Result<?> queryPageList(TbMemberProject tbMemberProject,
@@ -52,97 +53,4 @@ public class TbMemberProjectController extends JeroController<TbMemberProject, I
 		return Result.OK(pageList);
 	}
 
-    /**
-	 * 列表查询
-	 */
-	@AutoLog(value = "标协会员项目表-列表查询")
-    @ApiOperation(value="标协会员项目表-列表查询", notes="标协会员项目表-列表查询")
-	@GetMapping(value = "/list")
-	public Result<List<TbMemberProject>> queryList() {
-        List<TbMemberProject> list = tbMemberProjectService.queryList();
-        return Result.OK(list);
-	}
-
-	/**
-	 *   添加
-	 */
-	@AutoLog(value = "标协会员项目表-添加")
-	@ApiOperation(value="标协会员项目表-添加", notes="标协会员项目表-添加")
-	@PostMapping(value = "/add")
-	public Result<?> add(@Validated @RequestBody TbMemberProject tbMemberProject) {
-		tbMemberProjectService.add(tbMemberProject);
-		return Result.OK("添加成功！");
-	}
-
-	/**
-	 *  编辑
-	 */
-	@AutoLog(value = "标协会员项目表-编辑")
-	@ApiOperation(value="标协会员项目表-编辑", notes="标协会员项目表-编辑")
-	@PostMapping(value = "/edit")
-	public Result<?> edit(@Validated @RequestBody TbMemberProject tbMemberProject) {
-		tbMemberProjectService.editById(tbMemberProject);
-		return Result.OK("编辑成功!");
-	}
-
-	/**
-	 *   通过id删除
-	 */
-	@AutoLog(value = "标协会员项目表-通过id删除")
-	@ApiOperation(value="标协会员项目表-通过id删除", notes="标协会员项目表-通过id删除")
-	@GetMapping(value = "/delete")
-	public Result<?> delete(@RequestParam(name="id") String id) {
-		tbMemberProjectService.deleteById(id);
-		return Result.OK("删除成功!");
-	}
-
-	/**
-	 *  批量删除
-	 */
-	@AutoLog(value = "标协会员项目表-批量删除")
-	@ApiOperation(value="标协会员项目表-批量删除", notes="标协会员项目表-批量删除")
-	@GetMapping(value = "/deleteBatch")
-	public Result<?> deleteBatch(@RequestParam(name="ids") String ids) {
-		this.tbMemberProjectService.deleteByIds(Arrays.asList(ids.split(",")));
-		return Result.OK("批量删除成功!");
-	}
-
-	/**
-	 * 通过id查询
-	 */
-	@AutoLog(value = "标协会员项目表-通过id查询")
-	@ApiOperation(value="标协会员项目表-通过id查询", notes="标协会员项目表-通过id查询")
-	@GetMapping(value = "/queryById")
-	public Result<?> queryById(@RequestParam(name="id") String id) {
-		TbMemberProject tbMemberProject = tbMemberProjectService.queryById(id);
-		if(tbMemberProject==null) {
-			return Result.error("未找到对应数据");
-		}
-		return Result.OK(tbMemberProject);
-	}
-
-    /**
-    * 导出excel
-    */
-    @GetMapping(value = "/exportXls")
-    public ModelAndView exportXls(HttpServletRequest request, TbMemberProject tbMemberProject) {
-        return super.exportXls(request, tbMemberProject, TbMemberProject.class, "标协会员项目表");
-    }
-
-    /**
-    * 导出excel模板
-    */
-    @GetMapping(value = "/exportTemplate")
-    public ModelAndView exportTemplate() {
-        return super.exportTemplate(TbMemberProject.class, "标协会员项目表");
-    }
-
-    /**
-      * 通过excel导入数据
-    */
-    @PostMapping(value = "/importExcel")
-    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
-        return super.importExcel(request, response, TbMemberProject.class);
-    }
-
 }

jero-boot-incoming-payment/src/main/java/com/jero/member/controller/TbMemberProjectSubitemController.java

@@ -15,6 +15,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.extern.slf4j.Slf4j;
 import com.jero.common.system.base.controller.JeroController;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.ModelAndView;
@@ -40,7 +41,7 @@ public class TbMemberProjectSubitemController extends JeroController<TbMemberPro
 	/**
 	 * 分页列表查询
 	 */
-	@AutoLog(value = "标协会员项目成员表-分页列表查询")
+	@RequiresPermissions("safeguardStardsMember:search")
 	@ApiOperation(value="标协会员项目成员表-分页列表查询", notes="标协会员项目成员表-分页列表查询")
 	@GetMapping(value = "/page")
 	public Result<?> queryPageList(TbMemberProjectSubitem tbMemberProjectSubitem,
@@ -57,97 +58,13 @@ public class TbMemberProjectSubitemController extends JeroController<TbMemberPro
 		return Result.OK(pageList);
 	}
 
-    /**
-	 * 列表查询
-	 */
-	@AutoLog(value = "标协会员项目成员表-列表查询")
-    @ApiOperation(value="标协会员项目成员表-列表查询", notes="标协会员项目成员表-列表查询")
-	@GetMapping(value = "/list")
-	public Result<List<TbMemberProjectSubitem>> queryList() {
-        List<TbMemberProjectSubitem> list = tbMemberProjectSubitemService.queryList();
-        return Result.OK(list);
-	}
-
-	/**
-	 *   添加
-	 */
-	@AutoLog(value = "标协会员项目成员表-添加")
-	@ApiOperation(value="标协会员项目成员表-添加", notes="标协会员项目成员表-添加")
-	@PostMapping(value = "/add")
-	public Result<?> add(@Validated @RequestBody TbMemberProjectSubitem tbMemberProjectSubitem) {
-		tbMemberProjectSubitemService.add(tbMemberProjectSubitem);
-		return Result.OK("添加成功！");
-	}
-
-	/**
-	 *  编辑
-	 */
-	@AutoLog(value = "标协会员项目成员表-编辑")
-	@ApiOperation(value="标协会员项目成员表-编辑", notes="标协会员项目成员表-编辑")
-	@PostMapping(value = "/edit")
-	public Result<?> edit(@Validated @RequestBody TbMemberProjectSubitem tbMemberProjectSubitem) {
-		tbMemberProjectSubitemService.editById(tbMemberProjectSubitem);
-		return Result.OK("编辑成功!");
-	}
-
-	/**
-	 *   通过id删除
-	 */
-	@AutoLog(value = "标协会员项目成员表-通过id删除")
-	@ApiOperation(value="标协会员项目成员表-通过id删除", notes="标协会员项目成员表-通过id删除")
-	@GetMapping(value = "/delete")
-	public Result<?> delete(@RequestParam(name="id") String id) {
-		tbMemberProjectSubitemService.deleteById(id);
-		return Result.OK("删除成功!");
-	}
-
-	/**
-	 *  批量删除
-	 */
-	@AutoLog(value = "标协会员项目成员表-批量删除")
-	@ApiOperation(value="标协会员项目成员表-批量删除", notes="标协会员项目成员表-批量删除")
-	@GetMapping(value = "/deleteBatch")
-	public Result<?> deleteBatch(@RequestParam(name="ids") String ids) {
-		this.tbMemberProjectSubitemService.deleteByIds(Arrays.asList(ids.split(",")));
-		return Result.OK("批量删除成功!");
-	}
-
-	/**
-	 * 通过id查询
-	 */
-	@AutoLog(value = "标协会员项目成员表-通过id查询")
-	@ApiOperation(value="标协会员项目成员表-通过id查询", notes="标协会员项目成员表-通过id查询")
-	@GetMapping(value = "/queryById")
-	public Result<?> queryById(@RequestParam(name="id") String id) {
-		TbMemberProjectSubitem tbMemberProjectSubitem = tbMemberProjectSubitemService.queryById(id);
-		if(tbMemberProjectSubitem==null) {
-			return Result.error("未找到对应数据");
-		}
-		return Result.OK(tbMemberProjectSubitem);
-	}
-
     /**
     * 导出excel
     */
+	@RequiresPermissions("safeguardStardsMember:export")
     @GetMapping(value = "/exportXls")
     public ModelAndView exportXls(HttpServletRequest request, TbMemberProjectSubitem tbMemberProjectSubitem) {
         return super.exportXls(request, tbMemberProjectSubitem, TbMemberProjectSubitem.class, "标协会员项目成员表");
     }
 
-    /**
-    * 导出excel模板
-    */
-    @GetMapping(value = "/exportTemplate")
-    public ModelAndView exportTemplate() {
-        return super.exportTemplate(TbMemberProjectSubitem.class, "标协会员项目成员表");
-    }
-
-    /**
-      * 通过excel导入数据
-    */
-    @PostMapping(value = "/importExcel")
-    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
-        return super.importExcel(request, response, TbMemberProjectSubitem.class);
-    }
-
 }