瀏覽代碼

修改变更记录创建接口

fengyanjie 4 年之前
父節點
當前提交
a33ac4c14b

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

@@ -29,11 +29,6 @@ public class DmpGatewayController {
     @Value("${persagy.dmp.server}")
     private String dmpServer;
 
-    @PostMapping("/report/**")
-    public void report(HttpServletRequest request, HttpServletResponse response, @RequestBody JsonNode param) {
-        dispatch(request, response, param);
-    }
-
     @PostMapping("/dic/**")
     public void dic(HttpServletRequest request, HttpServletResponse response, @RequestBody JsonNode param) {
         dispatch(request, response, param);

+ 8 - 1
dmp-rwd-edit/src/main/java/com/persagy/dmp/rwd/edit/entity/ChangeRecord.java

@@ -1,9 +1,14 @@
 package com.persagy.dmp.rwd.edit.entity;
 
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.persagy.dmp.rwd.edit.enumeration.EnumOperationType;
 import com.persagy.dmp.rwd.edit.model.ChangeRecordModel;
+import com.vladmihalcea.hibernate.type.json.JsonStringType;
 import lombok.Getter;
 import lombok.Setter;
+import org.hibernate.annotations.Type;
+import org.hibernate.annotations.TypeDef;
 
 import javax.persistence.*;
 import java.util.Date;
@@ -12,6 +17,7 @@ import java.util.Date;
 @Getter
 @Entity
 @Table(name = "rwd_change_record")
+@TypeDef(name = "json", typeClass = JsonStringType.class)
 public class ChangeRecord {
 
     @Id
@@ -19,7 +25,8 @@ public class ChangeRecord {
     private Integer id;
     private String code;
     private String infoCode;
-    private String value;
+    @Type(type = "json")
+    private ObjectNode value;
     private EnumOperationType operationType;//操作类型
     private String operationUser;//操作人
     private Date operationTime;//操作时间

+ 2 - 1
dmp-rwd-edit/src/main/java/com/persagy/dmp/rwd/edit/model/ChangeRecordModel.java

@@ -1,5 +1,6 @@
 package com.persagy.dmp.rwd.edit.model;
 
+import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.persagy.dmp.rwd.edit.enumeration.EnumOperationType;
 import lombok.Getter;
 import lombok.Setter;
@@ -13,7 +14,7 @@ public class ChangeRecordModel {
     private Integer id;
     private String code;
     private String infoCode;
-    private String value;
+    private ObjectNode value;
     private EnumOperationType operationType;//操作类型
     private String operationUser;//操作人
     private Date operationTime;//操作时间

+ 1 - 2
dmp-rwd-edit/src/main/java/com/persagy/dmp/rwd/edit/service/ChangeRecordService.java

@@ -20,7 +20,6 @@ import java.util.Arrays;
 import java.util.Date;
 import java.util.LinkedList;
 import java.util.List;
-import java.util.stream.Collectors;
 
 @Slf4j
 @Service
@@ -38,7 +37,6 @@ public class ChangeRecordService {
         list.addAll(CriteriaUtils.parse(qt.id, object.get("id")));
         list.addAll(CriteriaUtils.parse(qt.code, object.get("code")));
         list.addAll(CriteriaUtils.parse(qt.infoCode, object.get("infoCode")));
-        list.addAll(CriteriaUtils.parse(qt.value, object.get("value")));
         list.addAll(CriteriaUtils.parse(qt.operationType, object.get("operationType"), OperationType.class));
         list.addAll(CriteriaUtils.parse(qt.operationUser, object.get("operationUser")));
         list.addAll(CriteriaUtils.parse(qt.operationTime, object.get("operationTime")));
@@ -64,6 +62,7 @@ public class ChangeRecordService {
         param.setOperationTime(new Date());
         param.setValid(true);
         param.setState(1);
+        repository.save(param);
         response.add("id", param.getId());
         return response;
     }