From bff12f46b588ba6f715282ecdc101223551b2e1d Mon Sep 17 00:00:00 2001 From: haungxing <1203316822@qq.com> Date: Wed, 24 Jul 2024 18:57:47 +0800 Subject: [PATCH] =?UTF-8?q?#=20stationMapper=E6=96=B0=E5=A2=9E@Param?= =?UTF-8?q?=E6=B3=A8=E8=A7=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inspect/obj/feign/ContentDefinitionClient.java | 2 +- .../operational/station/feign/StationClient.java | 18 ++++---- .../operational/station/mapper/StationMapper.java | 54 +++++++++++----------- 3 files changed, 37 insertions(+), 37 deletions(-) diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/feign/ContentDefinitionClient.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/feign/ContentDefinitionClient.java index 4d432b4..f7a0922 100644 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/feign/ContentDefinitionClient.java +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/feign/ContentDefinitionClient.java @@ -48,7 +48,7 @@ public class ContentDefinitionClient implements IContentDefinitionClient { @Override @GetMapping(LIST) - public R> list(ContentDefinitionDTO request) { + public R> list(@RequestParam("request") ContentDefinitionDTO request) { return R.data(contentDefinitionService.list(request)); } diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/feign/StationClient.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/feign/StationClient.java index b2ca924..619a196 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/feign/StationClient.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/feign/StationClient.java @@ -42,7 +42,7 @@ public class StationClient implements IStationClient { @GetMapping("/getStationByCode") @ApiOperation("获取电站遥控信息") @ApiOperationSupport(order = 1) - public R getStationByCode(String stationId) { + public R getStationByCode(@RequestParam String stationId) { StationEntity stationEntity = stationService.getStationByStationCode(stationId); if(ObjectUtil.isEmpty(stationEntity)){ return R.fail("未查询到相关站点"); @@ -54,7 +54,7 @@ public class StationClient implements IStationClient { @GetMapping("/getStationByCodeAndUser") @ApiOperation("通过userId获取电站遥控信息") @ApiOperationSupport(order = 2) - public R getStationByCodeAndUser(String stationId, Long userId) { + public R getStationByCodeAndUser(@RequestParam String stationId,@RequestParam Long userId) { return R.data(stationService.getStationByCodeAndUser(stationId,userId)); } @@ -62,7 +62,7 @@ public class StationClient implements IStationClient { @GetMapping("/deviceEnableControlCheck") @ApiOperation("判断操作设备能否做遥控") @ApiOperationSupport(order = 3) - public R deviceEnableControlCheck(String deviceCode) { + public R deviceEnableControlCheck(@RequestParam String deviceCode) { return R.data(true); } @@ -70,7 +70,7 @@ public class StationClient implements IStationClient { @GetMapping("/monitorPermissionCheck") @ApiOperation("监护员权限校验") @ApiOperationSupport(order = 4) - public R monitorPermissionCheck(String userName, String password) { + public R monitorPermissionCheck(@RequestParam String userName, @RequestParam String password) { return R.data(true); } @@ -78,7 +78,7 @@ public class StationClient implements IStationClient { @GetMapping("/normalPermissionCheck") @ApiOperation("操作员权限校验") @ApiOperationSupport(order = 5) - public R normalPermissionCheck(String userName, String password) { + public R normalPermissionCheck(@RequestParam String userName,@RequestParam String password) { return R.data(true); } @@ -86,7 +86,7 @@ public class StationClient implements IStationClient { @GetMapping("/getUsersByStationId") @ApiOperation("站点获取人员列表") @ApiOperationSupport(order = 6) - public R> getUsersByStationId(String stationId) { + public R> getUsersByStationId(@RequestParam String stationId) { return R.data(stationService.getUsersByStationId(stationId)); } @@ -94,7 +94,7 @@ public class StationClient implements IStationClient { @GetMapping("/getStationsByRefDept") @ApiOperation("根据所属部门获取站点列表") @ApiOperationSupport(order = 7) - public R> getStationsByRefDept(Long deptId) { + public R> getStationsByRefDept(@RequestParam Long deptId) { List stationEntityList = stationService.list(new LambdaQueryWrapper().eq(StationEntity::getRefDept,deptId)); return R.data(stationEntityList); } @@ -103,7 +103,7 @@ public class StationClient implements IStationClient { @PostMapping("/list") @ApiOperation("根据条件查询相关站点列表") @ApiOperationSupport(order = 8) - public R> list(StationEntity stationEntity) { + public R> list(@RequestBody StationEntity stationEntity) { LambdaQueryWrapper wrapper = Condition.getQueryWrapper(stationEntity).lambda(); if(Func.isNotEmpty(stationEntity.getStatus())) { wrapper.eq(StationEntity::getStatus,stationEntity.getStatus()); @@ -155,7 +155,7 @@ public class StationClient implements IStationClient { @PostMapping("/getStationByCodeOrRedDept") @ApiOperation("根据条件查询单个站点") @ApiOperationSupport(order = 9) - public R getStationByCodeOrRedDept(StationEntity stationEntity) { + public R getStationByCodeOrRedDept(@RequestBody StationEntity stationEntity) { return R.data(stationService.getStationByCodeOrRefDept(stationEntity.getCode(),stationEntity.getRefDept())); } diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/mapper/StationMapper.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/mapper/StationMapper.java index 77abd56..a21772e 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/mapper/StationMapper.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/mapper/StationMapper.java @@ -31,7 +31,7 @@ public interface StationMapper extends UserDataScopeBaseMapper { * @param stationType * @return */ - List selectLikeRefDept(Long deptId, String stationType, List types); + List selectLikeRefDept(@Param("deptId") Long deptId, @Param("stationType") String stationType, @Param("types") List types); /**. * 所属机构 @@ -40,7 +40,7 @@ public interface StationMapper extends UserDataScopeBaseMapper { * @param stationType * @return */ - List selectEqualToRefDept(Long deptId, String stationType, List types); + List selectEqualToRefDept(@Param("deptId") Long deptId, @Param("stationType") String stationType, @Param("types") List types); /** * 附属机构及下属 @@ -49,7 +49,7 @@ public interface StationMapper extends UserDataScopeBaseMapper { * @param stationType * @return */ - List selectForEachRefDept(List list, String stationType, List types); + List selectForEachRefDept(@Param("list") List list, @Param("stationType") String stationType, @Param("types") List types); /** * //附属机构 @@ -57,7 +57,7 @@ public interface StationMapper extends UserDataScopeBaseMapper { * @param list * @return */ - List selectInRefDeptRefDomainCount(List list); + List selectInRefDeptRefDomainCount(@Param("list") List list); /** * //附属机构及下属 @@ -66,7 +66,7 @@ public interface StationMapper extends UserDataScopeBaseMapper { * @param refDomain * @return */ - List selectLikeForEachRefDeptRefDomainCount(List list, @Param("refDomain") String refDomain); + List selectLikeForEachRefDeptRefDomainCount(@Param("list") List list, @Param("refDomain") String refDomain); /** * 所属机构及下属机构 || 个人及下属机构 @@ -74,7 +74,7 @@ public interface StationMapper extends UserDataScopeBaseMapper { * @param deptId * @return */ - List selectLikeRefDeptRefDomainCount(Long deptId); + List selectLikeRefDeptRefDomainCount(@Param("deptId") Long deptId); /** * 所属机构 @@ -82,7 +82,7 @@ public interface StationMapper extends UserDataScopeBaseMapper { * @param deptId * @return */ - List selectEqualToRefDeptRefDomainCount(Long deptId); + List selectEqualToRefDeptRefDomainCount(@Param("deptId") Long deptId); List selectGroupRefDomainCount(); @@ -94,7 +94,7 @@ public interface StationMapper extends UserDataScopeBaseMapper { * @param refDomain * @return */ - List selectInRefDeptStationType(List list, String refDomain, List deptIds); + List selectInRefDeptStationType(@Param("list") List list, @Param("refDomain") String refDomain, @Param("deptIds") List deptIds); /** * 根据机构id及行业查询有几个站点类型 --附属机构及下属 @@ -103,7 +103,7 @@ public interface StationMapper extends UserDataScopeBaseMapper { * @param refDomain * @return */ - List selectForEachRefDeptStationType(List list, String refDomain, List deptIds); + List selectForEachRefDeptStationType(@Param("list") List list, @Param("refDomain") String refDomain, @Param("deptIds") List deptIds); /** * 根据机构id及行业查询有几个站点类型 --所属机构及下属机构 @@ -112,7 +112,7 @@ public interface StationMapper extends UserDataScopeBaseMapper { * @param refDomain * @return */ - List selectLikeRefDeptStationType(Long deptId, String refDomain, List deptIds); + List selectLikeRefDeptStationType(@Param("deptId") Long deptId, @Param("refDomain") String refDomain, @Param("deptIds") List deptIds); /** * 根据机构id及行业查询有几个站点类型 --所属机构 @@ -121,7 +121,7 @@ public interface StationMapper extends UserDataScopeBaseMapper { * @param refDomain * @return */ - List selectEqualToRefDeptStationType(Long deptId, String refDomain, List deptIds); + List selectEqualToRefDeptStationType(@Param("deptId") Long deptId, @Param("refDomain") String refDomain, @Param("deptIds") List deptIds); /** @@ -131,7 +131,7 @@ public interface StationMapper extends UserDataScopeBaseMapper { * @param refDomain * @return */ - int selectInRefDeptStationTypeCount(List list, String refDomain, List deptIds); + int selectInRefDeptStationTypeCount(@Param("list") List list, @Param("refDomain") String refDomain, @Param("deptIds") List deptIds); /** * 根据机构id及行业查询有几个站点类型 --附属机构及下属 @@ -140,7 +140,7 @@ public interface StationMapper extends UserDataScopeBaseMapper { * @param refDomain * @return */ - int selectForEachRefDeptStationTypeCount(List list, String refDomain, List deptIds); + int selectForEachRefDeptStationTypeCount(@Param("list") List list,@Param("refDomain") String refDomain,@Param("deptIds") List deptIds); /** * 根据机构id及行业查询有几个站点类型 --所属机构及下属机构 @@ -149,7 +149,7 @@ public interface StationMapper extends UserDataScopeBaseMapper { * @param refDomain * @return */ - int selectLikeRefDeptStationTypeCount(Long deptId, String refDomain, List deptIds); + int selectLikeRefDeptStationTypeCount(@Param("deptId") Long deptId, @Param("refDomain") String refDomain, @Param("deptIds") List deptIds); /** * 根据机构id及行业查询有几个站点类型 --所属机构 @@ -158,9 +158,9 @@ public interface StationMapper extends UserDataScopeBaseMapper { * @param refDomain * @return */ - int selectEqualToRefDeptStationTypeCount(Long deptId, String refDomain, List deptIds); + int selectEqualToRefDeptStationTypeCount(@Param("deptId") Long deptId, @Param("refDomain") String refDomain, @Param("deptIds") List deptIds); - int selectStationTypeCount(String refDomain); + int selectStationTypeCount(@Param("refDomain") String refDomain); /** * 根据机构id及行业和站点类型查询有几个站点类型 -- 附属机构 @@ -169,7 +169,7 @@ public interface StationMapper extends UserDataScopeBaseMapper { * @param refDomain * @return */ - int selectInRefDeptStationCount(List list, String refDomain, String type, List deptIds); + int selectInRefDeptStationCount(@Param("list") List list, @Param("refDomain") String refDomain, @Param("type") String type, @Param("deptIds") List deptIds); /** * 根据机构id及行业和站点类型查询有几个站点类型 --附属机构及下属 @@ -178,7 +178,7 @@ public interface StationMapper extends UserDataScopeBaseMapper { * @param refDomain * @return */ - int selectForEachRefDeptStationCount(List list, String refDomain, String type, List deptIds); + int selectForEachRefDeptStationCount(@Param("list") List list, @Param("refDomain") String refDomain, @Param("type") String type, @Param("deptIds") List deptIds); /** * 根据机构id及行业和站点类型查询有几个站点类型 --所属机构及下属机构 @@ -187,7 +187,7 @@ public interface StationMapper extends UserDataScopeBaseMapper { * @param refDomain * @return */ - int selectLikeRefDeptStationCount(Long deptId, String refDomain, String type, List deptIds); + int selectLikeRefDeptStationCount(@Param("deptId") Long deptId, @Param("refDomain") String refDomain, @Param("type") String type, @Param("deptIds") List deptIds); /** * 根据机构id及行业和站点类型查询有几个站点类型 --所属机构 @@ -196,12 +196,12 @@ public interface StationMapper extends UserDataScopeBaseMapper { * @param refDomain * @return */ - int selectEqualToRefDeptStationCount(Long deptId, String refDomain, String type, List deptIds); + int selectEqualToRefDeptStationCount(@Param("deptId") Long deptId, @Param("refDomain") String refDomain, String type, @Param("deptIds") List deptIds); - int selectStationCount(String refDomain, String type); + int selectStationCount(@Param("refDomain") String refDomain, @Param("type") String type); - StationEntity getStationByCode(String stationId, List deptIds, String userAuthDataSQL); + StationEntity getStationByCode(@Param("stationId") String stationId, @Param("deptIds") List deptIds, @Param("userAuthDataSQL") String userAuthDataSQL); List selectAll(); @@ -213,7 +213,7 @@ public interface StationMapper extends UserDataScopeBaseMapper { * @param list * @return */ - List selectInRefDeptStationData(List list); + List selectInRefDeptStationData(@Param("list") List list); /** * 根据用户权限查询站点数据 --附属机构及下属 @@ -221,7 +221,7 @@ public interface StationMapper extends UserDataScopeBaseMapper { * @param list * @return */ - List selectForEachRefDeptStationData(List list); + List selectForEachRefDeptStationData(@Param("list") List list); /** * 根据用户权限查询站点数据 --所属机构及下属机构 @@ -229,7 +229,7 @@ public interface StationMapper extends UserDataScopeBaseMapper { * @param deptId * @return */ - List selectLikeRefDeptStationData(Long deptId); + List selectLikeRefDeptStationData(@Param("deptId") Long deptId); /** * 根据用户权限查询站点数据 --所属机构 @@ -243,7 +243,7 @@ public interface StationMapper extends UserDataScopeBaseMapper { List selectKyeStationNameValueStationId(); - List selectStationTypeGroupCount(Integer serveType); + List selectStationTypeGroupCount(@Param("serveType") Integer serveType); List selectRefDeptByStationId(@Param("stationType") Integer stationType, @Param("serveType") Integer serveType); @@ -257,7 +257,7 @@ public interface StationMapper extends UserDataScopeBaseMapper { List selectListByServeType(@Param("serveType") Integer serveType); - List selectStationByInCode(List list); + List selectStationByInCode(@Param("list") List list); List selectListByTypes();