Merge remote-tracking branch 'origin/dev/icss20200109_template' into dev/icss20200109_template

docs/029.20200109模板新需求/icss.sql

@@ -1,52 +0,0 @@
-use `sys-icss`;
-
-ALTER TABLE `icss_template_info`
-ADD COLUMN `spell` varchar(100) DEFAULT NULL COMMENT '拼音' AFTER `name`;
-
-DROP TABLE IF EXISTS `icss_template_folder`;
-CREATE TABLE `icss_template_folder` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键',
-  `is_deleted` char(1)  NOT NULL DEFAULT 'N' COMMENT '是否删除,N:未删除，Y:删除',
-  `gmt_create` datetime NOT NULL DEFAULT '1970-01-01 12:00:00' COMMENT '记录创建时间',
-  `gmt_modified` datetime NOT NULL DEFAULT '1970-01-01 12:00:00' COMMENT '记录修改时间,如果时间是1970年则表示纪录未修改',
-  `creator` varchar(20)  NOT NULL DEFAULT '' COMMENT '创建人姓名',
-  `modifier` varchar(20)  NOT NULL DEFAULT '' COMMENT '修改人姓名',
-  `name` varchar(300) NOT NULL DEFAULT '' COMMENT '名称',
-  `hospital_id` bigint(20) DEFAULT NULL COMMENT '医院id',
-  `doctor_id` bigint(20) DEFAULT NULL COMMENT '医生id',
-  `template_type` int(11) NOT NULL DEFAULT '1' COMMENT '模板类型（个人1，管理员2）',
-  `order_no` int(11) NOT NULL DEFAULT '1' COMMENT '排序号',
-  `remark` varchar(255)  NOT NULL DEFAULT '' COMMENT '备注',
-  PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8  COMMENT='模板文件夹表';
-
-
-DROP TABLE IF EXISTS `icss_folder_mapping`;
-CREATE TABLE `icss_folder_mapping` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键',
-  `is_deleted` char(1)  NOT NULL DEFAULT 'N' COMMENT '是否删除,N:未删除，Y:删除',
-  `gmt_create` datetime NOT NULL DEFAULT '1970-01-01 12:00:00' COMMENT '记录创建时间',
-  `gmt_modified` datetime NOT NULL DEFAULT '1970-01-01 12:00:00' COMMENT '记录修改时间,如果时间是1970年则表示纪录未修改',
-  `creator` varchar(20)  NOT NULL DEFAULT '' COMMENT '创建人姓名',
-  `modifier` varchar(20)  NOT NULL DEFAULT '' COMMENT '修改人姓名',
-  `template_id` bigint(20) DEFAULT NULL COMMENT '模板id',
-  `folder_id` bigint(20) DEFAULT NULL COMMENT '文件夹id',
-  `order_no` int(11) NOT NULL DEFAULT '1' COMMENT '排序号',
-  `remark` varchar(255)  NOT NULL DEFAULT '' COMMENT '备注',
-  PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8  COMMENT='模板文件夹映射表';
-
-
-DROP TABLE IF EXISTS `icss_template_quote`;
-CREATE TABLE `icss_template_quote` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键',
-  `is_deleted` char(3) DEFAULT 'N' COMMENT '是否删除,N:未删除，Y:删除',
-  `gmt_create` datetime DEFAULT '1970-01-01 12:00:00' COMMENT '记录创建时间',
-  `gmt_modified` datetime DEFAULT '1970-01-01 12:00:00' COMMENT '记录修改时间,如果时间是1970年则表示纪录未修改',
-  `creator` varchar(60) DEFAULT '0' COMMENT '创建人，0表示无创建人值',
-  `modifier` varchar(60) DEFAULT '0' COMMENT '修改人,如果为0则表示纪录未修改',
-  `template_id` bigint(20) DEFAULT NULL COMMENT '模板id',
-  `doctor_id` bigint(20) DEFAULT NULL COMMENT '医生id',
-  `remark` varchar(255) DEFAULT NULL COMMENT '备注',
-  PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='模板引用表';

docs/029.20200109模板新需求/init.sql

@@ -1,5 +1,23 @@
 use `sys-icss`;
 
+ALTER TABLE `icss_template_info`
+ADD COLUMN `spell` varchar(100) DEFAULT NULL COMMENT '拼音' AFTER `name`;
+
+DROP TABLE IF EXISTS `icss_template_quote`;
+CREATE TABLE `icss_template_quote` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键',
+  `is_deleted` char(3) DEFAULT 'N' COMMENT '是否删除,N:未删除，Y:删除',
+  `gmt_create` datetime DEFAULT '1970-01-01 12:00:00' COMMENT '记录创建时间',
+  `gmt_modified` datetime DEFAULT '1970-01-01 12:00:00' COMMENT '记录修改时间,如果时间是1970年则表示纪录未修改',
+  `creator` varchar(60) DEFAULT '0' COMMENT '创建人，0表示无创建人值',
+  `modifier` varchar(60) DEFAULT '0' COMMENT '修改人,如果为0则表示纪录未修改',
+  `template_id` bigint(20) DEFAULT NULL COMMENT '模板id',
+  `doctor_id` bigint(20) DEFAULT NULL COMMENT '医生id',
+  `remark` varchar(255) DEFAULT NULL COMMENT '备注',
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='模板引用表';
+
+
 DROP TABLE IF EXISTS `icss_template_folder`;
 CREATE TABLE `icss_template_folder` (
   `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键',

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

@@ -8,15 +8,19 @@ import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.enums.TemplateTypeEnum;
 import com.diagbot.exception.CommonErrorCode;
 import com.diagbot.exception.CommonException;
+import com.diagbot.service.TemplateFolderService;
 import com.diagbot.service.impl.TemplateFolderServiceImpl;
 import com.diagbot.util.BeanUtil;
 import com.diagbot.util.DateUtil;
+import com.diagbot.util.ListUtil;
 import com.diagbot.vo.HospitalCodeSetVO;
 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 org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Component;
 
 import java.util.ArrayList;
@@ -35,6 +39,9 @@ public class TemplateFolderAdminFacade extends TemplateFolderServiceImpl {
     AdminCheckFacade adminCheckFacade;
     @Autowired
     FolderMappingFacade folderMappingFacade;
+    @Autowired
+    @Qualifier("templateFolderServiceImpl")
+    TemplateFolderService templateFolderService;
 
     /**
      * 文件夹新增或更新
@@ -155,4 +162,33 @@ public class TemplateFolderAdminFacade extends TemplateFolderServiceImpl {
             .orderByDesc("gmt_modified")
         );
     }
+
+
+    /**
+     * 文件夹排序
+     *
+     * @param templateFolderSortVOList
+     */
+    public void sort(List<TemplateFolderSortVO> templateFolderSortVOList) {
+        if (ListUtil.isNotEmpty(templateFolderSortVOList)) {
+            TemplateFolderSortVO templateFolderSortVO = templateFolderSortVOList.get(0);
+            HospitalCodeSetVO hospitalCodeSetVO = new HospitalCodeSetVO();
+            hospitalCodeSetVO.setDoctorId(templateFolderSortVO.getDoctorId());
+            hospitalCodeSetVO.setHospitalId(templateFolderSortVO.getHospitalId());
+            boolean res = adminCheckFacade.getadminCheck(hospitalCodeSetVO);
+            if (!res) {
+                throw new CommonException(CommonErrorCode.NOT_EXISTS, "暂无文件夹排序权限");
+            }
+            List<TemplateFolder> list = 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);
+            }
+            templateFolderService.saveOrUpdateBatch(list);
+        }
+    }
 }

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

@@ -8,7 +8,7 @@ import java.io.Serializable;
 
 /**
  * <p>
- * 模板分类表
+ * 模板文件夹表
  * </p>
  *
  * @author zhoutg

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

@@ -7,7 +7,7 @@ import java.io.Serializable;
 
 /**
  * <p>
- * 模板分类表
+ * 模板文件夹表
  * </p>
  *
  * @author zhoutg

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

@@ -0,0 +1,58 @@
+package com.diagbot.vo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModelProperty;
+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 TemplateFolderSortVO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    private Long id;
+
+    /**
+     * 是否删除,N:未删除，Y:删除
+     */
+    private String isDeleted;
+
+    /**
+     * 名称
+     */
+    private String name;
+
+    /**
+     * 医院id
+     */
+    private Long hospitalId;
+
+    /**
+     * 医生id
+     */
+    private Long doctorId;
+
+    /**
+     * 排序号
+     */
+    private Integer orderNo;
+
+}

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

@@ -1,13 +1,9 @@
 package com.diagbot.vo;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Getter;
 import lombok.Setter;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 
 /**
  * <p>

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

@@ -8,7 +8,9 @@ import com.diagbot.facade.TemplateFolderAdminFacade;
 import com.diagbot.facade.TemplateFolderFacade;
 import com.diagbot.vo.TemplateFolderDelVO;
 import com.diagbot.vo.TemplateFolderListVO;
+import com.diagbot.vo.TemplateFolderSortVO;
 import com.diagbot.vo.TemplateFolderVO;
+import com.sun.org.apache.xpath.internal.operations.Bool;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -66,4 +68,15 @@ public class TemplateFolderAdminController {
         List<TemplateFolder> data = templateFolderAdminFacade.list(templateFoldeListVO);
         return RespDTO.onSuc(data);
     }
+
+
+    @ApiOperation(value = "文件夹排序[by:zhoutg]",
+            notes = "")
+    @PostMapping("/sort")
+    @SysLogger("sort")
+    @Transactional
+    public RespDTO<Boolean> sort(@RequestBody List<TemplateFolderSortVO> templateFolderSortVOList) {
+        templateFolderAdminFacade.sort(templateFolderSortVOList);
+        return RespDTO.onSuc(true);
+    }
 }