home 2 лет назад
Родитель
Сommit
d26f105708

+ 1 - 2
hx-common/client-util/src/main/java/com/fjhx/ClientUtils/FileClientUtil.java → hx-common/client-util/src/main/java/com/fjhx/utils/FileClientUtil.java

@@ -1,10 +1,9 @@
-package com.fjhx.ClientUtils;
+package com.fjhx.utils;
 
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.extra.spring.SpringUtil;
 import com.fjhx.feign.IFileClient;
 import com.fjhx.params.FileInfoParam;
-import com.fjhx.utils.Assert;
 import org.springblade.core.tool.api.R;
 
 import java.util.List;

+ 1 - 1
hx-common/client-util/src/main/java/com/fjhx/ClientUtils/UserClientUtil.java → hx-common/client-util/src/main/java/com/fjhx/utils/UserClientUtil.java

@@ -1,4 +1,4 @@
-package com.fjhx.ClientUtils;
+package com.fjhx.utils;
 
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.api.ResultCode;

+ 0 - 1
hx-common/hx-tool/src/main/java/com/fjhx/constants/StatusConstant.java

@@ -23,5 +23,4 @@ public interface StatusConstant {
     Integer NOT_DELETED = 0;
     Integer DELETED = 1;
 
-
 }

+ 1 - 0
hx-common/hx-tool/src/main/java/com/fjhx/utils/Assert.java

@@ -40,4 +40,5 @@ public class Assert {
             throw new ServiceException(errStr);
         }
     }
+
 }

+ 0 - 2
hx-common/hx-tool/src/main/java/com/fjhx/utils/TreeUtil.java

@@ -122,7 +122,6 @@ public class TreeUtil {
         return map;
     }
 
-
     public static List<Map<String, Object>> buildTreeObj(List<?> list) {
         return buildTreeObj(ID_NAME, PARENT_ID_NAME, list);
     }
@@ -194,7 +193,6 @@ public class TreeUtil {
         if (childrenList.size() > 0) {
             map.put(CHILDREN_NAME, childrenList);
         }
-
     }
 
 }

+ 2 - 2
hx-service/iot-management/src/main/java/com/fjhx/serve/bom/service/impl/BomServiceImpl.java

@@ -3,8 +3,8 @@ package com.fjhx.serve.bom.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.fjhx.ClientUtils.FileClientUtil;
-import com.fjhx.ClientUtils.UserClientUtil;
+import com.fjhx.utils.FileClientUtil;
+import com.fjhx.utils.UserClientUtil;
 import com.fjhx.constants.StatusConstant;
 import com.fjhx.entity.bom.Bom;
 import com.fjhx.enums.bom.BomTypeEnum;

+ 1 - 1
hx-service/iot-management/src/main/java/com/fjhx/serve/workshop/service/impl/WorkshopServiceImpl.java

@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.fjhx.ClientUtils.UserClientUtil;
+import com.fjhx.utils.UserClientUtil;
 import com.fjhx.base.BaseEntity;
 import com.fjhx.entity.workshop.Workshop;
 import com.fjhx.params.workshop.WorkshopEx;