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 eefd2acd..85096e08 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 @@ -11,6 +11,7 @@ import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; import java.io.Serializable; +import java.util.Date; /** *
@@ -63,12 +64,12 @@ public class BusProcessModelHis implements Serializable {
@ApiModelProperty(value = "创建时间")
@TableField("CREATE_TIME")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
- private String createTime;
+ private Date createTime;
@ApiModelProperty(value = "更新时间")
@TableField("UPDATE_TIME")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
- private String updateTime;
+ private Date updateTime;
@ApiModelProperty(value = "onlyOffice 是否编辑 0 未编辑 1 已编辑")
@TableField("EDIT_STATUS")
diff --git a/laws-modules/src/main/java/com/jero/modules/onlyoffice/entity/OnlineFileLog.java b/laws-modules/src/main/java/com/jero/modules/onlyoffice/entity/OnlineFileLog.java
index 0b4c0ffa..6c17355d 100644
--- a/laws-modules/src/main/java/com/jero/modules/onlyoffice/entity/OnlineFileLog.java
+++ b/laws-modules/src/main/java/com/jero/modules/onlyoffice/entity/OnlineFileLog.java
@@ -46,6 +46,6 @@ public class OnlineFileLog {
private String validFlag;
@ApiModelProperty(value = "文件key")
- private String filekey;
+ private String fileKey;
}
diff --git a/laws-modules/src/main/java/com/jero/modules/onlyoffice/service/LawsUserInfoService.java b/laws-modules/src/main/java/com/jero/modules/onlyoffice/service/LawsUserInfoService.java
index dc0c4816..5d95e082 100644
--- a/laws-modules/src/main/java/com/jero/modules/onlyoffice/service/LawsUserInfoService.java
+++ b/laws-modules/src/main/java/com/jero/modules/onlyoffice/service/LawsUserInfoService.java
@@ -8,14 +8,11 @@ import com.jero.modules.onlyoffice.mapper.AttFileEODao;
import com.jero.modules.onlyoffice.mapper.BusProcessModelHisMapper;
import com.jero.modules.onlyoffice.mapper.OnlineFileLogDao;
import com.jero.modules.onlyoffice.service.impl.AttFileEOServiceImpl;
-import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestParam;
import java.io.BufferedOutputStream;
import java.io.File;
@@ -100,7 +97,7 @@ public class LawsUserInfoService {
onlineFileLog.setCreateTime(new Date());
onlineFileLog.setFileName(String.valueOf(time));
onlineFileLog.setValidFlag("0");
- onlineFileLog.setFilekey(key);
+ onlineFileLog.setFileKey(key);
onlineFileLogDao.insert(onlineFileLog);
log.info("======================日志存入成功==============================="+onlineFileLog.toString());
if(StringUtils.isNotBlank(standName)) {
diff --git a/laws-modules/src/main/java/com/jero/modules/onlyoffice/service/impl/BusProcessModelHisServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/onlyoffice/service/impl/BusProcessModelHisServiceImpl.java
index bc16a1a4..262c2f48 100644
--- a/laws-modules/src/main/java/com/jero/modules/onlyoffice/service/impl/BusProcessModelHisServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/onlyoffice/service/impl/BusProcessModelHisServiceImpl.java
@@ -86,8 +86,6 @@ public class BusProcessModelHisServiceImpl extends ServiceImpl