From 111e90cd689b30177bcd7a6630f0260d57b0fa21 Mon Sep 17 00:00:00 2001 From: HAHA Date: Thu, 16 Jun 2022 16:53:01 +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=A8=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 + .../controller/CaBmCategoryController.java | 2 +- .../controller/CaSysDictController.java | 27 ++++-- .../com/epmet/opendata/dao/CaSysDictDao.java | 1 + .../opendata/service/CaSysDictService.java | 11 +++ .../service/impl/CaSysDictServiceImpl.java | 88 ++++++++++++++++++- .../main/resources/mapper/CaSysDictDao.xml | 3 + 7 files changed, 123 insertions(+), 10 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 e8480a24e8..0c43a0ae97 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 @@ -21,6 +21,7 @@ public interface CaWghDataConstant { String UNICOM_ROTATORS = "ca_rotators"; String UNICOM_RENTAL = "ca_rental"; String UNICOM_BM_CATEGORY = "ca_bm_category"; + String UNICOM_SYS_DICT = "ca_sys_dict"; String SHARE_BASE_GRID = "wgh_base_grid"; String SHARE_WGH_SUB = "wgh_subdistrict_office"; diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/CaBmCategoryController.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/CaBmCategoryController.java index 5c5034938b..a5a26e65a8 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/CaBmCategoryController.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/CaBmCategoryController.java @@ -88,7 +88,7 @@ public class CaBmCategoryController { * @date 2022/6/2 10:02 */ @PostMapping("/preserBmCategoryVation") - public Result getPreserLouDongVation(@RequestBody PreserVationFormDTO dto) { + public Result getPreserBmCategoryVation(@RequestBody PreserVationFormDTO dto) { caBmCategoryService.preserBmCategoryVation(dto); return new Result(); } diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/CaSysDictController.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/CaSysDictController.java index 314302f346..0964a32a69 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/CaSysDictController.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/CaSysDictController.java @@ -11,6 +11,7 @@ import com.epmet.commons.tools.validator.group.UpdateGroup; import com.epmet.commons.tools.validator.group.DefaultGroup; import com.epmet.opendata.dto.ca.CaSysDictDTO; +import com.epmet.opendata.dto.form.PreserVationFormDTO; import com.epmet.opendata.excel.CaSysDictExcel; import com.epmet.opendata.service.CaSysDictService; import org.springframework.beans.factory.annotation.Autowired; @@ -35,20 +36,20 @@ public class CaSysDictController { private CaSysDictService caSysDictService; @RequestMapping("page") - public Result> page(@RequestParam Map params){ + public Result> page(@RequestParam Map params) { PageData page = caSysDictService.page(params); return new Result>().ok(page); } - @RequestMapping(value = "{id}",method = {RequestMethod.POST,RequestMethod.GET}) - public Result get(@PathVariable("id") String id){ + @RequestMapping(value = "{id}", method = {RequestMethod.POST, RequestMethod.GET}) + public Result get(@PathVariable("id") String id) { CaSysDictDTO data = caSysDictService.get(id); return new Result().ok(data); } @NoRepeatSubmit @PostMapping("save") - public Result save(@RequestBody CaSysDictDTO dto){ + public Result save(@RequestBody CaSysDictDTO dto) { //效验数据 ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); caSysDictService.save(dto); @@ -57,7 +58,7 @@ public class CaSysDictController { @NoRepeatSubmit @PostMapping("update") - public Result update(@RequestBody CaSysDictDTO dto){ + public Result update(@RequestBody CaSysDictDTO dto) { //效验数据 ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); caSysDictService.update(dto); @@ -65,7 +66,7 @@ public class CaSysDictController { } @PostMapping("delete") - public Result delete(@RequestBody String[] ids){ + public Result delete(@RequestBody String[] ids) { //效验数据 AssertUtils.isArrayEmpty(ids, "id"); caSysDictService.delete(ids); @@ -78,6 +79,18 @@ public class CaSysDictController { ExcelUtils.exportExcelToTarget(response, null, list, CaSysDictExcel.class); } - + /** + * 调用ruoyi接口存储数据 + * + * @param dto + * @return com.epmet.commons.tools.utils.Result + * @author LZN + * @date 2022/6/2 10:02 + */ + @PostMapping("/preserSysdictVation") + public Result getPreserSysdictVation(@RequestBody PreserVationFormDTO dto) { + caSysDictService.preserSysdictVation(dto); + return new Result(); + } } diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/CaSysDictDao.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/CaSysDictDao.java index 91e682ed48..b761ce29fc 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/CaSysDictDao.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/CaSysDictDao.java @@ -14,4 +14,5 @@ import org.apache.ibatis.annotations.Mapper; @Mapper public interface CaSysDictDao extends BaseDao { + int deleteAll(); } diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/CaSysDictService.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/CaSysDictService.java index e7057b9646..f2c0cebb5f 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/CaSysDictService.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/CaSysDictService.java @@ -3,6 +3,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.ca.CaSysDictDTO; +import com.epmet.opendata.dto.form.PreserVationFormDTO; import com.epmet.opendata.entity.CaSysDictEntity; @@ -76,4 +77,14 @@ public interface CaSysDictService extends BaseService { * @date 2022-06-16 */ void delete(String[] ids); + + /** + * 调用ruoyi接口存储数据 + * + * @param dto + * @return void + * @author LZN + * @date 2022/6/16 16:52 + */ + void preserSysdictVation(PreserVationFormDTO dto); } diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaSysDictServiceImpl.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaSysDictServiceImpl.java index f1960a5274..2f11f830f0 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaSysDictServiceImpl.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaSysDictServiceImpl.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.CaSysDictDao; import com.epmet.opendata.dto.ca.CaSysDictDTO; +import com.epmet.opendata.dto.constant.CaWghDataConstant; +import com.epmet.opendata.dto.form.PreserVationFormDTO; +import com.epmet.opendata.entity.CaLoudongEntity; import com.epmet.opendata.entity.CaSysDictEntity; import com.epmet.opendata.redis.CaSysDictRedis; import com.epmet.opendata.service.CaSysDictService; +import com.epmet.opendata.util.AesUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -48,8 +57,8 @@ public class CaSysDictServiceImpl extends BaseServiceImpl getWrapper(Map params){ - String id = (String)params.get(FieldConstant.ID_HUMP); + private QueryWrapper getWrapper(Map params) { + String id = (String) params.get(FieldConstant.ID_HUMP); QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); @@ -84,4 +93,79 @@ public class CaSysDictServiceImpl extends BaseServiceImpl= 0) { + dto.setPageNo(NumConstant.ONE); + dto.setPageSize(CaWghDataConstant.PAGE_LIMIT); + dto.setTableSchema(CaWghDataConstant.TABLESCHEMA_UNICOM); + dto.setTableName(CaWghDataConstant.UNICOM_SYS_DICT); + + dto.setWhereCase("delete_flag = 'normal'"); + dto.setOrderBy("dict_id,,create_date,update_date"); + + int pageNo = 1; + + int total = 0; + + do { + try { + total = listSysDict(dto); + pageNo++; + dto.setPageNo(pageNo); + } catch (Exception e) { + e.printStackTrace(); + } + } while (total > (pageNo * NumConstant.FIFTY)); + } + } + + private int listSysDict(PreserVationFormDTO dto) throws Exception { + String aes = AesUtils.encryptByAES(JSONObject.toJSONString(dto), CaWghDataConstant.AESKEY); + JSONObject obj = new JSONObject(); + obj.put(CaWghDataConstant.UNICOM_CONDITION, aes); + 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()) { + 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/CaSysDictDao.xml b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaSysDictDao.xml index 04194b5436..25d1c87ea1 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaSysDictDao.xml +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaSysDictDao.xml @@ -17,6 +17,9 @@ + + delete from ca_sys_dict +