From b47f737c573fda85ceddb772ea1ae200c7da8972 Mon Sep 17 00:00:00 2001 From: jianjun Date: Fri, 23 Jul 2021 17:11:55 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E6=97=A0=E7=94=A8?= =?UTF-8?q?=E6=B3=A8=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/controller/PaCustomerController.java | 8 -------- 1 file changed, 8 deletions(-) diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/PaCustomerController.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/PaCustomerController.java index feb2062219..cc6c049d75 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/PaCustomerController.java +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/PaCustomerController.java @@ -25,16 +25,8 @@ import java.util.List; @RequestMapping("pacustomer") public class PaCustomerController { - @Autowired - private PaUserService paUserService; @Autowired private PaCustomerService paCustomerService; - @Autowired - private PaCustomerAgencyService paCustomerAgencyService; - @Autowired - private PaCustomerUserAgencyService paCustomerUserAgencyService; - @Autowired - private CustomerMpService customerMpService; @GetMapping("{id}") public Result get(@PathVariable("id") String id){ From 8a59d067281d8ecea213dca44a8fbfc7a5a85866 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 27 Jul 2021 15:07:02 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E3=80=81=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E3=80=81=E8=AF=A6=E6=83=85=E3=80=81=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=85=A5=E5=8F=82=E8=BF=94=E5=8F=82floatIcon?= =?UTF-8?q?Path?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/dto/CustomerFootBarDTO.java | 7 ++++++- .../java/com/epmet/dto/form/CustomerFootBarFormDTO.java | 2 ++ .../com/epmet/dto/result/CustomerFootBarResultDTO.java | 4 ++++ .../main/java/com/epmet/entity/CustomerFootBarEntity.java | 8 +++++--- .../db/migration/V0.0.12__add_float_icon_path.sql | 1 + .../src/main/resources/mapper/CustomerFootBarDao.xml | 6 ++++-- 6 files changed, 22 insertions(+), 6 deletions(-) create mode 100644 epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.12__add_float_icon_path.sql diff --git a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/CustomerFootBarDTO.java b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/CustomerFootBarDTO.java index 9a33b3161d..1bddb5f5f6 100644 --- a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/CustomerFootBarDTO.java +++ b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/CustomerFootBarDTO.java @@ -17,9 +17,10 @@ package com.epmet.dto; +import lombok.Data; + import java.io.Serializable; import java.util.Date; -import lombok.Data; /** @@ -100,4 +101,8 @@ public class CustomerFootBarDTO implements Serializable { private Boolean display; + /** + * 浮起时图标 + */ + private String floatIconPath; } \ No newline at end of file diff --git a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/CustomerFootBarFormDTO.java b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/CustomerFootBarFormDTO.java index d5981860fd..a3ff316f4a 100644 --- a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/CustomerFootBarFormDTO.java +++ b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/CustomerFootBarFormDTO.java @@ -69,6 +69,8 @@ public class CustomerFootBarFormDTO { @NotNull(message = "显示状态不能为空", groups = { UpdateDisplayStatusGroup.class }) private Boolean display; + @NotBlank(message = "浮起时图标不能为空", groups = { CreateFootBarGroup.class, UpdateFootBarGroup.class }) + private String floatIconPath; /** * 排序索引号dto */ diff --git a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/CustomerFootBarResultDTO.java b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/CustomerFootBarResultDTO.java index c517c835ad..2341a3d5a1 100644 --- a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/CustomerFootBarResultDTO.java +++ b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/CustomerFootBarResultDTO.java @@ -108,4 +108,8 @@ public class CustomerFootBarResultDTO implements Serializable { private String defaultPageTitle; + /** + * 浮起时图标 + */ + private String floatIconPath; } \ No newline at end of file diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/entity/CustomerFootBarEntity.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/entity/CustomerFootBarEntity.java index 9abc736b13..405d4f4d51 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/entity/CustomerFootBarEntity.java +++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/entity/CustomerFootBarEntity.java @@ -18,13 +18,10 @@ package com.epmet.entity; import com.baomidou.mybatisplus.annotation.TableName; - import com.epmet.commons.mybatis.entity.BaseEpmetEntity; import lombok.Data; import lombok.EqualsAndHashCode; -import java.util.Date; - /** * APP底部菜单栏信息 * @@ -80,4 +77,9 @@ public class CustomerFootBarEntity extends BaseEpmetEntity { */ private Boolean display; + /** + * 浮起时图标 + */ + private String floatIconPath; + } diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.12__add_float_icon_path.sql b/epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.12__add_float_icon_path.sql new file mode 100644 index 0000000000..34301ce5f8 --- /dev/null +++ b/epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.12__add_float_icon_path.sql @@ -0,0 +1 @@ +alter table customer_foot_bar add COLUMN FLOAT_ICON_PATH VARCHAR(255) COMMENT '凸起时图标路径' AFTER SELECTED_ICON_PATH; \ No newline at end of file diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/CustomerFootBarDao.xml b/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/CustomerFootBarDao.xml index b320a9c1d2..8ee7cedac8 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/CustomerFootBarDao.xml +++ b/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/CustomerFootBarDao.xml @@ -95,7 +95,8 @@ created_by, created_time, updated_by, - updated_time + updated_time, + FLOAT_ICON_PATH as floatIconPath FROM customer_foot_bar @@ -152,7 +153,8 @@ created_by, created_time, updated_by, - updated_time + updated_time, + FLOAT_ICON_PATH as floatIconPath from customer_foot_bar where CUSTOMER_ID = #{customerId} and APP_TYPE = #{appType}