Merge branch 'dev_ic_v2' into develop

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcCommunitySelfOrganizationController.java

@@ -18,6 +18,7 @@
 package com.epmet.controller;
 
 import com.epmet.commons.tools.annotation.LoginUser;
+import com.epmet.commons.tools.aop.NoRepeatSubmit;
 import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.security.dto.TokenDto;
@@ -145,6 +146,7 @@ public class IcCommunitySelfOrganizationController {
      * @author zxc
      * @date 2021/11/19 8:33 上午
      */
+    @NoRepeatSubmit
     @PostMapping("addcommunityselforganization")
     public Result addCommunitySelfOrganization(@LoginUser TokenDto tokenDto, @RequestBody AddCommunitySelfOrganizationFormDTO formDTO){
         ValidatorUtils.validateEntity(formDTO, AddCommunitySelfOrganizationFormDTO.AddCommunitySelfOrganizationForm.class);
@@ -159,6 +161,7 @@ public class IcCommunitySelfOrganizationController {
      * @author zxc
      * @date 2021/11/19 10:12 上午
      */
+    @NoRepeatSubmit
     @PostMapping("editcommunityselforganization")
     public Result editCommunitySelfOrganization(@LoginUser TokenDto tokenDto, @RequestBody EditCommunitySelfOrganizationFormDTO formDTO){
         ValidatorUtils.validateEntity(formDTO, EditCommunitySelfOrganizationFormDTO.EditCommunitySelfOrganizationForm.class);

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPartyActivityController.java

@@ -30,10 +30,12 @@ import com.epmet.dto.IcPartyActivityDTO;
 import com.epmet.dto.form.PartyActivityFormDTO;
 import com.epmet.excel.IcPartyActivityExcel;
 import com.epmet.service.IcPartyActivityService;
+import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.stream.Collectors;
@@ -82,17 +84,20 @@ public class IcPartyActivityController {
     @GetMapping("export")
     public void export(@RequestBody PartyActivityFormDTO formDTO, HttpServletResponse response) throws Exception {
         List<IcPartyActivityDTO> list = icPartyActivityService.list(formDTO);
+        List<IcPartyActivityExcel> excelList = new ArrayList<>();
         AtomicInteger i = new AtomicInteger(0);
-        List<IcPartyActivityExcel> excelList = list.stream().map(item -> {
+        if (CollectionUtils.isNotEmpty(list)) {
-            IcPartyActivityExcel excel = new IcPartyActivityExcel();
+            excelList = list.stream().map(item -> {
-            excel.setIndex(i.getAndIncrement());
+                IcPartyActivityExcel excel = new IcPartyActivityExcel();
-            excel.setUnitName(item.getUnitName());
+                excel.setIndex(i.getAndIncrement());
-            excel.setTitle(item.getTitle());
+                excel.setUnitName(item.getUnitName());
-            excel.setAddress(item.getAddress());
+                excel.setTitle(item.getTitle());
-            excel.setPeopleCount(item.getPeopleCount());
+                excel.setAddress(item.getAddress());
-            excel.setActivityTime(item.getActivityTime());
+                excel.setPeopleCount(item.getPeopleCount());
-            return excel;
+                excel.setActivityTime(item.getActivityTime());
-        }).collect(Collectors.toList());
+                return excel;
+            }).collect(Collectors.toList());
+        }
         ExcelUtils.exportExcelToTarget(response, null, excelList, IcPartyActivityExcel.class);
     }
 }

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPartyUnitController.java

@@ -33,10 +33,12 @@ import com.epmet.dto.form.demand.ServiceQueryFormDTO;
 import com.epmet.dto.result.demand.OptionDTO;
 import com.epmet.excel.IcPartyUnitExcel;
 import com.epmet.service.IcPartyUnitService;
+import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.stream.Collectors;
@@ -90,21 +92,23 @@ public class IcPartyUnitController {
     @GetMapping("export")
     public void export(@RequestBody PartyUnitFormDTO formDTO, HttpServletResponse response) throws Exception {
         List<IcPartyUnitDTO> list = icPartyUnitService.list(formDTO);
+        List<IcPartyUnitExcel> excelList = new ArrayList<>();
         AtomicInteger i = new AtomicInteger(0);
-        List<IcPartyUnitExcel> excelList = list.stream().map(item -> {
+        if (CollectionUtils.isNotEmpty(list)) {
-            IcPartyUnitExcel excel = new IcPartyUnitExcel();
+            excelList = list.stream().map(item -> {
-            excel.setIndex(i.getAndIncrement());
+                IcPartyUnitExcel excel = new IcPartyUnitExcel();
-            excel.setUnitName(item.getUnitName());
+                excel.setIndex(i.getAndIncrement());
-            excel.setContact(item.getContact());
+                excel.setUnitName(item.getUnitName());
-            excel.setContactMobile(item.getContactMobile());
+                excel.setContact(item.getContact());
-            excel.setType(item.getType());
+                excel.setContactMobile(item.getContactMobile());
-            excel.setMemberCount(item.getMemberCount());
+                excel.setType(item.getType());
-            excel.setRemark(item.getRemark());
+                excel.setMemberCount(item.getMemberCount());
-            excel.setSatisfaction(item.getSatisfaction());
+                excel.setRemark(item.getRemark());
-            excel.setServiceMatter(String.join(String.valueOf((char)10), item.getServiceMatterList()));
+                excel.setSatisfaction(item.getSatisfaction());
-            return excel;
+                excel.setServiceMatter(String.join(String.valueOf((char) 10), item.getServiceMatterList()));
-        }).collect(Collectors.toList());
+                return excel;
-
+            }).collect(Collectors.toList());
+        }
         ExcelUtils.exportExcelToTarget(response, null, excelList, IcPartyUnitExcel.class);
     }
 

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyUnitServiceImpl.java

@@ -76,7 +76,7 @@ public class IcPartyUnitServiceImpl extends BaseServiceImpl<IcPartyUnitDao, IcPa
         LambdaQueryWrapper<IcPartyUnitEntity> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(IcPartyUnitEntity::getAgencyId, formDTO.getAgencyId());
         wrapper.like(StringUtils.isNotBlank(formDTO.getUnitName()), IcPartyUnitEntity::getUnitName, formDTO.getUnitName());
-        wrapper.eq(StringUtils.isNotBlank(formDTO.getServiceMatter()), IcPartyUnitEntity::getServiceMatter, formDTO.getServiceMatter());
+        wrapper.like(StringUtils.isNotBlank(formDTO.getServiceMatter()), IcPartyUnitEntity::getServiceMatter, formDTO.getServiceMatter());
         wrapper.eq(StringUtils.isNotBlank(formDTO.getType()), IcPartyUnitEntity::getType, formDTO.getType());
         wrapper.like(StringUtils.isNotBlank(formDTO.getContact()), IcPartyUnitEntity::getContact, formDTO.getContact());
         wrapper.like(StringUtils.isNotBlank(formDTO.getContactMobile()), IcPartyUnitEntity::getContactMobile, formDTO.getContactMobile());
@@ -106,7 +106,7 @@ public class IcPartyUnitServiceImpl extends BaseServiceImpl<IcPartyUnitDao, IcPa
         LambdaQueryWrapper<IcPartyUnitEntity> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(IcPartyUnitEntity::getAgencyId, formDTO.getAgencyId());
         wrapper.like(StringUtils.isNotBlank(formDTO.getUnitName()), IcPartyUnitEntity::getUnitName, formDTO.getUnitName());
-        wrapper.eq(StringUtils.isNotBlank(formDTO.getServiceMatter()), IcPartyUnitEntity::getServiceMatter, formDTO.getServiceMatter());
+        wrapper.like(StringUtils.isNotBlank(formDTO.getServiceMatter()), IcPartyUnitEntity::getServiceMatter, formDTO.getServiceMatter());
         wrapper.eq(StringUtils.isNotBlank(formDTO.getType()), IcPartyUnitEntity::getType, formDTO.getType());
         wrapper.like(StringUtils.isNotBlank(formDTO.getContact()), IcPartyUnitEntity::getContact, formDTO.getContact());
         wrapper.like(StringUtils.isNotBlank(formDTO.getContactMobile()), IcPartyUnitEntity::getContactMobile, formDTO.getContactMobile());

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

@@ -18,6 +18,7 @@
 package com.epmet.controller;
 
 import com.epmet.commons.tools.annotation.LoginUser;
+import com.epmet.commons.tools.aop.NoRepeatSubmit;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.ExcelUtils;
@@ -103,6 +104,7 @@ public class IcPartyServiceCenterController {
      * @author zxc
      * @date 2021/11/22 9:13 上午
      */
+    @NoRepeatSubmit
     @PostMapping("addpartyservicecenter")
     public Result addPartyServiceCenter(@RequestBody AddPartyServiceCenterFormDTO formDTO, @LoginUser TokenDto tokenDto){
         ValidatorUtils.validateEntity(formDTO, AddPartyServiceCenterFormDTO.AddPartyServiceCenterForm.class);
@@ -117,6 +119,7 @@ public class IcPartyServiceCenterController {
      * @author zxc
      * @date 2021/11/22 10:21 上午
      */
+    @NoRepeatSubmit
     @PostMapping("editpartyservicecenter")
     public Result editPartyServiceCenter(@RequestBody EditPartyServiceCenterFormDTO formDTO,@LoginUser TokenDto tokenDto){
         ValidatorUtils.validateEntity(formDTO, EditPartyServiceCenterFormDTO.EditPartyServiceCenterForm.class);

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/IcPartymemberStyleController.java

@@ -31,10 +31,12 @@ import com.epmet.modules.partymember.excel.IcPartymemberStyleExcel;
 import com.epmet.modules.partymember.service.IcPartymemberStyleService;
 import com.epmet.resi.partymember.dto.partymember.IcPartymemberStyleDTO;
 import com.epmet.resi.partymember.dto.partymember.form.PartyMemberStyleFormDTO;
+import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.atomic.AtomicInteger;
@@ -84,17 +86,20 @@ public class IcPartymemberStyleController {
 
     @PostMapping("export")
     public void export(@RequestBody PartyMemberStyleFormDTO formDTO, HttpServletResponse response) throws Exception {
-        List<IcPartymemberStyleDTO> list = icPartymemberStyleService.search(formDTO).getList();
+        List<IcPartymemberStyleDTO> list = icPartymemberStyleService.list(formDTO);
+        List<IcPartymemberStyleExcel> result = new ArrayList<>();
         AtomicInteger i = new AtomicInteger(NumConstant.ONE);
-        List<IcPartymemberStyleExcel> result = list.stream().map(item -> {
+        if (CollectionUtils.isNotEmpty(list)) {
-            IcPartymemberStyleExcel excel = new IcPartymemberStyleExcel();
+            result = list.stream().map(item -> {
-            excel.setIndex(i.getAndIncrement());
+                IcPartymemberStyleExcel excel = new IcPartymemberStyleExcel();
-            excel.setGridName(item.getGridName());
+                excel.setIndex(i.getAndIncrement());
-            excel.setName(item.getName());
+                excel.setGridName(item.getGridName());
-            excel.setMainDeed(item.getMainDeed());
+                excel.setName(item.getName());
-            return excel;
+                excel.setMainDeed(item.getMainDeed());
-        }).collect(Collectors.toList());
+                return excel;
-        ExcelUtils.exportExcelToTarget(response, null, list, IcPartymemberStyleExcel.class);
+            }).collect(Collectors.toList());
+        }
+        ExcelUtils.exportExcelToTarget(response, null, result, IcPartymemberStyleExcel.class);
     }
 
     @PostMapping("list")

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/IcPartymemberStyleService.java

@@ -48,12 +48,12 @@ public interface IcPartymemberStyleService extends BaseService<IcPartymemberStyl
     /**
      * 默认查询
      *
-     * @param params
+     * @param formDTO
      * @return java.util.List<IcPartymemberStyleDTO>
      * @author generator
      * @date 2021-11-18
      */
-    List<IcPartymemberStyleDTO> list(Map<String, Object> params);
+    List<IcPartymemberStyleDTO> list(PartyMemberStyleFormDTO formDTO);
 
     /**
      * 单条查询

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartymemberStyleServiceImpl.java

@@ -73,10 +73,22 @@ public class IcPartymemberStyleServiceImpl extends BaseServiceImpl<IcPartymember
     }
 
     @Override
-    public List<IcPartymemberStyleDTO> list(Map<String, Object> params) {
+    public List<IcPartymemberStyleDTO> list(PartyMemberStyleFormDTO formDTO) {
-        List<IcPartymemberStyleEntity> entityList = baseDao.selectList(getWrapper(params));
+        //分页查询
+        LambdaQueryWrapper<IcPartymemberStyleEntity> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(IcPartymemberStyleEntity::getAgencyId, formDTO.getAgencyId());
+        wrapper.eq(StringUtils.isNotBlank(formDTO.getGridId()), IcPartymemberStyleEntity::getGridId, formDTO.getGridId());
+        wrapper.like(StringUtils.isNotBlank(formDTO.getName()), IcPartymemberStyleEntity::getName, formDTO.getName());
+        wrapper.like(StringUtils.isNotBlank(formDTO.getMainDeed()), IcPartymemberStyleEntity::getMainDeed, formDTO.getMainDeed());
+        List<IcPartymemberStyleEntity> list = baseDao.selectList(wrapper);
+        List<IcPartymemberStyleDTO> dtoList = ConvertUtils.sourceToTarget(list, IcPartymemberStyleDTO.class);
+        //设置网格名
+        dtoList.forEach(item -> {
+            GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(item.getGridId());
+            item.setGridName(gridInfo.getGridName());
+        });
 
-        return ConvertUtils.sourceToTarget(entityList, IcPartymemberStyleDTO.class);
+        return dtoList;
     }
 
     private QueryWrapper<IcPartymemberStyleEntity> getWrapper(Map<String, Object> params){