联建单位和活动相关接口

epmet-admin/epmet-admin-client/src/main/java/com/epmet/feign/EpmetAdminOpenFeignClient.java

@@ -6,9 +6,11 @@ import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.result.CorsConfigResultDTO;
 import com.epmet.feign.fallback.EpmetAdminOpenFeignClientFallbackFactory;
 import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 
 import java.util.List;
+import java.util.Map;
 
 @FeignClient(name = ServiceConstant.EPMET_ADMIN_SERVER, fallbackFactory = EpmetAdminOpenFeignClientFallbackFactory.class)
 //@FeignClient(name = ServiceConstant.EPMET_ADMIN_SERVER, fallbackFactory = EpmetAdminOpenFeignClientFallbackFactory.class, url = "localhost:8082")
@@ -72,4 +74,14 @@ public interface EpmetAdminOpenFeignClient {
      */
     @PostMapping("/sys/dict/data/relationship")
     Result<List<OptionResultDTO>> getRelationshipOption();
+
+    /**
+     * 字典数据查询通用接口
+     * @Param dictType
+     * @Return {@link Result<  Map < String, String>>}
+     * @Author zhaoqifeng
+     * @Date 2021/11/19 17:36
+     */
+    @PostMapping("/sys/dict/data/dictMap/{dictType}")
+    Result<Map<String, String>> dictMap(@PathVariable("dictType") String dictType);
 }

epmet-admin/epmet-admin-client/src/main/java/com/epmet/feign/fallback/EpmetAdminOpenFeignClientFallback.java

@@ -6,9 +6,9 @@ import com.epmet.commons.tools.utils.ModuleUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.result.CorsConfigResultDTO;
 import com.epmet.feign.EpmetAdminOpenFeignClient;
-import org.springframework.stereotype.Component;
 
 import java.util.List;
+import java.util.Map;
 
 //@Component
 public class EpmetAdminOpenFeignClientFallback implements EpmetAdminOpenFeignClient {
@@ -41,4 +41,9 @@ public class EpmetAdminOpenFeignClientFallback implements EpmetAdminOpenFeignCli
     public Result<List<OptionResultDTO>> getRelationshipOption() {
         return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "getRelationshipOption", null);
     }
+
+    @Override
+    public Result<Map<String, String>> dictMap(String dictType) {
+        return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "dictMap", dictType);
+    }
 }

epmet-admin/epmet-admin-server/src/main/java/com/epmet/controller/SysDictDataController.java

@@ -150,4 +150,16 @@ public class SysDictDataController {
         return new Result<List<DictListResultDTO>>().ok(sysDictDataService.dictList(formDTO.getDictType()));
     }
 
+    /**
+     * 字典数据查询通用接口
+     * @Param dictType
+     * @Return {@link Result< Map< String, String>>}
+     * @Author zhaoqifeng
+     * @Date 2021/11/19 17:36
+     */
+    @PostMapping("dictMap/{dictType}")
+    public Result<Map<String, String>> dictMap(@PathVariable("dictType") String dictType) {
+        return new Result<Map<String, String>>().ok(sysDictDataService.dictMap(dictType));
+    }
+
 }

epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/SysDictDataService.java

@@ -9,7 +9,6 @@
 package com.epmet.service;
 
 import com.epmet.commons.mybatis.service.BaseService;
-import com.epmet.commons.tools.dto.form.DictListFormDTO;
 import com.epmet.commons.tools.dto.result.DictListResultDTO;
 import com.epmet.commons.tools.dto.result.OptionResultDTO;
 import com.epmet.commons.tools.page.PageData;
@@ -85,4 +84,7 @@ public interface SysDictDataService extends BaseService<SysDictDataEntity> {
      * @Author sun
      */
     List<DictListResultDTO> dictList(String dictType);
+
+
+    Map<String, String> dictMap(String dictType);
 }

epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/impl/SysDictDataServiceImpl.java

@@ -12,7 +12,6 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 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.dto.form.DictListFormDTO;
 import com.epmet.commons.tools.dto.result.DictListResultDTO;
 import com.epmet.commons.tools.dto.result.OptionResultDTO;
 import com.epmet.commons.tools.page.PageData;
@@ -212,4 +211,10 @@ public class SysDictDataServiceImpl extends BaseServiceImpl<SysDictDataDao, SysD
         return resultDTOList;
     }
 
+    @Override
+    public Map<String, String> dictMap(String dictType) {
+        List<DictListResultDTO> resultDTOList = baseDao.selectDictList(dictType);
+        return resultDTOList.stream().collect(Collectors.toMap(DictListResultDTO::getValue, DictListResultDTO::getLabel));
+    }
+
 }

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/DictTypeEnum.java

@@ -0,0 +1,55 @@
+package com.epmet.commons.tools.enums;
+
+/**
+ * @author Administrator
+ */
+public enum DictTypeEnum {
+    /**
+     * 环境变量枚举
+     */
+    UN_KNOWN("un_know", "暂不清楚", 0),
+    NINE_SMALL_PLACES("nine_small_places", "九小场所", 1),
+    EDUCATION("education", "文化程度", 2),
+    NATION("nation", "民族", 3),
+    RELATIONSHIP("relationship", "与户主关系", 4),
+    HOUSE("house", "住房性质", 5),
+    SCALE("scale", "人员规模", 6),
+    PARTY_UNIT_TYPE("party_unit_type", "联建单位分类", 7),
+    GENDER("gender", "性别", 8),
+    ;
+
+    private final String code;
+    private final String name;
+    private final Integer sort;
+
+
+
+    DictTypeEnum(String code, String name, Integer sort) {
+        this.code = code;
+        this.name = name;
+        this.sort = sort;
+    }
+
+        public static DictTypeEnum getEnum(String code) {
+            DictTypeEnum[] values = DictTypeEnum.values();
+        for (DictTypeEnum value : values) {
+            if (value.getCode().equals(code)) {
+                return value;
+            }
+        }
+        return DictTypeEnum.UN_KNOWN;
+    }
+
+
+        public String getCode() {
+        return code;
+    }
+
+        public String getName() {
+        return name;
+    }
+
+        public Integer getSort(){
+        return sort;
+    }
+}

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/IcPartyUnitDTO.java

@@ -17,9 +17,10 @@
 
 package com.epmet.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -48,11 +49,6 @@ public class IcPartyUnitDTO implements Serializable {
      */
 	private String agencyId;
 
-    /**
-     * 网格ID
-     */
-	private String gridId;
-
     /**
      * 
      */

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/PartyUnitFormDTO.java

@@ -0,0 +1,26 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+/**
+ * @Description
+ * @Author zhaoqifeng
+ * @Date 2021/11/19 16:19
+ */
+@NoArgsConstructor
+@Data
+public class PartyUnitFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 1256798619648265622L;
+    private String agencyId;
+    private String unitName;
+    private String serviceMatter;
+    private String type;
+    private String contact;
+    private String contactMobile;
+    private Integer pageNo;
+    private Integer pageSize;
+}

epmet-module/epmet-heart/epmet-heart-server/pom.xml

@@ -82,6 +82,12 @@
             <version>2.0.0</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>com.epmet</groupId>
+            <artifactId>epmet-admin-client</artifactId>
+            <version>2.0.0</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 
     <build>

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

@@ -23,9 +23,10 @@ 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.IcPartyUnitDTO;
+import com.epmet.dto.form.PartyUnitFormDTO;
 import com.epmet.excel.IcPartyUnitExcel;
 import com.epmet.service.IcPartyUnitService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -49,9 +50,9 @@ public class IcPartyUnitController {
     @Autowired
     private IcPartyUnitService icPartyUnitService;
 
-    @GetMapping("page")
+    @GetMapping("list")
-    public Result<PageData<IcPartyUnitDTO>> page(@RequestParam Map<String, Object> params){
+    public Result<PageData<IcPartyUnitDTO>> search(@RequestBody PartyUnitFormDTO formDTO){
-        PageData<IcPartyUnitDTO> page = icPartyUnitService.page(params);
+        PageData<IcPartyUnitDTO> page = icPartyUnitService.search(formDTO);
         return new Result<PageData<IcPartyUnitDTO>>().ok(page);
     }
 

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/IcPartyUnitEntity.java

@@ -48,11 +48,6 @@ public class IcPartyUnitEntity extends BaseEpmetEntity {
      */
 	private String agencyId;
 
-    /**
-     * 网格ID
-     */
-	private String gridId;
-
     /**
      * 
      */

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

@@ -20,6 +20,7 @@ package com.epmet.service;
 import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.dto.IcPartyUnitDTO;
+import com.epmet.dto.form.PartyUnitFormDTO;
 import com.epmet.entity.IcPartyUnitEntity;
 
 import java.util.List;
@@ -36,12 +37,12 @@ public interface IcPartyUnitService extends BaseService<IcPartyUnitEntity> {
     /**
      * 默认分页
      *
-     * @param params
+     * @param formDTO
      * @return PageData<IcPartyUnitDTO>
      * @author generator
      * @date 2021-11-19
      */
-    PageData<IcPartyUnitDTO> page(Map<String, Object> params);
+    PageData<IcPartyUnitDTO> search(PartyUnitFormDTO formDTO);
 
     /**
      * 默认查询

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

@@ -17,22 +17,27 @@
 
 package com.epmet.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 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.enums.DictTypeEnum;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
-import com.epmet.commons.tools.constant.FieldConstant;
+import com.epmet.commons.tools.utils.Result;
 import com.epmet.dao.IcPartyUnitDao;
 import com.epmet.dto.IcPartyUnitDTO;
+import com.epmet.dto.form.PartyUnitFormDTO;
 import com.epmet.entity.IcPartyUnitEntity;
-import com.epmet.redis.IcPartyUnitRedis;
+import com.epmet.feign.EpmetAdminOpenFeignClient;
 import com.epmet.service.IcPartyUnitService;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
 import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import javax.annotation.Resource;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
@@ -46,16 +51,27 @@ import java.util.Map;
 @Service
 public class IcPartyUnitServiceImpl extends BaseServiceImpl<IcPartyUnitDao, IcPartyUnitEntity> implements IcPartyUnitService {
 
-    @Autowired
+    @Resource
-    private IcPartyUnitRedis icPartyUnitRedis;
+    private EpmetAdminOpenFeignClient epmetAdminOpenFeignClient;
 
     @Override
-    public PageData<IcPartyUnitDTO> page(Map<String, Object> params) {
+    public PageData<IcPartyUnitDTO> search(PartyUnitFormDTO formDTO) {
-        IPage<IcPartyUnitEntity> page = baseDao.selectPage(
+        PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize());
-                getPage(params, FieldConstant.CREATED_TIME, false),
+        LambdaQueryWrapper<IcPartyUnitEntity> wrapper = new LambdaQueryWrapper<>();
-                getWrapper(params)
+        wrapper.eq(IcPartyUnitEntity::getAgencyId, formDTO.getAgencyId());
-        );
+        wrapper.like(StringUtils.isNotBlank(formDTO.getUnitName()), IcPartyUnitEntity::getUnitName, formDTO.getUnitName());
-        return getPageData(page, IcPartyUnitDTO.class);
+        wrapper.eq(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());
+        List<IcPartyUnitEntity> list = baseDao.selectList(wrapper);
+        List<IcPartyUnitDTO> dtoList = ConvertUtils.sourceToTarget(list, IcPartyUnitDTO.class);
+        Result<Map<String, String>> unitTypeMap =  epmetAdminOpenFeignClient.dictMap(DictTypeEnum.PARTY_UNIT_TYPE.getCode());
+        dtoList.forEach(item -> {
+            item.setType(unitTypeMap.getData().get(item.getType()));
+        });
+        PageInfo<IcPartyUnitDTO> pageInfo = new PageInfo<>(dtoList);
+        return new PageData<>(dtoList, pageInfo.getTotal());
     }
 
     @Override