Browse Source

变更记录添加版本字段

fengyanjie 4 years ago
parent
commit
9145bc8bae

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

@@ -28,8 +28,8 @@ public class RwdeditVersionController {
     }
 
     @PostMapping("/infoAddVersion")
-    public MapResponse infoAddVersion(@RequestBody List<Integer> infoIdList, @RequestParam String versionId, @RequestParam Integer type) {
-        return service.infoAddVersion(infoIdList, versionId, type);
+    public MapResponse infoAddVersion(@RequestBody List<Integer> infoIdList, @RequestParam String version) {
+        return service.infoAddVersion(infoIdList, version);
     }
 
 }

+ 1 - 29
dmp-rwd-edit/src/main/java/com/persagy/dmp/rwd/edit/entity/ClassDefChangeRecord.java

@@ -1,7 +1,6 @@
 package com.persagy.dmp.rwd.edit.entity;
 
 import com.persagy.dmp.rwd.edit.enumeration.EnumOperationType;
-import com.persagy.dmp.rwd.edit.model.ClassDefChangeRecordModel;
 import com.persagy.dmp.rwd.enums.ObjType;
 import com.vladmihalcea.hibernate.type.json.JsonStringType;
 import lombok.Getter;
@@ -49,32 +48,5 @@ public class ClassDefChangeRecord {
     private Date finishTime;//完成时间
     private Boolean valid;//true 正常 false 失效
     private Integer state;//状态 0.取消 1.初始化 2.确认 3.发布 4.完成
-
-    public ClassDefChangeRecordModel toModel() {
-        ClassDefChangeRecordModel model = new ClassDefChangeRecordModel();
-        model.setId(this.id);
-        model.setCode(this.code);
-        model.setGroupCode(this.groupCode);
-        model.setObjType(this.objType);
-        model.setName(this.name);
-        model.setAliasCode(this.aliasCode);
-        model.setAliasName(this.aliasName);
-        model.setType(this.type);
-        model.setProjectId(this.projectId);
-        model.setMajorCode(this.majorCode);
-        model.setSystemCode(this.systemCode);
-        model.setEquipmentCode(this.equipmentCode);
-        model.setParentCode(this.parentCode);
-        model.setOperationType(this.operationType);
-        model.setOperationUser(this.operationUser);
-        model.setOperationTime(this.operationTime);
-        model.setConfirmUser(this.confirmUser);
-        model.setConfirmTime(this.confirmTime);
-        model.setPublishUser(this.publishUser);
-        model.setPublishTime(this.publishTime);
-        model.setFinishTime(this.finishTime);
-        model.setValid(this.valid);
-        model.setState(this.state);
-        return model;
-    }
+    private String version;//版本
 }

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

@@ -67,4 +67,5 @@ public class FuncidDefChangeRecord {
     private Date finishTime;//完成时间
     private Boolean valid;//true 正常 false 失效
     private Integer state;//状态 0.取消 1.初始化 2.确认 3.发布 4.完成
+    private String version;//版本
 }

+ 0 - 27
dmp-rwd-edit/src/main/java/com/persagy/dmp/rwd/edit/entity/RwdeditVersionChangeRecord.java

@@ -1,27 +0,0 @@
-package com.persagy.dmp.rwd.edit.entity;
-
-import lombok.Getter;
-import lombok.Setter;
-
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.IdClass;
-import javax.persistence.Table;
-
-/**
- * @author fengyanjie
- */
-@Setter
-@Getter
-@Entity
-@Table(name = "rwdedit_version_change_record")
-@IdClass(VersionPK.class)
-public class RwdeditVersionChangeRecord {
-
-    @Id
-    private String versionId;
-    @Id
-    private Integer changeId;
-    @Id
-    private Integer type;
-}

+ 0 - 55
dmp-rwd-edit/src/main/java/com/persagy/dmp/rwd/edit/entity/VersionPK.java

@@ -1,55 +0,0 @@
-package com.persagy.dmp.rwd.edit.entity;
-
-import javax.persistence.Column;
-import javax.persistence.Embeddable;
-import java.io.Serializable;
-import java.util.Objects;
-
-/**
- * @author: yaoll
- * @date: 2020-11-01
- * @verison: 1.0
- */
-@Embeddable
-public class VersionPK implements Serializable {
-
-    @Column
-    private String versionId;
-    @Column
-    private Integer changeId;
-    @Column
-    private Integer type;
-
-    public VersionPK() {
-    }
-
-    public VersionPK(String versionId, Integer changeId, Integer type) {
-        this.versionId = versionId;
-        this.changeId = changeId;
-        this.type = type;
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        VersionPK versionPK = (VersionPK) o;
-        return versionId.equals(versionPK.versionId) &&
-                changeId.equals(versionPK.changeId) &&
-                type.equals(versionPK.type);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(versionId, changeId, type);
-    }
-
-    @Override
-    public String toString() {
-        return "GroupPK{versionId=" + versionId + ", changeId=" + changeId + ",type=" + type + "}";
-    }
-}

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

@@ -1,9 +0,0 @@
-package com.persagy.dmp.rwd.edit.repository;
-
-import com.persagy.dmp.rwd.edit.entity.RwdeditVersionChangeRecord;
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.querydsl.QuerydslPredicateExecutor;
-
-public interface RwdeditVersionChangeRecordRepository extends JpaRepository<RwdeditVersionChangeRecord, Integer>, QuerydslPredicateExecutor<RwdeditVersionChangeRecord> {
-}
-

+ 1 - 15
dmp-rwd-edit/src/main/java/com/persagy/dmp/rwd/edit/service/ClassDefChangeRecordService.java

@@ -11,11 +11,8 @@ import com.persagy.common.web.PagedResponse;
 import com.persagy.dmp.rwd.edit.config.web.UserUtils;
 import com.persagy.dmp.rwd.edit.entity.ClassDefChangeRecord;
 import com.persagy.dmp.rwd.edit.entity.QClassDefChangeRecord;
-import com.persagy.dmp.rwd.edit.entity.QRwdeditVersionChangeRecord;
-import com.persagy.dmp.rwd.edit.entity.RwdeditVersionChangeRecord;
 import com.persagy.dmp.rwd.edit.enumeration.EnumOperationType;
 import com.persagy.dmp.rwd.edit.repository.ClassDefChangeRecordRepository;
-import com.persagy.dmp.rwd.edit.repository.RwdeditVersionChangeRecordRepository;
 import com.persagy.dmp.rwd.model.ClassDefModel;
 import com.querydsl.core.types.dsl.BooleanExpression;
 import lombok.extern.slf4j.Slf4j;
@@ -26,13 +23,10 @@ import javax.servlet.http.HttpServletResponse;
 import javax.transaction.Transactional;
 import java.io.*;
 import java.util.*;
-import java.util.stream.Collectors;
 
 @Slf4j
 @Service
 public class ClassDefChangeRecordService {
-    @Autowired
-    RwdeditVersionChangeRecordRepository versionChangeRecordRepository;
 
     @Autowired
     ClassDefChangeRecordRepository repository;
@@ -57,19 +51,11 @@ public class ClassDefChangeRecordService {
         list.addAll(CriteriaUtils.parse(qt.publishTime, object.get("publishTime")));
         list.addAll(CriteriaUtils.parse(qt.finishTime, object.get("finishTime")));
         list.addAll(CriteriaUtils.parse(qt.state, object.get("state")));
+        list.addAll(CriteriaUtils.parse(qt.version, object.get("version")));
         return list;
     }
 
     public PagedResponse<ClassDefChangeRecord> query(JacksonCriteria criteria) {
-        String versionId = criteria.getString("versionId");
-        if (versionId != null) {
-            QRwdeditVersionChangeRecord qt = QRwdeditVersionChangeRecord.rwdeditVersionChangeRecord;
-            Iterable<RwdeditVersionChangeRecord> all = versionChangeRecordRepository.findAll(qt.versionId.eq(versionId).and(qt.type.eq(1)));
-            List<RwdeditVersionChangeRecord> list = new ArrayList<>();
-            all.forEach(list::add);
-            List<Integer> changeIdList = list.stream().map(RwdeditVersionChangeRecord::getChangeId).collect(Collectors.toList());
-            criteria.add("id").in(changeIdList);
-        }
         return criteriaUtils.query(QClassDefChangeRecord.classDefChangeRecord, this::parse, criteria);
     }
 

+ 10 - 16
dmp-rwd-edit/src/main/java/com/persagy/dmp/rwd/edit/service/RwdeditVersionService.java

@@ -8,15 +8,12 @@ import com.persagy.common.web.PagedResponse;
 import com.persagy.dmp.rwd.edit.config.web.UserUtils;
 import com.persagy.dmp.rwd.edit.entity.QRwdeditVersion;
 import com.persagy.dmp.rwd.edit.entity.RwdeditVersion;
-import com.persagy.dmp.rwd.edit.entity.RwdeditVersionChangeRecord;
-import com.persagy.dmp.rwd.edit.repository.RwdeditVersionChangeRecordRepository;
 import com.persagy.dmp.rwd.edit.repository.RwdeditVersionRepository;
 import com.querydsl.core.types.dsl.BooleanExpression;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.transaction.Transactional;
-import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
@@ -29,9 +26,6 @@ public class RwdeditVersionService {
     @Autowired
     private RwdeditVersionRepository repository;
 
-    @Autowired
-    private RwdeditVersionChangeRecordRepository changeRecordRepository;
-
     private List<BooleanExpression> parse(ObjectNode criteria) {
         // TODO
         return null;
@@ -66,17 +60,17 @@ public class RwdeditVersionService {
     }
 
     @Transactional
-    public MapResponse infoAddVersion(List<Integer> infoIdList, String versionId, Integer type) {
+    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);
+//        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;
     }
 }

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

@@ -18,7 +18,7 @@
         "publishTime":1611295200000,//发布时间
         "finishTime":1611295200000,//完成时间
         "state":0,//状态 0.取消 1.初始化 2.确认 3.发布 4.完成
-        "versionId":"3.1.3"//版本编号
+        "version":"3.1.3"//版本编号
     },
     "page":1,
     "size":10
@@ -127,7 +127,7 @@
         "publishTime":1611295200000,//发布时间
         "finishTime":1611295200000,//完成时间
         "state":0,//状态 0.取消 1.初始化 2.确认 3.发布 4.完成
-        "versionId":"3.1.3"//版本编号
+        "version":"3.1.3"//版本编号
     },
     "page":1,
     "size":10
@@ -278,11 +278,11 @@
 ### 变更记录批量加入版本号
 
 
-地址:POST /rwdedit/version/infoAddVersion?versionId=1.2&type=1
+地址:POST /rwdedit/version/infoAddVersion?version=1.2
 
 路径参数说明
 ```
-   versionId:版本编号id
+   version:版本编号id
    type:1.类型,2.信息点 
 ```