From fad1b886464f52e88dd9b99a62b9cd89fd5bb8c2 Mon Sep 17 00:00:00 2001 From: mitao <2763622819@qq.com> Date: 星期二, 13 五月 2025 09:33:22 +0800 Subject: [PATCH] 用户端统计分析接口 --- springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/api/MgtPartyMemberController.java | 34 +++++++++++++++++----------------- 1 files changed, 17 insertions(+), 17 deletions(-) diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/api/MgtPartyMemberController.java b/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/api/MgtPartyMemberController.java index 7038c05..c72a94c 100644 --- a/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/api/MgtPartyMemberController.java +++ b/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/api/MgtPartyMemberController.java @@ -5,10 +5,11 @@ import com.panzhihua.common.controller.BaseController; import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.sangeshenbian.SystemUserVo; +import com.panzhihua.sangeshenbian.annotation.SysLog; import com.panzhihua.sangeshenbian.model.entity.PartyMember; -import com.panzhihua.sangeshenbian.warpper.PartyMemberImportFailedVO; import com.panzhihua.sangeshenbian.service.IPartyMemberService; import com.panzhihua.sangeshenbian.warpper.PartyMemberDTO; +import com.panzhihua.sangeshenbian.warpper.PartyMemberImportFailedVO; import com.panzhihua.sangeshenbian.warpper.PartyMemberQuery; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -16,15 +17,7 @@ import lombok.RequiredArgsConstructor; import org.springframework.context.annotation.Lazy; import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; - -import org.springframework.web.bind.annotation.RequestPart; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; import javax.validation.Valid; @@ -54,6 +47,7 @@ } @ApiOperation("添加/编辑党员") @PostMapping("/save") + @SysLog(operatorCategory = "添加党员",operId = 8) public R<?> save(@Valid @RequestBody PartyMemberDTO dto) { SystemUserVo loginUserInfo = getLoginUserInfoSanGeShenBian(); partyMemberService.save(dto,loginUserInfo); @@ -66,16 +60,19 @@ } @ApiOperation("删除党员") @DeleteMapping("/{id}") + @SysLog(operatorCategory = "删除党员",operId = 8) public R<?> deleteById(@ApiParam(name = "id", value = "党员id", required = true) @PathVariable("id") Long id) { + String name = partyMemberService.getById(id).getName(); partyMemberService.removeById(id); - return R.ok(); + return R.ok(name); } @ApiOperation("冻结/解冻") @GetMapping("/freeze/{id}") + @SysLog(operatorCategory = "冻结",operId = 8) public R<?> freeze(@ApiParam(name = "id", value = "党员id", required = true) @PathVariable("id") Long id) { SystemUserVo loginUserInfo = getLoginUserInfoSanGeShenBian(); - partyMemberService.freeze(id, loginUserInfo); - return R.ok(); + PartyMember member = partyMemberService.freeze(id, loginUserInfo); + return R.ok(member); } @ApiOperation("下载导入模板") @GetMapping("/download") @@ -88,6 +85,7 @@ } @ApiOperation("导出") @PostMapping("/export") + @SysLog(operatorCategory = "导出党员",operId = 8) public void export(@RequestBody PartyMemberQuery query) { SystemUserVo loginUserInfo = getLoginUserInfoSanGeShenBian(); try { @@ -98,6 +96,7 @@ } @ApiOperation("导入") @PostMapping("/import") + @SysLog(operatorCategory = "导入党员",operId = 8) public R<List<PartyMemberImportFailedVO> > importExcel(@RequestPart("file") MultipartFile file) { SystemUserVo loginUserInfo = getLoginUserInfoSanGeShenBian(); try { @@ -107,15 +106,16 @@ } } @ApiOperation("审核") - @GetMapping("/audit/{id}") + @PostMapping("/audit") + @SysLog(operatorCategory = "审核",operId = 9) public R<?> audit(@RequestBody PartyMemberDTO dto) { SystemUserVo loginUserInfo = getLoginUserInfoSanGeShenBian(); - partyMemberService.audit(dto,loginUserInfo); - return R.ok(); + PartyMember partyMember = partyMemberService.audit(dto, loginUserInfo); + return R.ok(partyMember); } @ApiOperation("校验手机号是否注册党员") @GetMapping("/verify/{phone}") - public R<Boolean> verify(@ApiParam(name = "phone",value = "电话号码",required = true) String phone){ + public R<Boolean> verify(@ApiParam(name = "phone",value = "电话号码",required = true) @PathVariable("phone") String phone){ return R.ok(partyMemberService.verifyPartyMemberByPhone(phone)); } } -- Gitblit v1.7.1