Merge branch 'develop' of http://git.elinkit.com.cn:7070/r/epmet-cloud into release_temp

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

@@ -8,6 +8,8 @@
 
 package com.epmet.controller;
 
+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;
 import com.epmet.commons.tools.utils.Result;
@@ -139,5 +141,13 @@ public class SysDictDataController {
         return new Result<List<OptionResultDTO>>().ok(sysDictDataService.getHouseOption());
     }
 
+    /**
+     * @Description 字典数据查询通用接口
+     * @Author sun
+     */
+    @PostMapping("dictlist")
+    public Result<List<DictListResultDTO>> dictList(@RequestBody DictListFormDTO formDTO) {
+        return new Result<List<DictListResultDTO>>().ok(sysDictDataService.dictList(formDTO.getDictType()));
+    }
 
 }

epmet-admin/epmet-admin-server/src/main/java/com/epmet/dao/SysDictDataDao.java

@@ -9,6 +9,7 @@
 package com.epmet.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.commons.tools.dto.result.DictListResultDTO;
 import com.epmet.entity.DictData;
 import com.epmet.entity.SysDictDataEntity;
 import org.apache.ibatis.annotations.Mapper;
@@ -27,4 +28,6 @@ public interface SysDictDataDao extends BaseDao<SysDictDataEntity> {
      * 字典数据列表
      */
     List<DictData> getDictDataList();
+
+    List<DictListResultDTO> selectDictList(String dictType);
 }

epmet-admin/epmet-admin-server/src/main/java/com/epmet/mq/listener/bean/log/LogOperationHelper.java

@@ -57,7 +57,7 @@ public class LogOperationHelper implements ResultDataResolver {
         form.setUserId(userId);
         Result<CustomerStaffDTO> result = userOpenFeignClient.getCustomerStaffInfoByUserId(form);
         CustomerStaffDTO staffInfo = getResultDataOrThrowsException(result, ServiceConstant.EPMET_ADMIN_SERVER, EpmetErrorCode.SERVER_ERROR.getCode(),
-                "调用epmet-user服务获取staff信息发生异常");
+                "调用epmet-user服务获取staff信息发生异常", null);
         return new OperatorInfo(staffInfo.getCustomerId(), staffInfo.getMobile(), staffInfo.getRealName());
     }
 }

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

@@ -9,6 +9,8 @@
 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;
 import com.epmet.dto.SysDictDataDTO;
@@ -77,4 +79,10 @@ public interface SysDictDataService extends BaseService<SysDictDataEntity> {
      * @Date 2021/10/26 17:12
      */
     List<OptionResultDTO> getHouseOption();
+
+    /**
+     * @Description 字典数据查询通用接口
+     * @Author sun
+     */
+    List<DictListResultDTO> dictList(String dictType);
 }

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

@@ -82,7 +82,7 @@ public class LogOperationServiceImpl implements LogOperationService, ResultDataR
         CustomerStaffFormDTO form = new CustomerStaffFormDTO();
         form.setUserIds(new ArrayList<>(userIds));
         Result<List<CustomerStaffDTO>> result = userOpenFeignClient.list(form);
-        List<CustomerStaffDTO> staffs = getResultDataOrThrowsException(result, ServiceConstant.EPMET_USER_SERVER, EpmetErrorCode.SERVER_ERROR.getCode(), "调用user服务发生异常");
+        List<CustomerStaffDTO> staffs = getResultDataOrThrowsException(result, ServiceConstant.EPMET_USER_SERVER, EpmetErrorCode.SERVER_ERROR.getCode(), "调用user服务发生异常", null);
 
         HashMap<String, CustomerStaffDTO> staffMap = new HashMap<>();
         staffs.forEach(s -> {
@@ -103,7 +103,7 @@ public class LogOperationServiceImpl implements LogOperationService, ResultDataR
         form.setCustomerId(customerId);
         form.setMobile(operatorMobile);
         Result<List<CustomerStaffDTO>> result = userOpenFeignClient.list(form);
-        List<CustomerStaffDTO> staffs = getResultDataOrThrowsException(result, ServiceConstant.EPMET_USER_SERVER, EpmetErrorCode.SERVER_ERROR.getCode(), "调用user服务发生异常");
+        List<CustomerStaffDTO> staffs = getResultDataOrThrowsException(result, ServiceConstant.EPMET_USER_SERVER, EpmetErrorCode.SERVER_ERROR.getCode(), "调用user服务发生异常", null);
 
         if (staffs.size() == 0) {
             return null;
@@ -134,7 +134,7 @@ public class LogOperationServiceImpl implements LogOperationService, ResultDataR
         CustomerStaffFormDTO form = new CustomerStaffFormDTO();
         form.setRealName(operatorName);
         Result<List<CustomerStaffDTO>> result = userOpenFeignClient.list(form);
-        List<CustomerStaffDTO> staffs = getResultDataOrThrowsException(result, ServiceConstant.EPMET_USER_SERVER, EpmetErrorCode.SERVER_ERROR.getCode(), "调用user服务查询工作人员信息发生异常");
+        List<CustomerStaffDTO> staffs = getResultDataOrThrowsException(result, ServiceConstant.EPMET_USER_SERVER, EpmetErrorCode.SERVER_ERROR.getCode(), "调用user服务查询工作人员信息发生异常", null);
 
         List<String> userIds = new ArrayList<>();
         HashMap<String, CustomerStaffDTO> staffMap = new HashMap<String, CustomerStaffDTO>();

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

@@ -12,6 +12,8 @@ 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;
 import com.epmet.commons.tools.utils.ConvertUtils;
@@ -200,4 +202,14 @@ public class SysDictDataServiceImpl extends BaseServiceImpl<SysDictDataDao, SysD
         }).collect(Collectors.toList());
     }
 
+    /**
+     * @Description 字典数据查询通用接口
+     * @Author sun
+     */
+    @Override
+    public List<DictListResultDTO> dictList(String dictType) {
+        List<DictListResultDTO> resultDTOList = baseDao.selectDictList(dictType);
+        return resultDTOList;
+    }
+
 }

epmet-admin/epmet-admin-server/src/main/resources/mapper/SysDictDataDao.xml

@@ -7,4 +7,17 @@
         select dict_type_id, dict_label, dict_value from sys_dict_data order by dict_type_id, sort
     </select>
 
+    <select id="selectDictList" resultType="com.epmet.commons.tools.dto.result.DictListResultDTO">
+        SELECT
+            a.dict_label label,
+            a.dict_value `value`
+        FROM
+            sys_dict_data a
+        INNER JOIN sys_dict_type b ON a.dict_type_id = b.id
+        WHERE
+            b.dict_type = #{dictType}
+        ORDER BY
+            a.sort ASC
+    </select>
+
 </mapper>

epmet-auth/src/main/java/com/epmet/controller/IcLoinController.java

@@ -76,7 +76,7 @@ public class IcLoinController implements ResultDataResolver {
 
         // 获取用户信息
         Result<List<CustomerStaffDTO>> staffResult = epmetUserFeignClient.checkCustomerStaff(mobile);
-        List<CustomerStaffDTO> staffList = getResultDataOrThrowsException(staffResult, ServiceConstant.EPMET_USER_SERVER, EpmetErrorCode.SERVER_ERROR.getCode(), "【基层治理平台登录】获取用户信息失败");
+        List<CustomerStaffDTO> staffList = getResultDataOrThrowsException(staffResult, ServiceConstant.EPMET_USER_SERVER, EpmetErrorCode.SERVER_ERROR.getCode(), "【基层治理平台登录】获取用户信息失败", null);
         if (CollectionUtils.isEmpty(staffList)) {
             throw new RenException(EpmetErrorCode.ERR10003.getCode());
         }
@@ -93,7 +93,7 @@ public class IcLoinController implements ResultDataResolver {
         RootOrgListByStaffIdFormDTO orgListForm = new RootOrgListByStaffIdFormDTO();
         orgListForm.setStaffId(staffId);
         Result<List<StaffOrgsResultDTO>> orgListResult = govOrgOpenFeignClient.getStaffOrgListByStaffId(orgListForm);
-        List<StaffOrgsResultDTO> orgs = getResultDataOrThrowsException(orgListResult, ServiceConstant.GOV_ORG_SERVER, EpmetErrorCode.SERVER_ERROR.getCode(), "【基层治理平台登录】根据staffId查询所属客户跟组织列表失败");
+        List<StaffOrgsResultDTO> orgs = getResultDataOrThrowsException(orgListResult, ServiceConstant.GOV_ORG_SERVER, EpmetErrorCode.SERVER_ERROR.getCode(), "【基层治理平台登录】根据staffId查询所属客户跟组织列表失败", null);
 
         // 生成登录票据
         String ticket = UUID.randomUUID().toString().replace("-", "");

epmet-auth/src/main/java/com/epmet/service/impl/IcLoginServiceImpl.java

@@ -65,7 +65,7 @@ public class IcLoginServiceImpl implements IcLoginService, ResultDataResolver {
         String token = this.generateIcToken(staffId, app, client);
 
         Result<CustomerAgencyDTO> agencyResult = govOrgOpenFeignClient.getAgencyById(orgId);
-        CustomerAgencyDTO agencyInfo = getResultDataOrThrowsException(agencyResult, ServiceConstant.GOV_ORG_SERVER, EpmetErrorCode.SERVER_ERROR.getCode(), "【IC平台登录】获取组织信息失败");
+        CustomerAgencyDTO agencyInfo = getResultDataOrThrowsException(agencyResult, ServiceConstant.GOV_ORG_SERVER, EpmetErrorCode.SERVER_ERROR.getCode(), "【IC平台登录】获取组织信息失败", null);
 
         // 2.缓存token
         cacheToken(app, client, staffId, token, orgId, agencyInfo.getCustomerId());

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/StrConstant.java

@@ -75,6 +75,8 @@ public interface StrConstant {
     String STAR="*";
 
     String QUESTION_MARK="?";
+    String QUESTION_MARK_TRANSFER="\\?";
+    String AND_MARK="&";
 
     /**
      * 空字符串

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/dto/form/DictListFormDTO.java

@@ -0,0 +1,20 @@
+package com.epmet.commons.tools.dto.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+
+/**
+ * @Description  字典数据查询-接口入参
+ * @Author sun
+ */
+@Data
+public class DictListFormDTO {
+
+    /**
+     * 字典类型
+     */
+    @NotBlank(message = "字典类型不能为空")
+    private String dictType;
+
+}

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/dto/result/DictListResultDTO.java

@@ -0,0 +1,17 @@
+package com.epmet.commons.tools.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @Description  字典数据查询-接口返参
+ * @Author sun
+ */
+@Data
+public class DictListResultDTO implements Serializable {
+    private static final long serialVersionUID = 8618231166600518980L;
+    private String label;
+    private String value;
+}

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

@@ -0,0 +1,53 @@
+/**
+ * Copyright (c) 2018 人人开源 All rights reserved.
+ *
+ * https://www.renren.io
+ *
+ * 版权所有，侵权必究！
+ */
+
+package com.epmet.commons.tools.enums;
+
+/**
+ * form表单 配置item类型 枚举
+ *
+ * @author Mark sunlightcs@gmail.com
+ * @since 1.0.0
+ */
+public enum FormItemTypeEnum {
+    //枚举类型
+    INPUT("input", "输入框"),
+    RADIO("radio", "单选框"),
+    CHECKBOX("checkbox", "复选框"),
+    SELECT("select", "下拉框"),
+    TEXTAREA("textarea", "文本域"),
+    CASCADER("cascader", "及联"),
+    DATE_PICKER("datepicker", "组织"),
+    UN_KNOWN("un_known", "不支持的类型");
+
+    private String code;
+    private String desc;
+
+    FormItemTypeEnum(String value,String name) {
+        this.code = value;
+        this.desc = name;
+    }
+
+    public static FormItemTypeEnum getEnum(String code) {
+        FormItemTypeEnum[] values = FormItemTypeEnum.values();
+        for (FormItemTypeEnum value : values) {
+            if (value.getCode().equals(code)) {
+                return value;
+            }
+        }
+        return UN_KNOWN;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public String getDesc() {
+        return desc;
+    }
+}

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

@@ -82,6 +82,7 @@ public enum EpmetErrorCode {
 	BUILDING_NAME_EXITED(8215,"楼栋名称已存在"),
 	DOOR_NAME_EXITED(8216,"门牌号已存在"),
 	NEIGHBOOR_NAME_EXITED(8217,"小区名称已存在"),
+	DEMAND_NAME_EXITED(8218, "分类名称已存在"),
 
 	REQUIRE_PERMISSION(8301, "您没有足够的操作权限"),
 	THIRD_PLAT_REQUEST_ERROR(8302, "请求第三方平台错误"),
@@ -222,7 +223,12 @@ public enum EpmetErrorCode {
 
 	ORG_ADD_FAILED(8919,"添加失败"),
 	ORG_EDIT_FAILED(8920,"编辑失败"),
-	ORG_DEL_FAILED(8921,"删除失败");
+	ORG_DEL_FAILED(8921,"删除失败"),
+	//通用的 错误消息自己定义返回
+	OPERATION_FAILED(9999,"网络开小差。。。"),
+	;
+
+
 
 	private int code;
 	private String msg;

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/feign/ResultDataResolver.java

@@ -34,18 +34,19 @@ public interface ResultDataResolver {
      * @return
      * @param targetServiceName 目标service名称
      * @param errorCode 错误码，可以为空，为空则使用上游服务抛出的错误码
-     * @param errorInternalMsg 错误信息，可以为空，为空则使用上游服务抛出的异常信息
+     * @param errorInternalMsg 内部错误信息，可以为空，为空则使用上游服务抛出的异常信息
+     * @param showMsg 展示给前端程序的错误信息，可以为空。为空则根据errorCode给定错误msg信息
      * @author wxz
      * @date 2021.06.07 22:45
      */
-    default <R> R getResultDataOrThrowsException(Result<R> result, String targetServiceName, Integer errorCode, String errorInternalMsg) {
+    default <R> R getResultDataOrThrowsException(Result<R> result, String targetServiceName, Integer errorCode, String errorInternalMsg, String showMsg) {
         if (result == null) {
             throw new RenException(EpmetErrorCode.SERVER_ERROR.getCode(), "调用{}服务发生错误，返回Result为null", targetServiceName);
         }
         if (!result.success()) {
             Integer finalErrorCode = errorCode == null ? result.getCode() : errorCode;
             String finalErrorInternalMsg = StringUtils.isBlank(errorInternalMsg) ? result.getInternalMsg() : errorInternalMsg;
-            throw new RenException(finalErrorCode, finalErrorInternalMsg);
+            throw new RenException(finalErrorCode, finalErrorInternalMsg, showMsg, RenException.MessageMode.CODE_INTERNAL_EXTERNAL);
         }
         return result.getData();
     }

epmet-gateway/src/main/java/com/epmet/config/CorsConfig.java

@@ -117,7 +117,7 @@ class EpmetWebFilter implements WebFilter, ResultDataResolver {
                         adminOpenFeignClient.list(),
                         ServiceConstant.EPMET_ADMIN_SERVER,
                         EpmetErrorCode.SERVER_ERROR.getCode(),
-                        "调用Admin服务查询Cors配置失败");
+                        "调用Admin服务查询Cors配置失败", null);
             } catch (Exception e) {
                 logger.error("调用Admin服务查询Cors配置失败");
             }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/QuestionnaireServiceImpl.java

@@ -73,7 +73,7 @@ public class QuestionnaireServiceImpl implements QuestionnaireService, ResultDat
         CustomerGridFormDTO form = new CustomerGridFormDTO();
         form.setGridId(gridId);
         Result<CustomerGridDTO> gridInfoResult = govOrgOpenFeignClient.getGridBaseInfoByGridId(form);
-        CustomerGridDTO gridInfo = getResultDataOrThrowsException(gridInfoResult, ServiceConstant.GOV_ORG_SERVER, EpmetErrorCode.SERVER_ERROR.getCode(), "【调查问卷】校验访问权限，查询网格信息失败");
+        CustomerGridDTO gridInfo = getResultDataOrThrowsException(gridInfoResult, ServiceConstant.GOV_ORG_SERVER, EpmetErrorCode.SERVER_ERROR.getCode(), "【调查问卷】校验访问权限，查询网格信息失败", null);
         // 网格父级ID列表:网格ID(拼接起来，冒号分割)
         String gridIdPath = gridInfo.getPids().concat(":").concat(gridInfo.getId());
         List<PrPublishRangeEntity> publishRangeEntity = prPublishRangeService.getPublishRangeEntity(projectKey);

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

@@ -0,0 +1,136 @@
+/**
+ * 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;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+
+/**
+ * 社区自组织表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-11-18
+ */
+@Data
+public class IcCommunitySelfOrganizationDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 
+     */
+	private String id;
+
+    /**
+     * 客户ID
+     */
+	private String customerId;
+
+    /**
+     * 组织ID
+     */
+	private String orgId;
+
+    /**
+     * 组织类型，agency：组织，grid：网格
+     */
+	private String orgType;
+
+    /**
+     * 组织ID的父级
+     */
+	private String pid;
+
+    /**
+     * org_id的所有上级
+     */
+	private String pids;
+
+    /**
+     * 组织名称
+     */
+	private String organizationName;
+
+    /**
+     * 组织人数
+     */
+	private Integer organizationPersonCount;
+
+    /**
+     * 负责人姓名
+     */
+	private String principalName;
+
+    /**
+     * 负责人电话
+     */
+	private String principalPhone;
+
+    /**
+     * 服务事项
+     */
+	private String serviceItem;
+
+    /**
+     * 社区自组织创建时间
+     */
+	private Date organizationCreatedTime;
+
+    /**
+     * 经度
+     */
+	private String longitude;
+
+    /**
+     * 纬度
+     */
+	private String latitude;
+
+    /**
+     * 
+     */
+	private Integer delFlag;
+
+    /**
+     * 乐观锁
+     */
+	private String revision;
+
+    /**
+     * 创建人
+     */
+	private String createdBy;
+
+    /**
+     * 创建时间
+     */
+	private Date createdTime;
+
+    /**
+     * 更新人
+     */
+	private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+	private Date updatedTime;
+
+}

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

@@ -0,0 +1,91 @@
+/**
+ * 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;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+
+/**
+ * 社区自组织人员表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-11-18
+ */
+@Data
+public class IcCommunitySelfOrganizationPersonnelDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 
+     */
+	private String id;
+
+    /**
+     * 客户ID
+     */
+	private String customerId;
+
+    /**
+     * 社区自组织ID
+     */
+	private String orgId;
+
+    /**
+     * 人员姓名
+     */
+	private String personName;
+
+    /**
+     * 人员电话
+     */
+	private String personPhone;
+
+    /**
+     * 
+     */
+	private Integer delFlag;
+
+    /**
+     * 乐观锁
+     */
+	private String revision;
+
+    /**
+     * 创建人
+     */
+	private String createdBy;
+
+    /**
+     * 创建时间
+     */
+	private Date createdTime;
+
+    /**
+     * 更新人
+     */
+	private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+	private Date updatedTime;
+
+}

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

@@ -0,0 +1,141 @@
+/**
+ * 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;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+
+/**
+ * 社会组织管理
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-11-18
+ */
+@Data
+public class SocietyOrgDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 唯一标识
+     */
+	private String id;
+
+    /**
+     * 客户Id
+     */
+	private String customerId;
+
+    /**
+     * 组织Id
+     */
+	private String agencyId;
+
+    /**
+     * agency_id的所有上级
+     */
+	private String pids;
+
+    /**
+     * 社会组织名称
+     */
+	private String societyName;
+
+    /**
+     * 服务事项
+     */
+	private String serviceMatters;
+
+    /**
+     * 负责人
+     */
+	private String personInCharge;
+
+    /**
+     * 负责人电话
+     */
+	private String mobile;
+
+    /**
+     * 起始服务时间
+     */
+	private Date serviceStartTime;
+
+    /**
+     * 终止服务时间
+     */
+	private Date serviceEndTime;
+
+    /**
+     * 绑定管理员[组织下录入的工作人员]
+     */
+	private String adminStaffId;
+
+    /**
+     * 地址
+     */
+	private String address;
+
+    /**
+     * 经度
+     */
+	private String longitude;
+
+    /**
+     * 维度
+     */
+	private String dimension;
+
+    /**
+     * 备注
+     */
+	private String remarks;
+
+    /**
+     * 删除标识：0.未删除 1.已删除
+     */
+	private Integer delFlag;
+
+    /**
+     * 乐观锁
+     */
+	private Integer revision;
+
+    /**
+     * 创建人
+     */
+	private String createdBy;
+
+    /**
+     * 创建时间
+     */
+	private Date createdTime;
+
+    /**
+     * 更新人
+     */
+	private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+	private Date updatedTime;
+
+}

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

@@ -0,0 +1,75 @@
+package com.epmet.dto.form;
+
+import com.epmet.dto.IcCommunitySelfOrganizationPersonnelDTO;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @Author zxc
+ * @DateTime 2021/11/18 5:32 下午
+ * @DESC
+ */
+@Data
+public class AddCommunitySelfOrganizationFormDTO implements Serializable {
+
+    private static final long serialVersionUID = -4996925380900678065L;
+
+    public interface AddCommunitySelfOrganizationForm{}
+
+    /**
+     * 组织名称
+     */
+    @NotBlank(message = "organizationName不能为空",groups = AddCommunitySelfOrganizationForm.class)
+    private String organizationName;
+
+    /**
+     * 组织人数
+     */
+    @NotNull(message = "organizationPersonCount不能为空",groups = AddCommunitySelfOrganizationForm.class)
+    private Integer organizationPersonCount;
+
+    /**
+     * 负责人姓名
+     */
+    @NotBlank(message = "principalName不能为空",groups = AddCommunitySelfOrganizationForm.class)
+    private String principalName;
+
+    /**
+     * 负责人电话
+     */
+    @NotBlank(message = "principalPhone不能为空",groups = AddCommunitySelfOrganizationForm.class)
+    private String principalPhone;
+
+    /**
+     * 服务事项
+     */
+    @NotBlank(message = "serviceItem不能为空",groups = AddCommunitySelfOrganizationForm.class)
+    private String serviceItem;
+
+    /**
+     * 社区自组织创建时间
+     */
+    private Date organizationCreatedTime;
+
+    /**
+     * 经度
+     */
+    @NotBlank(message = "longitude不能为空",groups = AddCommunitySelfOrganizationForm.class)
+    private String longitude;
+
+    /**
+     * 纬度
+     */
+    @NotBlank(message = "latitude不能为空",groups = AddCommunitySelfOrganizationForm.class)
+    private String latitude;
+
+    /**
+     * 社区自组织人员
+     */
+    private List<IcCommunitySelfOrganizationPersonnelDTO> organizationPersonnel;
+}

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

@@ -0,0 +1,104 @@
+/**
+ * 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 org.hibernate.validator.constraints.Length;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+import java.util.Date;
+
+
+/**
+ * @Author sun
+ * @Description 新增社会组织
+ **/
+@Data
+public class AddSocietyOrgFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+    /**
+     * 客户Id
+     */
+	private String customerId;
+    /**
+     * 组织Id
+     */
+	private String agencyId;
+    /**
+     * agency_id的所有上级
+     */
+	private String pids;
+    /**
+     * 社会组织名称
+     */
+    @NotBlank(message = "社会组织名称不能为空", groups = { AddSocietyOrgFormDTO.Add.class })
+    @Length(max = 50, message = "社会组织名称不能超过50个字符",groups = {Add.class})
+	private String societyName;
+    /**
+     * 服务事项
+     */
+    @NotBlank(message = "服务事项不能为空", groups = { AddSocietyOrgFormDTO.Add.class })
+    @Length(max = 1000, message = "服务事项不能超过1000个字符",groups = {Add.class})
+	private String serviceMatters;
+    /**
+     * 负责人
+     */
+    @NotBlank(message = "负责人名称不能为空", groups = { AddSocietyOrgFormDTO.Add.class })
+    @Length(max = 20, message = "负责人名称不能超过20个字符",groups = {Add.class})
+	private String personInCharge;
+    /**
+     * 负责人电话
+     */
+    @NotBlank(message = "负责人电话不能为空", groups = { AddSocietyOrgFormDTO.Add.class })
+    @Length(max = 11, message = "负责人电话不能超过11个字符",groups = {Add.class})
+	private String mobile;
+    /**
+     * 起始服务时间
+     */
+    @NotBlank(message = "起始服务时间不能为空", groups = { AddSocietyOrgFormDTO.Add.class })
+	private Date serviceStartTime;
+    /**
+     * 终止服务时间
+     */
+    @NotBlank(message = "终止服务时间不能为空", groups = { AddSocietyOrgFormDTO.Add.class })
+	private Date serviceEndTime;
+    /**
+     * 绑定管理员[组织下录入的工作人员]
+     */
+    @NotBlank(message = "绑定管理员名称不能为空", groups = { AddSocietyOrgFormDTO.Add.class })
+	private String adminStaffId;
+    /**
+     * 地址
+     */
+	private String address;
+    /**
+     * 经度
+     */
+	private String longitude;
+    /**
+     * 维度
+     */
+	private String dimension;
+    //token中userId
+	private String staffId;
+
+    public interface Add {}
+
+}

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

@@ -0,0 +1,92 @@
+/**
+ * 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 org.hibernate.validator.constraints.Length;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+import java.util.Date;
+
+
+/**
+ * @Author sun
+ * @Description 修改、删除社会组织
+ **/
+@Data
+public class EditSocietyOrgFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 社会组织Id
+     */
+    @NotBlank(message = "社会组织Id不能为空", groups = { Edit.class, Del.class })
+	private String societyId;
+    /**
+     * 社会组织名称
+     */
+    @Length(max = 50, message = "社会组织名称不能超过50个字符",groups = {Edit.class})
+	private String societyName;
+    /**
+     * 服务事项
+     */
+    @Length(max = 1000, message = "服务事项不能超过1000个字符",groups = {Edit.class})
+	private String serviceMatters;
+    /**
+     * 负责人
+     */
+    @Length(max = 20, message = "负责人名称不能超过20个字符",groups = {Edit.class})
+	private String personInCharge;
+    /**
+     * 负责人电话
+     */
+    @Length(max = 11, message = "负责人电话不能超过11个字符",groups = {Edit.class})
+	private String mobile;
+    /**
+     * 起始服务时间
+     */
+	private Date serviceStartTime;
+    /**
+     * 终止服务时间
+     */
+	private Date serviceEndTime;
+    /**
+     * 绑定管理员[组织下录入的工作人员]
+     */
+	private String adminStaffId;
+    /**
+     * 地址
+     */
+	private String address;
+    /**
+     * 经度
+     */
+	private String longitude;
+    /**
+     * 维度
+     */
+	private String dimension;
+    //token中userId
+	private String staffId;
+
+    public interface Edit {}
+    public interface Del {}
+
+}

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

@@ -0,0 +1,51 @@
+/**
+ * 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.Min;
+import java.io.Serializable;
+import java.util.Date;
+
+
+/**
+ * @Author sun
+ * @Description 社会组织列表查询
+ **/
+@Data
+public class GetListSocietyOrgFormDTO implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    //社会组织名称
+	private String societyName;
+    //负责人
+	private String personInCharge;
+    //负责人电话
+	private String mobile;
+    //起始服务时间
+	private Date serviceStartTime;
+    //终止服务时间
+	private Date serviceEndTime;
+    //页码
+    @Min(1)
+    private Integer pageNo;
+    //每页多少条
+    private Integer pageSize = 20;
+
+}

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

@@ -0,0 +1,31 @@
+package com.epmet.dto.form.demand;
+
+import com.epmet.commons.tools.validator.group.CustomerClientShowGroup;
+import lombok.Data;
+import org.hibernate.validator.constraints.Length;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+
+@Data
+public class AddCategoryFormDTO implements Serializable {
+    public interface AddUserInternalGroup {
+    }
+
+    public interface AddUserShowGroup extends CustomerClientShowGroup {
+    }
+
+    @NotBlank(message = "客户id不能为空", groups = AddUserInternalGroup.class)
+    private String customerId;
+
+    @NotBlank(message = "分类名称不能为空", groups = AddUserShowGroup.class)
+    @Length(max = 100, message = "分类名称最多输入100字", groups = AddUserShowGroup.class)
+    private String categoryName;
+
+    @NotBlank(message = "请先选择一级分类", groups = AddUserShowGroup.class)
+    private String parentCategoryCode;
+
+    @NotNull(message = "奖励积分不能为空", groups = AddUserShowGroup.class)
+    private Integer awardPoint;
+}

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

@@ -0,0 +1,26 @@
+package com.epmet.dto.form.demand;
+
+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;
+
+@Data
+public class AddFirstCategoryFormDTO implements Serializable {
+    private static final long serialVersionUID = -9011014064624688518L;
+
+    public interface AddUserInternalGroup {
+    }
+
+    public interface AddUserShowGroup extends CustomerClientShowGroup {
+    }
+
+    @NotBlank(message = "客户id不能为空", groups = AddUserInternalGroup.class)
+    private String customerId;
+
+    @NotBlank(message = "分类名称不能为空", groups = AddUserShowGroup.class)
+    @Length(max = 20, message = "一级分类名称最多输入20字", groups = AddUserShowGroup.class)
+    private String categoryName;
+}

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

@@ -0,0 +1,17 @@
+package com.epmet.dto.form.demand;
+
+import com.epmet.commons.tools.dto.form.PageFormDTO;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+@Data
+public class DemandDictPageFormDTO extends PageFormDTO implements Serializable {
+    public interface AddUserInternalGroup {}
+
+    @NotBlank(message = "客户id不能为空",groups = AddUserInternalGroup.class)
+    private  String customerId;
+
+    private String firstCategoryCode;
+}

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

@@ -0,0 +1,20 @@
+package com.epmet.dto.form.demand;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+
+@Data
+public class StatusFormDTO implements Serializable {
+
+    public interface AddUserInternalGroup {
+    }
+
+    @NotBlank(message = "categoryId不能为空", groups = AddUserInternalGroup.class)
+    private String categoryId;
+
+    @NotNull(message = "usableFlag不能为空", groups = AddUserInternalGroup.class)
+    private Boolean usableFlag;
+}

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

@@ -0,0 +1,15 @@
+package com.epmet.dto.form.demand;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+@Data
+public class SubCodeFormDTO implements Serializable {
+    public interface AddUserInternalGroup {}
+    @NotBlank(message = "客户id不能为空",groups = AddUserInternalGroup.class)
+    private  String customerId;
+    @NotBlank(message = "parentCategoryCode不能为空",groups = AddUserInternalGroup.class)
+    private  String parentCategoryCode;
+}

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

@@ -0,0 +1,42 @@
+package com.epmet.dto.form.demand;
+
+import com.epmet.commons.tools.validator.group.CustomerClientShowGroup;
+import lombok.Data;
+import org.hibernate.validator.constraints.Length;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+
+@Data
+public class UpdateFormDTO implements Serializable {
+
+    public interface AddUserInternalGroup {
+    }
+
+    public interface AddUserShowGroup extends CustomerClientShowGroup {
+    }
+
+    public interface First extends CustomerClientShowGroup {
+    }
+
+    public interface Two extends CustomerClientShowGroup {
+    }
+    @NotBlank(message = "客户id不能为空", groups = AddUserInternalGroup.class)
+    private String customerId;
+
+    @NotBlank(message = "categoryId不能为空", groups = AddUserInternalGroup.class)
+    private String categoryId;
+
+    @NotNull(message = "等级不能为空", groups = AddUserInternalGroup.class)
+    private Integer level;
+
+
+    @NotBlank(message = "分类名称不能为空", groups = AddUserShowGroup.class)
+    @Length(max = 100, message = "分类名称最多输入100字", groups = First.class)
+    @Length(max = 20,  message = "分类名称最多输入20字", groups = Two.class)
+    private String categoryName;
+
+    @NotNull(message = "奖励积分不能为空", groups = Two.class)
+    private Integer awardPoint;
+}

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

@@ -0,0 +1,21 @@
+package com.epmet.dto.form.demand;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotEmpty;
+import java.io.Serializable;
+import java.util.Set;
+
+@Data
+public class UserDemandNameQueryFormDTO implements Serializable {
+    private static final long serialVersionUID = 1562457999313501989L;
+
+    public interface AddUserInternalGroup {}
+
+    @NotBlank(message = "客户id不能为空",groups =AddUserInternalGroup.class)
+    private String customerId;
+
+    @NotEmpty(message = "分类编码不能为空",groups =AddUserInternalGroup.class)
+    private Set<String> codeSet;
+}

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

@@ -0,0 +1,69 @@
+/**
+ * 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;
+import java.util.List;
+
+/**
+ * @Author sun
+ * @Description 社会组织列表查询
+ **/
+@Data
+public class GetListSocietyOrgResultDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    //集合总条数
+    private Integer total;
+    //社会组织信息
+    private List<SocietyOrgList> list;
+
+    @Data
+    public class SocietyOrgList{
+        //所属组织Id
+        private String  agencyId;
+        //社会组织Id
+        private String societyId;
+        //社会组织名称
+        private String societyName;
+        //服务事项
+        private String serviceMatters;
+        //负责人姓名
+        private String personInCharge;
+        //负责人电话
+        private String mobile;
+        //起始服务时间
+        private String serviceStartTime;
+        //终止服务时间
+        private String serviceEndTime;
+        //绑定管理员[组织下Id录入的工作人员]
+        private String adminStaffId;
+        //绑定管理员[组织下录入的工作人员]姓名
+        private String adminStaffName;
+        //地址
+        private String address;
+        //经度
+        private String longitude;
+        //维度
+        private String dimension;
+    }
+
+}

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/demand/DemandPageResDTO.java

@@ -0,0 +1,21 @@
+package com.epmet.dto.result.demand;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.List;
+
+@Data
+public class DemandPageResDTO implements Serializable {
+    private String customerId;
+    private String categoryId;
+    private String categoryCode;
+    private String parentCategoryCode;
+    private String categoryName;
+    private Integer level;
+    private Integer sort;
+    private BigDecimal awardPoint;
+    private Boolean usableFlag;
+    private List<DemandPageResDTO> children;
+}

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/demand/OptionDTO.java

@@ -0,0 +1,12 @@
+package com.epmet.dto.result.demand;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class OptionDTO implements Serializable {
+    private static final long serialVersionUID = -6722370308097497466L;
+    private String label;
+    private String value;
+}

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/feign/EpmetHeartOpenFeignClient.java

@@ -5,7 +5,7 @@ import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.ActInfoDTO;
 import com.epmet.dto.VolunteerInfoDTO;
 import com.epmet.dto.form.CommonCustomerFormDTO;
-import com.epmet.feign.fallback.EpmetHeartOpenFeignClientFallback;
+import com.epmet.dto.form.demand.UserDemandNameQueryFormDTO;
 import com.epmet.feign.fallback.EpmetHeartOpenFeignClientFallbackFactory;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -53,4 +53,7 @@ public interface EpmetHeartOpenFeignClient {
      **/
     @PostMapping("/heart/resi/volunteer/queryuservolunteerinfo/{userId}")
     Result<VolunteerInfoDTO> queryUserVolunteerInfo(@PathVariable("userId") String userId);
+
+    @PostMapping("/heart/icresidemanddict/demangnames")
+    Result<String> queryDemandNames(@RequestBody UserDemandNameQueryFormDTO formDTO);
 }

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/feign/fallback/EpmetHeartOpenFeignClientFallback.java

@@ -6,8 +6,8 @@ import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.ActInfoDTO;
 import com.epmet.dto.VolunteerInfoDTO;
 import com.epmet.dto.form.CommonCustomerFormDTO;
+import com.epmet.dto.form.demand.UserDemandNameQueryFormDTO;
 import com.epmet.feign.EpmetHeartOpenFeignClient;
-import org.springframework.stereotype.Component;
 
 import java.util.List;
 
@@ -48,4 +48,9 @@ public class EpmetHeartOpenFeignClientFallback implements EpmetHeartOpenFeignCli
     public Result<VolunteerInfoDTO> queryUserVolunteerInfo(String userId) {
         return ModuleUtils.feignConError(ServiceConstant.EPMET_HEART_SERVER, "queryUserVolunteerInfo", userId);
     }
+
+    @Override
+    public Result<String> queryDemandNames(UserDemandNameQueryFormDTO formDTO) {
+        return ModuleUtils.feignConError(ServiceConstant.EPMET_HEART_SERVER, "queryDemandNames", formDTO);
+    }
 }

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/constant/IcCommunitySelfOrganizationConstant.java

@@ -0,0 +1,11 @@
+package com.epmet.constant;
+
+/**
+ * @Author zxc
+ * @DateTime 2021/11/19 8:39 上午
+ * @DESC
+ */
+public interface IcCommunitySelfOrganizationConstant {
+
+    String ORG_TYPE_AGENCY = "agency";
+}

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

@@ -0,0 +1,112 @@
+/**
+ * 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.controller;
+
+import com.epmet.commons.tools.annotation.LoginUser;
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.security.dto.TokenDto;
+import com.epmet.commons.tools.utils.ConvertUtils;
+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.dto.IcCommunitySelfOrganizationDTO;
+import com.epmet.dto.form.AddCommunitySelfOrganizationFormDTO;
+import com.epmet.excel.IcCommunitySelfOrganizationExcel;
+import com.epmet.service.IcCommunitySelfOrganizationService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * 社区自组织表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-11-18
+ */
+@RestController
+@RequestMapping("iccommunityselforganization")
+public class IcCommunitySelfOrganizationController {
+
+    @Autowired
+    private IcCommunitySelfOrganizationService icCommunitySelfOrganizationService;
+
+    @GetMapping("page")
+    public Result<PageData<IcCommunitySelfOrganizationDTO>> page(@RequestParam Map<String, Object> params){
+        PageData<IcCommunitySelfOrganizationDTO> page = icCommunitySelfOrganizationService.page(params);
+        return new Result<PageData<IcCommunitySelfOrganizationDTO>>().ok(page);
+    }
+
+    @GetMapping("{id}")
+    public Result<IcCommunitySelfOrganizationDTO> get(@PathVariable("id") String id){
+        IcCommunitySelfOrganizationDTO data = icCommunitySelfOrganizationService.get(id);
+        return new Result<IcCommunitySelfOrganizationDTO>().ok(data);
+    }
+
+    @PostMapping
+    public Result save(@RequestBody IcCommunitySelfOrganizationDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+        icCommunitySelfOrganizationService.save(dto);
+        return new Result();
+    }
+
+    @PutMapping
+    public Result update(@RequestBody IcCommunitySelfOrganizationDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+        icCommunitySelfOrganizationService.update(dto);
+        return new Result();
+    }
+
+    @DeleteMapping
+    public Result delete(@RequestBody String[] ids){
+        //效验数据
+        AssertUtils.isArrayEmpty(ids, "id");
+        icCommunitySelfOrganizationService.delete(ids);
+        return new Result();
+    }
+
+    @GetMapping("export")
+    public void export(@RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
+        List<IcCommunitySelfOrganizationDTO> list = icCommunitySelfOrganizationService.list(params);
+        ExcelUtils.exportExcelToTarget(response, null, list, IcCommunitySelfOrganizationExcel.class);
+    }
+
+    /**
+     * @Description  添加社区自组织
+     * @param tokenDto
+     * @param formDTO
+     * @author zxc
+     * @date 2021/11/19 8:33 上午
+     */
+    @PostMapping("addcommunityselforganization")
+    public Result addCommunitySelfOrganization(@LoginUser TokenDto tokenDto, @RequestBody AddCommunitySelfOrganizationFormDTO formDTO){
+        ValidatorUtils.validateEntity(formDTO, AddCommunitySelfOrganizationFormDTO.AddCommunitySelfOrganizationForm.class);
+        icCommunitySelfOrganizationService.addCommunitySelfOrganization(tokenDto, formDTO);
+        return new Result();
+    }
+
+}

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

@@ -0,0 +1,94 @@
+/**
+ * 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.controller;
+
+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.dto.IcCommunitySelfOrganizationPersonnelDTO;
+import com.epmet.excel.IcCommunitySelfOrganizationPersonnelExcel;
+import com.epmet.service.IcCommunitySelfOrganizationPersonnelService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * 社区自组织人员表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-11-18
+ */
+@RestController
+@RequestMapping("iccommunityselforganizationpersonnel")
+public class IcCommunitySelfOrganizationPersonnelController {
+    
+    @Autowired
+    private IcCommunitySelfOrganizationPersonnelService icCommunitySelfOrganizationPersonnelService;
+
+    @GetMapping("page")
+    public Result<PageData<IcCommunitySelfOrganizationPersonnelDTO>> page(@RequestParam Map<String, Object> params){
+        PageData<IcCommunitySelfOrganizationPersonnelDTO> page = icCommunitySelfOrganizationPersonnelService.page(params);
+        return new Result<PageData<IcCommunitySelfOrganizationPersonnelDTO>>().ok(page);
+    }
+
+    @GetMapping("{id}")
+    public Result<IcCommunitySelfOrganizationPersonnelDTO> get(@PathVariable("id") String id){
+        IcCommunitySelfOrganizationPersonnelDTO data = icCommunitySelfOrganizationPersonnelService.get(id);
+        return new Result<IcCommunitySelfOrganizationPersonnelDTO>().ok(data);
+    }
+
+    @PostMapping
+    public Result save(@RequestBody IcCommunitySelfOrganizationPersonnelDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+        icCommunitySelfOrganizationPersonnelService.save(dto);
+        return new Result();
+    }
+
+    @PutMapping
+    public Result update(@RequestBody IcCommunitySelfOrganizationPersonnelDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+        icCommunitySelfOrganizationPersonnelService.update(dto);
+        return new Result();
+    }
+
+    @DeleteMapping
+    public Result delete(@RequestBody String[] ids){
+        //效验数据
+        AssertUtils.isArrayEmpty(ids, "id");
+        icCommunitySelfOrganizationPersonnelService.delete(ids);
+        return new Result();
+    }
+
+    @GetMapping("export")
+    public void export(@RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
+        List<IcCommunitySelfOrganizationPersonnelDTO> list = icCommunitySelfOrganizationPersonnelService.list(params);
+        ExcelUtils.exportExcelToTarget(response, null, list, IcCommunitySelfOrganizationPersonnelExcel.class);
+    }
+
+}

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

@@ -0,0 +1,180 @@
+/**
+ * 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.controller;
+
+import com.epmet.commons.tools.annotation.LoginUser;
+import com.epmet.commons.tools.constant.NumConstant;
+import com.epmet.commons.tools.dto.form.PageFormDTO;
+import com.epmet.commons.tools.dto.result.OptionResultDTO;
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.security.dto.TokenDto;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.commons.tools.validator.AssertUtils;
+import com.epmet.commons.tools.validator.ValidatorUtils;
+import com.epmet.dto.form.demand.*;
+import com.epmet.dto.result.demand.DemandPageResDTO;
+import com.epmet.dto.result.demand.OptionDTO;
+import com.epmet.service.IcResiDemandDictService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+
+/**
+ * 居民需求字典表 
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-10-27
+ */
+@RestController
+@RequestMapping("icresidemanddict")
+public class IcResiDemandDictController {
+    
+    @Autowired
+    private IcResiDemandDictService icResiDemandDictService;
+
+    /**
+     * 分页列表查询
+     *
+     * @param formDTO
+     * @return
+     */
+    @PostMapping("pagelist")
+    public Result<PageData<DemandPageResDTO>> page(@RequestBody DemandDictPageFormDTO formDTO){
+        ValidatorUtils.validateEntity(formDTO,DemandDictPageFormDTO.AddUserInternalGroup.class, PageFormDTO.AddUserInternalGroup.class);
+        PageData<DemandPageResDTO> page = icResiDemandDictService.page(formDTO);
+        return new Result<PageData<DemandPageResDTO>>().ok(page);
+    }
+
+    /**
+     * 添加一级分类
+     * @param formDTO
+     * @return
+     */
+    @PostMapping("addfirst")
+    public Result addFirstCategory(@RequestBody AddFirstCategoryFormDTO formDTO){
+        ValidatorUtils.validateEntity(formDTO,AddFirstCategoryFormDTO.AddUserShowGroup.class,AddFirstCategoryFormDTO.AddUserInternalGroup.class);
+        icResiDemandDictService.addFirstCategory(formDTO);
+        return new Result();
+    }
+
+    /**
+     * 新增二级分类
+     * @param formDTO
+     * @return
+     */
+    @PostMapping("addchild")
+    public Result addChild(@RequestBody AddCategoryFormDTO formDTO ){
+        ValidatorUtils.validateEntity(formDTO,AddCategoryFormDTO.AddUserShowGroup.class,AddCategoryFormDTO.AddUserInternalGroup.class);
+        icResiDemandDictService.addChild(formDTO);
+        return new Result();
+    }
+
+    /**
+     * 修改分类
+     *
+     *
+     * @param formDTO
+     * @return
+     */
+    @PostMapping("update")
+    public Result update(@RequestBody UpdateFormDTO formDTO) {
+        //效验数据
+        ValidatorUtils.validateEntity(formDTO, UpdateFormDTO.AddUserInternalGroup.class, UpdateFormDTO.AddUserShowGroup.class);
+        if (NumConstant.ONE == formDTO.getLevel()) {
+            ValidatorUtils.validateEntity(formDTO, UpdateFormDTO.First.class);
+        } else if (NumConstant.TWO == formDTO.getLevel()) {
+            ValidatorUtils.validateEntity(formDTO, UpdateFormDTO.Two.class);
+        }
+        icResiDemandDictService.update(formDTO);
+        return new Result();
+    }
+
+    /**
+     * 启用或禁用
+     *
+     * @param formDTO
+     * @return
+     */
+    @PostMapping("updatestatus")
+    public Result updateStatus(@RequestBody  StatusFormDTO formDTO){
+        ValidatorUtils.validateEntity(formDTO,StatusFormDTO.AddUserInternalGroup.class);
+        icResiDemandDictService.updateStatus(formDTO);
+        return new Result();
+    }
+
+    @DeleteMapping
+    public Result delete(@RequestBody String[] ids){
+        //效验数据
+        AssertUtils.isArrayEmpty(ids, "id");
+        icResiDemandDictService.delete(ids);
+        return new Result();
+    }
+
+    @PostMapping("demandoption")
+    public Result<List<OptionResultDTO>> getDemandOptions(@LoginUser TokenDto tokenDto) {
+        return new Result<List<OptionResultDTO>>().ok(icResiDemandDictService.getDemandOptions(tokenDto.getCustomerId()));
+    }
+
+
+    /**
+     * 居民信息列表需要展示分类名称，单独开出来这个接口，供user查询
+     * @param formDTO
+     * @return
+     */
+    @PostMapping("demangnames")
+    public Result<String> queryDemandNames(@RequestBody UserDemandNameQueryFormDTO formDTO){
+        ValidatorUtils.validateEntity(formDTO,UserDemandNameQueryFormDTO.AddUserInternalGroup.class);
+        return icResiDemandDictService.queryDemandNames(formDTO);
+    }
+
+    /**
+     * 居民需求查询条件：一级分类列表 0
+     * 区域化党建单位：服务事项下拉框 1010
+     *
+     * @param tokenDto
+     * @param formDTO
+     * @return
+     */
+    @PostMapping("subcodelist")
+    public Result<List<OptionDTO>> querySubCodeList(@LoginUser TokenDto tokenDto, @RequestBody SubCodeFormDTO formDTO){
+        formDTO.setCustomerId(tokenDto.getCustomerId());
+        ValidatorUtils.validateEntity(formDTO,SubCodeFormDTO.AddUserInternalGroup.class);
+        return new Result<List<OptionDTO>>().ok(icResiDemandDictService.querySubCodeList(formDTO));
+    }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+}

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

@@ -0,0 +1,93 @@
+/**
+ * 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.controller;
+
+import com.epmet.commons.tools.annotation.LoginUser;
+import com.epmet.commons.tools.security.dto.TokenDto;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.commons.tools.validator.ValidatorUtils;
+import com.epmet.dto.form.AddSocietyOrgFormDTO;
+import com.epmet.dto.form.EditSocietyOrgFormDTO;
+import com.epmet.dto.form.GetListSocietyOrgFormDTO;
+import com.epmet.dto.result.GetListSocietyOrgResultDTO;
+import com.epmet.service.SocietyOrgService;
+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;
+
+
+/**
+ * 社会组织管理
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-11-18
+ */
+@RestController
+@RequestMapping("societyorg")
+public class SocietyOrgController {
+
+    @Autowired
+    private SocietyOrgService societyOrgService;
+
+    /**
+     * @Author sun
+     * @Description 新增社会组织
+     **/
+    @PostMapping("add")
+    public Result add(@LoginUser TokenDto tokenDto, @RequestBody AddSocietyOrgFormDTO formDTO) {
+        ValidatorUtils.validateEntity(formDTO, AddSocietyOrgFormDTO.Add.class);
+        formDTO.setCustomerId(tokenDto.getToken());
+        formDTO.setStaffId(tokenDto.getUserId());
+        societyOrgService.add(formDTO);
+        return new Result();
+    }
+
+    /**
+     * @Author sun
+     * @Description 修改社会组织
+     **/
+    @PostMapping("edit")
+    public Result edit(@LoginUser TokenDto tokenDto, @RequestBody EditSocietyOrgFormDTO formDTO) {
+        ValidatorUtils.validateEntity(formDTO, EditSocietyOrgFormDTO.Edit.class);
+        societyOrgService.edit(formDTO);
+        return new Result();
+    }
+
+    /**
+     * @Author sun
+     * @Description 删除社会组织
+     **/
+    @PostMapping("del")
+    public Result del(@LoginUser TokenDto tokenDto, @RequestBody EditSocietyOrgFormDTO formDTO) {
+        ValidatorUtils.validateEntity(formDTO, EditSocietyOrgFormDTO.Del.class);
+        societyOrgService.del(formDTO.getSocietyId());
+        return new Result();
+    }
+
+    /**
+     * @Author sun
+     * @Description 社会组织列表查询
+     **/
+    @PostMapping("getlist")
+    public Result<GetListSocietyOrgResultDTO> getList(@LoginUser TokenDto tokenDto, @RequestBody GetListSocietyOrgFormDTO formDTO) {
+        return new Result<GetListSocietyOrgResultDTO>().ok(societyOrgService.getList(formDTO));
+    }
+
+}

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/IcCommunitySelfOrganizationDao.java

@@ -0,0 +1,33 @@
+/**
+ * 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.dao;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.entity.IcCommunitySelfOrganizationEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 社区自组织表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-11-18
+ */
+@Mapper
+public interface IcCommunitySelfOrganizationDao extends BaseDao<IcCommunitySelfOrganizationEntity> {
+	
+}

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/IcCommunitySelfOrganizationPersonnelDao.java

@@ -0,0 +1,33 @@
+/**
+ * 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.dao;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.entity.IcCommunitySelfOrganizationPersonnelEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 社区自组织人员表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-11-18
+ */
+@Mapper
+public interface IcCommunitySelfOrganizationPersonnelDao extends BaseDao<IcCommunitySelfOrganizationPersonnelEntity> {
+	
+}

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/IcResiDemandDictDao.java

@@ -0,0 +1,63 @@
+/**
+ * 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.dao;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.commons.tools.dto.result.OptionResultDTO;
+import com.epmet.dto.result.demand.DemandPageResDTO;
+import com.epmet.dto.result.demand.OptionDTO;
+import com.epmet.entity.IcResiDemandDictEntity;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Set;
+
+/**
+ * 居民需求字典表 
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-10-27
+ */
+@Mapper
+public interface IcResiDemandDictDao extends BaseDao<IcResiDemandDictEntity> {
+    List<OptionResultDTO> selectDemandOptions(@Param("customerId") String customerId);
+    List<OptionResultDTO> selectChildDemands(@Param("customerId")String customerId, @Param("parentCode") String parentCode);
+
+    String selectCategoryNames(@Param("customerId") String customerId,@Param("codeSet") Set<String> codeSet);
+
+    List<OptionDTO> selectByPCode(@Param("pcode") String pcode, @Param("customerId") String customerId);
+
+    List<DemandPageResDTO> pageSelect(@Param("customerId") String customerId, @Param("firstCategoryCode")String firstCategoryCode);
+
+    List<DemandPageResDTO> selectChild(@Param("customerId") String customerId, @Param("parentCode")String parentCode);
+
+    int selectCountName(@Param("customerId") String customerId,
+                        @Param("categoryName")String categoryName,
+                        @Param("level")int level,
+                        @Param("parentCode")String parentCode,
+                        @Param("id")String id);
+
+    Integer selectMaxCategoryCode(@Param("customerId") String customerId,
+                                  @Param("level") Integer level,
+                                  @Param("parentCode") String parentCode);
+
+    Integer selectMaxSort(@Param("customerId") String customerId,
+                          @Param("level") int level,
+                          @Param("parentCode") String parentCode);
+}

epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiDemandDictDao.java → epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/SocietyOrgDao.java

@@ -18,21 +18,26 @@
 package com.epmet.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
-import com.epmet.commons.tools.dto.result.OptionResultDTO;
+import com.epmet.dto.form.GetListSocietyOrgFormDTO;
-import com.epmet.entity.IcResiDemandDictEntity;
+import com.epmet.dto.result.GetListSocietyOrgResultDTO;
+import com.epmet.entity.SocietyOrgEntity;
 import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
 /**
- * 居民需求字典表 
+ * 社会组织管理
  *
  * @author generator generator@elink-cn.com
- * @since v1.0.0 2021-10-27
+ * @since v1.0.0 2021-11-18
  */
 @Mapper
-public interface IcResiDemandDictDao extends BaseDao<IcResiDemandDictEntity> {
+public interface SocietyOrgDao extends BaseDao<SocietyOrgEntity> {
-    List<OptionResultDTO> selectDemandOptions(@Param("customerId") String customerId);
+
-    List<OptionResultDTO> selectChildDemands(@Param("customerId")String customerId, @Param("parentCode") String parentCode);
+    /**
+     * @Author sun
+     * @Description 社会组织列表查询
+     **/
+    List<GetListSocietyOrgResultDTO.SocietyOrgList> getList(GetListSocietyOrgFormDTO formDTO);
+
 }

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

@@ -0,0 +1,109 @@
+/**
+ * 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.entity;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+/**
+ * 社区自组织表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-11-18
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("ic_community_self_organization")
+public class IcCommunitySelfOrganizationEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 客户ID
+     */
+	private String customerId;
+
+    /**
+     * 组织ID
+     */
+	private String orgId;
+
+    /**
+     * 组织类型，agency：组织，grid：网格
+     */
+	private String orgType;
+
+    /**
+     * 组织ID的父级
+     */
+	private String pid;
+
+    /**
+     * org_id的所有上级
+     */
+	private String pids;
+
+    /**
+     * 组织名称
+     */
+	private String organizationName;
+
+    /**
+     * 组织人数
+     */
+	private Integer organizationPersonCount;
+
+    /**
+     * 负责人姓名
+     */
+	private String principalName;
+
+    /**
+     * 负责人电话
+     */
+	private String principalPhone;
+
+    /**
+     * 服务事项
+     */
+	private String serviceItem;
+
+    /**
+     * 社区自组织创建时间
+     */
+    private Date organizationCreatedTime;
+
+    /**
+     * 经度
+     */
+	private String longitude;
+
+    /**
+     * 纬度
+     */
+	private String latitude;
+
+}

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

@@ -0,0 +1,61 @@
+/**
+ * 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.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+/**
+ * 社区自组织人员表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-11-18
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("ic_community_self_organization_personnel")
+public class IcCommunitySelfOrganizationPersonnelEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 客户ID
+     */
+	private String customerId;
+
+    /**
+     * 社区自组织ID
+     */
+	private String orgId;
+
+    /**
+     * 人员姓名
+     */
+	private String personName;
+
+    /**
+     * 人员电话
+     */
+	private String personPhone;
+
+}

epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcResiDemandDictEntity.java → epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/IcResiDemandDictEntity.java

@@ -58,7 +58,7 @@ public class IcResiDemandDictEntity extends BaseEpmetEntity {
 	/**
 	 * 级别
 	 */
-	private String level;
+	private Integer level;
 
     /**
      * 备注
@@ -70,4 +70,13 @@ public class IcResiDemandDictEntity extends BaseEpmetEntity {
      */
 	private Integer sort;
 
+	/**
+	 * 奖励积分：只有二级分类才会配置，一级默认为0。11.17
+	 */
+	private Integer awardPoint;
+
+	/**
+	 * 1可用，0不可用,11.17
+	 */
+	private Boolean usableFlag;
 }

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

@@ -0,0 +1,111 @@
+/**
+ * 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.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+/**
+ * 社会组织管理
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-11-18
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("society_org")
+public class SocietyOrgEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 客户Id
+     */
+	private String customerId;
+
+    /**
+     * 组织Id
+     */
+	private String agencyId;
+
+    /**
+     * agency_id的所有上级
+     */
+	private String pids;
+
+    /**
+     * 社会组织名称
+     */
+	private String societyName;
+
+    /**
+     * 服务事项
+     */
+	private String serviceMatters;
+
+    /**
+     * 负责人
+     */
+	private String personInCharge;
+
+    /**
+     * 负责人电话
+     */
+	private String mobile;
+
+    /**
+     * 起始服务时间
+     */
+	private Date serviceStartTime;
+
+    /**
+     * 终止服务时间
+     */
+	private Date serviceEndTime;
+
+    /**
+     * 绑定管理员[组织下录入的工作人员]
+     */
+	private String adminStaffId;
+
+    /**
+     * 地址
+     */
+	private String address;
+
+    /**
+     * 经度
+     */
+	private String longitude;
+
+    /**
+     * 维度
+     */
+	private String dimension;
+
+    /**
+     * 备注
+     */
+	private String remarks;
+
+}

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/excel/IcCommunitySelfOrganizationExcel.java

@@ -0,0 +1,95 @@
+/**
+ * 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.excel;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 社区自组织表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-11-18
+ */
+@Data
+public class IcCommunitySelfOrganizationExcel {
+
+    @Excel(name = "")
+    private String id;
+
+    @Excel(name = "客户ID")
+    private String customerId;
+
+    @Excel(name = "组织ID")
+    private String orgId;
+
+    @Excel(name = "组织类型，agency：组织，grid：网格")
+    private String orgType;
+
+    @Excel(name = "组织ID的父级")
+    private String pid;
+
+    @Excel(name = "org_id的所有上级")
+    private String pids;
+
+    @Excel(name = "组织名称")
+    private String organizationName;
+
+    @Excel(name = "组织人数")
+    private Integer organizationPersonCount;
+
+    @Excel(name = "负责人姓名")
+    private String principalName;
+
+    @Excel(name = "负责人电话")
+    private String principalPhone;
+
+    @Excel(name = "服务事项")
+    private String serviceItem;
+
+    @Excel(name = "社区自组织创建时间")
+    private Date organizationCreatedTime;
+
+    @Excel(name = "经度")
+    private String longitude;
+
+    @Excel(name = "纬度")
+    private String latitude;
+
+    @Excel(name = "")
+    private Integer delFlag;
+
+    @Excel(name = "乐观锁")
+    private String revision;
+
+    @Excel(name = "创建人")
+    private String createdBy;
+
+    @Excel(name = "创建时间")
+    private Date createdTime;
+
+    @Excel(name = "更新人")
+    private String updatedBy;
+
+    @Excel(name = "更新时间")
+    private Date updatedTime;
+
+
+}

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/excel/IcCommunitySelfOrganizationPersonnelExcel.java

@@ -0,0 +1,68 @@
+/**
+ * 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.excel;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 社区自组织人员表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-11-18
+ */
+@Data
+public class IcCommunitySelfOrganizationPersonnelExcel {
+
+    @Excel(name = "")
+    private String id;
+
+    @Excel(name = "客户ID")
+    private String customerId;
+
+    @Excel(name = "社区自组织ID")
+    private String orgId;
+
+    @Excel(name = "人员姓名")
+    private String personName;
+
+    @Excel(name = "人员电话")
+    private String personIphone;
+
+    @Excel(name = "")
+    private Integer delFlag;
+
+    @Excel(name = "乐观锁")
+    private String revision;
+
+    @Excel(name = "创建人")
+    private String createdBy;
+
+    @Excel(name = "创建时间")
+    private Date createdTime;
+
+    @Excel(name = "更新人")
+    private String updatedBy;
+
+    @Excel(name = "更新时间")
+    private Date updatedTime;
+
+
+}

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/excel/SocietyOrgExcel.java

@@ -0,0 +1,98 @@
+/**
+ * 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.excel;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 社会组织管理
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-11-18
+ */
+@Data
+public class SocietyOrgExcel {
+
+    @Excel(name = "唯一标识")
+    private String id;
+
+    @Excel(name = "客户Id")
+    private String customerId;
+
+    @Excel(name = "组织Id")
+    private String agencyId;
+
+    @Excel(name = "agency_id的所有上级")
+    private String pids;
+
+    @Excel(name = "社会组织名称")
+    private String societyName;
+
+    @Excel(name = "服务事项")
+    private String serviceMatters;
+
+    @Excel(name = "负责人")
+    private String personInCharge;
+
+    @Excel(name = "负责人电话")
+    private String mobile;
+
+    @Excel(name = "起始服务时间")
+    private Date serviceStartTime;
+
+    @Excel(name = "终止服务时间")
+    private Date serviceEndTime;
+
+    @Excel(name = "绑定管理员[组织下录入的工作人员]")
+    private String adminStaffId;
+
+    @Excel(name = "地址")
+    private String address;
+
+    @Excel(name = "经度")
+    private String longitude;
+
+    @Excel(name = "维度")
+    private String dimension;
+
+    @Excel(name = "备注")
+    private String remarks;
+
+    @Excel(name = "删除标识：0.未删除 1.已删除")
+    private Integer delFlag;
+
+    @Excel(name = "乐观锁")
+    private Integer revision;
+
+    @Excel(name = "创建人")
+    private String createdBy;
+
+    @Excel(name = "创建时间")
+    private Date createdTime;
+
+    @Excel(name = "更新人")
+    private String updatedBy;
+
+    @Excel(name = "更新时间")
+    private Date updatedTime;
+
+
+}

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

@@ -0,0 +1,95 @@
+/**
+ * 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.service;
+
+import com.epmet.commons.mybatis.service.BaseService;
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.dto.IcCommunitySelfOrganizationPersonnelDTO;
+import com.epmet.entity.IcCommunitySelfOrganizationPersonnelEntity;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 社区自组织人员表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-11-18
+ */
+public interface IcCommunitySelfOrganizationPersonnelService extends BaseService<IcCommunitySelfOrganizationPersonnelEntity> {
+
+    /**
+     * 默认分页
+     *
+     * @param params
+     * @return PageData<IcCommunitySelfOrganizationPersonnelDTO>
+     * @author generator
+     * @date 2021-11-18
+     */
+    PageData<IcCommunitySelfOrganizationPersonnelDTO> page(Map<String, Object> params);
+
+    /**
+     * 默认查询
+     *
+     * @param params
+     * @return java.util.List<IcCommunitySelfOrganizationPersonnelDTO>
+     * @author generator
+     * @date 2021-11-18
+     */
+    List<IcCommunitySelfOrganizationPersonnelDTO> list(Map<String, Object> params);
+
+    /**
+     * 单条查询
+     *
+     * @param id
+     * @return IcCommunitySelfOrganizationPersonnelDTO
+     * @author generator
+     * @date 2021-11-18
+     */
+    IcCommunitySelfOrganizationPersonnelDTO get(String id);
+
+    /**
+     * 默认保存
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2021-11-18
+     */
+    void save(IcCommunitySelfOrganizationPersonnelDTO dto);
+
+    /**
+     * 默认更新
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2021-11-18
+     */
+    void update(IcCommunitySelfOrganizationPersonnelDTO dto);
+
+    /**
+     * 批量删除
+     *
+     * @param ids
+     * @return void
+     * @author generator
+     * @date 2021-11-18
+     */
+    void delete(String[] ids);
+}

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

@@ -0,0 +1,106 @@
+/**
+ * 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.service;
+
+import com.epmet.commons.mybatis.service.BaseService;
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.security.dto.TokenDto;
+import com.epmet.dto.IcCommunitySelfOrganizationDTO;
+import com.epmet.dto.form.AddCommunitySelfOrganizationFormDTO;
+import com.epmet.entity.IcCommunitySelfOrganizationEntity;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 社区自组织表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-11-18
+ */
+public interface IcCommunitySelfOrganizationService extends BaseService<IcCommunitySelfOrganizationEntity> {
+
+    /**
+     * 默认分页
+     *
+     * @param params
+     * @return PageData<IcCommunitySelfOrganizationDTO>
+     * @author generator
+     * @date 2021-11-18
+     */
+    PageData<IcCommunitySelfOrganizationDTO> page(Map<String, Object> params);
+
+    /**
+     * 默认查询
+     *
+     * @param params
+     * @return java.util.List<IcCommunitySelfOrganizationDTO>
+     * @author generator
+     * @date 2021-11-18
+     */
+    List<IcCommunitySelfOrganizationDTO> list(Map<String, Object> params);
+
+    /**
+     * 单条查询
+     *
+     * @param id
+     * @return IcCommunitySelfOrganizationDTO
+     * @author generator
+     * @date 2021-11-18
+     */
+    IcCommunitySelfOrganizationDTO get(String id);
+
+    /**
+     * 默认保存
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2021-11-18
+     */
+    void save(IcCommunitySelfOrganizationDTO dto);
+
+    /**
+     * 默认更新
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2021-11-18
+     */
+    void update(IcCommunitySelfOrganizationDTO dto);
+
+    /**
+     * 批量删除
+     *
+     * @param ids
+     * @return void
+     * @author generator
+     * @date 2021-11-18
+     */
+    void delete(String[] ids);
+
+    /**
+     * @Description  添加社区自组织
+     * @param tokenDto
+     * @param formDTO
+     * @author zxc
+     * @date 2021/11/19 8:33 上午
+     */
+    void addCommunitySelfOrganization(TokenDto tokenDto, AddCommunitySelfOrganizationFormDTO formDTO);
+}

epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiDemandDictService.java → epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcResiDemandDictService.java

@@ -20,7 +20,11 @@ package com.epmet.service;
 import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.dto.result.OptionResultDTO;
 import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.IcResiDemandDictDTO;
+import com.epmet.dto.form.demand.*;
+import com.epmet.dto.result.demand.DemandPageResDTO;
+import com.epmet.dto.result.demand.OptionDTO;
 import com.epmet.entity.IcResiDemandDictEntity;
 
 import java.util.List;
@@ -37,52 +41,46 @@ public interface IcResiDemandDictService extends BaseService<IcResiDemandDictEnt
     /**
      * 默认分页
      *
-     * @param params
+     * @param formDTO
      * @return PageData<IcResiDemandDictDTO>
      * @author generator
      * @date 2021-10-27
      */
-    PageData<IcResiDemandDictDTO> page(Map<String, Object> params);
+    PageData<DemandPageResDTO> page(DemandDictPageFormDTO formDTO);
 
     /**
-     * 默认查询
+     * 新增一级分类
-     *
+     * @param formDTO
-     * @param params
-     * @return java.util.List<IcResiDemandDictDTO>
-     * @author generator
-     * @date 2021-10-27
      */
-    List<IcResiDemandDictDTO> list(Map<String, Object> params);
+    void addFirstCategory(AddFirstCategoryFormDTO formDTO);
 
     /**
-     * 单条查询
+     * 新增二级分类
-     *
+     * @param formDTO
-     * @param id
-     * @return IcResiDemandDictDTO
-     * @author generator
-     * @date 2021-10-27
      */
-    IcResiDemandDictDTO get(String id);
+    void addChild(AddCategoryFormDTO formDTO);
+
 
     /**
-     * 默认保存
+     * 默认查询
      *
-     * @param dto
+     * @param params
-     * @return void
+     * @return java.util.List<IcResiDemandDictDTO>
      * @author generator
      * @date 2021-10-27
      */
-    void save(IcResiDemandDictDTO dto);
+    List<IcResiDemandDictDTO> list(Map<String, Object> params);
+
 
     /**
      * 默认更新
      *
-     * @param dto
+     * @param formDTO
      * @return void
      * @author generator
      * @date 2021-10-27
      */
-    void update(IcResiDemandDictDTO dto);
+    void update(UpdateFormDTO formDTO);
 
     /**
      * 批量删除
@@ -103,4 +101,19 @@ public interface IcResiDemandDictService extends BaseService<IcResiDemandDictEnt
      */
     List<OptionResultDTO> getDemandOptions(String customerId);
 
+    /**
+     * 居民信息列表需要展示分类名称，单独开出来这个接口，供user查询
+     * @param formDTO
+     * @return
+     */
+    Result<String> queryDemandNames(UserDemandNameQueryFormDTO formDTO);
+
+    List<OptionDTO> querySubCodeList(SubCodeFormDTO formDTO);
+
+    /**
+     * 启用或禁用
+     *
+     * @param formDTO
+     */
+    void updateStatus(StatusFormDTO formDTO);
 }

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

@@ -0,0 +1,58 @@
+/**
+ * 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.service;
+
+import com.epmet.commons.mybatis.service.BaseService;
+import com.epmet.dto.form.AddSocietyOrgFormDTO;
+import com.epmet.dto.form.EditSocietyOrgFormDTO;
+import com.epmet.dto.form.GetListSocietyOrgFormDTO;
+import com.epmet.dto.result.GetListSocietyOrgResultDTO;
+import com.epmet.entity.SocietyOrgEntity;
+
+/**
+ * 社会组织管理
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-11-18
+ */
+public interface SocietyOrgService extends BaseService<SocietyOrgEntity> {
+
+    /**
+     * @Author sun
+     * @Description 新增社会组织
+     **/
+    void add(AddSocietyOrgFormDTO dto);
+
+    /**
+     * @Author sun
+     * @Description 修改社会组织
+     **/
+    void edit(EditSocietyOrgFormDTO formDTO);
+
+    /**
+     * @Author sun
+     * @Description 删除社会组织
+     **/
+    void del(String societyId);
+
+    /**
+     * @Author sun
+     * @Description 社会组织列表查询
+     **/
+    GetListSocietyOrgResultDTO getList(GetListSocietyOrgFormDTO formDTO);
+}

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

@@ -0,0 +1,100 @@
+/**
+ * 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.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.page.PageData;
+import com.epmet.commons.tools.utils.ConvertUtils;
+import com.epmet.commons.tools.constant.FieldConstant;
+import com.epmet.dao.IcCommunitySelfOrganizationPersonnelDao;
+import com.epmet.dto.IcCommunitySelfOrganizationPersonnelDTO;
+import com.epmet.entity.IcCommunitySelfOrganizationPersonnelEntity;
+import com.epmet.service.IcCommunitySelfOrganizationPersonnelService;
+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 java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 社区自组织人员表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-11-18
+ */
+@Service
+public class IcCommunitySelfOrganizationPersonnelServiceImpl extends BaseServiceImpl<IcCommunitySelfOrganizationPersonnelDao, IcCommunitySelfOrganizationPersonnelEntity> implements IcCommunitySelfOrganizationPersonnelService {
+
+    @Override
+    public PageData<IcCommunitySelfOrganizationPersonnelDTO> page(Map<String, Object> params) {
+        IPage<IcCommunitySelfOrganizationPersonnelEntity> page = baseDao.selectPage(
+                getPage(params, FieldConstant.CREATED_TIME, false),
+                getWrapper(params)
+        );
+        return getPageData(page, IcCommunitySelfOrganizationPersonnelDTO.class);
+    }
+
+    @Override
+    public List<IcCommunitySelfOrganizationPersonnelDTO> list(Map<String, Object> params) {
+        List<IcCommunitySelfOrganizationPersonnelEntity> entityList = baseDao.selectList(getWrapper(params));
+
+        return ConvertUtils.sourceToTarget(entityList, IcCommunitySelfOrganizationPersonnelDTO.class);
+    }
+
+    private QueryWrapper<IcCommunitySelfOrganizationPersonnelEntity> getWrapper(Map<String, Object> params){
+        String id = (String)params.get(FieldConstant.ID_HUMP);
+
+        QueryWrapper<IcCommunitySelfOrganizationPersonnelEntity> wrapper = new QueryWrapper<>();
+        wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
+
+        return wrapper;
+    }
+
+    @Override
+    public IcCommunitySelfOrganizationPersonnelDTO get(String id) {
+        IcCommunitySelfOrganizationPersonnelEntity entity = baseDao.selectById(id);
+        return ConvertUtils.sourceToTarget(entity, IcCommunitySelfOrganizationPersonnelDTO.class);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void save(IcCommunitySelfOrganizationPersonnelDTO dto) {
+        IcCommunitySelfOrganizationPersonnelEntity entity = ConvertUtils.sourceToTarget(dto, IcCommunitySelfOrganizationPersonnelEntity.class);
+        insert(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void update(IcCommunitySelfOrganizationPersonnelDTO dto) {
+        IcCommunitySelfOrganizationPersonnelEntity entity = ConvertUtils.sourceToTarget(dto, IcCommunitySelfOrganizationPersonnelEntity.class);
+        updateById(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void delete(String[] ids) {
+        // 逻辑删除（@TableLogic 注解）
+        baseDao.deleteBatchIds(Arrays.asList(ids));
+    }
+
+}

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

@@ -0,0 +1,142 @@
+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.dto.result.CustomerStaffInfoCacheResult;
+import com.epmet.commons.tools.exception.RenException;
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.redis.common.CustomerOrgRedis;
+import com.epmet.commons.tools.redis.common.CustomerStaffRedis;
+import com.epmet.commons.tools.redis.common.bean.AgencyInfoCache;
+import com.epmet.commons.tools.security.dto.TokenDto;
+import com.epmet.commons.tools.utils.ConvertUtils;
+import com.epmet.commons.tools.constant.FieldConstant;
+import com.epmet.commons.tools.validator.PhoneValidatorUtils;
+import com.epmet.constant.IcCommunitySelfOrganizationConstant;
+import com.epmet.dao.IcCommunitySelfOrganizationDao;
+import com.epmet.dto.IcCommunitySelfOrganizationDTO;
+import com.epmet.dto.form.AddCommunitySelfOrganizationFormDTO;
+import com.epmet.entity.IcCommunitySelfOrganizationEntity;
+import com.epmet.entity.IcCommunitySelfOrganizationPersonnelEntity;
+import com.epmet.service.IcCommunitySelfOrganizationPersonnelService;
+import com.epmet.service.IcCommunitySelfOrganizationService;
+import org.apache.commons.collections4.CollectionUtils;
+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.xml.crypto.Data;
+import java.util.Arrays;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 社区自组织表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-11-18
+ */
+@Service
+public class IcCommunitySelfOrganizationServiceImpl extends BaseServiceImpl<IcCommunitySelfOrganizationDao, IcCommunitySelfOrganizationEntity> implements IcCommunitySelfOrganizationService {
+
+    @Autowired
+    private IcCommunitySelfOrganizationPersonnelService personnelService;
+
+    @Override
+    public PageData<IcCommunitySelfOrganizationDTO> page(Map<String, Object> params) {
+        IPage<IcCommunitySelfOrganizationEntity> page = baseDao.selectPage(
+                getPage(params, FieldConstant.CREATED_TIME, false),
+                getWrapper(params)
+        );
+        return getPageData(page, IcCommunitySelfOrganizationDTO.class);
+    }
+
+    @Override
+    public List<IcCommunitySelfOrganizationDTO> list(Map<String, Object> params) {
+        List<IcCommunitySelfOrganizationEntity> entityList = baseDao.selectList(getWrapper(params));
+
+        return ConvertUtils.sourceToTarget(entityList, IcCommunitySelfOrganizationDTO.class);
+    }
+
+    private QueryWrapper<IcCommunitySelfOrganizationEntity> getWrapper(Map<String, Object> params){
+        String id = (String)params.get(FieldConstant.ID_HUMP);
+
+        QueryWrapper<IcCommunitySelfOrganizationEntity> wrapper = new QueryWrapper<>();
+        wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
+
+        return wrapper;
+    }
+
+    @Override
+    public IcCommunitySelfOrganizationDTO get(String id) {
+        IcCommunitySelfOrganizationEntity entity = baseDao.selectById(id);
+        return ConvertUtils.sourceToTarget(entity, IcCommunitySelfOrganizationDTO.class);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void save(IcCommunitySelfOrganizationDTO dto) {
+        IcCommunitySelfOrganizationEntity entity = ConvertUtils.sourceToTarget(dto, IcCommunitySelfOrganizationEntity.class);
+        insert(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void update(IcCommunitySelfOrganizationDTO dto) {
+        IcCommunitySelfOrganizationEntity entity = ConvertUtils.sourceToTarget(dto, IcCommunitySelfOrganizationEntity.class);
+        updateById(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void delete(String[] ids) {
+        // 逻辑删除（@TableLogic 注解）
+        baseDao.deleteBatchIds(Arrays.asList(ids));
+    }
+
+    /**
+     * @Description  添加社区自组织
+     * @param tokenDto
+     * @param formDTO
+     * @author zxc
+     * @date 2021/11/19 8:33 上午
+     */
+    @Override
+    public void addCommunitySelfOrganization(TokenDto tokenDto, AddCommunitySelfOrganizationFormDTO formDTO) {
+        String customerId = tokenDto.getCustomerId();
+        CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(customerId, tokenDto.getUserId());
+        if (null == staffInfo){
+            throw new RenException(String.format("查询人员{%s}信息失败",tokenDto.getUserId()));
+        }
+        IcCommunitySelfOrganizationEntity orgEntity = ConvertUtils.sourceToTarget(formDTO, IcCommunitySelfOrganizationEntity.class);
+        orgEntity.setCustomerId(customerId);
+        orgEntity.setOrgId(staffInfo.getAgencyId());
+        orgEntity.setOrgType(IcCommunitySelfOrganizationConstant.ORG_TYPE_AGENCY);
+        AgencyInfoCache agencyInfo = CustomerOrgRedis.getAgencyInfo(staffInfo.getAgencyId());
+        if (null == agencyInfo){
+            throw new RenException(String.format("查询组织信息失败%s",staffInfo.getAgencyId()));
+        }
+        orgEntity.setPid(agencyInfo.getPid());
+        orgEntity.setPids(agencyInfo.getPids());
+        // 保持时间统一
+        if (null == formDTO.getOrganizationCreatedTime()){
+            Date date = new Date();
+            orgEntity.setOrganizationCreatedTime(date);
+            orgEntity.setCreatedTime(date);
+            orgEntity.setUpdatedTime(date);
+        }
+        baseDao.insert(orgEntity);
+        if(CollectionUtils.isNotEmpty(formDTO.getOrganizationPersonnel())){
+            List<IcCommunitySelfOrganizationPersonnelEntity> persons = ConvertUtils.sourceToTarget(formDTO.getOrganizationPersonnel(), IcCommunitySelfOrganizationPersonnelEntity.class);
+            persons.forEach(p -> {
+                p.setCustomerId(customerId);
+                p.setOrgId(orgEntity.getId());
+            });
+            personnelService.insertBatch(persons);
+        }
+    }
+
+}

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

@@ -0,0 +1,228 @@
+/**
+ * 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.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+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.dto.result.OptionResultDTO;
+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.dao.IcResiDemandDictDao;
+import com.epmet.dto.IcResiDemandDictDTO;
+import com.epmet.dto.form.demand.*;
+import com.epmet.dto.result.demand.DemandPageResDTO;
+import com.epmet.dto.result.demand.OptionDTO;
+import com.epmet.entity.IcResiDemandDictEntity;
+import com.epmet.service.IcResiDemandDictService;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 居民需求字典表 
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-10-27
+ */
+@Slf4j
+@Service
+public class IcResiDemandDictServiceImpl extends BaseServiceImpl<IcResiDemandDictDao, IcResiDemandDictEntity> implements IcResiDemandDictService {
+
+    /**
+     * 分页查询
+     *
+     * @param formDTO
+     * @return
+     */
+    @Override
+    public PageData<DemandPageResDTO> page(DemandDictPageFormDTO formDTO) {
+        PageInfo<DemandPageResDTO> pageInfo= PageHelper.startPage(formDTO.getPageNo(),
+                formDTO.getPageSize()).doSelectPageInfo(() -> baseDao.pageSelect(formDTO.getCustomerId(),formDTO.getFirstCategoryCode()));
+        return new PageData<>(pageInfo.getList(), pageInfo.getTotal());
+    }
+
+    /**
+     * 新增一级分类
+     * @param formDTO
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void addFirstCategory(AddFirstCategoryFormDTO formDTO) {
+        if (checkCategoryName(formDTO.getCustomerId(), formDTO.getCategoryName(), NumConstant.ONE, NumConstant.ZERO_STR,null) > NumConstant.ZERO) {
+            // 名称唯一
+            throw new RenException(EpmetErrorCode.DEMAND_NAME_EXITED.getCode(), EpmetErrorCode.DEMAND_NAME_EXITED.getMsg());
+        }
+
+        IcResiDemandDictEntity entity = new IcResiDemandDictEntity();
+        entity.setCustomerId(formDTO.getCustomerId());
+        entity.setCategoryName(formDTO.getCategoryName());
+        entity.setLevel(NumConstant.ONE);
+        entity.setParentCode(NumConstant.ZERO_STR);
+        entity.setAwardPoint(NumConstant.ZERO);
+        entity.setUsableFlag(true);
+        // 获取当前最大的排序号
+        Integer maxSort = baseDao.selectMaxSort(formDTO.getCustomerId(), NumConstant.ONE,NumConstant.ZERO_STR);
+        entity.setSort(null == maxSort ? NumConstant.ZERO : maxSort + 1);
+        // 一级分类，直接获取最大的，然后+1
+        Integer maxFirstCategoryCode = baseDao.selectMaxCategoryCode(formDTO.getCustomerId(),NumConstant.ONE,NumConstant.ZERO_STR);
+        entity.setCategoryCode(null == maxFirstCategoryCode ? "1001" : String.valueOf(maxFirstCategoryCode + 1));
+        baseDao.insert(entity);
+    }
+
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public void addChild(AddCategoryFormDTO formDTO) {
+        if (checkCategoryName(formDTO.getCustomerId(), formDTO.getCategoryName(), NumConstant.TWO, formDTO.getParentCategoryCode(),null) > NumConstant.ZERO) {
+            // 名称唯一
+            throw new RenException(EpmetErrorCode.DEMAND_NAME_EXITED.getCode(), EpmetErrorCode.DEMAND_NAME_EXITED.getMsg());
+        }
+
+        IcResiDemandDictEntity entity = new IcResiDemandDictEntity();
+        entity.setCustomerId(formDTO.getCustomerId());
+        entity.setCategoryName(formDTO.getCategoryName());
+        entity.setLevel(NumConstant.TWO);
+        entity.setParentCode(formDTO.getParentCategoryCode());
+        entity.setAwardPoint(formDTO.getAwardPoint());
+        entity.setUsableFlag(true);
+        // 获取当前最大的排序号
+        Integer maxSort = baseDao.selectMaxSort(formDTO.getCustomerId(), NumConstant.TWO,formDTO.getParentCategoryCode());
+        entity.setSort(null == maxSort ? NumConstant.ZERO : maxSort + 1);
+        // 二级分类，直接获取最大的，然后+1
+        Integer maxCategoryCode = baseDao.selectMaxCategoryCode(formDTO.getCustomerId(),NumConstant.TWO,formDTO.getParentCategoryCode());
+        entity.setCategoryCode(null == maxCategoryCode ? formDTO.getParentCategoryCode().concat("0001") : String.valueOf(maxCategoryCode + 1));
+        baseDao.insert(entity);
+    }
+
+    /**
+     * 校验名字是否存在
+     * @param customerId
+     * @param categoryName
+     * @param level
+     * @param id
+     * @return
+     */
+    public int checkCategoryName(String customerId,String categoryName,int level,String parentCategoryCode,String id){
+        return  baseDao.selectCountName(customerId,categoryName,level,parentCategoryCode,id);
+    }
+
+
+
+
+    @Override
+    public List<IcResiDemandDictDTO> list(Map<String, Object> params) {
+        List<IcResiDemandDictEntity> entityList = baseDao.selectList(getWrapper(params));
+
+        return ConvertUtils.sourceToTarget(entityList, IcResiDemandDictDTO.class);
+    }
+
+    private QueryWrapper<IcResiDemandDictEntity> getWrapper(Map<String, Object> params){
+        String id = (String)params.get(FieldConstant.ID_HUMP);
+
+        QueryWrapper<IcResiDemandDictEntity> wrapper = new QueryWrapper<>();
+        wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
+
+        return wrapper;
+    }
+
+
+    /**
+     * 修改分类
+     *
+     *
+     * @param formDTO
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void update(UpdateFormDTO formDTO) {
+        IcResiDemandDictEntity origin = baseDao.selectById(formDTO.getCategoryId());
+        if (checkCategoryName(formDTO.getCustomerId(), formDTO.getCategoryName(), NumConstant.TWO, origin.getParentCode(), formDTO.getCategoryId()) > NumConstant.ZERO) {
+            // 名称唯一
+            throw new RenException(EpmetErrorCode.DEMAND_NAME_EXITED.getCode(), EpmetErrorCode.DEMAND_NAME_EXITED.getMsg());
+        }
+        origin.setCategoryName(formDTO.getCategoryName());
+        if (NumConstant.TWO == origin.getLevel()) {
+            origin.setAwardPoint(formDTO.getAwardPoint());
+        }
+        updateById(origin);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void delete(String[] ids) {
+        // 逻辑删除（@TableLogic 注解）
+        baseDao.deleteBatchIds(Arrays.asList(ids));
+    }
+
+    /**
+     * @param customerId
+     * @Description 获取居民需求
+     * @Param customerId
+     * @Return {@link List<  OptionResultDTO >}
+     * @Author zhaoqifeng
+     * @Date 2021/10/27 17:57
+     */
+    @Override
+    public List<OptionResultDTO> getDemandOptions(String customerId) {
+        return baseDao.selectDemandOptions(customerId);
+    }
+
+    @Override
+    public Result<String> queryDemandNames(UserDemandNameQueryFormDTO formDTO) {
+        return new Result<String>().ok(baseDao.selectCategoryNames(formDTO.getCustomerId(),formDTO.getCodeSet()));
+    }
+
+    @Override
+    public List<OptionDTO> querySubCodeList(SubCodeFormDTO formDTO) {
+        return baseDao.selectByPCode(formDTO.getParentCategoryCode(),formDTO.getCustomerId());
+    }
+
+    @Override
+    public void updateStatus(StatusFormDTO formDTO) {
+        IcResiDemandDictEntity origin = baseDao.selectById(formDTO.getCategoryId());
+        if (null == origin) {
+            log.error("category_id=" + formDTO.getCategoryId() + " 没有找到记录");
+            return;
+        }
+        origin.setUsableFlag(formDTO.getUsableFlag());
+        updateById(origin);
+        // 如果修改的是一级分类, 同步到二级
+        if (NumConstant.ONE == origin.getLevel()) {
+            QueryWrapper<IcResiDemandDictEntity> wrapper = new QueryWrapper<>();
+            wrapper.eq(StringUtils.isNotBlank(origin.getCategoryCode()), "PARENT_CODE", origin.getCategoryCode());
+            List<IcResiDemandDictEntity> entityList = baseDao.selectList(wrapper);
+            for (IcResiDemandDictEntity sub : entityList) {
+                sub.setUsableFlag(formDTO.getUsableFlag());
+                updateById(sub);
+            }
+        }
+    }
+
+
+}

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

@@ -0,0 +1,132 @@
+/**
+ * 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.service.impl;
+
+import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.constant.NumConstant;
+import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult;
+import com.epmet.commons.tools.exception.RenException;
+import com.epmet.commons.tools.redis.common.CustomerStaffRedis;
+import com.epmet.commons.tools.utils.ConvertUtils;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.dao.SocietyOrgDao;
+import com.epmet.dto.ProjectStaffDTO;
+import com.epmet.dto.form.AddSocietyOrgFormDTO;
+import com.epmet.dto.form.EditSocietyOrgFormDTO;
+import com.epmet.dto.form.GetListSocietyOrgFormDTO;
+import com.epmet.dto.form.UserIdsFormDTO;
+import com.epmet.dto.result.GetListSocietyOrgResultDTO;
+import com.epmet.dto.result.StaffSinGridResultDTO;
+import com.epmet.entity.ActInfoEntity;
+import com.epmet.entity.SocietyOrgEntity;
+import com.epmet.feign.EpmetUserOpenFeignClient;
+import com.epmet.service.SocietyOrgService;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+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;
+import org.springframework.util.CollectionUtils;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * 社会组织管理
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-11-18
+ */
+@Service
+public class SocietyOrgServiceImpl extends BaseServiceImpl<SocietyOrgDao, SocietyOrgEntity> implements SocietyOrgService {
+    private static final Logger log = LoggerFactory.getLogger(SocietyOrgServiceImpl.class);
+    @Autowired
+    private EpmetUserOpenFeignClient epmetUserOpenFeignClient;
+
+
+    /**
+     * @Author sun
+     * @Description 新增社会组织
+     **/
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void add(AddSocietyOrgFormDTO dto) {
+        SocietyOrgEntity entity = ConvertUtils.sourceToTarget(dto, SocietyOrgEntity.class);
+        CustomerStaffInfoCacheResult staffInfoCache = CustomerStaffRedis.getStaffInfo(dto.getCustomerId(), dto.getStaffId());
+        entity.setPids(staffInfoCache.getAgencyPIds());
+        insert(entity);
+    }
+
+    /**
+     * @Author sun
+     * @Description 修改社会组织
+     **/
+    @Override
+    public void edit(EditSocietyOrgFormDTO formDTO) {
+        SocietyOrgEntity entity = baseDao.selectById(formDTO.getSocietyId());
+        if (null == entity) {
+            throw new RenException(String.format("修改社会组织信息失败，社会组织信息不存在，组织Id->%s", formDTO.getSocietyId()));
+        }
+        entity = ConvertUtils.sourceToTarget(formDTO, SocietyOrgEntity.class);
+        baseDao.updateById(entity);
+    }
+
+    /**
+     * @Author sun
+     * @Description 删除社会组织
+     **/
+    @Override
+    public void del(String societyId) {
+        if (baseDao.deleteById(societyId) < NumConstant.ONE) {
+            throw new RenException(String.format("修改社会组织信息删除失败，社会组织Id->%s", societyId));
+        }
+    }
+
+    /**
+     * @Author sun
+     * @Description 社会组织列表查询
+     **/
+    @Override
+    public GetListSocietyOrgResultDTO getList(GetListSocietyOrgFormDTO formDTO) {
+        GetListSocietyOrgResultDTO resultDTO = new GetListSocietyOrgResultDTO();
+        //1.根据查询条件分页查询社会组织数据
+        PageInfo<GetListSocietyOrgResultDTO.SocietyOrgList> result =
+                PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize()).doSelectPageInfo(() -> baseDao.getList(formDTO));
+        if (CollectionUtils.isEmpty(result.getList())) {
+            return resultDTO;
+        }
+        resultDTO.setTotal((int) result.getTotal());
+        //2.查询被绑定管理员信息
+        UserIdsFormDTO dto = new UserIdsFormDTO();
+        List<String> staffIdList = result.getList().stream().map(GetListSocietyOrgResultDTO.SocietyOrgList::getAdminStaffId).collect(Collectors.toList());
+        staffIdList = staffIdList.stream().distinct().collect(Collectors.toList());
+        dto.setUserIds(staffIdList);
+        Result<List<StaffSinGridResultDTO>> listResult = epmetUserOpenFeignClient.getStaffInfoList(dto);
+        if (!listResult.success()) {
+            throw new RenException("获取工作人员基本信息失败......");
+        }
+        result.getList().forEach(r -> listResult.getData().stream().filter(u -> r.getAdminStaffId().equals(u.getStaffId())).forEach(u -> r.setAdminStaffName(u.getStaffName())));
+        resultDTO.setList(result.getList());
+
+        return resultDTO;
+    }
+
+}

epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcCommunitySelfOrganizationDao.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.epmet.dao.IcCommunitySelfOrganizationDao">
+
+</mapper>

epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcCommunitySelfOrganizationPersonnelDao.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.epmet.dao.IcCommunitySelfOrganizationPersonnelDao">
+
+</mapper>

epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcResiDemandDictDao.xml

@@ -0,0 +1,197 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.epmet.dao.IcResiDemandDictDao">
+
+    <resultMap type="com.epmet.entity.IcResiDemandDictEntity" id="icResiDemandDictMap">
+        <result property="id" column="ID"/>
+        <result property="customerId" column="CUSTOMER_ID"/>
+        <result property="parentCode" column="PARENT_CODE"/>
+        <result property="categoryCode" column="CATEGORY_CODE"/>
+        <result property="categoryName" column="CATEGORY_NAME"/>
+        <result property="level" column="LEVEL"/>
+        <result property="remark" column="REMARK"/>
+        <result property="sort" column="SORT"/>
+        <result property="delFlag" column="DEL_FLAG"/>
+        <result property="revision" column="REVISION"/>
+        <result property="createdBy" column="CREATED_BY"/>
+        <result property="createdTime" column="CREATED_TIME"/>
+        <result property="updatedBy" column="UPDATED_BY"/>
+        <result property="updatedTime" column="UPDATED_TIME"/>
+    </resultMap>
+    <resultMap id="DemandResult" type="com.epmet.commons.tools.dto.result.OptionResultDTO">
+        <result column="customerId"/>
+        <result column="value"  property="value"/>
+        <result column="label" property="label"/>
+        <collection property="children" ofType="com.epmet.commons.tools.dto.result.OptionResultDTO"
+                    select="selectChildDemands" column="customerId=customerId,parentCode=value">
+        </collection>
+    </resultMap>
+    <select id="selectDemandOptions" resultMap="DemandResult">
+        SELECT
+            CUSTOMER_ID AS customerId,
+            CATEGORY_CODE AS "value",
+            CATEGORY_NAME AS "label"
+        FROM
+            ic_resi_demand_dict
+        WHERE
+            DEL_FLAG = 0
+            AND LEVEL = 1
+            AND CUSTOMER_ID = #{customerId}
+        ORDER BY
+            SORT ASC
+    </select>
+    <select id="selectChildDemands" resultMap="DemandResult">
+        SELECT
+            CUSTOMER_ID AS customerId,
+            CATEGORY_CODE AS "value",
+            CATEGORY_NAME AS "label"
+        FROM
+            ic_resi_demand_dict
+        WHERE
+            DEL_FLAG = 0
+            AND LEVEL = 2
+            AND CUSTOMER_ID = #{customerId}
+            AND PARENT_CODE = #{parentCode}
+        ORDER BY
+            SORT ASC
+    </select>
+
+
+    <select id="selectCategoryNames" parameterType="map" resultType="java.lang.String">
+        SELECT
+        GROUP_CONCAT(m.CATEGORY_NAME)
+        FROM
+        ic_resi_demand_dict m
+        WHERE
+        m.DEL_FLAG = '0'
+        AND m.CUSTOMER_ID = #{customerId}
+        <if test="null != codeSet and codeSet.size() > 0">
+            AND m.CATEGORY_CODE IN
+            <foreach item="code" collection="codeSet" open="(" separator="," close=")">
+                #{code}
+            </foreach>
+        </if>
+    </select>
+
+    <select id="selectByPCode" parameterType="map" resultType="com.epmet.dto.result.demand.OptionDTO">
+        SELECT
+            m.CATEGORY_NAME  as label,
+            m.CATEGORY_CODE  as `value`
+        FROM
+            ic_resi_demand_dict m
+        WHERE
+             m.DEL_FLAG = '0'
+             AND m.CUSTOMER_ID = #{customerId}
+             and m.PARENT_CODE = #{pcode}
+             order by m.sort asc
+    </select>
+
+
+
+    <resultMap id="DemandPageResDTOMap" type="com.epmet.dto.result.demand.DemandPageResDTO">
+        <id property="categoryId" column="ID"></id>
+        <result property="customerId" column="CUSTOMER_ID"/>
+        <result property="categoryCode" column="CATEGORY_CODE"/>
+        <result property="parentCategoryCode" column="PARENT_CODE"/>
+        <result property="categoryName" column="CATEGORY_NAME"/>
+        <result property="level" column="LEVEL"/>
+        <result property="sort" column="SORT"/>
+        <result property="usableFlag" column="USABLE_FLAG"/>
+        <result property="awardPoint" column="AWARD_POINT"/>
+        <collection property="children" ofType="com.epmet.dto.result.demand.DemandPageResDTO"
+                    select="selectChild" column="customerId=CUSTOMER_ID,parentCode=CATEGORY_CODE">
+        </collection>
+    </resultMap>
+    <select id="pageSelect" resultMap="DemandPageResDTOMap" parameterType="map">
+        SELECT
+            m.CUSTOMER_ID,
+            m.ID,
+            m.CATEGORY_CODE,
+            m.PARENT_CODE,
+            m.CATEGORY_NAME,
+            m.`LEVEL`,
+            m.SORT,
+            m.USABLE_FLAG,
+            m.AWARD_POINT
+        FROM
+            ic_resi_demand_dict m
+        WHERE
+            m.DEL_FLAG = '0'
+            AND m.CUSTOMER_ID = #{customerId}
+            AND m.PARENT_CODE = '0'
+            <if test="null!=firstCategoryCode and firstCategoryCode!=''">
+                AND m.CATEGORY_CODE =#{firstCategoryCode}
+            </if>
+        ORDER BY
+            m.CREATED_TIME DESC
+    </select>
+
+
+    <select id="selectChild" resultMap="DemandPageResDTOMap" parameterType="map">
+        SELECT
+            m.CUSTOMER_ID,
+            m.ID,
+            m.CATEGORY_CODE,
+            m.PARENT_CODE,
+            m.CATEGORY_NAME,
+            m.`LEVEL`,
+            m.SORT,
+            m.USABLE_FLAG,
+            m.AWARD_POINT
+        FROM
+        ic_resi_demand_dict m
+        WHERE
+            m.DEL_FLAG = '0'
+            AND m.CUSTOMER_ID = #{customerId}
+            AND m.PARENT_CODE = #{parentCode}
+        ORDER BY
+        m.CREATED_TIME DESC
+    </select>
+
+
+    <select id="selectCountName" parameterType="map" resultType="int">
+        select
+            count(1)
+        FROM
+            ic_resi_demand_dict m
+        WHERE
+            m.DEL_FLAG = '0'
+            AND m.CUSTOMER_ID = #{customerId}
+            and m.level=#{level}
+            and m.CATEGORY_NAME=#{categoryName}
+            <if test="null!=parentCode and parentCode!=''">
+                and m.parent_code=#{parentCode}
+            </if>
+            <if test="null!=id and id!=''">
+                and m.id !=#{id}
+            </if>
+    </select>
+
+    <select id="selectMaxCategoryCode" parameterType="map" resultType="java.lang.Integer">
+        SELECT
+            MAX(
+            CONVERT ( m.CATEGORY_CODE, UNSIGNED )) AS maxFirstCategoryCode
+        FROM
+            ic_resi_demand_dict m
+        WHERE
+            m.DEL_FLAG = '0'
+            AND m.CUSTOMER_ID = #{customerId}
+            AND m.`LEVEL` = #{level}
+            and m.parent_code=#{parentCode}
+    </select>
+
+    <select id="selectMaxSort" parameterType="map" resultType="java.lang.Integer">
+        SELECT
+            max( m.SORT ) AS maxSort
+        FROM
+            ic_resi_demand_dict m
+        WHERE
+            m.DEL_FLAG = '0'
+            AND m.CUSTOMER_ID = #{customerId}
+            AND m.`LEVEL` = #{level}
+        <if test="null!=parentCode and parentCode!=''">
+            and m.parent_code=#{parentCode}
+        </if>
+    </select>
+</mapper>

epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/SocietyOrgDao.xml

@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.epmet.dao.SocietyOrgDao">
+
+    <select id="getList" resultType="com.epmet.dto.result.GetListSocietyOrgResultDTO$SocietyOrgList">
+        SELECT
+            agency_id agencyId,
+            id societyId,
+            society_name societyName,
+            service_matters serviceMatters,
+            person_in_charge personInCharge,
+            mobile mobile,
+            service_start_time serviceStartTime,
+            service_end_time serviceEndTime,
+            admin_staff_id adminStaffId,
+            address address,
+            longitude longitude,
+            dimension dimension
+        FROM
+            society_org
+        WHERE
+            del_flag = '0'
+        <if test="societyName != null and societyName.trim() != ''">
+            AND society_name LIKE #{societyName}
+        </if>
+        <if test="personInCharge != null and personInCharge.trim() != ''">
+            AND person_in_charge LIKE #{personInCharge}
+        </if>
+        <if test="mobile != null and mobile.trim() != ''">
+            AND mobile = #{mobile}
+        </if>
+        <if test="serviceStartTime != null and serviceStartTime != ''">
+            AND date_id <![CDATA[>=]]> #{serviceStartTime}
+        </if>
+        <if test="serviceEndTime != null and serviceEndTime != ''">
+            AND date_id <![CDATA[<=]]> #{serviceEndTime}
+        </if>
+    </select>
+
+</mapper>

epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/BizPointTotalDetailServiceImpl.java

@@ -380,7 +380,7 @@ public class BizPointTotalDetailServiceImpl extends BaseServiceImpl<BizPointTota
         form.setSearchScopeObjectId(searchScopeObjectId);
 
         Result<List<GroupDetailResultDTO>> result = resiGroupOpenFeignClient.listGroupDetailsExcludeGroupIds(form);
-        List<GroupDetailResultDTO> groups = getResultDataOrThrowsException(result, ServiceConstant.RESI_GROUP_SERVER, EpmetErrorCode.SERVER_ERROR.getCode(), "【小组排名】查询积分为0的小组列表失败");
+        List<GroupDetailResultDTO> groups = getResultDataOrThrowsException(result, ServiceConstant.RESI_GROUP_SERVER, EpmetErrorCode.SERVER_ERROR.getCode(), "【小组排名】查询积分为0的小组列表失败", null);
         if (CollectionUtils.isEmpty(groups)) {
             return new ArrayList<>();
         }
@@ -412,7 +412,7 @@ public class BizPointTotalDetailServiceImpl extends BaseServiceImpl<BizPointTota
 
         // 查询这些小组的基本信息
         Result<List<GroupDetailResultDTO>> listResult = resiGroupOpenFeignClient.listGroupDetailsByGroupIds(groupIds);
-        List<GroupDetailResultDTO> groupInfos = getResultDataOrThrowsException(listResult, ServiceConstant.RESI_GROUP_SERVER, EpmetErrorCode.SERVER_ERROR.getCode(), "【小组排行】批量查询小组信息出错");
+        List<GroupDetailResultDTO> groupInfos = getResultDataOrThrowsException(listResult, ServiceConstant.RESI_GROUP_SERVER, EpmetErrorCode.SERVER_ERROR.getCode(), "【小组排行】批量查询小组信息出错", null);
 
         // 将小组基本信息转化为map
         HashMap<String, GroupDetailResultDTO> groupMap = new HashMap<>();
@@ -454,7 +454,7 @@ public class BizPointTotalDetailServiceImpl extends BaseServiceImpl<BizPointTota
         CustomerGridFormDTO form = new CustomerGridFormDTO();
         form.setGridId(gridId);
         Result<CustomerGridDTO> result = govOrgOpenFeignClient.getGridBaseInfoByGridId(form);
-        return getResultDataOrThrowsException(result, ServiceConstant.GOV_ORG_SERVER, EpmetErrorCode.SERVER_ERROR.getCode(), "【小组排名】查询网格信息失败");
+        return getResultDataOrThrowsException(result, ServiceConstant.GOV_ORG_SERVER, EpmetErrorCode.SERVER_ERROR.getCode(), "【小组排名】查询网格信息失败", null);
     }
 
     @Override
@@ -464,7 +464,7 @@ public class BizPointTotalDetailServiceImpl extends BaseServiceImpl<BizPointTota
         form.setGridId(gridId);
         form.setUserId(userId);
         List<GroupDetailResultDTO> groupList = getResultDataOrThrowsException(resiGroupOpenFeignClient.listGroupsByMember(form),
-                ServiceConstant.RESI_GROUP_SERVER, EpmetErrorCode.SERVER_ERROR.getCode(), "【我所在的小组排名】查询组列表失败");
+                ServiceConstant.RESI_GROUP_SERVER, EpmetErrorCode.SERVER_ERROR.getCode(), "【我所在的小组排名】查询组列表失败", null);
 
         if (CollectionUtils.isEmpty(groupList)) {
             return new ArrayList();

epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/apiservice/impl/PingyinPrivateEpmetApiService.java

@@ -55,7 +55,7 @@ public class PingyinPrivateEpmetApiService extends ApiService<Result> implements
                 String urlParams = super.convertQueryParams2String(constructCommonUrlParamsMap(platformKey, authType, uuid, currentTimeMillis, sign));
                 String requestUrl = baseUrl.concat(apiUrl).concat(urlParams);
                 Result<String> stringResult = HttpClientManager.getInstance().sendPostByHttps(requestUrl, "{}");
-                String remoteResultString = getResultDataOrThrowsException(stringResult, "【调用平阴私有化平台获取AccessToken】", EpmetErrorCode.SERVER_ERROR.getCode(), null);
+                String remoteResultString = getResultDataOrThrowsException(stringResult, "【调用平阴私有化平台获取AccessToken】", EpmetErrorCode.SERVER_ERROR.getCode(), null, null);
                 Result<GetAccessTokenResultDTO> remoteResult = parsePlatformResponseResult(remoteResultString, GetAccessTokenResultDTO.class);
                 log.info("【调用平阴私有化平台获取AccessToken】结果:{}", remoteResultString);
                 accessTokenFromCache = remoteResult.getData().getAccessToken();
@@ -159,7 +159,7 @@ public class PingyinPrivateEpmetApiService extends ApiService<Result> implements
 
         String jsonString = JSON.toJSONString(form);
         Result result = super.sendPostRequest(platformId, ThirdPlatformActions.PUSH_COMPONENT_ACCESS_TOKEN, jsonString, null, urlParams);
-        getResultDataOrThrowsException(result, "【平阴私有化平台】推送ComponentAccessToken", EpmetErrorCode.SERVER_ERROR.getCode(), null);
+        getResultDataOrThrowsException(result, "【平阴私有化平台】推送ComponentAccessToken", EpmetErrorCode.SERVER_ERROR.getCode(), null, null);
     }
 
     @Override

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

@@ -0,0 +1,131 @@
+/**
+ * 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;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+
+/**
+ * 事项预约记录
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-11-18
+ */
+@Data
+public class IcMatterAppointmentRecordDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 
+     */
+	private String id;
+
+    /**
+     * 
+     */
+	private String customerId;
+
+    /**
+     * 组织ID
+     */
+	private String orgId;
+
+    /**
+     * 组织类型，agency：组织，grid：网格
+     */
+	private String orgType;
+
+    /**
+     * 
+     */
+	private String pid;
+
+    /**
+     * 
+     */
+	private String pids;
+
+    /**
+     * 事项ID
+     */
+	private String matterId;
+
+    /**
+     * 预约日期
+     */
+	private String appointmentDate;
+
+    /**
+     * 预约人
+     */
+	private String appointmentName;
+
+    /**
+     * 预约电话
+     */
+	private String appointmentPhone;
+
+    /**
+     * 备注
+     */
+	private String remark;
+
+    /**
+     * 预约状态【cancel：取消，appointing：预约中】
+     */
+	private String status;
+
+    /**
+     * 
+     */
+	private Integer delFlag;
+
+    /**
+     * 乐观锁
+     */
+	private String revision;
+
+    /**
+     * 创建人
+     */
+	private String createdBy;
+
+    /**
+     * 创建时间
+     */
+	private Date createdTime;
+
+    /**
+     * 更新人
+     */
+	private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+	private Date updatedTime;
+
+    /**
+     * 1,2,5
+     */
+	private String timeId;
+
+}

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

@@ -0,0 +1,141 @@
+/**
+ * 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;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+
+/**
+ * 党群服务中心
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-11-18
+ */
+@Data
+public class IcPartyServiceCenterDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 
+     */
+	private String id;
+
+    /**
+     * 客户ID
+     */
+	private String customerId;
+
+    /**
+     * 组织ID
+     */
+	private String orgId;
+
+    /**
+     * 组织类型，agency：组织，grid：网格
+     */
+	private String orgType;
+
+    /**
+     * 
+     */
+	private String pid;
+
+    /**
+     * 
+     */
+	private String pids;
+
+    /**
+     * 中心名称
+     */
+	private String centerName;
+
+    /**
+     * 办公电话
+     */
+	private String workPhone;
+
+    /**
+     * 上午开始办公时间
+     */
+	private String amStartTime;
+
+    /**
+     * 上午结束办公时间
+     */
+	private String amEndTime;
+
+    /**
+     * 下午开始办公时间
+     */
+	private String pmStartTime;
+
+    /**
+     * 下午结束办公时间
+     */
+	private String pmEndTime;
+
+    /**
+     * 经度
+     */
+	private String longitude;
+
+    /**
+     * 纬度
+     */
+	private String latitude;
+
+    /**
+     * 地址
+     */
+	private String address;
+
+    /**
+     * 
+     */
+	private Integer delFlag;
+
+    /**
+     * 乐观锁
+     */
+	private String revision;
+
+    /**
+     * 创建人
+     */
+	private String createdBy;
+
+    /**
+     * 创建时间
+     */
+	private Date createdTime;
+
+    /**
+     * 更新人
+     */
+	private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+	private Date updatedTime;
+
+}

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

@@ -0,0 +1,101 @@
+/**
+ * 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;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+
+/**
+ * 党群服务中心可预约事项表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-11-18
+ */
+@Data
+public class IcPartyServiceCenterMatterDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 
+     */
+	private String id;
+
+    /**
+     * 党群服务中心ID
+     */
+	private String partyServiceCenterId;
+
+    /**
+     * 事项名字
+     */
+	private String matterName;
+
+    /**
+     * 预约类型，每天：everyDay，工作日：workDay，周末：weekend
+     */
+	private String appointmentType;
+
+    /**
+     * 可预约开始时间
+     */
+	private String startTime;
+
+    /**
+     * 可预约结束时间
+     */
+	private String endTime;
+
+    /**
+     * 
+     */
+	private Integer delFlag;
+
+    /**
+     * 乐观锁
+     */
+	private String revision;
+
+    /**
+     * 创建人
+     */
+	private String createdBy;
+
+    /**
+     * 创建时间
+     */
+	private Date createdTime;
+
+    /**
+     * 更新人
+     */
+	private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+	private Date updatedTime;
+
+    /**
+     * 客户ID
+     */
+	private String customerId;
+
+}

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

@@ -0,0 +1,131 @@
+/**
+ * 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;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+
+/**
+ * 九小场所下组织管理
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-11-18
+ */
+@Data
+public class PlaceOrgDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 唯一标识
+     */
+	private String id;
+
+    /**
+     * 客户Id
+     */
+	private String customerId;
+
+    /**
+     * 组织Id
+     */
+	private String agencyId;
+
+    /**
+     * agency_id的所有上级
+     */
+	private String pids;
+
+    /**
+     * 网格Id【场所区域】
+     */
+	private String gridId;
+
+    /**
+     * 场所类型【admin库sys_dict_data表九小场所value值】
+     */
+	private String ninePlaceVal;
+
+    /**
+     * 场所名称
+     */
+	private String placeOrgName;
+
+    /**
+     * 场所地址
+     */
+	private String address;
+
+    /**
+     * 字典value,场所规模【
+0:10人以下
+1:10-20人
+2:21-40人
+3:41-100人
+4:100人以上】
+     */
+	private String scale;
+
+    /**
+     * 场所负责人
+     */
+	private String personInCharge;
+
+    /**
+     * 负责人电话
+     */
+	private String mobile;
+
+    /**
+     * 备注
+     */
+	private String remarks;
+
+    /**
+     * 删除标识：0.未删除 1.已删除
+     */
+	private Integer delFlag;
+
+    /**
+     * 乐观锁
+     */
+	private Integer revision;
+
+    /**
+     * 创建人
+     */
+	private String createdBy;
+
+    /**
+     * 创建时间
+     */
+	private Date createdTime;
+
+    /**
+     * 更新人
+     */
+	private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+	private Date updatedTime;
+
+}

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

@@ -0,0 +1,146 @@
+/**
+ * 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;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+
+/**
+ * 场所巡查记录
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-11-18
+ */
+@Data
+public class PlacePatrolRecordDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 唯一标识
+     */
+	private String id;
+
+    /**
+     * 客户Id
+     */
+	private String customerId;
+
+    /**
+     * 组织Id
+     */
+	private String agencyId;
+
+    /**
+     * agency_id的所有上级
+     */
+	private String pids;
+
+    /**
+     * 网格Id【场所区域】
+     */
+	private String gridId;
+
+    /**
+     * 场所类型【admin库sys_dict_data表九小场所value值】
+     */
+	private String ninePlacsVal;
+
+    /**
+     * 场所下的组织Id
+     */
+	private String placeOrgId;
+
+    /**
+     * 场所下分队(place_patrolteam)表Id
+     */
+	private String placePatrolTeamId;
+
+    /**
+     * 分队下检查人员Id，分号分隔
+     */
+	private String inspectors;
+
+    /**
+     * 首次巡查时间
+     */
+	private Date firstTime;
+
+    /**
+     * 隐患明细
+     */
+	private String detailed;
+
+    /**
+     * 首次检查结果【0:合格 1:不合格】
+     */
+	private String firstResult;
+
+    /**
+     * 拟复查时间
+     */
+	private Date reviewTime;
+
+    /**
+     * 最终检查结果【0:合格 1:不合格】初始数据默认和首次检查结果相同
+     */
+	private String finalResult;
+
+    /**
+     * 最新复查时间【初始数据默认和首次巡查时间相同】
+     */
+	private Date finalTime;
+
+    /**
+     * 备注
+     */
+	private String remarks;
+
+    /**
+     * 删除标识：0.未删除 1.已删除
+     */
+	private Integer delFlag;
+
+    /**
+     * 乐观锁
+     */
+	private Integer revision;
+
+    /**
+     * 创建人
+     */
+	private String createdBy;
+
+    /**
+     * 创建时间
+     */
+	private Date createdTime;
+
+    /**
+     * 更新人
+     */
+	private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+	private Date updatedTime;
+
+}

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

@@ -0,0 +1,111 @@
+/**
+ * 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;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+
+/**
+ * 场所巡查复查记录
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-11-18
+ */
+@Data
+public class PlacePatrolReviewRecordDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 唯一标识
+     */
+	private String id;
+
+    /**
+     * 客户Id
+     */
+	private String customerId;
+
+    /**
+     * 巡查记录主(place_patrol_record)表Id
+     */
+	private String placePatrolRecordId;
+
+    /**
+     * 场所下分队(place_patrol_team)表Id
+     */
+	private String placePatrolTeamId;
+
+    /**
+     * 检查人员Id，逗号分隔
+     */
+	private String inspectors;
+
+    /**
+     * 复查时间
+     */
+	private Date reviewTime;
+
+    /**
+     * 复查隐患明细
+     */
+	private String detailed;
+
+    /**
+     * 复查检查结果【0:合格 1:不合格】
+     */
+	private String reviewResult;
+
+    /**
+     * 备注
+     */
+	private String remarks;
+
+    /**
+     * 删除标识：0.未删除 1.已删除
+     */
+	private Integer delFlag;
+
+    /**
+     * 乐观锁
+     */
+	private Integer revision;
+
+    /**
+     * 创建人
+     */
+	private String createdBy;
+
+    /**
+     * 创建时间
+     */
+	private Date createdTime;
+
+    /**
+     * 更新人
+     */
+	private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+	private Date updatedTime;
+
+}

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

@@ -0,0 +1,126 @@
+/**
+ * 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;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+
+/**
+ * 场所分队管理
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-11-18
+ */
+@Data
+public class PlacePatrolTeamDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 唯一标识
+     */
+	private String id;
+
+    /**
+     * 客户Id
+     */
+	private String customerId;
+
+    /**
+     * 组织Id
+     */
+	private String agencyId;
+
+    /**
+     * agency_id的所有上级
+     */
+	private String pids;
+
+    /**
+     * 负责区域【网格Id 多个值逗号分隔】
+     */
+	private String gridIds;
+
+    /**
+     * 负责场所类型【admin库sys_dict_data表九小场所value值 多个值逗号分隔】
+     */
+	private String ninePlacsVals;
+
+    /**
+     * 分队名称
+     */
+	private String teamName;
+
+    /**
+     * 巡查计划
+     */
+	private String plan;
+
+    /**
+     * 创建(建队)时间
+     */
+	private Date time;
+
+    /**
+     * 场所负责人
+     */
+	private String personInCharge;
+
+    /**
+     * 负责人电话
+     */
+	private String mobile;
+
+    /**
+     * 备注
+     */
+	private String remarks;
+
+    /**
+     * 删除标识：0.未删除 1.已删除
+     */
+	private Integer delFlag;
+
+    /**
+     * 乐观锁
+     */
+	private Integer revision;
+
+    /**
+     * 创建人
+     */
+	private String createdBy;
+
+    /**
+     * 创建时间
+     */
+	private Date createdTime;
+
+    /**
+     * 更新人
+     */
+	private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+	private Date updatedTime;
+
+}

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

@@ -0,0 +1,96 @@
+/**
+ * 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;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+
+/**
+ * 场所分队下人员管理
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-11-18
+ */
+@Data
+public class PlacePatrolTeamStaffDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 唯一标识
+     */
+	private String id;
+
+    /**
+     * 客户Id
+     */
+	private String customerId;
+
+    /**
+     * 巡查分队(place_patrol_team)表Id
+     */
+	private String placePatrolTeamId;
+
+    /**
+     * 成员姓名
+     */
+	private String name;
+
+    /**
+     * 成员电话
+     */
+	private String mobile;
+
+    /**
+     * 备注
+     */
+	private String remarks;
+
+    /**
+     * 删除标识：0.未删除 1.已删除
+     */
+	private Integer delFlag;
+
+    /**
+     * 乐观锁
+     */
+	private Integer revision;
+
+    /**
+     * 创建人
+     */
+	private String createdBy;
+
+    /**
+     * 创建时间
+     */
+	private Date createdTime;
+
+    /**
+     * 更新人
+     */
+	private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+	private Date updatedTime;
+
+}

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

@@ -0,0 +1,94 @@
+/**
+ * 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.controller;
+
+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.dto.IcMatterAppointmentRecordDTO;
+import com.epmet.excel.IcMatterAppointmentRecordExcel;
+import com.epmet.service.IcMatterAppointmentRecordService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * 事项预约记录
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-11-18
+ */
+@RestController
+@RequestMapping("icmatterappointmentrecord")
+public class IcMatterAppointmentRecordController {
+    
+    @Autowired
+    private IcMatterAppointmentRecordService icMatterAppointmentRecordService;
+
+    @GetMapping("page")
+    public Result<PageData<IcMatterAppointmentRecordDTO>> page(@RequestParam Map<String, Object> params){
+        PageData<IcMatterAppointmentRecordDTO> page = icMatterAppointmentRecordService.page(params);
+        return new Result<PageData<IcMatterAppointmentRecordDTO>>().ok(page);
+    }
+
+    @GetMapping("{id}")
+    public Result<IcMatterAppointmentRecordDTO> get(@PathVariable("id") String id){
+        IcMatterAppointmentRecordDTO data = icMatterAppointmentRecordService.get(id);
+        return new Result<IcMatterAppointmentRecordDTO>().ok(data);
+    }
+
+    @PostMapping
+    public Result save(@RequestBody IcMatterAppointmentRecordDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+        icMatterAppointmentRecordService.save(dto);
+        return new Result();
+    }
+
+    @PutMapping
+    public Result update(@RequestBody IcMatterAppointmentRecordDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+        icMatterAppointmentRecordService.update(dto);
+        return new Result();
+    }
+
+    @DeleteMapping
+    public Result delete(@RequestBody String[] ids){
+        //效验数据
+        AssertUtils.isArrayEmpty(ids, "id");
+        icMatterAppointmentRecordService.delete(ids);
+        return new Result();
+    }
+
+    @GetMapping("export")
+    public void export(@RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
+        List<IcMatterAppointmentRecordDTO> list = icMatterAppointmentRecordService.list(params);
+        ExcelUtils.exportExcelToTarget(response, null, list, IcMatterAppointmentRecordExcel.class);
+    }
+
+}

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

@@ -45,7 +45,7 @@ import java.util.Map;
 @RestController
 @RequestMapping("icneighborhood")
 public class IcNeighborHoodController {
-    
+
     @Autowired
     private IcNeighborHoodService icNeighborHoodService;
 
@@ -109,4 +109,4 @@ public class IcNeighborHoodController {
         return new Result<List<IcNeighborHoodDTO>>().ok(icNeighborHoodService.getListByIds(ids));
     }
 
-}
+}

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

@@ -0,0 +1,94 @@
+/**
+ * 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.controller;
+
+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.dto.IcPartyServiceCenterDTO;
+import com.epmet.excel.IcPartyServiceCenterExcel;
+import com.epmet.service.IcPartyServiceCenterService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * 党群服务中心
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-11-18
+ */
+@RestController
+@RequestMapping("icpartyservicecenter")
+public class IcPartyServiceCenterController {
+    
+    @Autowired
+    private IcPartyServiceCenterService icPartyServiceCenterService;
+
+    @GetMapping("page")
+    public Result<PageData<IcPartyServiceCenterDTO>> page(@RequestParam Map<String, Object> params){
+        PageData<IcPartyServiceCenterDTO> page = icPartyServiceCenterService.page(params);
+        return new Result<PageData<IcPartyServiceCenterDTO>>().ok(page);
+    }
+
+    @GetMapping("{id}")
+    public Result<IcPartyServiceCenterDTO> get(@PathVariable("id") String id){
+        IcPartyServiceCenterDTO data = icPartyServiceCenterService.get(id);
+        return new Result<IcPartyServiceCenterDTO>().ok(data);
+    }
+
+    @PostMapping
+    public Result save(@RequestBody IcPartyServiceCenterDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+        icPartyServiceCenterService.save(dto);
+        return new Result();
+    }
+
+    @PutMapping
+    public Result update(@RequestBody IcPartyServiceCenterDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+        icPartyServiceCenterService.update(dto);
+        return new Result();
+    }
+
+    @DeleteMapping
+    public Result delete(@RequestBody String[] ids){
+        //效验数据
+        AssertUtils.isArrayEmpty(ids, "id");
+        icPartyServiceCenterService.delete(ids);
+        return new Result();
+    }
+
+    @GetMapping("export")
+    public void export(@RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
+        List<IcPartyServiceCenterDTO> list = icPartyServiceCenterService.list(params);
+        ExcelUtils.exportExcelToTarget(response, null, list, IcPartyServiceCenterExcel.class);
+    }
+
+}

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

@@ -0,0 +1,94 @@
+/**
+ * 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.controller;
+
+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.dto.IcPartyServiceCenterMatterDTO;
+import com.epmet.excel.IcPartyServiceCenterMatterExcel;
+import com.epmet.service.IcPartyServiceCenterMatterService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * 党群服务中心可预约事项表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-11-18
+ */
+@RestController
+@RequestMapping("icpartyservicecentermatter")
+public class IcPartyServiceCenterMatterController {
+    
+    @Autowired
+    private IcPartyServiceCenterMatterService icPartyServiceCenterMatterService;
+
+    @GetMapping("page")
+    public Result<PageData<IcPartyServiceCenterMatterDTO>> page(@RequestParam Map<String, Object> params){
+        PageData<IcPartyServiceCenterMatterDTO> page = icPartyServiceCenterMatterService.page(params);
+        return new Result<PageData<IcPartyServiceCenterMatterDTO>>().ok(page);
+    }
+
+    @GetMapping("{id}")
+    public Result<IcPartyServiceCenterMatterDTO> get(@PathVariable("id") String id){
+        IcPartyServiceCenterMatterDTO data = icPartyServiceCenterMatterService.get(id);
+        return new Result<IcPartyServiceCenterMatterDTO>().ok(data);
+    }
+
+    @PostMapping
+    public Result save(@RequestBody IcPartyServiceCenterMatterDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+        icPartyServiceCenterMatterService.save(dto);
+        return new Result();
+    }
+
+    @PutMapping
+    public Result update(@RequestBody IcPartyServiceCenterMatterDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+        icPartyServiceCenterMatterService.update(dto);
+        return new Result();
+    }
+
+    @DeleteMapping
+    public Result delete(@RequestBody String[] ids){
+        //效验数据
+        AssertUtils.isArrayEmpty(ids, "id");
+        icPartyServiceCenterMatterService.delete(ids);
+        return new Result();
+    }
+
+    @GetMapping("export")
+    public void export(@RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
+        List<IcPartyServiceCenterMatterDTO> list = icPartyServiceCenterMatterService.list(params);
+        ExcelUtils.exportExcelToTarget(response, null, list, IcPartyServiceCenterMatterExcel.class);
+    }
+
+}

epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiDemandDictController.java → epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/PlaceOrgController.java

@@ -17,63 +17,63 @@
 
 package com.epmet.controller;
 
-import com.epmet.commons.tools.annotation.LoginUser;
-import com.epmet.commons.tools.dto.result.OptionResultDTO;
 import com.epmet.commons.tools.page.PageData;
-import com.epmet.commons.tools.security.dto.TokenDto;
+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.DefaultGroup;
 import com.epmet.commons.tools.validator.group.UpdateGroup;
-import com.epmet.dto.IcResiDemandDictDTO;
+import com.epmet.commons.tools.validator.group.DefaultGroup;
-import com.epmet.service.IcResiDemandDictService;
+import com.epmet.dto.PlaceOrgDTO;
+import com.epmet.excel.PlaceOrgExcel;
+import com.epmet.service.PlaceOrgService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 import java.util.Map;
 
 
 /**
- * 居民需求字典表 
+ * 九小场所下组织管理
  *
  * @author generator generator@elink-cn.com
- * @since v1.0.0 2021-10-27
+ * @since v1.0.0 2021-11-18
  */
 @RestController
-@RequestMapping("icresidemanddict")
+@RequestMapping("placeorg")
-public class IcResiDemandDictController {
+public class PlaceOrgController {
     
     @Autowired
-    private IcResiDemandDictService icResiDemandDictService;
+    private PlaceOrgService placeOrgService;
 
     @GetMapping("page")
-    public Result<PageData<IcResiDemandDictDTO>> page(@RequestParam Map<String, Object> params){
+    public Result<PageData<PlaceOrgDTO>> page(@RequestParam Map<String, Object> params){
-        PageData<IcResiDemandDictDTO> page = icResiDemandDictService.page(params);
+        PageData<PlaceOrgDTO> page = placeOrgService.page(params);
-        return new Result<PageData<IcResiDemandDictDTO>>().ok(page);
+        return new Result<PageData<PlaceOrgDTO>>().ok(page);
     }
 
     @GetMapping("{id}")
-    public Result<IcResiDemandDictDTO> get(@PathVariable("id") String id){
+    public Result<PlaceOrgDTO> get(@PathVariable("id") String id){
-        IcResiDemandDictDTO data = icResiDemandDictService.get(id);
+        PlaceOrgDTO data = placeOrgService.get(id);
-        return new Result<IcResiDemandDictDTO>().ok(data);
+        return new Result<PlaceOrgDTO>().ok(data);
     }
 
     @PostMapping
-    public Result save(@RequestBody IcResiDemandDictDTO dto){
+    public Result save(@RequestBody PlaceOrgDTO dto){
         //效验数据
         ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
-        icResiDemandDictService.save(dto);
+        placeOrgService.save(dto);
         return new Result();
     }
 
     @PutMapping
-    public Result update(@RequestBody IcResiDemandDictDTO dto){
+    public Result update(@RequestBody PlaceOrgDTO dto){
         //效验数据
         ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
-        icResiDemandDictService.update(dto);
+        placeOrgService.update(dto);
         return new Result();
     }
 
@@ -81,13 +81,14 @@ public class IcResiDemandDictController {
     public Result delete(@RequestBody String[] ids){
         //效验数据
         AssertUtils.isArrayEmpty(ids, "id");
-        icResiDemandDictService.delete(ids);
+        placeOrgService.delete(ids);
         return new Result();
     }
 
-    @PostMapping("demandoption")
+    @GetMapping("export")
-    public Result<List<OptionResultDTO>> getDemandOptions(@LoginUser TokenDto tokenDto) {
+    public void export(@RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
-        return new Result<List<OptionResultDTO>>().ok(icResiDemandDictService.getDemandOptions(tokenDto.getCustomerId()));
+        List<PlaceOrgDTO> list = placeOrgService.list(params);
+        ExcelUtils.exportExcelToTarget(response, null, list, PlaceOrgExcel.class);
     }
 
 }

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

@@ -0,0 +1,94 @@
+/**
+ * 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.controller;
+
+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.dto.PlacePatrolRecordDTO;
+import com.epmet.excel.PlacePatrolRecordExcel;
+import com.epmet.service.PlacePatrolRecordService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * 场所巡查记录
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-11-18
+ */
+@RestController
+@RequestMapping("placepatrolrecord")
+public class PlacePatrolRecordController {
+    
+    @Autowired
+    private PlacePatrolRecordService placePatrolRecordService;
+
+    @GetMapping("page")
+    public Result<PageData<PlacePatrolRecordDTO>> page(@RequestParam Map<String, Object> params){
+        PageData<PlacePatrolRecordDTO> page = placePatrolRecordService.page(params);
+        return new Result<PageData<PlacePatrolRecordDTO>>().ok(page);
+    }
+
+    @GetMapping("{id}")
+    public Result<PlacePatrolRecordDTO> get(@PathVariable("id") String id){
+        PlacePatrolRecordDTO data = placePatrolRecordService.get(id);
+        return new Result<PlacePatrolRecordDTO>().ok(data);
+    }
+
+    @PostMapping
+    public Result save(@RequestBody PlacePatrolRecordDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+        placePatrolRecordService.save(dto);
+        return new Result();
+    }
+
+    @PutMapping
+    public Result update(@RequestBody PlacePatrolRecordDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+        placePatrolRecordService.update(dto);
+        return new Result();
+    }
+
+    @DeleteMapping
+    public Result delete(@RequestBody String[] ids){
+        //效验数据
+        AssertUtils.isArrayEmpty(ids, "id");
+        placePatrolRecordService.delete(ids);
+        return new Result();
+    }
+
+    @GetMapping("export")
+    public void export(@RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
+        List<PlacePatrolRecordDTO> list = placePatrolRecordService.list(params);
+        ExcelUtils.exportExcelToTarget(response, null, list, PlacePatrolRecordExcel.class);
+    }
+
+}

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

@@ -0,0 +1,94 @@
+/**
+ * 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.controller;
+
+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.dto.PlacePatrolReviewRecordDTO;
+import com.epmet.excel.PlacePatrolReviewRecordExcel;
+import com.epmet.service.PlacePatrolReviewRecordService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * 场所巡查复查记录
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-11-18
+ */
+@RestController
+@RequestMapping("placepatrolreviewrecord")
+public class PlacePatrolReviewRecordController {
+    
+    @Autowired
+    private PlacePatrolReviewRecordService placePatrolReviewRecordService;
+
+    @GetMapping("page")
+    public Result<PageData<PlacePatrolReviewRecordDTO>> page(@RequestParam Map<String, Object> params){
+        PageData<PlacePatrolReviewRecordDTO> page = placePatrolReviewRecordService.page(params);
+        return new Result<PageData<PlacePatrolReviewRecordDTO>>().ok(page);
+    }
+
+    @GetMapping("{id}")
+    public Result<PlacePatrolReviewRecordDTO> get(@PathVariable("id") String id){
+        PlacePatrolReviewRecordDTO data = placePatrolReviewRecordService.get(id);
+        return new Result<PlacePatrolReviewRecordDTO>().ok(data);
+    }
+
+    @PostMapping
+    public Result save(@RequestBody PlacePatrolReviewRecordDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+        placePatrolReviewRecordService.save(dto);
+        return new Result();
+    }
+
+    @PutMapping
+    public Result update(@RequestBody PlacePatrolReviewRecordDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+        placePatrolReviewRecordService.update(dto);
+        return new Result();
+    }
+
+    @DeleteMapping
+    public Result delete(@RequestBody String[] ids){
+        //效验数据
+        AssertUtils.isArrayEmpty(ids, "id");
+        placePatrolReviewRecordService.delete(ids);
+        return new Result();
+    }
+
+    @GetMapping("export")
+    public void export(@RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
+        List<PlacePatrolReviewRecordDTO> list = placePatrolReviewRecordService.list(params);
+        ExcelUtils.exportExcelToTarget(response, null, list, PlacePatrolReviewRecordExcel.class);
+    }
+
+}

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

@@ -0,0 +1,94 @@
+/**
+ * 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.controller;
+
+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.dto.PlacePatrolTeamDTO;
+import com.epmet.excel.PlacePatrolTeamExcel;
+import com.epmet.service.PlacePatrolTeamService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * 场所分队管理
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-11-18
+ */
+@RestController
+@RequestMapping("placepatrolteam")
+public class PlacePatrolTeamController {
+    
+    @Autowired
+    private PlacePatrolTeamService placePatrolTeamService;
+
+    @GetMapping("page")
+    public Result<PageData<PlacePatrolTeamDTO>> page(@RequestParam Map<String, Object> params){
+        PageData<PlacePatrolTeamDTO> page = placePatrolTeamService.page(params);
+        return new Result<PageData<PlacePatrolTeamDTO>>().ok(page);
+    }
+
+    @GetMapping("{id}")
+    public Result<PlacePatrolTeamDTO> get(@PathVariable("id") String id){
+        PlacePatrolTeamDTO data = placePatrolTeamService.get(id);
+        return new Result<PlacePatrolTeamDTO>().ok(data);
+    }
+
+    @PostMapping
+    public Result save(@RequestBody PlacePatrolTeamDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+        placePatrolTeamService.save(dto);
+        return new Result();
+    }
+
+    @PutMapping
+    public Result update(@RequestBody PlacePatrolTeamDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+        placePatrolTeamService.update(dto);
+        return new Result();
+    }
+
+    @DeleteMapping
+    public Result delete(@RequestBody String[] ids){
+        //效验数据
+        AssertUtils.isArrayEmpty(ids, "id");
+        placePatrolTeamService.delete(ids);
+        return new Result();
+    }
+
+    @GetMapping("export")
+    public void export(@RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
+        List<PlacePatrolTeamDTO> list = placePatrolTeamService.list(params);
+        ExcelUtils.exportExcelToTarget(response, null, list, PlacePatrolTeamExcel.class);
+    }
+
+}

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

@@ -0,0 +1,94 @@
+/**
+ * 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.controller;
+
+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.dto.PlacePatrolTeamStaffDTO;
+import com.epmet.excel.PlacePatrolTeamStaffExcel;
+import com.epmet.service.PlacePatrolTeamStaffService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * 场所分队下人员管理
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-11-18
+ */
+@RestController
+@RequestMapping("placepatrolteamstaff")
+public class PlacePatrolTeamStaffController {
+    
+    @Autowired
+    private PlacePatrolTeamStaffService placePatrolTeamStaffService;
+
+    @GetMapping("page")
+    public Result<PageData<PlacePatrolTeamStaffDTO>> page(@RequestParam Map<String, Object> params){
+        PageData<PlacePatrolTeamStaffDTO> page = placePatrolTeamStaffService.page(params);
+        return new Result<PageData<PlacePatrolTeamStaffDTO>>().ok(page);
+    }
+
+    @GetMapping("{id}")
+    public Result<PlacePatrolTeamStaffDTO> get(@PathVariable("id") String id){
+        PlacePatrolTeamStaffDTO data = placePatrolTeamStaffService.get(id);
+        return new Result<PlacePatrolTeamStaffDTO>().ok(data);
+    }
+
+    @PostMapping
+    public Result save(@RequestBody PlacePatrolTeamStaffDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+        placePatrolTeamStaffService.save(dto);
+        return new Result();
+    }
+
+    @PutMapping
+    public Result update(@RequestBody PlacePatrolTeamStaffDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+        placePatrolTeamStaffService.update(dto);
+        return new Result();
+    }
+
+    @DeleteMapping
+    public Result delete(@RequestBody String[] ids){
+        //效验数据
+        AssertUtils.isArrayEmpty(ids, "id");
+        placePatrolTeamStaffService.delete(ids);
+        return new Result();
+    }
+
+    @GetMapping("export")
+    public void export(@RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
+        List<PlacePatrolTeamStaffDTO> list = placePatrolTeamStaffService.list(params);
+        ExcelUtils.exportExcelToTarget(response, null, list, PlacePatrolTeamStaffExcel.class);
+    }
+
+}

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

@@ -0,0 +1,33 @@
+/**
+ * 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.dao;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.entity.IcMatterAppointmentRecordEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 事项预约记录
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-11-18
+ */
+@Mapper
+public interface IcMatterAppointmentRecordDao extends BaseDao<IcMatterAppointmentRecordEntity> {
+	
+}

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

@@ -0,0 +1,33 @@
+/**
+ * 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.dao;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.entity.IcPartyServiceCenterEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 党群服务中心
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-11-18
+ */
+@Mapper
+public interface IcPartyServiceCenterDao extends BaseDao<IcPartyServiceCenterEntity> {
+	
+}

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

@@ -0,0 +1,33 @@
+/**
+ * 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.dao;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.entity.IcPartyServiceCenterMatterEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 党群服务中心可预约事项表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-11-18
+ */
+@Mapper
+public interface IcPartyServiceCenterMatterDao extends BaseDao<IcPartyServiceCenterMatterEntity> {
+	
+}

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

@@ -0,0 +1,33 @@
+/**
+ * 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.dao;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.entity.PlaceOrgEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 九小场所下组织管理
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-11-18
+ */
+@Mapper
+public interface PlaceOrgDao extends BaseDao<PlaceOrgEntity> {
+	
+}

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

@@ -0,0 +1,33 @@
+/**
+ * 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.dao;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.entity.PlacePatrolRecordEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 场所巡查记录
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-11-18
+ */
+@Mapper
+public interface PlacePatrolRecordDao extends BaseDao<PlacePatrolRecordEntity> {
+	
+}

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

@@ -0,0 +1,33 @@
+/**
+ * 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.dao;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.entity.PlacePatrolReviewRecordEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 场所巡查复查记录
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-11-18
+ */
+@Mapper
+public interface PlacePatrolReviewRecordDao extends BaseDao<PlacePatrolReviewRecordEntity> {
+	
+}

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

@@ -0,0 +1,33 @@
+/**
+ * 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.dao;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.entity.PlacePatrolTeamEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 场所分队管理
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-11-18
+ */
+@Mapper
+public interface PlacePatrolTeamDao extends BaseDao<PlacePatrolTeamEntity> {
+	
+}

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

@@ -0,0 +1,33 @@
+/**
+ * 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.dao;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.entity.PlacePatrolTeamStaffEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 场所分队下人员管理
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-11-18
+ */
+@Mapper
+public interface PlacePatrolTeamStaffDao extends BaseDao<PlacePatrolTeamStaffEntity> {
+	
+}

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcMatterAppointmentRecordEntity.java

@@ -0,0 +1,101 @@
+/**
+ * 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.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+/**
+ * 事项预约记录
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-11-18
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("ic_matter_appointment_record")
+public class IcMatterAppointmentRecordEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 
+     */
+	private String customerId;
+
+    /**
+     * 组织ID
+     */
+	private String orgId;
+
+    /**
+     * 组织类型，agency：组织，grid：网格
+     */
+	private String orgType;
+
+    /**
+     * 
+     */
+	private String pid;
+
+    /**
+     * 
+     */
+	private String pids;
+
+    /**
+     * 事项ID
+     */
+	private String matterId;
+
+    /**
+     * 预约日期
+     */
+	private String appointmentDate;
+
+    /**
+     * 预约人
+     */
+	private String appointmentName;
+
+    /**
+     * 预约电话
+     */
+	private String appointmentPhone;
+
+    /**
+     * 备注
+     */
+	private String remark;
+
+    /**
+     * 预约状态【cancel：取消，appointing：预约中】
+     */
+	private String status;
+
+    /**
+     * 1,2,5
+     */
+	private String timeId;
+
+}

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcPartyServiceCenterEntity.java

@@ -0,0 +1,111 @@
+/**
+ * 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.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+/**
+ * 党群服务中心
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-11-18
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("ic_party_service_center")
+public class IcPartyServiceCenterEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 客户ID
+     */
+	private String customerId;
+
+    /**
+     * 组织ID
+     */
+	private String orgId;
+
+    /**
+     * 组织类型，agency：组织，grid：网格
+     */
+	private String orgType;
+
+    /**
+     * 
+     */
+	private String pid;
+
+    /**
+     * 
+     */
+	private String pids;
+
+    /**
+     * 中心名称
+     */
+	private String centerName;
+
+    /**
+     * 办公电话
+     */
+	private String workPhone;
+
+    /**
+     * 上午开始办公时间
+     */
+	private String amStartTime;
+
+    /**
+     * 上午结束办公时间
+     */
+	private String amEndTime;
+
+    /**
+     * 下午开始办公时间
+     */
+	private String pmStartTime;
+
+    /**
+     * 下午结束办公时间
+     */
+	private String pmEndTime;
+
+    /**
+     * 经度
+     */
+	private String longitude;
+
+    /**
+     * 纬度
+     */
+	private String latitude;
+
+    /**
+     * 地址
+     */
+	private String address;
+
+}

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcPartyServiceCenterMatterEntity.java

@@ -0,0 +1,71 @@
+/**
+ * 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.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+/**
+ * 党群服务中心可预约事项表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-11-18
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("ic_party_service_center_matter")
+public class IcPartyServiceCenterMatterEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 党群服务中心ID
+     */
+	private String partyServiceCenterId;
+
+    /**
+     * 事项名字
+     */
+	private String matterName;
+
+    /**
+     * 预约类型，每天：everyDay，工作日：workDay，周末：weekend
+     */
+	private String appointmentType;
+
+    /**
+     * 可预约开始时间
+     */
+	private String startTime;
+
+    /**
+     * 可预约结束时间
+     */
+	private String endTime;
+
+    /**
+     * 客户ID
+     */
+	private String customerId;
+
+}

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/PlaceOrgEntity.java

@@ -0,0 +1,101 @@
+/**
+ * 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.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+/**
+ * 九小场所下组织管理
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-11-18
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("place_org")
+public class PlaceOrgEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 客户Id
+     */
+	private String customerId;
+
+    /**
+     * 组织Id
+     */
+	private String agencyId;
+
+    /**
+     * agency_id的所有上级
+     */
+	private String pids;
+
+    /**
+     * 网格Id【场所区域】
+     */
+	private String gridId;
+
+    /**
+     * 场所类型【admin库sys_dict_data表九小场所value值】
+     */
+	private String ninePlaceVal;
+
+    /**
+     * 场所名称
+     */
+	private String placeOrgName;
+
+    /**
+     * 场所地址
+     */
+	private String address;
+
+    /**
+     * 字典value,场所规模【
+0:10人以下
+1:10-20人
+2:21-40人
+3:41-100人
+4:100人以上】
+     */
+	private String scale;
+
+    /**
+     * 场所负责人
+     */
+	private String personInCharge;
+
+    /**
+     * 负责人电话
+     */
+	private String mobile;
+
+    /**
+     * 备注
+     */
+	private String remarks;
+
+}

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/PlacePatrolRecordEntity.java

@@ -0,0 +1,116 @@
+/**
+ * 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.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+/**
+ * 场所巡查记录
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-11-18
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("place_patrol_record")
+public class PlacePatrolRecordEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 客户Id
+     */
+	private String customerId;
+
+    /**
+     * 组织Id
+     */
+	private String agencyId;
+
+    /**
+     * agency_id的所有上级
+     */
+	private String pids;
+
+    /**
+     * 网格Id【场所区域】
+     */
+	private String gridId;
+
+    /**
+     * 场所类型【admin库sys_dict_data表九小场所value值】
+     */
+	private String ninePlacsVal;
+
+    /**
+     * 场所下的组织Id
+     */
+	private String placeOrgId;
+
+    /**
+     * 场所下分队(place_patrolteam)表Id
+     */
+	private String placePatrolTeamId;
+
+    /**
+     * 分队下检查人员Id，分号分隔
+     */
+	private String inspectors;
+
+    /**
+     * 首次巡查时间
+     */
+	private Date firstTime;
+
+    /**
+     * 隐患明细
+     */
+	private String detailed;
+
+    /**
+     * 首次检查结果【0:合格 1:不合格】
+     */
+	private String firstResult;
+
+    /**
+     * 拟复查时间
+     */
+	private Date reviewTime;
+
+    /**
+     * 最终检查结果【0:合格 1:不合格】初始数据默认和首次检查结果相同
+     */
+	private String finalResult;
+
+    /**
+     * 最新复查时间【初始数据默认和首次巡查时间相同】
+     */
+	private Date finalTime;
+
+    /**
+     * 备注
+     */
+	private String remarks;
+
+}

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/PlacePatrolReviewRecordEntity.java

@@ -0,0 +1,81 @@
+/**
+ * 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.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+/**
+ * 场所巡查复查记录
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-11-18
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("place_patrol_review_record")
+public class PlacePatrolReviewRecordEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 客户Id
+     */
+	private String customerId;
+
+    /**
+     * 巡查记录主(place_patrol_record)表Id
+     */
+	private String placePatrolRecordId;
+
+    /**
+     * 场所下分队(place_patrol_team)表Id
+     */
+	private String placePatrolTeamId;
+
+    /**
+     * 检查人员Id，逗号分隔
+     */
+	private String inspectors;
+
+    /**
+     * 复查时间
+     */
+	private Date reviewTime;
+
+    /**
+     * 复查隐患明细
+     */
+	private String detailed;
+
+    /**
+     * 复查检查结果【0:合格 1:不合格】
+     */
+	private String reviewResult;
+
+    /**
+     * 备注
+     */
+	private String remarks;
+
+}

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/PlacePatrolTeamEntity.java

@@ -0,0 +1,96 @@
+/**
+ * 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.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+/**
+ * 场所分队管理
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-11-18
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("place_patrol_team")
+public class PlacePatrolTeamEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 客户Id
+     */
+	private String customerId;
+
+    /**
+     * 组织Id
+     */
+	private String agencyId;
+
+    /**
+     * agency_id的所有上级
+     */
+	private String pids;
+
+    /**
+     * 负责区域【网格Id 多个值逗号分隔】
+     */
+	private String gridIds;
+
+    /**
+     * 负责场所类型【admin库sys_dict_data表九小场所value值 多个值逗号分隔】
+     */
+	private String ninePlacsVals;
+
+    /**
+     * 分队名称
+     */
+	private String teamName;
+
+    /**
+     * 巡查计划
+     */
+	private String plan;
+
+    /**
+     * 创建(建队)时间
+     */
+	private Date time;
+
+    /**
+     * 场所负责人
+     */
+	private String personInCharge;
+
+    /**
+     * 负责人电话
+     */
+	private String mobile;
+
+    /**
+     * 备注
+     */
+	private String remarks;
+
+}

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/PlacePatrolTeamStaffEntity.java

@@ -0,0 +1,66 @@
+/**
+ * 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.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+/**
+ * 场所分队下人员管理
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-11-18
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("place_patrol_team_staff")
+public class PlacePatrolTeamStaffEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 客户Id
+     */
+	private String customerId;
+
+    /**
+     * 巡查分队(place_patrol_team)表Id
+     */
+	private String placePatrolTeamId;
+
+    /**
+     * 成员姓名
+     */
+	private String name;
+
+    /**
+     * 成员电话
+     */
+	private String mobile;
+
+    /**
+     * 备注
+     */
+	private String remarks;
+
+}

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcMatterAppointmentRecordExcel.java

@@ -0,0 +1,92 @@
+/**
+ * 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.excel;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 事项预约记录
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-11-18
+ */
+@Data
+public class IcMatterAppointmentRecordExcel {
+
+    @Excel(name = "")
+    private String id;
+
+    @Excel(name = "")
+    private String customerId;
+
+    @Excel(name = "组织ID")
+    private String orgId;
+
+    @Excel(name = "组织类型，agency：组织，grid：网格")
+    private String orgType;
+
+    @Excel(name = "")
+    private String pid;
+
+    @Excel(name = "")
+    private String pids;
+
+    @Excel(name = "事项ID")
+    private String matterId;
+
+    @Excel(name = "预约日期")
+    private String appointmentDate;
+
+    @Excel(name = "预约人")
+    private String appointmentName;
+
+    @Excel(name = "预约电话")
+    private String appointmentPhone;
+
+    @Excel(name = "备注")
+    private String remark;
+
+    @Excel(name = "预约状态【cancel：取消，appointing：预约中】")
+    private String status;
+
+    @Excel(name = "")
+    private Integer delFlag;
+
+    @Excel(name = "乐观锁")
+    private String revision;
+
+    @Excel(name = "创建人")
+    private String createdBy;
+
+    @Excel(name = "创建时间")
+    private Date createdTime;
+
+    @Excel(name = "更新人")
+    private String updatedBy;
+
+    @Excel(name = "更新时间")
+    private Date updatedTime;
+
+    @Excel(name = "1,2,5")
+    private String timeId;
+
+
+}