删除表

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

@@ -1,120 +0,0 @@
-package com.diagbot.facade;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.diagbot.entity.ClassifyMapping;
-import com.diagbot.entity.FolderMapping;
-import com.diagbot.entity.TemplateClassify;
-import com.diagbot.enums.IsDeleteEnum;
-import com.diagbot.exception.CommonErrorCode;
-import com.diagbot.exception.CommonException;
-import com.diagbot.service.impl.TemplateClassifyServiceImpl;
-import com.diagbot.util.BeanUtil;
-import com.diagbot.util.DateUtil;
-import com.diagbot.vo.HospitalCodeSetVO;
-import com.diagbot.vo.TemplateClassifyDelVO;
-import com.diagbot.vo.TemplateClassifyListVO;
-import com.diagbot.vo.TemplateClassifyVO;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-import java.util.Date;
-import java.util.List;
-
-/**
- * @author zhoutg
- * @Description: 模板分类
- * @date 2018年11月16日 上午11:24:36
- */
-@Component
-public class TemplateClassifyAdminFacade extends TemplateClassifyServiceImpl {
-
-    @Autowired
-    ClassifyMappingFacade classifyMappingFacade;
-    @Autowired
-    AdminCheckFacade adminCheckFacade;
-
-    /**
-     * 分类新增或更新
-     *
-     * @param templateClassifyVO
-     */
-    public void saveOrUpdate(TemplateClassifyVO templateClassifyVO) {
-        HospitalCodeSetVO hospitalCodeSetVO = new HospitalCodeSetVO();
-        hospitalCodeSetVO.setDoctorId(templateClassifyVO.getDoctorId());
-        hospitalCodeSetVO.setHospitalId(templateClassifyVO.getHospitalId());
-        boolean res = adminCheckFacade.getadminCheck(hospitalCodeSetVO);
-        if (!res) {
-            throw new CommonException(CommonErrorCode.NOT_EXISTS, "暂无修改权限");
-        }
-        boolean add = true;
-        if (templateClassifyVO.getId() != null) {
-            add = false;
-        }
-        int count = this.count(new QueryWrapper<TemplateClassify>()
-                .eq("is_deleted", IsDeleteEnum.N.getKey())
-                .eq("name", templateClassifyVO.getName())
-                .eq("hospital_id", templateClassifyVO.getHospitalId())
-//                .eq("doctor_id", templateClassifyVO.getDoctorId())
-                .ne(!add, "id", templateClassifyVO.getId())
-        );
-        if (count > 0) {
-            throw new CommonException(CommonErrorCode.SERVER_IS_ERROR, "该分类已存在");
-        }
-        TemplateClassify templateClassify = new TemplateClassify();
-        BeanUtil.copyProperties(templateClassifyVO, templateClassify);
-        Date date = DateUtil.now();
-        if (add) {
-            templateClassify.setGmtCreate(date);
-            templateClassify.setCreator(templateClassifyVO.getDoctorId().toString());
-        }
-        templateClassify.setGmtModified(date);
-        templateClassify.setModifier(templateClassifyVO.getDoctorId().toString());
-        this.saveOrUpdate(templateClassify);
-    }
-
-
-    /**
-     * 分类删除
-     *
-     * @param templateClassifyDelVO
-     */
-    public void delete(TemplateClassifyDelVO templateClassifyDelVO) {
-        // 校验权限
-        HospitalCodeSetVO hospitalCodeSetVO = new HospitalCodeSetVO();
-        hospitalCodeSetVO.setDoctorId(templateClassifyDelVO.getDoctorId());
-        hospitalCodeSetVO.setHospitalId(templateClassifyDelVO.getHospitalId());
-        boolean res = adminCheckFacade.getadminCheck(hospitalCodeSetVO);
-        if (!res) {
-            throw new CommonException(CommonErrorCode.NOT_EXISTS, "暂无删除权限");
-        }
-        int count = classifyMappingFacade.count(new QueryWrapper<ClassifyMapping>()
-            .eq("is_deleted", IsDeleteEnum.N.getKey())
-            .eq("folder_id", templateClassifyDelVO.getClassifyId())
-        );
-        if (count > 0) {
-            throw new CommonException(CommonErrorCode.SERVER_IS_ERROR, "请先删除当前分类下的模板");
-        }
-        // 删除
-        this.update(new UpdateWrapper<TemplateClassify>()
-            .eq("id", templateClassifyDelVO.getClassifyId())
-            .set("is_deleted", IsDeleteEnum.Y.getKey())
-            .set("gmt_modified", DateUtil.now())
-            .set("modifier", templateClassifyDelVO.getDoctorId())
-        );
-    }
-
-
-    /**
-     * 分类列表
-     *
-     * @param templateClassifyListVO
-     */
-    public List<TemplateClassify> list(TemplateClassifyListVO templateClassifyListVO) {
-        return this.list(new QueryWrapper<TemplateClassify>()
-            .eq("is_deleted", IsDeleteEnum.N.getKey())
-//            .eq("doctor_id", templateClassifyListVO.getDoctorId())
-            .eq("hospital_id", templateClassifyListVO.getHospitalId())
-            .orderByDesc("gmt_modified")
-        );
-    }
-}

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

@@ -1,108 +0,0 @@
-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.ClassifyMapping;
-import com.diagbot.entity.FolderMapping;
-import com.diagbot.entity.TemplateClassify;
-import com.diagbot.entity.TemplateFolder;
-import com.diagbot.enums.IsDeleteEnum;
-import com.diagbot.exception.CommonErrorCode;
-import com.diagbot.exception.CommonException;
-import com.diagbot.service.impl.TemplateClassifyServiceImpl;
-import com.diagbot.service.impl.TemplateFolderServiceImpl;
-import com.diagbot.util.BeanUtil;
-import com.diagbot.util.DateUtil;
-import com.diagbot.vo.TemplateClassifyDelVO;
-import com.diagbot.vo.TemplateClassifyListVO;
-import com.diagbot.vo.TemplateClassifyVO;
-import com.diagbot.vo.TemplateFolderDelVO;
-import com.diagbot.vo.TemplateFolderListVO;
-import com.diagbot.vo.TemplateFolderVO;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-import java.util.Date;
-import java.util.List;
-
-/**
- * @author zhoutg
- * @Description: 模板类型
- * @date 2018年11月16日 上午11:24:36
- */
-@Component
-public class TemplateClassifyFacade extends TemplateClassifyServiceImpl {
-
-    @Autowired
-    ClassifyMappingFacade classifyMappingFacade;
-
-    /**
-     * 分类新增或更新
-     *
-     * @param templateClassifyVO
-     */
-    public void saveOrUpdate(TemplateClassifyVO templateClassifyVO) {
-        boolean add = true;
-        if (templateClassifyVO.getId() != null) {
-            add = false;
-        }
-        int count = this.count(new QueryWrapper<TemplateClassify>()
-                .eq("is_deleted", IsDeleteEnum.N.getKey())
-                .eq("name", templateClassifyVO.getName())
-                .eq("hospital_id", templateClassifyVO.getHospitalId())
-                .eq("doctor_id", templateClassifyVO.getDoctorId())
-                .ne(!add, "id", templateClassifyVO.getId())
-        );
-        if (count > 0) {
-            throw new CommonException(CommonErrorCode.SERVER_IS_ERROR, "该分类已存在");
-        }
-        TemplateClassify templateClassify = new TemplateClassify();
-        BeanUtil.copyProperties(templateClassifyVO, templateClassify);
-        Date date = DateUtil.now();
-        if (add) {
-            templateClassify.setGmtCreate(date);
-            templateClassify.setCreator(templateClassifyVO.getDoctorId().toString());
-        }
-        templateClassify.setGmtModified(date);
-        templateClassify.setModifier(templateClassifyVO.getDoctorId().toString());
-        this.saveOrUpdate(templateClassify);
-    }
-
-
-    /**
-     * 分类删除
-     *
-     * @param templateClassifyDelVO
-     */
-    public void delete(TemplateClassifyDelVO templateClassifyDelVO) {
-        int count = classifyMappingFacade.count(new QueryWrapper<ClassifyMapping>()
-            .eq("is_deleted", IsDeleteEnum.N.getKey())
-            .eq("classify_id", templateClassifyDelVO.getClassifyId())
-        );
-        if (count > 0) {
-            throw new CommonException(CommonErrorCode.SERVER_IS_ERROR, "请先删除当前分类下的模板");
-        }
-        // 删除
-        this.update(new UpdateWrapper<TemplateClassify>()
-            .eq("id", templateClassifyDelVO.getClassifyId())
-            .set("is_deleted", IsDeleteEnum.Y.getKey())
-            .set("gmt_modified", DateUtil.now())
-            .set("modifier", templateClassifyDelVO.getDoctorId())
-        );
-    }
-
-
-    /**
-     * 分类列表
-     *
-     * @param templateClassifyListVO
-     */
-    public List<TemplateClassify> list(TemplateClassifyListVO templateClassifyListVO) {
-        return this.list(new QueryWrapper<TemplateClassify>()
-            .eq("is_deleted", IsDeleteEnum.N.getKey())
-            .eq("doctor_id", templateClassifyListVO.getDoctorId())
-            .eq("hospital_id", templateClassifyListVO.getHospitalId())
-            .orderByDesc("gmt_modified")
-        );
-    }
-}

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

@@ -5,6 +5,7 @@ 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.impl.TemplateFolderServiceImpl;
@@ -17,6 +18,7 @@ import com.diagbot.vo.TemplateFolderVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
@@ -110,6 +112,38 @@ public class TemplateFolderAdminFacade extends TemplateFolderServiceImpl {
      * @param templateFolderListVO
      */
     public List<TemplateFolder> list(TemplateFolderListVO templateFolderListVO) {
+        // 校验权限
+        HospitalCodeSetVO hospitalCodeSetVO = new HospitalCodeSetVO();
+        hospitalCodeSetVO.setDoctorId(templateFolderListVO.getDoctorId());
+        hospitalCodeSetVO.setHospitalId(templateFolderListVO.getHospitalId());
+        boolean res = adminCheckFacade.getadminCheck(hospitalCodeSetVO);
+        if (!res) {
+            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())
+                .orderByDesc("gmt_modified")
+        );
+        // 如果没有文件夹，新建一个“未分类文件夹”
+        if (0 == count) {
+            TemplateFolder templateFolder = new TemplateFolder();
+            templateFolder.setIsDeleted(IsDeleteEnum.N.getKey());
+            templateFolder.setCreator(templateFolderListVO.getDoctorId().toString());
+            templateFolder.setModifier(templateFolderListVO.getDoctorId().toString());
+            templateFolder.setDoctorId(templateFolderListVO.getDoctorId());
+            Date date = DateUtil.now();
+            templateFolder.setGmtCreate(date);
+            templateFolder.setGmtModified(date);
+            templateFolder.setName("未分类文件夹");
+            templateFolder.setOrderNo(999999);
+            templateFolder.setTemplateType(TemplateTypeEnum.AdminTemplate.getKey());
+            this.save(templateFolder);
+            List<TemplateFolder> data = new ArrayList<>();
+            data.add(templateFolder);
+            return data;
+        }
         return this.list(new QueryWrapper<TemplateFolder>()
             .eq("is_deleted", IsDeleteEnum.N.getKey())
             //.eq("doctor_id", templateFolderListVO.getDoctorId())

icss-service/src/main/java/com/diagbot/web/TemplateFolderAdminController.java

@@ -4,6 +4,7 @@ package com.diagbot.web;
 import com.diagbot.annotation.SysLogger;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.entity.TemplateFolder;
+import com.diagbot.facade.TemplateFolderAdminFacade;
 import com.diagbot.facade.TemplateFolderFacade;
 import com.diagbot.vo.TemplateFolderDelVO;
 import com.diagbot.vo.TemplateFolderListVO;
@@ -33,7 +34,7 @@ import java.util.List;
 public class TemplateFolderAdminController {
 
     @Autowired
-    TemplateFolderFacade templateFolderFacade;
+    TemplateFolderAdminFacade templateFolderAdminFacade;
 
     @ApiOperation(value = "文件夹新增或更新[by:zhoutg]",
             notes = "")
@@ -41,7 +42,7 @@ public class TemplateFolderAdminController {
     @SysLogger("saveOrUpdate")
     @Transactional
     public RespDTO<Boolean> saveOrUpdate(@RequestBody TemplateFolderVO templateFolderVO) {
-        templateFolderFacade.saveOrUpdate(templateFolderVO);
+        templateFolderAdminFacade.saveOrUpdate(templateFolderVO);
         return RespDTO.onSuc(true);
     }
 
@@ -52,7 +53,7 @@ public class TemplateFolderAdminController {
     @SysLogger("detele")
     @Transactional
     public RespDTO<Boolean> detele(@RequestBody TemplateFolderDelVO templateFolderDelVO) {
-        templateFolderFacade.delete(templateFolderDelVO);
+        templateFolderAdminFacade.delete(templateFolderDelVO);
         return RespDTO.onSuc(true);
     }
 
@@ -62,7 +63,7 @@ public class TemplateFolderAdminController {
     @PostMapping("/list")
     @SysLogger("list")
     public RespDTO<List<TemplateFolder>> list(@RequestBody TemplateFolderListVO templateFoldeListVO) {
-        List<TemplateFolder> data = templateFolderFacade.list(templateFoldeListVO);
+        List<TemplateFolder> data = templateFolderAdminFacade.list(templateFoldeListVO);
         return RespDTO.onSuc(data);
     }
 }