支部管理v1

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

@@ -38,7 +38,7 @@ public enum EpmetErrorCode {
 	MESSAGE_SMS_SEND_ERROR(8105, "短信发送失败"),
 	NOT_DEL_GRID(8106,"该网格存在工作人员，不允许删除"),
 	ORG_IS_NOT_NULL(8107,"党组织关系不能为空"),
-
+	CANNOT_DELETE_PARTYB_RANCH(8108,"当前支部存在党员，不允许删除"),
     CANNOT_AUDIT_WARM(8201, "请完善居民信息"),
 	NOT_DEL_AGENCY(8202, "该机关存在下级机关，不允许删除"),
 	NOT_DEL_AGENCY_PER(8205, "该机关存在工作人员，不允许删除"),

epmet-module/gov-grid/gov-grid-client/pom.xml

@@ -19,6 +19,12 @@
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.epmet</groupId>
+            <artifactId>epmet-commons-tools</artifactId>
+            <version>2.0.0</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 
 

epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/form/DeleteBranchFormDTO.java

@@ -0,0 +1,20 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * 描述一下
+ *
+ * @author yinzuomei@elink-cn.com
+ * @date 2020/6/17 17:02
+ */
+@Data
+public class DeleteBranchFormDTO implements Serializable {
+    private static final long serialVersionUID = 5321430865413383354L;
+
+    @NotBlank(message = "党支部id不能为空")
+    private String partyBranchId;
+}

epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/form/PartyBranchAddFormDTO.java

@@ -0,0 +1,51 @@
+package com.epmet.dto.form;
+
+import com.epmet.commons.tools.validator.group.CustomerClientShowGroup;
+import lombok.Data;
+import org.hibernate.validator.constraints.Length;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * 添加党支部入参DTO
+ *
+ * @author yinzuomei@elink-cn.com
+ * @date 2020/6/17 12:35
+ */
+@Data
+public class PartyBranchAddFormDTO implements Serializable {
+    private static final long serialVersionUID = -8102877381223078842L;
+
+    public interface AddUserInternalGroup {
+    }
+
+    public interface AddUserShowGroup extends CustomerClientShowGroup {
+    }
+
+    /**
+     * 客户id
+     */
+    @NotBlank(message = "客户id不能为空", groups = {AddUserInternalGroup.class})
+    private String customerId;
+
+    /**
+     * 网格id
+     */
+    @NotBlank(message = "网格id不能为空", groups = {AddUserInternalGroup.class})
+    private String gridId;
+
+    /**
+     * 党支部名称
+     */
+    @NotBlank(message = "请输入支部名称", groups = {AddUserShowGroup.class})
+    @Length(max = 20, message = "支部名称不能超过20个字", groups = AddUserShowGroup.class)
+    private String partyBranchName;
+
+    /**
+     * 党支部概要信息
+     */
+    @NotBlank(message = "请输入支部概要信息", groups = {AddUserShowGroup.class})
+    @Length(max = 500, message = "支部概要信息不能超过500个字", groups = AddUserShowGroup.class)
+    private String profile;
+}

epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/form/PartyBranchEditFormDTO.java

@@ -0,0 +1,40 @@
+package com.epmet.dto.form;
+
+import com.epmet.commons.tools.validator.group.CustomerClientShowGroup;
+import lombok.Data;
+import org.hibernate.validator.constraints.Length;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * 修改党支部信息入参DTO
+ *
+ * @author yinzuomei@elink-cn.com
+ * @date 2020/6/17 14:00
+ */
+@Data
+public class PartyBranchEditFormDTO implements Serializable {
+    private static final long serialVersionUID = -6739109166420798965L;
+    public interface AddUserInternalGroup {
+    }
+
+    public interface AddUserShowGroup extends CustomerClientShowGroup {
+    }
+
+    @NotBlank(message = "党支部id不能为空", groups = {AddUserInternalGroup.class})
+    private String partyBranchId;
+    /**
+     * 党支部名称
+     */
+    @NotBlank(message = "请输入支部名称", groups = {AddUserShowGroup.class})
+    @Length(max = 20, message = "支部名称不能超过20个字", groups = AddUserShowGroup.class)
+    private String partyBranchName;
+
+    /**
+     * 党支部概要信息
+     */
+    @NotBlank(message = "请输入支部概要信息", groups = {AddUserShowGroup.class})
+    @Length(max = 500, message = "支部概要信息不能超过500个字", groups = AddUserShowGroup.class)
+    private String profile;
+}

epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/form/PartyBranchListFormDTO.java

@@ -0,0 +1,29 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * 3、党支部列表查询入参DTO
+ *
+ * @author yinzuomei@elink-cn.com
+ * @date 2020/6/17 16:11
+ */
+@Data
+public class PartyBranchListFormDTO implements Serializable {
+    public interface AddUserInternalGroup {
+    }
+    /**
+     * 客户id
+     */
+    @NotBlank(message = "客户id不能为空", groups = {PartyBranchListFormDTO.AddUserInternalGroup.class})
+    private String customerId;
+
+    /**
+     * 网格id
+     */
+    @NotBlank(message = "网格id不能为空", groups = {PartyBranchListFormDTO.AddUserInternalGroup.class})
+    private String gridId;
+}

epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/result/PartyBranchAddResultDTO.java

@@ -0,0 +1,20 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 添加党支部返参DTO
+ *
+ * @author yinzuomei@elink-cn.com
+ * @date 2020/6/17 12:45
+ */
+@Data
+public class PartyBranchAddResultDTO implements Serializable {
+    private static final long serialVersionUID = 5610858988982913682L;
+    /**
+     * 党支部id
+     */
+    private String partyBranchId;
+}

epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/result/PartyBranchListResultDTO.java

@@ -0,0 +1,24 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 3、党支部列表查询返参DTO
+ *
+ * @author yinzuomei@elink-cn.com
+ * @date 2020/6/17 16:13
+ */
+@Data
+public class PartyBranchListResultDTO implements Serializable {
+    private static final long serialVersionUID = 8342529186641647970L;
+    /**
+     * 支部id
+     */
+    private String partyBranchId;
+    /**
+     * 支部名称
+     */
+    private String partyBranchName;
+}

epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/controller/PartyBranchManageController.java

@@ -0,0 +1,88 @@
+package com.epmet.controller;
+
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.commons.tools.validator.ValidatorUtils;
+import com.epmet.dto.form.DeleteBranchFormDTO;
+import com.epmet.dto.form.PartyBranchAddFormDTO;
+import com.epmet.dto.form.PartyBranchEditFormDTO;
+import com.epmet.dto.form.PartyBranchListFormDTO;
+import com.epmet.dto.result.PartyBranchAddResultDTO;
+import com.epmet.dto.result.PartyBranchListResultDTO;
+import com.epmet.service.PartyBranchManageService;
+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;
+
+import java.util.List;
+
+/**
+ * 基层治理-支部管理
+ *
+ * @author yinzuomei@elink-cn.com
+ * @date 2020/6/17 12:25
+ */
+@RestController
+@RequestMapping("partybranch")
+public class PartyBranchManageController {
+    @Autowired
+    private PartyBranchManageService partyBranchManageService;
+
+    /**
+     * @param formDTO
+     * @return com.epmet.commons.tools.utils.Result<com.epmet.dto.result.PartyBranchAddResultDTO>
+     * @author yinzuomei
+     * @description 添加党支部
+     * @Date 2020/6/17 12:47
+     **/
+    @PostMapping("add")
+    public Result<PartyBranchAddResultDTO> addPartyBranch(@RequestBody PartyBranchAddFormDTO formDTO) {
+        ValidatorUtils.validateEntity(formDTO, PartyBranchAddFormDTO.AddUserShowGroup.class, PartyBranchAddFormDTO.AddUserInternalGroup.class);
+        PartyBranchAddResultDTO partyBranchAddResultDTO = partyBranchManageService.addPartyBranch(formDTO);
+        return new Result<PartyBranchAddResultDTO>().ok(partyBranchAddResultDTO);
+    }
+
+    /**
+     * @param formDTO
+     * @return com.epmet.commons.tools.utils.Result<com.epmet.dto.result.PartyBranchAddResultDTO>
+     * @author yinzuomei
+     * @description 修改党支部信息
+     * @Date 2020/6/17 15:31
+     **/
+    @PostMapping("edit")
+    public Result<PartyBranchAddResultDTO> editPartyBranch(@RequestBody PartyBranchEditFormDTO formDTO) {
+        ValidatorUtils.validateEntity(formDTO, PartyBranchEditFormDTO.AddUserShowGroup.class, PartyBranchEditFormDTO.AddUserInternalGroup.class);
+        partyBranchManageService.editPartyBranch(formDTO);
+        PartyBranchAddResultDTO partyBranchAddResultDTO = new PartyBranchAddResultDTO();
+        partyBranchAddResultDTO.setPartyBranchId(formDTO.getPartyBranchId());
+        return new Result<PartyBranchAddResultDTO>().ok(partyBranchAddResultDTO);
+    }
+
+    /**
+     * @param formDTO
+     * @return com.epmet.commons.tools.utils.Result<java.util.List < com.epmet.dto.result.PartyBranchListResultDTO>>
+     * @author yinzuomei
+     * @description 党支部列表查询
+     * @Date 2020/6/17 16:15
+     **/
+    @PostMapping("list")
+    public Result<List<PartyBranchListResultDTO>> listPartyBranch(@RequestBody PartyBranchListFormDTO formDTO) {
+        ValidatorUtils.validateEntity(formDTO, PartyBranchListFormDTO.AddUserInternalGroup.class);
+        return new Result<List<PartyBranchListResultDTO>>().ok(partyBranchManageService.listPartyBranch(formDTO));
+    }
+
+    /**
+     * @return com.epmet.commons.tools.utils.Result
+     * @param formDTO
+     * @author yinzuomei
+     * @description 删除党支部
+     * @Date 2020/6/17 18:23
+     **/
+    @PostMapping("delete")
+    public Result deleteBranch(@RequestBody DeleteBranchFormDTO formDTO) {
+        ValidatorUtils.validateEntity(formDTO);
+        partyBranchManageService.deleteBranch(formDTO);
+        return new Result();
+    }
+}

epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/PartyBranchManageService.java

@@ -0,0 +1,54 @@
+package com.epmet.service;
+
+import com.epmet.dto.form.DeleteBranchFormDTO;
+import com.epmet.dto.form.PartyBranchAddFormDTO;
+import com.epmet.dto.form.PartyBranchEditFormDTO;
+import com.epmet.dto.form.PartyBranchListFormDTO;
+import com.epmet.dto.result.PartyBranchAddResultDTO;
+import com.epmet.dto.result.PartyBranchListResultDTO;
+
+import java.util.List;
+
+/**
+ * 基层治理-支部管理
+ *
+ * @author yinzuomei@elink-cn.com
+ * @date 2020/6/17 12:47
+ */
+public interface PartyBranchManageService {
+    /**
+     * @param formDTO
+     * @return com.epmet.dto.result.PartyBranchAddResultDTO
+     * @author yinzuomei
+     * @description 添加党支部
+     * @Date 2020/6/17 13:24
+     **/
+    PartyBranchAddResultDTO addPartyBranch(PartyBranchAddFormDTO formDTO);
+
+    /**
+     * @param formDTO
+     * @return com.epmet.dto.result.PartyBranchAddResultDTO
+     * @author yinzuomei
+     * @description 修改党支部信息
+     * @Date 2020/6/17 14:30
+     **/
+    void editPartyBranch(PartyBranchEditFormDTO formDTO);
+
+    /**
+     * @param formDTO
+     * @return java.util.List<com.epmet.dto.result.PartyBranchListResultDTO>
+     * @author yinzuomei
+     * @description 党支部列表查询
+     * @Date 2020/6/17 16:15
+     **/
+    List<PartyBranchListResultDTO> listPartyBranch(PartyBranchListFormDTO formDTO);
+
+    /**
+     * @return void
+     * @param formDTO
+     * @author yinzuomei
+     * @description 删除党支部
+     * @Date 2020/6/17 17:04
+     **/
+    void deleteBranch(DeleteBranchFormDTO formDTO);
+}

epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/impl/PartyBranchManageServiceImpl.java

@@ -0,0 +1,89 @@
+package com.epmet.service.impl;
+
+import com.alibaba.fastjson.JSON;
+import com.epmet.commons.tools.exception.EpmetErrorCode;
+import com.epmet.commons.tools.exception.RenException;
+import com.epmet.commons.tools.utils.ConvertUtils;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.CustomerPartyBranchDTO;
+import com.epmet.dto.form.*;
+import com.epmet.dto.result.ListPartyBranchResultDTO;
+import com.epmet.dto.result.PartyBranchAddResultDTO;
+import com.epmet.dto.result.PartyBranchListResultDTO;
+import com.epmet.feign.GovOrgOpenFeignClient;
+import com.epmet.service.PartyBranchManageService;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 基层治理-支部管理
+ *
+ * @author yinzuomei@elink-cn.com
+ * @date 2020/6/17 13:23
+ */
+@Service
+public class PartyBranchManageServiceImpl implements PartyBranchManageService {
+    private Logger logger = LogManager.getLogger(PartyBranchManageServiceImpl.class);
+    @Autowired
+    private GovOrgOpenFeignClient govOrgOpenFeignClient;
+
+    @Override
+    public PartyBranchAddResultDTO addPartyBranch(PartyBranchAddFormDTO formDTO) {
+        CustomerPartyBranchDTO customerPartyBranchDTO = ConvertUtils.sourceToTarget(formDTO, CustomerPartyBranchDTO.class);
+        customerPartyBranchDTO.setTotalPartyMember(0);
+        PartyBranchAddResultDTO partyBranchAddResultDTO = new PartyBranchAddResultDTO();
+        Result<String> result = govOrgOpenFeignClient.savePartyBranch(customerPartyBranchDTO);
+        if (result.success()) {
+            partyBranchAddResultDTO.setPartyBranchId(result.getData());
+        } else {
+            logger.error("添加党支部错误,调用gov-org-server接口返回失败");
+        }
+        return partyBranchAddResultDTO;
+    }
+
+    @Override
+    public void editPartyBranch(PartyBranchEditFormDTO formDTO) {
+        CustomerPartyBranchDTO customerPartyBranchDTO = ConvertUtils.sourceToTarget(formDTO, CustomerPartyBranchDTO.class);
+        customerPartyBranchDTO.setId(formDTO.getPartyBranchId());
+        Result<String> result = govOrgOpenFeignClient.updatePartyBranch(customerPartyBranchDTO);
+        if (result.success()) {
+            logger.info("修改党支部信息成功");
+        }
+    }
+
+    @Override
+    public List<PartyBranchListResultDTO> listPartyBranch(PartyBranchListFormDTO formDTO) {
+        ListPartyBranchFormDTO listPartyBranchFormDTO = ConvertUtils.sourceToTarget(formDTO, ListPartyBranchFormDTO.class);
+        Result<List<ListPartyBranchResultDTO>> result = govOrgOpenFeignClient.listPartyBranch(listPartyBranchFormDTO);
+        List<ListPartyBranchResultDTO> resultList=result.getData();
+        if (result.success()) {
+            List<PartyBranchListResultDTO> list = ConvertUtils.sourceToTarget(resultList, PartyBranchListResultDTO.class);
+            return list;
+        } else {
+            logger.error(String.format("党支部列表查询失败入参:"), JSON.toJSONString(formDTO));
+        }
+        return new ArrayList<>();
+    }
+
+    @Override
+    public void deleteBranch(DeleteBranchFormDTO formDTO) {
+        Result<CustomerPartyBranchDTO> customerPartyBranchDTOResult = govOrgOpenFeignClient.getPartyBranchById(formDTO.getPartyBranchId());
+        if (!customerPartyBranchDTOResult.success()||null==customerPartyBranchDTOResult.getData()) {
+            logger.error(String.format("查询党支部信息失败入参:%s",JSON.toJSONString(formDTO)));
+            return;
+        }else{
+            if (null != customerPartyBranchDTOResult.getData() && customerPartyBranchDTOResult.getData().getTotalPartyMember() > 0) {
+                throw new RenException(EpmetErrorCode.CANNOT_DELETE_PARTYB_RANCH.getCode());
+            }
+        }
+        Result delteResult=govOrgOpenFeignClient.deletePartyBranchById(formDTO.getPartyBranchId());
+        if(!delteResult.success()){
+            logger.error(String.format("删除党支部失败入参:%s",JSON.toJSONString(formDTO)));
+        }
+    }
+}

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

@@ -0,0 +1,29 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * 党支部列表查询
+ *
+ * @author yinzuomei@elink-cn.com
+ * @date 2020/6/17 16:27
+ */
+@Data
+public class ListPartyBranchFormDTO implements Serializable {
+    private static final long serialVersionUID = -5693132528876149747L;
+
+    /**
+     * 客户id
+     */
+    @NotBlank(message = "客户id不能为空")
+    private String customerId;
+
+    /**
+     * 网格id
+     */
+    @NotBlank(message = "网格id不能为空")
+    private String gridId;
+}

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

@@ -0,0 +1,24 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 党支部列表查询返参
+ *
+ * @author yinzuomei@elink-cn.com
+ * @date 2020/6/17 16:30
+ */
+@Data
+public class ListPartyBranchResultDTO implements Serializable {
+    private static final long serialVersionUID = 2306892144298853581L;
+    /**
+     * 支部id
+     */
+    private String partyBranchId;
+    /**
+     * 支部名称
+     */
+    private String partyBranchName;
+}

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java

@@ -1,16 +1,19 @@
 package com.epmet.feign;
 
+import com.epmet.commons.tools.constant.ServiceConstant;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.CustomerAgencyDTO;
+import com.epmet.dto.CustomerPartyBranchDTO;
+import com.epmet.dto.form.ListPartyBranchFormDTO;
 import com.epmet.dto.result.ArticleGridResultDTO;
+import com.epmet.dto.result.ListPartyBranchResultDTO;
 import com.epmet.dto.result.PublishAgencyListResultDTO;
+import com.epmet.feign.fallback.GovOrgOpenFeignClientFallback;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.http.MediaType;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.*;
 
-import com.epmet.commons.tools.constant.ServiceConstant;
-import com.epmet.commons.tools.utils.Result;
-import com.epmet.dto.CustomerAgencyDTO;
-import com.epmet.feign.fallback.GovOrgOpenFeignClientFallback;
+import java.util.List;
 
 /**
  * 本服务对外开放的API,其他服务通过引用此client调用该服务
@@ -18,8 +21,7 @@ import com.epmet.feign.fallback.GovOrgOpenFeignClientFallback;
  * @author yinzuomei@elink-cn.com
  * @date 2020/6/4 13:37
  */
-// @FeignClient(name = ServiceConstant.GOV_ORG_SERVER, fallback = GovOrgOpenFeignClientFallback.class, url =
-// "localhost:8092")
+// @FeignClient(name = ServiceConstant.GOV_ORG_SERVER, fallback = GovOrgOpenFeignClientFallback.class, url = "localhost:8092")
 @FeignClient(name = ServiceConstant.GOV_ORG_SERVER, fallback = GovOrgOpenFeignClientFallback.class)
 public interface GovOrgOpenFeignClient {
 
@@ -58,4 +60,54 @@ public interface GovOrgOpenFeignClient {
      **/
     @PostMapping(value = "gov/org/customeragency/getpublishagencylist/{staffId}", consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
     Result<PublishAgencyListResultDTO> getPublishAgencyList(@PathVariable("staffId") String staffId);
+
+    /**
+     * @param customerPartyBranchDTO
+     * @return com.epmet.commons.tools.utils.Result
+     * @author yinzuomei
+     * @description 添加党支部
+     * @Date 2020/6/17 13:36
+     **/
+    @PostMapping(value = "gov/org/customerpartybranch/save", consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
+    Result<String> savePartyBranch(@RequestBody CustomerPartyBranchDTO customerPartyBranchDTO);
+
+    /**
+     * @param customerPartyBranchDTO
+     * @return com.epmet.commons.tools.utils.Result<java.lang.String>
+     * @author yinzuomei
+     * @description 修改党支部信息
+     * @Date 2020/6/17 15:31
+     **/
+    @PutMapping(value = "gov/org/customerpartybranch/update", consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
+    Result<String> updatePartyBranch(@RequestBody CustomerPartyBranchDTO customerPartyBranchDTO);
+
+    /**
+     * @param formDTO
+     * @return com.epmet.commons.tools.utils.Result
+     * @author yinzuomei
+     * @description 根据客户id、网格id查询党支部列表
+     * @Date 2020/6/17 16:28
+     **/
+    @PostMapping(value = "gov/org/customerpartybranch/listpartybranch", consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
+    Result<List<ListPartyBranchResultDTO>> listPartyBranch(@RequestBody ListPartyBranchFormDTO formDTO);
+
+    /**
+     * @param partyBranchId
+     * @return com.epmet.commons.tools.utils.Result<com.epmet.dto.CustomerPartyBranchDTO>
+     * @author yinzuomei
+     * @description 根据党支部id,查询党支部信息
+     * @Date 2020/6/17 18:01
+     **/
+    @GetMapping(value = "gov/org/customerpartybranch/get/{id}")
+    Result<CustomerPartyBranchDTO> getPartyBranchById(@PathVariable("id") String partyBranchId);
+
+    /**
+     * @return com.epmet.commons.tools.utils.Result
+     * @param partyBranchId
+     * @author yinzuomei
+     * @description 根据党支部id,删除党支部（存在党员的不允许删除）
+     * @Date 2020/6/17 18:08
+     **/
+    @GetMapping(value = "gov/org/customerpartybranch/delete/{id}")
+    Result deletePartyBranchById(@PathVariable("id") String partyBranchId);
 }

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/fallback/GovOrgOpenFeignClientFallback.java

@@ -4,11 +4,16 @@ 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.CustomerAgencyDTO;
+import com.epmet.dto.CustomerPartyBranchDTO;
+import com.epmet.dto.form.ListPartyBranchFormDTO;
 import com.epmet.dto.result.ArticleGridResultDTO;
+import com.epmet.dto.result.ListPartyBranchResultDTO;
 import com.epmet.dto.result.PublishAgencyListResultDTO;
 import com.epmet.feign.GovOrgOpenFeignClient;
 import org.springframework.stereotype.Component;
 
+import java.util.List;
+
 /**
  * 本服务对外开放的API,其他服务通过引用此client调用该服务
  *
@@ -37,4 +42,29 @@ public class GovOrgOpenFeignClientFallback implements GovOrgOpenFeignClient {
         return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "getPublishAgencyList", staffId);
     }
 
+    @Override
+    public Result<String> savePartyBranch(CustomerPartyBranchDTO customerPartyBranchDTO) {
+        return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "save", customerPartyBranchDTO);
+    }
+
+    @Override
+    public Result<String> updatePartyBranch(CustomerPartyBranchDTO customerPartyBranchDTO) {
+        return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "update", customerPartyBranchDTO);
+    }
+
+    @Override
+    public Result<List<ListPartyBranchResultDTO>> listPartyBranch(ListPartyBranchFormDTO formDTO) {
+        return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "listpartybranch", formDTO);
+    }
+
+    @Override
+    public Result<CustomerPartyBranchDTO> getPartyBranchById(String partyBranchId) {
+        return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "get", partyBranchId);
+    }
+
+    @Override
+    public Result deletePartyBranchById(String partyBranchId) {
+        return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "deleteById", partyBranchId);
+    }
+
 }

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

@@ -17,15 +17,19 @@
 
 package com.epmet.controller;
 
+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.ExcelUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.AssertUtils;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.commons.tools.validator.group.AddGroup;
-import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
+import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.dto.CustomerPartyBranchDTO;
+import com.epmet.dto.form.ListPartyBranchFormDTO;
+import com.epmet.dto.result.ListPartyBranchResultDTO;
 import com.epmet.excel.CustomerPartyBranchExcel;
 import com.epmet.service.CustomerPartyBranchService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -55,21 +59,20 @@ public class CustomerPartyBranchController {
         return new Result<PageData<CustomerPartyBranchDTO>>().ok(page);
     }
 
-    @GetMapping("{id}")
+    @GetMapping("get/{id}")
     public Result<CustomerPartyBranchDTO> get(@PathVariable("id") String id){
         CustomerPartyBranchDTO data = customerPartyBranchService.get(id);
         return new Result<CustomerPartyBranchDTO>().ok(data);
     }
 
-    @PostMapping
-    public Result save(@RequestBody CustomerPartyBranchDTO dto){
+    @PostMapping("save")
+    public Result<String> save(@RequestBody CustomerPartyBranchDTO dto){
         //效验数据
         ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
-        customerPartyBranchService.save(dto);
-        return new Result();
+        return new Result<String>().ok(customerPartyBranchService.save(dto));
     }
 
-    @PutMapping
+    @PutMapping("update")
     public Result update(@RequestBody CustomerPartyBranchDTO dto){
         //效验数据
         ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
@@ -85,10 +88,32 @@ public class CustomerPartyBranchController {
         return new Result();
     }
 
+    @GetMapping("delete/{id}")
+    public Result deleteById(@PathVariable("id") String id){
+        CustomerPartyBranchDTO data = customerPartyBranchService.get(id);
+        if(null!=data&&data.getTotalPartyMember()>0){
+            throw new RenException(EpmetErrorCode.CANNOT_DELETE_PARTYB_RANCH.getCode());
+        }
+        customerPartyBranchService.deleteById(id);
+        return new Result();
+    }
+
     @GetMapping("export")
     public void export(@RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
         List<CustomerPartyBranchDTO> list = customerPartyBranchService.list(params);
         ExcelUtils.exportExcelToTarget(response, null, list, CustomerPartyBranchExcel.class);
     }
 
+    /**
+     * @return com.epmet.commons.tools.utils.Result<java.util.List<com.epmet.dto.form.ListPartyBranchFormDTO>>
+     * @param formDTO
+     * @author yinzuomei
+     * @description 党支部列表查询,供gov-grid服务调用
+     * @Date 2020/6/17 16:33
+     **/
+    @PostMapping("listpartybranch")
+    public Result<List<ListPartyBranchResultDTO>> listpartybranch(@RequestBody ListPartyBranchFormDTO formDTO){
+        ValidatorUtils.validateEntity(formDTO);
+        return new Result<List<ListPartyBranchResultDTO>>().ok(customerPartyBranchService.listpartybranch(formDTO));
+    }
 }

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

@@ -18,9 +18,13 @@
 package com.epmet.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dto.form.ListPartyBranchFormDTO;
+import com.epmet.dto.result.ListPartyBranchResultDTO;
 import com.epmet.entity.CustomerPartyBranchEntity;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 /**
  * 党支部信息
  *
@@ -29,5 +33,6 @@ import org.apache.ibatis.annotations.Mapper;
  */
 @Mapper
 public interface CustomerPartyBranchDao extends BaseDao<CustomerPartyBranchEntity> {
-	
+    //根据客户id、网格id查询党支部列表
+    List<ListPartyBranchResultDTO> selectListPartyBranchResultDTO(ListPartyBranchFormDTO formDTO);
 }

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

@@ -20,6 +20,8 @@ package com.epmet.service;
 import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.dto.CustomerPartyBranchDTO;
+import com.epmet.dto.form.ListPartyBranchFormDTO;
+import com.epmet.dto.result.ListPartyBranchResultDTO;
 import com.epmet.entity.CustomerPartyBranchEntity;
 
 import java.util.List;
@@ -71,7 +73,7 @@ public interface CustomerPartyBranchService extends BaseService<CustomerPartyBra
      * @author generator
      * @date 2020-06-17
      */
-    void save(CustomerPartyBranchDTO dto);
+    String save(CustomerPartyBranchDTO dto);
 
     /**
      * 默认更新
@@ -92,4 +94,13 @@ public interface CustomerPartyBranchService extends BaseService<CustomerPartyBra
      * @date 2020-06-17
      */
     void delete(String[] ids);
+
+    /**
+     * @return java.util.List<com.epmet.dto.form.ListPartyBranchFormDTO>
+     * @param formDTO
+     * @author yinzuomei
+     * @description 党支部列表查询,供gov-grid服务调用
+     * @Date 2020/6/17 16:33
+     **/
+    List<ListPartyBranchResultDTO> listpartybranch(ListPartyBranchFormDTO formDTO);
 }

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

@@ -20,11 +20,13 @@ package com.epmet.service.impl;
 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.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
-import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.dao.CustomerPartyBranchDao;
 import com.epmet.dto.CustomerPartyBranchDTO;
+import com.epmet.dto.form.ListPartyBranchFormDTO;
+import com.epmet.dto.result.ListPartyBranchResultDTO;
 import com.epmet.entity.CustomerPartyBranchEntity;
 import com.epmet.redis.CustomerPartyBranchRedis;
 import com.epmet.service.CustomerPartyBranchService;
@@ -82,9 +84,10 @@ public class CustomerPartyBranchServiceImpl extends BaseServiceImpl<CustomerPart
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void save(CustomerPartyBranchDTO dto) {
+    public String save(CustomerPartyBranchDTO dto) {
         CustomerPartyBranchEntity entity = ConvertUtils.sourceToTarget(dto, CustomerPartyBranchEntity.class);
         insert(entity);
+        return entity.getId();
     }
 
     @Override
@@ -101,4 +104,9 @@ public class CustomerPartyBranchServiceImpl extends BaseServiceImpl<CustomerPart
         baseDao.deleteBatchIds(Arrays.asList(ids));
     }
 
+    @Override
+    public List<ListPartyBranchResultDTO> listpartybranch(ListPartyBranchFormDTO formDTO) {
+        return baseDao.selectListPartyBranchResultDTO(formDTO);
+    }
+
 }

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

@@ -18,5 +18,19 @@
         <result property="updatedTime" column="UPDATED_TIME"/>
     </resultMap>
 
-
+    <!-- 根据客户id、网格id查询党支部列表  -->
+    <select id="selectListPartyBranchResultDTO" parameterType="com.epmet.dto.form.ListPartyBranchFormDTO"
+            resultType="com.epmet.dto.result.ListPartyBranchResultDTO">
+            SELECT
+                id as partyBranchId,
+                PARTY_BRANCH_NAME as partyBranchName
+            FROM
+                customer_party_branch
+            WHERE
+                DEL_FLAG = '0'
+                AND CUSTOMER_ID =#{customerId}
+                AND GRID_ID = #{gridId}
+            ORDER BY
+                CREATED_TIME DESC
+    </select>
 </mapper>