diff --git a/.claude/settings.local.json b/.claude/settings.local.json new file mode 100644 index 0000000..9a18865 --- /dev/null +++ b/.claude/settings.local.json @@ -0,0 +1,8 @@ +{ + "permissions": { + "allow": [ + "Bash(ls:*)", + "Bash(mvn --version)" + ] + } +} diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 0000000..25b312e --- /dev/null +++ b/.editorconfig @@ -0,0 +1,18 @@ +# http://editorconfig.org +root = true + +# 空格替代Tab缩进在各种编辑工具下效果一致 +[*] +indent_style = space +indent_size = 4 +charset = utf-8 +end_of_line = lf +trim_trailing_whitespace = true +insert_final_newline = true + +[*.{json,yml,yaml}] +indent_size = 2 + +[*.md] +insert_final_newline = false +trim_trailing_whitespace = false diff --git a/hw-wcs/src/main/java/org/dromara/wcs/service/impl/WcsSubtaskInstanceServiceImpl.java b/hw-wcs/src/main/java/org/dromara/wcs/service/impl/WcsSubtaskInstanceServiceImpl.java index 97f2d4e..d5a1930 100644 --- a/hw-wcs/src/main/java/org/dromara/wcs/service/impl/WcsSubtaskInstanceServiceImpl.java +++ b/hw-wcs/src/main/java/org/dromara/wcs/service/impl/WcsSubtaskInstanceServiceImpl.java @@ -1,24 +1,24 @@ package org.dromara.wcs.service.impl; -import org.dromara.common.core.utils.MapstructUtils; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.common.mybatis.core.page.PageQuery; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Service; +import org.dromara.common.core.utils.MapstructUtils; +import org.dromara.common.core.utils.StringUtils; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.wcs.domain.WcsSubtaskInstance; import org.dromara.wcs.domain.bo.WcsSubtaskInstanceBo; import org.dromara.wcs.domain.vo.WcsSubtaskInstanceVo; -import org.dromara.wcs.domain.WcsSubtaskInstance; import org.dromara.wcs.mapper.WcsSubtaskInstanceMapper; import org.dromara.wcs.service.IWcsSubtaskInstanceService; +import org.springframework.stereotype.Service; +import java.util.Collection; import java.util.List; import java.util.Map; -import java.util.Collection; /** * agv任务Service业务层处理 diff --git a/pom.xml b/pom.xml index d0e0f0c..555a523 100644 --- a/pom.xml +++ b/pom.xml @@ -357,6 +357,13 @@ ${revision} + + + org.dromara + hw-wcs + ${revision} + + @@ -497,4 +504,3 @@ - diff --git a/ruoyi-admin/pom.xml b/ruoyi-admin/pom.xml index 9e97804..f663a51 100644 --- a/ruoyi-admin/pom.xml +++ b/ruoyi-admin/pom.xml @@ -93,6 +93,12 @@ ruoyi-workflow + + + org.dromara + hw-wcs + + de.codecentric spring-boot-admin-starter-client