From e5e721ba01419be8bda34b6a815676a4d309aa36 Mon Sep 17 00:00:00 2001 From: yinzuomei Date: Tue, 31 Dec 2019 17:14:38 +0800 Subject: [PATCH 01/12] =?UTF-8?q?webservice=E6=8E=A5=E5=8F=A3bug=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epdc/dto/GridPlatformHandleLogDTO.java | 176 ------------------ .../elink/esua/epdc/dto/InterfaceLogDTO.java | 101 ---------- .../esua/epdc/dto/ItemGridPlatformDTO.java | 91 --------- ...ityGridInterfaceServiceWebServiceImpl.java | 1 - .../elink/esua/epdc/utils/XstreamUtil.java | 47 ----- 5 files changed, 416 deletions(-) delete mode 100644 esua-epdc/epdc-module/epdc-webservice/src/main/java/com/elink/esua/epdc/dto/GridPlatformHandleLogDTO.java delete mode 100644 esua-epdc/epdc-module/epdc-webservice/src/main/java/com/elink/esua/epdc/dto/InterfaceLogDTO.java delete mode 100644 esua-epdc/epdc-module/epdc-webservice/src/main/java/com/elink/esua/epdc/dto/ItemGridPlatformDTO.java delete mode 100644 esua-epdc/epdc-module/epdc-webservice/src/main/java/com/elink/esua/epdc/utils/XstreamUtil.java diff --git a/esua-epdc/epdc-module/epdc-webservice/src/main/java/com/elink/esua/epdc/dto/GridPlatformHandleLogDTO.java b/esua-epdc/epdc-module/epdc-webservice/src/main/java/com/elink/esua/epdc/dto/GridPlatformHandleLogDTO.java deleted file mode 100644 index 565022fc3..000000000 --- a/esua-epdc/epdc-module/epdc-webservice/src/main/java/com/elink/esua/epdc/dto/GridPlatformHandleLogDTO.java +++ /dev/null @@ -1,176 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.elink.esua.epdc.dto; - -import java.io.Serializable; -import java.util.Date; -import lombok.Data; - - -/** - * 网格化平台处理日志表 网格化平台处理日志表 - * - * @author qu qu@elink-cn.com - * @since v1.0.0 2019-12-31 - */ -@Data -public class GridPlatformHandleLogDTO implements Serializable { - - private static final long serialVersionUID = 1L; - - /** - * 主键 - */ - private String id; - - /** - * 网格化平台项目关系表ID - */ - private String itemGridPlatformId; - - /** - * 状态 15-网格化平台-上报，20-网格化平台-受理，25-网格化平台-立案，30-网格化平台-派遣，35-网格化平台-中间再派，40-网格化平台-接单，45-网格化平台-处理，50-网格化平台-中间督办，55-网格化平台-催办，55-网格化平台-结案 - */ - private Integer status; - - /** - * 项目处理表ID - */ - private String itemHandleProcessId; - - /** - * 处理人 - */ - private String handler; - - /** - * 处理意见 - */ - private String handlingOpinions; - - /** - * 处理部门 - */ - private String handlingDept; - - /** - * 处理时间 - */ - private Date handlingTime; - - /** - * 乐观锁 - */ - private Integer revision; - - /** - * 创建人 - */ - private String createdBy; - - /** - * 创建时间 - */ - private Date createdTime; - - /** - * 更新人 - */ - private String updatedBy; - - /** - * 更新时间 - */ - private Date updatedTime; - - /** - * 删除标记 - */ - private String delFlag; - - /** - * 派遣时间（格式：yyyy-MM-dd HH24:mm:ss） - */ - private String dispatchTime; - - /** - * 派遣部门编号 - */ - private String deptCode; - - /** - * 派遣部门名称 - */ - private String deptName; - - /** - * 主责部门编号 - */ - private String execDeptCode; - - /** - * 主责部门名称 - */ - private String execDeptName; - - /** - * 到场时间要求（分钟数） - */ - private Integer carriveTime; - - /** - * 处置时间要求（分钟数） - */ - private Integer csolvingTime; - - /** - * 到场截止时间（格式：yyyy-MM-dd HH24:mm:ss） - */ - private String arriveTime; - - /** - * 处置截止时间（格式：yyyy-MM-dd HH24:mm:ss） - */ - private String solvingTime; - - /** - * 派遣意见、最终主责单位处理完成意见 - */ - private String solvingNote; - - /** - * 结案时间（格式：yyyy-MM-dd HH24:mm:ss） - */ - private String endTime; - - /** - * 最终处理时间（格式：yyyy-MM-dd HH24:mm:ss） - */ - private String lastSolvingTime; - - /** - * 结案意见 - */ - private String endNote; - - /** - * 结案评判（实际解决、解释说明等） - */ - private String banliResult; - -} diff --git a/esua-epdc/epdc-module/epdc-webservice/src/main/java/com/elink/esua/epdc/dto/InterfaceLogDTO.java b/esua-epdc/epdc-module/epdc-webservice/src/main/java/com/elink/esua/epdc/dto/InterfaceLogDTO.java deleted file mode 100644 index 633b85f65..000000000 --- a/esua-epdc/epdc-module/epdc-webservice/src/main/java/com/elink/esua/epdc/dto/InterfaceLogDTO.java +++ /dev/null @@ -1,101 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.elink.esua.epdc.dto; - -import java.io.Serializable; -import java.util.Date; -import lombok.Data; - - -/** - * 接口日志表 接口日志表 - * - * @author qu qu@elink-cn.com - * @since v1.0.0 2019-12-31 - */ -@Data -public class InterfaceLogDTO implements Serializable { - - private static final long serialVersionUID = 1L; - - /** - * 主键 - */ - private String id; - - /** - * 引用ID - */ - private String referenceId; - - /** - * 业务类型(1:项目上报网格化平台) - */ - private String businessType; - - /** - * 调用接口名称 - */ - private String interfaceName; - - /** - * 调用是否成功 0-调用失败，1-调用成功 - */ - private String successFlag; - - /** - * 调用消息体 - */ - private String callMsgBody; - - /** - * 调用返回消息体 - */ - private String returnMsgBody; - - /** - * 乐观锁 - */ - private Integer revision; - - /** - * 创建人 - */ - private String createdBy; - - /** - * 创建时间 - */ - private Date createdTime; - - /** - * 更新人 - */ - private String updatedBy; - - /** - * 更新时间 - */ - private Date updatedTime; - - /** - * 删除标记 - */ - private String delFlag; - -} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-webservice/src/main/java/com/elink/esua/epdc/dto/ItemGridPlatformDTO.java b/esua-epdc/epdc-module/epdc-webservice/src/main/java/com/elink/esua/epdc/dto/ItemGridPlatformDTO.java deleted file mode 100644 index 2dc8d8c03..000000000 --- a/esua-epdc/epdc-module/epdc-webservice/src/main/java/com/elink/esua/epdc/dto/ItemGridPlatformDTO.java +++ /dev/null @@ -1,91 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.elink.esua.epdc.dto; - -import java.io.Serializable; -import java.util.Date; -import lombok.Data; - - -/** - * 网格化平台项目关系表 网格化平台项目关系表 - * - * @author qu qu@elink-cn.com - * @since v1.0.0 2019-12-31 - */ -@Data -public class ItemGridPlatformDTO implements Serializable { - - private static final long serialVersionUID = 1L; - - /** - * 主键 - */ - private String id; - - /** - * 关联表ID - */ - private String referenceId; - - /** - * 网格平台任务ID - */ - private String taskid; - - /** - * 上报人部门ID - */ - private Long reportPersonDeptId; - - /** - * 状态 15-网格化平台-上报，20-网格化平台-受理，25-网格化平台-立案，30-网格化平台-派遣，35-网格化平台-中间再派，40-网格化平台-接单，45-网格化平台-处理，50-网格化平台-中间督办，55-网格化平台-催办，60-网格化平台-结案 - */ - private Integer status; - - /** - * 乐观锁 - */ - private Integer revision; - - /** - * 创建人 - */ - private String createdBy; - - /** - * 创建时间 - */ - private Date createdTime; - - /** - * 更新人 - */ - private String updatedBy; - - /** - * 更新时间 - */ - private Date updatedTime; - - /** - * 删除标记 - */ - private String delFlag; - -} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-webservice/src/main/java/com/elink/esua/epdc/service/impl/CityGridInterfaceServiceWebServiceImpl.java b/esua-epdc/epdc-module/epdc-webservice/src/main/java/com/elink/esua/epdc/service/impl/CityGridInterfaceServiceWebServiceImpl.java index 570ed7339..ef48ce055 100644 --- a/esua-epdc/epdc-module/epdc-webservice/src/main/java/com/elink/esua/epdc/service/impl/CityGridInterfaceServiceWebServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-webservice/src/main/java/com/elink/esua/epdc/service/impl/CityGridInterfaceServiceWebServiceImpl.java @@ -174,7 +174,6 @@ public class CityGridInterfaceServiceWebServiceImpl implements CityGridInterface itemHandleProcessDTO.setState(ItemGridPlatformHandleStatusEnum.HANDLE_PQ.getValue()); itemHandleProcessDTO.setHandleAdvice(formDto.getSolvingNote()); itemHandleProcessDTO.setOutHandleAdvice(formDto.getSolvingNote()); - itemHandleProcessDTO.setHandlerDeptId(Long.valueOf(formDto.getDeptCode()));// 存储平台部门id有必要吗？？？？？ itemHandleProcessDTO.setHandlerDept(formDto.getDeptName()); itemHandleProcessDTO.setCreatedTime(nowDate);//测试事务回滚可以注释掉此行代码 itemHandleProcessDTO.setUpdatedTime(nowDate); diff --git a/esua-epdc/epdc-module/epdc-webservice/src/main/java/com/elink/esua/epdc/utils/XstreamUtil.java b/esua-epdc/epdc-module/epdc-webservice/src/main/java/com/elink/esua/epdc/utils/XstreamUtil.java deleted file mode 100644 index d50132d66..000000000 --- a/esua-epdc/epdc-module/epdc-webservice/src/main/java/com/elink/esua/epdc/utils/XstreamUtil.java +++ /dev/null @@ -1,47 +0,0 @@ -package com.elink.esua.epdc.utils; - -import com.thoughtworks.xstream.XStream; -import com.thoughtworks.xstream.io.xml.DomDriver; -import com.thoughtworks.xstream.io.xml.XmlFriendlyNameCoder; -import com.thoughtworks.xstream.io.xml.XppDriver; - -/** - * @author rongchao - * @Date 18-12-4 - */ -public class XstreamUtil { - - /** - * 将xml转换为bean - * - * @param 泛型 - * @param xml 要转换为bean的xml - * @param cls bean对应的Class - * @return xml转换为bean - */ - public static T xmlToObject(String xml, Class cls) { - XStream xStream = new XStream(new DomDriver()); - XStream.setupDefaultSecurity(xStream); - xStream.allowTypes(new Class[]{cls}); - //xstream使用注解转换 - xStream.processAnnotations(cls); - return (T) xStream.fromXML(xStream.fromXML(xml).toString()); - } - - /** - * 将bean转换为xml - * - * @param obj - * @return - */ - public static String objectToXml(Object obj) { - //解决下划线问题 - XStream xStream = new XStream(new XppDriver(new XmlFriendlyNameCoder("_-", "_"))); - XStream.setupDefaultSecurity(xStream); - xStream.allowTypes(new Class[]{obj.getClass()}); - //xstream使用注解转换 - xStream.processAnnotations(obj.getClass()); - return xStream.toXML(obj); - } - -} From bf9b75cc8fe8af989ca0fde7054601786a7a04bd Mon Sep 17 00:00:00 2001 From: yujintao Date: Thu, 2 Jan 2020 09:22:56 +0800 Subject: [PATCH 02/12] =?UTF-8?q?job=E6=A8=A1=E5=9D=97=E7=94=9F=E4=BA=A7?= =?UTF-8?q?=E7=8E=AF=E5=A2=83=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epdc-job/epdc-job-server/pom.xml | 43 +++++++++++++++---- .../src/main/resources/registry.conf | 4 +- 2 files changed, 36 insertions(+), 11 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-job/epdc-job-server/pom.xml b/esua-epdc/epdc-module/epdc-job/epdc-job-server/pom.xml index b710327a6..897818898 100644 --- a/esua-epdc/epdc-module/epdc-job/epdc-job-server/pom.xml +++ b/esua-epdc/epdc-module/epdc-job/epdc-job-server/pom.xml @@ -109,6 +109,30 @@ dockerfile-maven-plugin + + ${project.basedir}/src/main/java + + + + true + ${basedir}/src/main/resources + + **/application*.yml + **/*.properties + logback-spring.xml + registry.conf + + + + ${basedir}/src/main/resources + + **/application*.yml + **/*.properties + logback-spring.xml + registry.conf + + + @@ -165,22 +189,23 @@ prod prod + prod 9061 - - 2 - 47.104.224.45 + + 0 + 10.5.34.164 6379 - elink@888 + Elink@833066 - + epdc - elink888 - - false - 47.104.224.45:8848 + Elink@833066 + + true + 10.5.34.164:8848 diff --git a/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/resources/registry.conf b/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/resources/registry.conf index 9cfedf9cc..fb64abd71 100644 --- a/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/resources/registry.conf +++ b/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/resources/registry.conf @@ -3,7 +3,7 @@ registry { type = "nacos" nacos { - serverAddr = "47.104.224.45" + serverAddr = "@nacos.server-addr@" namespace = "public" cluster = "default" } @@ -14,7 +14,7 @@ config { type = "nacos" nacos { - serverAddr = "47.104.224.45" + serverAddr = "@nacos.server-addr@" namespace = "public" cluster = "default" } From 66de2230a1ab5b5e6120074ab11b797c0d03b40b Mon Sep 17 00:00:00 2001 From: yinzuomei Date: Thu, 2 Jan 2020 12:42:25 +0800 Subject: [PATCH 03/12] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E4=B8=8A=E6=8A=A5?= =?UTF-8?q?=E5=8E=BB=E6=8E=89=E6=B5=8B=E8=AF=95"=E6=B5=8B=E8=AF=95ITEM-"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epdc/modules/item/service/impl/ItemServiceImpl.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java index ca1dd4179..67e244b0e 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java @@ -33,7 +33,10 @@ import com.elink.esua.epdc.commons.tools.utils.ConvertUtils; import com.elink.esua.epdc.commons.tools.utils.DateUtils; import com.elink.esua.epdc.commons.tools.utils.GPSUtils; import com.elink.esua.epdc.commons.tools.utils.Result; -import com.elink.esua.epdc.constant.*; +import com.elink.esua.epdc.constant.EventIssueItemState; +import com.elink.esua.epdc.constant.EventsNoticeConstant; +import com.elink.esua.epdc.constant.ImageConstant; +import com.elink.esua.epdc.constant.ItemInformationConstant; import com.elink.esua.epdc.constants.MenuCodeConstant; import com.elink.esua.epdc.dto.CompleteDeptDTO; import com.elink.esua.epdc.dto.DeptGridPlatformDTO; @@ -81,7 +84,6 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.math.BigDecimal; -import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.*; @@ -961,7 +963,7 @@ public class ItemServiceImpl extends BaseServiceImpl implem // 发生地址 formDto.setStandardAddress(itemEntity.getIssueAddress()); // 问题描述 - formDto.setDescription("测试ITEM-"+itemEntity.getItemContent());// 测试999勿删谢谢 + formDto.setDescription(itemEntity.getItemContent());// 测试999勿删谢谢 // 反映人 formDto.setReportPerson(itemEntity.getNickName());// itemEntity.getNickName()测试人员 // 联系方式 From 17f44b046f8a8f7f37eb6ac6f8be12f474713d12 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B2=E6=A0=91=E9=80=9A?= <1976590620@qq.com> Date: Thu, 2 Jan 2020 13:19:32 +0800 Subject: [PATCH 04/12] =?UTF-8?q?=E5=B7=B2=E8=AE=A4=E8=AF=81=E5=85=9A?= =?UTF-8?q?=E5=91=98=E8=AE=A4=E8=AF=81=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/PartyMembersDao.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/PartyMembersDao.xml b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/PartyMembersDao.xml index afb00d190..708f55c56 100755 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/PartyMembersDao.xml +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/PartyMembersDao.xml @@ -88,10 +88,10 @@ From 40844273782938bce00bdfb180e115d06f4f7a05 Mon Sep 17 00:00:00 2001 From: yinzuomei Date: Thu, 2 Jan 2020 14:56:02 +0800 Subject: [PATCH 08/12] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E4=B8=8A=E6=8A=A5?= =?UTF-8?q?=E7=BB=8F=E7=BA=AC=E5=BA=A6=E4=BF=9D=E7=95=99=E5=B0=8F=E6=95=B0?= =?UTF-8?q?=E7=82=B9=E5=90=8E15=E4=BD=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../esua/epdc/modules/item/service/impl/ItemServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java index 1609141b4..ce41affcf 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java @@ -970,9 +970,9 @@ public class ItemServiceImpl extends BaseServiceImpl implem formDto.setContactMode(itemEntity.getMobile()); double[] gps= GPSUtils.gcj02_To_Gps84(itemEntity.getIssueLatitude(),itemEntity.getIssueLongitude()); // 坐标X - formDto.setCoordX(new BigDecimal(gps[1])); + formDto.setCoordX(new BigDecimal(gps[1]).setScale(15, BigDecimal.ROUND_HALF_UP)); // 坐标Y - formDto.setCoordY(new BigDecimal(gps[0])); + formDto.setCoordY(new BigDecimal(gps[0]).setScale(15, BigDecimal.ROUND_HALF_UP)); // 监督员编号 formDto.setKeepersn(""); // 操作时间 From b5461a8d1057ac29bf935c71d8b582c1e7e1ad63 Mon Sep 17 00:00:00 2001 From: zhangyongzhangyong <2012005003@qq.coom> Date: Thu, 2 Jan 2020 15:17:24 +0800 Subject: [PATCH 09/12] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20=E7=B3=BB=E7=BB=9F?= =?UTF-8?q?=E7=AE=A1=E7=90=86-APP=E8=8F=9C=E5=8D=95=E7=AE=A1=E7=90=86-?= =?UTF-8?q?=E4=BA=8C=E7=BA=A7=E8=8F=9C=E5=8D=95-=E7=82=B9=E5=87=BB?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8C=89=E9=92=AE=EF=BC=8C=E4=B8=8A=E7=BA=A7?= =?UTF-8?q?=E8=8F=9C=E5=8D=95=E9=94=99=E8=AF=AF=E6=98=BE=E7=A4=BA=E4=B8=BA?= =?UTF-8?q?=E2=80=9C=E4=B8=80=E7=BA=A7=E8=8F=9C=E5=8D=95=E2=80=9D=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/elink/esua/epdc/dto/AppMenuDTO.java | 7 +++++++ .../src/main/resources/mapper/AppMenuDao.xml | 4 +++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/AppMenuDTO.java b/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/AppMenuDTO.java index 210ca1665..7f0cd1e00 100644 --- a/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/AppMenuDTO.java +++ b/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/AppMenuDTO.java @@ -125,4 +125,11 @@ public class AppMenuDTO extends TreeNode implements Serializable { * 是否显示数字 0否 1是 */ private String numFlag; + + //虚字段 + + /** + * 上级菜单名称 + */ + private String parentName; } diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/AppMenuDao.xml b/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/AppMenuDao.xml index 9e2579c79..8daf8818c 100644 --- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/AppMenuDao.xml +++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/AppMenuDao.xml @@ -18,9 +18,11 @@