admin模块添加部门相关方法

esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/CompleteDeptDTO.java

@@ -0,0 +1,51 @@
+package com.elink.esua.epdc.dto;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 完整机构信息
+ *
+ * @author yujintao
+ * @email yujintao@elink-cn.com
+ * @date 2019/9/7 9:8
+ */
+@Data
+public class CompleteDeptDTO implements Serializable {
+
+    private static final long serialVersionUID = 8264059305193996215L;
+
+    /**
+     * 区
+     */
+    private String district;
+    /**
+     * 区ID
+     */
+    private Long districtId;
+    /**
+     * 街道
+     */
+    private String street;
+    /**
+     * 街道ID
+     */
+    private Long streetId;
+    /**
+     * 社区
+     */
+    private String community;
+    /**
+     * 社区ID
+     */
+    private Long communityId;
+    /**
+     * 网格
+     */
+    private String grid;
+    /**
+     * 网格ID
+     */
+    private Long gridId;
+}

esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/SysDeptController.java

@@ -1,8 +1,8 @@
 /**
  * Copyright (c) 2018 人人开源 All rights reserved.
- *
+ * <p>
  * https://www.renren.io
- *
+ * <p>
  * 版权所有，侵权必究！
  */
 
@@ -15,6 +15,7 @@ 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.DefaultGroup;
 import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup;
+import com.elink.esua.epdc.dto.CompleteDeptDTO;
 import com.elink.esua.epdc.dto.SysDeptDTO;
 import com.elink.esua.epdc.dto.SysSimpleDeptDTO;
 import com.elink.esua.epdc.service.SysDeptService;
@@ -35,14 +36,14 @@ import java.util.Map;
  */
 @RestController
 @RequestMapping("dept")
-@Api(tags="部门管理")
+@Api(tags = "部门管理")
 public class SysDeptController {
     @Autowired
     private SysDeptService sysDeptService;
 
     @GetMapping("list")
     @ApiOperation("列表")
-    public Result<List<SysDeptDTO>> list(){
+    public Result<List<SysDeptDTO>> list() {
         List<SysDeptDTO> list = sysDeptService.list(new HashMap<>(1));
 
         return new Result<List<SysDeptDTO>>().ok(list);
@@ -50,14 +51,14 @@ public class SysDeptController {
 
     @GetMapping("sublist/{pid}")
     @ApiOperation("子列表")
-    public Result<List<SysSimpleDeptDTO>> sublist(@PathVariable("pid") String pid){
+    public Result<List<SysSimpleDeptDTO>> sublist(@PathVariable("pid") String pid) {
         List<SysSimpleDeptDTO> list = sysDeptService.subList(pid);
         return new Result().ok(list);
     }
 
     @GetMapping("{id}")
     @ApiOperation("信息")
-    public Result<SysDeptDTO> get(@PathVariable("id") Long id){
+    public Result<SysDeptDTO> get(@PathVariable("id") Long id) {
         SysDeptDTO data = sysDeptService.get(id);
 
         return new Result<SysDeptDTO>().ok(data);
@@ -66,7 +67,7 @@ public class SysDeptController {
     @PostMapping
     @ApiOperation("保存")
     @LogOperation("Save Dept")
-    public Result save(@RequestBody SysDeptDTO dto){
+    public Result save(@RequestBody SysDeptDTO dto) {
         //效验数据
         ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
 
@@ -78,7 +79,7 @@ public class SysDeptController {
     @PutMapping
     @ApiOperation("修改")
     @LogOperation("Update Dept")
-    public Result update(@RequestBody SysDeptDTO dto){
+    public Result update(@RequestBody SysDeptDTO dto) {
         //效验数据
         ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
 
@@ -90,7 +91,7 @@ public class SysDeptController {
     @DeleteMapping("{id}")
     @ApiOperation("删除")
     @LogOperation("Delete Dept")
-    public Result delete(@PathVariable("id") Long id){
+    public Result delete(@PathVariable("id") Long id) {
         //效验数据
         AssertUtils.isNull(id, "id");
 
@@ -101,7 +102,22 @@ public class SysDeptController {
 
     @GetMapping("listGridId/{pid}")
     @ApiOperation("获取所有下属网格ID集合")
-    public Result<List<Long>> listGridIdByPid(@PathVariable("pid") Long pid){
+    public Result<List<Long>> listGridIdByPid(@PathVariable("pid") Long pid) {
         return sysDeptService.listGridIdByPid(pid);
     }
+
+    /**
+     * 通过网格ID获取该网格所有上级机构
+     *
+     * @param gridId
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.CompleteDeptDTO>
+     * @author yujintao
+     * @date 2019/9/7 09:12
+     */
+    @GetMapping("getCompleteDept/{gridId}")
+    public Result<CompleteDeptDTO> getCompleteDept(@PathVariable("gridId") Long gridId) {
+        return sysDeptService.getCompleteDept(gridId);
+    }
+
+
 }

esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/dao/SysDeptDao.java

@@ -8,6 +8,7 @@
 
 package com.elink.esua.epdc.dao;
 
+import com.elink.esua.epdc.dto.CompleteDeptDTO;
 import com.elink.esua.epdc.dto.SysSimpleDeptDTO;
 import com.elink.esua.epdc.entity.SysDeptEntity;
 import com.elink.esua.epdc.commons.mybatis.dao.BaseDao;
@@ -37,7 +38,8 @@ public interface SysDeptDao extends BaseDao<SysDeptEntity> {
 
     /**
      * 根据部门ID，获取所有子部门ID列表
-     * @param id   部门ID
+     *
+     * @param id 部门ID
      */
     List<Long> getSubDeptIdList(String id);
 
@@ -60,4 +62,14 @@ public interface SysDeptDao extends BaseDao<SysDeptEntity> {
      * @date 2019/9/5 13:46
      */
     List<Long> listGridIdByPid(@Param("pid") Long pid);
+
+    /**
+     * 通过网格ID获取该网格所有上级机构
+     *
+     * @param gridId
+     * @return com.elink.esua.epdc.dto.CompleteDeptDTO
+     * @author yujintao
+     * @date 2019/9/7 09:20
+     */
+    CompleteDeptDTO getCompleteDept(@Param("gridId") Long gridId);
 }

esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/entity/SysDeptEntity.java

@@ -10,6 +10,7 @@ package com.elink.esua.epdc.entity;
 
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.elink.esua.epdc.commons.mybatis.entity.BaseEntity;
 import lombok.Data;
@@ -48,6 +49,7 @@ public class SysDeptEntity extends BaseEntity {
     /**
      * 删除标识  0：未删除    1：删除
      */
+    @TableLogic
     @TableField(fill = FieldFill.INSERT)
     private Integer delFlag;
     /**

esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/SysDeptService.java

@@ -9,11 +9,11 @@
 package com.elink.esua.epdc.service;
 
 import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.dto.CompleteDeptDTO;
 import com.elink.esua.epdc.dto.SysSimpleDeptDTO;
 import com.elink.esua.epdc.entity.SysDeptEntity;
 import com.elink.esua.epdc.commons.mybatis.service.BaseService;
 import com.elink.esua.epdc.dto.SysDeptDTO;
-import com.elink.esua.epdc.entity.SysDeptEntity;
 
 import java.util.List;
 import java.util.Map;
@@ -62,4 +62,14 @@ public interface SysDeptService extends BaseService<SysDeptEntity> {
      * @date 2019/9/5 13:45
      */
     Result<List<Long>> listGridIdByPid(Long pid);
+
+    /**
+     * 通过网格ID获取该网格所有上级机构
+     *
+     * @param gridId
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.CompleteDeptDTO>
+     * @author yujintao
+     * @date 2019/9/7 09:13
+     */
+    Result<CompleteDeptDTO> getCompleteDept(Long gridId);
 }

esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java

@@ -21,6 +21,7 @@ import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.commons.tools.utils.TreeUtils;
 import com.elink.esua.epdc.dao.SysDeptDao;
+import com.elink.esua.epdc.dto.CompleteDeptDTO;
 import com.elink.esua.epdc.dto.SysDeptDTO;
 import com.elink.esua.epdc.dto.SysSimpleDeptDTO;
 import com.elink.esua.epdc.entity.SysDeptEntity;
@@ -65,7 +66,8 @@ public class SysDeptServiceImpl extends BaseServiceImpl<SysDeptDao, SysDeptEntit
     @Override
     public List<SysSimpleDeptDTO> subList(String pid) {
         QueryWrapper<SysDeptEntity> wrapper = new QueryWrapper<>();
-        wrapper.eq("pid", pid)
+        wrapper.eq("PID", pid)
+                .ne("TYPE_KEY","district_dept")
                 .select(FieldConstant.ID, FieldConstant.NAME)
                 .orderByAsc(FieldConstant.NAME);
         List<SysDeptEntity> entities = this.baseDao.selectList(wrapper);
@@ -181,4 +183,11 @@ public class SysDeptServiceImpl extends BaseServiceImpl<SysDeptDao, SysDeptEntit
         List<Long> deptIdList = this.baseDao.listGridIdByPid(pid);
         return new Result().ok(deptIdList);
     }
+
+    @Override
+    public Result<CompleteDeptDTO> getCompleteDept(Long gridId) {
+        CompleteDeptDTO completeDept = this.baseDao.getCompleteDept(gridId);
+        return new Result().ok(completeDept);
+    }
+
 }

esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/SysDeptDao.xml

@@ -45,5 +45,25 @@
             AND NOT EXISTS
             ( SELECT 1 FROM sys_dept dd WHERE dd.pid = d.id )
     </select>
+    <select id="getCompleteDept" resultType="com.elink.esua.epdc.dto.CompleteDeptDTO">
+        SELECT
+            dis.`name` district,
+            dis.id districtId,
+            str.`name` street,
+            str.id streetId,
+            com.`name` community,
+            com.id communityId,
+            gri.`name` grid,
+            gri.id gridId
+        FROM
+            sys_dept gri
+            LEFT JOIN sys_dept com ON gri.pid = com.id
+            LEFT JOIN sys_dept str ON com.pid = str.id
+            LEFT JOIN sys_dept dis ON str.pid = dis.id
+        WHERE
+            gri.ID = #{gridId}
+            AND gri.del_flag = '0'
+            AND dis.id IS NOT NULL
+    </select>
 
 </mapper>