diff --git a/laws-modules/src/main/java/com/jero/modules/onlyoffice/controller/BusProcessModelHisController.java b/laws-modules/src/main/java/com/jero/modules/onlyoffice/controller/BusProcessModelHisController.java index 66f842e3..67a71252 100644 --- a/laws-modules/src/main/java/com/jero/modules/onlyoffice/controller/BusProcessModelHisController.java +++ b/laws-modules/src/main/java/com/jero/modules/onlyoffice/controller/BusProcessModelHisController.java @@ -10,9 +10,11 @@ import com.jero.modules.onlyoffice.entity.OnlineFileLog; import com.jero.modules.onlyoffice.mapper.BusProcessModelHisMapper; import com.jero.modules.onlyoffice.service.IBusProcessModelHisService; import com.jero.modules.onlyoffice.service.LawsUserInfoService; +import com.jero.modules.system.entity.SysLog; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.apache.commons.lang3.StringUtils; +import org.apache.poi.ss.formula.functions.T; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -24,7 +26,9 @@ import javax.servlet.http.HttpServletResponse; import java.io.*; import java.net.URL; import java.net.URLConnection; +import java.util.Arrays; import java.util.List; +import java.util.Map; import java.util.Scanner; /** @@ -64,6 +68,38 @@ public class BusProcessModelHisController { IPage pageList = busProcessModelHisService.page(page, queryWrapper); return Result.OK(pageList); } + /** + * 删除 + */ + @ApiOperation(value = "删除") + @PostMapping("/delete") + public Result delete(@RequestBody Map map) { + String id = map.get("id"); + if(StringUtils.isBlank(id)){ + return Result.error("参数不识别！"); + } + boolean ok = busProcessModelHisService.removeById(id); + if(ok) { + return Result.OK("删除成功!"); + } + return Result.OK(); + } + + /** + * 批量删除 + */ + @ApiOperation(value = "批量删除") + @PostMapping("/deleteBatch") + public Result deleteBatch(@RequestBody Map map) { + String ids = map.get("ids"); + if(StringUtils.isBlank(ids)) { + return Result.error("参数不识别！"); + }else { + this.busProcessModelHisService.removeByIds(Arrays.asList(ids.split(","))); + return Result.OK("删除成功!"); + } + } + @ApiOperation(value = "|onlyOffice接收文件") @PostMapping("/recieveFile") diff --git a/laws-modules/src/main/java/com/jero/modules/onlyoffice/entity/BusProcessModelHis.java b/laws-modules/src/main/java/com/jero/modules/onlyoffice/entity/BusProcessModelHis.java index 85096e08..23bee52d 100644 --- a/laws-modules/src/main/java/com/jero/modules/onlyoffice/entity/BusProcessModelHis.java +++ b/laws-modules/src/main/java/com/jero/modules/onlyoffice/entity/BusProcessModelHis.java @@ -3,6 +3,7 @@ package com.jero.modules.onlyoffice.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableLogic; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -34,27 +35,21 @@ public class BusProcessModelHis implements Serializable { private String id; @ApiModelProperty(value = "标准id") - @TableField("STAND_ID") private String standId; @ApiModelProperty(value = "处理人") - @TableField("USER_ID") private String userId; @ApiModelProperty(value = "信息") - @TableField("MESG") private String mesg; @ApiModelProperty(value = "节点信息") - @TableField("TASK_INFO") private String taskInfo; @ApiModelProperty(value = "任务id") - @TableField("TASK_ID") private String taskId; @ApiModelProperty(value = "流程实例id") - @TableField("P_ID") private String pId; @ApiModelProperty(value = "流程名称") @@ -62,30 +57,25 @@ public class BusProcessModelHis implements Serializable { private String fileName; @ApiModelProperty(value = "创建时间") - @TableField("CREATE_TIME") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") private Date createTime; @ApiModelProperty(value = "更新时间") - @TableField("UPDATE_TIME") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") private Date updateTime; @ApiModelProperty(value = "onlyOffice 是否编辑 0 未编辑 1 已编辑") - @TableField("EDIT_STATUS") private String editStatus; @ApiModelProperty(value = "onlyOffice 编辑文件存储路径") - @TableField("EDIT_FILE_PATH") private String editFilePath; @ApiModelProperty(value = "onlyOffice 编辑类型 node 节点编辑 count 汇总编辑") - @TableField("EDIT_TYPE") private String editType; @ApiModelProperty(value = "逻辑状态") - @TableField("FLAG") - private String flag; + @TableLogic + private String delFlag; @ApiModelProperty(value = "onlyOffice 访问编辑文件全路径") @TableField(exist = false) diff --git a/laws-modules/src/main/java/com/jero/modules/onlyoffice/mapper/xml/AttFileEOMapper.xml b/laws-modules/src/main/java/com/jero/modules/onlyoffice/mapper/xml/AttFileEOMapper.xml index 9611e221..26f6c685 100644 --- a/laws-modules/src/main/java/com/jero/modules/onlyoffice/mapper/xml/AttFileEOMapper.xml +++ b/laws-modules/src/main/java/com/jero/modules/onlyoffice/mapper/xml/AttFileEOMapper.xml @@ -17,18 +17,19 @@ id, file_name, old_file_name, file_suffix, file_path, valid_flag, creation_time, modify_time - - - CREATE TABLE ${tableName} ( - "id" VARCHAR(100) NOT NULL PRIMARY KEY, - "file_name" VARCHAR(255) NULL , - "old_file_name" VARCHAR(255) NULL , - "file_suffix" VARCHAR(30) NULL , - "file_path" VARCHAR(255) NULL , - "valid_flag" int(1) NULL , - "creation_time" DATE NULL , - "modify_time" DATE NULL - ) + + + create table ${tableName} + ( + id varchar(100) not null primary key, + file_name varchar(255) null, + old_file_name varchar(255) null, + file_suffix varchar(30) null, + file_path varchar(255) null, + valid_flag int(1) null, + creation_time date null, + modify_time date null + )