aps-common/aps-common-core/pom.xml
@@ -119,7 +119,12 @@ <groupId>jakarta.servlet</groupId> <artifactId>jakarta.servlet-api</artifactId> </dependency> <!--hutool--> <dependency> <groupId>cn.hutool</groupId> <artifactId>hutool-all</artifactId> <version>5.8.16</version> </dependency> </dependencies> </project> aps-modules/aps-job/src/main/java/com/aps/job/service/impl/ApsWorkOrderJobServiceImpl.java
@@ -1,9 +1,9 @@ package com.aps.job.service.impl; import cn.hutool.core.util.IdUtil; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.aps.common.core.utils.DateUtils; import com.aps.common.core.utils.uuid.Sequence; import com.aps.job.domain.ApsWorkOrderJob; import com.aps.job.domain.ApsWorkOrderJobLog; import com.aps.job.mapper.ApsWorkOrderJobLogMapper; @@ -27,8 +27,6 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; import static com.aps.common.core.utils.uuid.IdUtils.getId; /** * 工单同步Service业务层处理 @@ -296,7 +294,7 @@ } ApsWorkOrderJob order = result.getObject(i, ApsWorkOrderJob.class); order.setId(getId()); order.setId(IdUtil.getSnowflakeNextId()); order.setOrderId(jsonObject.getString("ID")); order.setCreateTime(DateUtils.getNowDate()); order.setPageIndex(i); aps-modules/aps-job/src/main/java/com/aps/job/service/impl/ApsWorkOrderProcessServiceImpl.java
@@ -1,10 +1,10 @@ package com.aps.job.service.impl; import cn.hutool.core.util.IdUtil; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.aps.common.core.utils.DateUtils; import com.aps.common.core.utils.StringUtils; import com.aps.common.core.utils.uuid.Sequence; import com.aps.job.domain.ApsWorkOrderJob; import com.aps.job.domain.ApsWorkOrderJobLog; import com.aps.job.domain.ApsWorkOrderProcess; @@ -29,8 +29,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; import static com.aps.common.core.utils.uuid.IdUtils.getId; /** * 工单工序Service业务层处理 @@ -197,7 +195,7 @@ apsWorkOrderProcess.setUpdateTime(DateUtils.getNowDate()); updateList.add(apsWorkOrderProcess); } else { apsWorkOrderProcess.setId(getId()); apsWorkOrderProcess.setId(IdUtil.getSnowflakeNextId()); apsWorkOrderProcess.setCreateBy("task"); apsWorkOrderProcess.setCreateTime(DateUtils.getNowDate()); addList.add(apsWorkOrderProcess);