From 0b4cc482bf3d5169b0b7d4fb7f750f97d2d9303a Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 28 Jul 2021 10:59:40 +0800 Subject: [PATCH] =?UTF-8?q?sql=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/app/result/AppFootBarResultDTO.java | 2 +- .../dao/opercustomize/CustomerFootBarDao.java | 21 ++++++++++++ .../impl/CustomerFootBarServiceImpl.java | 32 ++++++++++++------- .../opercustomize/CustomerFootBarDao.xml | 16 ++++++++++ 4 files changed, 58 insertions(+), 13 deletions(-) diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/app/result/AppFootBarResultDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/app/result/AppFootBarResultDTO.java index a516aa1bf8..15085b7634 100644 --- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/app/result/AppFootBarResultDTO.java +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/app/result/AppFootBarResultDTO.java @@ -35,5 +35,5 @@ public class AppFootBarResultDTO implements Serializable { /** * 是否都上传了图标，true:都上传了 */ - private Boolean bothUploaded; + // private Boolean bothUploaded; } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/opercustomize/CustomerFootBarDao.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/opercustomize/CustomerFootBarDao.java index 523d6596dd..7d5d11dda7 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/opercustomize/CustomerFootBarDao.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/opercustomize/CustomerFootBarDao.java @@ -34,5 +34,26 @@ import java.util.List; @Mapper public interface CustomerFootBarDao extends BaseDao { + /** + * 查询客户工作端或者居民端，footbar列表 + * + * @param customerId + * @param appType + * @return java.util.List + * @author yinzuomei + * @date 2021/7/28 10:56 + */ List selectAppFootBars(@Param("customerId") String customerId, @Param("appType") String appType); + + /** + * 查询某个footbar信息 + * + * @param customerId + * @param appType + * @param barKey + * @return com.epmet.dataaggre.entity.opercustomize.CustomerFootBarEntity + * @author yinzuomei + * @date 2021/7/28 10:56 + */ + CustomerFootBarEntity selectDefaultIcon(@Param("customerId") String customerId, @Param("appType")String appType, @Param("barKey")String barKey); } \ No newline at end of file diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/opercustomize/impl/CustomerFootBarServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/opercustomize/impl/CustomerFootBarServiceImpl.java index efe1325d5a..4e1546f5a5 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/opercustomize/impl/CustomerFootBarServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/opercustomize/impl/CustomerFootBarServiceImpl.java @@ -21,6 +21,7 @@ import com.epmet.commons.dynamic.datasource.annotation.DataSource; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; import com.epmet.commons.tools.constant.Constant; import com.epmet.commons.tools.constant.NumConstant; +import com.epmet.commons.tools.constant.StrConstant; import com.epmet.dataaggre.constant.DataSourceConstant; import com.epmet.dataaggre.dao.opercustomize.CustomerFootBarDao; import com.epmet.dataaggre.dto.app.form.AppFootBarFormDTO; @@ -70,28 +71,35 @@ public class CustomerFootBarServiceImpl extends BaseServiceImpl footBarList = baseDao.selectAppFootBars(footBarFormDTO.getCustomerId(), footBarFormDTO.getAppType()); if (CollectionUtils.isEmpty(footBarList)) { footBarList = baseDao.selectAppFootBars(Constant.DEFAULT_CUSTOMER, footBarFormDTO.getAppType()); + }else{ + //如果客户没有上传图标,返回产品默认的图标 + for (CustomerFootBarDTO dto : footBarList) { + if (StringUtils.isBlank(dto.getIconPath()) + || StringUtils.isBlank(dto.getSelectedIconPath()) + || StringUtils.isBlank(dto.getFloatIconPath())) { + CustomerFootBarEntity defaultEntity = baseDao.selectDefaultIcon(Constant.DEFAULT_CUSTOMER, footBarFormDTO.getAppType(), dto.getBarKey()); + if (StringUtils.isBlank(dto.getIconPath())) { + dto.setIconPath(null == defaultEntity ? StrConstant.EPMETY_STR : defaultEntity.getIconPath()); + } + if (StringUtils.isBlank(dto.getSelectedIconPath())) { + dto.setSelectedIconPath(null == defaultEntity ? StrConstant.EPMETY_STR : defaultEntity.getSelectedIconPath()); + } + if (StringUtils.isBlank(dto.getFloatIconPath())) { + dto.setFloatIconPath(null == defaultEntity ? StrConstant.EPMETY_STR : defaultEntity.getFloatIconPath()); + } + } + } } if (footBarList.size() % NumConstant.TWO == 0) { resultDTO.setIsOddNum(false); } else { resultDTO.setIsOddNum(true); } - //避免产品默认的没有上传全图标 - resultDTO.setBothUploaded(true); - for (CustomerFootBarDTO entity : footBarList) { - if (StringUtils.isBlank(entity.getIconPath()) - || StringUtils.isBlank(entity.getSelectedIconPath()) - || StringUtils.isBlank(entity.getFloatIconPath())) { - resultDTO.setBothUploaded(false); - break; - } - } //只有客户选择的浮起+奇数+全部上传了图标才返回pattern=flat - if (resultDTO.getIsOddNum() && resultDTO.getBothUploaded() && Constant.FOOT_BAR_FLOAT.equals(patternEntity.getParameterValue())) { + if (resultDTO.getIsOddNum() && Constant.FOOT_BAR_FLOAT.equals(patternEntity.getParameterValue())) { resultDTO.setPattern(Constant.FOOT_BAR_FLOAT); //返回 resultDTO.setHighLightNum(footBarList.size() / NumConstant.TWO); diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/opercustomize/CustomerFootBarDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/opercustomize/CustomerFootBarDao.xml index 7cedd54a32..b412fd552f 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/opercustomize/CustomerFootBarDao.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/opercustomize/CustomerFootBarDao.xml @@ -3,6 +3,7 @@ + + + \ No newline at end of file