From 8d93660dc6df47940e685abc6bd63f2de350a756 Mon Sep 17 00:00:00 2001 From: bupengxiang Date: Sat, 6 May 2023 18:04:14 +0800 Subject: [PATCH] =?UTF-8?q?[=E6=96=B0=E5=A2=9E]=20=E6=8A=A5=E5=91=8A?= =?UTF-8?q?=E6=97=A5=E5=BF=97=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ReportLogBookController.java | 113 +++++++++ .../controller/ReportManageConroller.java | 20 +- .../adc/da/report/dao/mysql/ReportLogDao.java | 47 ++++ .../com/adc/da/report/eo/ReportLogBook.java | 45 ++++ .../da/report/service/IReportLogService.java | 27 +++ .../service/impl/IReportLogServiceImpl.java | 110 +++++++++ .../com/adc/da/report/vo/ReportLogPageVO.java | 31 +++ .../mybatis/mapper/mysql/ReportLogMapper.xml | 74 ++++++ .../controller/ReportManageConroller.class | Bin 13646 -> 0 bytes .../service/impl/IReportServiceImpl.class | Bin 19254 -> 0 bytes .../com/adc/da/report/util/PdfUtil.class | Bin 6335 -> 0 bytes .../com/adc/da/report/util/PptUtil.class | Bin 14669 -> 0 bytes .../mapper/mysql/ReportManageMapper.xml | 228 ------------------ 13 files changed, 466 insertions(+), 229 deletions(-) create mode 100644 adc-da-report/src/main/java/com/adc/da/report/controller/ReportLogBookController.java create mode 100644 adc-da-report/src/main/java/com/adc/da/report/dao/mysql/ReportLogDao.java create mode 100644 adc-da-report/src/main/java/com/adc/da/report/eo/ReportLogBook.java create mode 100644 adc-da-report/src/main/java/com/adc/da/report/service/IReportLogService.java create mode 100644 adc-da-report/src/main/java/com/adc/da/report/service/impl/IReportLogServiceImpl.java create mode 100644 adc-da-report/src/main/java/com/adc/da/report/vo/ReportLogPageVO.java create mode 100644 adc-da-report/src/main/resources/mybatis/mapper/mysql/ReportLogMapper.xml delete mode 100644 adc-da-report/target/classes/com/adc/da/report/controller/ReportManageConroller.class delete mode 100644 adc-da-report/target/classes/com/adc/da/report/service/impl/IReportServiceImpl.class delete mode 100644 adc-da-report/target/classes/com/adc/da/report/util/PdfUtil.class delete mode 100644 adc-da-report/target/classes/com/adc/da/report/util/PptUtil.class delete mode 100644 adc-da-report/target/classes/mybatis/mapper/mysql/ReportManageMapper.xml diff --git a/adc-da-report/src/main/java/com/adc/da/report/controller/ReportLogBookController.java b/adc-da-report/src/main/java/com/adc/da/report/controller/ReportLogBookController.java new file mode 100644 index 0000000..281ad62 --- /dev/null +++ b/adc-da-report/src/main/java/com/adc/da/report/controller/ReportLogBookController.java @@ -0,0 +1,113 @@ +package com.adc.da.report.controller; + +import com.adc.da.report.eo.ReportLogBook; +import com.adc.da.report.service.IReportLogService; +import com.adc.da.report.vo.DeleteParamRequestVO; +import com.adc.da.report.vo.ReportLogPageVO; +import com.adc.da.util.http.ResponseMessage; +import com.adc.da.util.http.Result; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * @Author bu + */ +@Api(tags = "报告日志book管理") +@RequestMapping("/${restPath}/reportLogBook") +@RestController +public class ReportLogBookController { + + @Autowired + private IReportLogService reportLogService; + + /** + * @param reportLogPageVO + * @return com.adc.da.util.http.ResponseMessage + * @author bu + * @date 2023-05-06 + * @description 分页查询 + */ + @PostMapping(value = "/page") + @ApiOperation(value = "分页查询") + @ApiImplicitParam(name = "reportLogPageVO", value = "查询条件VO", dataType = "ReportLogPageVO") + public ResponseMessage> page(@RequestBody ReportLogPageVO reportLogPageVO){ + + //分页查询 + Page reportLogIPage = reportLogService.selectPage(reportLogPageVO); + return Result.success(reportLogIPage); + } + + /** + * @param reportLogPageVO + * @return com.adc.da.util.http.ResponseMessage + * @author bu + * @date 2023-05-06 + * @description 列表查询 + */ + @PostMapping("/list") + @ApiOperation(value = "列表查询") + @ApiImplicitParam(name = "reportLogPageVO", value = "查询条件VO", dataType = "ReportLogPageVO") + public ResponseMessage> list(@RequestBody ReportLogPageVO reportLogPageVO) { + + //列表查询 + List reportLogBookList = reportLogService.selectList(reportLogPageVO); + return Result.success(reportLogBookList); + } + + /** + * @param id + * @return com.adc.da.util.http.ResponseMessage + * @author bu + * @date 2023-05-06 + * @description 根据id查询 + */ + @GetMapping("/info/{id}") + @ApiOperation(value = "根据id查询") + @ApiImplicitParam(name = "id", value = "主键ID", dataType = "String") + public ResponseMessage info(@PathVariable("id") String id){ + + //根据id查询 + ReportLogBook reportLogBook = reportLogService.selectById(id); + return Result.success(reportLogBook); + } + + /** + * @param reportLogBook + * @return com.adc.da.util.http.ResponseMessage + * @author bu + * @date 2023-05-06 + * @description 单条数据新增/更改 + */ + @PostMapping("/saveOrUpdate") + @ApiOperation(value = "单条数据新增/更改") + @ApiImplicitParam(name = "reportLog", value = " ReportLog实体", dataType = "ReportLog") + public ResponseMessage saveOrUpdate(@RequestBody ReportLogBook reportLogBook){ + + //单条数据新增/更改 + reportLogService.saveOrUpdateSingle(reportLogBook); + return Result.success(reportLogBook.getId()); + } + + /** + * @param deleteParamRequestVO + * @return com.adc.da.util.http.ResponseMessage + * @author bu + * @date 2023-05-06 + * @description 根据id或id数组进行删除 + */ + @DeleteMapping("/delete") + @ApiOperation(value = "单条/批量删除数据") + public ResponseMessage delete(@RequestBody DeleteParamRequestVO deleteParamRequestVO){ + + //单条/批量删除数据 + reportLogService.deleteById(deleteParamRequestVO); + return Result.success(); + } + +} diff --git a/adc-da-report/src/main/java/com/adc/da/report/controller/ReportManageConroller.java b/adc-da-report/src/main/java/com/adc/da/report/controller/ReportManageConroller.java index 2916ee5..2439227 100644 --- a/adc-da-report/src/main/java/com/adc/da/report/controller/ReportManageConroller.java +++ b/adc-da-report/src/main/java/com/adc/da/report/controller/ReportManageConroller.java @@ -1,9 +1,12 @@ package com.adc.da.report.controller; +import com.adc.da.login.util.UserUtils; import com.adc.da.report.annotation.ReportLog; import com.adc.da.report.dao.mysql.ReportDao; +import com.adc.da.report.dao.mysql.ReportLogDao; import com.adc.da.report.eo.FileEntity; import com.adc.da.report.eo.ReportEntity; +import com.adc.da.report.eo.ReportLogBook; import com.adc.da.report.service.IFileService; import com.adc.da.report.service.IReportService; import com.adc.da.report.util.LocalFileUtil; @@ -74,6 +77,8 @@ public class ReportManageConroller { @Autowired private ReportDao reportDao; + @Autowired + private ReportLogDao reportLogDao; /** * 新增或编辑报告 * @param vo @@ -165,6 +170,13 @@ public class ReportManageConroller { String html = reportService.reportHtml(id); Map map = new HashMap<>(); map.put("content", html); + + ReportLogBook reportLog = new ReportLogBook(); + reportLog.setReportId(id); + reportLog.setType(1); + reportLog.setUpdateTime(new Date()); + reportLog.setUserId(UserUtils.getUserId()); + reportLogDao.insert(reportLog); return Result.success(map); } @@ -330,7 +342,7 @@ public class ReportManageConroller { */ @ApiOperation(value = "|下载文件") @GetMapping("/download") - public void downloadPic(HttpServletResponse response, String fileId) throws IOException { + public void downloadPic(HttpServletResponse response, String fileId,String repostId) throws IOException { try { FileEntity entity = fileService.getFile(fileId); @@ -351,6 +363,12 @@ public class ReportManageConroller { } catch (Exception ex) { log.info(ex.getMessage(),ex); } + ReportLogBook reportLog = new ReportLogBook(); + reportLog.setReportId(repostId); + reportLog.setType(2); + reportLog.setUpdateTime(new Date()); + reportLog.setUserId(UserUtils.getUserId()); + reportLogDao.insert(reportLog); } diff --git a/adc-da-report/src/main/java/com/adc/da/report/dao/mysql/ReportLogDao.java b/adc-da-report/src/main/java/com/adc/da/report/dao/mysql/ReportLogDao.java new file mode 100644 index 0000000..27c6ac4 --- /dev/null +++ b/adc-da-report/src/main/java/com/adc/da/report/dao/mysql/ReportLogDao.java @@ -0,0 +1,47 @@ +package com.adc.da.report.dao.mysql; + + +import com.adc.da.report.eo.ReportLogBook; +import com.adc.da.report.vo.ReportLogPageVO; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * @author bu + * @version 1.0 + * @description 报告日志 Mapper接口 + * @date 2023-05-06 + */ +public interface ReportLogDao extends BaseMapper { + + /** + * @param reportLogPageVO + * @param page + * @author bu + * @date 2023-05-06 + * @description 使用分页插件进行查询 + */ + List selectPage(Page page, @Param("pageVO") ReportLogPageVO reportLogPageVO); + + /** + * @param reportLogPageVO + * @param page + * @author bu + * @date 2023-05-06 + * @description 使用分页插件进行查询总数 + */ + Long selectPageCount(@Param("pageVO") ReportLogPageVO reportLogPageVO); + + /** + * @param reportLogPageVO + * @return java.util.List + * @author bu + * @date 2023-05-06 + * @description 列表查询 + */ + List queryList(@Param("pageVO") ReportLogPageVO reportLogPageVO); + +} diff --git a/adc-da-report/src/main/java/com/adc/da/report/eo/ReportLogBook.java b/adc-da-report/src/main/java/com/adc/da/report/eo/ReportLogBook.java new file mode 100644 index 0000000..5ac309c --- /dev/null +++ b/adc-da-report/src/main/java/com/adc/da/report/eo/ReportLogBook.java @@ -0,0 +1,45 @@ +package com.adc.da.report.eo; + + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.util.Date; + +/** + * @author bu + * @version 1.0 + * @description 报告日志 + * @date 2023-05-06 + */ +@Data +@TableName("report_log") +public class ReportLogBook { + + @TableId("id") + private String id; + /** + * 报告id + */ + @TableField("report_id") + private String reportId; + + /** + * 类型 1预览 2下载 3点赞 + */ + private Integer type; + + /** + * 操作人 + */ + @TableField("user_id") + private String userId; + + /** + * 操作时间 + */ + @TableField("update_time") + private Date updateTime; +} diff --git a/adc-da-report/src/main/java/com/adc/da/report/service/IReportLogService.java b/adc-da-report/src/main/java/com/adc/da/report/service/IReportLogService.java new file mode 100644 index 0000000..158a554 --- /dev/null +++ b/adc-da-report/src/main/java/com/adc/da/report/service/IReportLogService.java @@ -0,0 +1,27 @@ +package com.adc.da.report.service; + +import com.adc.da.report.eo.ReportLogBook; +import com.adc.da.report.vo.DeleteParamRequestVO; +import com.adc.da.report.vo.ReportLogPageVO; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; + +import java.util.List; + +/** + * @author bu + * @version 1.0 + * @description 报告日志 + * @date 2023-05-06 + */ +public interface IReportLogService { + + Page selectPage(ReportLogPageVO reportLogPageVO); + + List selectList(ReportLogPageVO reportLogPageVO); + + ReportLogBook selectById(String id); + + void saveOrUpdateSingle(ReportLogBook reportLogBook); + + void deleteById(DeleteParamRequestVO deleteParamVO); +} diff --git a/adc-da-report/src/main/java/com/adc/da/report/service/impl/IReportLogServiceImpl.java b/adc-da-report/src/main/java/com/adc/da/report/service/impl/IReportLogServiceImpl.java new file mode 100644 index 0000000..27cff3b --- /dev/null +++ b/adc-da-report/src/main/java/com/adc/da/report/service/impl/IReportLogServiceImpl.java @@ -0,0 +1,110 @@ +package com.adc.da.report.service.impl; + + +import com.adc.da.report.dao.mysql.ReportLogDao; +import com.adc.da.report.eo.ReportLogBook; +import com.adc.da.report.service.IReportLogService; +import com.adc.da.report.vo.DeleteParamRequestVO; +import com.adc.da.report.vo.ReportLogPageVO; +import com.adc.da.util.utils.StringUtils; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; +import org.springframework.util.ObjectUtils; + +import java.util.ArrayList; +import java.util.List; + +/** + * @author bu + * @version 1.0 + * @description 报告日志 服务实现类 + * @date 2023-05-06 + */ +@Slf4j +@Service +public class IReportLogServiceImpl extends ServiceImpl implements IReportLogService { + + /** + * @param reportLogPageVO + * @return + * @author bu + * @date 2023-05-06 + * @description 分页查询 + */ + public Page selectPage(ReportLogPageVO reportLogPageVO){ + Page page = new Page<>(reportLogPageVO.getCurrent(), + reportLogPageVO.getSize()); + page.setRecords(baseMapper.selectPage(page, reportLogPageVO)); + Long total = baseMapper.selectPageCount(reportLogPageVO); + page.setTotal(total); + return page; + } + + /** + * @param reportLogPageVO + * @return java.util.List + * @author bu + * @date 2023-05-06 + * @description 列表查询 + */ + public List selectList(ReportLogPageVO reportLogPageVO) { + return baseMapper.queryList(reportLogPageVO); + } + + /** + * @param id + * @return com.adc.da.report.entity.ReportLog + * @author bu + * @date 2023-05-06 + * @description 根据id查询 + */ + public ReportLogBook selectById(String id) { + return baseMapper.selectById(id); + } + + /** + * @param reportLogBook + * @return boolean + * @author bu + * @date 2023-05-06 + * @description 单条数据新增/更改 + */ + public void saveOrUpdateSingle(ReportLogBook reportLogBook) { + if (StringUtils.isEmpty(reportLogBook.getId())) { + baseMapper.insert(reportLogBook); + } else { + baseMapper.updateById(reportLogBook); + } + } + + /** + * @param deleteParamVO + * @return void + * @author bu + * @date 2023-05-06 + * @description 根据id或id数组进行删除 + */ + public void deleteById(DeleteParamRequestVO deleteParamVO) { + if (ObjectUtils.isEmpty(deleteParamVO)) { + return; + } + List ids = new ArrayList<>(); + + if (!ObjectUtils.isEmpty(deleteParamVO.getId())) { + ids.add(deleteParamVO.getId()); + } + if (!ObjectUtils.isEmpty(deleteParamVO.getIds())) { + ids.addAll(deleteParamVO.getIds()); + } + if (ObjectUtils.isEmpty(deleteParamVO)) { + return; + } +// Q wrapper = new EntityWrapper(); +// wrapper.in("id",ids); +// ReportLog reportLog = new ReportLog(); +// reportLog.setDel(YesOrNoEnum.YES.getValue()); +// baseMapper.update(reportLog,wrapper); + } +} diff --git a/adc-da-report/src/main/java/com/adc/da/report/vo/ReportLogPageVO.java b/adc-da-report/src/main/java/com/adc/da/report/vo/ReportLogPageVO.java new file mode 100644 index 0000000..9b86d93 --- /dev/null +++ b/adc-da-report/src/main/java/com/adc/da/report/vo/ReportLogPageVO.java @@ -0,0 +1,31 @@ +package com.adc.da.report.vo; + +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * @author bu + * @version 1.0 + * @description 报告日志查询条件VO + * @date 2023-05-06 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class ReportLogPageVO extends BasePageVO { + + + /** + * + */ + private String reportId; + + /** + * 类型 1预览 2下载 3点赞 + */ + private Integer type; + + /** + * 操作人 + */ + private String userId; +} diff --git a/adc-da-report/src/main/resources/mybatis/mapper/mysql/ReportLogMapper.xml b/adc-da-report/src/main/resources/mybatis/mapper/mysql/ReportLogMapper.xml new file mode 100644 index 0000000..a1f9090 --- /dev/null +++ b/adc-da-report/src/main/resources/mybatis/mapper/mysql/ReportLogMapper.xml @@ -0,0 +1,74 @@ + + + + + + + + + + + + + + + + report_log + + + + + id, + update_time, + report_id, type, user_id + + + + + + AND del = '${@com.adc.da.sys.constant.YesOrNoEnum@NO.value}' + + + AND report_id LIKE CONCAT(CONCAT('%',#{pageVO.reportId}),'%') + + + AND type = #{pageVO.type} + + + AND user_id LIKE CONCAT(CONCAT('%',#{pageVO.userId}),'%') + + + + + + + + + + + + + + + diff --git a/adc-da-report/target/classes/com/adc/da/report/controller/ReportManageConroller.class b/adc-da-report/target/classes/com/adc/da/report/controller/ReportManageConroller.class deleted file mode 100644 index c97520f706640339033c79db981b02bf34b0ebd6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 13646 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 L9`TG?q0awb!oB!o diff --git a/adc-da-report/target/classes/com/adc/da/report/util/PdfUtil.class b/adc-da-report/target/classes/com/adc/da/report/util/PdfUtil.class deleted file mode 100644 index fafc618b1f857771db48644f1309a2446bfe8117..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6335 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 V`!P<0uU@skRnO;db4|hfe+n)VKr8?N diff --git a/adc-da-report/target/classes/com/adc/da/report/util/PptUtil.class b/adc-da-report/target/classes/com/adc/da/report/util/PptUtil.class deleted file mode 100644 index 595c61b5c0e229981d7f6d60013f412a9af076c4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 14669 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 bd%U0DM=dykeyGOhfi}r0PTO~1<{SP82nYbH diff --git a/adc-da-report/target/classes/mybatis/mapper/mysql/ReportManageMapper.xml b/adc-da-report/target/classes/mybatis/mapper/mysql/ReportManageMapper.xml deleted file mode 100644 index d877337..0000000 --- a/adc-da-report/target/classes/mybatis/mapper/mysql/ReportManageMapper.xml +++ /dev/null @@ -1,228 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -