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 index 281ad62..6178f7c 100644 --- 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 @@ -1,7 +1,7 @@ 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.service.IReportLogBookService; import com.adc.da.report.vo.DeleteParamRequestVO; import com.adc.da.report.vo.ReportLogPageVO; import com.adc.da.util.http.ResponseMessage; @@ -24,7 +24,7 @@ import java.util.List; public class ReportLogBookController { @Autowired - private IReportLogService reportLogService; + private IReportLogBookService reportLogBookService; /** * @param reportLogPageVO @@ -39,7 +39,7 @@ public class ReportLogBookController { public ResponseMessage> page(@RequestBody ReportLogPageVO reportLogPageVO){ //分页查询 - Page reportLogIPage = reportLogService.selectPage(reportLogPageVO); + Page reportLogIPage = reportLogBookService.selectPage(reportLogPageVO); return Result.success(reportLogIPage); } @@ -56,7 +56,7 @@ public class ReportLogBookController { public ResponseMessage> list(@RequestBody ReportLogPageVO reportLogPageVO) { //列表查询 - List reportLogBookList = reportLogService.selectList(reportLogPageVO); + List reportLogBookList = reportLogBookService.selectList(reportLogPageVO); return Result.success(reportLogBookList); } @@ -73,7 +73,7 @@ public class ReportLogBookController { public ResponseMessage info(@PathVariable("id") String id){ //根据id查询 - ReportLogBook reportLogBook = reportLogService.selectById(id); + ReportLogBook reportLogBook = reportLogBookService.selectById(id); return Result.success(reportLogBook); } @@ -90,7 +90,7 @@ public class ReportLogBookController { public ResponseMessage saveOrUpdate(@RequestBody ReportLogBook reportLogBook){ //单条数据新增/更改 - reportLogService.saveOrUpdateSingle(reportLogBook); + reportLogBookService.saveOrUpdateSingle(reportLogBook); return Result.success(reportLogBook.getId()); } @@ -106,7 +106,7 @@ public class ReportLogBookController { public ResponseMessage delete(@RequestBody DeleteParamRequestVO deleteParamRequestVO){ //单条/批量删除数据 - reportLogService.deleteById(deleteParamRequestVO); + reportLogBookService.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 2439227..bc4127c 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 @@ -3,7 +3,7 @@ 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.dao.mysql.ReportLogBookDao; import com.adc.da.report.eo.FileEntity; import com.adc.da.report.eo.ReportEntity; import com.adc.da.report.eo.ReportLogBook; @@ -16,6 +16,7 @@ import com.adc.da.report.vo.ReportQueryVo; import com.adc.da.report.vo.ReportVo; import com.adc.da.util.http.ResponseMessage; import com.adc.da.util.http.Result; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -78,7 +79,7 @@ public class ReportManageConroller { private ReportDao reportDao; @Autowired - private ReportLogDao reportLogDao; + private ReportLogBookDao reportLogBookDao; /** * 新增或编辑报告 * @param vo @@ -176,10 +177,42 @@ public class ReportManageConroller { reportLog.setType(1); reportLog.setUpdateTime(new Date()); reportLog.setUserId(UserUtils.getUserId()); - reportLogDao.insert(reportLog); + reportLogBookDao.insert(reportLog); return Result.success(map); } + + /** + * 点赞 + * @return + */ + @ApiOperation("点赞") + @GetMapping("/praise/{reportId}") + public ResponseMessage praise(@PathVariable("reportId") String reportId) { + ReportLogBook reportLog = new ReportLogBook(); + reportLog.setReportId(reportId); + reportLog.setType(3); + reportLog.setUpdateTime(new Date()); + reportLog.setUserId(UserUtils.getUserId()); + reportLogBookDao.insert(reportLog); + return Result.success(reportLog.getId()); + } + + /** + * 取消点赞 + * @return + */ + @ApiOperation("取消点赞") + @GetMapping("/delPraise/{reportId}") + public ResponseMessage delPraise(@PathVariable("reportId") String reportId) { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(ReportLogBook::getReportId,reportId); + wrapper.eq(ReportLogBook::getUserId,UserUtils.getUserId()); + wrapper.eq(ReportLogBook::getType,3); + reportLogBookDao.delete(wrapper); + return Result.success(); + } + /** * 测试 */ @@ -368,10 +401,12 @@ public class ReportManageConroller { reportLog.setType(2); reportLog.setUpdateTime(new Date()); reportLog.setUserId(UserUtils.getUserId()); - reportLogDao.insert(reportLog); + reportLogBookDao.insert(reportLog); } + + /** * 权限审批流程 添加报告按钮 可添加的报告 * @return 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/ReportLogBookDao.java similarity index 93% rename from adc-da-report/src/main/java/com/adc/da/report/dao/mysql/ReportLogDao.java rename to adc-da-report/src/main/java/com/adc/da/report/dao/mysql/ReportLogBookDao.java index 27c6ac4..639065a 100644 --- 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/ReportLogBookDao.java @@ -15,7 +15,7 @@ import java.util.List; * @description 报告日志 Mapper接口 * @date 2023-05-06 */ -public interface ReportLogDao extends BaseMapper { +public interface ReportLogBookDao extends BaseMapper { /** * @param reportLogPageVO @@ -28,7 +28,6 @@ public interface ReportLogDao extends BaseMapper { /** * @param reportLogPageVO - * @param page * @author bu * @date 2023-05-06 * @description 使用分页插件进行查询总数 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 index 5ac309c..576c565 100644 --- 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 @@ -15,7 +15,7 @@ import java.util.Date; * @date 2023-05-06 */ @Data -@TableName("report_log") +@TableName("report_log_book") public class ReportLogBook { @TableId("id") 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/IReportLogBookService.java similarity index 94% rename from adc-da-report/src/main/java/com/adc/da/report/service/IReportLogService.java rename to adc-da-report/src/main/java/com/adc/da/report/service/IReportLogBookService.java index 158a554..66427ba 100644 --- 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/IReportLogBookService.java @@ -13,7 +13,7 @@ import java.util.List; * @description 报告日志 * @date 2023-05-06 */ -public interface IReportLogService { +public interface IReportLogBookService { Page selectPage(ReportLogPageVO reportLogPageVO); 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/IReportLogBookServiceImpl.java similarity index 92% rename from adc-da-report/src/main/java/com/adc/da/report/service/impl/IReportLogServiceImpl.java rename to adc-da-report/src/main/java/com/adc/da/report/service/impl/IReportLogBookServiceImpl.java index 27cff3b..de725e9 100644 --- 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/IReportLogBookServiceImpl.java @@ -1,9 +1,9 @@ package com.adc.da.report.service.impl; -import com.adc.da.report.dao.mysql.ReportLogDao; +import com.adc.da.report.dao.mysql.ReportLogBookDao; import com.adc.da.report.eo.ReportLogBook; -import com.adc.da.report.service.IReportLogService; +import com.adc.da.report.service.IReportLogBookService; import com.adc.da.report.vo.DeleteParamRequestVO; import com.adc.da.report.vo.ReportLogPageVO; import com.adc.da.util.utils.StringUtils; @@ -24,7 +24,7 @@ import java.util.List; */ @Slf4j @Service -public class IReportLogServiceImpl extends ServiceImpl implements IReportLogService { +public class IReportLogBookServiceImpl extends ServiceImpl implements IReportLogBookService { /** * @param reportLogPageVO diff --git a/adc-da-report/src/main/resources/mybatis/mapper/mysql/ReportLogMapper.xml b/adc-da-report/src/main/resources/mybatis/mapper/mysql/ReportLogBookDao.xml similarity index 96% rename from adc-da-report/src/main/resources/mybatis/mapper/mysql/ReportLogMapper.xml rename to adc-da-report/src/main/resources/mybatis/mapper/mysql/ReportLogBookDao.xml index a1f9090..9c69a3b 100644 --- a/adc-da-report/src/main/resources/mybatis/mapper/mysql/ReportLogMapper.xml +++ b/adc-da-report/src/main/resources/mybatis/mapper/mysql/ReportLogBookDao.xml @@ -1,6 +1,6 @@ - + @@ -13,7 +13,7 @@ - report_log + report_log_book