From 5268a2b7dfa556bd6f5a2d5e446cea3ea9940c10 Mon Sep 17 00:00:00 2001 From: kimi <kimi42345@gmail.com> Date: 星期三, 22 四月 2020 11:18:23 +0800 Subject: [PATCH] add 分发 master_author 添加字段 subscribe increment, 添加7个表 master_author_subscribe master_author_unactive sys_dispense_config sys_dispense_logs sys_view sys_view_join sys_view_logic --- src/main/java/com/highdatas/mdm/util/DbUtils.java | 119 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 118 insertions(+), 1 deletions(-) diff --git a/src/main/java/com/highdatas/mdm/util/DbUtils.java b/src/main/java/com/highdatas/mdm/util/DbUtils.java index d315e34..70a6a3b 100644 --- a/src/main/java/com/highdatas/mdm/util/DbUtils.java +++ b/src/main/java/com/highdatas/mdm/util/DbUtils.java @@ -2,10 +2,15 @@ import com.baomidou.mybatisplus.annotations.TableName; +import com.google.common.collect.Maps; import com.highdatas.mdm.entity.Character; import com.highdatas.mdm.entity.*; +import com.highdatas.mdm.mapper.MaintainDetailMapper; +import com.highdatas.mdm.mapper.TableInfoMapper; import com.highdatas.mdm.pojo.MasterAuthorType; import com.highdatas.mdm.pojo.Segment; +import com.highdatas.mdm.service.*; +import com.highdatas.mdm.util.pool.MqClient; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.apache.ibatis.mapping.BoundSql; @@ -18,6 +23,7 @@ import org.apache.ibatis.session.Configuration; import org.apache.ibatis.session.SqlSessionFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.cglib.beans.BeanMap; import org.springframework.stereotype.Component; import javax.servlet.http.HttpServletRequest; @@ -25,6 +31,7 @@ import java.lang.reflect.Method; import java.security.MessageDigest; import java.text.MessageFormat; +import java.text.SimpleDateFormat; import java.util.*; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -41,6 +48,78 @@ public class DbUtils { private static UserRoleClient userRoleClient; + public static MaintainDetailMapper maintainDetailMapper; + public static IMaintainService maintainService; + public static IMaintainDetailService maintainDetailService; + public static ISysFieldService fieldService; + public static IMaintainFieldService maintainFieldService; + public static TableInfoMapper tableInfoMapper; + public static ISysViewService viewService; + public static MasterDataService masterDataService; + public static IMasterAuthorService masterAuthorService; + public static ISysMenuService menuService; + public static MqClient mqClient; + + public static ISysDispenseLogsService dispenseLogsService; + + @Autowired + public void setISysDispenseLogsService(ISysDispenseLogsService dispenseLogsService){ + DbUtils.dispenseLogsService = dispenseLogsService; + } + + @Autowired + public void setMqClient(MqClient mqClient){ + DbUtils.mqClient = mqClient; + } + + @Autowired + public void setISysMenuService(ISysMenuService menuService){ + DbUtils.menuService = menuService; + } + @Autowired + public void setIMasterAuthorService(IMasterAuthorService masterAuthorService){ + DbUtils.masterAuthorService = masterAuthorService; + } + + @Autowired + public void setMasterDataService(MasterDataService masterDataService){ + DbUtils.masterDataService = masterDataService; + } + + @Autowired + public void setISysViewService(ISysViewService viewService){ + DbUtils.viewService = viewService; + } + + @Autowired + public void setTableInfoMapper(TableInfoMapper tableInfoMapper){ + DbUtils.tableInfoMapper = tableInfoMapper; + } + + @Autowired + public void setIMaintainFieldService(IMaintainFieldService maintainFieldService){ + DbUtils.maintainFieldService = maintainFieldService; + } + + @Autowired + public void setISysFieldService(ISysFieldService fieldService){ + DbUtils.fieldService = fieldService; + } + + @Autowired + public void setIMaintainDetailService(IMaintainDetailService maintainDetailService){ + DbUtils.maintainDetailService = maintainDetailService; + } + + @Autowired + public void setIMaintainService(IMaintainService maintainService){ + DbUtils.maintainService = maintainService; + } + @Autowired + public void setMaintainDetailMapper(MaintainDetailMapper maintainDetailMapper){ + DbUtils.maintainDetailMapper = maintainDetailMapper; + } + @Autowired public void setUserRoleClient(UserRoleClient userRoleClient){ @@ -90,6 +169,18 @@ bigVersion++; return MessageFormat.format("V{0}.{1}",bigVersion, 0); } + + public static <T> Map<String, Object> beanToMap(T bean) { + Map<String, Object> map = Maps.newHashMap(); + if (bean != null) { + BeanMap beanMap = BeanMap.create(bean); + for (Object key : beanMap.keySet()) { + map.put(key+"", beanMap.get(key)); + } + } + return map; + } + public static Integer getSubVersion(String baseVersion) { if (StringUtils.isEmpty(baseVersion)) { @@ -219,6 +310,14 @@ public static String StrJoin(String... objects){ ContentBuilder builder = new ContentBuilder(Constant.EMPTY); + for (String object : objects) { + builder.append(object); + } + return builder.toString(); + } + + public static String StrJoinLink(String link,String... objects){ + ContentBuilder builder = new ContentBuilder(link); for (String object : objects) { builder.append(object); } @@ -384,7 +483,7 @@ public static List<String> split(String redisVal) { if (StringUtils.isEmpty(redisVal)) { - return null; + return new ArrayList<>(); } String[] split = redisVal.split(Constant.SEMICOLON); List<String> strings = Arrays.asList(split); @@ -468,6 +567,19 @@ return collect; } + public static Set<TUser> getAllUser() { + List<TUser> tRoleListByUserId = userRoleClient.listUserRoleGroup(); + return new HashSet<TUser>(tRoleListByUserId); + } + + + public static Set<String> getUserByRole(String roleId) { + List<String> userListByRole = userRoleClient.getUserListByRole(roleId); + + HashSet<String> result = new HashSet<>(userListByRole); + return result; + } + public static Set<String> getGroupByUser(String userId) { List<TUserGroup> tRoleListByUserId = userRoleClient.getUserGroupByUserId(userId); if (tRoleListByUserId == null || tRoleListByUserId.isEmpty()){ @@ -535,4 +647,9 @@ return ibatisSql; } + public static String getNowDateStr() { + SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + String time = format.format(new Date()); + return time; + } } -- Gitblit v1.8.0