Explorar o código

变更记录添加版本字段

fengyanjie %!s(int64=4) %!d(string=hai) anos
pai
achega
d0bde9d664

+ 6 - 4
dmp-rwd-edit/src/main/java/com/persagy/dmp/rwd/edit/controller/ClassDefChangeRecordController.java

@@ -6,10 +6,7 @@ import com.persagy.common.web.PagedResponse;
 import com.persagy.dmp.rwd.edit.entity.ClassDefChangeRecord;
 import com.persagy.dmp.rwd.edit.service.ClassDefChangeRecordService;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;
 import java.util.List;
@@ -46,4 +43,9 @@ public class ClassDefChangeRecordController {
         service.download(response, idList);
     }
 
+    @PostMapping("/addVersion")
+    public MapResponse addVersion(@RequestParam String version, @RequestBody List<Integer> idList) {
+        return service.addVersion(version, idList);
+    }
+
 }

+ 5 - 4
dmp-rwd-edit/src/main/java/com/persagy/dmp/rwd/edit/controller/FuncidDefChangeRecordController.java

@@ -6,10 +6,7 @@ import com.persagy.common.web.PagedResponse;
 import com.persagy.dmp.rwd.edit.entity.FuncidDefChangeRecord;
 import com.persagy.dmp.rwd.edit.service.FuncidDefChangeRecordService;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;
 import java.util.List;
@@ -46,4 +43,8 @@ public class FuncidDefChangeRecordController {
         service.download(response, idList);
     }
 
+    @PostMapping("/addVersion")
+    public MapResponse addVersion(@RequestParam String version, @RequestBody List<Integer> idList) {
+        return service.addVersion(version, idList);
+    }
 }

+ 0 - 5
dmp-rwd-edit/src/main/java/com/persagy/dmp/rwd/edit/controller/RwdeditVersionController.java

@@ -27,9 +27,4 @@ public class RwdeditVersionController {
         return service.create(param);
     }
 
-    @PostMapping("/infoAddVersion")
-    public MapResponse infoAddVersion(@RequestBody List<Integer> infoIdList, @RequestParam String version) {
-        return service.infoAddVersion(infoIdList, version);
-    }
-
 }

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

@@ -2,8 +2,17 @@ package com.persagy.dmp.rwd.edit.repository;
 
 import com.persagy.dmp.rwd.edit.entity.ClassDefChangeRecord;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Modifying;
+import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.querydsl.QuerydslPredicateExecutor;
 
+import java.util.List;
+
 public interface ClassDefChangeRecordRepository extends JpaRepository<ClassDefChangeRecord, Integer>, QuerydslPredicateExecutor<ClassDefChangeRecord> {
+
+    @Modifying
+    @Query(nativeQuery = true, value = "update rwd_def_class_change_record set version = ?1 where id in (?2)")
+    Integer addVersion(String version, List<Integer> idList);
+
 }
 

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

@@ -2,8 +2,16 @@ package com.persagy.dmp.rwd.edit.repository;
 
 import com.persagy.dmp.rwd.edit.entity.FuncidDefChangeRecord;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Modifying;
+import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.querydsl.QuerydslPredicateExecutor;
 
+import java.util.List;
+
 public interface FuncidDefChangeRecordRepository extends JpaRepository<FuncidDefChangeRecord, Integer>, QuerydslPredicateExecutor<FuncidDefChangeRecord> {
+
+    @Modifying
+    @Query(nativeQuery = true, value = "update rwd_def_funcid_change_record set version = ?1 where id in (?2)")
+    Integer addVersion(String version, List<Integer> idList);
 }
 

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

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

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

@@ -180,6 +180,14 @@ public class FuncidDefChangeRecordService {
     }
 
     @Transactional
+    public MapResponse addVersion(String version, List<Integer> idList) {
+        MapResponse response = new MapResponse();
+        Integer num = repository.addVersion(version, idList);
+        response.setMessage("update num+" + num);
+        return response;
+    }
+
+    @Transactional
     public MapResponse delete(List<Integer> param) {
         MapResponse response = new MapResponse();
         List<FuncidDefChangeRecord> list = repository.findAllById(param);

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

@@ -58,20 +58,5 @@ public class RwdeditVersionService {
         response.add("id", entity.getVersion());
         return response;
     }
-
-    @Transactional
-    public MapResponse infoAddVersion(List<Integer> infoIdList, String version) {
-        MapResponse response = new MapResponse();
-//        List<RwdeditVersionChangeRecord> data = new ArrayList<>();
-//        for (Integer infoId : infoIdList) {
-//            RwdeditVersionChangeRecord entity = new RwdeditVersionChangeRecord();
-//            entity.setVersionId(versionId);
-//            entity.setChangeId(infoId);
-//            entity.setType(type);
-//            data.add(entity);
-//        }
-//        changeRecordRepository.saveAll(data);
-        return response;
-    }
 }
 

+ 25 - 5
dmp-rwd-edit/数据字典编辑工具接口文档.md

@@ -253,16 +253,16 @@
     "count": 1
 }
 ```
-### 新增版本号
+### 类型-新增版本号
 
 
-地址:POST /rwdedit/version/create
+地址:POST /rwdedit/classDef/changeRecord/addVersion?version=3.1.1
 
 参数
 
 ```json
 {
-    "version":"3.1.1",//版本编号
+    "version":"3.1.1"//版本编号
 }
 ```
 
@@ -270,8 +270,28 @@
 
 ```json
 {
-    "result": "success",
-    "id":1
+    "result": "success"
+}
+```
+
+### 信息点-新增版本号
+
+
+地址:POST /rwdedit/funcidDef/changeRecord/addVersion?version=3.1.1
+
+参数
+
+```json
+{
+    "version":"3.1.1"//版本编号
+}
+```
+
+返回结果
+
+```json
+{
+    "result": "success"
 }
 ```