From fb10bd34692b0b0b0bfd1f68c30715509d3df741 Mon Sep 17 00:00:00 2001 From: HAHA Date: Wed, 15 Jun 2022 11:00:10 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=B9=E4=B8=80=E4=BA=9B=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/constant/CaWghDataConstant.java | 4 +- .../controller/WghBaseGridController.java | 2 +- ...ontroller.java => caBmGridController.java} | 10 ++--- .../{WghBmGridDao.java => caBmGridDao.java} | 4 +- .../opendata/entity/WghBaseGridEntity.java | 2 +- .../opendata/entity/WghCommunityEntity.java | 2 +- .../epmet/opendata/entity/WghJdbEntity.java | 2 +- .../epmet/opendata/entity/WghSjxxbEntity.java | 2 +- .../entity/WghSubdistrictOfficeEntity.java | 2 +- ...hBmGridEntity.java => caBmGridEntity.java} | 4 +- ...WghBmGridExcel.java => caBmGridExcel.java} | 2 +- ...mGridService.java => caBmGridService.java} | 4 +- ...viceImpl.java => CaBmGridServiceImpl.java} | 38 ++++++++++--------- .../impl/GuardarDatosTaskServiceImpl.java | 2 +- .../service/impl/WghBaseGridServiceImpl.java | 2 +- .../service/impl/WghCommunityServiceImpl.java | 2 +- .../service/impl/WghJqzServiceImpl.java | 2 +- .../impl/WghSubdistrictOfficeServiceImpl.java | 2 +- .../service/impl/WghSzzrwgServiceImpl.java | 2 +- .../src/main/resources/mapper/WghSjxxbDao.xml | 2 +- .../{WghBmGridDao.xml => caBmGridDao.xml} | 4 +- 21 files changed, 49 insertions(+), 47 deletions(-) rename epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/{WghBmGridController.java => caBmGridController.java} (91%) rename epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/{WghBmGridDao.java => caBmGridDao.java} (68%) rename epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/{WghBmGridEntity.java => caBmGridEntity.java} (98%) rename epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/excel/{WghBmGridExcel.java => caBmGridExcel.java} (99%) rename epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/{WghBmGridService.java => caBmGridService.java} (93%) rename epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/{WghBmGridServiceImpl.java => CaBmGridServiceImpl.java} (78%) rename epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/{WghBmGridDao.xml => caBmGridDao.xml} (69%) diff --git a/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/constant/CaWghDataConstant.java b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/constant/CaWghDataConstant.java index e603610dea..029f846273 100644 --- a/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/constant/CaWghDataConstant.java +++ b/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"; diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/WghBaseGridController.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/WghBaseGridController.java index dc990c7324..d537ae63e9 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/WghBaseGridController.java +++ b/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(); diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/WghBmGridController.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/caBmGridController.java similarity index 91% rename from epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/WghBmGridController.java rename to epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/caBmGridController.java index c4d6c0773a..6c344bc523 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/WghBmGridController.java +++ b/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> page(@RequestParam Map params){ @@ -77,7 +77,7 @@ public class WghBmGridController { @GetMapping("export") public void export(@RequestParam Map params, HttpServletResponse response) throws Exception { List list = bmGridService.list(params); - ExcelUtils.exportExcelToTarget(response, null, list, WghBmGridExcel.class); + ExcelUtils.exportExcelToTarget(response, null, list, caBmGridExcel.class); } /** diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/WghBmGridDao.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/caBmGridDao.java similarity index 68% rename from epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/WghBmGridDao.java rename to epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/caBmGridDao.java index f41a557914..b9a1ca4e5b 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/WghBmGridDao.java +++ b/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 { +public interface caBmGridDao extends BaseDao { int deleteAll(); } diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/WghBaseGridEntity.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/WghBaseGridEntity.java index 060a64e921..0a4d1ff91c 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/WghBaseGridEntity.java +++ b/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; diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/WghCommunityEntity.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/WghCommunityEntity.java index f2e8a2a9c6..cafd34e05c 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/WghCommunityEntity.java +++ b/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; diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/WghJdbEntity.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/WghJdbEntity.java index 6dd4cab773..b02d41dd5c 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/WghJdbEntity.java +++ b/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; /** * diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/WghSjxxbEntity.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/WghSjxxbEntity.java index ea97c3cefe..2e443c2205 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/WghSjxxbEntity.java +++ b/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; /** * diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/WghSubdistrictOfficeEntity.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/WghSubdistrictOfficeEntity.java index f9d249ecf7..fa133bc1fb 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/WghSubdistrictOfficeEntity.java +++ b/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; diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/WghBmGridEntity.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/caBmGridEntity.java similarity index 98% rename from epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/WghBmGridEntity.java rename to epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/caBmGridEntity.java index 157a526928..f287d88494 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/WghBmGridEntity.java +++ b/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") -public class WghBmGridEntity { +@TableName("ca_bm_grid") +public class caBmGridEntity { private static final long serialVersionUID = 1L; diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/excel/WghBmGridExcel.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/excel/caBmGridExcel.java similarity index 99% rename from epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/excel/WghBmGridExcel.java rename to epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/excel/caBmGridExcel.java index 7703a171df..21ee4853dd 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/excel/WghBmGridExcel.java +++ b/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; diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/WghBmGridService.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/caBmGridService.java similarity index 93% rename from epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/WghBmGridService.java rename to epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/caBmGridService.java index 164506d33a..0d559be42c 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/WghBmGridService.java +++ b/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 { +public interface caBmGridService extends BaseService { /** * 默认分页 diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghBmGridServiceImpl.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaBmGridServiceImpl.java similarity index 78% rename from epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghBmGridServiceImpl.java rename to epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaBmGridServiceImpl.java index 622f59da1a..ad44a7dda5 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghBmGridServiceImpl.java +++ b/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 implements WghBmGridService { +public class CaBmGridServiceImpl extends BaseServiceImpl implements caBmGridService { @Autowired private BmGridRedis bmGridRedis; @Override public PageData page(Map params) { - IPage page = baseDao.selectPage( + IPage page = baseDao.selectPage( getPage(params, FieldConstant.CREATED_TIME, false), getWrapper(params) ); @@ -52,15 +54,15 @@ public class WghBmGridServiceImpl extends BaseServiceImpl list(Map params) { - List entityList = baseDao.selectList(getWrapper(params)); + List entityList = baseDao.selectList(getWrapper(params)); return ConvertUtils.sourceToTarget(entityList, BmGridDTO.class); } - private QueryWrapper getWrapper(Map params){ + private QueryWrapper getWrapper(Map params){ String id = (String)params.get(FieldConstant.ID_HUMP); - QueryWrapper wrapper = new QueryWrapper<>(); + QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); return wrapper; @@ -68,21 +70,21 @@ public class WghBmGridServiceImpl extends BaseServiceImpl= 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 list; + private List list; public int getTotal() { return total; @@ -157,11 +159,11 @@ public class WghBmGridServiceImpl extends BaseServiceImpl getList() { + public List getList() { return list; } - public void setList(List list) { + public void setList(List list) { this.list = list; } } diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/GuardarDatosTaskServiceImpl.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/GuardarDatosTaskServiceImpl.java index 65f83e02a7..d819c24758 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/GuardarDatosTaskServiceImpl.java +++ b/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; diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghBaseGridServiceImpl.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghBaseGridServiceImpl.java index b799f6cec9..e3105dab2e 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghBaseGridServiceImpl.java +++ b/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 dto.setTableName(CaWghDataConstant.SHARE_WGH_JQZ); dto.setWhereCase("1=1"); - dto.setOrderBy(""); + dto.setOrderBy("OBJECTID"); int pageNo = 1; diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghSubdistrictOfficeServiceImpl.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghSubdistrictOfficeServiceImpl.java index 2cccafee16..8425427509 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghSubdistrictOfficeServiceImpl.java +++ b/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 - delete from wgh_sjxx + delete from wgh_sjxxb diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/WghBmGridDao.xml b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/caBmGridDao.xml similarity index 69% rename from epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/WghBmGridDao.xml rename to epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/caBmGridDao.xml index bc8c5b7f7e..a87a72b682 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/WghBmGridDao.xml +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/caBmGridDao.xml @@ -1,11 +1,11 @@ - + - delete from wgh_bm_grid + delete from ca_bm_grid