diff --git a/pom.xml b/pom.xml index 9c93b1fd..c38fb1c3 100644 --- a/pom.xml +++ b/pom.xml @@ -34,6 +34,7 @@ 3.14.0 1.2.83 4.4.0 + 5.5.1 @@ -83,6 +84,11 @@ commons-lang3 ${lang3.version} + + net.sf.dozer + dozer + ${dozer.version} + diff --git a/survey-core/pom.xml b/survey-core/pom.xml index 76d3b3d3..7cee87af 100644 --- a/survey-core/pom.xml +++ b/survey-core/pom.xml @@ -36,7 +36,6 @@ net.sf.dozer dozer - 5.5.1 org.springframework.boot diff --git a/survey-core/src/main/java/com/xiaojusurvey/engine/core/workspace/impl/WorkspaceServiceImpl.java b/survey-core/src/main/java/com/xiaojusurvey/engine/core/workspace/impl/WorkspaceServiceImpl.java index 447cefd2..3f041b2c 100644 --- a/survey-core/src/main/java/com/xiaojusurvey/engine/core/workspace/impl/WorkspaceServiceImpl.java +++ b/survey-core/src/main/java/com/xiaojusurvey/engine/core/workspace/impl/WorkspaceServiceImpl.java @@ -53,6 +53,9 @@ public class WorkspaceServiceImpl implements WorkspaceService { @Autowired private WorkspaceMemberService memberService; + @Autowired + private MongoEntityInterceptor mongoEntityInterceptor; + /** * 创建空间 * @param request @@ -180,7 +183,7 @@ public void update(HttpServletRequest request, WorkspaceParam workspaceParam, St public void delete(HttpServletRequest request, String workspaceId) { Workspace workspace = mongoRepository.findOne(new Query().addCriteria(Criteria.where("_id").is(workspaceId)), Workspace.class); // 更新空间状态 - InitBaseEntity initBaseEntity = MongoEntityInterceptor.updateDocument(workspace.getStatusList()); + InitBaseEntity initBaseEntity = mongoEntityInterceptor.updateDocument(workspace.getStatusList()); mongoRepository.updateMulti(new Query().addCriteria(Criteria.where("_id").is(workspaceId)), new Update().set("curStatus", initBaseEntity.getCurStatus()) .set("statusList", initBaseEntity.getStatusList()), Workspace.class); diff --git a/survey-dal/src/main/java/com/xiaojusurvey/engine/repository/interceptor/MongoEntityInterceptor.java b/survey-dal/src/main/java/com/xiaojusurvey/engine/repository/interceptor/MongoEntityInterceptor.java index 227085f6..8c4ec19b 100644 --- a/survey-dal/src/main/java/com/xiaojusurvey/engine/repository/interceptor/MongoEntityInterceptor.java +++ b/survey-dal/src/main/java/com/xiaojusurvey/engine/repository/interceptor/MongoEntityInterceptor.java @@ -41,7 +41,7 @@ public void onBeforeConvert(BeforeConvertEvent event) { * @param statusList * @return */ - public static InitBaseEntity updateDocument(List statusList) { + public InitBaseEntity updateDocument(List statusList) { long time = System.currentTimeMillis(); Status status = new Status().setStatus(RecordStatusEnum.REMOVED.getStatusType()).setDate(time); statusList.add(status);