From c144ef63db0b89eb3902abe4f72a0cc57b9ab42f Mon Sep 17 00:00:00 2001 From: HAHA Date: Fri, 17 Jun 2022 13:33:20 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E8=8E=B7=E5=8F=96=E7=BA=A7?= =?UTF-8?q?=E8=81=94=E8=8F=9C=E5=8D=95=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../opendata/controller/CaLoudongController.java | 14 +------------- .../opendata/controller/caBmGridController.java | 16 ++++++++++++++++ .../com/epmet/opendata/dao/CaLoudongDao.java | 2 +- .../java/com/epmet/opendata/dao/caBmGridDao.java | 5 +++++ .../epmet/opendata/service/CaLoudongService.java | 10 +--------- .../epmet/opendata/service/caBmGridService.java | 11 +++++++++++ .../service/impl/CaBmGridServiceImpl.java | 16 ++++++++++++++++ .../service/impl/CaLoudongServiceImpl.java | 14 +------------- .../src/main/resources/mapper/CaLoudongDao.xml | 12 +----------- .../src/main/resources/mapper/caBmGridDao.xml | 11 +++++++++++ 10 files changed, 64 insertions(+), 47 deletions(-) diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/CaLoudongController.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/CaLoudongController.java index 70b62c5738..1a24078b95 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/CaLoudongController.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/CaLoudongController.java @@ -129,18 +129,6 @@ public class CaLoudongController { return new Result(); } - /** - * 获取级联菜单 - * - * @param - * @return com.epmet.commons.tools.utils.Result - * @author LZN - * @date 2022/6/15 14:01 - */ - @PostMapping("getLouDongCascade") - public Result getLouDongCascade(){ - List dto = caLoudongService.getLouDongCascade(); - return new Result().ok(dto); - } + } diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/caBmGridController.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/caBmGridController.java index 6c344bc523..52217e64f3 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/caBmGridController.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/caBmGridController.java @@ -10,6 +10,7 @@ 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.result.LouDongCascadeResultDTO; import com.epmet.opendata.dto.wgh.BmGridDTO; @@ -93,4 +94,19 @@ public class caBmGridController { bmGridService.getPreserBmGridVation(dto); return new Result(); } + + /** + * 获取级联菜单 + * + * @param + * @return com.epmet.commons.tools.utils.Result + * @author LZN + * @date 2022/6/15 14:01 + */ + @PostMapping("getCascadeMenu") + public Result getCascadeMenu(){ + List dto = bmGridService.getCascadeMenu(); + return new Result().ok(dto); + } + } diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/CaLoudongDao.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/CaLoudongDao.java index 57286319a0..cb923fdc9a 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/CaLoudongDao.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/CaLoudongDao.java @@ -46,6 +46,6 @@ public interface CaLoudongDao extends BaseDao { int deleteAll(); - List getLouDongCascade(); + } diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/caBmGridDao.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/caBmGridDao.java index b9a1ca4e5b..1f76dd0d28 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/caBmGridDao.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/caBmGridDao.java @@ -3,9 +3,12 @@ package com.epmet.opendata.dao; import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.opendata.dto.result.LouDongCascadeResultDTO; import com.epmet.opendata.entity.caBmGridEntity; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + /** * * @@ -16,4 +19,6 @@ import org.apache.ibatis.annotations.Mapper; public interface caBmGridDao extends BaseDao { int deleteAll(); + + List getCascadeMenu(); } diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/CaLoudongService.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/CaLoudongService.java index ef432c4e68..10e5a08aa4 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/CaLoudongService.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/CaLoudongService.java @@ -109,13 +109,5 @@ public interface CaLoudongService extends BaseService { */ void preserLouDongVation(PreserVationFormDTO dto); - /** - * 获取级联菜单 - * - * @param - * @return java.util.List - * @author LZN - * @date 2022/6/15 14:01 - */ - List getLouDongCascade(); + } diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/caBmGridService.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/caBmGridService.java index 0d559be42c..5f763e4433 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/caBmGridService.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/caBmGridService.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.form.PreserVationFormDTO; +import com.epmet.opendata.dto.result.LouDongCascadeResultDTO; import com.epmet.opendata.dto.wgh.BmGridDTO; import com.epmet.opendata.entity.caBmGridEntity; @@ -87,4 +88,14 @@ public interface caBmGridService extends BaseService { * @date 2022/6/14 14:17 */ void getPreserBmGridVation(PreserVationFormDTO dto); + + /** + * 获取级联菜单 + * + * @param + * @return java.util.List + * @author LZN + * @date 2022/6/17 13:32 + */ + List getCascadeMenu(); } diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaBmGridServiceImpl.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaBmGridServiceImpl.java index e15b7dfccb..42528e3a4a 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaBmGridServiceImpl.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaBmGridServiceImpl.java @@ -10,11 +10,13 @@ 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.LouDongTreeNodeUtils; import com.epmet.commons.tools.utils.Result; 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.result.LouDongCascadeResultDTO; import com.epmet.opendata.dto.wgh.BmGridDTO; import com.epmet.opendata.entity.caBmGridEntity; @@ -131,6 +133,20 @@ public class CaBmGridServiceImpl extends BaseServiceImpl + * @author LZN + * @date 2022/6/15 14:01 + */ + @Override + public List getCascadeMenu() { + List list = baseDao.getCascadeMenu(); + return LouDongTreeNodeUtils.build(list); + } + private int listBmGrid(PreserVationFormDTO dto) throws Exception { String aes = AesUtils.encryptByAES(JSONObject.toJSONString(dto), CaWghDataConstant.AESKEY); JSONObject obj = new JSONObject(); diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaLoudongServiceImpl.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaLoudongServiceImpl.java index 8d7dc657fc..40e440d48e 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaLoudongServiceImpl.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaLoudongServiceImpl.java @@ -161,19 +161,7 @@ public class CaLoudongServiceImpl extends BaseServiceImpl - * @author LZN - * @date 2022/6/15 14:01 - */ - @Override - public List getLouDongCascade() { - List list = baseDao.getLouDongCascade(); - return LouDongTreeNodeUtils.build(list); - } + private int listLouDong(PreserVationFormDTO dto) throws Exception { String aes = AesUtils.encryptByAES(JSONObject.toJSONString(dto), CaWghDataConstant.AESKEY); diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaLoudongDao.xml b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaLoudongDao.xml index 325c224424..24afdf1451 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaLoudongDao.xml +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaLoudongDao.xml @@ -115,17 +115,7 @@ - + diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/caBmGridDao.xml b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/caBmGridDao.xml index a87a72b682..2fe689c55c 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/caBmGridDao.xml +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/caBmGridDao.xml @@ -7,6 +7,17 @@ delete from ca_bm_grid +