# stationMapper新增@Param注解

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<ContentDefinitionVO>> list(ContentDefinitionDTO request) {
+    public R<List<ContentDefinitionVO>> list(@RequestParam("request") ContentDefinitionDTO request) {
         return R.data(contentDefinitionService.list(request));
     }
 

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<StationEntity> getStationByCode(String stationId) {
+	public R<StationEntity> 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<StationEntity> getStationByCodeAndUser(String stationId, Long userId) {
+	public R<StationEntity> 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<Boolean> deviceEnableControlCheck(String deviceCode) {
+	public R<Boolean> 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<Boolean> monitorPermissionCheck(String userName, String password) {
+	public R<Boolean> 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<Boolean> normalPermissionCheck(String userName, String password) {
+	public R<Boolean> 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<List<User>> getUsersByStationId(String stationId) {
+	public R<List<User>> 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<List<StationEntity>> getStationsByRefDept(Long deptId) {
+	public R<List<StationEntity>> getStationsByRefDept(@RequestParam Long deptId) {
 		List<StationEntity> stationEntityList = stationService.list(new LambdaQueryWrapper<StationEntity>().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>> list(StationEntity stationEntity) {
+	public R<List<StationEntity>> list(@RequestBody StationEntity stationEntity) {
 		LambdaQueryWrapper<StationEntity> 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<StationEntity> getStationByCodeOrRedDept(StationEntity stationEntity) {
+	public R<StationEntity> getStationByCodeOrRedDept(@RequestBody StationEntity stationEntity) {
 		return R.data(stationService.getStationByCodeOrRefDept(stationEntity.getCode(),stationEntity.getRefDept()));
 	}
 

hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/mapper/StationMapper.java

@@ -31,7 +31,7 @@ public interface StationMapper extends UserDataScopeBaseMapper<StationEntity> {
 	 * @param stationType
 	 * @return
 	 */
-	List<StationEntity> selectLikeRefDept(Long deptId, String stationType, List<String> types);
+	List<StationEntity> selectLikeRefDept(@Param("deptId") Long deptId, @Param("stationType") String stationType, @Param("types") List<String> types);
 
 	/**.
 	 * 所属机构
@@ -40,7 +40,7 @@ public interface StationMapper extends UserDataScopeBaseMapper<StationEntity> {
 	 * @param stationType
 	 * @return
 	 */
-	List<StationEntity> selectEqualToRefDept(Long deptId, String stationType, List<String> types);
+	List<StationEntity> selectEqualToRefDept(@Param("deptId") Long deptId, @Param("stationType") String stationType, @Param("types") List<String> types);
 
 	/**
 	 * 附属机构及下属
@@ -49,7 +49,7 @@ public interface StationMapper extends UserDataScopeBaseMapper<StationEntity> {
 	 * @param stationType
 	 * @return
 	 */
-	List<StationEntity> selectForEachRefDept(List<Long> list, String stationType, List<String> types);
+	List<StationEntity> selectForEachRefDept(@Param("list") List<Long> list, @Param("stationType") String stationType, @Param("types") List<String> types);
 
 	/**
 	 * //附属机构
@@ -57,7 +57,7 @@ public interface StationMapper extends UserDataScopeBaseMapper<StationEntity> {
 	 * @param list
 	 * @return
 	 */
-	List<RefDomainOrStationVo> selectInRefDeptRefDomainCount(List<Long> list);
+	List<RefDomainOrStationVo> selectInRefDeptRefDomainCount(@Param("list") List<Long> list);
 
 	/**
 	 * //附属机构及下属
@@ -66,7 +66,7 @@ public interface StationMapper extends UserDataScopeBaseMapper<StationEntity> {
 	 * @param refDomain
 	 * @return
 	 */
-	List<RefDomainOrStationVo> selectLikeForEachRefDeptRefDomainCount(List<Long> list, @Param("refDomain") String refDomain);
+	List<RefDomainOrStationVo> selectLikeForEachRefDeptRefDomainCount(@Param("list") List<Long> list, @Param("refDomain") String refDomain);
 
 	/**
 	 * 所属机构及下属机构 || 个人及下属机构
@@ -74,7 +74,7 @@ public interface StationMapper extends UserDataScopeBaseMapper<StationEntity> {
 	 * @param deptId
 	 * @return
 	 */
-	List<RefDomainOrStationVo> selectLikeRefDeptRefDomainCount(Long deptId);
+	List<RefDomainOrStationVo> selectLikeRefDeptRefDomainCount(@Param("deptId") Long deptId);
 
 	/**
 	 * 所属机构
@@ -82,7 +82,7 @@ public interface StationMapper extends UserDataScopeBaseMapper<StationEntity> {
 	 * @param deptId
 	 * @return
 	 */
-	List<RefDomainOrStationVo> selectEqualToRefDeptRefDomainCount(Long deptId);
+	List<RefDomainOrStationVo> selectEqualToRefDeptRefDomainCount(@Param("deptId") Long deptId);
 
 	List<RefDomainOrStationVo> selectGroupRefDomainCount();
 
@@ -94,7 +94,7 @@ public interface StationMapper extends UserDataScopeBaseMapper<StationEntity> {
 	 * @param refDomain
 	 * @return
 	 */
-	List<RefDomainOrStationVo> selectInRefDeptStationType(List<Long> list, String refDomain, List<Long> deptIds);
+	List<RefDomainOrStationVo> selectInRefDeptStationType(@Param("list") List<Long> list, @Param("refDomain") String refDomain, @Param("deptIds") List<Long> deptIds);
 
 	/**
 	 * 根据机构id及行业查询有几个站点类型 --附属机构及下属
@@ -103,7 +103,7 @@ public interface StationMapper extends UserDataScopeBaseMapper<StationEntity> {
 	 * @param refDomain
 	 * @return
 	 */
-	List<RefDomainOrStationVo> selectForEachRefDeptStationType(List<Long> list, String refDomain, List<Long> deptIds);
+	List<RefDomainOrStationVo> selectForEachRefDeptStationType(@Param("list") List<Long> list, @Param("refDomain") String refDomain, @Param("deptIds") List<Long> deptIds);
 
 	/**
 	 * 根据机构id及行业查询有几个站点类型 --所属机构及下属机构
@@ -112,7 +112,7 @@ public interface StationMapper extends UserDataScopeBaseMapper<StationEntity> {
 	 * @param refDomain
 	 * @return
 	 */
-	List<RefDomainOrStationVo> selectLikeRefDeptStationType(Long deptId, String refDomain, List<Long> deptIds);
+	List<RefDomainOrStationVo> selectLikeRefDeptStationType(@Param("deptId") Long deptId, @Param("refDomain") String refDomain, @Param("deptIds") List<Long> deptIds);
 
 	/**
 	 * 根据机构id及行业查询有几个站点类型 --所属机构
@@ -121,7 +121,7 @@ public interface StationMapper extends UserDataScopeBaseMapper<StationEntity> {
 	 * @param refDomain
 	 * @return
 	 */
-	List<RefDomainOrStationVo> selectEqualToRefDeptStationType(Long deptId, String refDomain, List<Long> deptIds);
+	List<RefDomainOrStationVo> selectEqualToRefDeptStationType(@Param("deptId") Long deptId, @Param("refDomain") String refDomain, @Param("deptIds") List<Long> deptIds);
 
 
 	/**
@@ -131,7 +131,7 @@ public interface StationMapper extends UserDataScopeBaseMapper<StationEntity> {
 	 * @param refDomain
 	 * @return
 	 */
-	int selectInRefDeptStationTypeCount(List<Long> list, String refDomain, List<Long> deptIds);
+	int selectInRefDeptStationTypeCount(@Param("list") List<Long> list, @Param("refDomain") String refDomain, @Param("deptIds") List<Long> deptIds);
 
 	/**
 	 * 根据机构id及行业查询有几个站点类型 --附属机构及下属
@@ -140,7 +140,7 @@ public interface StationMapper extends UserDataScopeBaseMapper<StationEntity> {
 	 * @param refDomain
 	 * @return
 	 */
-	int selectForEachRefDeptStationTypeCount(List<Long> list, String refDomain, List<Long> deptIds);
+	int selectForEachRefDeptStationTypeCount(@Param("list") List<Long> list,@Param("refDomain") String refDomain,@Param("deptIds") List<Long> deptIds);
 
 	/**
 	 * 根据机构id及行业查询有几个站点类型 --所属机构及下属机构
@@ -149,7 +149,7 @@ public interface StationMapper extends UserDataScopeBaseMapper<StationEntity> {
 	 * @param refDomain
 	 * @return
 	 */
-	int selectLikeRefDeptStationTypeCount(Long deptId, String refDomain, List<Long> deptIds);
+	int selectLikeRefDeptStationTypeCount(@Param("deptId") Long deptId, @Param("refDomain") String refDomain, @Param("deptIds") List<Long> deptIds);
 
 	/**
 	 * 根据机构id及行业查询有几个站点类型 --所属机构
@@ -158,9 +158,9 @@ public interface StationMapper extends UserDataScopeBaseMapper<StationEntity> {
 	 * @param refDomain
 	 * @return
 	 */
-	int selectEqualToRefDeptStationTypeCount(Long deptId, String refDomain, List<Long> deptIds);
+	int selectEqualToRefDeptStationTypeCount(@Param("deptId") Long deptId, @Param("refDomain") String refDomain, @Param("deptIds") List<Long> deptIds);
 
-	int selectStationTypeCount(String refDomain);
+	int selectStationTypeCount(@Param("refDomain") String refDomain);
 
 	/**
 	 * 根据机构id及行业和站点类型查询有几个站点类型 -- 附属机构
@@ -169,7 +169,7 @@ public interface StationMapper extends UserDataScopeBaseMapper<StationEntity> {
 	 * @param refDomain
 	 * @return
 	 */
-	int selectInRefDeptStationCount(List<Long> list, String refDomain, String type, List<Long> deptIds);
+	int selectInRefDeptStationCount(@Param("list") List<Long> list, @Param("refDomain") String refDomain, @Param("type") String type, @Param("deptIds") List<Long> deptIds);
 
 	/**
 	 * 根据机构id及行业和站点类型查询有几个站点类型 --附属机构及下属
@@ -178,7 +178,7 @@ public interface StationMapper extends UserDataScopeBaseMapper<StationEntity> {
 	 * @param refDomain
 	 * @return
 	 */
-	int selectForEachRefDeptStationCount(List<Long> list, String refDomain, String type, List<Long> deptIds);
+	int selectForEachRefDeptStationCount(@Param("list") List<Long> list, @Param("refDomain") String refDomain, @Param("type") String type, @Param("deptIds") List<Long> deptIds);
 
 	/**
 	 * 根据机构id及行业和站点类型查询有几个站点类型 --所属机构及下属机构
@@ -187,7 +187,7 @@ public interface StationMapper extends UserDataScopeBaseMapper<StationEntity> {
 	 * @param refDomain
 	 * @return
 	 */
-	int selectLikeRefDeptStationCount(Long deptId, String refDomain, String type, List<Long> deptIds);
+	int selectLikeRefDeptStationCount(@Param("deptId") Long deptId, @Param("refDomain") String refDomain, @Param("type")  String type, @Param("deptIds") List<Long> deptIds);
 
 	/**
 	 * 根据机构id及行业和站点类型查询有几个站点类型 --所属机构
@@ -196,12 +196,12 @@ public interface StationMapper extends UserDataScopeBaseMapper<StationEntity> {
 	 * @param refDomain
 	 * @return
 	 */
-	int selectEqualToRefDeptStationCount(Long deptId, String refDomain, String type, List<Long> deptIds);
+	int selectEqualToRefDeptStationCount(@Param("deptId") Long deptId, @Param("refDomain") String refDomain, String type, @Param("deptIds") List<Long> deptIds);
 
-	int selectStationCount(String refDomain, String type);
+	int selectStationCount(@Param("refDomain") String refDomain, @Param("type") String type);
 
 
-	StationEntity getStationByCode(String stationId, List<Long> deptIds, String userAuthDataSQL);
+	StationEntity getStationByCode(@Param("stationId") String stationId, @Param("deptIds") List<Long> deptIds, @Param("userAuthDataSQL") String userAuthDataSQL);
 
 
 	List<StationEntity> selectAll();
@@ -213,7 +213,7 @@ public interface StationMapper extends UserDataScopeBaseMapper<StationEntity> {
 	 * @param list
 	 * @return
 	 */
-	List<StationEntity> selectInRefDeptStationData(List<Long> list);
+	List<StationEntity> selectInRefDeptStationData(@Param("list") List<Long> list);
 
 	/**
 	 * 根据用户权限查询站点数据 --附属机构及下属
@@ -221,7 +221,7 @@ public interface StationMapper extends UserDataScopeBaseMapper<StationEntity> {
 	 * @param list
 	 * @return
 	 */
-	List<StationEntity> selectForEachRefDeptStationData(List<Long> list);
+	List<StationEntity> selectForEachRefDeptStationData(@Param("list") List<Long> list);
 
 	/**
 	 * 根据用户权限查询站点数据 --所属机构及下属机构
@@ -229,7 +229,7 @@ public interface StationMapper extends UserDataScopeBaseMapper<StationEntity> {
 	 * @param deptId
 	 * @return
 	 */
-	List<StationEntity> selectLikeRefDeptStationData(Long deptId);
+	List<StationEntity> selectLikeRefDeptStationData(@Param("deptId") Long deptId);
 
 	/**
 	 * 根据用户权限查询站点数据 --所属机构
@@ -243,7 +243,7 @@ public interface StationMapper extends UserDataScopeBaseMapper<StationEntity> {
 	List<StationEntity> selectKyeStationNameValueStationId();
 
 
-	List<StationCountVo> selectStationTypeGroupCount(Integer serveType);
+	List<StationCountVo> selectStationTypeGroupCount(@Param("serveType") Integer serveType);
 
 	List<Long> selectRefDeptByStationId(@Param("stationType") Integer stationType, @Param("serveType") Integer serveType);
 
@@ -257,7 +257,7 @@ public interface StationMapper extends UserDataScopeBaseMapper<StationEntity> {
 
 	List<StationEntity> selectListByServeType(@Param("serveType") Integer serveType);
 
-	List<StationEntity> selectStationByInCode(List<String> list);
+	List<StationEntity> selectStationByInCode(@Param("list") List<String> list);
 
 
 	List<StationEntity> selectListByTypes();