Merge branches 'dev_5big_coverage' and 'master' of http://121.42.41.42:7070/r/epmet-cloud into dev_5big_coverage

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/LouDongTreeNodeUtils.java

@@ -0,0 +1,34 @@
+package com.epmet.commons.tools.utils;
+
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+public class LouDongTreeNodeUtils {
+
+    /**
+     * 构建树节点
+     */
+    public static <T extends LoudongTreeNode> List<T> build(List<T> treeNodes) {
+        List<T> result = new ArrayList<>();
+
+        //list转map
+        Map<String, T> nodeMap = new LinkedHashMap<>(treeNodes.size());
+        for(T treeNode : treeNodes){
+            nodeMap.put(treeNode.getId(), treeNode);
+        }
+
+        for(T node : nodeMap.values()) {
+            T parent = nodeMap.get(node.getPid());
+            if(parent != null && !(node.getId().equals(parent.getId()))){
+                parent.getChildren().add(node);
+                continue;
+            }
+
+            result.add(node);
+        }
+
+        return result;
+    }
+}

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/LoudongTreeNode.java

@@ -0,0 +1,48 @@
+package com.epmet.commons.tools.utils;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+
+public class LoudongTreeNode<T> implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+    /**
+     * 主键
+     */
+    private String id;
+    /**
+     * 上级ID
+     */
+    private String pid;
+    /**
+     * 子节点列表
+     */
+    private List<T> children = new ArrayList<>();
+
+
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getPid() {
+        return pid;
+    }
+
+    public void setPid(String pid) {
+        this.pid = pid;
+    }
+
+    public List<T> getChildren() {
+        return children;
+    }
+
+    public void setChildren(List<T> children) {
+        this.children = children;
+    }
+}

epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/GuardarDatosTask.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Component;
 import javax.annotation.Resource;
 
 /**
- * 获取流动人口的数据存入ca_开头的表
+ * 获取ruoyi系统数据存入表内
  *
  * @param
  * @author LZN

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

@@ -98,7 +98,7 @@ public class ImportGeneralDTO implements Serializable {
     private String purpose;
 
     /**
-     * 房屋状态 1：出租 0：自住  2：闲置
+     * 房屋状态 1：出租 0：自住  2：闲置 3:未出售
      */
     private String rentFlagString;
     private Integer rentFlag;

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

@@ -15,4 +15,8 @@ public class GetAgencyListFormDTO implements Serializable {
     private static final long serialVersionUID = -5846836779036328298L;
 
     private String customerId;
+
+
+    //当前登录用户id，从tokenDto中获取
+    private String userId;
 }

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

@@ -81,7 +81,7 @@ public class IcHouseAddFormDTO implements Serializable {
     private String purpose;
 
     /**
-     * 1：出租 0：自住  2：闲置
+     * 1：出租 0：自住  2：闲置 3: 未出售
      */
     @NotNull(message = "房屋状态不能为空", groups = {AddShowGroup.class, UpdateShowGroup.class})
     private Integer rentFlag;

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

@@ -48,7 +48,7 @@ public class IcHouseListFormDTO extends PageFormDTO {
      */
     private String ownerPhone;
     /**
-     * 房屋状态 【1：出租 0：自住  2：闲置】
+     * 房屋状态 【1：出租 0：自住  2：闲置 3:未出售】
      */
     private String rentFlag;
     /**

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

@@ -50,7 +50,7 @@ public class HouseChartResultDTO implements Serializable {
 
     @JsonIgnore
     private Integer num;
-    //1：出租 0：自住  2：闲置
+    //1：出租 0：自住  2：闲置 3:未出售
     @JsonIgnore
     private Integer rentFlag;
 

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/enums/HouseRentFlagEnums.java

@@ -8,7 +8,8 @@ public enum HouseRentFlagEnums {
     NO(0,"否");*/
     HOUSE_ZZ(0,"自住"),
     HOUSE_CZ(1,"出租"),
-    HOUSE_XZ(2,"闲置");
+    HOUSE_XZ(2,"闲置"),
+    HOUSE_WCS(3,"未出售");
 
 
 
@@ -41,7 +42,7 @@ public enum HouseRentFlagEnums {
 
     public static Integer getCodeByName(String name){
         if(StringUtils.isEmpty(name)){
-            return 0;
+            return null;
         }
         for (HouseRentFlagEnums e : HouseRentFlagEnums.values()) {
             if (e.getName().equals(name)) {

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

@@ -354,6 +354,20 @@ public class CustomerAgencyController {
         return new Result<AgencyTreeResultDTO>().ok(customerAgencyService.getAgencyList(formDTO));
     }
 
+    /**
+     * 工作端，获取当前登录用户所属组织及下级的组织树（不包括网格！！！！！！！！！！）
+     * @param tokenDTO
+     * @param formDTO
+     * @return
+     */
+    @PostMapping("my-subagency-list")
+    public Result<AgencyTreeResultDTO> getMySubAgencyList(@LoginUser TokenDto tokenDTO,@RequestBody GetAgencyListFormDTO formDTO) {
+        formDTO.setCustomerId(tokenDTO.getCustomerId());
+        formDTO.setUserId(tokenDTO.getUserId());
+        return new Result<AgencyTreeResultDTO>().ok(customerAgencyService.getMySubAgencyList(formDTO));
+    }
+
+
     /**
      * @description 通过staffId查询跟组织列表
      *

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

@@ -250,7 +250,7 @@ public interface CustomerAgencyDao extends BaseDao<CustomerAgencyEntity> {
      */
     OrgResultDTO selectAgencyDetail(@Param("orgId") String orgId, @Param("orgType") String orgType);
 
-    AgencyTreeResultDTO getAllAgency(@Param("customerId") String customerId);
+    AgencyTreeResultDTO getAllAgency(@Param("customerId") String customerId,@Param("staffAgencyId")String staffAgencyId);
 
     List<AgencyTreeResultDTO> getSubAgencyList(@Param("pid") String pid);
 

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

@@ -83,7 +83,7 @@ public class IcHouseEntity extends BaseEpmetEntity {
 	private String purpose;
 
     /**
-     * 1出租；0未出租
+     * 1：出租 0：自住  2：闲置 3：未出售
      */
 	private Integer rentFlag;
 

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportHouseInfoListener.java

@@ -191,12 +191,14 @@ public class ImportHouseInfoListener extends AnalysisEventListener<HouseInfoMode
             return;
         }
         dto.setPurpose(HousePurposeEnums.getKeyByValue(dto.getPurpose()));
-        if (StringUtils.isNotBlank(dto.getRentFlagString()) && (!dto.getRentFlagString().equals("自住") && !dto.getRentFlagString().equals("出租") && !dto.getRentFlagString().equals("闲置"))){
+        //根据name 获取code 名字没有匹配返回null
+        Integer rentFlagCode = HouseRentFlagEnums.getCodeByName(dto.getRentFlagString());
+        if (StringUtils.isNotBlank(dto.getRentFlagString()) && rentFlagCode == null){
             nums.add(num);
             disposeErrorMsg(info,"房屋状态的值未填写或者所填写信息在系统中未找到");
             return;
         }
-        dto.setRentFlag(HouseRentFlagEnums.getCodeByName(dto.getRentFlagString()));
+        dto.setRentFlag(rentFlagCode);
         dto.setHouseName(dto.getBuildingName()+"-"+dto.getBuildingUnit()+"-"+dto.getDoorName());
         if (formDTO.getOrgType().equals(CustomerGridConstant.BUILDING)){
             disposeBuildingHouse(dto);

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

@@ -255,6 +255,13 @@ public interface CustomerAgencyService extends BaseService<CustomerAgencyEntity>
      */
     AgencyTreeResultDTO getAgencyList(GetAgencyListFormDTO formDTO);
 
+    /**
+     * 工作端，获取当前登录用户所属组织及下级的组织树（不包括网格！！！！！！！！！！）
+     * @param formDTO
+     * @return
+     */
+    AgencyTreeResultDTO getMySubAgencyList(GetAgencyListFormDTO formDTO);
+
     List<StaffOrgsResultDTO> getStaffOrgListByStaffId(String staffId);
 
     /**

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

@@ -24,6 +24,7 @@ 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.constant.StrConstant;
+import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult;
 import com.epmet.commons.tools.enums.PartyOrgTypeEnum;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.EpmetException;
@@ -32,6 +33,7 @@ import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.redis.RedisKeys;
 import com.epmet.commons.tools.redis.RedisUtils;
 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.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.Result;
@@ -1136,7 +1138,7 @@ public class CustomerAgencyServiceImpl extends BaseServiceImpl<CustomerAgencyDao
      */
     @Override
     public AgencyTreeResultDTO getAgencyList(GetAgencyListFormDTO formDTO) {
-        AgencyTreeResultDTO agency = baseDao.getAllAgency(formDTO.getCustomerId());
+        AgencyTreeResultDTO agency = baseDao.getAllAgency(formDTO.getCustomerId(),null);
         if (CollectionUtils.isEmpty(agency.getSubAgencyList())) {
             agency.setSubAgencyList(null);
         } else {
@@ -1145,6 +1147,28 @@ public class CustomerAgencyServiceImpl extends BaseServiceImpl<CustomerAgencyDao
         return agency;
     }
 
+    /**
+     * 工作端，获取当前登录用户所属组织及下级的组织树（不包括网格！！！！！！！！！！）
+     * @param formDTO
+     * @return
+     */
+    @Override
+    public AgencyTreeResultDTO getMySubAgencyList(GetAgencyListFormDTO formDTO) {
+        CustomerStaffInfoCacheResult staffInfoCacheResult = CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(), formDTO.getUserId());
+        if (null == staffInfoCacheResult || StringUtils.isBlank(staffInfoCacheResult.getAgencyId())) {
+            log.warn("com.epmet.service.impl.CustomerAgencyServiceImpl.getMySubAgencyList，没有找到工作人员所属的机关信息，用户Id：{}", formDTO.getUserId());
+            throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),"获取用户组织信息异常","获取用户组织信息异常");
+        }
+        AgencyTreeResultDTO agency = baseDao.getAllAgency(formDTO.getCustomerId(),staffInfoCacheResult.getAgencyId());
+        if (CollectionUtils.isEmpty(agency.getSubAgencyList())) {
+            agency.setSubAgencyList(null);
+        } else {
+            setAgencyList(agency.getSubAgencyList());
+        }
+        return agency;
+    }
+
+
     @Override
     public AgencyTreeResultDTO getOrgTreeData(String staffId) {
         AgencyTreeResultDTO result = new AgencyTreeResultDTO();

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

@@ -1,6 +1,5 @@
 package com.epmet.service.impl;
 
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -222,19 +221,8 @@ public class IcHouseServiceImpl extends BaseServiceImpl<IcHouseDao, IcHouseEntit
             HouseListResultDTO dto = new HouseListResultDTO();
             dto.setHouseId(item.getId());
             dto.setHouseName(item.getHouseName());
-            switch (item.getRentFlag()) {
-                case NumConstant.ZERO:
-                    dto.setRentFlag("自住");
-                    break;
-                case NumConstant.ONE:
-                    dto.setRentFlag("出租");
-                    break;
-                case NumConstant.TWO:
-                    dto.setRentFlag("闲置");
-                    break;
-                default:
-                    break;
-            }
+            String houseTypeName = HouseRentFlagEnums.getTypeValue(item.getRentFlag());
+            dto.setRentFlag(houseTypeName == null ? StrConstant.EPMETY_STR:houseTypeName);
             List<HouseListResultDTO.CategoryListBean> categories = new ArrayList<>();
             if (null != countMap && CollectionUtils.isNotEmpty(categoryList)) {
                 for (IcResiCategoryStatsConfigDTO category : categoryList) {
@@ -302,4 +290,4 @@ public class IcHouseServiceImpl extends BaseServiceImpl<IcHouseDao, IcHouseEntit
         lqw.eq(IcHouseEntity::getHouseCode, houseCode);
         return ConvertUtils.sourceToTarget(baseDao.selectOne(lqw), IcHouseDTO.class);
     }
-}
+}

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

@@ -620,7 +620,9 @@
         AND PID= #{pid}
         ORDER BY ID
     </select>
-    <select id="getAllAgency" resultMap="NodeTreeResult">
+
+    <!-- 如果传入了 staffAgencyId 查询当前组织及下级没有的话查询客户下所有组织   -->
+    <select id="getAllAgency" parameterType="map" resultMap="NodeTreeResult">
         select
             ID AS agencyId,
             ORGANIZATION_NAME AS agencyName,
@@ -630,8 +632,13 @@
             customer_agency
         where
              DEL_FLAG = 0
-            AND PID ='0'
             AND CUSTOMER_ID = #{customerId}
+            <if test="staffAgencyId != null and staffAgencyId != ''">
+                AND id = #{staffAgencyId}
+            </if>
+            <if test="staffAgencyId == null || staffAgencyId == ''">
+                AND PID ='0'
+            </if>
     </select>
 
     <select id="getStaffOrgListByStaffId" resultType="com.epmet.dto.result.StaffOrgsResultDTO">

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

@@ -96,6 +96,7 @@
         (case when a.RENT_FLAG = '0' then '自住'
         when a.RENT_FLAG = '1' then '出租'
         when a.RENT_FLAG = '2' then '闲置'
+        when a.RENT_FLAG = '3' then '未出售'
         else '' end) as rentFlag,
         a.OWNER_NAME as ownerName,
         a.OWNER_PHONE as ownerPhone,
@@ -467,6 +468,7 @@
         (case when a.RENT_FLAG = '0' then '自住'
         when a.RENT_FLAG = '1' then '出租'
         when a.RENT_FLAG = '2' then '闲置'
+        when a.RENT_FLAG = '3' then '未出售'
         else '' end) as rentFlag,
         a.OWNER_NAME as ownerName,
         a.OWNER_PHONE as ownerPhone,

epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/ca/CaBmCategoryDTO.java

@@ -0,0 +1,129 @@
+package com.epmet.opendata.dto.ca;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+
+/**
+ * 多级类型信息表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-06-16
+ */
+@Data
+public class CaBmCategoryDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 类别ID
+     */
+	private Long categoryId;
+
+    /**
+     * 名称
+     */
+	private String categoryName;
+
+    /**
+     *
+     */
+	private String categoryType;
+
+    /**
+     * 名称值
+     */
+	private String categoryValue;
+
+    /**
+     * 父类别ID
+     */
+	private Long parentCategoryId;
+
+    /**
+     * 展示顺序
+     */
+	private Integer categorySort;
+
+    /**
+     * 创建人
+     */
+	private Long createBy;
+
+    /**
+     * 创建时间
+     */
+	private Date createDate;
+
+    /**
+     * 最后修改人
+     */
+	private Long updateBy;
+
+    /**
+     * 最后修改时间
+     */
+	private Date updateDate;
+
+    /**
+     * 删除状态
+     */
+	private String deleteFlag;
+
+    /**
+     * 乐观锁
+     */
+	private Integer versions;
+
+    /**
+     * 扩展字段1
+     */
+	private String attribute1;
+
+    /**
+     * 扩展字段2
+     */
+	private String attribute2;
+
+    /**
+     * 扩展字段3
+     */
+	private String attribute3;
+
+    /**
+     * 扩展字段4
+     */
+	private String attribute4;
+
+    /**
+     * 扩展字段5
+     */
+	private String attribute5;
+
+    /**
+     * 扩展字段6
+     */
+	private Long attribute6;
+
+    /**
+     * 扩展字段7
+     */
+	private Long attribute7;
+
+    /**
+     * 扩展字段8
+     */
+	private Long attribute8;
+
+    /**
+     * 扩展字段9
+     */
+	private Date attribute9;
+
+    /**
+     * 扩展字段10
+     */
+	private Date attribute10;
+
+}

epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/ca/CaSysDictDTO.java

@@ -0,0 +1,79 @@
+package com.epmet.opendata.dto.ca;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+
+/**
+ * 字典信息表，字典值和字典组均存入此表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-06-16
+ */
+@Data
+public class CaSysDictDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 字典ID
+     */
+	private Long dictId;
+
+    /**
+     * 字典值，例如：sex/F
+     */
+	private String dictValue;
+
+    /**
+     * 1.字典组名称（性别）或者字典名称（女）
+     */
+	private String dictLabel;
+
+    /**
+     * 字典值时存入字典的值，字典组时存null
+     */
+	private String dictType;
+
+    /**
+     * 描述
+     */
+	private String dictDesc;
+
+    /**
+     * 排序
+     */
+	private Integer dictSort;
+
+    /**
+     * 创建人
+     */
+	private Long createBy;
+
+    /**
+     * 创建时间
+     */
+	private Date createDate;
+
+    /**
+     * 最后修改人
+     */
+	private Long updateBy;
+
+    /**
+     * 最后修改时间
+     */
+	private Date updateDate;
+
+    /**
+     * 字典值：normal正常，deleted正常
+     */
+	private String deleteFlag;
+
+    /**
+     * 乐观锁
+     */
+	private Integer versions;
+
+}

epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/constant/CaWghDataConstant.java

@@ -7,20 +7,42 @@ package com.epmet.opendata.dto.constant;
  */
 public interface CaWghDataConstant {
 
+    int PAGE_LIMIT = 200;
 
     String AESKEY = "hriajrutnbghajsd";
 
     String TABLESCHEMA_UNICOM = "unicom";
-
-    String UNICOM_PINGFANG = "ca_pingfang";
+    String TABLESCHEMA_SHARE = "share";
 
 
+    String UNICOM_PINGFANG = "ca_pingfang";
     String UNICOM_LOUDONG = "ca_loudong";
     String UNICOM_RESIDENT = "ca_resident";
     String UNICOM_ROTATORS = "ca_rotators";
     String UNICOM_RENTAL = "ca_rental";
+    String UNICOM_BM_CATEGORY = "ca_bm_category";
+    String UNICOM_SYS_DICT = "ca_sys_dict";
+
+    String SHARE_BASE_GRID = "wgh_base_grid";
+    String SHARE_WGH_SUB = "wgh_subdistrict_office";
+    String SHARE_BM_GRID = "ca_bm_grid";
+    String SHARE_COMMUNITY = "wgh_community";
+    String SHARE_WGH_DYWG = "wgh_dywg";
+    String SHARE_WGH_JDB = "wgh_jdb";
+    String SHARE_WGH_JQZ = "wgh_jqz";
+    String SHARE_WGH_JXCS = "wgh_jxcs";
+    String SHARE_WGH_JYZ = "wgh_jyz";
+    String SHARE_WGH_SJXX = "wgh_sjxxb";
+    String SHARE_WGH_SQXX = "wgh_sqxx";
+    String SHARE_WGH_SZCGWGH = "wgh_szcgwgh";
+    String SHARE_WGH_SZZRWG = "wgh_szzrwg";
+    String SHARE_WGH_WHPDW = "wgh_whpdw";
+    String SHARE_WGH_YJBMCS = "wgh_yjbmcs";
+    String SHARE_WGH_YQHJZ = "wgh_yqhjz";
 
     String DATA_URL_UNICON = "http://120.221.72.83:9090/bridge/unicom/page";
+    String DATA_URL_SHARE = "http://120.221.72.83:9090/bridge/share/sharePage";
 
     String UNICOM_CONDITION = "unicomCondition";
+    String SHARE_CONDITION = "shareCondition";
 }

epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/form/CaLoudongFormDTO.java

@@ -20,6 +20,11 @@ public class CaLoudongFormDTO  implements Serializable {
      */
     private String buildingName;
 
+    /**
+     * 网格id
+     */
+    private String gridId;
+
     private Integer page;
     private Integer limit;
 

epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/form/CaPingfangFormDTO.java

@@ -19,6 +19,11 @@ public class CaPingfangFormDTO implements Serializable {
      */
     private String communityName;
 
+    /**
+     * 网格id
+     */
+    private String gridId;
+
     private Integer page;
 
     private Integer limit;

epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/form/CaRentalFormtDTO.java

@@ -19,6 +19,11 @@ public class CaRentalFormtDTO implements Serializable {
      */
     private String houseName;
 
+    /**
+     * 网格id
+     */
+    private String gridId;
+
     /**
      * 承租人姓名
      */

epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/form/CaResidentFormDTO.java

@@ -28,4 +28,9 @@ public class CaResidentFormDTO implements Serializable {
      */
     private String telephone;
 
+    /**
+     * 网格id
+     */
+    private String gridId;
+
 }

epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/form/CaRotatorsFormDTO.java

@@ -25,6 +25,11 @@ public class CaRotatorsFormDTO implements Serializable {
      */
     private String telephone;
 
+    /**
+     * 网格id
+     */
+    private String gridId;
+
     private Integer page;
     private Integer limit;
 }

epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/result/CaLoudongResultDTO.java

@@ -12,6 +12,12 @@ public class CaLoudongResultDTO extends PageFormDTO implements Serializable {
 
     private static final long serialVersionUID = 2835612060476537433L;
 
+    private String gridName;
+
+    private String comName;
+
+    private String streetName;
+
     /**
      * 楼栋ID
      */

epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/result/CaPingfangResultDTO.java

@@ -12,6 +12,12 @@ public class CaPingfangResultDTO extends PageFormDTO implements Serializable {
 
     private static final long serialVersionUID = 3689421598802326474L;
 
+    private String gridName;
+
+    private String comName;
+
+    private String streetName;
+
     /**
      * 楼栋ID
      */

epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/result/CaRentalResultDTO.java

@@ -10,6 +10,12 @@ public class CaRentalResultDTO implements Serializable {
 
     private static final long serialVersionUID = -1721373620271590333L;
 
+    private String gridName;
+
+    private String comName;
+
+    private String streetName;
+
     /**
      * 出租房ID
      */

epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/result/CaResidentResultDTO.java

@@ -10,6 +10,12 @@ public class CaResidentResultDTO implements Serializable {
 
     private static final long serialVersionUID = 3876909002181822355L;
 
+    private String gridName;
+
+    private String comName;
+
+    private String streetName;
+
     /**
      * 人口ID
      */

epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/result/CaRotatorsResultDTO.java

@@ -10,6 +10,12 @@ public class CaRotatorsResultDTO implements Serializable {
 
     private static final long serialVersionUID = -5388784241677803257L;
 
+    private String gridName;
+
+    private String comName;
+
+    private String streetName;
+
     /**
      * 主键id
      */

epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/result/LouDongCascadeResultDTO.java

@@ -0,0 +1,18 @@
+package com.epmet.opendata.dto.result;
+
+import com.epmet.commons.tools.utils.LoudongTreeNode;
+import com.epmet.commons.tools.utils.TreeNode;
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class LouDongCascadeResultDTO extends LoudongTreeNode implements Serializable {
+
+    private static final long serialVersionUID = -359443782589013555L;
+
+    private String label;
+
+    private String value;
+
+}

epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/wgh/BasegridDTO.java

@@ -0,0 +1,64 @@
+package com.epmet.opendata.dto.wgh;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+
+/**
+ *
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-06-14
+ */
+@Data
+public class BasegridDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     *
+     */
+	private String coordinateInfo;
+
+    /**
+     *
+     */
+	private String gridName;
+
+    /**
+     *
+     */
+	private String subDistrictOffice;
+
+    /**
+     *
+     */
+	private String community;
+
+    /**
+     *
+     */
+	private String streetCode;
+
+    /**
+     *
+     */
+	private String gridCode;
+
+    /**
+     *
+     */
+	private String communityCode;
+
+    /**
+     *
+     */
+	private String longitude;
+
+    /**
+     *
+     */
+	private String latitude;
+
+}

epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/wgh/BmGridDTO.java

@@ -0,0 +1,206 @@
+package com.epmet.opendata.dto.wgh;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+
+/**
+ *
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-06-14
+ */
+@Data
+public class BmGridDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 网格ID
+     */
+	private Long gridId;
+
+    /**
+     * 网格编码。人工填写，编码规则业务规定，不允许重复。
+     */
+	private String gridCode;
+
+    /**
+     * 网格名称
+     */
+	private String gridName;
+
+    /**
+     * 行政区划的国标编码
+     */
+	private String gbCode;
+
+    /**
+     * 上级网格ID
+     */
+	private Long parentId;
+
+    /**
+     * 上级网格编码
+     */
+	private String parentCode;
+
+    /**
+     * 网格分类。1基础网格 2环保网格 3防火网格 4城管网格 5执法网格 6安监网格等
+     */
+	private String gridClassification;
+
+    /**
+     * 网格层级。网格层级表的层级
+根据【网格层级表】的层级关系动态展示。
+查询【网格层级表】层级 条件：上层级=网格树返回的网格层级
+     */
+	private String gridLevel;
+
+    /**
+     * 网格属性。01村庄、02小区、03企业、04学校（幼儿园）、05医院、06驻镇（街）单位、07其他
+     */
+	private String gridProperty;
+
+    /**
+     * 是否最后一级:0否 1是
+     */
+	private String isEnd;
+
+    /**
+     * 网格地址
+     */
+	private String gridAddress;
+
+    /**
+     * 网格介绍
+     */
+	private String gridIntroduce;
+
+    /**
+     * 宣传图片
+     */
+	private String gridPicture;
+
+    /**
+     * 地图区域范围
+     */
+	private String reginScopeDesc;
+
+    /**
+     * 展示顺序
+     */
+	private Integer gridSort;
+
+    /**
+     * 标绘状态
+     */
+	private String pointStatus;
+
+    /**
+     * 事件上报中心
+     */
+	private Long gridEmCenter;
+
+    /**
+     * 初始日期
+     */
+	private Date gridBeginTime;
+
+    /**
+     * 终止日期
+     */
+	private Date gridEndTime;
+
+    /**
+     * 面积
+     */
+	private String gridArea;
+
+    /**
+     * 是否有效
+     */
+	private String isValid;
+
+    /**
+     * 创建人
+     */
+	private Long createBy;
+
+    /**
+     * 创建时间
+     */
+	private Date createDate;
+
+    /**
+     *
+     */
+	private Long updateBy;
+
+    /**
+     *
+     */
+	private Date updateDate;
+
+    /**
+     * 删除状态: 字典值：normal正常，删除deleted
+     */
+	private String deleteFlag;
+
+    /**
+     * 乐观锁
+     */
+	private Integer versions;
+
+    /**
+     * 网格内人口规模
+     */
+	private String attribute1;
+
+    /**
+     * 是否成立网格党支部或网格党小组
+     */
+	private String attribute2;
+
+    /**
+     * 网格党组织类型
+     */
+	private String attribute3;
+
+    /**
+     * 党组织编码
+     */
+	private String attribute4;
+
+    /**
+     * 扩展字段
+     */
+	private String attribute5;
+
+    /**
+     * 扩展字段
+     */
+	private Long attribute6;
+
+    /**
+     * 扩展字段
+     */
+	private Long attribute7;
+
+    /**
+     * 扩展字段
+     */
+	private Long attribute8;
+
+    /**
+     * 扩展字段
+     */
+	private Date attribute9;
+
+    /**
+     * 扩展字段
+     */
+	private Date attribute10;
+
+}

epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/wgh/CommunityDTO.java

@@ -0,0 +1,54 @@
+package com.epmet.opendata.dto.wgh;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+
+/**
+ *
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-06-14
+ */
+@Data
+public class CommunityDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     *
+     */
+	private String coordinateInfo;
+
+    /**
+     *
+     */
+	private String streetName;
+
+    /**
+     *
+     */
+	private String streetCode;
+
+    /**
+     *
+     */
+	private String communityName;
+
+    /**
+     *
+     */
+	private String communityCode;
+
+    /**
+     *
+     */
+	private String longitude;
+
+    /**
+     *
+     */
+	private String latitude;
+
+}

epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/wgh/SubdistrictOfficeDTO.java

@@ -0,0 +1,44 @@
+package com.epmet.opendata.dto.wgh;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+
+/**
+ *
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-06-14
+ */
+@Data
+public class SubdistrictOfficeDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     *
+     */
+	private String coordinateInfo;
+
+    /**
+     *
+     */
+	private String streetName;
+
+    /**
+     *
+     */
+	private String streetCode;
+
+    /**
+     *
+     */
+	private String longitude;
+
+    /**
+     *
+     */
+	private String latitude;
+
+}

epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/wgh/WghDywgDTO.java

@@ -0,0 +1,74 @@
+package com.epmet.opendata.dto.wgh;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+
+/**
+ * 单元网格
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-06-14
+ */
+@Data
+public class WghDywgDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     *
+     */
+	private Integer objectid;
+
+    /**
+     * 网格名称
+     */
+	private String bgname;
+
+    /**
+     * 所属街镇
+     */
+	private String street;
+
+    /**
+     * 所属社区
+     */
+	private String community;
+
+    /**
+     * 网格面积
+     */
+	private Double bgsqua;
+
+    /**
+     * 初始时间
+     */
+	private Date ordate;
+
+    /**
+     * 变更时间
+     */
+	private Date chdate;
+
+    /**
+     * 备注
+     */
+	private String note;
+
+    /**
+     *
+     */
+	private String contacts;
+
+    /**
+     * 联系电话
+     */
+	private String telphone;
+
+    /**
+     * 插入日期
+     */
+	private Date insertTime;
+
+}

epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/wgh/WghJdbDTO.java

@@ -0,0 +1,54 @@
+package com.epmet.opendata.dto.wgh;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+
+/**
+ * 街道办
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-06-14
+ */
+@Data
+public class WghJdbDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     *
+     */
+	private String objectid1;
+
+    /**
+     *
+     */
+	private String objectid;
+
+    /**
+     * 街道名称
+     */
+	private String mc;
+
+    /**
+     * 责任人
+     */
+	private String personInCharge;
+
+    /**
+     * 联系电话
+     */
+	private String phone;
+
+    /**
+     *
+     */
+	private Double shapeLeng;
+
+    /**
+     * 插入日期
+     */
+	private Date insertTime;
+
+}

epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/wgh/WghJqzDTO.java

@@ -0,0 +1,124 @@
+package com.epmet.opendata.dto.wgh;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+
+/**
+ * 加气站信息
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-06-14
+ */
+@Data
+public class WghJqzDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     *
+     */
+	private Integer objectid;
+
+    /**
+     * 序号
+     */
+	private String xh;
+
+    /**
+     * 单位名称
+     */
+	private String name;
+
+    /**
+     *
+     */
+	private Double area;
+
+    /**
+     * 周边安全间距
+     */
+	private String space;
+
+    /**
+     * 存在问题
+     */
+	private String problem;
+
+    /**
+     * 危险源类型
+     */
+	private String type;
+
+    /**
+     * 经营地址
+     */
+	private String location;
+
+    /**
+     * 负责人
+     */
+	private String principal;
+
+    /**
+     * 联系电话
+     */
+	private String phone;
+
+    /**
+     * 企业类型
+     */
+	private String qtype;
+
+    /**
+     * 危化品种类
+     */
+	private String wtype;
+
+    /**
+     * 等级
+     */
+	private String level;
+
+    /**
+     * 性质
+     */
+	private String nature;
+
+    /**
+     * 备注
+     */
+	private String remarks;
+
+    /**
+     *
+     */
+	private String dwmcjc;
+
+    /**
+     *
+     */
+	private String layer;
+
+    /**
+     *
+     */
+	private String ssjdb;
+
+    /**
+     * 数量
+     */
+	private String amount;
+
+    /**
+     * 应急措施
+     */
+	private String yjcs;
+
+    /**
+     * 插入日期
+     */
+	private Date insertTime;
+
+}

epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/wgh/WghJxcsDTO.java

@@ -0,0 +1,119 @@
+package com.epmet.opendata.dto.wgh;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+
+/**
+ * 九小场所信息
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-06-14
+ */
+@Data
+public class WghJxcsDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     *
+     */
+	private String objectid;
+
+    /**
+     *
+     */
+	private String jsonInfo;
+
+    /**
+     *
+     */
+	private String creatTime;
+
+    /**
+     * 所属街道
+     */
+	private String ssjd;
+
+    /**
+     * 所属社区
+     */
+	private String sssq;
+
+    /**
+     * 道路名
+     */
+	private String dlm;
+
+    /**
+     * 门牌号
+     */
+	private String mph;
+
+    /**
+     * 名称
+     */
+	private String name;
+
+    /**
+     *
+     */
+	private String ztlx;
+
+    /**
+     * 子类型
+     */
+	private String type;
+
+    /**
+     * 统一社会信用代码
+     */
+	private String xydm;
+
+    /**
+     * 联系人
+     */
+	private String lxr;
+
+    /**
+     * 联系电话
+     */
+	private String lxdh;
+
+    /**
+     *
+     */
+	private String userName;
+
+    /**
+     * 备注
+     */
+	private String bz;
+
+    /**
+     *
+     */
+	private String available;
+
+    /**
+     *
+     */
+	private String id;
+
+    /**
+     * 编辑人ID
+     */
+	private String userId;
+
+    /**
+     * 编辑人姓名
+     */
+	private String updateTim;
+
+    /**
+     * 插入日期
+     */
+	private String insertTime;
+
+}

epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/wgh/WghJyzDTO.java

@@ -0,0 +1,124 @@
+package com.epmet.opendata.dto.wgh;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+
+/**
+ * 加油站
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-06-14
+ */
+@Data
+public class WghJyzDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     *
+     */
+	private Integer objectid;
+
+    /**
+     * 序号
+     */
+	private String xh;
+
+    /**
+     * 单位名称
+     */
+	private String name;
+
+    /**
+     *
+     */
+	private Double area;
+
+    /**
+     * 周边安全间距
+     */
+	private String space;
+
+    /**
+     * 存在问题
+     */
+	private String problem;
+
+    /**
+     * 危险源类型
+     */
+	private String type;
+
+    /**
+     * 经营地址
+     */
+	private String location;
+
+    /**
+     * 负责人
+     */
+	private String principal;
+
+    /**
+     * 联系电话
+     */
+	private String phone;
+
+    /**
+     * 企业类型
+     */
+	private String qtype;
+
+    /**
+     * 危化品种类
+     */
+	private String wtype;
+
+    /**
+     * 等级
+     */
+	private String level;
+
+    /**
+     * 性质
+     */
+	private String nature;
+
+    /**
+     * 备注
+     */
+	private String remarks;
+
+    /**
+     *
+     */
+	private String dwmcjc;
+
+    /**
+     *
+     */
+	private String layer;
+
+    /**
+     *
+     */
+	private String ssjdb;
+
+    /**
+     * 数量
+     */
+	private String amount;
+
+    /**
+     * 应急措施
+     */
+	private String yjcs;
+
+    /**
+     * 插入日期
+     */
+	private Date insertTime;
+
+}

epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/wgh/WghSjxxbDTO.java

@@ -0,0 +1,94 @@
+package com.epmet.opendata.dto.wgh;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+
+/**
+ * 事件信息
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-06-14
+ */
+@Data
+public class WghSjxxbDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     *
+     */
+	private Integer objectid1;
+
+    /**
+     *
+     */
+	private Double objectid;
+
+    /**
+     * 事件来源
+     */
+	private String infosourcename;
+
+    /**
+     * 事件类别
+     */
+	private String infotypename;
+
+    /**
+     * 社区名称
+     */
+	private String communityname;
+
+    /**
+     * 事件描述
+     */
+	private String description;
+
+    /**
+     *
+     */
+	private String taskid;
+
+    /**
+     *
+     */
+	private String casesn;
+
+    /**
+     * 事件地址
+     */
+	private String address;
+
+    /**
+     * 事件状态
+     */
+	private String statusname;
+
+    /**
+     *
+     */
+	private String infobcname;
+
+    /**
+     *
+     */
+	private String infoscname;
+
+    /**
+     * 街道名称
+     */
+	private String streetname;
+
+    /**
+     *
+     */
+	private Date discovertime;
+
+    /**
+     * 插入日期
+     */
+	private Date insertTime;
+
+}

epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/wgh/WghSqxxDTO.java

@@ -0,0 +1,139 @@
+package com.epmet.opendata.dto.wgh;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+
+/**
+ *
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-06-14
+ */
+@Data
+public class WghSqxxDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     *
+     */
+	private Integer objectid;
+
+    /**
+     *
+     */
+	private Double commuarea;
+
+    /**
+     *
+     */
+	private String belongto;
+
+    /**
+     *
+     */
+	private String contacts;
+
+    /**
+     *
+     */
+	private String telphone;
+
+    /**
+     *
+     */
+	private Double numberOfGrid;
+
+    /**
+     *
+     */
+	private String streetCode;
+
+    /**
+     *
+     */
+	private String communityCode;
+
+    /**
+     *
+     */
+	private String commname;
+
+    /**
+     *
+     */
+	private String jdcjgb;
+
+    /**
+     *
+     */
+	private String wgz;
+
+    /**
+     *
+     */
+	private String policeName;
+
+    /**
+     *
+     */
+	private Double trafficPolicePhone;
+
+    /**
+     *
+     */
+	private String trafficPoliceCompany;
+
+    /**
+     *
+     */
+	private String peoPoliceName;
+
+    /**
+     *
+     */
+	private String peoPolicePhone;
+
+    /**
+     *
+     */
+	private String policeStation;
+
+    /**
+     *
+     */
+	private String wgy;
+
+    /**
+     *
+     */
+	private String jdlxks;
+
+    /**
+     *
+     */
+	private String ddy;
+
+    /**
+     *
+     */
+	private String zhzfxm;
+
+    /**
+     *
+     */
+	private String zhzfdh;
+
+    /**
+     *
+     */
+	private String zhzfbm;
+
+    /**
+     *
+     */
+	private Date insertTime;
+
+}

epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/wgh/WghSzcgwghDTO.java

@@ -0,0 +1,49 @@
+package com.epmet.opendata.dto.wgh;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+
+/**
+ * 数字城管网格化信息
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-06-14
+ */
+@Data
+public class WghSzcgwghDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     *
+     */
+	private Integer objectid;
+
+    /**
+     * 备注
+     */
+	private String note;
+
+    /**
+     *
+     */
+	private String sssq;
+
+    /**
+     *
+     */
+	private String ssjd;
+
+    /**
+     *
+     */
+	private String id;
+
+    /**
+     *
+     */
+	private Date insertTime;
+
+}

epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/wgh/WghSzzrwgDTO.java

@@ -0,0 +1,49 @@
+package com.epmet.opendata.dto.wgh;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+
+/**
+ * 市政责任网格信息
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-06-14
+ */
+@Data
+public class WghSzzrwgDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     *
+     */
+	private Integer objectid;
+
+    /**
+     * 备注
+     */
+	private String note;
+
+    /**
+     * 责任单位
+     */
+	private String name;
+
+    /**
+     * 监管人
+     */
+	private String principal;
+
+    /**
+     * 联系方式
+     */
+	private String phone;
+
+    /**
+     * 插入日期
+     */
+	private Date insertTime;
+
+}

epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/wgh/WghWhpdwDTO.java

@@ -0,0 +1,134 @@
+package com.epmet.opendata.dto.wgh;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+
+/**
+ * 危化品单位信息
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-06-14
+ */
+@Data
+public class WghWhpdwDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     *
+     */
+	private Integer objectid;
+
+    /**
+     * 序号
+     */
+	private String xh;
+
+    /**
+     * 单位名称
+     */
+	private String name;
+
+    /**
+     *
+     */
+	private Double area;
+
+    /**
+     * 周边安全间距
+     */
+	private String space;
+
+    /**
+     * 存在问题
+     */
+	private String problem;
+
+    /**
+     * 危险源类型
+     */
+	private String type;
+
+    /**
+     * 经营地址
+     */
+	private String location;
+
+    /**
+     * 安全负责人
+     */
+	private String person;
+
+    /**
+     * 联系电话
+     */
+	private String phone;
+
+    /**
+     * 企业类型
+     */
+	private String qtype;
+
+    /**
+     * 危化品种类
+     */
+	private String wtype;
+
+    /**
+     * 数量
+     */
+	private String amount;
+
+    /**
+     * 等级
+     */
+	private String grade;
+
+    /**
+     * 性质
+     */
+	private String natrue;
+
+    /**
+     * 应急措施
+     */
+	private String yjcs;
+
+    /**
+     * 备注
+     */
+	private String note;
+
+    /**
+     *
+     */
+	private String dwmcjc;
+
+    /**
+     * 主要负责人
+     */
+	private String principal;
+
+    /**
+     * 用途
+     */
+	private String user;
+
+    /**
+     *
+     */
+	private String layer;
+
+    /**
+     *
+     */
+	private String ssjdb;
+
+    /**
+     * 插入日期
+     */
+	private Date insertTime;
+
+}

epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/wgh/WghYjbmcsDTO.java

@@ -0,0 +1,84 @@
+package com.epmet.opendata.dto.wgh;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+
+/**
+ * 应急避难场所信息
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-06-14
+ */
+@Data
+public class WghYjbmcsDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     *
+     */
+	private Integer objectid;
+
+    /**
+     *
+     */
+	private String grade;
+
+    /**
+     * 地址
+     */
+	private String adress;
+
+    /**
+     * 面积(㎡)
+     */
+	private String area;
+
+    /**
+     * 容纳人数
+     */
+	private String rnns;
+
+    /**
+     *
+     */
+	private String sfbsp;
+
+    /**
+     *
+     */
+	private String zysbcs;
+
+    /**
+     *
+     */
+	private String fzr;
+
+    /**
+     *
+     */
+	private String zgdw;
+
+    /**
+     *
+     */
+	private String name;
+
+    /**
+     *
+     */
+	private String fzrtel;
+
+    /**
+     *
+     */
+	private String ssjd;
+
+    /**
+     *
+     */
+	private Date insertTime;
+
+}

epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/wgh/WghYqhjzDTO.java

@@ -0,0 +1,124 @@
+package com.epmet.opendata.dto.wgh;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+
+/**
+ * 油气合建站信息
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-06-14
+ */
+@Data
+public class WghYqhjzDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     *
+     */
+	private Integer objectid;
+
+    /**
+     * 序号
+     */
+	private String xh;
+
+    /**
+     * 单位名称
+     */
+	private String name;
+
+    /**
+     *
+     */
+	private Double area;
+
+    /**
+     * 周边安全间距
+     */
+	private String space;
+
+    /**
+     * 危险源类型
+     */
+	private String type;
+
+    /**
+     * 经营地址
+     */
+	private String location;
+
+    /**
+     * 负责人
+     */
+	private String principal;
+
+    /**
+     * 联系电话
+     */
+	private String phone;
+
+    /**
+     * 企业类型
+     */
+	private String qtype;
+
+    /**
+     * 危化品种类
+     */
+	private String wtype;
+
+    /**
+     * 数量
+     */
+	private String amount;
+
+    /**
+     * 等级
+     */
+	private String grade;
+
+    /**
+     * 性质
+     */
+	private String natrue;
+
+    /**
+     * 应急措施
+     */
+	private String yjcs;
+
+    /**
+     * 备注
+     */
+	private String note;
+
+    /**
+     * 简称
+     */
+	private String dwmcjc;
+
+    /**
+     * 所在图层
+     */
+	private String layer;
+
+    /**
+     * 所属街道办
+     */
+	private String ssjdb;
+
+    /**
+     * 存在问题
+     */
+	private String problem;
+
+    /**
+     * 插入日期
+     */
+	private Date insertTime;
+
+}

epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/CaBmCategoryController.java

@@ -0,0 +1,96 @@
+package com.epmet.opendata.controller;
+
+import com.epmet.commons.tools.aop.NoRepeatSubmit;
+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.opendata.dto.ca.CaBmCategoryDTO;
+import com.epmet.opendata.dto.form.PreserVationFormDTO;
+import com.epmet.opendata.excel.CaBmCategoryExcel;
+import com.epmet.opendata.service.CaBmCategoryService;
+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 2022-06-16
+ */
+@RestController
+@RequestMapping("caBmCategory")
+public class CaBmCategoryController {
+
+    @Autowired
+    private CaBmCategoryService caBmCategoryService;
+
+    @RequestMapping("page")
+    public Result<PageData<CaBmCategoryDTO>> page(@RequestParam Map<String, Object> params) {
+        PageData<CaBmCategoryDTO> page = caBmCategoryService.page(params);
+        return new Result<PageData<CaBmCategoryDTO>>().ok(page);
+    }
+
+    @RequestMapping(value = "{id}", method = {RequestMethod.POST, RequestMethod.GET})
+    public Result<CaBmCategoryDTO> get(@PathVariable("id") String id) {
+        CaBmCategoryDTO data = caBmCategoryService.get(id);
+        return new Result<CaBmCategoryDTO>().ok(data);
+    }
+
+    @NoRepeatSubmit
+    @PostMapping("save")
+    public Result save(@RequestBody CaBmCategoryDTO dto) {
+        //效验数据
+        ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+        caBmCategoryService.save(dto);
+        return new Result();
+    }
+
+    @NoRepeatSubmit
+    @PostMapping("update")
+    public Result update(@RequestBody CaBmCategoryDTO dto) {
+        //效验数据
+        ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+        caBmCategoryService.update(dto);
+        return new Result();
+    }
+
+    @PostMapping("delete")
+    public Result delete(@RequestBody String[] ids) {
+        //效验数据
+        AssertUtils.isArrayEmpty(ids, "id");
+        caBmCategoryService.delete(ids);
+        return new Result();
+    }
+
+    @GetMapping("export")
+    public void export(@RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
+        List<CaBmCategoryDTO> list = caBmCategoryService.list(params);
+        ExcelUtils.exportExcelToTarget(response, null, list, CaBmCategoryExcel.class);
+    }
+
+    /**
+     * 调用ruoyi接口存储数据
+     *
+     * @param dto
+     * @return com.epmet.commons.tools.utils.Result
+     * @author LZN
+     * @date 2022/6/2 10:02
+     */
+    @PostMapping("/preserBmCategoryVation")
+    public Result getPreserBmCategoryVation(@RequestBody PreserVationFormDTO dto) {
+        caBmCategoryService.preserBmCategoryVation(dto);
+        return new Result();
+    }
+
+}

epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/CaLoudongController.java

@@ -17,6 +17,7 @@ import com.epmet.opendata.dto.form.CaLoudongFormDTO;
 import com.epmet.opendata.dto.form.PreserVationFormDTO;
 import com.epmet.opendata.dto.result.CaLoudongDetailsResultDTO;
 import com.epmet.opendata.dto.result.CaLoudongResultDTO;
+import com.epmet.opendata.dto.result.LouDongCascadeResultDTO;
 import com.epmet.opendata.excel.CaLoudongExcel;
 import com.epmet.opendata.service.CaLoudongService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -128,4 +129,6 @@ public class CaLoudongController {
         return new Result();
     }
 
+
+
 }

epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/CaSysDictController.java

@@ -0,0 +1,96 @@
+package com.epmet.opendata.controller;
+
+import com.epmet.commons.tools.aop.NoRepeatSubmit;
+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.opendata.dto.ca.CaSysDictDTO;
+import com.epmet.opendata.dto.form.PreserVationFormDTO;
+import com.epmet.opendata.excel.CaSysDictExcel;
+import com.epmet.opendata.service.CaSysDictService;
+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 2022-06-16
+ */
+@RestController
+@RequestMapping("caSysDict")
+public class CaSysDictController {
+
+    @Autowired
+    private CaSysDictService caSysDictService;
+
+    @RequestMapping("page")
+    public Result<PageData<CaSysDictDTO>> page(@RequestParam Map<String, Object> params) {
+        PageData<CaSysDictDTO> page = caSysDictService.page(params);
+        return new Result<PageData<CaSysDictDTO>>().ok(page);
+    }
+
+    @RequestMapping(value = "{id}", method = {RequestMethod.POST, RequestMethod.GET})
+    public Result<CaSysDictDTO> get(@PathVariable("id") String id) {
+        CaSysDictDTO data = caSysDictService.get(id);
+        return new Result<CaSysDictDTO>().ok(data);
+    }
+
+    @NoRepeatSubmit
+    @PostMapping("save")
+    public Result save(@RequestBody CaSysDictDTO dto) {
+        //效验数据
+        ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+        caSysDictService.save(dto);
+        return new Result();
+    }
+
+    @NoRepeatSubmit
+    @PostMapping("update")
+    public Result update(@RequestBody CaSysDictDTO dto) {
+        //效验数据
+        ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+        caSysDictService.update(dto);
+        return new Result();
+    }
+
+    @PostMapping("delete")
+    public Result delete(@RequestBody String[] ids) {
+        //效验数据
+        AssertUtils.isArrayEmpty(ids, "id");
+        caSysDictService.delete(ids);
+        return new Result();
+    }
+
+    @GetMapping("export")
+    public void export(@RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
+        List<CaSysDictDTO> list = caSysDictService.list(params);
+        ExcelUtils.exportExcelToTarget(response, null, list, CaSysDictExcel.class);
+    }
+
+    /**
+     * 调用ruoyi接口存储数据
+     *
+     * @param dto
+     * @return com.epmet.commons.tools.utils.Result
+     * @author LZN
+     * @date 2022/6/2 10:02
+     */
+    @PostMapping("/preserSysdictVation")
+    public Result getPreserSysdictVation(@RequestBody PreserVationFormDTO dto) {
+        caSysDictService.preserSysdictVation(dto);
+        return new Result();
+    }
+
+}

epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/WghBaseGridController.java

@@ -0,0 +1,96 @@
+package com.epmet.opendata.controller;
+
+import com.epmet.commons.tools.aop.NoRepeatSubmit;
+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.DefaultGroup;
+import com.epmet.commons.tools.validator.group.UpdateGroup;
+import com.epmet.opendata.dto.form.PreserVationFormDTO;
+import com.epmet.opendata.dto.wgh.BasegridDTO;
+import com.epmet.opendata.excel.WghBaseGridExcel;
+import com.epmet.opendata.service.WghBaseGridService;
+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 2022-06-14
+ */
+@RestController
+@RequestMapping("basegrid")
+public class WghBaseGridController {
+
+    @Autowired
+    private WghBaseGridService basegridService;
+
+    @RequestMapping("page")
+    public Result<PageData<BasegridDTO>> page(@RequestParam Map<String, Object> params){
+        PageData<BasegridDTO> page = basegridService.page(params);
+        return new Result<PageData<BasegridDTO>>().ok(page);
+    }
+
+    @RequestMapping(value = "{id}",method = {RequestMethod.POST,RequestMethod.GET})
+    public Result<BasegridDTO> get(@PathVariable("id") String id){
+        BasegridDTO data = basegridService.get(id);
+        return new Result<BasegridDTO>().ok(data);
+    }
+
+    @NoRepeatSubmit
+    @PostMapping("save")
+    public Result save(@RequestBody BasegridDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+        basegridService.save(dto);
+        return new Result();
+    }
+
+    @NoRepeatSubmit
+    @PostMapping("update")
+    public Result update(@RequestBody BasegridDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+        basegridService.update(dto);
+        return new Result();
+    }
+
+    @PostMapping("delete")
+    public Result delete(@RequestBody String[] ids){
+        //效验数据
+        AssertUtils.isArrayEmpty(ids, "id");
+        basegridService.delete(ids);
+        return new Result();
+    }
+
+    @GetMapping("export")
+    public void export(@RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
+        List<BasegridDTO> list = basegridService.list(params);
+        ExcelUtils.exportExcelToTarget(response, null, list, WghBaseGridExcel.class);
+    }
+
+    /**
+     * 调用ruoyi存储基础网格的数据
+     *
+     * @param dto
+     * @return com.epmet.commons.tools.utils.Result
+     * @author LZN
+     * @date 2022/6/14 13:40
+     */
+    @PostMapping("/preserBaseGridVation")
+    public Result getPreserLouDongVation(@RequestBody PreserVationFormDTO dto) {
+        basegridService.preserBaseGridVation(dto);
+        return new Result();
+    }
+
+
+}

epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/WghCommunityController.java

@@ -0,0 +1,93 @@
+package com.epmet.opendata.controller;
+
+import com.epmet.commons.tools.aop.NoRepeatSubmit;
+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.DefaultGroup;
+import com.epmet.commons.tools.validator.group.UpdateGroup;
+import com.epmet.opendata.dto.form.PreserVationFormDTO;
+import com.epmet.opendata.dto.wgh.CommunityDTO;
+import com.epmet.opendata.excel.WghCommunityExcel;
+import com.epmet.opendata.service.WghCommunityService;
+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 2022-06-14
+ */
+@RestController
+@RequestMapping("community")
+public class WghCommunityController {
+
+    @Autowired
+    private WghCommunityService communityService;
+
+    @RequestMapping("page")
+    public Result<PageData<CommunityDTO>> page(@RequestParam Map<String, Object> params) {
+        PageData<CommunityDTO> page = communityService.page(params);
+        return new Result<PageData<CommunityDTO>>().ok(page);
+    }
+
+    @RequestMapping(value = "{id}", method = {RequestMethod.POST, RequestMethod.GET})
+    public Result<CommunityDTO> get(@PathVariable("id") String id) {
+        CommunityDTO data = communityService.get(id);
+        return new Result<CommunityDTO>().ok(data);
+    }
+
+    @NoRepeatSubmit
+    @PostMapping("save")
+    public Result save(@RequestBody CommunityDTO dto) {
+        //效验数据
+        ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+        communityService.save(dto);
+        return new Result();
+    }
+
+    @NoRepeatSubmit
+    @PostMapping("update")
+    public Result update(@RequestBody CommunityDTO dto) {
+        //效验数据
+        ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+        communityService.update(dto);
+        return new Result();
+    }
+
+    @PostMapping("delete")
+    public Result delete(@RequestBody String[] ids) {
+        //效验数据
+        AssertUtils.isArrayEmpty(ids, "id");
+        communityService.delete(ids);
+        return new Result();
+    }
+
+    @GetMapping("export")
+    public void export(@RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
+        List<CommunityDTO> list = communityService.list(params);
+        ExcelUtils.exportExcelToTarget(response, null, list, WghCommunityExcel.class);
+    }
+
+    /**
+     * 调用ruoyi接口存储社区数据
+     *
+     * @param dto
+     * @return com.epmet.commons.tools.utils.Result
+     * @author LZN
+     * @date 2022/6/14 15:02
+     */
+    @PostMapping("preserCommunityVation")
+    public Result getPreserCommunityVation(@RequestBody PreserVationFormDTO dto) {
+        communityService.getPreserCommunityVation(dto);
+        return new Result();
+    }
+
+}

epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/WghDywgController.java

@@ -0,0 +1,96 @@
+package com.epmet.opendata.controller;
+
+import com.epmet.commons.tools.aop.NoRepeatSubmit;
+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.opendata.dto.form.PreserVationFormDTO;
+import com.epmet.opendata.dto.wgh.WghDywgDTO;
+import com.epmet.opendata.excel.WghDywgExcel;
+import com.epmet.opendata.service.WghDywgService;
+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 2022-06-14
+ */
+@RestController
+@RequestMapping("wghDywg")
+public class WghDywgController {
+
+    @Autowired
+    private WghDywgService wghDywgService;
+
+    @RequestMapping("page")
+    public Result<PageData<WghDywgDTO>> page(@RequestParam Map<String, Object> params){
+        PageData<WghDywgDTO> page = wghDywgService.page(params);
+        return new Result<PageData<WghDywgDTO>>().ok(page);
+    }
+
+    @RequestMapping(value = "{id}",method = {RequestMethod.POST,RequestMethod.GET})
+    public Result<WghDywgDTO> get(@PathVariable("id") String id){
+        WghDywgDTO data = wghDywgService.get(id);
+        return new Result<WghDywgDTO>().ok(data);
+    }
+
+    @NoRepeatSubmit
+    @PostMapping("save")
+    public Result save(@RequestBody WghDywgDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+        wghDywgService.save(dto);
+        return new Result();
+    }
+
+    @NoRepeatSubmit
+    @PostMapping("update")
+    public Result update(@RequestBody WghDywgDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+        wghDywgService.update(dto);
+        return new Result();
+    }
+
+    @PostMapping("delete")
+    public Result delete(@RequestBody String[] ids){
+        //效验数据
+        AssertUtils.isArrayEmpty(ids, "id");
+        wghDywgService.delete(ids);
+        return new Result();
+    }
+
+    @GetMapping("export")
+    public void export(@RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
+        List<WghDywgDTO> list = wghDywgService.list(params);
+        ExcelUtils.exportExcelToTarget(response, null, list, WghDywgExcel.class);
+    }
+
+    /**
+     * 调用ruoyi接口获取dywg数据
+     *
+     * @param dto
+     * @return com.epmet.commons.tools.utils.Result
+     * @author LZN
+     * @date 2022/6/14 15:11
+     */
+    @PostMapping("preserDywgVation")
+    public Result getPreserDywgVation(@RequestBody PreserVationFormDTO dto) {
+        wghDywgService.getPreserDywgVation(dto);
+        return new Result();
+    }
+
+}

epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/WghJdbController.java

@@ -0,0 +1,96 @@
+package com.epmet.opendata.controller;
+
+import com.epmet.commons.tools.aop.NoRepeatSubmit;
+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.opendata.dto.form.PreserVationFormDTO;
+import com.epmet.opendata.dto.wgh.WghJdbDTO;
+import com.epmet.opendata.excel.WghJdbExcel;
+import com.epmet.opendata.service.WghJdbService;
+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 2022-06-14
+ */
+@RestController
+@RequestMapping("wghJdb")
+public class WghJdbController {
+
+    @Autowired
+    private WghJdbService wghJdbService;
+
+    @RequestMapping("page")
+    public Result<PageData<WghJdbDTO>> page(@RequestParam Map<String, Object> params) {
+        PageData<WghJdbDTO> page = wghJdbService.page(params);
+        return new Result<PageData<WghJdbDTO>>().ok(page);
+    }
+
+    @RequestMapping(value = "{id}", method = {RequestMethod.POST, RequestMethod.GET})
+    public Result<WghJdbDTO> get(@PathVariable("id") String id) {
+        WghJdbDTO data = wghJdbService.get(id);
+        return new Result<WghJdbDTO>().ok(data);
+    }
+
+    @NoRepeatSubmit
+    @PostMapping("save")
+    public Result save(@RequestBody WghJdbDTO dto) {
+        //效验数据
+        ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+        wghJdbService.save(dto);
+        return new Result();
+    }
+
+    @NoRepeatSubmit
+    @PostMapping("update")
+    public Result update(@RequestBody WghJdbDTO dto) {
+        //效验数据
+        ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+        wghJdbService.update(dto);
+        return new Result();
+    }
+
+    @PostMapping("delete")
+    public Result delete(@RequestBody String[] ids) {
+        //效验数据
+        AssertUtils.isArrayEmpty(ids, "id");
+        wghJdbService.delete(ids);
+        return new Result();
+    }
+
+    @GetMapping("export")
+    public void export(@RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
+        List<WghJdbDTO> list = wghJdbService.list(params);
+        ExcelUtils.exportExcelToTarget(response, null, list, WghJdbExcel.class);
+    }
+
+    /**
+     * 调用ruoyi接口获取wgh_jdb数据
+     *
+     * @param dto
+     * @return com.epmet.commons.tools.utils.Result
+     * @author LZN
+     * @date 2022/6/14 15:31
+     */
+    @PostMapping("/preserWghJdbVation")
+    public Result getPreserWghJdbVation(@RequestBody PreserVationFormDTO dto) {
+        wghJdbService.getPreserWghJdbVation(dto);
+        return new Result();
+    }
+
+}

epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/WghJqzController.java

@@ -0,0 +1,97 @@
+package com.epmet.opendata.controller;
+
+import com.epmet.commons.tools.aop.NoRepeatSubmit;
+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.opendata.dto.form.PreserVationFormDTO;
+import com.epmet.opendata.dto.wgh.WghJqzDTO;
+import com.epmet.opendata.excel.WghJqzExcel;
+import com.epmet.opendata.service.WghJqzService;
+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 2022-06-14
+ */
+@RestController
+@RequestMapping("wghJqz")
+public class WghJqzController {
+
+    @Autowired
+    private WghJqzService wghJqzService;
+
+    @RequestMapping("page")
+    public Result<PageData<WghJqzDTO>> page(@RequestParam Map<String, Object> params){
+        PageData<WghJqzDTO> page = wghJqzService.page(params);
+        return new Result<PageData<WghJqzDTO>>().ok(page);
+    }
+
+    @RequestMapping(value = "{id}",method = {RequestMethod.POST,RequestMethod.GET})
+    public Result<WghJqzDTO> get(@PathVariable("id") String id){
+        WghJqzDTO data = wghJqzService.get(id);
+        return new Result<WghJqzDTO>().ok(data);
+    }
+
+    @NoRepeatSubmit
+    @PostMapping("save")
+    public Result save(@RequestBody WghJqzDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+        wghJqzService.save(dto);
+        return new Result();
+    }
+
+    @NoRepeatSubmit
+    @PostMapping("update")
+    public Result update(@RequestBody WghJqzDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+        wghJqzService.update(dto);
+        return new Result();
+    }
+
+    @PostMapping("delete")
+    public Result delete(@RequestBody String[] ids){
+        //效验数据
+        AssertUtils.isArrayEmpty(ids, "id");
+        wghJqzService.delete(ids);
+        return new Result();
+    }
+
+    @GetMapping("export")
+    public void export(@RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
+        List<WghJqzDTO> list = wghJqzService.list(params);
+        ExcelUtils.exportExcelToTarget(response, null, list, WghJqzExcel.class);
+    }
+
+    /**
+     * 调用ruoyi接口存储wgh_jqz数据
+     *
+     * @param dto
+     * @return com.epmet.commons.tools.utils.Result
+     * @author LZN
+     * @date 2022/6/14 15:39
+     */
+    @PostMapping("/preserWghjqzVation")
+    public Result getPreserWghjqzVation(@RequestBody PreserVationFormDTO dto) {
+        wghJqzService.getPreserWghjqzVation(dto);
+        return new Result();
+    }
+
+
+}

epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/WghJxcsController.java

@@ -0,0 +1,95 @@
+package com.epmet.opendata.controller;
+
+import com.epmet.commons.tools.aop.NoRepeatSubmit;
+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.DefaultGroup;
+import com.epmet.commons.tools.validator.group.UpdateGroup;
+import com.epmet.opendata.dto.form.PreserVationFormDTO;
+import com.epmet.opendata.dto.wgh.WghJxcsDTO;
+import com.epmet.opendata.excel.WghJxcsExcel;
+import com.epmet.opendata.service.WghJxcsService;
+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 2022-06-14
+ */
+@RestController
+@RequestMapping("wghJxcs")
+public class WghJxcsController {
+
+    @Autowired
+    private WghJxcsService wghJxcsService;
+
+    @RequestMapping("page")
+    public Result<PageData<WghJxcsDTO>> page(@RequestParam Map<String, Object> params){
+        PageData<WghJxcsDTO> page = wghJxcsService.page(params);
+        return new Result<PageData<WghJxcsDTO>>().ok(page);
+    }
+
+    @RequestMapping(value = "{id}",method = {RequestMethod.POST,RequestMethod.GET})
+    public Result<WghJxcsDTO> get(@PathVariable("id") String id){
+        WghJxcsDTO data = wghJxcsService.get(id);
+        return new Result<WghJxcsDTO>().ok(data);
+    }
+
+    @NoRepeatSubmit
+    @PostMapping("save")
+    public Result save(@RequestBody WghJxcsDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+        wghJxcsService.save(dto);
+        return new Result();
+    }
+
+    @NoRepeatSubmit
+    @PostMapping("update")
+    public Result update(@RequestBody WghJxcsDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+        wghJxcsService.update(dto);
+        return new Result();
+    }
+
+    @PostMapping("delete")
+    public Result delete(@RequestBody String[] ids){
+        //效验数据
+        AssertUtils.isArrayEmpty(ids, "id");
+        wghJxcsService.delete(ids);
+        return new Result();
+    }
+
+    @GetMapping("export")
+    public void export(@RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
+        List<WghJxcsDTO> list = wghJxcsService.list(params);
+        ExcelUtils.exportExcelToTarget(response, null, list, WghJxcsExcel.class);
+    }
+
+    /**
+     * 调用ruoyi接口存储wgh_jxcs数据
+     *
+     * @param dto
+     * @return com.epmet.commons.tools.utils.Result
+     * @author LZN
+     * @date 2022/6/14 15:46
+     */
+    @PostMapping("/preserWghJxcsVation")
+    public Result getPreserWghJxcsVation(@RequestBody PreserVationFormDTO dto) {
+        wghJxcsService.preserWghJxcsVation(dto);
+        return new Result();
+    }
+
+}

epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/WghJyzController.java

@@ -0,0 +1,95 @@
+package com.epmet.opendata.controller;
+
+import com.epmet.commons.tools.aop.NoRepeatSubmit;
+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.DefaultGroup;
+import com.epmet.commons.tools.validator.group.UpdateGroup;
+import com.epmet.opendata.dto.form.PreserVationFormDTO;
+import com.epmet.opendata.dto.wgh.WghJyzDTO;
+import com.epmet.opendata.excel.WghJyzExcel;
+import com.epmet.opendata.service.WghJyzService;
+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 2022-06-14
+ */
+@RestController
+@RequestMapping("wghJyz")
+public class WghJyzController {
+
+    @Autowired
+    private WghJyzService wghJyzService;
+
+    @RequestMapping("page")
+    public Result<PageData<WghJyzDTO>> page(@RequestParam Map<String, Object> params){
+        PageData<WghJyzDTO> page = wghJyzService.page(params);
+        return new Result<PageData<WghJyzDTO>>().ok(page);
+    }
+
+    @RequestMapping(value = "{id}",method = {RequestMethod.POST,RequestMethod.GET})
+    public Result<WghJyzDTO> get(@PathVariable("id") String id){
+        WghJyzDTO data = wghJyzService.get(id);
+        return new Result<WghJyzDTO>().ok(data);
+    }
+
+    @NoRepeatSubmit
+    @PostMapping("save")
+    public Result save(@RequestBody WghJyzDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+        wghJyzService.save(dto);
+        return new Result();
+    }
+
+    @NoRepeatSubmit
+    @PostMapping("update")
+    public Result update(@RequestBody WghJyzDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+        wghJyzService.update(dto);
+        return new Result();
+    }
+
+    @PostMapping("delete")
+    public Result delete(@RequestBody String[] ids){
+        //效验数据
+        AssertUtils.isArrayEmpty(ids, "id");
+        wghJyzService.delete(ids);
+        return new Result();
+    }
+
+    @GetMapping("export")
+    public void export(@RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
+        List<WghJyzDTO> list = wghJyzService.list(params);
+        ExcelUtils.exportExcelToTarget(response, null, list, WghJyzExcel.class);
+    }
+
+    /**
+     * 调用ruoyi接口获取wgh_jyz数据
+     *
+     * @param dto
+     * @return com.epmet.commons.tools.utils.Result
+     * @author LZN
+     * @date 2022/6/14 15:52
+     */
+    @PostMapping("/preserWghJyzVation")
+    public Result getPreserWghJyzVation(@RequestBody PreserVationFormDTO dto) {
+        wghJyzService.getPreserWghJyzVation(dto);
+        return new Result();
+    }
+
+}

epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/WghSjxxbController.java

@@ -0,0 +1,95 @@
+package com.epmet.opendata.controller;
+
+import com.epmet.commons.tools.aop.NoRepeatSubmit;
+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.DefaultGroup;
+import com.epmet.commons.tools.validator.group.UpdateGroup;
+import com.epmet.opendata.dto.form.PreserVationFormDTO;
+import com.epmet.opendata.dto.wgh.WghSjxxbDTO;
+import com.epmet.opendata.excel.WghSjxxbExcel;
+import com.epmet.opendata.service.WghSjxxbService;
+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 2022-06-14
+ */
+@RestController
+@RequestMapping("wghSjxxb")
+public class WghSjxxbController {
+
+    @Autowired
+    private WghSjxxbService wghSjxxbService;
+
+    @RequestMapping("page")
+    public Result<PageData<WghSjxxbDTO>> page(@RequestParam Map<String, Object> params){
+        PageData<WghSjxxbDTO> page = wghSjxxbService.page(params);
+        return new Result<PageData<WghSjxxbDTO>>().ok(page);
+    }
+
+    @RequestMapping(value = "{id}",method = {RequestMethod.POST,RequestMethod.GET})
+    public Result<WghSjxxbDTO> get(@PathVariable("id") String id){
+        WghSjxxbDTO data = wghSjxxbService.get(id);
+        return new Result<WghSjxxbDTO>().ok(data);
+    }
+
+    @NoRepeatSubmit
+    @PostMapping("save")
+    public Result save(@RequestBody WghSjxxbDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+        wghSjxxbService.save(dto);
+        return new Result();
+    }
+
+    @NoRepeatSubmit
+    @PostMapping("update")
+    public Result update(@RequestBody WghSjxxbDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+        wghSjxxbService.update(dto);
+        return new Result();
+    }
+
+    @PostMapping("delete")
+    public Result delete(@RequestBody String[] ids){
+        //效验数据
+        AssertUtils.isArrayEmpty(ids, "id");
+        wghSjxxbService.delete(ids);
+        return new Result();
+    }
+
+    @GetMapping("export")
+    public void export(@RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
+        List<WghSjxxbDTO> list = wghSjxxbService.list(params);
+        ExcelUtils.exportExcelToTarget(response, null, list, WghSjxxbExcel.class);
+    }
+
+    /**
+     * 调用ruoyi接口获取wgh_sjxx数据
+     *
+     * @param dto
+     * @return com.epmet.commons.tools.utils.Result
+     * @author LZN
+     * @date 2022/6/14 16:01
+     */
+    @PostMapping("/preserSjxxVation")
+    public Result getPreserSjxxVation(@RequestBody PreserVationFormDTO dto) {
+        wghSjxxbService.getPreserSjxxVation(dto);
+        return new Result();
+    }
+
+}

epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/WghSqxxController.java

@@ -0,0 +1,95 @@
+package com.epmet.opendata.controller;
+
+import com.epmet.commons.tools.aop.NoRepeatSubmit;
+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.DefaultGroup;
+import com.epmet.commons.tools.validator.group.UpdateGroup;
+import com.epmet.opendata.dto.form.PreserVationFormDTO;
+import com.epmet.opendata.dto.wgh.WghSqxxDTO;
+import com.epmet.opendata.excel.WghSqxxExcel;
+import com.epmet.opendata.service.WghSqxxService;
+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 2022-06-14
+ */
+@RestController
+@RequestMapping("wghSqxx")
+public class WghSqxxController {
+
+    @Autowired
+    private WghSqxxService wghSqxxService;
+
+    @RequestMapping("page")
+    public Result<PageData<WghSqxxDTO>> page(@RequestParam Map<String, Object> params){
+        PageData<WghSqxxDTO> page = wghSqxxService.page(params);
+        return new Result<PageData<WghSqxxDTO>>().ok(page);
+    }
+
+    @RequestMapping(value = "{id}",method = {RequestMethod.POST,RequestMethod.GET})
+    public Result<WghSqxxDTO> get(@PathVariable("id") String id){
+        WghSqxxDTO data = wghSqxxService.get(id);
+        return new Result<WghSqxxDTO>().ok(data);
+    }
+
+    @NoRepeatSubmit
+    @PostMapping("save")
+    public Result save(@RequestBody WghSqxxDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+        wghSqxxService.save(dto);
+        return new Result();
+    }
+
+    @NoRepeatSubmit
+    @PostMapping("update")
+    public Result update(@RequestBody WghSqxxDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+        wghSqxxService.update(dto);
+        return new Result();
+    }
+
+    @PostMapping("delete")
+    public Result delete(@RequestBody String[] ids){
+        //效验数据
+        AssertUtils.isArrayEmpty(ids, "id");
+        wghSqxxService.delete(ids);
+        return new Result();
+    }
+
+    @GetMapping("export")
+    public void export(@RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
+        List<WghSqxxDTO> list = wghSqxxService.list(params);
+        ExcelUtils.exportExcelToTarget(response, null, list, WghSqxxExcel.class);
+    }
+
+    /**
+     * 调用ruoyi接口获取wgh_sqxx数据
+     *
+     * @param dto
+     * @return com.epmet.commons.tools.utils.Result
+     * @author LZN
+     * @date 2022/6/14 16:08
+     */
+    @PostMapping("/preserWghSqxxVation")
+    public Result getPreserWghSqxxVation(@RequestBody PreserVationFormDTO dto) {
+        wghSqxxService.getPreserWghSqxxVation(dto);
+        return new Result();
+    }
+
+}

epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/WghSubdistrictOfficeController.java

@@ -0,0 +1,98 @@
+package com.epmet.opendata.controller;
+
+import com.epmet.commons.tools.aop.NoRepeatSubmit;
+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.opendata.dto.form.PreserVationFormDTO;
+import com.epmet.opendata.dto.wgh.SubdistrictOfficeDTO;
+
+import com.epmet.opendata.excel.WghSubdistrictOfficeExcel;
+import com.epmet.opendata.service.WghSubdistrictOfficeService;
+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 2022-06-14
+ */
+@RestController
+@RequestMapping("subdistrictOffice")
+public class WghSubdistrictOfficeController {
+
+    @Autowired
+    private WghSubdistrictOfficeService subdistrictOfficeService;
+
+    @RequestMapping("page")
+    public Result<PageData<SubdistrictOfficeDTO>> page(@RequestParam Map<String, Object> params){
+        PageData<SubdistrictOfficeDTO> page = subdistrictOfficeService.page(params);
+        return new Result<PageData<SubdistrictOfficeDTO>>().ok(page);
+    }
+
+    @RequestMapping(value = "{id}",method = {RequestMethod.POST,RequestMethod.GET})
+    public Result<SubdistrictOfficeDTO> get(@PathVariable("id") String id){
+        SubdistrictOfficeDTO data = subdistrictOfficeService.get(id);
+        return new Result<SubdistrictOfficeDTO>().ok(data);
+    }
+
+    @NoRepeatSubmit
+    @PostMapping("save")
+    public Result save(@RequestBody SubdistrictOfficeDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+        subdistrictOfficeService.save(dto);
+        return new Result();
+    }
+
+    @NoRepeatSubmit
+    @PostMapping("update")
+    public Result update(@RequestBody SubdistrictOfficeDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+        subdistrictOfficeService.update(dto);
+        return new Result();
+    }
+
+    @PostMapping("delete")
+    public Result delete(@RequestBody String[] ids){
+        //效验数据
+        AssertUtils.isArrayEmpty(ids, "id");
+        subdistrictOfficeService.delete(ids);
+        return new Result();
+    }
+
+    @GetMapping("export")
+    public void export(@RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
+        List<SubdistrictOfficeDTO> list = subdistrictOfficeService.list(params);
+        ExcelUtils.exportExcelToTarget(response, null, list, WghSubdistrictOfficeExcel.class);
+    }
+
+    /**
+     * 调用ruoyi接口
+     *
+     * @param dto
+     * @return com.epmet.commons.tools.utils.Result
+     * @author LZN
+     * @date 2022/6/14 17:36
+     */
+    @PostMapping("/preserSubVation")
+    public Result getpreserSubVation(@RequestBody PreserVationFormDTO dto) {
+        subdistrictOfficeService.getpreserSubVation(dto);
+        return new Result();
+    }
+
+
+}

epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/WghSzcgwghController.java

@@ -0,0 +1,95 @@
+package com.epmet.opendata.controller;
+
+import com.epmet.commons.tools.aop.NoRepeatSubmit;
+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.DefaultGroup;
+import com.epmet.commons.tools.validator.group.UpdateGroup;
+import com.epmet.opendata.dto.form.PreserVationFormDTO;
+import com.epmet.opendata.dto.wgh.WghSzcgwghDTO;
+import com.epmet.opendata.excel.WghSzcgwghExcel;
+import com.epmet.opendata.service.WghSzcgwghService;
+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 2022-06-14
+ */
+@RestController
+@RequestMapping("wghSzcgwgh")
+public class WghSzcgwghController {
+
+    @Autowired
+    private WghSzcgwghService wghSzcgwghService;
+
+    @RequestMapping("page")
+    public Result<PageData<WghSzcgwghDTO>> page(@RequestParam Map<String, Object> params){
+        PageData<WghSzcgwghDTO> page = wghSzcgwghService.page(params);
+        return new Result<PageData<WghSzcgwghDTO>>().ok(page);
+    }
+
+    @RequestMapping(value = "{id}",method = {RequestMethod.POST,RequestMethod.GET})
+    public Result<WghSzcgwghDTO> get(@PathVariable("id") String id){
+        WghSzcgwghDTO data = wghSzcgwghService.get(id);
+        return new Result<WghSzcgwghDTO>().ok(data);
+    }
+
+    @NoRepeatSubmit
+    @PostMapping("save")
+    public Result save(@RequestBody WghSzcgwghDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+        wghSzcgwghService.save(dto);
+        return new Result();
+    }
+
+    @NoRepeatSubmit
+    @PostMapping("update")
+    public Result update(@RequestBody WghSzcgwghDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+        wghSzcgwghService.update(dto);
+        return new Result();
+    }
+
+    @PostMapping("delete")
+    public Result delete(@RequestBody String[] ids){
+        //效验数据
+        AssertUtils.isArrayEmpty(ids, "id");
+        wghSzcgwghService.delete(ids);
+        return new Result();
+    }
+
+    @GetMapping("export")
+    public void export(@RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
+        List<WghSzcgwghDTO> list = wghSzcgwghService.list(params);
+        ExcelUtils.exportExcelToTarget(response, null, list, WghSzcgwghExcel.class);
+    }
+
+    /**
+     * 调用ruoyi系统获取wgh_szcgwgh数据
+     *
+     * @param dto
+     * @return com.epmet.commons.tools.utils.Result
+     * @author LZN
+     * @date 2022/6/14 16:19
+     */
+    @PostMapping("/preserWghSzcgwghVation")
+    public Result getPreserWghSzcgwghVation(@RequestBody PreserVationFormDTO dto) {
+        wghSzcgwghService.getPreserWghSzcgwghVation(dto);
+        return new Result();
+    }
+
+}

epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/WghSzzrwgController.java

@@ -0,0 +1,95 @@
+package com.epmet.opendata.controller;
+
+import com.epmet.commons.tools.aop.NoRepeatSubmit;
+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.DefaultGroup;
+import com.epmet.commons.tools.validator.group.UpdateGroup;
+import com.epmet.opendata.dto.form.PreserVationFormDTO;
+import com.epmet.opendata.dto.wgh.WghSzzrwgDTO;
+import com.epmet.opendata.excel.WghSzzrwgExcel;
+import com.epmet.opendata.service.WghSzzrwgService;
+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 2022-06-14
+ */
+@RestController
+@RequestMapping("wghSzzrwg")
+public class WghSzzrwgController {
+
+    @Autowired
+    private WghSzzrwgService wghSzzrwgService;
+
+    @RequestMapping("page")
+    public Result<PageData<WghSzzrwgDTO>> page(@RequestParam Map<String, Object> params){
+        PageData<WghSzzrwgDTO> page = wghSzzrwgService.page(params);
+        return new Result<PageData<WghSzzrwgDTO>>().ok(page);
+    }
+
+    @RequestMapping(value = "{id}",method = {RequestMethod.POST,RequestMethod.GET})
+    public Result<WghSzzrwgDTO> get(@PathVariable("id") String id){
+        WghSzzrwgDTO data = wghSzzrwgService.get(id);
+        return new Result<WghSzzrwgDTO>().ok(data);
+    }
+
+    @NoRepeatSubmit
+    @PostMapping("save")
+    public Result save(@RequestBody WghSzzrwgDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+        wghSzzrwgService.save(dto);
+        return new Result();
+    }
+
+    @NoRepeatSubmit
+    @PostMapping("update")
+    public Result update(@RequestBody WghSzzrwgDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+        wghSzzrwgService.update(dto);
+        return new Result();
+    }
+
+    @PostMapping("delete")
+    public Result delete(@RequestBody String[] ids){
+        //效验数据
+        AssertUtils.isArrayEmpty(ids, "id");
+        wghSzzrwgService.delete(ids);
+        return new Result();
+    }
+
+    @GetMapping("export")
+    public void export(@RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
+        List<WghSzzrwgDTO> list = wghSzzrwgService.list(params);
+        ExcelUtils.exportExcelToTarget(response, null, list, WghSzzrwgExcel.class);
+    }
+
+    /**
+     * 调用ruoyi接口获取wgh_szzrwg数据
+     *
+     * @param dto
+     * @return com.epmet.commons.tools.utils.Result
+     * @author LZN
+     * @date 2022/6/14 16:26
+     */
+    @PostMapping("/preserWghSzzrwgVation")
+    public Result getPreserWghSzzrwgVation(@RequestBody PreserVationFormDTO dto) {
+        wghSzzrwgService.getPreserWghSzzrwgVation(dto);
+        return new Result();
+    }
+
+}

epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/WghWhpdwController.java

@@ -0,0 +1,95 @@
+package com.epmet.opendata.controller;
+
+import com.epmet.commons.tools.aop.NoRepeatSubmit;
+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.opendata.dto.form.PreserVationFormDTO;
+import com.epmet.opendata.dto.wgh.WghWhpdwDTO;
+import com.epmet.opendata.excel.WghWhpdwExcel;
+import com.epmet.opendata.service.WghWhpdwService;
+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 2022-06-14
+ */
+@RestController
+@RequestMapping("wghWhpdw")
+public class WghWhpdwController {
+
+    @Autowired
+    private WghWhpdwService wghWhpdwService;
+
+    @RequestMapping("page")
+    public Result<PageData<WghWhpdwDTO>> page(@RequestParam Map<String, Object> params){
+        PageData<WghWhpdwDTO> page = wghWhpdwService.page(params);
+        return new Result<PageData<WghWhpdwDTO>>().ok(page);
+    }
+
+    @RequestMapping(value = "{id}",method = {RequestMethod.POST,RequestMethod.GET})
+    public Result<WghWhpdwDTO> get(@PathVariable("id") String id){
+        WghWhpdwDTO data = wghWhpdwService.get(id);
+        return new Result<WghWhpdwDTO>().ok(data);
+    }
+
+    @NoRepeatSubmit
+    @PostMapping("save")
+    public Result save(@RequestBody WghWhpdwDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+        wghWhpdwService.save(dto);
+        return new Result();
+    }
+
+    @NoRepeatSubmit
+    @PostMapping("update")
+    public Result update(@RequestBody WghWhpdwDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+        wghWhpdwService.update(dto);
+        return new Result();
+    }
+
+    @PostMapping("delete")
+    public Result delete(@RequestBody String[] ids){
+        //效验数据
+        AssertUtils.isArrayEmpty(ids, "id");
+        wghWhpdwService.delete(ids);
+        return new Result();
+    }
+
+    @GetMapping("export")
+    public void export(@RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
+        List<WghWhpdwDTO> list = wghWhpdwService.list(params);
+        ExcelUtils.exportExcelToTarget(response, null, list, WghWhpdwExcel.class);
+    }
+
+    /**
+     * 调用ruoyi系统获取wgh_whpdw数据
+     *
+     * @param dto
+     * @return com.epmet.commons.tools.utils.Result
+     * @author LZN
+     * @date 2022/6/14 16:33
+     */
+    @PostMapping("/preserWhpdwVation")
+    public Result getPreserWhpdwVation(@RequestBody PreserVationFormDTO dto) {
+        wghWhpdwService.getPreserWhpdwVation(dto);
+        return new Result();
+    }
+
+}

epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/WghYjbmcsController.java

@@ -0,0 +1,95 @@
+package com.epmet.opendata.controller;
+
+import com.epmet.commons.tools.aop.NoRepeatSubmit;
+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.DefaultGroup;
+import com.epmet.commons.tools.validator.group.UpdateGroup;
+import com.epmet.opendata.dto.form.PreserVationFormDTO;
+import com.epmet.opendata.dto.wgh.WghYjbmcsDTO;
+import com.epmet.opendata.excel.WghYjbmcsExcel;
+import com.epmet.opendata.service.WghYjbmcsService;
+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 2022-06-14
+ */
+@RestController
+@RequestMapping("wghYjbmcs")
+public class WghYjbmcsController {
+
+    @Autowired
+    private WghYjbmcsService wghYjbmcsService;
+
+    @RequestMapping("page")
+    public Result<PageData<WghYjbmcsDTO>> page(@RequestParam Map<String, Object> params) {
+        PageData<WghYjbmcsDTO> page = wghYjbmcsService.page(params);
+        return new Result<PageData<WghYjbmcsDTO>>().ok(page);
+    }
+
+    @RequestMapping(value = "{id}", method = {RequestMethod.POST, RequestMethod.GET})
+    public Result<WghYjbmcsDTO> get(@PathVariable("id") String id) {
+        WghYjbmcsDTO data = wghYjbmcsService.get(id);
+        return new Result<WghYjbmcsDTO>().ok(data);
+    }
+
+    @NoRepeatSubmit
+    @PostMapping("save")
+    public Result save(@RequestBody WghYjbmcsDTO dto) {
+        //效验数据
+        ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+        wghYjbmcsService.save(dto);
+        return new Result();
+    }
+
+    @NoRepeatSubmit
+    @PostMapping("update")
+    public Result update(@RequestBody WghYjbmcsDTO dto) {
+        //效验数据
+        ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+        wghYjbmcsService.update(dto);
+        return new Result();
+    }
+
+    @PostMapping("delete")
+    public Result delete(@RequestBody String[] ids) {
+        //效验数据
+        AssertUtils.isArrayEmpty(ids, "id");
+        wghYjbmcsService.delete(ids);
+        return new Result();
+    }
+
+    @GetMapping("export")
+    public void export(@RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
+        List<WghYjbmcsDTO> list = wghYjbmcsService.list(params);
+        ExcelUtils.exportExcelToTarget(response, null, list, WghYjbmcsExcel.class);
+    }
+
+    /**
+     * 调用ruoyi系统获取wgh_yjbmcs数据
+     *
+     * @param dto
+     * @return com.epmet.commons.tools.utils.Result
+     * @author LZN
+     * @date 2022/6/14 16:39
+     */
+    @PostMapping("/preserWghYjbmcsVation")
+    public Result getPreserWghYjbmcsVation(@RequestBody PreserVationFormDTO dto) {
+        wghYjbmcsService.getPreserWghYjbmcsVation(dto);
+        return new Result();
+    }
+
+}

epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/WghYqhjzController.java

@@ -0,0 +1,94 @@
+package com.epmet.opendata.controller;
+
+import com.epmet.commons.tools.aop.NoRepeatSubmit;
+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.DefaultGroup;
+import com.epmet.commons.tools.validator.group.UpdateGroup;
+import com.epmet.opendata.dto.form.PreserVationFormDTO;
+import com.epmet.opendata.service.WghYqhjzService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import com.epmet.opendata.dto.wgh.WghYqhjzDTO;
+import javax.servlet.http.HttpServletResponse;
+import com.epmet.opendata.excel.WghYqhjzExcel;
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * 油气合建站信息
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-06-14
+ */
+@RestController
+@RequestMapping("wghYqhjz")
+public class WghYqhjzController {
+
+    @Autowired
+    private WghYqhjzService wghYqhjzService;
+
+    @RequestMapping("page")
+    public Result<PageData<WghYqhjzDTO>> page(@RequestParam Map<String, Object> params){
+        PageData<WghYqhjzDTO> page = wghYqhjzService.page(params);
+        return new Result<PageData<WghYqhjzDTO>>().ok(page);
+    }
+
+    @RequestMapping(value = "{id}",method = {RequestMethod.POST,RequestMethod.GET})
+    public Result<WghYqhjzDTO> get(@PathVariable("id") String id){
+        WghYqhjzDTO data = wghYqhjzService.get(id);
+        return new Result<WghYqhjzDTO>().ok(data);
+    }
+
+    @NoRepeatSubmit
+    @PostMapping("save")
+    public Result save(@RequestBody WghYqhjzDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+        wghYqhjzService.save(dto);
+        return new Result();
+    }
+
+    @NoRepeatSubmit
+    @PostMapping("update")
+    public Result update(@RequestBody WghYqhjzDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+        wghYqhjzService.update(dto);
+        return new Result();
+    }
+
+    @PostMapping("delete")
+    public Result delete(@RequestBody String[] ids){
+        //效验数据
+        AssertUtils.isArrayEmpty(ids, "id");
+        wghYqhjzService.delete(ids);
+        return new Result();
+    }
+
+    @GetMapping("export")
+    public void export(@RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
+        List<WghYqhjzDTO> list = wghYqhjzService.list(params);
+        ExcelUtils.exportExcelToTarget(response, null, list, WghYqhjzExcel.class);
+    }
+
+    /**
+     * 调用ruoyi系统获取wgh_yqhjz数据
+     *
+     * @param dto
+     * @return com.epmet.commons.tools.utils.Result
+     * @author LZN
+     * @date 2022/6/14 16:46
+     */
+    @PostMapping("/preserWghYqhjzVation")
+    public Result getPreserWghYqhjzVation(@RequestBody PreserVationFormDTO dto) {
+        wghYqhjzService.getPreserWghYqhjzVation(dto);
+        return new Result();
+    }
+
+}

epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/caBmGridController.java

@@ -0,0 +1,112 @@
+package com.epmet.opendata.controller;
+
+import com.epmet.commons.tools.aop.NoRepeatSubmit;
+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.DefaultGroup;
+import com.epmet.commons.tools.validator.group.UpdateGroup;
+import com.epmet.opendata.dto.form.PreserVationFormDTO;
+import com.epmet.opendata.dto.result.LouDongCascadeResultDTO;
+import com.epmet.opendata.dto.wgh.BmGridDTO;
+
+
+import com.epmet.opendata.excel.caBmGridExcel;
+import com.epmet.opendata.service.caBmGridService;
+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 2022-06-14
+ */
+@RestController
+@RequestMapping("bmGrid")
+public class caBmGridController {
+
+    @Autowired
+    private caBmGridService bmGridService;
+
+    @RequestMapping("page")
+    public Result<PageData<BmGridDTO>> page(@RequestParam Map<String, Object> params){
+        PageData<BmGridDTO> page = bmGridService.page(params);
+        return new Result<PageData<BmGridDTO>>().ok(page);
+    }
+
+    @RequestMapping(value = "{id}",method = {RequestMethod.POST,RequestMethod.GET})
+    public Result<BmGridDTO> get(@PathVariable("id") String id){
+        BmGridDTO data = bmGridService.get(id);
+        return new Result<BmGridDTO>().ok(data);
+    }
+
+    @NoRepeatSubmit
+    @PostMapping("save")
+    public Result save(@RequestBody BmGridDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+        bmGridService.save(dto);
+        return new Result();
+    }
+
+    @NoRepeatSubmit
+    @PostMapping("update")
+    public Result update(@RequestBody BmGridDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+        bmGridService.update(dto);
+        return new Result();
+    }
+
+    @PostMapping("delete")
+    public Result delete(@RequestBody String[] ids){
+        //效验数据
+        AssertUtils.isArrayEmpty(ids, "id");
+        bmGridService.delete(ids);
+        return new Result();
+    }
+
+    @GetMapping("export")
+    public void export(@RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
+        List<BmGridDTO> list = bmGridService.list(params);
+        ExcelUtils.exportExcelToTarget(response, null, list, caBmGridExcel.class);
+    }
+
+    /**
+     * 调用ruoyi存储bm_grid数据
+     *
+     * @param dto
+     * @return com.epmet.commons.tools.utils.Result
+     * @author LZN
+     * @date 2022/6/14 14:16
+     */
+    @PostMapping("preserBmGridVation")
+    public Result getpreserBmGridVation(@RequestBody PreserVationFormDTO dto) {
+        bmGridService.getPreserBmGridVation(dto);
+        return new Result();
+    }
+
+    /**
+     * 获取级联菜单
+     *
+     * @param
+     * @return com.epmet.commons.tools.utils.Result
+     * @author LZN
+     * @date 2022/6/15 14:01
+     */
+    @PostMapping("getCascadeMenu")
+    public Result getCascadeMenu(){
+        List<LouDongCascadeResultDTO> dto = bmGridService.getCascadeMenu();
+        return new Result().ok(dto);
+    }
+
+}

epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/CaBmCategoryDao.java

@@ -0,0 +1,18 @@
+package com.epmet.opendata.dao;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+
+import com.epmet.opendata.entity.CaBmCategoryEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 多级类型信息表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-06-16
+ */
+@Mapper
+public interface CaBmCategoryDao extends BaseDao<CaBmCategoryEntity> {
+
+    int deleteAll();
+}

epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/CaLoudongDao.java

@@ -5,6 +5,7 @@ import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.opendata.dto.ca.CaLoudongDTO;
 import com.epmet.opendata.dto.result.CaLoudongDetailsResultDTO;
 import com.epmet.opendata.dto.result.CaLoudongResultDTO;
+import com.epmet.opendata.dto.result.LouDongCascadeResultDTO;
 import com.epmet.opendata.entity.CaLoudongEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -32,7 +33,8 @@ public interface CaLoudongDao extends BaseDao<CaLoudongEntity> {
      * @date 2022/5/31 18:57
      */
     List<CaLoudongResultDTO> getPage(@Param("communityName") String communityName,
-                                     @Param("buildingName") String buildingName);
+                                     @Param("buildingName") String buildingName,
+                                     @Param("gridId") String gridId);
 
     /**
      * 楼栋基本信息详情
@@ -43,4 +45,7 @@ public interface CaLoudongDao extends BaseDao<CaLoudongEntity> {
     CaLoudongDetailsResultDTO getLouDongDetails(@Param("buildingId") BigInteger buildingId);
 
     int deleteAll();
+
+
 }
+

epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/CaPingfangDao.java

@@ -23,7 +23,8 @@ public interface CaPingfangDao extends BaseDao<CaPingfangEntity> {
      * @return
      */
     List<CaPingfangResultDTO> getPage(@Param("buildingName") String buildingName,
-                                      @Param("communityName") String communityName);
+                                      @Param("communityName") String communityName,
+                                      @Param("gridId") String gridId);
 
     int deleteAll();
 

epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/CaRentalDao.java

@@ -28,7 +28,8 @@ public interface CaRentalDao extends BaseDao<CaRentalEntity> {
      */
     List<CaRentalResultDTO> getPage(@Param("residentName") String residentName,
                                     @Param("houseName") String houseName,
-                                    @Param("renterName") String renterName);
+                                    @Param("renterName") String renterName,
+                                    @Param("gridId") String gridId);
 
     int deleteAll();
 

epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/CaResidentDao.java

@@ -27,7 +27,8 @@ public interface CaResidentDao extends BaseDao<CaResidentEntity> {
      */
     List<CaResidentResultDTO> getPage(@Param("residentName") String residentName,
                                       @Param("idCard") String idCard,
-                                      @Param("telephone") String telephone);
+                                      @Param("telephone") String telephone,
+                                      @Param("gridId") String gridId);
 
     int deleteAll();
 

epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/CaRotatorsDao.java

@@ -28,7 +28,8 @@ public interface CaRotatorsDao extends BaseDao<CaRotatorsEntity> {
      */
     List<CaRotatorsResultDTO> getPage(@Param("rotatorsName") String rotatorsName,
                                       @Param("idCard") String idCard,
-                                      @Param("telephone") String telephone);
+                                      @Param("telephone") String telephone,
+                                      @Param("gridId") String gridId);
 
     int deleteAll();
 

epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/CaSysDictDao.java

@@ -0,0 +1,18 @@
+package com.epmet.opendata.dao;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+
+import com.epmet.opendata.entity.CaSysDictEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 字典信息表，字典值和字典组均存入此表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-06-16
+ */
+@Mapper
+public interface CaSysDictDao extends BaseDao<CaSysDictEntity> {
+
+    int deleteAll();
+}

epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/WghBaseGridDao.java

@@ -0,0 +1,17 @@
+package com.epmet.opendata.dao;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+
+import com.epmet.opendata.entity.WghBaseGridEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ *
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-06-14
+ */
+@Mapper
+public interface WghBaseGridDao extends BaseDao<WghBaseGridEntity> {
+    int deleteAll();
+}

epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/WghCommunityDao.java

@@ -0,0 +1,19 @@
+package com.epmet.opendata.dao;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+
+
+import com.epmet.opendata.entity.WghCommunityEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ *
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-06-14
+ */
+@Mapper
+public interface WghCommunityDao extends BaseDao<WghCommunityEntity> {
+
+    int deleteAll();
+}

epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/WghDywgDao.java

@@ -0,0 +1,18 @@
+package com.epmet.opendata.dao;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+
+import com.epmet.opendata.entity.WghDywgEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 单元网格
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-06-14
+ */
+@Mapper
+public interface WghDywgDao extends BaseDao<WghDywgEntity> {
+
+    int deleteAll();
+}

epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/WghJdbDao.java

@@ -0,0 +1,18 @@
+package com.epmet.opendata.dao;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+
+import com.epmet.opendata.entity.WghJdbEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 街道办
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-06-14
+ */
+@Mapper
+public interface WghJdbDao extends BaseDao<WghJdbEntity> {
+
+    int deleteAll();
+}

epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/WghJqzDao.java

@@ -0,0 +1,17 @@
+package com.epmet.opendata.dao;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.opendata.entity.WghJqzEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 加气站信息
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-06-14
+ */
+@Mapper
+public interface WghJqzDao extends BaseDao<WghJqzEntity> {
+
+    int deleteAll();
+}

epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/WghJxcsDao.java

@@ -0,0 +1,17 @@
+package com.epmet.opendata.dao;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.opendata.entity.WghJxcsEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 九小场所信息
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-06-14
+ */
+@Mapper
+public interface WghJxcsDao extends BaseDao<WghJxcsEntity> {
+
+    int deleteAll();
+}

epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/WghJyzDao.java

@@ -0,0 +1,17 @@
+package com.epmet.opendata.dao;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.opendata.entity.WghJyzEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 加油站
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-06-14
+ */
+@Mapper
+public interface WghJyzDao extends BaseDao<WghJyzEntity> {
+
+    int deleteAll();
+}

epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/WghSjxxbDao.java

@@ -0,0 +1,17 @@
+package com.epmet.opendata.dao;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.opendata.entity.WghSjxxbEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 事件信息
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-06-14
+ */
+@Mapper
+public interface WghSjxxbDao extends BaseDao<WghSjxxbEntity> {
+
+    int deleteAll();
+}

epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/WghSqxxDao.java

@@ -0,0 +1,18 @@
+package com.epmet.opendata.dao;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+
+import com.epmet.opendata.entity.WghSqxxEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ *
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-06-14
+ */
+@Mapper
+public interface WghSqxxDao extends BaseDao<WghSqxxEntity> {
+
+    int deleteAll();
+}

epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/WghSubdistrictOfficeDao.java

@@ -0,0 +1,19 @@
+package com.epmet.opendata.dao;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+
+
+import com.epmet.opendata.entity.WghSubdistrictOfficeEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ *
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-06-14
+ */
+@Mapper
+public interface WghSubdistrictOfficeDao extends BaseDao<WghSubdistrictOfficeEntity> {
+
+    int deleteAll();
+}

epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/WghSzcgwghDao.java

@@ -0,0 +1,18 @@
+package com.epmet.opendata.dao;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+
+import com.epmet.opendata.entity.WghSzcgwghEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 数字城管网格化信息
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-06-14
+ */
+@Mapper
+public interface WghSzcgwghDao extends BaseDao<WghSzcgwghEntity> {
+
+    int deleteAll();
+}

epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/WghSzzrwgDao.java

@@ -0,0 +1,17 @@
+package com.epmet.opendata.dao;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.opendata.entity.WghSzzrwgEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 市政责任网格信息
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-06-14
+ */
+@Mapper
+public interface WghSzzrwgDao extends BaseDao<WghSzzrwgEntity> {
+
+    int deleteAll();
+}

epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/WghWhpdwDao.java

@@ -0,0 +1,17 @@
+package com.epmet.opendata.dao;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.opendata.entity.WghWhpdwEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 危化品单位信息
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-06-14
+ */
+@Mapper
+public interface WghWhpdwDao extends BaseDao<WghWhpdwEntity> {
+
+    int deleteAll();
+}

epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/WghYjbmcsDao.java

@@ -0,0 +1,17 @@
+package com.epmet.opendata.dao;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.opendata.entity.WghYjbmcsEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 应急避难场所信息
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-06-14
+ */
+@Mapper
+public interface WghYjbmcsDao extends BaseDao<WghYjbmcsEntity> {
+
+    int deleteAll();
+}

epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/WghYqhjzDao.java

@@ -0,0 +1,17 @@
+package com.epmet.opendata.dao;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.opendata.entity.WghYqhjzEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 油气合建站信息
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-06-14
+ */
+@Mapper
+public interface WghYqhjzDao extends BaseDao<WghYqhjzEntity> {
+
+    int deleteAll();
+}

epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/caBmGridDao.java

@@ -0,0 +1,24 @@
+package com.epmet.opendata.dao;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+
+
+import com.epmet.opendata.dto.result.LouDongCascadeResultDTO;
+import com.epmet.opendata.entity.caBmGridEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+/**
+ *
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-06-14
+ */
+@Mapper
+public interface caBmGridDao extends BaseDao<caBmGridEntity> {
+
+    int deleteAll();
+
+    List<LouDongCascadeResultDTO> getCascadeMenu();
+}

epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/CaBmCategoryEntity.java

@@ -0,0 +1,134 @@
+package com.epmet.opendata.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 2022-06-16
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("ca_bm_category")
+public class CaBmCategoryEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 类别ID
+     */
+	private Long categoryId;
+
+    /**
+     * 名称
+     */
+	private String categoryName;
+
+    /**
+     *
+     */
+	private String categoryType;
+
+    /**
+     * 名称值
+     */
+	private String categoryValue;
+
+    /**
+     * 父类别ID
+     */
+	private Long parentCategoryId;
+
+    /**
+     * 展示顺序
+     */
+	private Integer categorySort;
+
+    /**
+     * 创建人
+     */
+	private Long createBy;
+
+    /**
+     * 创建时间
+     */
+	private Date createDate;
+
+    /**
+     * 最后修改人
+     */
+	private Long updateBy;
+
+    /**
+     * 最后修改时间
+     */
+	private Date updateDate;
+
+    /**
+     * 删除状态
+     */
+	private String deleteFlag;
+
+    /**
+     * 乐观锁
+     */
+	private Integer versions;
+
+    /**
+     * 扩展字段1
+     */
+	private String attribute1;
+
+    /**
+     * 扩展字段2
+     */
+	private String attribute2;
+
+    /**
+     * 扩展字段3
+     */
+	private String attribute3;
+
+    /**
+     * 扩展字段4
+     */
+	private String attribute4;
+
+    /**
+     * 扩展字段5
+     */
+	private String attribute5;
+
+    /**
+     * 扩展字段6
+     */
+	private Long attribute6;
+
+    /**
+     * 扩展字段7
+     */
+	private Long attribute7;
+
+    /**
+     * 扩展字段8
+     */
+	private Long attribute8;
+
+    /**
+     * 扩展字段9
+     */
+	private Date attribute9;
+
+    /**
+     * 扩展字段10
+     */
+	private Date attribute10;
+
+}

epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/CaSysDictEntity.java

@@ -0,0 +1,84 @@
+package com.epmet.opendata.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 2022-06-16
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("ca_sys_dict")
+public class CaSysDictEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 字典ID
+     */
+	private Long dictId;
+
+    /**
+     * 字典值，例如：sex/F
+     */
+	private String dictValue;
+
+    /**
+     * 1.字典组名称（性别）或者字典名称（女）
+     */
+	private String dictLabel;
+
+    /**
+     * 字典值时存入字典的值，字典组时存null
+     */
+	private String dictType;
+
+    /**
+     * 描述
+     */
+	private String dictDesc;
+
+    /**
+     * 排序
+     */
+	private Integer dictSort;
+
+    /**
+     * 创建人
+     */
+	private Long createBy;
+
+    /**
+     * 创建时间
+     */
+	private Date createDate;
+
+    /**
+     * 最后修改人
+     */
+	private Long updateBy;
+
+    /**
+     * 最后修改时间
+     */
+	private Date updateDate;
+
+    /**
+     * 字典值：normal正常，deleted正常
+     */
+	private String deleteFlag;
+
+    /**
+     * 乐观锁
+     */
+	private Integer versions;
+
+}

epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/WghBaseGridEntity.java

@@ -0,0 +1,69 @@
+package com.epmet.opendata.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 2022-06-14
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("wgh_base_grid")
+public class WghBaseGridEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     *
+     */
+	private String coordinateInfo;
+
+    /**
+     *
+     */
+	private String gridName;
+
+    /**
+     *
+     */
+	private String subDistrictOffice;
+
+    /**
+     *
+     */
+	private String community;
+
+    /**
+     *
+     */
+	private String streetCode;
+
+    /**
+     *
+     */
+	private String gridCode;
+
+    /**
+     *
+     */
+	private String communityCode;
+
+    /**
+     *
+     */
+	private String longitude;
+
+    /**
+     *
+     */
+	private String latitude;
+
+}

epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/WghCommunityEntity.java

@@ -0,0 +1,59 @@
+package com.epmet.opendata.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 2022-06-14
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("wgh_community")
+public class WghCommunityEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     *
+     */
+	private String coordinateInfo;
+
+    /**
+     *
+     */
+	private String streetName;
+
+    /**
+     *
+     */
+	private String streetCode;
+
+    /**
+     *
+     */
+	private String communityName;
+
+    /**
+     *
+     */
+	private String communityCode;
+
+    /**
+     *
+     */
+	private String longitude;
+
+    /**
+     *
+     */
+	private String latitude;
+
+}

epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/WghDywgEntity.java

@@ -0,0 +1,79 @@
+package com.epmet.opendata.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 2022-06-14
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("wgh_dywg")
+public class WghDywgEntity  {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     *
+     */
+	private Integer objectid;
+
+    /**
+     * 网格名称
+     */
+	private String bgname;
+
+    /**
+     * 所属街镇
+     */
+	private String street;
+
+    /**
+     * 所属社区
+     */
+	private String community;
+
+    /**
+     * 网格面积
+     */
+	private Double bgsqua;
+
+    /**
+     * 初始时间
+     */
+	private Date ordate;
+
+    /**
+     * 变更时间
+     */
+	private Date chdate;
+
+    /**
+     * 备注
+     */
+	private String note;
+
+    /**
+     *
+     */
+	private String contacts;
+
+    /**
+     * 联系电话
+     */
+	private String telphone;
+
+    /**
+     * 插入日期
+     */
+	private Date insertTime;
+
+}

epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/WghJdbEntity.java

@@ -0,0 +1,59 @@
+package com.epmet.opendata.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 2022-06-14
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("wgh_jdb")
+public class WghJdbEntity  {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     *
+     */
+	private String objectid_1;
+
+    /**
+     *
+     */
+	private String objectid;
+
+    /**
+     * 街道名称
+     */
+	private String mc;
+
+    /**
+     * 责任人
+     */
+	private String personInCharge;
+
+    /**
+     * 联系电话
+     */
+	private String phone;
+
+    /**
+     *
+     */
+	private Double shapeLeng;
+
+    /**
+     * 插入日期
+     */
+	private Date insertTime;
+
+}

epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/WghJqzEntity.java

@@ -0,0 +1,129 @@
+package com.epmet.opendata.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 2022-06-14
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("wgh_jqz")
+public class WghJqzEntity  {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     *
+     */
+	private Integer objectid;
+
+    /**
+     * 序号
+     */
+	private String xh;
+
+    /**
+     * 单位名称
+     */
+	private String name;
+
+    /**
+     *
+     */
+	private Double area;
+
+    /**
+     * 周边安全间距
+     */
+	private String space;
+
+    /**
+     * 存在问题
+     */
+	private String problem;
+
+    /**
+     * 危险源类型
+     */
+	private String type;
+
+    /**
+     * 经营地址
+     */
+	private String location;
+
+    /**
+     * 负责人
+     */
+	private String principal;
+
+    /**
+     * 联系电话
+     */
+	private String phone;
+
+    /**
+     * 企业类型
+     */
+	private String qtype;
+
+    /**
+     * 危化品种类
+     */
+	private String wtype;
+
+    /**
+     * 等级
+     */
+	private String level;
+
+    /**
+     * 性质
+     */
+	private String nature;
+
+    /**
+     * 备注
+     */
+	private String remarks;
+
+    /**
+     *
+     */
+	private String dwmcjc;
+
+    /**
+     *
+     */
+	private String layer;
+
+    /**
+     *
+     */
+	private String ssjdb;
+
+    /**
+     * 数量
+     */
+	private String amount;
+
+    /**
+     * 应急措施
+     */
+	private String yjcs;
+
+    /**
+     * 插入日期
+     */
+	private Date insertTime;
+
+}

epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/WghJxcsEntity.java

@@ -0,0 +1,119 @@
+package com.epmet.opendata.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 2022-06-14
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("wgh_jxcs")
+public class WghJxcsEntity  {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     *
+     */
+	private String objectid;
+
+    /**
+     *
+     */
+	private String jsonInfo;
+
+    /**
+     *
+     */
+	private String creatTime;
+
+    /**
+     * 所属街道
+     */
+	private String ssjd;
+
+    /**
+     * 所属社区
+     */
+	private String sssq;
+
+    /**
+     * 道路名
+     */
+	private String dlm;
+
+    /**
+     * 门牌号
+     */
+	private String mph;
+
+    /**
+     * 名称
+     */
+	private String name;
+
+    /**
+     *
+     */
+	private String ztlx;
+
+    /**
+     * 子类型
+     */
+	private String type;
+
+    /**
+     * 统一社会信用代码
+     */
+	private String xydm;
+
+    /**
+     * 联系人
+     */
+	private String lxr;
+
+    /**
+     * 联系电话
+     */
+	private String lxdh;
+
+    /**
+     *
+     */
+	private String userName;
+
+    /**
+     * 备注
+     */
+	private String bz;
+
+    /**
+     *
+     */
+	private String available;
+
+    /**
+     * 编辑人ID
+     */
+	private String userId;
+
+    /**
+     * 编辑人姓名
+     */
+	private String updateTim;
+
+    /**
+     * 插入日期
+     */
+	private String insertTime;
+
+}

epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/WghJyzEntity.java

@@ -0,0 +1,129 @@
+package com.epmet.opendata.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 2022-06-14
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("wgh_jyz")
+public class WghJyzEntity  {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     *
+     */
+	private Integer objectid;
+
+    /**
+     * 序号
+     */
+	private String xh;
+
+    /**
+     * 单位名称
+     */
+	private String name;
+
+    /**
+     *
+     */
+	private Double area;
+
+    /**
+     * 周边安全间距
+     */
+	private String space;
+
+    /**
+     * 存在问题
+     */
+	private String problem;
+
+    /**
+     * 危险源类型
+     */
+	private String type;
+
+    /**
+     * 经营地址
+     */
+	private String location;
+
+    /**
+     * 负责人
+     */
+	private String principal;
+
+    /**
+     * 联系电话
+     */
+	private String phone;
+
+    /**
+     * 企业类型
+     */
+	private String qtype;
+
+    /**
+     * 危化品种类
+     */
+	private String wtype;
+
+    /**
+     * 等级
+     */
+	private String level;
+
+    /**
+     * 性质
+     */
+	private String nature;
+
+    /**
+     * 备注
+     */
+	private String remarks;
+
+    /**
+     *
+     */
+	private String dwmcjc;
+
+    /**
+     *
+     */
+	private String layer;
+
+    /**
+     *
+     */
+	private String ssjdb;
+
+    /**
+     * 数量
+     */
+	private String amount;
+
+    /**
+     * 应急措施
+     */
+	private String yjcs;
+
+    /**
+     * 插入日期
+     */
+	private Date insertTime;
+
+}