改一些字段问题

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

@@ -20,9 +20,9 @@ public interface CaWghDataConstant {
     String UNICOM_ROTATORS = "ca_rotators";
     String UNICOM_RENTAL = "ca_rental";
 
-    String SHARE_BASE_GRID = "Wgh_base_grid";
+    String SHARE_BASE_GRID = "wgh_base_grid";
     String SHARE_WGH_SUB = "wgh_subdistrict_office";
-    String SHARE_BM_GRID = "wgh_bm_grid";
+    String SHARE_BM_GRID = "ca_bm_grid";
     String SHARE_COMMUNITY = "wgh_community";
     String SHARE_WGH_DYWG = "wgh_dywg";
     String SHARE_WGH_JDB = "wgh_jdb";

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

@@ -86,7 +86,7 @@ public class WghBaseGridController {
      * @author LZN
      * @date 2022/6/14 13:40
      */
-    @PostMapping("preserBaseGridVation")
+    @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/WghBmGridController.java → epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/caBmGridController.java

@@ -12,9 +12,9 @@ import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.opendata.dto.form.PreserVationFormDTO;
 import com.epmet.opendata.dto.wgh.BmGridDTO;
 
-import com.epmet.opendata.excel.WghBmGridExcel;
 
-import com.epmet.opendata.service.WghBmGridService;
+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.*;
 
@@ -31,10 +31,10 @@ import java.util.Map;
  */
 @RestController
 @RequestMapping("bmGrid")
-public class WghBmGridController {
+public class caBmGridController {
 
     @Autowired
-    private WghBmGridService bmGridService;
+    private caBmGridService bmGridService;
 
     @RequestMapping("page")
     public Result<PageData<BmGridDTO>> page(@RequestParam Map<String, Object> params){
@@ -77,7 +77,7 @@ public class WghBmGridController {
     @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, WghBmGridExcel.class);
+        ExcelUtils.exportExcelToTarget(response, null, list, caBmGridExcel.class);
     }
 
     /**

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

@@ -3,7 +3,7 @@ package com.epmet.opendata.dao;
 import com.epmet.commons.mybatis.dao.BaseDao;
 
 
-import com.epmet.opendata.entity.WghBmGridEntity;
+import com.epmet.opendata.entity.caBmGridEntity;
 import org.apache.ibatis.annotations.Mapper;
 
 /**
@@ -13,7 +13,7 @@ import org.apache.ibatis.annotations.Mapper;
  * @since v1.0.0 2022-06-14
  */
 @Mapper
-public interface WghBmGridDao extends BaseDao<WghBmGridEntity> {
+public interface caBmGridDao extends BaseDao<caBmGridEntity> {
 
     int deleteAll();
 }

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

@@ -16,7 +16,7 @@ import java.util.Date;
  */
 @Data
 @EqualsAndHashCode(callSuper=false)
-@TableName("basegrid")
+@TableName("wgh_base_grid")
 public class WghBaseGridEntity {
 
 	private static final long serialVersionUID = 1L;

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

@@ -16,7 +16,7 @@ import java.util.Date;
  */
 @Data
 @EqualsAndHashCode(callSuper=false)
-@TableName("community")
+@TableName("wgh_community")
 public class WghCommunityEntity {
 
 	private static final long serialVersionUID = 1L;

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

@@ -24,7 +24,7 @@ public class WghJdbEntity  {
     /**
      *
      */
-	private String objectid1;
+	private String objectid_1;
 
     /**
      *

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

@@ -24,7 +24,7 @@ public class WghSjxxbEntity  {
     /**
      *
      */
-	private Integer objectid1;
+	private Integer objectid_1;
 
     /**
      *

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

@@ -16,7 +16,7 @@ import java.util.Date;
  */
 @Data
 @EqualsAndHashCode(callSuper=false)
-@TableName("subdistrict_office")
+@TableName("wgh_subdistrict_office")
 public class WghSubdistrictOfficeEntity  {
 
 	private static final long serialVersionUID = 1L;

epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/WghBmGridEntity.java → epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/caBmGridEntity.java

@@ -16,8 +16,8 @@ import java.util.Date;
  */
 @Data
 @EqualsAndHashCode(callSuper=false)
-@TableName("bm_grid")
+@TableName("ca_bm_grid")
-public class WghBmGridEntity {
+public class caBmGridEntity {
 
 	private static final long serialVersionUID = 1L;
 

epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/excel/WghBmGridExcel.java → epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/excel/caBmGridExcel.java

@@ -12,7 +12,7 @@ import java.util.Date;
  * @since v1.0.0 2022-06-14
  */
 @Data
-public class WghBmGridExcel {
+public class caBmGridExcel {
 
     @Excel(name = "网格ID")
     private Long gridId;

epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/WghBmGridService.java → epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/caBmGridService.java

@@ -4,7 +4,7 @@ import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.opendata.dto.form.PreserVationFormDTO;
 import com.epmet.opendata.dto.wgh.BmGridDTO;
-import com.epmet.opendata.entity.WghBmGridEntity;
+import com.epmet.opendata.entity.caBmGridEntity;
 
 
 import java.util.List;
@@ -16,7 +16,7 @@ import java.util.Map;
  * @author generator generator@elink-cn.com
  * @since v1.0.0 2022-06-14
  */
-public interface WghBmGridService extends BaseService<WghBmGridEntity> {
+public interface caBmGridService extends BaseService<caBmGridEntity> {
 
     /**
      * 默认分页

epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghBmGridServiceImpl.java → epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaBmGridServiceImpl.java

@@ -11,14 +11,16 @@ import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.HttpClientManager;
 import com.epmet.commons.tools.utils.Result;
-import com.epmet.opendata.dao.WghBmGridDao;
+
+import com.epmet.opendata.dao.caBmGridDao;
 import com.epmet.opendata.dto.constant.CaWghDataConstant;
 import com.epmet.opendata.dto.form.PreserVationFormDTO;
 import com.epmet.opendata.dto.wgh.BmGridDTO;
-import com.epmet.opendata.entity.WghBmGridEntity;
+
+import com.epmet.opendata.entity.caBmGridEntity;
 import com.epmet.opendata.redis.BmGridRedis;
 
-import com.epmet.opendata.service.WghBmGridService;
+import com.epmet.opendata.service.caBmGridService;
 import com.epmet.opendata.util.AesUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -36,14 +38,14 @@ import java.util.Map;
  * @since v1.0.0 2022-06-14
  */
 @Service
-public class WghBmGridServiceImpl extends BaseServiceImpl<WghBmGridDao, WghBmGridEntity> implements WghBmGridService {
+public class CaBmGridServiceImpl extends BaseServiceImpl<caBmGridDao, caBmGridEntity> implements caBmGridService {
 
     @Autowired
     private BmGridRedis bmGridRedis;
 
     @Override
     public PageData<BmGridDTO> page(Map<String, Object> params) {
-        IPage<WghBmGridEntity> page = baseDao.selectPage(
+        IPage<caBmGridEntity> page = baseDao.selectPage(
                 getPage(params, FieldConstant.CREATED_TIME, false),
                 getWrapper(params)
         );
@@ -52,15 +54,15 @@ public class WghBmGridServiceImpl extends BaseServiceImpl<WghBmGridDao, WghBmGri
 
     @Override
     public List<BmGridDTO> list(Map<String, Object> params) {
-        List<WghBmGridEntity> entityList = baseDao.selectList(getWrapper(params));
+        List<caBmGridEntity> entityList = baseDao.selectList(getWrapper(params));
 
         return ConvertUtils.sourceToTarget(entityList, BmGridDTO.class);
     }
 
-    private QueryWrapper<WghBmGridEntity> getWrapper(Map<String, Object> params){
+    private QueryWrapper<caBmGridEntity> getWrapper(Map<String, Object> params){
         String id = (String)params.get(FieldConstant.ID_HUMP);
 
-        QueryWrapper<WghBmGridEntity> wrapper = new QueryWrapper<>();
+        QueryWrapper<caBmGridEntity> wrapper = new QueryWrapper<>();
         wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
 
         return wrapper;
@@ -68,21 +70,21 @@ public class WghBmGridServiceImpl extends BaseServiceImpl<WghBmGridDao, WghBmGri
 
     @Override
     public BmGridDTO get(String id) {
-        WghBmGridEntity entity = baseDao.selectById(id);
+        caBmGridEntity entity = baseDao.selectById(id);
         return ConvertUtils.sourceToTarget(entity, BmGridDTO.class);
     }
 
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void save(BmGridDTO dto) {
-        WghBmGridEntity entity = ConvertUtils.sourceToTarget(dto, WghBmGridEntity.class);
+        caBmGridEntity entity = ConvertUtils.sourceToTarget(dto, caBmGridEntity.class);
         insert(entity);
     }
 
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void update(BmGridDTO dto) {
-        WghBmGridEntity entity = ConvertUtils.sourceToTarget(dto, WghBmGridEntity.class);
+        caBmGridEntity entity = ConvertUtils.sourceToTarget(dto, caBmGridEntity.class);
         updateById(entity);
     }
 
@@ -107,11 +109,11 @@ public class WghBmGridServiceImpl extends BaseServiceImpl<WghBmGridDao, WghBmGri
         if (i >= 0) {
             dto.setPageNo(NumConstant.ONE);
             dto.setPageSize(NumConstant.FIFTY);
-            dto.setTableSchema(CaWghDataConstant.TABLESCHEMA_SHARE);
+            dto.setTableSchema(CaWghDataConstant.TABLESCHEMA_UNICOM);
             dto.setTableName(CaWghDataConstant.SHARE_BM_GRID);
 
             dto.setWhereCase("delete_flag = 'normal'");
-            dto.setOrderBy("grid_id,parent_id,create_date");
+            dto.setOrderBy("grid_id");
 
             int pageNo = 1;
 
@@ -132,8 +134,8 @@ public class WghBmGridServiceImpl extends BaseServiceImpl<WghBmGridDao, WghBmGri
     private int listBmGrid(PreserVationFormDTO dto) throws Exception {
         String aes = AesUtils.encryptByAES(JSONObject.toJSONString(dto), CaWghDataConstant.AESKEY);
         JSONObject obj = new JSONObject();
-        obj.put(CaWghDataConstant.SHARE_CONDITION, aes);
+        obj.put(CaWghDataConstant.UNICOM_CONDITION, aes);
-        String data = HttpClientManager.getInstance().sendPostByJSON(CaWghDataConstant.DATA_URL_SHARE, obj.toJSONString()).getData();
+        String data = HttpClientManager.getInstance().sendPostByJSON(CaWghDataConstant.DATA_URL_UNICON, obj.toJSONString()).getData();
         JSONObject toResult = JSON.parseObject(data);
         Result result = ConvertUtils.mapToEntity(toResult, Result.class);
         if (!result.success()) {
@@ -147,7 +149,7 @@ public class WghBmGridServiceImpl extends BaseServiceImpl<WghBmGridDao, WghBmGri
 
     static class ReturnDate {
         private int total;
-        private List<WghBmGridEntity> list;
+        private List<caBmGridEntity> list;
 
         public int getTotal() {
             return total;
@@ -157,11 +159,11 @@ public class WghBmGridServiceImpl extends BaseServiceImpl<WghBmGridDao, WghBmGri
             this.total = total;
         }
 
-        public List<WghBmGridEntity> getList() {
+        public List<caBmGridEntity> getList() {
             return list;
         }
 
-        public void setList(List<WghBmGridEntity> list) {
+        public void setList(List<caBmGridEntity> list) {
             this.list = list;
         }
     }

epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/GuardarDatosTaskServiceImpl.java

@@ -30,7 +30,7 @@ public class GuardarDatosTaskServiceImpl implements GuardarDatosTaskService {
     private WghBaseGridService basegridService;
 
     @Autowired
-    private WghBmGridService bmGridService;
+    private caBmGridService bmGridService;
 
     @Autowired
     private WghCommunityService communityService;

epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghBaseGridServiceImpl.java

@@ -108,7 +108,7 @@ public class WghBaseGridServiceImpl extends BaseServiceImpl<WghBaseGridDao, WghB
             dto.setTableName(CaWghDataConstant.SHARE_BASE_GRID);
 
             dto.setWhereCase("1=1");
-            dto.setOrderBy("gridName");
+            dto.setOrderBy("网格编码");
 
             int pageNo = 1;
 

epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghCommunityServiceImpl.java

@@ -109,7 +109,7 @@ public class WghCommunityServiceImpl extends BaseServiceImpl<WghCommunityDao, Wg
             dto.setTableName(CaWghDataConstant.SHARE_COMMUNITY);
 
             dto.setWhereCase("1=1");
-            dto.setOrderBy("");
+            dto.setOrderBy("社区编码");
 
             int pageNo = 1;
 

epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghJqzServiceImpl.java

@@ -111,7 +111,7 @@ public class WghJqzServiceImpl extends BaseServiceImpl<WghJqzDao, WghJqzEntity>
             dto.setTableName(CaWghDataConstant.SHARE_WGH_JQZ);
 
             dto.setWhereCase("1=1");
-            dto.setOrderBy("");
+            dto.setOrderBy("OBJECTID");
 
             int pageNo = 1;
 

epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghSubdistrictOfficeServiceImpl.java

@@ -103,7 +103,7 @@ public class WghSubdistrictOfficeServiceImpl extends BaseServiceImpl<WghSubdistr
             dto.setTableName(CaWghDataConstant.SHARE_WGH_SUB);
 
             dto.setWhereCase("1=1");
-            dto.setOrderBy("");
+            dto.setOrderBy("街道代码");
 
             int pageNo = 1;
 

epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghSzzrwgServiceImpl.java

@@ -113,7 +113,7 @@ public class WghSzzrwgServiceImpl extends BaseServiceImpl<WghSzzrwgDao, WghSzzrw
             dto.setTableName(CaWghDataConstant.SHARE_WGH_SZZRWG);
 
             dto.setWhereCase("1=1");
-            dto.setOrderBy("");
+            dto.setOrderBy("OBJECTID");
 
             int pageNo = 1;
 

epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/WghSjxxbDao.xml

@@ -21,7 +21,7 @@
         <result property="insertTime" column="insert_time"/>
     </resultMap>
     <delete id="deleteAll">
-        delete from wgh_sjxx
+        delete from wgh_sjxxb
     </delete>
 
 

epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/WghBmGridDao.xml → epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/caBmGridDao.xml

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
-<mapper namespace="com.epmet.opendata.dao.WghBmGridDao">
+<mapper namespace="com.epmet.opendata.dao.caBmGridDao">
 
 
     <delete id="deleteAll">
-        delete from wgh_bm_grid
+        delete from ca_bm_grid
     </delete>