From dbd342424cf0cd43482a78804db5eb3e3f258f86 Mon Sep 17 00:00:00 2001 From: zer0Black <694429613@qq.com> Date: Fri, 29 Sep 2023 16:02:24 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91=E5=9C=A8?= =?UTF-8?q?=E7=BA=BF=E7=BC=96=E8=BE=91=E9=9C=80=E8=A6=81=20=E5=9C=A8?= =?UTF-8?q?=E6=AD=A3=E5=BC=8F=E5=BC=80=E5=8F=91=E5=88=B0=E7=9A=84=E6=97=B6?= =?UTF-8?q?=E5=80=99=20=E6=B3=A8=E6=84=8F=E7=9A=84=E5=9C=B0=E6=96=B9?= =?UTF-8?q?=E6=89=93=E4=B8=8A=E6=B3=A8=E9=87=8A=E6=A0=87=E8=AE=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/MarketListVersionUpdateLogEO.java | 81 ----------------- .../jero/modules/log/enums/ListTypeEnum.java | 33 ------- .../MarketListVersionUpdateLogEOMapper.java | 14 --- .../IMarketListVersionUpdateLogEOService.java | 62 ------------- ...rketListVersionUpdateLogEOServiceImpl.java | 90 ------------------- ...troller.java => OnlyofficeController.java} | 12 +-- .../modules/onlyoffice/entity/AttFileEO.java | 1 + .../modules/onlyoffice/entity/AttFileVo.java | 1 + .../onlyoffice/entity/BusProcessModelHis.java | 2 +- .../onlyoffice/entity/OnlineFileLog.java | 4 + .../service/LawsUserInfoService.java | 4 +- .../service/impl/AttFileEOServiceImpl.java | 1 - 12 files changed, 11 insertions(+), 294 deletions(-) delete mode 100644 laws-modules/src/main/java/com/jero/modules/log/entity/MarketListVersionUpdateLogEO.java delete mode 100644 laws-modules/src/main/java/com/jero/modules/log/enums/ListTypeEnum.java delete mode 100644 laws-modules/src/main/java/com/jero/modules/log/mapper/MarketListVersionUpdateLogEOMapper.java delete mode 100644 laws-modules/src/main/java/com/jero/modules/log/service/IMarketListVersionUpdateLogEOService.java delete mode 100644 laws-modules/src/main/java/com/jero/modules/log/service/impl/MarketListVersionUpdateLogEOServiceImpl.java rename laws-modules/src/main/java/com/jero/modules/onlyoffice/controller/{BusProcessModelHisController.java => OnlyofficeController.java} (98%) diff --git a/laws-modules/src/main/java/com/jero/modules/log/entity/MarketListVersionUpdateLogEO.java b/laws-modules/src/main/java/com/jero/modules/log/entity/MarketListVersionUpdateLogEO.java deleted file mode 100644 index a650c4d4..00000000 --- a/laws-modules/src/main/java/com/jero/modules/log/entity/MarketListVersionUpdateLogEO.java +++ /dev/null @@ -1,81 +0,0 @@ -//package com.jero.modules.log.entity; -// -//import com.baomidou.mybatisplus.annotation.IdType; -//import com.baomidou.mybatisplus.annotation.TableId; -//import com.baomidou.mybatisplus.annotation.TableName; -//import com.fasterxml.jackson.annotation.JsonFormat; -//import io.swagger.annotations.ApiModel; -//import io.swagger.annotations.ApiModelProperty; -//import lombok.Data; -//import lombok.EqualsAndHashCode; -//import lombok.experimental.Accessors; -//import org.jeecgframework.poi.excel.annotation.Excel; -//import org.springframework.format.annotation.DateTimeFormat; -// -//import java.io.Serializable; -//import java.util.Date; -// -///** -// * @Description: 市场清单版本更新log表 -// * @Author: jero-boot -// * @Date: 2023-04-24 -// * @Version: V1.0 -// */ -//@Data -//@TableName("market_list_version_update_log") -//@Accessors(chain = true) -//@EqualsAndHashCode(callSuper = false) -//@ApiModel(value="market_list_version_update_log对象", description="市场清单版本更新log表") -//public class MarketListVersionUpdateLogEO implements Serializable { -// private static final long serialVersionUID = 1L; -// -// /**主键*/ -// @TableId(type = IdType.ASSIGN_ID) -// @ApiModelProperty(value = "主键") -// private String id; -// -// /**创建人*/ -// @ApiModelProperty(value = "创建人") -// private String createBy; -// -// /**创建日期*/ -// @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") -// @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") -// @ApiModelProperty(value = "创建日期") -// private Date createTime; -// -// /**更新人*/ -// @ApiModelProperty(value = "更新人") -// private String updateBy; -// -// /**更新日期*/ -// @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") -// @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") -// @ApiModelProperty(value = "更新日期") -// private Date updateTime; -// -// /**所属部门*/ -// @ApiModelProperty(value = "所属部门") -// private String sysOrgCode; -// -// /**版本号*/ -// @Excel(name = "版本号", width = 15) -// @ApiModelProperty(value = "版本号") -// private String versionNum; -// -// /**升版说明*/ -// @Excel(name = "升版说明", width = 15) -// @ApiModelProperty(value = "升版说明") -// private String upgradeExplanation; -// -// /**清单类型*/ -// @Excel(name = "清单类型", width = 15) -// @ApiModelProperty(value = "清单类型") -// private String listType; -// -// /**清单id*/ -// @Excel(name = "清单id", width = 15) -// @ApiModelProperty(value = "清单id") -// private String listId; -// -//} diff --git a/laws-modules/src/main/java/com/jero/modules/log/enums/ListTypeEnum.java b/laws-modules/src/main/java/com/jero/modules/log/enums/ListTypeEnum.java deleted file mode 100644 index 6ef1eb95..00000000 --- a/laws-modules/src/main/java/com/jero/modules/log/enums/ListTypeEnum.java +++ /dev/null @@ -1,33 +0,0 @@ -//package com.jero.modules.log.enums; -// -///** -// * 清单类型枚举类 -// */ -//public enum ListTypeEnum { -// MARKET_REGULATION_LIST("市场法规清单","Market Regulation List"), -// MARKET_CERTIFICATION_LIST("市场认证清单","Market Certification List"); -// -// String name; -// String value; -// -// private ListTypeEnum(String name, String value) { -// this.name = name; -// this.value = value; -// } -// -// public String getName() { -// return name; -// } -// -// public void setName(String name) { -// this.name = name; -// } -// -// public String getValue() { -// return value; -// } -// -// public void setValue(String value) { -// this.value = value; -// } -//} diff --git a/laws-modules/src/main/java/com/jero/modules/log/mapper/MarketListVersionUpdateLogEOMapper.java b/laws-modules/src/main/java/com/jero/modules/log/mapper/MarketListVersionUpdateLogEOMapper.java deleted file mode 100644 index 904708f0..00000000 --- a/laws-modules/src/main/java/com/jero/modules/log/mapper/MarketListVersionUpdateLogEOMapper.java +++ /dev/null @@ -1,14 +0,0 @@ -//package com.jero.modules.log.mapper; -// -//import com.baomidou.mybatisplus.core.mapper.BaseMapper; -//import com.jero.modules.log.entity.MarketListVersionUpdateLogEO; -// -///** -// * @Description: 市场清单版本更新log表 -// * @Author: jero-boot -// * @Date: 2023-04-24 -// * @Version: V1.0 -// */ -//public interface MarketListVersionUpdateLogEOMapper extends BaseMapper { -// -//} diff --git a/laws-modules/src/main/java/com/jero/modules/log/service/IMarketListVersionUpdateLogEOService.java b/laws-modules/src/main/java/com/jero/modules/log/service/IMarketListVersionUpdateLogEOService.java deleted file mode 100644 index e16a7312..00000000 --- a/laws-modules/src/main/java/com/jero/modules/log/service/IMarketListVersionUpdateLogEOService.java +++ /dev/null @@ -1,62 +0,0 @@ -//package com.jero.modules.log.service; -// -//import com.baomidou.mybatisplus.extension.service.IService; -//import com.jero.modules.log.entity.MarketListVersionUpdateLogEO; -// -//import java.util.List; -// -///** -// * @Description: 市场清单版本更新log表 -// * @Author: jero-boot -// * @Date: 2023-04-24 -// * @Version: V1.0 -// */ -//public interface IMarketListVersionUpdateLogEOService extends IService { -// -// /** -// * 保存 -// * -// * @param marketListVersionUpdateLogEO -// * @return -// */ -// void add(MarketListVersionUpdateLogEO marketListVersionUpdateLogEO); -// -// /** -// * 更新 -// * -// * @param marketListVersionUpdateLogEO -// * @return -// */ -// void editById(MarketListVersionUpdateLogEO marketListVersionUpdateLogEO); -// -// /** -// * 通过id删除 -// * -// * @param id -// * @return -// */ -// void deleteById(String id); -// -// /** -// * 批量删除 -// * -// * @param ids -// * @return -// */ -// void deleteByIds(List ids); -// -// /** -// * 通过id查询 -// * -// * @param id -// * @return -// */ -// MarketListVersionUpdateLogEO queryById(String id); -// -// /** -// * 列表查询 -// * -// * @return -// */ -// List queryList(); -//} diff --git a/laws-modules/src/main/java/com/jero/modules/log/service/impl/MarketListVersionUpdateLogEOServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/log/service/impl/MarketListVersionUpdateLogEOServiceImpl.java deleted file mode 100644 index b3e14484..00000000 --- a/laws-modules/src/main/java/com/jero/modules/log/service/impl/MarketListVersionUpdateLogEOServiceImpl.java +++ /dev/null @@ -1,90 +0,0 @@ -//package com.jero.modules.log.service.impl; -// -//import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -//import com.jero.modules.log.entity.MarketListVersionUpdateLogEO; -//import com.jero.modules.log.mapper.MarketListVersionUpdateLogEOMapper; -//import com.jero.modules.log.service.IMarketListVersionUpdateLogEOService; -//import org.springframework.stereotype.Service; -// -//import java.util.Date; -//import java.util.List; -// -///** -// * @Description: 市场清单版本更新log表 -// * @Author: jero-boot -// * @Date: 2023-04-24 -// * @Version: V1.0 -// */ -//@Service -//public class MarketListVersionUpdateLogEOServiceImpl extends ServiceImpl implements IMarketListVersionUpdateLogEOService { -// -// /** -// * 保存 -// * -// * @param marketListVersionUpdateLogEO -// * @return -// */ -// @Override -// public void add(MarketListVersionUpdateLogEO marketListVersionUpdateLogEO) { -// Date now = new Date(); -// marketListVersionUpdateLogEO.setCreateTime(now); -// marketListVersionUpdateLogEO.setUpdateTime(now); -// save(marketListVersionUpdateLogEO); -// } -// -// /** -// * 更新 -// * -// * @param marketListVersionUpdateLogEO -// * @return -// */ -// @Override -// public void editById(MarketListVersionUpdateLogEO marketListVersionUpdateLogEO) { -// Date now = new Date(); -// marketListVersionUpdateLogEO.setUpdateTime(now); -// saveOrUpdate(marketListVersionUpdateLogEO); -// } -// -// /** -// * 通过id删除 -// * -// * @param id -// * @return -// */ -// @Override -// public void deleteById(String id) { -// removeById(id); -// } -// -// /** -// * 批量删除 -// * -// * @param ids -// * @return -// */ -// @Override -// public void deleteByIds(List ids) { -// removeByIds(ids); -// } -// -// /** -// * 通过id查询 -// * -// * @param id -// * @return -// */ -// @Override -// public MarketListVersionUpdateLogEO queryById(String id) { -// return getById(id); -// } -// -// /** -// * 列表查询 -// * -// * @return -// */ -// @Override -// public List queryList() { -// return list(); -// } -//} 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/OnlyofficeController.java similarity index 98% rename from laws-modules/src/main/java/com/jero/modules/onlyoffice/controller/BusProcessModelHisController.java rename to laws-modules/src/main/java/com/jero/modules/onlyoffice/controller/OnlyofficeController.java index 2c28984d..f1954e8b 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/OnlyofficeController.java @@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.jero.common.api.vo.Result; -import com.jero.common.constant.CommonConstant; import com.jero.common.exception.JeroBootException; import com.jero.common.system.query.QueryGenerator; import com.jero.common.util.CommonUtils; @@ -17,11 +16,9 @@ import com.jero.modules.onlyoffice.service.IBusProcessModelHisService; import com.jero.modules.onlyoffice.service.LawsUserInfoService; import com.jero.modules.oss.entity.OSSFile; import com.jero.modules.oss.service.IOSSFileService; -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; @@ -43,18 +40,15 @@ import java.util.Scanner; /** *

- * 流程模块历史表 前端控制器 + * onlyoffice前端控制器 *

- * - * @author super_liu - * @since 2021-09-17 */ @Api(tags="onlyoffice操作") @RestController @RequestMapping("/onlyoffice") -public class BusProcessModelHisController { +public class OnlyofficeController { - private static final Logger logger = LoggerFactory.getLogger(BusProcessModelHisController.class); + private static final Logger logger = LoggerFactory.getLogger(OnlyofficeController.class); @Value("${file.path}") private String standEditFilePath;//文件存储路径 diff --git a/laws-modules/src/main/java/com/jero/modules/onlyoffice/entity/AttFileEO.java b/laws-modules/src/main/java/com/jero/modules/onlyoffice/entity/AttFileEO.java index f46d3719..8601210a 100644 --- a/laws-modules/src/main/java/com/jero/modules/onlyoffice/entity/AttFileEO.java +++ b/laws-modules/src/main/java/com/jero/modules/onlyoffice/entity/AttFileEO.java @@ -12,6 +12,7 @@ import java.util.Date; * 日期： 2018-09-07
* 版权所有：版权归北京卡达克数据技术中心所有。
*/ +// TODO 等在线编辑正式上线时，把该部分去掉，此部分在正式功能中无用 public class AttFileEO implements Serializable{ private static final long serialVersionUID = 1284335706608668758L; diff --git a/laws-modules/src/main/java/com/jero/modules/onlyoffice/entity/AttFileVo.java b/laws-modules/src/main/java/com/jero/modules/onlyoffice/entity/AttFileVo.java index 656d729b..97c03bc9 100644 --- a/laws-modules/src/main/java/com/jero/modules/onlyoffice/entity/AttFileVo.java +++ b/laws-modules/src/main/java/com/jero/modules/onlyoffice/entity/AttFileVo.java @@ -1,5 +1,6 @@ package com.jero.modules.onlyoffice.entity; +// TODO 等在线编辑正式上线时，把该部分去掉，此部分在正式功能中无用 public class AttFileVo { private String id; 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 66a6add9..66cca559 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 @@ -16,7 +16,7 @@ import java.util.Date; /** *

- * 流程模块历史表 + * 流程模块历史表 TODO 等在线编辑正式上线时，把该部分去掉，此部分在正式功能中无用 *

* * @author super_liu 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 6c17355d..95d54b44 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 @@ -3,7 +3,9 @@ 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.TableName; import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import org.springframework.format.annotation.DateTimeFormat; @@ -11,6 +13,8 @@ import org.springframework.format.annotation.DateTimeFormat; import java.util.Date; @Data +@TableName("online_file_log") +@ApiModel(value = "OnlineFileLog对象", description = "在线编辑日志表") public class OnlineFileLog { @ApiModelProperty(value = "主键") 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 537fc322..fc2bc8a7 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 @@ -32,9 +32,6 @@ public class LawsUserInfoService { private String standEditFilePath; @Autowired private IBusProcessModelHisService busProcessModelHisService; - - @Autowired - private BusProcessModelHisMapper busProcessModelHisMapper; @Autowired private AttFileEOServiceImpl attFileEOService; @Autowired @@ -107,6 +104,7 @@ public class LawsUserInfoService { AttFileEO attFileEO = new AttFileEO(); attFileEO.setId(attFileVo.getId()); attFileEO.setOldFileName(standName+".docx"); + // TODO 等在线编辑正式上线时，需要替换成oss_file表 attFileEODao.updateFileInfoById(attFileEO); log.info("======================文件名称修改成功==============================="+standName+".docx"+"======"+"传入对象为："+attFileEO.getOldFileName()); } diff --git a/laws-modules/src/main/java/com/jero/modules/onlyoffice/service/impl/AttFileEOServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/onlyoffice/service/impl/AttFileEOServiceImpl.java index 34da1e51..f196ea6c 100644 --- a/laws-modules/src/main/java/com/jero/modules/onlyoffice/service/impl/AttFileEOServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/onlyoffice/service/impl/AttFileEOServiceImpl.java @@ -1,7 +1,6 @@ package com.jero.modules.onlyoffice.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -//import com.jero.modules.ocr.util.UUIDUtils; import com.jero.common.util.UUIDUtils; import com.jero.modules.onlyoffice.entity.AttFileEO; import com.jero.modules.onlyoffice.entity.AttFileVo;