Merge remote-tracking branch 'origin/dev_govorg' into dev_govorg

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java

@@ -26,7 +26,8 @@ public enum EpmetErrorCode {
 	MOBILE_GET_CODE_ERROR(8104,"获取验证码失败"),
 	MESSAGE_SMS_SEND_ERROR(8105, "短信发送失败"),
 
-    CANNOT_AUDIT_WARM(8201, "请完善居民信息");
+    CANNOT_AUDIT_WARM(8201, "请完善居民信息"),
+	NOT_DEL_AGENCY(8202, "该机关存在下级机关，不允许删除");
 
 
 	private int code;

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/StaffGridListDTO.java

@@ -0,0 +1,34 @@
+package com.epmet.dto;
+
+import lombok.Data;
+
+/**
+ * @Auther zxc
+ * @Create 2020-04-23 10:38
+ */
+@Data
+public class StaffGridListDTO {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 用户id
+     */
+    private String staffId;
+
+    /**
+     * 用户姓名
+     */
+    private String staffName;
+
+    /**
+     * 用户头像
+     */
+    private String staffHeadPhoto;
+
+    /**
+     * 角色名称
+     */
+    private String roleName;
+
+}

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/AddAgencyFormDTO.java

@@ -0,0 +1,78 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+
+/**
+ * 添加组织-接口入参
+ *
+ * @author sun
+ */
+@Data
+public class AddAgencyFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 上级机关组织Id(当前机关组织添加下级组织)
+     */
+    @NotBlank(message = "上级机关组织ID不能为空")
+    private String pid;
+
+    /**
+     * 机构组织名称
+     */
+    @NotBlank(message = "组织名称不能为空")
+    private String agencyName;
+
+    /**
+     * 机关级别（社区级：community，
+     * 乡（镇、街道）级:street,
+     * 区县级: district,
+     * 市级: city
+     * 省级:province） 机关级别（社区级：community，乡（镇、街道）级:street,区县级: district,市级: city省级:province）
+     */
+    private String level;
+
+    /**
+     * 地区编码
+     */
+    private Integer areaCode;
+
+    /**
+     * 国家
+     */
+    private String country;
+
+    /**
+     * 省份
+     */
+    private String province;
+
+    /**
+     * 城市
+     */
+    private String city;
+
+
+}

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/AgencydetailFormDTO.java

@@ -0,0 +1,43 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+
+/**
+ * 组织首页-获取组织机构信息接口入参
+ *
+ * @author sun
+ */
+@Data
+public class AgencydetailFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 机关组织Id
+     */
+    @NotBlank(message = "机关组织ID不能为空")
+    private String agencyId;
+
+
+}

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/EditAgencyFormDTO.java

@@ -0,0 +1,48 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+
+/**
+ * 组织名称编辑-接口入参
+ *
+ * @author sun
+ */
+@Data
+public class EditAgencyFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 机关组织Id
+     */
+    @NotBlank(message = "机关组织ID不能为空")
+    private String agencyId;
+
+    /**
+     * 机关组织名称
+     */
+    @NotBlank(message = "机关组织名称不能为空")
+    private String agencyName;
+
+}

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/RemoveAgencyFormDTO.java

@@ -0,0 +1,42 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+
+/**
+ * 删除组织机关-接口入参
+ *
+ * @author sun
+ */
+@Data
+public class RemoveAgencyFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 机关组织Id
+     */
+    @NotBlank(message = "机关组织ID不能为空")
+    private String agencyId;
+
+}

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/SubAgencyFormDTO.java

@@ -0,0 +1,43 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+
+/**
+ * 组织首页-下级机关列表-接口入参
+ *
+ * @author sun
+ */
+@Data
+public class SubAgencyFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 机关组织Id
+     */
+    @NotBlank(message = "机关组织ID不能为空")
+    private String agencyId;
+
+
+}

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AddAgencyResultDTO.java

@@ -0,0 +1,40 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+
+/**
+ * 添加组织-接口返参
+ *
+ * @author sun
+ */
+@Data
+public class AddAgencyResultDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 机关组织Id
+     */
+    private String agencyId;
+
+}

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AgencydetailResultDTO.java

@@ -0,0 +1,82 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+import java.util.List;
+
+
+/**
+ * 组织首页-获取组织机构信息接口返参
+ *
+ * @author sun
+ */
+@Data
+public class AgencydetailResultDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 机关组织Id
+     */
+    private String agencyId;
+
+    /**
+     * 组织名称
+     */
+    private String agencyName;
+
+    /**
+     * 机关级别（社区级：community，
+     * 乡（镇、街道）级:street,
+     * 区县级: district,
+     * 市级: city
+     * 省级:province） 机关级别（社区级：community，乡（镇、街道）级:street,区县级: district,市级: city省级:province）
+     */
+    private String level;
+
+    /**
+     * 地区编码
+     */
+    private Integer areaCode;
+
+    /**
+     * 国家
+     */
+    private String country;
+
+    /**
+     * 省份
+     */
+    private String province;
+
+    /**
+     * 城市
+     */
+    private String city;
+
+    /**
+     * 本机关的所有上级机关
+     */
+    private List<ParentListResultDTO> parentList;
+
+
+}

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/GridDetailResultDTO.java

@@ -0,0 +1,68 @@
+package com.epmet.dto.result;
+
+import com.epmet.dto.StaffGridListDTO;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @Auther zxc
+ * @Create 2020-04-23 10:28
+ */
+@Data
+public class GridDetailResultDTO implements Serializable {
+
+    private static final long serialVersionUID = -1L;
+
+    /**
+     * 网格id
+     */
+    private String grid;
+
+    /**
+     * 网格名称
+     */
+    private String gridName;
+
+    /**
+     * 中心位置经度
+     */
+    private String longitude;
+
+    /**
+     * 中心位置维度
+     */
+    private String latitude;
+
+    /**
+     * 所属地区码（所属组织地区码）
+     */
+    private String areaCode;
+
+    /**
+     * 管辖区域
+     */
+    private String manageDistrict;
+
+    /**
+     * 当前网格总人数
+     */
+    private Integer totalUser;
+
+    /**
+     * 所属组织机构ID（customer_agencys.id）
+     */
+    private String agencyId;
+
+    /**
+     * 所有上级组织ID
+     */
+    private String pIds;
+
+    /**
+     * 网格用户信息集合
+     */
+    private List<StaffGridListDTO> staffGridList;
+
+}

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/ParentListResultDTO.java

@@ -0,0 +1,46 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+
+/**
+ * 组织首页-获取组织机构信息接口-本机关的所有上级机关信息
+ *
+ * @author sun
+ */
+@Data
+public class ParentListResultDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 机关组织Id
+     */
+    private String id;
+    /**
+     * 机关组织名称
+     */
+    private String name;
+
+
+}

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/SubAgencyResultDTO.java

@@ -0,0 +1,48 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+import java.util.List;
+
+
+/**
+ * 组织首页-下级机关列表-接口返参
+ *
+ * @author sun
+ */
+@Data
+public class SubAgencyResultDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 下级机关总数
+     */
+    private Integer subAgencyCount;
+
+    /**
+     * 下级机关总数
+     */
+    private List<SubListResultDTO> agencyList;
+
+
+}

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/SubListResultDTO.java

@@ -0,0 +1,45 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+
+/**
+ * 组织首页-下级机关列表-查询本机关的直属下一级机关
+ *
+ * @author sun
+ */
+@Data
+public class SubListResultDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 机关组织Id
+     */
+    private String agencyId;
+    /**
+     * 机关组织名称
+     */
+    private String agencyName;
+
+
+}

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/constant/CustomerAgencyConstant.java

@@ -0,0 +1,21 @@
+package com.epmet.constant;
+
+/**
+ * @author sun
+ * @dscription
+ */
+public interface CustomerAgencyConstant {
+
+	/**
+	 * 组织名称编辑修改失败
+	 */
+	String UPDATE_EXCEPTION = "组织机构信息更新失败";
+	/**
+	 * 添加组织失败
+	 */
+	String SAVE_EXCEPTION = "组织机构新增失败";
+	/**
+	 * 组织删除失败
+	 */
+	String DEL_EXCEPTION = "组织删除失败";
+}

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerAgencyController.java

@@ -26,8 +26,11 @@ import com.epmet.commons.tools.validator.group.AddGroup;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
 import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.dto.CustomerAgencyDTO;
-import com.epmet.dto.form.StaffOrgFormDTO;
+import com.epmet.dto.form.*;
+import com.epmet.dto.result.AddAgencyResultDTO;
+import com.epmet.dto.result.AgencydetailResultDTO;
 import com.epmet.dto.result.StaffOrgsResultDTO;
+import com.epmet.dto.result.SubAgencyResultDTO;
 import com.epmet.excel.CustomerAgencyExcel;
 import com.epmet.service.CustomerAgencyService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -47,24 +50,24 @@ import java.util.Map;
 @RestController
 @RequestMapping("customeragency")
 public class CustomerAgencyController {
-    
+
     @Autowired
     private CustomerAgencyService customerAgencyService;
 
     @GetMapping("page")
-    public Result<PageData<CustomerAgencyDTO>> page(@RequestParam Map<String, Object> params){
+    public Result<PageData<CustomerAgencyDTO>> page(@RequestParam Map<String, Object> params) {
         PageData<CustomerAgencyDTO> page = customerAgencyService.page(params);
         return new Result<PageData<CustomerAgencyDTO>>().ok(page);
     }
 
     @GetMapping("{id}")
-    public Result<CustomerAgencyDTO> get(@PathVariable("id") String id){
+    public Result<CustomerAgencyDTO> get(@PathVariable("id") String id) {
         CustomerAgencyDTO data = customerAgencyService.get(id);
         return new Result<CustomerAgencyDTO>().ok(data);
     }
 
     @PostMapping
-    public Result save(@RequestBody CustomerAgencyDTO dto){
+    public Result save(@RequestBody CustomerAgencyDTO dto) {
         //效验数据
         ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
         customerAgencyService.save(dto);
@@ -72,7 +75,7 @@ public class CustomerAgencyController {
     }
 
     @PutMapping
-    public Result update(@RequestBody CustomerAgencyDTO dto){
+    public Result update(@RequestBody CustomerAgencyDTO dto) {
         //效验数据
         ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
         customerAgencyService.update(dto);
@@ -80,7 +83,7 @@ public class CustomerAgencyController {
     }
 
     @DeleteMapping
-    public Result delete(@RequestBody String[] ids){
+    public Result delete(@RequestBody String[] ids) {
         //效验数据
         AssertUtils.isArrayEmpty(ids, "id");
         customerAgencyService.delete(ids);
@@ -94,14 +97,70 @@ public class CustomerAgencyController {
     }
 
     /**
-     * @return com.epmet.commons.tools.utils.Result<java.util.List<com.epmet.dto.result.StaffOrgsResultDTO>>
      * @param staffOrgsFormDTO
+     * @return com.epmet.commons.tools.utils.Result<java.util.List < com.epmet.dto.result.StaffOrgsResultDTO>>
      * @Author yinzuomei
      * @Description 登录-获取工作人员所有组织
      * @Date 2020/4/20 21:59
      **/
     @PostMapping("getStaffOrgList")
-    public Result<List<StaffOrgsResultDTO>> getStaffOrgList(@RequestBody StaffOrgFormDTO staffOrgsFormDTO){
+    public Result<List<StaffOrgsResultDTO>> getStaffOrgList(@RequestBody StaffOrgFormDTO staffOrgsFormDTO) {
         return customerAgencyService.getStaffOrgList(staffOrgsFormDTO);
     }
+
+    /**
+     * @param formDTO
+     * @return
+     * @Author sun
+     * @Description 添加组织
+     */
+    @PostMapping("addagency")
+    public Result<AddAgencyResultDTO> addAgency(@RequestBody AddAgencyFormDTO formDTO) {
+        return customerAgencyService.addAgency(formDTO);
+    }
+
+    /**
+     * @param formDTO
+     * @return
+     * @Author sun
+     * @Description 组织名称编辑
+     */
+    @PostMapping("editagency")
+    public Result editAgency(@RequestBody EditAgencyFormDTO formDTO) {
+        return customerAgencyService.editAgency(formDTO);
+    }
+
+    /**
+     * @param formDTO
+     * @return
+     * @Author sun
+     * @Description 删除组织机关
+     */
+    @PostMapping("removeagency")
+    public Result removeAgency(@RequestBody RemoveAgencyFormDTO formDTO) {
+        return customerAgencyService.removeAgency(formDTO);
+    }
+
+    /**
+     * @param formDTO
+     * @return
+     * @Author sun
+     * @Description 组织首页-获取组织机构信息
+     */
+    @PostMapping("agencydetail")
+    public Result<AgencydetailResultDTO> agencyDetail(@RequestBody AgencydetailFormDTO formDTO) {
+        return customerAgencyService.agencyDetail(formDTO);
+    }
+
+    /**
+     * @param formDTO
+     * @return
+     * @Author sun
+     * @Description 组织首页-下级机关列表
+     */
+    @PostMapping("subagencylist")
+    public Result<SubAgencyResultDTO> subAgencyList(@RequestBody SubAgencyFormDTO formDTO) {
+        return customerAgencyService.subAgencyList(formDTO);
+    }
+
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/GridController.java

@@ -0,0 +1,36 @@
+package com.epmet.controller;
+
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.form.CustomerGridFormDTO;
+import com.epmet.dto.result.GridDetailResultDTO;
+import com.epmet.service.CustomerGridService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @Auther zxc
+ * @Create 2020-04-23 9:50
+ */
+@RestController
+@RequestMapping("grid")
+public class GridController {
+
+    @Autowired
+    private CustomerGridService customerGridService;
+
+    @PostMapping("griddetail")
+    public Result<GridDetailResultDTO> griddetail(@RequestBody CustomerGridFormDTO customerGridFormDTO){
+        Result<GridDetailResultDTO> griddetail = customerGridService.griddetail(customerGridFormDTO);
+        return griddetail;
+    }
+
+    /*@PostMapping("addgrid")
+
+    @PostMapping("editgrid")
+
+    @PostMapping("deletegrid")*/
+
+}

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java

@@ -18,7 +18,9 @@
 package com.epmet.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dto.result.ParentListResultDTO;
 import com.epmet.dto.result.StaffOrgsResultDTO;
+import com.epmet.dto.result.SubListResultDTO;
 import com.epmet.entity.CustomerAgencyEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -41,4 +43,20 @@ public interface CustomerAgencyDao extends BaseDao<CustomerAgencyEntity> {
      * @Date 2020/4/20 21:48
      **/
     List<StaffOrgsResultDTO> selectStaffOrgList(@Param("customerIdList") List<String> customerIdList);
+
+    /**
+     * @param listStr
+     * @return
+     * @Author sun
+     * @Description 查询当前机关的所有上级组织信息
+     **/
+    List<ParentListResultDTO> selectPAgencyById(@Param("listStr") List<String> listStr);
+
+    /**
+     * @param pId
+     * @return
+     * @Author sun
+     * @Description 组织首页-下级机关列表
+     **/
+    List<SubListResultDTO> selectSubAgencyById(@Param("pId") String pId);
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerGridDao.java

@@ -19,10 +19,12 @@ package com.epmet.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.dto.CustomerGridDTO;
+import com.epmet.dto.CustomerStaffGridDTO;
 import com.epmet.dto.form.CustomerGridFormDTO;
 import com.epmet.dto.form.ListCustomerGridFormDTO;
 import com.epmet.dto.result.CustomerGridByUserIdResultDTO;
 import com.epmet.dto.result.CustomerGridForStrangerResultDTO;
+import com.epmet.dto.result.GridDetailResultDTO;
 import com.epmet.entity.CustomerGridEntity;
 import org.apache.ibatis.annotations.Mapper;
 
@@ -69,4 +71,19 @@ public interface CustomerGridDao extends BaseDao<CustomerGridEntity> {
      * @Author sun
      */
     List<CustomerGridByUserIdResultDTO> getMyGrids(String userId);
+
+    /**
+     * 根据gridId获取网格详情
+     * @param customerGridFormDTO
+     * @return
+     */
+    GridDetailResultDTO griddetail(CustomerGridFormDTO customerGridFormDTO);
+
+    /**
+     * 根据gridId查询uerId
+     * @param customerGridFormDTO
+     * @return
+     */
+    List<CustomerStaffGridDTO> selectUserIdByGridId(CustomerGridFormDTO customerGridFormDTO);
+
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/feign/EpmetUserFeignClient.java

@@ -3,18 +3,21 @@ package com.epmet.feign;
 import com.epmet.commons.tools.constant.ServiceConstant;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.CustomerStaffDTO;
-import com.epmet.feign.fallback.EpmetUserFeignClientFallback;
+import com.epmet.dto.CustomerStaffGridDTO;
+import com.epmet.dto.StaffGridListDTO;
+import com.epmet.feign.fallback.EpmetUserFeignClientFallBack;
 import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+import java.util.List;
 
 /**
  * @author zhaoqifeng
  * @dscription
  * @date 2020/3/19 9:32
  */
-@FeignClient(name = ServiceConstant.EPMET_USER_SERVER, fallback = EpmetUserFeignClientFallback.class)
+@FeignClient(name = ServiceConstant.EPMET_USER_SERVER, fallback = EpmetUserFeignClientFallBack.class)
 public interface EpmetUserFeignClient {
 	/**
 	 * 根据用户ID获取工作人员基本信息
@@ -27,4 +30,7 @@ public interface EpmetUserFeignClient {
 	@PostMapping(value = "/epmetuser/customerstaff/getstaffinfobyuserid")
 	Result<CustomerStaffDTO> getCustomerStaffInfoByUserId(CustomerStaffDTO formDTO);
 
+    @PostMapping("/epmetuser/customerstaff/selectstaffgridlistbyuserid")
+    Result<List<StaffGridListDTO>> getStaffGridList(@RequestBody List<CustomerStaffGridDTO> customerStaffGridDTOS);
+
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/feign/fallback/EpmetUserFeignClientFallBack.java

@@ -0,0 +1,28 @@
+package com.epmet.feign.fallback;
+
+import com.epmet.commons.tools.constant.ServiceConstant;
+import com.epmet.commons.tools.utils.ModuleUtils;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.CustomerStaffDTO;
+import com.epmet.dto.CustomerStaffGridDTO;
+import com.epmet.dto.StaffGridListDTO;
+import com.epmet.feign.EpmetUserFeignClient;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * @Auther zxc
+ * @Create 2020-04-23 14:10
+ */
+@Component
+public class EpmetUserFeignClientFallBack implements EpmetUserFeignClient {
+    @Override
+    public Result<CustomerStaffDTO> getCustomerStaffInfoByUserId(CustomerStaffDTO formDTO) {
+        return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "getCustomerStaffInfoByUserId", formDTO);
+    }
+    @Override
+    public Result<List<StaffGridListDTO>> getStaffGridList(List<CustomerStaffGridDTO> customerStaffGridDTOS) {
+        return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "getStaffGridList", customerStaffGridDTOS);
+    }
+}

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/feign/fallback/EpmetUserFeignClientFallback.java

@@ -1,23 +0,0 @@
-package com.epmet.feign.fallback;
-
-import com.epmet.commons.tools.constant.ServiceConstant;
-import com.epmet.commons.tools.utils.ModuleUtils;
-import com.epmet.commons.tools.utils.Result;
-import com.epmet.dto.CustomerStaffDTO;
-import com.epmet.dto.OperUserDTO;
-import com.epmet.feign.EpmetUserFeignClient;
-import org.springframework.stereotype.Component;
-
-/**
- * 用户模块
- * @author zhaoqifeng
- * @date 2020/3/19 9:34
- */
-@Component
-public class EpmetUserFeignClientFallback implements EpmetUserFeignClient {
-
-	@Override
-	public Result<CustomerStaffDTO> getCustomerStaffInfoByUserId(CustomerStaffDTO formDTO) {
-		return ModuleUtils.feignConError(ServiceConstant.OPER_CRM_SERVER, "getCustomerStaffInfoByUserId", formDTO);
-	}
-}

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerAgencyService.java

@@ -21,8 +21,11 @@ import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.CustomerAgencyDTO;
-import com.epmet.dto.form.StaffOrgFormDTO;
+import com.epmet.dto.form.*;
+import com.epmet.dto.result.AddAgencyResultDTO;
+import com.epmet.dto.result.AgencydetailResultDTO;
 import com.epmet.dto.result.StaffOrgsResultDTO;
+import com.epmet.dto.result.SubAgencyResultDTO;
 import com.epmet.entity.CustomerAgencyEntity;
 
 import java.util.List;
@@ -104,4 +107,44 @@ public interface CustomerAgencyService extends BaseService<CustomerAgencyEntity>
      * @Date 2020/4/20 21:45
      **/
     Result<List<StaffOrgsResultDTO>> getStaffOrgList(StaffOrgFormDTO staffOrgsFormDTO);
+
+    /**
+     * @param formDTO
+     * @return
+     * @Author sun
+     * @Description 添加组织
+     */
+    Result<AddAgencyResultDTO> addAgency(AddAgencyFormDTO formDTO);
+
+    /**
+     * @param formDTO
+     * @return
+     * @Author sun
+     * @Description 组织名称编辑
+     */
+    Result editAgency(EditAgencyFormDTO formDTO);
+
+    /**
+     * @param formDTO
+     * @return
+     * @Author sun
+     * @Description 删除组织机关
+     */
+    Result removeAgency(RemoveAgencyFormDTO formDTO);
+
+    /**
+     * @param formDTO
+     * @return
+     * @Author sun
+     * @Description 组织首页-获取组织机构信息
+     */
+    Result<AgencydetailResultDTO> agencyDetail(AgencydetailFormDTO formDTO);
+
+    /**
+     * @param formDTO
+     * @return
+     * @Author sun
+     * @Description 组织首页-下级机关列表
+     */
+    Result<SubAgencyResultDTO> subAgencyList(SubAgencyFormDTO formDTO);
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerGridService.java

@@ -25,6 +25,7 @@ import com.epmet.dto.form.CustomerGridFormDTO;
 import com.epmet.dto.form.ListCustomerGridFormDTO;
 import com.epmet.dto.result.CustomerGridByUserIdResultDTO;
 import com.epmet.dto.result.CustomerGridForStrangerResultDTO;
+import com.epmet.dto.result.GridDetailResultDTO;
 import com.epmet.entity.CustomerGridEntity;
 
 import java.util.List;
@@ -122,4 +123,11 @@ public interface CustomerGridService extends BaseService<CustomerGridEntity> {
      * @Author sun
      */
     Result<List<CustomerGridByUserIdResultDTO>> getMyGrids(String userId);
+
+    /**
+     * 根据gridId获取网格详情
+     * @param customerGridFormDTO
+     * @return
+     */
+    Result<GridDetailResultDTO> griddetail(CustomerGridFormDTO customerGridFormDTO);
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java

@@ -21,17 +21,23 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.constant.FieldConstant;
+import com.epmet.commons.tools.constant.NumConstant;
+import com.epmet.commons.tools.exception.EpmetErrorCode;
+import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.Result;
+import com.epmet.constant.CustomerAgencyConstant;
 import com.epmet.dao.CustomerAgencyDao;
 import com.epmet.dto.CustomerAgencyDTO;
-import com.epmet.dto.form.StaffOrgFormDTO;
-import com.epmet.dto.result.StaffOrgsResultDTO;
+import com.epmet.dto.form.*;
+import com.epmet.dto.result.*;
 import com.epmet.entity.CustomerAgencyEntity;
 import com.epmet.redis.CustomerAgencyRedis;
 import com.epmet.service.CustomerAgencyService;
 import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -49,6 +55,7 @@ import java.util.Map;
 @Service
 public class CustomerAgencyServiceImpl extends BaseServiceImpl<CustomerAgencyDao, CustomerAgencyEntity> implements CustomerAgencyService {
 
+    private static final Logger log = LoggerFactory.getLogger(CustomerAgencyServiceImpl.class);
     @Autowired
     private CustomerAgencyRedis customerAgencyRedis;
 
@@ -68,8 +75,8 @@ public class CustomerAgencyServiceImpl extends BaseServiceImpl<CustomerAgencyDao
         return ConvertUtils.sourceToTarget(entityList, CustomerAgencyDTO.class);
     }
 
-    private QueryWrapper<CustomerAgencyEntity> getWrapper(Map<String, Object> params){
-        String id = (String)params.get(FieldConstant.ID_HUMP);
+    private QueryWrapper<CustomerAgencyEntity> getWrapper(Map<String, Object> params) {
+        String id = (String) params.get(FieldConstant.ID_HUMP);
 
         QueryWrapper<CustomerAgencyEntity> wrapper = new QueryWrapper<>();
         wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
@@ -112,4 +119,128 @@ public class CustomerAgencyServiceImpl extends BaseServiceImpl<CustomerAgencyDao
         List<StaffOrgsResultDTO> list = baseDao.selectStaffOrgList(staffOrgsFormDTO.getCustomerIdList());
         return new Result<List<StaffOrgsResultDTO>>().ok(list);
     }
+
+    /**
+     * @param formDTO
+     * @return
+     * @Author sun
+     * @Description 添加组织
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Result<AddAgencyResultDTO> addAgency(AddAgencyFormDTO formDTO) {
+        Result<AddAgencyResultDTO> result = new Result<AddAgencyResultDTO>();
+        AddAgencyResultDTO addAgencyResultDTO = new AddAgencyResultDTO();
+        //0:属性映射赋值
+        CustomerAgencyEntity entity = ConvertUtils.sourceToTarget(formDTO, CustomerAgencyEntity.class);
+        entity.setOrganizationName(formDTO.getAgencyName());
+        entity.setTotalUser(NumConstant.ZERO);
+        //1:查询上级机关信息
+        CustomerAgencyEntity parentEntity = baseDao.selectById(formDTO.getPid());
+        entity.setCustomerId(parentEntity.getCustomerId());
+        if (null == parentEntity.getPid()) {
+            entity.setPids(parentEntity.getId());
+            entity.setAllParentName(parentEntity.getOrganizationName());
+        } else {
+            entity.setPids(":" + parentEntity.getId());
+            entity.setAllParentName("-" + parentEntity.getOrganizationName());
+        }
+        //2:保存组织信息
+        if (baseDao.insert(entity) < NumConstant.ONE) {
+            log.error(CustomerAgencyConstant.SAVE_EXCEPTION);
+            throw new RenException(CustomerAgencyConstant.SAVE_EXCEPTION);
+        }
+        //3:返回新组织Id
+        addAgencyResultDTO.setAgencyId(entity.getId());
+        return result.ok(addAgencyResultDTO);
+    }
+
+    /**
+     * @param formDTO
+     * @return
+     * @Author sun
+     * @Description 组织名称编辑
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Result editAgency(EditAgencyFormDTO formDTO) {
+        Result result = new Result();
+        CustomerAgencyEntity entity = new CustomerAgencyEntity();
+        entity.setId(formDTO.getAgencyId());
+        entity.setOrganizationName(formDTO.getAgencyName());
+        if (baseDao.updateById(entity) < NumConstant.ONE) {
+            log.error(CustomerAgencyConstant.UPDATE_EXCEPTION);
+            throw new RenException(CustomerAgencyConstant.UPDATE_EXCEPTION);
+        }
+        return result;
+    }
+
+    /**
+     * @param formDTO
+     * @return
+     * @Author sun
+     * @Description 删除组织机关
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Result removeAgency(RemoveAgencyFormDTO formDTO) {
+        Result result = new Result();
+        //1:查询当前机关是否存在所属下级机关，存在下级的不能删除
+        List<SubListResultDTO> agencyList = baseDao.selectSubAgencyById(formDTO.getAgencyId());
+        if (null != agencyList && agencyList.size() > NumConstant.ZERO) {
+            result.setCode(EpmetErrorCode.NOT_DEL_AGENCY.getCode());
+            result.setMsg(EpmetErrorCode.NOT_DEL_AGENCY.getMsg());
+            return result;
+        }
+        //2:删除当前机关组织（逻辑删）
+        if (baseDao.deleteById(formDTO.getAgencyId()) < NumConstant.ONE) {
+            log.error(CustomerAgencyConstant.DEL_EXCEPTION);
+            throw new RenException(CustomerAgencyConstant.DEL_EXCEPTION);
+        }
+        return result;
+    }
+
+    /**
+     * @param formDTO
+     * @return
+     * @Author sun
+     * @Description 组织首页-获取组织机构信息
+     */
+    @Override
+    public Result<AgencydetailResultDTO> agencyDetail(AgencydetailFormDTO formDTO) {
+        AgencydetailResultDTO agencydetailResultDTO = new AgencydetailResultDTO();
+        //1:查询本机关详细信息
+        CustomerAgencyEntity entity = baseDao.selectById(formDTO.getAgencyId());
+        if (null == entity) {
+            return new Result<AgencydetailResultDTO>().ok(agencydetailResultDTO);
+        }
+        agencydetailResultDTO = ConvertUtils.sourceToTarget(entity, AgencydetailResultDTO.class);
+        agencydetailResultDTO.setAgencyId(entity.getId());
+        agencydetailResultDTO.setAgencyName(entity.getOrganizationName());
+        //2:查询本机关的所有上级机关，按自上而下层级顺序
+        if (null == entity.getPids()) {
+            return new Result<AgencydetailResultDTO>().ok(agencydetailResultDTO);
+        }
+        List<String> listStr = Arrays.asList(entity.getPids().split(":"));
+        List<ParentListResultDTO> parentList = baseDao.selectPAgencyById(listStr);
+        agencydetailResultDTO.setParentList(parentList);
+        return new Result<AgencydetailResultDTO>().ok(agencydetailResultDTO);
+    }
+
+    /**
+     * @param formDTO
+     * @return
+     * @Author sun
+     * @Description 组织首页-下级机关列表
+     */
+    @Override
+    public Result<SubAgencyResultDTO> subAgencyList(SubAgencyFormDTO formDTO) {
+        SubAgencyResultDTO subAgencyResultDTO = new SubAgencyResultDTO();
+        //1:根据当前机关Id查询直属下一级机关列表
+        List<SubListResultDTO> agencyList = baseDao.selectSubAgencyById(formDTO.getAgencyId());
+        subAgencyResultDTO.setAgencyList(agencyList);
+        //2:统计下一级机关数
+        subAgencyResultDTO.setSubAgencyCount(agencyList.size());
+        return new Result<SubAgencyResultDTO>().ok(subAgencyResultDTO);
+    }
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java

@@ -26,11 +26,15 @@ import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dao.CustomerGridDao;
 import com.epmet.dto.CustomerGridDTO;
+import com.epmet.dto.CustomerStaffGridDTO;
+import com.epmet.dto.StaffGridListDTO;
 import com.epmet.dto.form.CustomerGridFormDTO;
 import com.epmet.dto.form.ListCustomerGridFormDTO;
 import com.epmet.dto.result.CustomerGridByUserIdResultDTO;
 import com.epmet.dto.result.CustomerGridForStrangerResultDTO;
+import com.epmet.dto.result.GridDetailResultDTO;
 import com.epmet.entity.CustomerGridEntity;
+import com.epmet.feign.EpmetUserFeignClient;
 import com.epmet.redis.CustomerGridRedis;
 import com.epmet.service.CustomerGridService;
 import com.epmet.util.ModuleConstant;
@@ -55,6 +59,8 @@ public class CustomerGridServiceImpl extends BaseServiceImpl<CustomerGridDao, Cu
 
     @Autowired
     private CustomerGridRedis customerGridRedis;
+    @Autowired
+    private EpmetUserFeignClient epmetUserFeignClient;
 
     @Override
     public PageData<CustomerGridDTO> page(Map<String, Object> params) {
@@ -163,4 +169,13 @@ public class CustomerGridServiceImpl extends BaseServiceImpl<CustomerGridDao, Cu
         return new Result<List<CustomerGridByUserIdResultDTO>>().ok(baseDao.getMyGrids(userId));
     }
 
+    @Override
+    public Result<GridDetailResultDTO> griddetail(CustomerGridFormDTO customerGridFormDTO) {
+        GridDetailResultDTO griddetail = baseDao.griddetail(customerGridFormDTO);
+        List<CustomerStaffGridDTO> customerStaffGridDTOS = baseDao.selectUserIdByGridId(customerGridFormDTO);
+        Result<List<StaffGridListDTO>> staffGridList = epmetUserFeignClient.getStaffGridList(customerStaffGridDTOS);
+        griddetail.setStaffGridList(staffGridList.getData());
+        return new Result<GridDetailResultDTO>().ok(griddetail);
+    }
+
 }

epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml

@@ -37,4 +37,26 @@
                 #{customerId}
             </foreach>
     </select>
+
+    <select id="selectPAgencyById" resultType="com.epmet.dto.result.ParentListResultDTO">
+        SELECT
+            id,
+            organization_name AS 'name'
+        FROM customer_agency
+        WHERE del_flag = '0'
+        AND id IN
+        <foreach item="id" collection="listStr" open="(" separator="," close=")" index="">
+            #{id}
+        </foreach>
+    </select>
+
+    <select id="selectSubAgencyById" resultType="com.epmet.dto.result.SubListResultDTO">
+        SELECT
+            id AS 'agencyId',
+            organization_name AS 'agencyName'
+        FROM customer_agency
+        WHERE del_flag = '0'
+        AND pid = #{pId}
+        ORDER BY CREATED_TIME DESC
+    </select>
 </mapper>

epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml

@@ -109,4 +109,34 @@
             cg.created_time DESC
     </select>
 
+    <!-- 根据gridId获取网格详情 -->
+    <select id="griddetail" resultType="com.epmet.dto.result.GridDetailResultDTO">
+        SELECT id AS grid,
+            grid_name AS gridName,
+            longitude AS longitude,
+            latitude AS latitude,
+            area_code AS areaCode,
+            manage_district AS manageDistrict,
+            total_user AS totalUser,
+            pid AS agencyId,
+            pids AS pids
+        FROM
+            customer_grid
+        WHERE
+            id = #{gridId}
+            AND del_flag = 0
+        ORDER BY created_by DESC
+    </select>
+
+    <!--根据gridId查询userId-->
+    <select id="selectUserIdByGridId" resultType="com.epmet.dto.CustomerStaffGridDTO">
+        SELECT
+            user_id
+        FROM
+            customer_staff_grid
+        WHERE
+	        del_flag = 0
+	        AND grid_id = #{gridId}
+    </select>
+
 </mapper>

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/StaffRoleFormDTO.java

@@ -7,12 +7,28 @@ import javax.validation.constraints.NotBlank;
 @Data
 public class StaffRoleFormDTO {
 
-    @NotBlank(message = "工作人员ID不能为空")
+    /**===========校验分组开始============*/
+
+    // 查询工作人员角色列表group
+    public interface GetRolesOfStaff {}
+
+    // 查询某角色下的人员列表group
+    public interface GetStaffsInRole {}
+
+    /**===========校验分组结束============*/
+
+    @NotBlank(message = "工作人员ID不能为空", groups = {GetRolesOfStaff.class})
     private String staffId;
 
     /**
-     * 机构id，可以是agencyId,DeptId,GridId
+     * 组织id，可以是agencyId,DeptId,GridId
      */
-    @NotBlank(message = "工作人员所属组织ID不能为空")
+    @NotBlank(message = "工作人员所属组织ID不能为空", groups = {GetRolesOfStaff.class, GetStaffsInRole.class})
     private String orgId;
+
+    /**
+     * 角色key
+     */
+    @NotBlank(message = "角色Key不能为空", groups = {GetStaffsInRole.class})
+    private String roleKey;
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/controller/CustomerStaffController.java

@@ -26,6 +26,9 @@ import com.epmet.commons.tools.validator.group.AddGroup;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
 import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.dto.CustomerStaffDTO;
+import com.epmet.dto.CustomerStaffGridDTO;
+import com.epmet.dto.StaffGridListDTO;
+import com.epmet.dto.form.CustomerGridFormDTO;
 import com.epmet.dto.form.CustomerStaffFormDTO;
 import com.epmet.excel.CustomerStaffExcel;
 import com.epmet.service.CustomerStaffService;
@@ -117,6 +120,17 @@ public class CustomerStaffController {
         return customerStaffService.getCustomerStaffInfo(formDTO);
     }
 
+    /**
+     * 根据userId查询网格下用户信息
+     * @param customerStaffGridDTOS
+     * @return
+     */
+    @PostMapping(value = "selectstaffgridlistbyuserid")
+    public Result<List<StaffGridListDTO>> selectStaffGridListByUserId(@RequestBody List<CustomerStaffGridDTO> customerStaffGridDTOS){
+        Result<List<StaffGridListDTO>> listResult = customerStaffService.selectStaffGridListByUserId(customerStaffGridDTOS);
+        return listResult;
+    }
+
     /**
      * 根据用户ID获取工作人员基本信息
      *

epmet-user/epmet-user-server/src/main/java/com/epmet/controller/StaffRoleController.java

@@ -7,6 +7,7 @@ import com.epmet.dto.StaffRoleDTO;
 import com.epmet.dto.form.StaffRoleFormDTO;
 import com.epmet.entity.GovStaffRoleEntity;
 import com.epmet.service.GovStaffRoleService;
+import com.epmet.service.StaffRoleService;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -31,13 +32,16 @@ public class StaffRoleController {
     @Autowired
     private GovStaffRoleService govStaffRoleService;
 
+    @Autowired
+    private StaffRoleService staffRoleService;
+
     /**
-     * 根据工作人员查询工作人员具有的角色列表
+     * 查询工作人员具有的角色列表
      * @return
      */
     @PostMapping("staffroles")
     public Result<List<GovStaffRoleDTO>> getRolesOfStaff(@RequestBody StaffRoleFormDTO staffRoleFormDTO) {
-        ValidatorUtils.validateEntity(staffRoleFormDTO);
+        ValidatorUtils.validateEntity(staffRoleFormDTO, StaffRoleFormDTO.GetRolesOfStaff.class);
         String staffId = staffRoleFormDTO.getStaffId();
         String orgId = staffRoleFormDTO.getOrgId();
         List<GovStaffRoleEntity> staffRoleEntities = govStaffRoleService.listRolesByStaffId(staffId, orgId);
@@ -50,4 +54,18 @@ public class StaffRoleController {
         return new Result<List<GovStaffRoleDTO>>().ok(staffRoleDTOS);
     }
 
+    /**
+     * 查询拥有指定角色的用户列表
+     * @param staffRoleFormDTO
+     * @return
+     */
+    @PostMapping("staffsinrole")
+    public Result<List<StaffRoleDTO>> getStaffsInRole(@RequestBody StaffRoleFormDTO staffRoleFormDTO) {
+        ValidatorUtils.validateEntity(staffRoleFormDTO, StaffRoleFormDTO.GetStaffsInRole.class);
+        String roleKey = staffRoleFormDTO.getRoleKey();
+        String orgId = staffRoleFormDTO.getOrgId();
+        List<StaffRoleDTO> staffRoleDTOS = staffRoleService.listStaffsInRole(roleKey, orgId);
+        return new Result<List<StaffRoleDTO>>().ok(staffRoleDTOS);
+    }
+
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/dao/CustomerStaffDao.java

@@ -19,6 +19,8 @@ package com.epmet.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.dto.CustomerStaffDTO;
+import com.epmet.dto.CustomerStaffGridDTO;
+import com.epmet.dto.StaffGridListDTO;
 import com.epmet.dto.form.CustomerStaffFormDTO;
 import com.epmet.entity.CustomerStaffEntity;
 import org.apache.ibatis.annotations.Mapper;
@@ -53,4 +55,11 @@ public interface CustomerStaffDao extends BaseDao<CustomerStaffEntity> {
     CustomerStaffDTO selectListCustomerStaffInfo(CustomerStaffFormDTO formDTO);
 
     CustomerStaffDTO selectStaffInfoByUserId(CustomerStaffDTO formDTO);
+
+    /**
+     * 根据userId查询查询网格下的用户信息
+     * @param customerStaffGridDTOS
+     * @return
+     */
+    List<StaffGridListDTO> selectStaffGridListByUserId(List<CustomerStaffGridDTO> customerStaffGridDTOS);
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/dao/GovStaffRoleDao.java

@@ -33,5 +33,12 @@ import java.util.List;
 @Mapper
 public interface GovStaffRoleDao extends BaseDao<GovStaffRoleEntity> {
 
+    /**
+     * 根据staffId查询具有的角色列表
+     * @param staffId
+     * @param orgId
+     * @return
+     */
     List<GovStaffRoleEntity> listRolesByStaffId(@Param("staffId") String staffId, @Param("orgId") String orgId);
+
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/dao/StaffRoleDao.java

@@ -18,8 +18,12 @@
 package com.epmet.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dto.StaffRoleDTO;
 import com.epmet.entity.StaffRoleEntity;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * 工作人员-角色关系表
@@ -29,5 +33,11 @@ import org.apache.ibatis.annotations.Mapper;
  */
 @Mapper
 public interface StaffRoleDao extends BaseDao<StaffRoleEntity> {
-	
+    /**
+     * 查询具有某角色的staff列表
+     * @param roleKey
+     * @param orgId
+     * @return
+     */
+    List<StaffRoleDTO> listStaffIdsByRoleKeyAndOrgId(@Param("roleKey") String roleKey, @Param("orgId") String orgId);
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/service/CustomerStaffService.java

@@ -21,6 +21,9 @@ import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.CustomerStaffDTO;
+import com.epmet.dto.CustomerStaffGridDTO;
+import com.epmet.dto.StaffGridListDTO;
+import com.epmet.dto.form.CustomerGridFormDTO;
 import com.epmet.dto.form.CustomerStaffFormDTO;
 import com.epmet.entity.CustomerStaffEntity;
 
@@ -122,4 +125,11 @@ public interface CustomerStaffService extends BaseService<CustomerStaffEntity> {
 	 * @date 2020/4/22 10:05
 	 **/
 	Result<CustomerStaffDTO> getCustomerStaffInfoByUserId(CustomerStaffDTO formDTO);
+
+	/**
+	 * 根据guidId查询网格下的用户信息
+	 * @param customerStaffGridDTOS
+	 * @return
+	 */
+	Result<List<StaffGridListDTO>> selectStaffGridListByUserId(List<CustomerStaffGridDTO> customerStaffGridDTOS);
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/service/StaffRoleService.java

@@ -92,4 +92,12 @@ public interface StaffRoleService extends BaseService<StaffRoleEntity> {
      * @date 2020-04-22
      */
     void delete(String[] ids);
+
+    /**
+     * 查询具有某角色的staff列表
+     * @param roleKey
+     * @param orgId
+     * @return
+     */
+    List<StaffRoleDTO> listStaffsInRole(String roleKey, String orgId);
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java

@@ -28,6 +28,9 @@ import com.epmet.commons.tools.utils.Result;
 import com.epmet.constant.UserConstant;
 import com.epmet.dao.CustomerStaffDao;
 import com.epmet.dto.CustomerStaffDTO;
+import com.epmet.dto.CustomerStaffGridDTO;
+import com.epmet.dto.StaffGridListDTO;
+import com.epmet.dto.form.CustomerGridFormDTO;
 import com.epmet.dto.form.CustomerStaffFormDTO;
 import com.epmet.entity.CustomerStaffEntity;
 import com.epmet.redis.CustomerStaffRedis;
@@ -140,4 +143,10 @@ public class CustomerStaffServiceImpl extends BaseServiceImpl<CustomerStaffDao,
         return new Result<CustomerStaffDTO>().ok(customerStaffDTO);
     }
 
+    @Override
+    public Result<List<StaffGridListDTO>> selectStaffGridListByUserId(List<CustomerStaffGridDTO> customerStaffGridDTOS) {
+        List<StaffGridListDTO> staffGridListDTOS = baseDao.selectStaffGridListByUserId(customerStaffGridDTOS);
+        return new Result<List<StaffGridListDTO>>().ok(staffGridListDTOS);
+    }
+
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/GovStaffRoleServiceImpl.java

@@ -110,5 +110,4 @@ public class GovStaffRoleServiceImpl extends BaseServiceImpl<GovStaffRoleDao, Go
     public List<GovStaffRoleEntity> listRolesByStaffId(String staffId, String orgId) {
         return baseDao.listRolesByStaffId(staffId, orgId);
     }
-
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/StaffRoleServiceImpl.java

@@ -101,4 +101,15 @@ public class StaffRoleServiceImpl extends BaseServiceImpl<StaffRoleDao, StaffRol
         baseDao.deleteBatchIds(Arrays.asList(ids));
     }
 
+    /**
+     * 查询具有某角色的staff列表
+     * @param roleKey
+     * @param orgId
+     * @return
+     */
+    @Override
+    public List<StaffRoleDTO> listStaffsInRole(String roleKey, String orgId) {
+        return baseDao.listStaffIdsByRoleKeyAndOrgId(roleKey, orgId);
+    }
+
 }

epmet-user/epmet-user-server/src/main/resources/mapper/CustomerStaffDao.xml

@@ -23,4 +23,22 @@
         where cs.USER_ID=#{userId}
           and cs.DEL_FLAG='0'
     </select>
+
+    <!-- 根据userId查询网格下的用户信息 -->
+    <select id="selectStaffGridListByUserId" parameterType="com.epmet.dto.CustomerStaffGridDTO" resultType="com.epmet.dto.StaffGridListDTO">
+        SELECT
+            cs.id AS staffId,
+            cs.real_name AS staffName,
+            cs.head_photo AS staffHeadPhoto,
+            gsr.role_name AS roleName
+        FROM
+            customer_staff cs
+        LEFT JOIN gov_staff_role gsr ON cs.user_id = gsr.id
+        WHERE
+            cs.user_id in
+            <foreach collection="list" item="staff" open="(" separator="," close=")">
+                #{staff.userId}
+            </foreach>
+            AND cs.del_flag = 0
+    </select>
 </mapper>

epmet-user/epmet-user-server/src/main/resources/mapper/GovStaffRoleDao.xml

@@ -17,6 +17,7 @@
         <result property="updatedTime" column="UPDATED_TIME"/>
     </resultMap>
 
+    <!--根据staffId查询具有的角色列表-->
     <select id="listRolesByStaffId" resultType="com.epmet.entity.GovStaffRoleEntity">
         SELECT
             r.*
@@ -27,6 +28,4 @@
             sr.STAFF_ID = #{staffId}
             AND sr.ORG_ID = #{orgId}
     </select>
-
-
 </mapper>

epmet-user/epmet-user-server/src/main/resources/mapper/StaffRoleDao.xml

@@ -17,4 +17,15 @@
     </resultMap>
 
 
+    <!--查询具有某角色的staff列表-->
+    <select id="listStaffIdsByRoleKeyAndOrgId" resultType="com.epmet.dto.StaffRoleDTO">
+        SELECT
+            sr.*
+        FROM
+            staff_role sr
+            INNER JOIN gov_staff_role r ON ( sr.ROLE_ID = r.ID )
+        WHERE
+            r.ROLE_KEY = #{roleKey}
+            AND sr.ORG_ID = #{orgId}
+    </select>
 </mapper>