识别

src/main/java/com/iden/bms/controller/CommunityController.java

@@ -40,6 +40,23 @@ public class CommunityController {
     @Autowired
     private CommunityService communityService;
 
+    @GetMapping("/listCommunity4Select")
+    @ApiOperation(value = "小区下拉列表 ")
+    public Result<List<CommunityVO>> listCommunity4Select(HttpServletRequest request, @RequestHeader(value = "token") String token,
+                                                          PageReqVO pageReqVo){
+        try {
+            UserLoginedConvertVO loginUser = WebPageUtils.getCurrentLoginedUser(request);
+            List<CommunityVO> datas = this.communityService.listCommunity4Select(loginUser);
+            return Result.success(datas);
+        }catch (BDException e) {
+            log.error("小区下拉列表查询-分页列表出现异常",e);
+            return  PageResult.error(e.getMessage());
+        } catch (Exception e) {
+            log.error("小区管理: 小区下拉列表查询出现异常",e);
+            return PageResult.error( "获取列表失败");
+        }
+    }
+
     @GetMapping("/countCommunity")
     @ApiOperation(value = "当前小区个数查询")
     @ApiImplicitParams(value = {

src/main/java/com/iden/bms/controller/CrowdController.java

@@ -42,6 +42,22 @@ public class CrowdController {
     private CrowdService crowdService;
     @Autowired
     private PersonService personService;
+    @GetMapping("/listCommunity4Select")
+    @ApiOperation(value = "人群下拉列表 ")
+    public Result<List<CrowdVO>> listCommunity4Select(HttpServletRequest request, @RequestHeader(value = "token") String token,
+                                                          PageReqVO pageReqVo){
+        try {
+            UserLoginedConvertVO loginUser = WebPageUtils.getCurrentLoginedUser(request);
+            List<CrowdVO> datas = this.crowdService.lisCrowd4Select(loginUser);
+            return Result.success(datas);
+        }catch (BDException e) {
+            log.error("人群下拉列表查询-分页列表出现异常",e);
+            return  PageResult.error(e.getMessage());
+        } catch (Exception e) {
+            log.error("人群管理: 人群下拉列表查询出现异常",e);
+            return PageResult.error( "获取列表失败");
+        }
+    }
 
     @GetMapping("/listCrowd")
     @ApiOperation(value = "人群列表分页 ")

src/main/java/com/iden/bms/controller/DistrictController.java

@@ -0,0 +1,59 @@
+package com.iden.bms.controller;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.iden.bms.service.DistrictService;
+import com.iden.common.annotation.Permission;
+import com.iden.common.exception.BDException;
+import com.iden.common.logaspect.LogAnnotation;
+import com.iden.common.logaspect.OperateType;
+import com.iden.common.util.PageResult;
+import com.iden.common.util.Result;
+import com.iden.common.util.WebPageUtils;
+import com.iden.common.vo.PageReqVO;
+import com.iden.common.vo.SysMenuVO;
+import com.iden.common.vo.DistrictVO;
+import com.iden.common.vo.UserLoginedConvertVO;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.List;
+
+/**
+ * @Author: lilt
+ * @Date: 2021/5/26
+ * @Desc:
+ */
+@RestController
+@Api(value = "DistrictController", tags = { "区域管理" })
+@Slf4j
+@RequestMapping("/bms/district")
+@Permission
+public class DistrictController {
+
+    @Autowired
+    private DistrictService districtService;
+
+    @GetMapping("/listDistrict4Select")
+    @ApiOperation(value = "区域下拉列表 ")
+    public Result<List<DistrictVO>> listDistrict4Select(HttpServletRequest request, @RequestHeader(value = "token") String token,
+                                                   PageReqVO pageReqVo){
+        try {
+            UserLoginedConvertVO loginUser = WebPageUtils.getCurrentLoginedUser(request);
+            List<DistrictVO> datas = this.districtService.listDistrict4Select(loginUser);
+            return Result.success(datas);
+        }catch (BDException e) {
+            log.error("区域下拉列表查询-分页列表出现异常",e);
+            return  PageResult.error(e.getMessage());
+        } catch (Exception e) {
+            log.error("区域管理: 区域下拉列表查询出现异常",e);
+            return PageResult.error( "获取列表失败");
+        }
+    }
+
+}

src/main/java/com/iden/bms/controller/SubistrictController.java

@@ -0,0 +1,56 @@
+package com.iden.bms.controller;
+
+import com.iden.bms.service.SubdistrictService;
+import com.iden.common.annotation.Permission;
+import com.iden.common.exception.BDException;
+import com.iden.common.util.PageResult;
+import com.iden.common.util.Result;
+import com.iden.common.util.WebPageUtils;
+import com.iden.common.vo.SubdistrictVO;
+import com.iden.common.vo.PageReqVO;
+import com.iden.common.vo.UserLoginedConvertVO;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestHeader;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.List;
+
+/**
+ * @Author: lilt
+ * @Date: 2021/5/26
+ * @Desc:
+ */
+@RestController
+@Api(value = "SubdistrictController", tags = { "区域管理" })
+@Slf4j
+@RequestMapping("/bms/subdistrict")
+@Permission
+public class SubistrictController {
+
+    @Autowired
+    private SubdistrictService subdistrictService;
+
+    @GetMapping("/listSubdistrict4Select")
+    @ApiOperation(value = "区域下拉列表 ")
+    public Result<List<SubdistrictVO>> listSubdistrict4Select(HttpServletRequest request, @RequestHeader(value = "token") String token,
+                                                   PageReqVO pageReqVo){
+        try {
+            UserLoginedConvertVO loginUser = WebPageUtils.getCurrentLoginedUser(request);
+            List<SubdistrictVO> datas = this.subdistrictService.listSubdistrict4Select(loginUser);
+            return Result.success(datas);
+        }catch (BDException e) {
+            log.error("区域下拉列表查询-分页列表出现异常",e);
+            return  PageResult.error(e.getMessage());
+        } catch (Exception e) {
+            log.error("区域管理: 区域下拉列表查询出现异常",e);
+            return PageResult.error( "获取列表失败");
+        }
+    }
+
+}

src/main/java/com/iden/bms/controller/SysRoleController.java

@@ -39,6 +39,23 @@ public class SysRoleController {
     @Autowired
     private SysRoleService sysRoleService;
 
+    @GetMapping("/listSysRole4Select")
+    @ApiOperation(value = "角色下拉列表 ")
+    public Result<List<SysRoleVO>> listSysRole4Select(HttpServletRequest request, @RequestHeader(value = "token") String token,
+                                                   PageReqVO pageReqVo){
+        try {
+            UserLoginedConvertVO loginUser = WebPageUtils.getCurrentLoginedUser(request);
+            List<SysRoleVO> datas = this.sysRoleService.listSysRole4Select(loginUser);
+            return Result.success(datas);
+        }catch (BDException e) {
+            log.error("角色下拉列表查询-分页列表出现异常",e);
+            return  PageResult.error(e.getMessage());
+        } catch (Exception e) {
+            log.error("角色管理: 角色下拉列表查询出现异常",e);
+            return PageResult.error( "获取列表失败");
+        }
+    }
+
     @GetMapping("/listSysRole")
     @ApiOperation(value = "角色列表分页 ")
     public PageResult<List<SysRoleVO>> listSysRole(HttpServletRequest request, @RequestHeader(value = "token") String token,

src/main/java/com/iden/bms/service/CommunityService.java

@@ -14,6 +14,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.iden.common.entity.IdenCommunity;
 
+import com.iden.common.entity.IdenDistrict;
 import com.iden.common.exceltool.CommonExcelParse;
 import com.iden.common.exceltool.IExcelParser;
 import com.iden.common.exceltool.MultipartFileToFile;
@@ -21,6 +22,7 @@ import com.iden.common.service.IdenCommunityService;
 import com.iden.common.exceltool.ExcelUtil;
 import com.iden.common.util.MyBeanUtils;
 import com.iden.common.vo.CommunityVO;
+import com.iden.common.vo.DistrictVO;
 import com.iden.common.vo.PageReqVO;
 import com.iden.common.vo.UserLoginedConvertVO;
 import org.apache.poi.ss.usermodel.Sheet;
@@ -50,6 +52,26 @@ public class CommunityService {
     @Resource
     private IdenCommunityService idenCommunityService;
 
+    /**
+     * 查询区域列表
+     * @return
+     */
+    public List<CommunityVO> listCommunity4Select(UserLoginedConvertVO loginUser) {
+
+        QueryWrapper<IdenCommunity> queryWrapper = new QueryWrapper<>();
+        queryWrapper.lambda().orderByAsc(IdenCommunity::getName);
+
+        List<IdenCommunity> list = this.idenCommunityService.list(queryWrapper);
+        List<CommunityVO> results = new ArrayList<>();
+        if(CollUtil.isNotEmpty(list)) {
+            list.forEach(item -> {
+                CommunityVO resVO = new CommunityVO();
+                BeanUtils.copyProperties(item,resVO);
+                results.add(resVO);
+            });
+        }
+        return results;
+    }
 
     public Integer countCommunity(String district, String subdistrict, String name, UserLoginedConvertVO loginUser) {
         QueryWrapper<IdenCommunity> queryWrapper = new QueryWrapper<>();

src/main/java/com/iden/bms/service/CrowdService.java

@@ -12,7 +12,7 @@ import com.iden.common.entity.IdenCrowd;
 import com.iden.common.entity.IdenPersonCrowdRef;
 import com.iden.common.service.IdenCrowdService;
 import com.iden.common.service.IdenPersonCrowdRefService;
-import com.iden.common.util.MyBeanUtils;
+
 import com.iden.common.vo.CrowdVO;
 import com.iden.common.vo.PageReqVO;
 import com.iden.common.vo.UserLoginedConvertVO;
@@ -37,7 +37,29 @@ public class CrowdService {
     private IdenCrowdService idenCrowdService;
     @Resource
     private IdenPersonCrowdRefService idenPersonCrowdRefService;
-    
+
+
+    /**
+     * 查询区域列表
+     * @return
+     */
+    public List<CrowdVO> lisCrowd4Select(UserLoginedConvertVO loginUser) {
+
+        QueryWrapper<IdenCrowd> queryWrapper = new QueryWrapper<>();
+        queryWrapper.lambda().orderByAsc(IdenCrowd::getName);
+
+        List<IdenCrowd> list = this.idenCrowdService.list(queryWrapper);
+        List<CrowdVO> results = new ArrayList<>();
+        if(CollUtil.isNotEmpty(list)) {
+            list.forEach(item -> {
+                CrowdVO resVO = new CrowdVO();
+                BeanUtils.copyProperties(item,resVO);
+                results.add(resVO);
+            });
+        }
+        return results;
+    }
+
 
     /**
      * 查询人群列表

src/main/java/com/iden/bms/service/DistrictService.java

@@ -0,0 +1,56 @@
+package com.iden.bms.service;
+
+
+import cn.hutool.core.collection.CollUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+
+import com.iden.common.entity.IdenDistrict;
+
+import com.iden.common.service.IdenDistrictService;
+
+import com.iden.common.vo.DistrictVO;
+import com.iden.common.vo.UserLoginedConvertVO;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ *
+ * @author makejava
+ * @since 2021-05-21 00:08:38
+ */
+@Service
+public class DistrictService {
+
+    @Resource
+    private IdenDistrictService idenDistrictService;
+
+
+    /**
+     * 查询区域列表
+     * @return
+     */
+    public List<DistrictVO> listDistrict4Select(UserLoginedConvertVO loginUser) {
+
+        QueryWrapper<IdenDistrict> queryWrapper = new QueryWrapper<>();
+        queryWrapper.lambda().orderByAsc(IdenDistrict::getName);
+
+        List<IdenDistrict> list = this.idenDistrictService.list(queryWrapper);
+        List<DistrictVO> results = new ArrayList<>();
+        if(CollUtil.isNotEmpty(list)) {
+            list.forEach(item -> {
+                DistrictVO resVO = new DistrictVO();
+                BeanUtils.copyProperties(item,resVO);
+                results.add(resVO);
+            });
+        }
+        return results;
+    }
+
+
+
+}

src/main/java/com/iden/bms/service/SubdistrictService.java

@@ -0,0 +1,52 @@
+package com.iden.bms.service;
+
+
+import cn.hutool.core.collection.CollUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.iden.common.entity.IdenSubdistrict;
+import com.iden.common.service.IdenSubdistrictService;
+import com.iden.common.vo.SubdistrictVO;
+import com.iden.common.vo.UserLoginedConvertVO;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ *
+ * @author makejava
+ * @since 2021-05-21 00:08:38
+ */
+@Service
+public class SubdistrictService {
+
+    @Resource
+    private IdenSubdistrictService idenSubdistrictService;
+
+
+    /**
+     * 查询街道列表
+     * @return
+     */
+    public List<SubdistrictVO> listSubdistrict4Select(UserLoginedConvertVO loginUser) {
+
+        QueryWrapper<IdenSubdistrict> queryWrapper = new QueryWrapper<>();
+        queryWrapper.lambda().orderByAsc(IdenSubdistrict::getName);
+
+        List<IdenSubdistrict> list = this.idenSubdistrictService.list(queryWrapper);
+        List<SubdistrictVO> results = new ArrayList<>();
+        if(CollUtil.isNotEmpty(list)) {
+            list.forEach(item -> {
+                SubdistrictVO resVO = new SubdistrictVO();
+                BeanUtils.copyProperties(item,resVO);
+                results.add(resVO);
+            });
+        }
+        return results;
+    }
+
+
+
+}

src/main/java/com/iden/bms/service/SysRoleService.java

@@ -44,6 +44,28 @@ public class SysRoleService {
     @Resource
     private IdenSysMenuService idenSysMenuService;
 
+    /**
+     * 查询角色列表
+     * @return
+     */
+    public List<SysRoleVO> listSysRole4Select(UserLoginedConvertVO loginUser) {
+
+        QueryWrapper<IdenSysRole> queryWrapper = new QueryWrapper<>();
+        queryWrapper.lambda().orderByAsc(IdenSysRole::getCode);
+
+        List<IdenSysRole> list = this.idenSysRoleService.list(queryWrapper);
+        List<SysRoleVO> results = new ArrayList<>();
+        if(CollUtil.isNotEmpty(list)) {
+            list.forEach(item -> {
+                SysRoleVO resVO = new SysRoleVO();
+                BeanUtils.copyProperties(item,resVO);
+                resVO.setValidStatusName(ValidStatusEnum.getValueToName(resVO.getValidStatus()));
+                results.add(resVO);
+            });
+        }
+        return results;
+    }
+
     /**
      * 查询角色列表
      * @return

src/main/java/com/iden/common/enums/CredentialsTypeEnum.java

@@ -12,8 +12,7 @@ public enum CredentialsTypeEnum {
      * 证件类型类型
      */
     IDCARD("1","身份证"),
-    PASSPORT("2","护照"),
-    OL("3","军官证");
+    PASSPORT("2","护照");
     private String value;
     private String name;
     CredentialsTypeEnum(String value, String name) {
@@ -33,10 +32,8 @@ public enum CredentialsTypeEnum {
         }
         if (IDCARD.getValue().equals(value)){
             return  IDCARD.name;
-        } else if (PASSPORT.getValue().equals(value)){
-            return  PASSPORT.name;
-        } else if (OL.getValue().equals(value)) {
-            return OL.name;
+        } else if (PASSPORT.getValue().equals(value)) {
+            return PASSPORT.name;
         }
         return null;
     }
@@ -46,10 +43,8 @@ public enum CredentialsTypeEnum {
         }
         if (IDCARD.getName().equals(name)){
             return  IDCARD.value;
-        } else if (PASSPORT.getName().equals(name)){
-            return  PASSPORT.value;
-        } else if (OL.getName().equals(name)){
-            return  OL.value;
+        } else if (PASSPORT.getName().equals(name)) {
+            return PASSPORT.value;
         }
         return null;
     }

src/main/java/com/iden/common/vo/DistrictVO.java

@@ -0,0 +1,35 @@
+package com.iden.common.vo;
+
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 区域表(IdenDistrict)实体类
+ *
+ * @author makejava
+ * @since 2021-12-30 19:06:41
+ */
+
+@Data
+
+@ApiModel(value = "区域表", description = "")
+public class DistrictVO implements Serializable {
+    private static final long serialVersionUID = -50659674990115962L;
+
+    private Long id;
+
+    @ApiModelProperty("区名称")
+    private String name;
+
+    @ApiModelProperty("市名称")
+    private String city;
+
+    @ApiModelProperty("省名称")
+    private String province;
+
+
+}

src/main/java/com/iden/common/vo/SubdistrictVO.java

@@ -0,0 +1,42 @@
+package com.iden.common.vo;
+
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 区域表(IdenSubdistrict)实体类
+ *
+ * @author makejava
+ * @since 2021-12-30 19:06:41
+ */
+
+@Data
+@ApiModel(value = "街道表", description = "")
+public class SubdistrictVO implements Serializable {
+    private static final long serialVersionUID = -10316883561234562L;
+
+
+    private Long id;
+
+
+    @ApiModelProperty("街道名称")
+    private String name;
+
+
+    @ApiModelProperty("区名称")
+    private String district;
+
+
+    @ApiModelProperty("市名称")
+    private String city;
+
+
+    @ApiModelProperty("省名称")
+    private String province;
+
+
+}