调整IdHelper位置,解决冲突

soc-modules/soc-modules-system/src/main/java/com/xunmei/resumption/service/impl/AppRuleItemServiceImpl.java

@@ -19,7 +19,6 @@ import com.xunmei.resumption.dto.appRulePoint.AppRulePointDto;
 import com.xunmei.resumption.service.IAppRuleItemService;
 import com.xunmei.resumption.service.IAppRulePointService;
 import com.xunmei.resumption.vo.appRuleItem.AppRuleItemPageVo;
-import com.xunmei.util.IDHelper;
 import io.netty.util.internal.StringUtil;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
@@ -115,7 +114,7 @@ public class AppRuleItemServiceImpl extends ServiceImpl<AppRuleItemMapper, AppRu
             point.setRuleTypeId(item.getRuleTypeId());
             if (point.getId() == null) {
                 //新增
-                point.setId(IDHelper.id());
+                point.setId(com.xunmei.system.util.IDHelper.id());
                 appRulePointService.save(point);
             } else {
                 //修改
@@ -125,7 +124,7 @@ public class AppRuleItemServiceImpl extends ServiceImpl<AppRuleItemMapper, AppRu
                 } else {
                     //将之前的记录逻辑删除,然后新增一条记录关联到检查项
                     appRulePointMapper.updateDeleted(point.getId(), 1);
-                    Long newId = IDHelper.id();
+                    Long newId = com.xunmei.system.util.IDHelper.id();
                     appRulePointMapper.updatePlanItem(point.getId(), newId);
                     point.setId(newId);
                     appRulePointMapper.insert(point);

soc-modules/soc-modules-system/src/main/java/com/xunmei/resumption/service/impl/AppRuleServiceImpl.java

@@ -15,12 +15,11 @@ import com.xunmei.resumption.vo.appRule.AppRuleGroupVo;
 import com.xunmei.resumption.vo.appRule.AppRuleInfoVo;
 import com.xunmei.resumption.vo.appRule.AppRulePageVo;
 import com.xunmei.system.api.model.LoginUser;
-import com.xunmei.util.IDHelper;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-
+import com.xunmei.system.util.IDHelper;
 import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.HashMap;

soc-modules/soc-modules-system/src/main/java/com/xunmei/util/IDHelper.java → soc-modules/soc-modules-system/src/main/java/com/xunmei/system/util/IDHelper.java

@@ -1,12 +1,13 @@
 package com.xunmei.system.util;
 
 import cn.hutool.core.date.DateUtil;
+import com.xunmei.util.DateHelper;
 import org.apache.commons.codec.digest.DigestUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.env.Environment;
 import org.springframework.stereotype.Component;
-
+import com.xunmei.system.util.SnowflaskGenerator;
 import javax.annotation.PostConstruct;
 import java.io.Serializable;
 import java.util.Date;
@@ -44,7 +45,7 @@ public class IDHelper {
         snowflaskGenerator = new SnowflaskGenerator(0L, 0L);
     }
 
-    private static SnowflaskGenerator snowflaskGenerator = null;
+    private static  SnowflaskGenerator snowflaskGenerator = null;
 
     public static Long id() {
         return snowflaskGenerator.nextId();

soc-modules/soc-modules-system/src/main/java/com/xunmei/util/Ymd.java → soc-modules/soc-modules-system/src/main/java/com/xunmei/system/util/Ymd.java

@@ -1,5 +1,6 @@
 package com.xunmei.system.util;
 
+import com.xunmei.util.DateHelper;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.*;