Parcourir la source

实现知识库管理-更改知识库信息查询接口,修复查询数据重复的bug

lijie il y a 3 ans
Parent
commit
31ed7836b5

+ 1 - 0
dmp-model/src/main/java/com/persagy/dmp/rwd/model/RwdeditRefTypeInfosModel.java

@@ -18,6 +18,7 @@ public class RwdeditRefTypeInfosModel {
     private String codePath;
     private ObjectNode dataSource;
     private Integer createUser;
+    private Integer seq;
     private Date createTime;
     private Integer updateUser;
     private Date updateTime;

+ 6 - 2
dmp-rwd-datautils/src/test/java/com/persagy/dmp/rwd/dic/ImportKnowledgeForEdit.java

@@ -2533,6 +2533,9 @@ public class ImportKnowledgeForEdit {
 
     private void writeFuncSqlToFile(List<RwdeditRefTypeInfosModel> classes,String refKey) throws IOException {
         FileWriter writer = new FileWriter(outPath,true);
+        for (int i = 0; i < classes.size(); i++) {
+            classes.get(i).setSeq(i+1);
+        }
         writer.append("delete from rwdedit_ref_type_infos where ref_key='"+refKey+"';");
         writer.append("\n");
         writer.append("commit;");
@@ -2552,7 +2555,7 @@ public class ImportKnowledgeForEdit {
 
     private String toSql(RwdeditRefTypeInfosModel model) {
         StringBuilder sb = new StringBuilder();
-        sb.append("INSERT INTO `rwdedit_ref_type_infos`(`ref_key`, `code`, `name`,`code_path`, `parent_code`, `data_source`, `create_user`, `update_user`) VALUES ( ");
+        sb.append("INSERT INTO `rwdedit_ref_type_infos`(`ref_key`, `code`, `name`,`code_path`, `parent_code`, `data_source`, `create_user`, `update_user`, `seq`) VALUES ( ");
         sb.append("'").append(model.getRefKey()).append("', ");
         sb.append("'").append(model.getCode()).append("', ");
         sb.append("'").append(model.getName()).append("', ");
@@ -2564,7 +2567,8 @@ public class ImportKnowledgeForEdit {
             sb.append("null, ");
         }
         sb.append(model.getCreateUser()).append(", ");
-        sb.append(model.getUpdateUser()).append(");");
+        sb.append(model.getUpdateUser()).append(", ");
+        sb.append(model.getSeq()).append(");");
         return sb.toString();
     }
 

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

@@ -32,6 +32,7 @@ public class RwdeditRefTypeInfos {
     @CreationTimestamp
     @Column(updatable = false)
     private Date createTime;
+    private Integer seq;
     private Integer updateUser;
     @UpdateTimestamp
     private Date updateTime;

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

@@ -37,11 +37,11 @@ public class RwdeditRefTypeInfosService {
 
     private List<BooleanExpression> parse(ObjectNode object) {
         List<BooleanExpression> list = new LinkedList<>();
-        QRwdeditRefTypeInfos qt = QRwdeditRefTypeInfos.rwdeditRefTypeInfos;
-        list.addAll(CriteriaUtils.parse(qt.refKey, object.get("refKey")));
-        list.addAll(CriteriaUtils.parse(qt.code, object.get("code")));
-        list.addAll(CriteriaUtils.parse(qt.createUser, object.get("createUser")));
-        list.addAll(CriteriaUtils.parse(qt.updateUser, object.get("updateUser")));
+//        QRwdeditRefTypeInfos qt = QRwdeditRefTypeInfos.rwdeditRefTypeInfos;
+//        list.addAll(CriteriaUtils.parse(qt.refKey, object.get("refKey")));
+//        list.addAll(CriteriaUtils.parse(qt.code, object.get("code")));
+//        list.addAll(CriteriaUtils.parse(qt.createUser, object.get("createUser")));
+//        list.addAll(CriteriaUtils.parse(qt.updateUser, object.get("updateUser")));
         return list;
     }