文件夹和模板一起排序接口

icss-service/src/main/java/com/diagbot/facade/TemplateFolderAdminFacade.java

@@ -1,13 +1,14 @@
 package com.diagbot.facade;
+
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.diagbot.client.TranServiceClient;
 import com.diagbot.entity.FolderMapping;
 import com.diagbot.entity.TemplateFolder;
 import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.enums.TemplateTypeEnum;
 import com.diagbot.exception.CommonErrorCode;
 import com.diagbot.exception.CommonException;
+import com.diagbot.service.FolderMappingService;
 import com.diagbot.service.TemplateFolderService;
 import com.diagbot.service.impl.TemplateFolderServiceImpl;
 import com.diagbot.util.BeanUtil;
@@ -18,7 +19,7 @@ import com.diagbot.vo.TemplateFolderDelVO;
 import com.diagbot.vo.TemplateFolderListVO;
 import com.diagbot.vo.TemplateFolderSortVO;
 import com.diagbot.vo.TemplateFolderVO;
-import freemarker.template.Template;
+import com.diagbot.vo.TemplateSortVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Component;
@@ -43,6 +44,10 @@ public class TemplateFolderAdminFacade extends TemplateFolderServiceImpl {
     @Qualifier("templateFolderServiceImpl")
     TemplateFolderService templateFolderService;
 
+    @Autowired
+    @Qualifier("folderMappingServiceImpl")
+    FolderMappingService folderMappingService;
+
     /**
      * 文件夹新增或更新
      *
@@ -61,12 +66,12 @@ public class TemplateFolderAdminFacade extends TemplateFolderServiceImpl {
             add = false;
         }
         int count = this.count(new QueryWrapper<TemplateFolder>()
-            .eq("is_deleted", IsDeleteEnum.N.getKey())
-            .eq("name", templateFolderVO.getName())
-            .eq("hospital_id", templateFolderVO.getHospitalId())
-            .eq("template_type", TemplateTypeEnum.AdminTemplate.getKey())
-            // .eq("doctor_id", templateFolderVO.getDoctorId())
-            .ne(!add, "id", templateFolderVO.getId())
+                .eq("is_deleted", IsDeleteEnum.N.getKey())
+                .eq("name", templateFolderVO.getName())
+                .eq("hospital_id", templateFolderVO.getHospitalId())
+                .eq("template_type", TemplateTypeEnum.AdminTemplate.getKey())
+                // .eq("doctor_id", templateFolderVO.getDoctorId())
+                .ne(!add, "id", templateFolderVO.getId())
         );
         if (count > 0) {
             throw new CommonException(CommonErrorCode.SERVER_IS_ERROR, "该文件夹已存在");
@@ -84,8 +89,8 @@ public class TemplateFolderAdminFacade extends TemplateFolderServiceImpl {
         // 如果是新增，id改为负数
         if (add) {
             this.update(new UpdateWrapper<TemplateFolder>()
-                .eq("id", templateFolder.getId())
-                .set("id", Long.parseLong("-" + templateFolder.getId()))
+                    .eq("id", templateFolder.getId())
+                    .set("id", Long.parseLong("-" + templateFolder.getId()))
             );
         }
     }
@@ -106,19 +111,19 @@ public class TemplateFolderAdminFacade extends TemplateFolderServiceImpl {
             throw new CommonException(CommonErrorCode.NOT_EXISTS, "暂无删除权限");
         }
         int count = folderMappingFacade.count(new QueryWrapper<FolderMapping>()
-            .eq("is_deleted", IsDeleteEnum.N.getKey())
-            .eq("folder_id", templateFolderDelVO.getFolderId())
+                .eq("is_deleted", IsDeleteEnum.N.getKey())
+                .eq("folder_id", templateFolderDelVO.getFolderId())
         );
         if (count > 0) {
             throw new CommonException(CommonErrorCode.SERVER_IS_ERROR, "请先删除当前文件夹下的模板");
         }
         // 删除
         this.update(new UpdateWrapper<TemplateFolder>()
-            .eq("id", templateFolderDelVO.getFolderId())
-            .set("is_deleted", IsDeleteEnum.Y.getKey())
-            .set("gmt_modified", DateUtil.now())
-            .set("modifier", templateFolderDelVO.getDoctorId())
-            .set("doctor_id", templateFolderDelVO.getDoctorId())
+                .eq("id", templateFolderDelVO.getFolderId())
+                .set("is_deleted", IsDeleteEnum.Y.getKey())
+                .set("gmt_modified", DateUtil.now())
+                .set("modifier", templateFolderDelVO.getDoctorId())
+                .set("doctor_id", templateFolderDelVO.getDoctorId())
         );
     }
 
@@ -138,10 +143,10 @@ public class TemplateFolderAdminFacade extends TemplateFolderServiceImpl {
             throw new CommonException(CommonErrorCode.NOT_EXISTS, "暂无获取文件夹列表权限");
         }
         int count = this.count(new QueryWrapper<TemplateFolder>()
-            .eq("is_deleted", IsDeleteEnum.N.getKey())
-            //.eq("doctor_id", templateFolderListVO.getDoctorId())
-            .eq("hospital_id", templateFolderListVO.getHospitalId())
-            .eq("template_type", TemplateTypeEnum.AdminTemplate.getKey())
+                .eq("is_deleted", IsDeleteEnum.N.getKey())
+                //.eq("doctor_id", templateFolderListVO.getDoctorId())
+                .eq("hospital_id", templateFolderListVO.getHospitalId())
+                .eq("template_type", TemplateTypeEnum.AdminTemplate.getKey())
         );
         // 如果没有文件夹，新建一个“未分类文件夹”
         if (0 == count) {
@@ -163,10 +168,10 @@ public class TemplateFolderAdminFacade extends TemplateFolderServiceImpl {
             return data;
         }
         return this.list(new QueryWrapper<TemplateFolder>()
-            .eq("is_deleted", IsDeleteEnum.N.getKey())
-            //.eq("doctor_id", templateFolderListVO.getDoctorId())
-            .eq("hospital_id", templateFolderListVO.getHospitalId())
-            .orderByDesc("gmt_modified")
+                .eq("is_deleted", IsDeleteEnum.N.getKey())
+                //.eq("doctor_id", templateFolderListVO.getDoctorId())
+                .eq("hospital_id", templateFolderListVO.getHospitalId())
+                .orderByDesc("gmt_modified")
         );
     }
 
@@ -187,15 +192,34 @@ public class TemplateFolderAdminFacade extends TemplateFolderServiceImpl {
                 throw new CommonException(CommonErrorCode.NOT_EXISTS, "暂无文件夹排序权限");
             }
             List<TemplateFolder> list = new ArrayList<>();
+            List<FolderMapping> folderMappingList = new ArrayList<>();
             Date date = DateUtil.now();
             for (TemplateFolderSortVO template : templateFolderSortVOList) {
+                //文件夹排序
                 TemplateFolder templateFolder = new TemplateFolder();
                 BeanUtil.copyProperties(template, templateFolder);
                 templateFolder.setGmtModified(date);
                 templateFolder.setModifier(templateFolderSortVO.getDoctorId().toString());
                 list.add(templateFolder);
+
+                //模板排序
+                if (ListUtil.isNotEmpty(template.getTemplateSortVOList())) {
+                    List<TemplateSortVO> templateSortVOList = template.getTemplateSortVOList();
+                    for (TemplateSortVO templateSortVO : templateSortVOList) {
+                        FolderMapping folderMapping = new FolderMapping();
+                        BeanUtil.copyProperties(templateSortVO, folderMapping);
+                        folderMapping.setGmtModified(date);
+                        folderMapping.setModifier(templateFolderSortVO.getDoctorId().toString());
+                        folderMappingList.add(folderMapping);
+                    }
+                }
+            }
+            if (ListUtil.isNotEmpty(list)){
+                templateFolderService.saveOrUpdateBatch(list);
+            }
+            if (ListUtil.isNotEmpty(folderMappingList)){
+                folderMappingService.saveOrUpdateBatch(folderMappingList);
             }
-            templateFolderService.saveOrUpdateBatch(list);
         }
     }
 }

icss-service/src/main/java/com/diagbot/vo/TemplateFolderSortVO.java

@@ -9,7 +9,9 @@ import lombok.Getter;
 import lombok.Setter;
 
 import java.io.Serializable;
+import java.util.ArrayList;
 import java.util.Date;
+import java.util.List;
 
 /**
  * <p>
@@ -55,4 +57,7 @@ public class TemplateFolderSortVO implements Serializable {
      */
     private Integer orderNo;
 
+    //模板排序
+    List<TemplateSortVO> templateSortVOList = new ArrayList<>();
+
 }

icss-service/src/main/java/com/diagbot/vo/TemplateSortVO.java

@@ -0,0 +1,48 @@
+package com.diagbot.vo;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 模板文件夹表
+ * </p>
+ *
+ * @author zhoutg
+ * @since 2020-01-09
+ */
+@Getter
+@Setter
+public class TemplateSortVO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    private Long id;
+
+    /**
+     * 是否删除,N:未删除，Y:删除
+     */
+    private String isDeleted;
+
+    /**
+     * 模板id
+     */
+    private Long templateId;
+
+    /**
+     * 文件夹id
+     */
+    private Long folderId;
+
+    /**
+     * 排序号
+     */
+    private Long orderNo;
+
+}