From 4a1eae3c114b90b60edfaa14c1dc2f87a21bd017 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Tue, 22 Nov 2022 15:31:28 +0800 Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E8=84=B1=E6=95=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epdc/controller/CheckRecordsController.java | 16 +++++++++------- .../controller/ViolationsRecordsController.java | 16 +++++++++------- .../controller/GridOperatorInfoController.java | 4 +++- .../controller/EnterpriseInfoController.java | 2 ++ .../PartyAuthenticationFailedController.java | 4 +++- .../user/controller/PartyMembersController.java | 5 ++++- .../epdc/user/controller/UserController.java | 6 +++++- .../user/controller/VolunteerInfoController.java | 2 ++ 8 files changed, 37 insertions(+), 18 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/src/main/java/com/elink/esua/epdc/controller/CheckRecordsController.java b/esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/src/main/java/com/elink/esua/epdc/controller/CheckRecordsController.java index 29449ac14..6bec7374a 100644 --- a/esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/src/main/java/com/elink/esua/epdc/controller/CheckRecordsController.java +++ b/esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/src/main/java/com/elink/esua/epdc/controller/CheckRecordsController.java @@ -17,14 +17,15 @@ package com.elink.esua.epdc.controller; +import com.elink.esua.epdc.commons.tools.annotation.MaskResponse; import com.elink.esua.epdc.commons.tools.page.PageData; import com.elink.esua.epdc.commons.tools.utils.ExcelUtils; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.commons.tools.validator.AssertUtils; import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils; import com.elink.esua.epdc.commons.tools.validator.group.AddGroup; -import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup; import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup; +import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup; import com.elink.esua.epdc.dto.CheckRecordsDTO; import com.elink.esua.epdc.excel.CheckRecordsExcel; import com.elink.esua.epdc.service.CheckRecordsService; @@ -45,24 +46,25 @@ import java.util.Map; @RestController @RequestMapping("checkrecords") public class CheckRecordsController { - + @Autowired private CheckRecordsService checkRecordsService; @GetMapping("page") - public Result> page(@RequestParam Map params){ + @MaskResponse(fieldNames = {"mobile"}, fieldsMaskType = {MaskResponse.MASK_TYPE_MOBILE}) + public Result> page(@RequestParam Map params) { PageData page = checkRecordsService.page(params); return new Result>().ok(page); } @GetMapping("{id}") - public Result get(@PathVariable("id") String id){ + public Result get(@PathVariable("id") String id) { CheckRecordsDTO data = checkRecordsService.getDetails(id); return new Result().ok(data); } @PostMapping - public Result save(@RequestBody CheckRecordsDTO dto){ + public Result save(@RequestBody CheckRecordsDTO dto) { //效验数据 ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); checkRecordsService.save(dto); @@ -70,7 +72,7 @@ public class CheckRecordsController { } @PutMapping - public Result update(@RequestBody CheckRecordsDTO dto){ + public Result update(@RequestBody CheckRecordsDTO dto) { //效验数据 ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); checkRecordsService.update(dto); @@ -78,7 +80,7 @@ public class CheckRecordsController { } @DeleteMapping - public Result delete(@RequestBody String[] ids){ + public Result delete(@RequestBody String[] ids) { //效验数据 AssertUtils.isArrayEmpty(ids, "id"); checkRecordsService.delete(ids); diff --git a/esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/src/main/java/com/elink/esua/epdc/controller/ViolationsRecordsController.java b/esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/src/main/java/com/elink/esua/epdc/controller/ViolationsRecordsController.java index b52f1ee87..130809a5f 100644 --- a/esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/src/main/java/com/elink/esua/epdc/controller/ViolationsRecordsController.java +++ b/esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/src/main/java/com/elink/esua/epdc/controller/ViolationsRecordsController.java @@ -17,14 +17,15 @@ package com.elink.esua.epdc.controller; +import com.elink.esua.epdc.commons.tools.annotation.MaskResponse; import com.elink.esua.epdc.commons.tools.page.PageData; import com.elink.esua.epdc.commons.tools.utils.ExcelUtils; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.commons.tools.validator.AssertUtils; import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils; import com.elink.esua.epdc.commons.tools.validator.group.AddGroup; -import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup; import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup; +import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup; import com.elink.esua.epdc.dto.ViolationsRecordsDTO; import com.elink.esua.epdc.excel.ViolationsRecordsExcel; import com.elink.esua.epdc.service.ViolationsRecordsService; @@ -45,24 +46,25 @@ import java.util.Map; @RestController @RequestMapping("violationsrecords") public class ViolationsRecordsController { - + @Autowired private ViolationsRecordsService violationsRecordsService; @GetMapping("page") - public Result> page(@RequestParam Map params){ + @MaskResponse(fieldNames = {"mobile"}, fieldsMaskType = {MaskResponse.MASK_TYPE_MOBILE}) + public Result> page(@RequestParam Map params) { PageData page = violationsRecordsService.page(params); return new Result>().ok(page); } @GetMapping("{id}") - public Result get(@PathVariable("id") String id){ + public Result get(@PathVariable("id") String id) { ViolationsRecordsDTO data = violationsRecordsService.getDetails(id); return new Result().ok(data); } @PostMapping - public Result save(@RequestBody ViolationsRecordsDTO dto){ + public Result save(@RequestBody ViolationsRecordsDTO dto) { //效验数据 ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); violationsRecordsService.save(dto); @@ -70,7 +72,7 @@ public class ViolationsRecordsController { } @PutMapping - public Result update(@RequestBody ViolationsRecordsDTO dto){ + public Result update(@RequestBody ViolationsRecordsDTO dto) { //效验数据 ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); violationsRecordsService.update(dto); @@ -78,7 +80,7 @@ public class ViolationsRecordsController { } @DeleteMapping - public Result delete(@RequestBody String[] ids){ + public Result delete(@RequestBody String[] ids) { //效验数据 AssertUtils.isArrayEmpty(ids, "id"); violationsRecordsService.delete(ids); diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/consult/controller/GridOperatorInfoController.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/consult/controller/GridOperatorInfoController.java index 7d74f57b1..6d59eabdc 100755 --- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/consult/controller/GridOperatorInfoController.java +++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/consult/controller/GridOperatorInfoController.java @@ -18,6 +18,7 @@ package com.elink.esua.epdc.modules.consult.controller; import com.elink.esua.epdc.commons.mybatis.annotation.DataFilter; +import com.elink.esua.epdc.commons.tools.annotation.MaskResponse; import com.elink.esua.epdc.commons.tools.enums.YesOrNoEnum; import com.elink.esua.epdc.commons.tools.page.PageData; import com.elink.esua.epdc.commons.tools.utils.ExcelUtils; @@ -26,8 +27,8 @@ import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.commons.tools.validator.AssertUtils; import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils; import com.elink.esua.epdc.commons.tools.validator.group.AddGroup; -import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup; import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup; +import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup; import com.elink.esua.epdc.dto.consult.GridOperatorInfoDTO; import com.elink.esua.epdc.dto.consult.form.GridOperatorListFormDTO; import com.elink.esua.epdc.dto.consult.result.GridOperatorListResultDTO; @@ -56,6 +57,7 @@ public class GridOperatorInfoController { private GridOperatorInfoService gridOperatorInfoService; @GetMapping("page") + @MaskResponse(fieldNames = {"mobile", "identityNo"}, fieldsMaskType = {MaskResponse.MASK_TYPE_MOBILE, MaskResponse.MASK_TYPE_ID_CARD}) @DataFilter(tableAlias = "t", deptId = "DEPT_ID", prefix = "AND", isPendingCreator = false) public Result> page(@RequestParam Map params) { PageData page = gridOperatorInfoService.getEnterpriseInfoPageFromPc(params); diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/enterprise/controller/EnterpriseInfoController.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/enterprise/controller/EnterpriseInfoController.java index 4702912d5..4555425e9 100644 --- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/enterprise/controller/EnterpriseInfoController.java +++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/enterprise/controller/EnterpriseInfoController.java @@ -18,6 +18,7 @@ package com.elink.esua.epdc.modules.enterprise.controller; import com.elink.esua.epdc.commons.mybatis.annotation.DataFilter; +import com.elink.esua.epdc.commons.tools.annotation.MaskResponse; import com.elink.esua.epdc.commons.tools.page.PageData; import com.elink.esua.epdc.commons.tools.utils.ExcelUtils; import com.elink.esua.epdc.commons.tools.utils.Result; @@ -54,6 +55,7 @@ public class EnterpriseInfoController { private EnterpriseInfoService enterpriseInfoService; @GetMapping("page") + @MaskResponse(fieldNames = {"mobile"}, fieldsMaskType = {MaskResponse.MASK_TYPE_MOBILE}) @DataFilter(tableAlias = "t", prefix = "AND", isPendingCreator = false) public Result> page(@RequestParam Map params) { PageData page = enterpriseInfoService.getEnterpriseInfoPageFromPc(params); diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/controller/PartyAuthenticationFailedController.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/controller/PartyAuthenticationFailedController.java index e628c9826..95bc265d1 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/controller/PartyAuthenticationFailedController.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/controller/PartyAuthenticationFailedController.java @@ -18,14 +18,15 @@ package com.elink.esua.epdc.user.controller; import com.elink.esua.epdc.commons.mybatis.annotation.DataFilter; +import com.elink.esua.epdc.commons.tools.annotation.MaskResponse; import com.elink.esua.epdc.commons.tools.page.PageData; import com.elink.esua.epdc.commons.tools.utils.ExcelUtils; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.commons.tools.validator.AssertUtils; import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils; import com.elink.esua.epdc.commons.tools.validator.group.AddGroup; -import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup; import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup; +import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup; import com.elink.esua.epdc.user.dto.PartyAuthenticationFailedDTO; import com.elink.esua.epdc.user.excel.PartyAuthenticationFailedExcel; import com.elink.esua.epdc.user.service.PartyAuthenticationFailedService; @@ -52,6 +53,7 @@ public class PartyAuthenticationFailedController { @GetMapping("page") @DataFilter(tableAlias = "epaf", deptId = "grid_id", prefix = "AND", isPendingCreator = false) + @MaskResponse(fieldNames = {"mobile", "identityNo"}, fieldsMaskType = {MaskResponse.MASK_TYPE_MOBILE, MaskResponse.MASK_TYPE_ID_CARD}) public Result> page(@RequestParam Map params) { PageData page = partyAuthenticationFailedService.page(params); return new Result>().ok(page); diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/controller/PartyMembersController.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/controller/PartyMembersController.java index 1c1bec300..ce7af3da7 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/controller/PartyMembersController.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/controller/PartyMembersController.java @@ -18,6 +18,7 @@ package com.elink.esua.epdc.user.controller; import com.elink.esua.epdc.commons.mybatis.annotation.DataFilter; +import com.elink.esua.epdc.commons.tools.annotation.MaskResponse; import com.elink.esua.epdc.commons.tools.page.PageData; import com.elink.esua.epdc.commons.tools.security.user.SecurityUser; import com.elink.esua.epdc.commons.tools.utils.ExcelUtils; @@ -25,8 +26,8 @@ import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.commons.tools.validator.AssertUtils; import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils; import com.elink.esua.epdc.commons.tools.validator.group.AddGroup; -import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup; import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup; +import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup; import com.elink.esua.epdc.user.dto.PartyMembersDTO; import com.elink.esua.epdc.user.excel.PartyMembersExcel; import com.elink.esua.epdc.user.service.PartyMembersService; @@ -61,6 +62,7 @@ public class PartyMembersController { * @date 2020/2/24 15:16 */ @GetMapping("page") + @MaskResponse(fieldNames = {"mobile", "identityNo"}, fieldsMaskType = {MaskResponse.MASK_TYPE_MOBILE, MaskResponse.MASK_TYPE_ID_CARD}) public Result> page(@RequestParam Map params) { return partyMembersService.pageDIY(params); } @@ -172,6 +174,7 @@ public class PartyMembersController { */ @GetMapping("optimizeHasAuthenticationPartyPage") // @DataFilter(tableAlias = "eu", prefix = "AND", isPendingCreator = false) + @MaskResponse(fieldNames = {"mobile", "identityNo"}, fieldsMaskType = {MaskResponse.MASK_TYPE_MOBILE, MaskResponse.MASK_TYPE_ID_CARD}) public Result> optimizeHasAuthenticationPartyPage(@RequestParam Map params) { return partyMembersService.optimizeHasAuthenticationPartyPage(params); } diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/controller/UserController.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/controller/UserController.java index 4ce071bd3..823391b3a 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/controller/UserController.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/controller/UserController.java @@ -18,7 +18,7 @@ package com.elink.esua.epdc.user.controller; import com.elink.esua.epdc.commons.mybatis.annotation.DataFilter; -import com.elink.esua.epdc.commons.tools.annotation.LoginUser; +import com.elink.esua.epdc.commons.tools.annotation.MaskResponse; import com.elink.esua.epdc.commons.tools.page.PageData; import com.elink.esua.epdc.commons.tools.utils.ExcelUtils; import com.elink.esua.epdc.commons.tools.utils.Result; @@ -74,6 +74,7 @@ public class UserController { * @since 2020/3/24 15:47 */ @GetMapping("waitPartyPage") + @MaskResponse(fieldNames = {"mobile", "identityNo"}, fieldsMaskType = {MaskResponse.MASK_TYPE_MOBILE, MaskResponse.MASK_TYPE_ID_CARD}) // @DataFilter(tableAlias = "u", isPendingCreator = false, deptId = "DEPT_ID", prefix = "AND") public Result> waitPartyPage(@RequestParam Map params) { PageData page = userService.waitPartyPage(params); @@ -262,6 +263,7 @@ public class UserController { * @date 2020/3/16 10:51 */ @GetMapping("alluserpage") + @MaskResponse(fieldNames = {"mobile", "identityNo"}, fieldsMaskType = {MaskResponse.MASK_TYPE_MOBILE, MaskResponse.MASK_TYPE_ID_CARD}) public Result> alluserpage(@RequestParam Map params) { PageData page = userService.allUserPage(params); return new Result>().ok(page); @@ -277,6 +279,7 @@ public class UserController { */ @GetMapping("authenticatedpage") // @DataFilter(tableAlias = "u", isPendingCreator = false, deptId = "DEPT_ID", prefix = "AND") + @MaskResponse(fieldNames = {"mobile", "identityNo"}, fieldsMaskType = {MaskResponse.MASK_TYPE_MOBILE, MaskResponse.MASK_TYPE_ID_CARD}) public Result> authenticatedpage(@RequestParam Map params) { PageData page = userService.authenticatedpage(params); return new Result>().ok(page); @@ -291,6 +294,7 @@ public class UserController { * @date 2022/4/29 9:29 */ @GetMapping("/partymembers/standardbearer/examine/page") + @MaskResponse(fieldNames = {"mobile", "identityNo"}, fieldsMaskType = {MaskResponse.MASK_TYPE_MOBILE, MaskResponse.MASK_TYPE_ID_CARD}) public Result> partyMenFlagReviewPage(@RequestParam Map params) { PageData page = userService.partyMenFlagReviewPage(params); return new Result>().ok(page); diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/controller/VolunteerInfoController.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/controller/VolunteerInfoController.java index 459f4feb6..f6017f918 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/controller/VolunteerInfoController.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/controller/VolunteerInfoController.java @@ -17,6 +17,7 @@ package com.elink.esua.epdc.user.controller; +import com.elink.esua.epdc.commons.tools.annotation.MaskResponse; import com.elink.esua.epdc.commons.tools.page.PageData; import com.elink.esua.epdc.commons.tools.utils.ExcelUtils; import com.elink.esua.epdc.commons.tools.utils.Result; @@ -63,6 +64,7 @@ public class VolunteerInfoController { * @Date: 2019-12-17 */ @GetMapping("page") + @MaskResponse(fieldNames = {"mobile", "identityNo"}, fieldsMaskType = {MaskResponse.MASK_TYPE_MOBILE, MaskResponse.MASK_TYPE_ID_CARD}) public Result> page(@RequestParam Map params) { PageData page = volunteerInfoService.volunteerInfo(params); return new Result>().ok(page);