From f7ffef5d3d9def9b7c976fcbc3f61e3446443a0b Mon Sep 17 00:00:00 2001 From: interestinglife41 Date: Fri, 20 Aug 2021 19:19:53 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E6=9F=90=E4=BA=9Bservice?= =?UTF-8?q?=E8=8E=B7=E5=8F=96=E5=AE=9E=E4=BD=93=E6=9C=AA=E5=88=A4=E7=A9=BA?= =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/AbstractMybatisEntityService.java | 8 +++--- .../impl/AuthorizationServiceImpl.java | 5 +++- .../impl/DataSetEntityServiceImpl.java | 6 +++++ .../HtmlChartWidgetEntityServiceImpl.java | 27 ++++++++++++++----- .../service/impl/SchemaServiceImpl.java | 1 - .../service/impl/UserServiceImpl.java | 22 +++++++++++---- 6 files changed, 51 insertions(+), 18 deletions(-) diff --git a/datagear-management/src/main/java/org/datagear/management/service/impl/AbstractMybatisEntityService.java b/datagear-management/src/main/java/org/datagear/management/service/impl/AbstractMybatisEntityService.java index a9d8075c..6f2b2198 100644 --- a/datagear-management/src/main/java/org/datagear/management/service/impl/AbstractMybatisEntityService.java +++ b/datagear-management/src/main/java/org/datagear/management/service/impl/AbstractMybatisEntityService.java @@ -139,15 +139,15 @@ public abstract class AbstractMybatisEntityService> ext * 注意：加载此实体的私有属性值应通过重写{@linkplain #getByIdFromDB(Object, Map)}来实现，这样它们才会被加入缓存。 *

*

- * 此方法的默认实现是：直接返回{@code obj}。 + * 此方法的默认实现是：直接返回{@code entity}。 *

* * @see #getById(Object) getById(Object)会在其内部调用此方法 */ @Override - protected T postProcessGet(T obj) + protected T postProcessGet(T entity) { - return super.postProcessGet(obj); + return super.postProcessGet(entity); } @Override @@ -207,7 +207,7 @@ public abstract class AbstractMybatisEntityService> ext * * @param id * @param params - * @return + * @return 可能返回{@code null} */ protected T getByIdFromDB(ID id, Map params) { diff --git a/datagear-management/src/main/java/org/datagear/management/service/impl/AuthorizationServiceImpl.java b/datagear-management/src/main/java/org/datagear/management/service/impl/AuthorizationServiceImpl.java index b60e83b8..9b42737c 100644 --- a/datagear-management/src/main/java/org/datagear/management/service/impl/AuthorizationServiceImpl.java +++ b/datagear-management/src/main/java/org/datagear/management/service/impl/AuthorizationServiceImpl.java @@ -90,9 +90,12 @@ public class AuthorizationServiceImpl extends AbstractMybatisEntityService delParams = buildParamMap(); delParams.put("dataSetId", entity.getId()); @@ -608,6 +611,9 @@ public class DataSetEntityServiceImpl extends AbstractMybatisDataPermissionEntit protected void saveDataSetParamPOs(DataSetEntity entity) { + if (entity == null) + return; + Map delParams = buildParamMap(); delParams.put("dataSetId", entity.getId()); diff --git a/datagear-management/src/main/java/org/datagear/management/service/impl/HtmlChartWidgetEntityServiceImpl.java b/datagear-management/src/main/java/org/datagear/management/service/impl/HtmlChartWidgetEntityServiceImpl.java index a3ce0808..28824ff4 100644 --- a/datagear-management/src/main/java/org/datagear/management/service/impl/HtmlChartWidgetEntityServiceImpl.java +++ b/datagear-management/src/main/java/org/datagear/management/service/impl/HtmlChartWidgetEntityServiceImpl.java @@ -244,6 +244,9 @@ public class HtmlChartWidgetEntityServiceImpl protected void saveWidgetDataSetRelations(HtmlChartWidgetEntity entity) { + if (entity == null) + return; + Map delParams = buildParamMap(); delParams.put("id", entity.getId()); @@ -287,6 +290,9 @@ public class HtmlChartWidgetEntityServiceImpl protected void setChartDataSetVOs(HtmlChartWidgetEntity entity) { + if (entity == null) + return; + Map sqlParams = buildParamMap(); sqlParams.put("widgetId", entity.getId()); @@ -330,16 +336,19 @@ public class HtmlChartWidgetEntityServiceImpl inflateChartDataSets(entity, forAnalysis); } - protected void inflateHtmlChartPlugin(HtmlChartWidgetEntity obj, boolean forAnalysis) + protected void inflateHtmlChartPlugin(HtmlChartWidgetEntity entity, boolean forAnalysis) { - HtmlChartPlugin htmlChartPlugin = obj.getHtmlChartPlugin(); + if (entity == null) + return; + + HtmlChartPlugin htmlChartPlugin = entity.getHtmlChartPlugin(); if (htmlChartPlugin != null) { HtmlChartPlugin full = getHtmlChartPlugin(htmlChartPlugin.getId()); if (forAnalysis) - obj.setHtmlChartPlugin(full); + entity.setHtmlChartPlugin(full); else { if (full != null) @@ -354,6 +363,9 @@ public class HtmlChartWidgetEntityServiceImpl protected void inflateChartDataSets(HtmlChartWidgetEntity entity, boolean forAnalysis) { + if (entity == null) + return; + ChartDataSetVO[] chartDataSetVOs = entity.getChartDataSetVOs(); if (chartDataSetVOs == null || chartDataSetVOs.length == 0) @@ -438,14 +450,14 @@ public class HtmlChartWidgetEntityServiceImpl return (HtmlChartPlugin) this.chartPluginManager.get(id); } - protected List getWidgetDataSetRelations(HtmlChartWidgetEntity obj) + protected List getWidgetDataSetRelations(HtmlChartWidgetEntity entity) { List list = new ArrayList<>(); - if (obj == null) + if (entity == null) return list; - ChartDataSet[] chartDataSets = obj.getChartDataSets(); + ChartDataSet[] chartDataSets = entity.getChartDataSets(); if (chartDataSets == null) return list; @@ -457,7 +469,8 @@ public class HtmlChartWidgetEntityServiceImpl String propertySignsJson = JsonSupport.generate(chartDataSet.getPropertySigns(), ""); String queryJson = JsonSupport.generate(chartDataSet.getQuery(), ""); - WidgetDataSetRelation relation = new WidgetDataSetRelation(obj.getId(), chartDataSet.getDataSet().getId(), + WidgetDataSetRelation relation = new WidgetDataSetRelation(entity.getId(), + chartDataSet.getDataSet().getId(), i + 1); relation.setPropertySignsJson(propertySignsJson); relation.setAlias(chartDataSet.getAlias()); diff --git a/datagear-management/src/main/java/org/datagear/management/service/impl/SchemaServiceImpl.java b/datagear-management/src/main/java/org/datagear/management/service/impl/SchemaServiceImpl.java index 4b004176..88a5d2a6 100644 --- a/datagear-management/src/main/java/org/datagear/management/service/impl/SchemaServiceImpl.java +++ b/datagear-management/src/main/java/org/datagear/management/service/impl/SchemaServiceImpl.java @@ -96,7 +96,6 @@ public class SchemaServiceImpl extends AbstractMybatisDataPermissionEntityServic public boolean update(User user, Schema entity) throws PermissionDeniedException { checkSaveUrlPermission(user, entity.getUrl()); - return super.update(user, entity); } diff --git a/datagear-management/src/main/java/org/datagear/management/service/impl/UserServiceImpl.java b/datagear-management/src/main/java/org/datagear/management/service/impl/UserServiceImpl.java index f5340aac..13f86cbb 100644 --- a/datagear-management/src/main/java/org/datagear/management/service/impl/UserServiceImpl.java +++ b/datagear-management/src/main/java/org/datagear/management/service/impl/UserServiceImpl.java @@ -21,6 +21,7 @@ import org.datagear.management.service.RoleService; import org.datagear.management.service.UserService; import org.datagear.management.util.dialect.MbSqlDialect; import org.datagear.util.IDUtil; +import org.datagear.util.StringUtil; import org.mybatis.spring.SqlSessionTemplate; /** @@ -99,6 +100,9 @@ public class UserServiceImpl extends AbstractMybatisEntityService String id = selectOneMybatis("getIdByName", params); + if (StringUtil.isEmpty(id)) + return null; + return getById(id); } @@ -106,7 +110,9 @@ public class UserServiceImpl extends AbstractMybatisEntityService public User getByIdNoPassword(String id) { User user = getById(id); - user.clearPassword(); + + if (user != null) + user.clearPassword(); return user; } @@ -185,6 +191,9 @@ public class UserServiceImpl extends AbstractMybatisEntityService protected void saveUserRoles(User user) { + if (user == null) + return; + deleteUserRoles(user.getId()); Set roles = user.getRoles(); @@ -215,6 +224,9 @@ public class UserServiceImpl extends AbstractMybatisEntityService { User user = super.getByIdFromDB(id, params); + if (user == null) + return null; + Map params1 = buildParamMap(); params1.put("userId", user.getId()); @@ -240,9 +252,9 @@ public class UserServiceImpl extends AbstractMybatisEntityService } @Override - protected User postProcessGet(User obj) + protected User postProcessGet(User entity) { - Set roles = obj.getRoles(); + Set roles = entity.getRoles(); if (roles != null && !roles.isEmpty()) { @@ -254,10 +266,10 @@ public class UserServiceImpl extends AbstractMybatisEntityService addIfNonNull(rolesNew, role); } - obj.setRoles(rolesNew); + entity.setRoles(rolesNew); } - return super.postProcessGet(obj); + return super.postProcessGet(entity); } @Override