Sfoglia il codice sorgente

新增获取指定地块所绑定用户列表的接口

liuyaowen 10 mesi fa
parent
commit
89d2cecc6b

+ 5 - 7
src/main/java/com/yunfeiyun/agmp/fms/controller/FmsBlockController.java

@@ -1,8 +1,6 @@
 package com.yunfeiyun.agmp.fms.controller;
 package com.yunfeiyun.agmp.fms.controller;
 
 
 import com.yunfeiyun.agmp.common.annotation.Log;
 import com.yunfeiyun.agmp.common.annotation.Log;
-import com.yunfeiyun.agmp.common.constant.ErrorCode;
-import com.yunfeiyun.agmp.common.constant.ResConstants;
 import com.yunfeiyun.agmp.common.core.controller.BaseController;
 import com.yunfeiyun.agmp.common.core.controller.BaseController;
 import com.yunfeiyun.agmp.common.core.domain.AjaxResult;
 import com.yunfeiyun.agmp.common.core.domain.AjaxResult;
 import com.yunfeiyun.agmp.common.core.page.TableDataInfo;
 import com.yunfeiyun.agmp.common.core.page.TableDataInfo;
@@ -11,7 +9,6 @@ import com.yunfeiyun.agmp.common.enums.CommonEnums;
 import com.yunfeiyun.agmp.common.framework.manager.ResManager;
 import com.yunfeiyun.agmp.common.framework.manager.ResManager;
 import com.yunfeiyun.agmp.common.utils.SecurityUtils;
 import com.yunfeiyun.agmp.common.utils.SecurityUtils;
 import com.yunfeiyun.agmp.common.utils.poi.ExcelUtil;
 import com.yunfeiyun.agmp.common.utils.poi.ExcelUtil;
-import com.yunfeiyun.agmp.common.web.system.domain.SysRes;
 import com.yunfeiyun.agmp.fms.domain.FmsBlock;
 import com.yunfeiyun.agmp.fms.domain.FmsBlock;
 import com.yunfeiyun.agmp.fms.domain.FmsLand;
 import com.yunfeiyun.agmp.fms.domain.FmsLand;
 import com.yunfeiyun.agmp.fms.domain.reqvo.FmsBlockBindUserReqVo;
 import com.yunfeiyun.agmp.fms.domain.reqvo.FmsBlockBindUserReqVo;
@@ -21,22 +18,19 @@ import com.yunfeiyun.agmp.fms.domain.resvo.FmsBlockResVo;
 import com.yunfeiyun.agmp.fms.domain.resvo.FmsLandTreeResVo;
 import com.yunfeiyun.agmp.fms.domain.resvo.FmsLandTreeResVo;
 import com.yunfeiyun.agmp.fms.domain.resvo.FmsPlanResVo;
 import com.yunfeiyun.agmp.fms.domain.resvo.FmsPlanResVo;
 import com.yunfeiyun.agmp.fms.mapper.FmsBlockMapper;
 import com.yunfeiyun.agmp.fms.mapper.FmsBlockMapper;
-import com.yunfeiyun.agmp.fms.util.DataAuthUtil;
 import com.yunfeiyun.agmp.fms.service.IFmsBlockService;
 import com.yunfeiyun.agmp.fms.service.IFmsBlockService;
 import com.yunfeiyun.agmp.fms.service.IFmsLandService;
 import com.yunfeiyun.agmp.fms.service.IFmsLandService;
 import com.yunfeiyun.agmp.fms.service.IFmsPlanService;
 import com.yunfeiyun.agmp.fms.service.IFmsPlanService;
+import com.yunfeiyun.agmp.fms.util.DataAuthUtil;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
 
 
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 import javax.validation.Valid;
 import java.util.ArrayList;
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
 import java.util.List;
-import java.util.Map;
 
 
 /**
 /**
  * 地块Controller
  * 地块Controller
@@ -203,4 +197,8 @@ public class FmsBlockController extends BaseController
     public AjaxResult userBindList(String userId){
     public AjaxResult userBindList(String userId){
         return AjaxResult.success(fmsBlockService.userBindList(userId,SecurityUtils.getTid()));
         return AjaxResult.success(fmsBlockService.userBindList(userId,SecurityUtils.getTid()));
     }
     }
+    @GetMapping("/bind/user/list")
+    public AjaxResult bindUserList(@RequestParam("blockId") String blockId){
+        return AjaxResult.success(fmsBlockService.selectFmsBlockBindUserList(blockId));
+    }
 }
 }

+ 3 - 0
src/main/java/com/yunfeiyun/agmp/fms/mapper/FmsBlockMapper.java

@@ -1,5 +1,6 @@
 package com.yunfeiyun.agmp.fms.mapper;
 package com.yunfeiyun.agmp.fms.mapper;
 
 
+import com.yunfeiyun.agmp.common.core.domain.entity.SysUser;
 import com.yunfeiyun.agmp.fms.domain.FmsBlock;
 import com.yunfeiyun.agmp.fms.domain.FmsBlock;
 import com.yunfeiyun.agmp.fms.domain.FmsLand;
 import com.yunfeiyun.agmp.fms.domain.FmsLand;
 import com.yunfeiyun.agmp.fms.domain.reqvo.FmsBlockBindUserReqVo;
 import com.yunfeiyun.agmp.fms.domain.reqvo.FmsBlockBindUserReqVo;
@@ -71,4 +72,6 @@ public interface FmsBlockMapper
     List<String> userBindList(@Param("userId") String userId,@Param("tid") String tid);
     List<String> userBindList(@Param("userId") String userId,@Param("tid") String tid);
 
 
     int unbindUser(@Param("userId") String userId,@Param("tid")String tid);
     int unbindUser(@Param("userId") String userId,@Param("tid")String tid);
+
+    List<SysUser> selectFmsBlockBindUserList(String blockId);
 }
 }

+ 3 - 0
src/main/java/com/yunfeiyun/agmp/fms/service/IFmsBlockService.java

@@ -1,6 +1,7 @@
 package com.yunfeiyun.agmp.fms.service;
 package com.yunfeiyun.agmp.fms.service;
 
 
 import com.yunfeiyun.agmp.common.core.domain.AjaxResult;
 import com.yunfeiyun.agmp.common.core.domain.AjaxResult;
+import com.yunfeiyun.agmp.common.core.domain.entity.SysUser;
 import com.yunfeiyun.agmp.fms.domain.FmsBlock;
 import com.yunfeiyun.agmp.fms.domain.FmsBlock;
 import com.yunfeiyun.agmp.fms.domain.FmsLand;
 import com.yunfeiyun.agmp.fms.domain.FmsLand;
 import com.yunfeiyun.agmp.fms.domain.reqvo.FmsBlockBindUserReqVo;
 import com.yunfeiyun.agmp.fms.domain.reqvo.FmsBlockBindUserReqVo;
@@ -65,4 +66,6 @@ public interface IFmsBlockService
     int bindUser(FmsBlockBindUserReqVo fmsBlockBindUserReqVo);
     int bindUser(FmsBlockBindUserReqVo fmsBlockBindUserReqVo);
 
 
     List<String> userBindList(String userId,String tid);
     List<String> userBindList(String userId,String tid);
+
+    List<SysUser> selectFmsBlockBindUserList(String blockId);
 }
 }

+ 7 - 1
src/main/java/com/yunfeiyun/agmp/fms/service/impl/FmsBlockServiceImpl.java

@@ -2,6 +2,7 @@ package com.yunfeiyun.agmp.fms.service.impl;
 
 
 import com.yunfeiyun.agmp.common.constant.ErrorCode;
 import com.yunfeiyun.agmp.common.constant.ErrorCode;
 import com.yunfeiyun.agmp.common.core.domain.AjaxResult;
 import com.yunfeiyun.agmp.common.core.domain.AjaxResult;
+import com.yunfeiyun.agmp.common.core.domain.entity.SysUser;
 import com.yunfeiyun.agmp.common.utils.SecurityUtils;
 import com.yunfeiyun.agmp.common.utils.SecurityUtils;
 import com.yunfeiyun.agmp.common.utils.StringUtils;
 import com.yunfeiyun.agmp.common.utils.StringUtils;
 import com.yunfeiyun.agmp.common.web.system.domain.SysRes;
 import com.yunfeiyun.agmp.common.web.system.domain.SysRes;
@@ -181,7 +182,12 @@ public class FmsBlockServiceImpl implements IFmsBlockService
 
 
     @Override
     @Override
     public List<String> userBindList(String userId,String tid) {
     public List<String> userBindList(String userId,String tid) {
-        return  fmsBlockMapper.userBindList(userId,tid);
+        return fmsBlockMapper.userBindList(userId,tid);
+    }
+
+    @Override
+    public List<SysUser> selectFmsBlockBindUserList(String blockId) {
+        return fmsBlockMapper.selectFmsBlockBindUserList(blockId);
     }
     }
 
 
 }
 }

+ 4 - 0
src/main/resources/mapper/FmsBlockMapper.xml

@@ -243,4 +243,8 @@
         </where>
         </where>
     </update>
     </update>
 
 
+    <select id="selectFmsBlockBindUserList" resultType="com.yunfeiyun.agmp.common.core.domain.entity.SysUser">
+        select * from SysUser where userId in ( select userId from FmsBlockUser where blockId = #{blockId} )
+    </select>
+
 </mapper>
 </mapper>