From e0027535a04aeaf23fdc105ed6fffa62d7d39904 Mon Sep 17 00:00:00 2001 From: HAHA Date: Tue, 14 Jun 2022 15:40:41 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E7=94=A8ruoyi=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E5=AD=98=E5=82=A8wgh=5Fjqz=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/constant/CaWghDataConstant.java | 1 + .../opendata/controller/WghJqzController.java | 14 ++++ .../com/epmet/opendata/dao/WghJqzDao.java | 1 + .../epmet/opendata/service/WghJqzService.java | 11 +++ .../impl/GuardarDatosTaskServiceImpl.java | 72 +++++++++------- .../service/impl/WghJqzServiceImpl.java | 84 +++++++++++++++++++ .../src/main/resources/mapper/WghJqzDao.xml | 3 + 7 files changed, 154 insertions(+), 32 deletions(-) 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 4fa98e64af..b2ca16aca4 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 @@ -25,6 +25,7 @@ public interface CaWghDataConstant { String SHARE_COMMUNITY = "community"; String SHARE_WGH_DYWG = "wgh_dywg"; String SHARE_WGH_JDB = "wgh_jdb"; + String SHARE_WGH_JQZ = "wgh_jqz"; String DATA_URL_UNICON = "http://120.221.72.83:9090/bridge/unicom/page"; String DATA_URL_SHARE = "http://120.221.72.83:9090/bridge/share/sharePage"; diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/WghJqzController.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/WghJqzController.java index 57b51603ce..bb38ffc0ca 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/WghJqzController.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/WghJqzController.java @@ -10,6 +10,7 @@ import com.epmet.commons.tools.validator.group.AddGroup; import com.epmet.commons.tools.validator.group.UpdateGroup; import com.epmet.commons.tools.validator.group.DefaultGroup; +import com.epmet.opendata.dto.form.PreserVationFormDTO; import com.epmet.opendata.dto.wgh.WghJqzDTO; import com.epmet.opendata.excel.WghJqzExcel; import com.epmet.opendata.service.WghJqzService; @@ -78,6 +79,19 @@ public class WghJqzController { ExcelUtils.exportExcelToTarget(response, null, list, WghJqzExcel.class); } + /** + * 调用ruoyi接口存储wgh_jqz数据 + * + * @param dto + * @return com.epmet.commons.tools.utils.Result + * @author LZN + * @date 2022/6/14 15:39 + */ + @PostMapping("/preserWghjqzVation") + public Result getPreserWghjqzVation(@RequestBody PreserVationFormDTO dto) { + wghJqzService.getPreserWghjqzVation(dto); + return new Result(); + } } diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/WghJqzDao.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/WghJqzDao.java index 4e38c5a9e1..52881f0543 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/WghJqzDao.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/WghJqzDao.java @@ -13,4 +13,5 @@ import org.apache.ibatis.annotations.Mapper; @Mapper public interface WghJqzDao extends BaseDao { + int deleteAll(); } diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/WghJqzService.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/WghJqzService.java index 941e4c2b29..9ad0ee26d6 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/WghJqzService.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/WghJqzService.java @@ -2,6 +2,7 @@ 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.WghJqzDTO; import com.epmet.opendata.entity.WghJqzEntity; @@ -76,4 +77,14 @@ public interface WghJqzService extends BaseService { * @date 2022-06-14 */ void delete(String[] ids); + + /** + * 调用ruoyi接口存储wgh_jqz数据 + * + * @param dto + * @return void + * @author LZN + * @date 2022/6/14 15:40 + */ + void getPreserWghjqzVation(PreserVationFormDTO dto); } 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 0380ef8e10..7cad0e6cb7 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 @@ -41,6 +41,9 @@ public class GuardarDatosTaskServiceImpl implements GuardarDatosTaskService { @Autowired private WghJdbService wghJdbService; + @Autowired + private WghJqzService wghJqzService; + @Override public void guardarDatosTask(PreserVationFormDTO dto) { if (StringUtils.isBlank(dto.getTableName())) { @@ -53,39 +56,44 @@ public class GuardarDatosTaskServiceImpl implements GuardarDatosTaskService { bmGridService.getPreserBmGridVation(dto); communityService.getPreserCommunityVation(dto); wghDywgService.getPreserDywgVation(dto); - } + wghJqzService.getPreserWghjqzVation(dto); + } else { - switch (dto.getTableName()) { - case CaWghDataConstant.UNICOM_LOUDONG: - caLoudongService.preserLouDongVation(dto); - break; - case CaWghDataConstant.UNICOM_PINGFANG: - pingfangService.preserPingFangVation(dto); - break; - case CaWghDataConstant.UNICOM_RESIDENT: - residentService.preserResidentVation(dto); - break; - case CaWghDataConstant.UNICOM_RENTAL: - rentalService.preserRentalVation(dto); - break; - case CaWghDataConstant.UNICOM_ROTATORS: - rotatorsService.preserRotatorsVation(dto); - break; - case CaWghDataConstant.SHARE_BASE_GRID: - basegridService.preserBaseGridVation(dto); - break; - case CaWghDataConstant.SHARE_BM_GRID: - bmGridService.getPreserBmGridVation(dto); - break; - case CaWghDataConstant.SHARE_COMMUNITY: - communityService.getPreserCommunityVation(dto); - break; - case CaWghDataConstant.SHARE_WGH_DYWG: - wghDywgService.getPreserDywgVation(dto); - break; - case CaWghDataConstant.SHARE_WGH_JDB: - wghJdbService.getPreserWghJdbVation(dto); - break; + switch (dto.getTableName()) { + case CaWghDataConstant.UNICOM_LOUDONG: + caLoudongService.preserLouDongVation(dto); + break; + case CaWghDataConstant.UNICOM_PINGFANG: + pingfangService.preserPingFangVation(dto); + break; + case CaWghDataConstant.UNICOM_RESIDENT: + residentService.preserResidentVation(dto); + break; + case CaWghDataConstant.UNICOM_RENTAL: + rentalService.preserRentalVation(dto); + break; + case CaWghDataConstant.UNICOM_ROTATORS: + rotatorsService.preserRotatorsVation(dto); + break; + case CaWghDataConstant.SHARE_BASE_GRID: + basegridService.preserBaseGridVation(dto); + break; + case CaWghDataConstant.SHARE_BM_GRID: + bmGridService.getPreserBmGridVation(dto); + break; + case CaWghDataConstant.SHARE_COMMUNITY: + communityService.getPreserCommunityVation(dto); + break; + case CaWghDataConstant.SHARE_WGH_DYWG: + wghDywgService.getPreserDywgVation(dto); + break; + case CaWghDataConstant.SHARE_WGH_JDB: + wghJdbService.getPreserWghJdbVation(dto); + break; + case CaWghDataConstant.SHARE_WGH_JQZ: + wghJqzService.getPreserWghjqzVation(dto); + break; + } } } } diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghJqzServiceImpl.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghJqzServiceImpl.java index 79ed9af41e..9870565af7 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghJqzServiceImpl.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghJqzServiceImpl.java @@ -1,16 +1,25 @@ 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.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.WghJqzDao; +import com.epmet.opendata.dto.constant.CaWghDataConstant; +import com.epmet.opendata.dto.form.PreserVationFormDTO; import com.epmet.opendata.dto.wgh.WghJqzDTO; +import com.epmet.opendata.entity.CaLoudongEntity; import com.epmet.opendata.entity.WghJqzEntity; import com.epmet.opendata.redis.WghJqzRedis; import com.epmet.opendata.service.WghJqzService; +import com.epmet.opendata.util.AesUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -84,4 +93,79 @@ public class WghJqzServiceImpl extends BaseServiceImpl baseDao.deleteBatchIds(Arrays.asList(ids)); } + /** + * 调用ruoyi接口存储wgh_jqz数据 + * + * @param dto + * @return void + * @author LZN + * @date 2022/6/14 15:40 + */ + @Override + public void getPreserWghjqzVation(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_JQZ); + + dto.setWhereCase("1=1"); + dto.setOrderBy(""); + + int pageNo = 1; + + int total = 0; + + do { + try { + total = listWghJqz(dto); + pageNo++; + dto.setPageNo(pageNo); + } catch (Exception e) { + e.printStackTrace(); + } + } while (total > (pageNo * NumConstant.FIFTY)); + } + } + + private int listWghJqz(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 list; + + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public List getList() { + return list; + } + + public void setList(List list) { + this.list = list; + } + } + } diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/WghJqzDao.xml b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/WghJqzDao.xml index d4549ee7a3..a0e0b7a610 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/WghJqzDao.xml +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/WghJqzDao.xml @@ -26,6 +26,9 @@ + + delete from wgh_jdb +