Browse Source

添加修改版本状态接口

fengyanjie 4 years ago
parent
commit
21bbfb7836

+ 1 - 0
dmp-rwd-edit/src/main/java/com/persagy/dmp/rwd/edit/entity/RwdeditVersion.java

@@ -21,5 +21,6 @@ public class RwdeditVersion {
     @Column(name = "create_time", insertable = false, updatable = false)
     @Column(name = "create_time", insertable = false, updatable = false)
     private Date createTime;
     private Date createTime;
     private String createUser;
     private String createUser;
+    private Integer state;
 
 
 }
 }

+ 4 - 0
dmp-rwd-edit/src/main/java/com/persagy/dmp/rwd/edit/repository/ClassDefChangeRecordRepository.java

@@ -14,5 +14,9 @@ public interface ClassDefChangeRecordRepository extends JpaRepository<ClassDefCh
     @Query(nativeQuery = true, value = "update rwd_def_class_change_record set version = ?1 where version is null and id in (?2)")
     @Query(nativeQuery = true, value = "update rwd_def_class_change_record set version = ?1 where version is null and id in (?2)")
     Integer addVersion(String version, List<Integer> idList);
     Integer addVersion(String version, List<Integer> idList);
 
 
+    @Modifying
+    @Query(nativeQuery = true, value = "update rwd_def_class_change_record set state = ?2 where version = ?1")
+    Integer batchUpdateStateByVersion(String version, Integer state);
+
 }
 }
 
 

+ 4 - 0
dmp-rwd-edit/src/main/java/com/persagy/dmp/rwd/edit/repository/FuncidDefChangeRecordRepository.java

@@ -13,5 +13,9 @@ public interface FuncidDefChangeRecordRepository extends JpaRepository<FuncidDef
     @Modifying
     @Modifying
     @Query(nativeQuery = true, value = "update rwd_def_funcid_change_record set version = ?1 where version is null and id in (?2)")
     @Query(nativeQuery = true, value = "update rwd_def_funcid_change_record set version = ?1 where version is null and id in (?2)")
     Integer addVersion(String version, List<Integer> idList);
     Integer addVersion(String version, List<Integer> idList);
+
+    @Modifying
+    @Query(nativeQuery = true, value = "update rwd_def_class_change_record set state = ?2 where version = ?1")
+    Integer batchUpdateStateByVersion(String version, Integer state);
 }
 }
 
 

+ 1 - 1
dmp-rwd-edit/src/main/java/com/persagy/dmp/rwd/edit/repository/RwdeditVersionRepository.java

@@ -4,6 +4,6 @@ import com.persagy.dmp.rwd.edit.entity.RwdeditVersion;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.querydsl.QuerydslPredicateExecutor;
 import org.springframework.data.querydsl.QuerydslPredicateExecutor;
 
 
-public interface RwdeditVersionRepository extends JpaRepository<RwdeditVersion, Integer>, QuerydslPredicateExecutor<RwdeditVersion> {
+public interface RwdeditVersionRepository extends JpaRepository<RwdeditVersion, String>, QuerydslPredicateExecutor<RwdeditVersion> {
 }
 }
 
 

+ 8 - 0
dmp-rwd-edit/src/main/java/com/persagy/dmp/rwd/edit/service/ClassDefChangeRecordService.java

@@ -159,6 +159,14 @@ public class ClassDefChangeRecordService {
     }
     }
 
 
     @Transactional
     @Transactional
+    public MapResponse batchUpdateState(String version, Integer state) {
+        MapResponse response = new MapResponse();
+        Integer num = repository.batchUpdateStateByVersion(version, state);
+        response.setMessage("update num: " + num);
+        return response;
+    }
+
+    @Transactional
     public MapResponse delete(List<Integer> param) {
     public MapResponse delete(List<Integer> param) {
         MapResponse response = new MapResponse();
         MapResponse response = new MapResponse();
         List<ClassDefChangeRecord> list = repository.findAllById(param);
         List<ClassDefChangeRecord> list = repository.findAllById(param);

+ 9 - 5
dmp-rwd-edit/src/main/java/com/persagy/dmp/rwd/edit/service/FuncidDefChangeRecordService.java

@@ -3,7 +3,6 @@ package com.persagy.dmp.rwd.edit.service;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.persagy.common.criteria.CriteriaUtils;
 import com.persagy.common.criteria.CriteriaUtils;
 import com.persagy.common.criteria.JacksonCriteria;
 import com.persagy.common.criteria.JacksonCriteria;
-import com.persagy.common.date.DateUtils;
 import com.persagy.common.web.MapResponse;
 import com.persagy.common.web.MapResponse;
 import com.persagy.common.web.PagedResponse;
 import com.persagy.common.web.PagedResponse;
 import com.persagy.dmp.rwd.edit.config.web.UserUtils;
 import com.persagy.dmp.rwd.edit.config.web.UserUtils;
@@ -17,10 +16,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 
 
-import javax.servlet.http.HttpServletResponse;
 import javax.transaction.Transactional;
 import javax.transaction.Transactional;
-import java.io.*;
-import java.net.URLEncoder;
 import java.util.*;
 import java.util.*;
 
 
 @Slf4j
 @Slf4j
@@ -183,7 +179,15 @@ public class FuncidDefChangeRecordService {
     public MapResponse addVersion(String version, List<Integer> idList) {
     public MapResponse addVersion(String version, List<Integer> idList) {
         MapResponse response = new MapResponse();
         MapResponse response = new MapResponse();
         Integer num = repository.addVersion(version, idList);
         Integer num = repository.addVersion(version, idList);
-        response.setMessage("update num+" + num);
+        response.setMessage("update num: " + num);
+        return response;
+    }
+
+    @Transactional
+    public MapResponse batchUpdateState(String version, Integer state) {
+        MapResponse response = new MapResponse();
+        Integer num = repository.batchUpdateStateByVersion(version, state);
+        response.setMessage("update num: " + num);
         return response;
         return response;
     }
     }
 
 

+ 27 - 0
dmp-rwd-edit/src/main/java/com/persagy/dmp/rwd/edit/service/RwdeditVersionService.java

@@ -21,6 +21,7 @@ import java.net.URLEncoder;
 import java.util.ArrayList;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.Date;
 import java.util.List;
 import java.util.List;
+import java.util.Optional;
 
 
 @Service
 @Service
 public class RwdeditVersionService {
 public class RwdeditVersionService {
@@ -71,6 +72,32 @@ public class RwdeditVersionService {
     }
     }
 
 
     @Transactional
     @Transactional
+    public MapResponse update(RwdeditVersion param) {
+        MapResponse response = new MapResponse();
+        String version = param.getVersion();
+        Integer state = param.getState();
+        if (version == null) {
+            response.setFail("version is required");
+            return response;
+        }
+        if (state == null) {
+            response.setFail("state is required");
+            return response;
+        }
+        Optional<RwdeditVersion> data = repository.findById(version);
+        if (data.isPresent()) {
+            response.setFail("version not exists");
+            return response;
+        }
+        classDefChangeRecordService.batchUpdateState(version, state);
+        funcidDefChangeRecordService.batchUpdateState(version, state);
+        RwdeditVersion rwdeditVersion = data.get();
+        rwdeditVersion.setState(state);
+        repository.save(rwdeditVersion);
+        return response;
+    }
+
+    @Transactional
     public void download(HttpServletResponse resp, String version) {
     public void download(HttpServletResponse resp, String version) {
         String fileName = DateUtils.format(new Date()) + ".sql";
         String fileName = DateUtils.format(new Date()) + ".sql";
         List<String> sqlList = new ArrayList<>();
         List<String> sqlList = new ArrayList<>();