Browse Source

不继承,补充拉取数据街道办的代码

dev
HAHA 3 years ago
parent
commit
93a42261c8
  1. 7
      epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/constant/CaWghDataConstant.java
  2. 94
      epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/BmGridController.java
  3. 10
      epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/WghBaseGridController.java
  4. 13
      epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/WghCommunityController.java
  5. 25
      epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/WghSubdistrictOfficeController.java
  6. 5
      epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/WghBaseGridDao.java
  7. 5
      epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/WghBmGridDao.java
  8. 5
      epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/WghCommunityDao.java
  9. 6
      epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/WghSubdistrictOfficeDao.java
  10. 2
      epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/WghBaseGridEntity.java
  11. 2
      epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/WghBmGridEntity.java
  12. 2
      epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/WghCommunityEntity.java
  13. 2
      epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/WghDywgEntity.java
  14. 2
      epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/WghJdbEntity.java
  15. 2
      epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/WghJqzEntity.java
  16. 2
      epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/WghJxcsEntity.java
  17. 2
      epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/WghJyzEntity.java
  18. 2
      epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/WghSjxxbEntity.java
  19. 2
      epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/WghSqxxEntity.java
  20. 2
      epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/WghSubdistrictOfficeEntity.java
  21. 2
      epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/WghSzcgwghEntity.java
  22. 2
      epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/WghSzzrwgEntity.java
  23. 2
      epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/WghWhpdwEntity.java
  24. 2
      epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/WghYjbmcsEntity.java
  25. 2
      epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/WghYqhjzEntity.java
  26. 2
      epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/excel/WghBaseGridExcel.java
  27. 2
      epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/excel/WghBmGridExcel.java
  28. 2
      epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/excel/WghCommunityExcel.java
  29. 2
      epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/excel/WghSubdistrictOfficeExcel.java
  30. 4
      epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/WghBaseGridService.java
  31. 4
      epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/WghBmGridService.java
  32. 4
      epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/WghCommunityService.java
  33. 8
      epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/WghSubdistrictOfficeService.java
  34. 6
      epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/GuardarDatosTaskServiceImpl.java
  35. 87
      epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/SubdistrictOfficeServiceImpl.java
  36. 33
      epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghBaseGridServiceImpl.java
  37. 35
      epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghBmGridServiceImpl.java
  38. 30
      epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghCommunityServiceImpl.java
  39. 165
      epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghSubdistrictOfficeServiceImpl.java
  40. 22
      epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/BasegridDao.xml
  41. 50
      epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/BmGridDao.xml
  42. 20
      epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CommunityDao.xml
  43. 15
      epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/SubdistrictOfficeDao.xml
  44. 11
      epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/WghBaseGridDao.xml
  45. 12
      epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/WghBmGridDao.xml
  46. 12
      epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/WghCommunityDao.xml
  47. 10
      epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/WghSubdistrictOfficeDao.xml

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

@ -20,9 +20,10 @@ public interface CaWghDataConstant {
String UNICOM_ROTATORS = "ca_rotators";
String UNICOM_RENTAL = "ca_rental";
String SHARE_BASE_GRID = "BaseGrid";
String SHARE_BM_GRID = "bm_grid";
String SHARE_COMMUNITY = "community";
String SHARE_BASE_GRID = "Wgh_base_grid";
String SHARE_WGH_SUB = "wgh_subdistrict_office";
String SHARE_BM_GRID = "wgh_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";

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

@ -1,94 +0,0 @@
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.BmGridDTO;
import com.epmet.opendata.excel.BmGridExcel;
import com.epmet.opendata.service.BmGridService;
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 BmGridController {
@Autowired
private BmGridService 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, BmGridExcel.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();
}
}

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

@ -11,8 +11,8 @@ 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.BasegridExcel;
import com.epmet.opendata.service.BasegridService;
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.*;
@ -29,10 +29,10 @@ import java.util.Map;
*/
@RestController
@RequestMapping("basegrid")
public class BasegridController {
public class WghBaseGridController {
@Autowired
private BasegridService basegridService;
private WghBaseGridService basegridService;
@RequestMapping("page")
public Result<PageData<BasegridDTO>> page(@RequestParam Map<String, Object> params){
@ -75,7 +75,7 @@ public class BasegridController {
@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, BasegridExcel.class);
ExcelUtils.exportExcelToTarget(response, null, list, WghBaseGridExcel.class);
}
/**

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

@ -7,13 +7,12 @@ import com.epmet.commons.tools.utils.Result;
import com.epmet.commons.tools.validator.AssertUtils;
import com.epmet.commons.tools.validator.ValidatorUtils;
import com.epmet.commons.tools.validator.group.AddGroup;
import com.epmet.commons.tools.validator.group.UpdateGroup;
import com.epmet.commons.tools.validator.group.DefaultGroup;
import com.epmet.commons.tools.validator.group.UpdateGroup;
import com.epmet.opendata.dto.form.PreserVationFormDTO;
import com.epmet.opendata.dto.wgh.CommunityDTO;
import com.epmet.opendata.excel.CommunityExcel;
import com.epmet.opendata.service.CommunityService;
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.*;
@ -28,10 +27,10 @@ import java.util.Map;
*/
@RestController
@RequestMapping("community")
public class CommunityController {
public class WghCommunityController {
@Autowired
private CommunityService communityService;
private WghCommunityService communityService;
@RequestMapping("page")
public Result<PageData<CommunityDTO>> page(@RequestParam Map<String, Object> params) {
@ -74,7 +73,7 @@ public class CommunityController {
@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, CommunityExcel.class);
ExcelUtils.exportExcelToTarget(response, null, list, WghCommunityExcel.class);
}
/**

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

@ -10,9 +10,11 @@ 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.SubdistrictOfficeExcel;
import com.epmet.opendata.service.SubdistrictOfficeService;
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.*;
@ -29,10 +31,10 @@ import java.util.Map;
*/
@RestController
@RequestMapping("subdistrictOffice")
public class SubdistrictOfficeController {
public class WghSubdistrictOfficeController {
@Autowired
private SubdistrictOfficeService subdistrictOfficeService;
private WghSubdistrictOfficeService subdistrictOfficeService;
@RequestMapping("page")
public Result<PageData<SubdistrictOfficeDTO>> page(@RequestParam Map<String, Object> params){
@ -75,9 +77,22 @@ public class SubdistrictOfficeController {
@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, SubdistrictOfficeExcel.class);
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();
}
}

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

@ -2,7 +2,7 @@ package com.epmet.opendata.dao;
import com.epmet.commons.mybatis.dao.BaseDao;
import com.epmet.opendata.entity.BasegridEntity;
import com.epmet.opendata.entity.WghBaseGridEntity;
import org.apache.ibatis.annotations.Mapper;
/**
@ -12,7 +12,6 @@ import org.apache.ibatis.annotations.Mapper;
* @since v1.0.0 2022-06-14
*/
@Mapper
public interface BasegridDao extends BaseDao<BasegridEntity> {
public interface WghBaseGridDao extends BaseDao<WghBaseGridEntity> {
int deleteAll();
}

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

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

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

@ -2,7 +2,8 @@ package com.epmet.opendata.dao;
import com.epmet.commons.mybatis.dao.BaseDao;
import com.epmet.opendata.entity.BmGridEntity;
import com.epmet.opendata.entity.WghCommunityEntity;
import org.apache.ibatis.annotations.Mapper;
/**
@ -12,7 +13,7 @@ import org.apache.ibatis.annotations.Mapper;
* @since v1.0.0 2022-06-14
*/
@Mapper
public interface BmGridDao extends BaseDao<BmGridEntity> {
public interface WghCommunityDao extends BaseDao<WghCommunityEntity> {
int deleteAll();
}

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

@ -2,7 +2,8 @@ package com.epmet.opendata.dao;
import com.epmet.commons.mybatis.dao.BaseDao;
import com.epmet.opendata.entity.SubdistrictOfficeEntity;
import com.epmet.opendata.entity.WghSubdistrictOfficeEntity;
import org.apache.ibatis.annotations.Mapper;
/**
@ -12,6 +13,7 @@ import org.apache.ibatis.annotations.Mapper;
* @since v1.0.0 2022-06-14
*/
@Mapper
public interface SubdistrictOfficeDao extends BaseDao<SubdistrictOfficeEntity> {
public interface WghSubdistrictOfficeDao extends BaseDao<WghSubdistrictOfficeEntity> {
int deleteAll();
}

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

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

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

@ -17,7 +17,7 @@ import java.util.Date;
@Data
@EqualsAndHashCode(callSuper=false)
@TableName("bm_grid")
public class BmGridEntity extends BaseEpmetEntity {
public class WghBmGridEntity {
private static final long serialVersionUID = 1L;

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

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

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

@ -17,7 +17,7 @@ import java.util.Date;
@Data
@EqualsAndHashCode(callSuper=false)
@TableName("wgh_dywg")
public class WghDywgEntity extends BaseEpmetEntity {
public class WghDywgEntity {
private static final long serialVersionUID = 1L;

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

@ -17,7 +17,7 @@ import java.util.Date;
@Data
@EqualsAndHashCode(callSuper=false)
@TableName("wgh_jdb")
public class WghJdbEntity extends BaseEpmetEntity {
public class WghJdbEntity {
private static final long serialVersionUID = 1L;

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

@ -17,7 +17,7 @@ import java.util.Date;
@Data
@EqualsAndHashCode(callSuper=false)
@TableName("wgh_jqz")
public class WghJqzEntity extends BaseEpmetEntity {
public class WghJqzEntity {
private static final long serialVersionUID = 1L;

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

@ -17,7 +17,7 @@ import java.util.Date;
@Data
@EqualsAndHashCode(callSuper=false)
@TableName("wgh_jxcs")
public class WghJxcsEntity extends BaseEpmetEntity {
public class WghJxcsEntity {
private static final long serialVersionUID = 1L;

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

@ -17,7 +17,7 @@ import java.util.Date;
@Data
@EqualsAndHashCode(callSuper=false)
@TableName("wgh_jyz")
public class WghJyzEntity extends BaseEpmetEntity {
public class WghJyzEntity {
private static final long serialVersionUID = 1L;

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

@ -17,7 +17,7 @@ import java.util.Date;
@Data
@EqualsAndHashCode(callSuper=false)
@TableName("wgh_sjxxb")
public class WghSjxxbEntity extends BaseEpmetEntity {
public class WghSjxxbEntity {
private static final long serialVersionUID = 1L;

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

@ -17,7 +17,7 @@ import java.util.Date;
@Data
@EqualsAndHashCode(callSuper=false)
@TableName("wgh_sqxx")
public class WghSqxxEntity extends BaseEpmetEntity {
public class WghSqxxEntity {
private static final long serialVersionUID = 1L;

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

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

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

@ -17,7 +17,7 @@ import java.util.Date;
@Data
@EqualsAndHashCode(callSuper=false)
@TableName("wgh_szcgwgh")
public class WghSzcgwghEntity extends BaseEpmetEntity {
public class WghSzcgwghEntity {
private static final long serialVersionUID = 1L;

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

@ -17,7 +17,7 @@ import java.util.Date;
@Data
@EqualsAndHashCode(callSuper=false)
@TableName("wgh_szzrwg")
public class WghSzzrwgEntity extends BaseEpmetEntity {
public class WghSzzrwgEntity {
private static final long serialVersionUID = 1L;

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

@ -17,7 +17,7 @@ import java.util.Date;
@Data
@EqualsAndHashCode(callSuper=false)
@TableName("wgh_whpdw")
public class WghWhpdwEntity extends BaseEpmetEntity {
public class WghWhpdwEntity {
private static final long serialVersionUID = 1L;

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

@ -17,7 +17,7 @@ import java.util.Date;
@Data
@EqualsAndHashCode(callSuper=false)
@TableName("wgh_yjbmcs")
public class WghYjbmcsEntity extends BaseEpmetEntity {
public class WghYjbmcsEntity {
private static final long serialVersionUID = 1L;

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

@ -17,7 +17,7 @@ import java.util.Date;
@Data
@EqualsAndHashCode(callSuper=false)
@TableName("wgh_yqhjz")
public class WghYqhjzEntity extends BaseEpmetEntity {
public class WghYqhjzEntity {
private static final long serialVersionUID = 1L;

2
epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/excel/BasegridExcel.java → epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/excel/WghBaseGridExcel.java

@ -12,7 +12,7 @@ import java.util.Date;
* @since v1.0.0 2022-06-14
*/
@Data
public class BasegridExcel {
public class WghBaseGridExcel {
@Excel(name = "")
private String coordinateInfo;

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

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

2
epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/excel/CommunityExcel.java → epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/excel/WghCommunityExcel.java

@ -12,7 +12,7 @@ import java.util.Date;
* @since v1.0.0 2022-06-14
*/
@Data
public class CommunityExcel {
public class WghCommunityExcel {
@Excel(name = "")
private String coordinateInfo;

2
epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/excel/SubdistrictOfficeExcel.java → epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/excel/WghSubdistrictOfficeExcel.java

@ -12,7 +12,7 @@ import java.util.Date;
* @since v1.0.0 2022-06-14
*/
@Data
public class SubdistrictOfficeExcel {
public class WghSubdistrictOfficeExcel {
@Excel(name = "")
private String coordinateInfo;

4
epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/BasegridService.java → epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/WghBaseGridService.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.BasegridDTO;
import com.epmet.opendata.entity.BasegridEntity;
import com.epmet.opendata.entity.WghBaseGridEntity;
import java.util.List;
@ -14,7 +14,7 @@ import java.util.Map;
* @author generator generator@elink-cn.com
* @since v1.0.0 2022-06-14
*/
public interface BasegridService extends BaseService<BasegridEntity> {
public interface WghBaseGridService extends BaseService<WghBaseGridEntity> {
/**
* 默认分页

4
epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/BmGridService.java → epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/WghBmGridService.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.BmGridEntity;
import com.epmet.opendata.entity.WghBmGridEntity;
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 BmGridService extends BaseService<BmGridEntity> {
public interface WghBmGridService extends BaseService<WghBmGridEntity> {
/**
* 默认分页

4
epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/CommunityService.java → epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/WghCommunityService.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.CommunityDTO;
import com.epmet.opendata.entity.CommunityEntity;
import com.epmet.opendata.entity.WghCommunityEntity;
import java.util.List;
@ -14,7 +14,7 @@ import java.util.Map;
* @author generator generator@elink-cn.com
* @since v1.0.0 2022-06-14
*/
public interface CommunityService extends BaseService<CommunityEntity> {
public interface WghCommunityService extends BaseService<WghCommunityEntity> {
/**
* 默认分页

8
epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/SubdistrictOfficeService.java → epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/WghSubdistrictOfficeService.java

@ -2,9 +2,9 @@ package com.epmet.opendata.service;
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.SubdistrictOfficeDTO;
import com.epmet.opendata.entity.SubdistrictOfficeEntity;
import com.epmet.opendata.entity.WghSubdistrictOfficeEntity;
import java.util.List;
import java.util.Map;
@ -15,7 +15,7 @@ import java.util.Map;
* @author generator generator@elink-cn.com
* @since v1.0.0 2022-06-14
*/
public interface SubdistrictOfficeService extends BaseService<SubdistrictOfficeEntity> {
public interface WghSubdistrictOfficeService extends BaseService<WghSubdistrictOfficeEntity> {
/**
* 默认分页
@ -76,4 +76,6 @@ public interface SubdistrictOfficeService extends BaseService<SubdistrictOfficeE
* @date 2022-06-14
*/
void delete(String[] ids);
void getpreserSubVation(PreserVationFormDTO dto);
}

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

@ -27,13 +27,13 @@ public class GuardarDatosTaskServiceImpl implements GuardarDatosTaskService {
private CaRotatorsService rotatorsService;
@Autowired
private BasegridService basegridService;
private WghBaseGridService basegridService;
@Autowired
private BmGridService bmGridService;
private WghBmGridService bmGridService;
@Autowired
private CommunityService communityService;
private WghCommunityService communityService;
@Autowired
private WghDywgService wghDywgService;

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

@ -1,87 +0,0 @@
package com.epmet.opendata.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
import com.epmet.commons.tools.constant.FieldConstant;
import com.epmet.commons.tools.page.PageData;
import com.epmet.commons.tools.utils.ConvertUtils;
import com.epmet.opendata.dao.SubdistrictOfficeDao;
import com.epmet.opendata.dto.wgh.SubdistrictOfficeDTO;
import com.epmet.opendata.entity.SubdistrictOfficeEntity;
import com.epmet.opendata.redis.SubdistrictOfficeRedis;
import com.epmet.opendata.service.SubdistrictOfficeService;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
/**
*
*
* @author generator generator@elink-cn.com
* @since v1.0.0 2022-06-14
*/
@Service
public class SubdistrictOfficeServiceImpl extends BaseServiceImpl<SubdistrictOfficeDao, SubdistrictOfficeEntity> implements SubdistrictOfficeService {
@Autowired
private SubdistrictOfficeRedis subdistrictOfficeRedis;
@Override
public PageData<SubdistrictOfficeDTO> page(Map<String, Object> params) {
IPage<SubdistrictOfficeEntity> page = baseDao.selectPage(
getPage(params, FieldConstant.CREATED_TIME, false),
getWrapper(params)
);
return getPageData(page, SubdistrictOfficeDTO.class);
}
@Override
public List<SubdistrictOfficeDTO> list(Map<String, Object> params) {
List<SubdistrictOfficeEntity> entityList = baseDao.selectList(getWrapper(params));
return ConvertUtils.sourceToTarget(entityList, SubdistrictOfficeDTO.class);
}
private QueryWrapper<SubdistrictOfficeEntity> getWrapper(Map<String, Object> params){
String id = (String)params.get(FieldConstant.ID_HUMP);
QueryWrapper<SubdistrictOfficeEntity> wrapper = new QueryWrapper<>();
wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
return wrapper;
}
@Override
public SubdistrictOfficeDTO get(String id) {
SubdistrictOfficeEntity entity = baseDao.selectById(id);
return ConvertUtils.sourceToTarget(entity, SubdistrictOfficeDTO.class);
}
@Override
@Transactional(rollbackFor = Exception.class)
public void save(SubdistrictOfficeDTO dto) {
SubdistrictOfficeEntity entity = ConvertUtils.sourceToTarget(dto, SubdistrictOfficeEntity.class);
insert(entity);
}
@Override
@Transactional(rollbackFor = Exception.class)
public void update(SubdistrictOfficeDTO dto) {
SubdistrictOfficeEntity entity = ConvertUtils.sourceToTarget(dto, SubdistrictOfficeEntity.class);
updateById(entity);
}
@Override
@Transactional(rollbackFor = Exception.class)
public void delete(String[] ids) {
// 逻辑删除(@TableLogic 注解)
baseDao.deleteBatchIds(Arrays.asList(ids));
}
}

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

@ -11,14 +11,13 @@ 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.BasegridDao;
import com.epmet.opendata.dao.WghBaseGridDao;
import com.epmet.opendata.dto.constant.CaWghDataConstant;
import com.epmet.opendata.dto.form.PreserVationFormDTO;
import com.epmet.opendata.dto.wgh.BasegridDTO;
import com.epmet.opendata.entity.BasegridEntity;
import com.epmet.opendata.entity.CaLoudongEntity;
import com.epmet.opendata.entity.WghBaseGridEntity;
import com.epmet.opendata.redis.BasegridRedis;
import com.epmet.opendata.service.BasegridService;
import com.epmet.opendata.service.WghBaseGridService;
import com.epmet.opendata.util.AesUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
@ -34,14 +33,14 @@ import java.util.Map;
* @since v1.0.0 2022-06-14
*/
@Service
public class BasegridServiceImpl extends BaseServiceImpl<BasegridDao, BasegridEntity> implements BasegridService {
public class WghBaseGridServiceImpl extends BaseServiceImpl<WghBaseGridDao, WghBaseGridEntity> implements WghBaseGridService {
@Autowired
private BasegridRedis basegridRedis;
@Override
public PageData<BasegridDTO> page(Map<String, Object> params) {
IPage<BasegridEntity> page = baseDao.selectPage(
IPage<WghBaseGridEntity> page = baseDao.selectPage(
getPage(params, FieldConstant.CREATED_TIME, false),
getWrapper(params)
);
@ -50,15 +49,15 @@ public class BasegridServiceImpl extends BaseServiceImpl<BasegridDao, BasegridEn
@Override
public List<BasegridDTO> list(Map<String, Object> params) {
List<BasegridEntity> entityList = baseDao.selectList(getWrapper(params));
List<WghBaseGridEntity> entityList = baseDao.selectList(getWrapper(params));
return ConvertUtils.sourceToTarget(entityList, BasegridDTO.class);
}
private QueryWrapper<BasegridEntity> getWrapper(Map<String, Object> params) {
private QueryWrapper<WghBaseGridEntity> getWrapper(Map<String, Object> params) {
String id = (String) params.get(FieldConstant.ID_HUMP);
QueryWrapper<BasegridEntity> wrapper = new QueryWrapper<>();
QueryWrapper<WghBaseGridEntity> wrapper = new QueryWrapper<>();
wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
return wrapper;
@ -66,21 +65,21 @@ public class BasegridServiceImpl extends BaseServiceImpl<BasegridDao, BasegridEn
@Override
public BasegridDTO get(String id) {
BasegridEntity entity = baseDao.selectById(id);
WghBaseGridEntity entity = baseDao.selectById(id);
return ConvertUtils.sourceToTarget(entity, BasegridDTO.class);
}
@Override
@Transactional(rollbackFor = Exception.class)
public void save(BasegridDTO dto) {
BasegridEntity entity = ConvertUtils.sourceToTarget(dto, BasegridEntity.class);
WghBaseGridEntity entity = ConvertUtils.sourceToTarget(dto, WghBaseGridEntity.class);
insert(entity);
}
@Override
@Transactional(rollbackFor = Exception.class)
public void update(BasegridDTO dto) {
BasegridEntity entity = ConvertUtils.sourceToTarget(dto, BasegridEntity.class);
WghBaseGridEntity entity = ConvertUtils.sourceToTarget(dto, WghBaseGridEntity.class);
updateById(entity);
}
@ -102,14 +101,14 @@ public class BasegridServiceImpl extends BaseServiceImpl<BasegridDao, BasegridEn
@Override
public void preserBaseGridVation(PreserVationFormDTO dto) {
int i = baseDao.deleteAll();
if (i > 0) {
if (i >= 0) {
dto.setPageNo(NumConstant.ONE);
dto.setPageSize(NumConstant.FIFTY);
dto.setTableSchema(CaWghDataConstant.TABLESCHEMA_SHARE);
dto.setTableName(CaWghDataConstant.SHARE_BASE_GRID);
dto.setWhereCase("1=1");
dto.setOrderBy("");
dto.setOrderBy("gridName");
int pageNo = 1;
@ -146,7 +145,7 @@ public class BasegridServiceImpl extends BaseServiceImpl<BasegridDao, BasegridEn
static class ReturnDate {
private int total;
private List<BasegridEntity> list;
private List<WghBaseGridEntity> list;
public int getTotal() {
return total;
@ -156,11 +155,11 @@ public class BasegridServiceImpl extends BaseServiceImpl<BasegridDao, BasegridEn
this.total = total;
}
public List<BasegridEntity> getList() {
public List<WghBaseGridEntity> getList() {
return list;
}
public void setList(List<BasegridEntity> list) {
public void setList(List<WghBaseGridEntity> list) {
this.list = list;
}
}

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

@ -5,21 +5,20 @@ import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
import com.epmet.commons.tools.constant.FieldConstant;
import com.epmet.commons.tools.constant.NumConstant;
import com.epmet.commons.tools.page.PageData;
import com.epmet.commons.tools.utils.ConvertUtils;
import com.epmet.commons.tools.constant.FieldConstant;
import com.epmet.commons.tools.utils.HttpClientManager;
import com.epmet.commons.tools.utils.Result;
import com.epmet.opendata.dao.BmGridDao;
import com.epmet.opendata.dao.WghBmGridDao;
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.BasegridEntity;
import com.epmet.opendata.entity.BmGridEntity;
import com.epmet.opendata.entity.WghBmGridEntity;
import com.epmet.opendata.redis.BmGridRedis;
import com.epmet.opendata.service.BmGridService;
import com.epmet.opendata.service.WghBmGridService;
import com.epmet.opendata.util.AesUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
@ -37,14 +36,14 @@ import java.util.Map;
* @since v1.0.0 2022-06-14
*/
@Service
public class BmGridServiceImpl extends BaseServiceImpl<BmGridDao, BmGridEntity> implements BmGridService {
public class WghBmGridServiceImpl extends BaseServiceImpl<WghBmGridDao, WghBmGridEntity> implements WghBmGridService {
@Autowired
private BmGridRedis bmGridRedis;
@Override
public PageData<BmGridDTO> page(Map<String, Object> params) {
IPage<BmGridEntity> page = baseDao.selectPage(
IPage<WghBmGridEntity> page = baseDao.selectPage(
getPage(params, FieldConstant.CREATED_TIME, false),
getWrapper(params)
);
@ -53,15 +52,15 @@ public class BmGridServiceImpl extends BaseServiceImpl<BmGridDao, BmGridEntity>
@Override
public List<BmGridDTO> list(Map<String, Object> params) {
List<BmGridEntity> entityList = baseDao.selectList(getWrapper(params));
List<WghBmGridEntity> entityList = baseDao.selectList(getWrapper(params));
return ConvertUtils.sourceToTarget(entityList, BmGridDTO.class);
}
private QueryWrapper<BmGridEntity> getWrapper(Map<String, Object> params){
private QueryWrapper<WghBmGridEntity> getWrapper(Map<String, Object> params){
String id = (String)params.get(FieldConstant.ID_HUMP);
QueryWrapper<BmGridEntity> wrapper = new QueryWrapper<>();
QueryWrapper<WghBmGridEntity> wrapper = new QueryWrapper<>();
wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
return wrapper;
@ -69,21 +68,21 @@ public class BmGridServiceImpl extends BaseServiceImpl<BmGridDao, BmGridEntity>
@Override
public BmGridDTO get(String id) {
BmGridEntity entity = baseDao.selectById(id);
WghBmGridEntity entity = baseDao.selectById(id);
return ConvertUtils.sourceToTarget(entity, BmGridDTO.class);
}
@Override
@Transactional(rollbackFor = Exception.class)
public void save(BmGridDTO dto) {
BmGridEntity entity = ConvertUtils.sourceToTarget(dto, BmGridEntity.class);
WghBmGridEntity entity = ConvertUtils.sourceToTarget(dto, WghBmGridEntity.class);
insert(entity);
}
@Override
@Transactional(rollbackFor = Exception.class)
public void update(BmGridDTO dto) {
BmGridEntity entity = ConvertUtils.sourceToTarget(dto, BmGridEntity.class);
WghBmGridEntity entity = ConvertUtils.sourceToTarget(dto, WghBmGridEntity.class);
updateById(entity);
}
@ -105,7 +104,7 @@ public class BmGridServiceImpl extends BaseServiceImpl<BmGridDao, BmGridEntity>
@Override
public void getPreserBmGridVation(PreserVationFormDTO dto) {
int i = baseDao.deleteAll();
if (i > 0) {
if (i >= 0) {
dto.setPageNo(NumConstant.ONE);
dto.setPageSize(NumConstant.FIFTY);
dto.setTableSchema(CaWghDataConstant.TABLESCHEMA_SHARE);
@ -148,7 +147,7 @@ public class BmGridServiceImpl extends BaseServiceImpl<BmGridDao, BmGridEntity>
static class ReturnDate {
private int total;
private List<BmGridEntity> list;
private List<WghBmGridEntity> list;
public int getTotal() {
return total;
@ -158,11 +157,11 @@ public class BmGridServiceImpl extends BaseServiceImpl<BmGridDao, BmGridEntity>
this.total = total;
}
public List<BmGridEntity> getList() {
public List<WghBmGridEntity> getList() {
return list;
}
public void setList(List<BmGridEntity> list) {
public void setList(List<WghBmGridEntity> list) {
this.list = list;
}
}

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

@ -11,14 +11,14 @@ 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.CommunityDao;
import com.epmet.opendata.dao.WghCommunityDao;
import com.epmet.opendata.dto.constant.CaWghDataConstant;
import com.epmet.opendata.dto.form.PreserVationFormDTO;
import com.epmet.opendata.dto.wgh.CommunityDTO;
import com.epmet.opendata.entity.CaLoudongEntity;
import com.epmet.opendata.entity.CommunityEntity;
import com.epmet.opendata.entity.WghCommunityEntity;
import com.epmet.opendata.redis.CommunityRedis;
import com.epmet.opendata.service.CommunityService;
import com.epmet.opendata.service.WghCommunityService;
import com.epmet.opendata.util.AesUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
@ -34,14 +34,14 @@ import java.util.Map;
* @since v1.0.0 2022-06-14
*/
@Service
public class CommunityServiceImpl extends BaseServiceImpl<CommunityDao, CommunityEntity> implements CommunityService {
public class WghCommunityServiceImpl extends BaseServiceImpl<WghCommunityDao, WghCommunityEntity> implements WghCommunityService {
@Autowired
private CommunityRedis communityRedis;
@Override
public PageData<CommunityDTO> page(Map<String, Object> params) {
IPage<CommunityEntity> page = baseDao.selectPage(
IPage<WghCommunityEntity> page = baseDao.selectPage(
getPage(params, FieldConstant.CREATED_TIME, false),
getWrapper(params)
);
@ -50,15 +50,15 @@ public class CommunityServiceImpl extends BaseServiceImpl<CommunityDao, Communit
@Override
public List<CommunityDTO> list(Map<String, Object> params) {
List<CommunityEntity> entityList = baseDao.selectList(getWrapper(params));
List<WghCommunityEntity> entityList = baseDao.selectList(getWrapper(params));
return ConvertUtils.sourceToTarget(entityList, CommunityDTO.class);
}
private QueryWrapper<CommunityEntity> getWrapper(Map<String, Object> params) {
private QueryWrapper<WghCommunityEntity> getWrapper(Map<String, Object> params) {
String id = (String) params.get(FieldConstant.ID_HUMP);
QueryWrapper<CommunityEntity> wrapper = new QueryWrapper<>();
QueryWrapper<WghCommunityEntity> wrapper = new QueryWrapper<>();
wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
return wrapper;
@ -66,21 +66,21 @@ public class CommunityServiceImpl extends BaseServiceImpl<CommunityDao, Communit
@Override
public CommunityDTO get(String id) {
CommunityEntity entity = baseDao.selectById(id);
WghCommunityEntity entity = baseDao.selectById(id);
return ConvertUtils.sourceToTarget(entity, CommunityDTO.class);
}
@Override
@Transactional(rollbackFor = Exception.class)
public void save(CommunityDTO dto) {
CommunityEntity entity = ConvertUtils.sourceToTarget(dto, CommunityEntity.class);
WghCommunityEntity entity = ConvertUtils.sourceToTarget(dto, WghCommunityEntity.class);
insert(entity);
}
@Override
@Transactional(rollbackFor = Exception.class)
public void update(CommunityDTO dto) {
CommunityEntity entity = ConvertUtils.sourceToTarget(dto, CommunityEntity.class);
WghCommunityEntity entity = ConvertUtils.sourceToTarget(dto, WghCommunityEntity.class);
updateById(entity);
}
@ -146,7 +146,7 @@ public class CommunityServiceImpl extends BaseServiceImpl<CommunityDao, Communit
static class ReturnDate {
private int total;
private List<CommunityEntity> list;
private List<WghCommunityEntity> list;
public int getTotal() {
@ -157,11 +157,11 @@ public class CommunityServiceImpl extends BaseServiceImpl<CommunityDao, Communit
this.total = total;
}
public List<CommunityEntity> getList() {
public List<WghCommunityEntity> getList() {
return list;
}
public void setList(List<CommunityEntity> list) {
public void setList(List<WghCommunityEntity> list) {
this.list = list;
}
}

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

@ -0,0 +1,165 @@
package com.epmet.opendata.service.impl;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
import com.epmet.commons.tools.constant.FieldConstant;
import com.epmet.commons.tools.constant.NumConstant;
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.WghSubdistrictOfficeDao;
import com.epmet.opendata.dto.constant.CaWghDataConstant;
import com.epmet.opendata.dto.form.PreserVationFormDTO;
import com.epmet.opendata.dto.wgh.SubdistrictOfficeDTO;
import com.epmet.opendata.entity.CaLoudongEntity;
import com.epmet.opendata.entity.WghSubdistrictOfficeEntity;
import com.epmet.opendata.redis.SubdistrictOfficeRedis;
import com.epmet.opendata.service.WghSubdistrictOfficeService;
import com.epmet.opendata.util.AesUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
/**
*
*
* @author generator generator@elink-cn.com
* @since v1.0.0 2022-06-14
*/
@Service
public class WghSubdistrictOfficeServiceImpl extends BaseServiceImpl<WghSubdistrictOfficeDao, WghSubdistrictOfficeEntity> implements WghSubdistrictOfficeService {
@Autowired
private SubdistrictOfficeRedis subdistrictOfficeRedis;
@Override
public PageData<SubdistrictOfficeDTO> page(Map<String, Object> params) {
IPage<WghSubdistrictOfficeEntity> page = baseDao.selectPage(
getPage(params, FieldConstant.CREATED_TIME, false),
getWrapper(params)
);
return getPageData(page, SubdistrictOfficeDTO.class);
}
@Override
public List<SubdistrictOfficeDTO> list(Map<String, Object> params) {
List<WghSubdistrictOfficeEntity> entityList = baseDao.selectList(getWrapper(params));
return ConvertUtils.sourceToTarget(entityList, SubdistrictOfficeDTO.class);
}
private QueryWrapper<WghSubdistrictOfficeEntity> getWrapper(Map<String, Object> params){
String id = (String)params.get(FieldConstant.ID_HUMP);
QueryWrapper<WghSubdistrictOfficeEntity> wrapper = new QueryWrapper<>();
wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
return wrapper;
}
@Override
public SubdistrictOfficeDTO get(String id) {
WghSubdistrictOfficeEntity entity = baseDao.selectById(id);
return ConvertUtils.sourceToTarget(entity, SubdistrictOfficeDTO.class);
}
@Override
@Transactional(rollbackFor = Exception.class)
public void save(SubdistrictOfficeDTO dto) {
WghSubdistrictOfficeEntity entity = ConvertUtils.sourceToTarget(dto, WghSubdistrictOfficeEntity.class);
insert(entity);
}
@Override
@Transactional(rollbackFor = Exception.class)
public void update(SubdistrictOfficeDTO dto) {
WghSubdistrictOfficeEntity entity = ConvertUtils.sourceToTarget(dto, WghSubdistrictOfficeEntity.class);
updateById(entity);
}
@Override
@Transactional(rollbackFor = Exception.class)
public void delete(String[] ids) {
// 逻辑删除(@TableLogic 注解)
baseDao.deleteBatchIds(Arrays.asList(ids));
}
@Override
public void getpreserSubVation(PreserVationFormDTO dto) {
int i = baseDao.deleteAll();
if (i >= 0) {
dto.setPageNo(NumConstant.ONE);
dto.setPageSize(NumConstant.FIFTY);
dto.setTableSchema(CaWghDataConstant.TABLESCHEMA_SHARE);
dto.setTableName(CaWghDataConstant.SHARE_WGH_SUB);
dto.setWhereCase("1=1");
dto.setOrderBy("");
int pageNo = 1;
int total = 0;
do {
try {
total = listSub(dto);
pageNo++;
dto.setPageNo(pageNo);
} catch (Exception e) {
e.printStackTrace();
}
} while (total > (pageNo * NumConstant.FIFTY));
}
}
private int listSub(PreserVationFormDTO dto) throws Exception {
String aes = AesUtils.encryptByAES(JSONObject.toJSONString(dto), CaWghDataConstant.AESKEY);
JSONObject obj = new JSONObject();
obj.put(CaWghDataConstant.SHARE_CONDITION, aes);
String data = HttpClientManager.getInstance().sendPostByJSON(CaWghDataConstant.DATA_URL_SHARE, obj.toJSONString()).getData();
JSONObject toResult = JSON.parseObject(data);
Result result = ConvertUtils.mapToEntity(toResult, Result.class);
if (!result.success()) {
return dto.getPageNo() + 1;
}
ReturnDate returnDate = JSONObject.parseObject(JSONObject.toJSONString(result.getData()), ReturnDate.class);
this.insertBatch(returnDate.getList());
return returnDate.getTotal();
}
static class ReturnDate {
private int total;
private List<WghSubdistrictOfficeEntity> list;
public int getTotal() {
return total;
}
public void setTotal(int total) {
this.total = total;
}
public List<WghSubdistrictOfficeEntity> getList() {
return list;
}
public void setList(List<WghSubdistrictOfficeEntity> list) {
this.list = list;
}
}
}

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

@ -1,22 +0,0 @@
<?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.BasegridDao">
<resultMap type="com.epmet.opendata.entity.BasegridEntity" id="basegridMap">
<result property="coordinateInfo" column="坐标信息"/>
<result property="gridName" column="网格名称"/>
<result property="subDistrictOffice" column="所属街道办"/>
<result property="community" column="所属社区"/>
<result property="streetCode" column="街道编码"/>
<result property="gridCode" column="网格编码"/>
<result property="communityCode" column="社区编码"/>
<result property="longitude" column="longitude"/>
<result property="latitude" column="latitude"/>
</resultMap>
<delete id="deleteAll">
delete from BaseGrid
</delete>
</mapper>

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

@ -1,50 +0,0 @@
<?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.BmGridDao">
<resultMap type="com.epmet.opendata.entity.BmGridEntity" id="bmGridMap">
<result property="gridId" column="grid_id"/>
<result property="gridCode" column="grid_code"/>
<result property="gridName" column="grid_name"/>
<result property="gbCode" column="gb_code"/>
<result property="parentId" column="parent_id"/>
<result property="parentCode" column="parent_code"/>
<result property="gridClassification" column="grid_classification"/>
<result property="gridLevel" column="grid_level"/>
<result property="gridProperty" column="grid_property"/>
<result property="isEnd" column="is_end"/>
<result property="gridAddress" column="grid_address"/>
<result property="gridIntroduce" column="grid_introduce"/>
<result property="gridPicture" column="grid_picture"/>
<result property="reginScopeDesc" column="regin_scope_desc"/>
<result property="gridSort" column="grid_sort"/>
<result property="pointStatus" column="point_status"/>
<result property="gridEmCenter" column="grid_em_center"/>
<result property="gridBeginTime" column="grid_begin_time"/>
<result property="gridEndTime" column="grid_end_time"/>
<result property="gridArea" column="grid_area"/>
<result property="isValid" column="is_valid"/>
<result property="createBy" column="create_by"/>
<result property="createDate" column="create_date"/>
<result property="updateBy" column="update_by"/>
<result property="updateDate" column="update_date"/>
<result property="deleteFlag" column="delete_flag"/>
<result property="versions" column="versions"/>
<result property="attribute1" column="attribute1"/>
<result property="attribute2" column="attribute2"/>
<result property="attribute3" column="attribute3"/>
<result property="attribute4" column="attribute4"/>
<result property="attribute5" column="attribute5"/>
<result property="attribute6" column="attribute6"/>
<result property="attribute7" column="attribute7"/>
<result property="attribute8" column="attribute8"/>
<result property="attribute9" column="attribute9"/>
<result property="attribute10" column="attribute10"/>
</resultMap>
<delete id="deleteAll">
delete from bm_grid
</delete>
</mapper>

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

@ -1,20 +0,0 @@
<?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.CommunityDao">
<resultMap type="com.epmet.opendata.entity.CommunityEntity" id="communityMap">
<result property="coordinateInfo" column="坐标信息"/>
<result property="streetName" column="街道名称"/>
<result property="streetCode" column="街道编码"/>
<result property="communityName" column="社区名称"/>
<result property="communityCode" column="社区编码"/>
<result property="longitude" column="longitude"/>
<result property="latitude" column="latitude"/>
</resultMap>
<delete id="deleteAll">
delete from community
</delete>
</mapper>

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

@ -1,15 +0,0 @@
<?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.SubdistrictOfficeDao">
<resultMap type="com.epmet.opendata.entity.SubdistrictOfficeEntity" id="subdistrictOfficeMap">
<result property="coordinateInfo" column="坐标信息"/>
<result property="streetName" column="街道名称"/>
<result property="streetCode" column="街道代码"/>
<result property="longitude" column="longitude"/>
<result property="latitude" column="latitude"/>
</resultMap>
</mapper>

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

@ -0,0 +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.WghBaseGridDao">
<delete id="deleteAll">
delete from wgh_base_grid
</delete>
</mapper>

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

@ -0,0 +1,12 @@
<?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">
<delete id="deleteAll">
delete from wgh_bm_grid
</delete>
</mapper>

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

@ -0,0 +1,12 @@
<?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.WghCommunityDao">
<delete id="deleteAll">
delete from wgh_community
</delete>
</mapper>

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

@ -0,0 +1,10 @@
<?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.WghSubdistrictOfficeDao">
<delete id="deleteAll">
delete from wgh_subdistrict_office
</delete>
</mapper>
Loading…
Cancel
Save