From e844a6fdbacc87732b0b02ae4e3e91c237941d77 Mon Sep 17 00:00:00 2001 From: bupengxiang Date: Mon, 15 May 2023 14:39:13 +0800 Subject: [PATCH] =?UTF-8?q?[=E4=BF=AE=E6=94=B9]=20=E6=8A=A5=E5=91=8A?= =?UTF-8?q?=E7=AE=A1=E7=90=86=20=E6=93=8D=E4=BD=9C=E6=97=A5=E5=BF=97=20?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=20=E4=BF=AE=E6=94=B9=20=E9=A2=84=E8=A7=88=20?= =?UTF-8?q?=E4=B8=8B=E8=BD=BD=20=E5=88=A0=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../adc/da/report/Timer/secrecyDDLTimer.java | 1 + .../adc/da/report/aspect/ReportLogAspect.java | 20 +++++------- .../controller/ReportManageConroller.java | 30 +++++++++++++++--- .../service/impl/IReportServiceImpl.java | 17 ++++++++++ .../impl/ITtReportManageActServiceImpl.java | 25 +++++++++++++++ .../impl/IReportContentServiceImpl.class | Bin 3610 -> 4161 bytes .../impl/ITtReportManageActServiceImpl.class | Bin 6444 -> 7658 bytes 7 files changed, 77 insertions(+), 16 deletions(-) diff --git a/adc-da-report/src/main/java/com/adc/da/report/Timer/secrecyDDLTimer.java b/adc-da-report/src/main/java/com/adc/da/report/Timer/secrecyDDLTimer.java index 40d5615..906f8de 100644 --- a/adc-da-report/src/main/java/com/adc/da/report/Timer/secrecyDDLTimer.java +++ b/adc-da-report/src/main/java/com/adc/da/report/Timer/secrecyDDLTimer.java @@ -25,6 +25,7 @@ public class secrecyDDLTimer { @Autowired ReportDao reportDao; +// @Scheduled(cron="0 0 0 * * *") @Scheduled(cron="0 0/10 * * * ?") public void timingOpen() { log.info("**********************保密到期定时任务开始**********************"); diff --git a/adc-da-report/src/main/java/com/adc/da/report/aspect/ReportLogAspect.java b/adc-da-report/src/main/java/com/adc/da/report/aspect/ReportLogAspect.java index 50737c3..5a561a1 100644 --- a/adc-da-report/src/main/java/com/adc/da/report/aspect/ReportLogAspect.java +++ b/adc-da-report/src/main/java/com/adc/da/report/aspect/ReportLogAspect.java @@ -1,11 +1,11 @@ package com.adc.da.report.aspect; import com.adc.da.login.util.CommonUtils; +import com.adc.da.login.util.UserUtils; import com.adc.da.report.annotation.ReportLog; import com.adc.da.report.eo.LogEntity; +import com.adc.da.report.eo.ReportEntity; import com.adc.da.report.service.ILogService; -import com.adc.da.report.vo.ReportVo; -import com.adc.da.sys.entity.UserEO; import com.adc.da.util.http.ResponseMessage; import com.adc.da.util.utils.StringUtils; import lombok.extern.slf4j.Slf4j; @@ -13,16 +13,14 @@ import org.aspectj.lang.ProceedingJoinPoint; import org.aspectj.lang.annotation.Around; import org.aspectj.lang.annotation.Aspect; import org.aspectj.lang.annotation.Pointcut; -import javax.annotation.Resource; import org.springframework.stereotype.Component; import org.springframework.web.bind.annotation.ResponseBody; +import javax.annotation.Resource; import java.lang.reflect.Method; import java.text.SimpleDateFormat; import java.util.Date; import java.util.List; -import java.util.Map; -import java.util.Optional; /** * @Author doudxw @@ -64,9 +62,7 @@ public class ReportLogAspect { SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); LogEntity entity = new LogEntity(); - String account = Optional.ofNullable(CommonUtils.getUserInfo()).orElse(new UserEO()).getAccount(); - account = StringUtils.isEmpty(account) ? "未知用户" : account; - entity.setAccount(account); + entity.setAccount(UserUtils.getUser().getAccount()); entity.setClassName(cs.getName()); entity.setOperateTime(format.format(new Date())); entity.setMethod(name); @@ -74,11 +70,11 @@ public class ReportLogAspect { entity.setUsid(CommonUtils.getUserId()); //新增或者编辑操作 if ("新增或编辑".equals(description)) { - Map map = (Map) returnValue.getData(); - String reportName = map.get("reportName"); + ReportEntity reportEntity = (ReportEntity) returnValue.getData(); + String reportName = reportEntity.getName(); entity.setReportName(reportName); - ReportVo vo = (ReportVo) args[0]; - if (StringUtils.isNotEmpty(vo.getId())) { + ReportEntity vo = (ReportEntity) args[0]; + if (StringUtils.isEmpty(vo.getId())) { entity.setDescription("新增"); } else { entity.setDescription("编辑"); 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 a7697db..fcfc9e1 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 @@ -6,9 +6,11 @@ import com.adc.da.report.annotation.ReportLog; import com.adc.da.report.dao.mysql.ReportDao; import com.adc.da.report.dao.mysql.ReportLogBookDao; import com.adc.da.report.eo.FileEntity; +import com.adc.da.report.eo.LogEntity; 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.ILogService; import com.adc.da.report.service.IReportService; import com.adc.da.report.util.LocalFileUtil; import com.adc.da.report.util.OSSClientUtil; @@ -90,6 +92,8 @@ public class ReportManageConroller { @Resource private WaterMarkUtil waterMarkUtil; + @Resource + private ILogService logService; /** * 新增或编辑报告 * 弃用 @@ -124,11 +128,12 @@ public class ReportManageConroller { */ @ApiOperation("新增或编辑报告") @PostMapping("/saveOrUpdate") -// @ReportLog(description = "新增或编辑") + @ReportLog(description = "新增或编辑") public ResponseMessage saveOrUpdate(@RequestBody ReportEntity reportEntity) throws IOException { - - reportService.addOrUpdate(reportEntity); - return Result.success(); + ReportEntity re = new ReportEntity(); + BeanUtils.copyProperties(reportEntity,re); + reportService.addOrUpdate(re); + return Result.success(reportEntity); } /** * 判断报告名称是否被占用 @@ -534,9 +539,26 @@ public class ReportManageConroller { reportLog.setUpdateTime(new Date()); reportLog.setUserId(UserUtils.getUserId()); reportLogBookDao.insert(reportLog); + + //报告日志管理 + ReportEntity reportEntity = reportDao.selectById(repostId); + reportLog(reportEntity.getName(),"下载"); } } + public void reportLog(String reportName,String desc){ + SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + LogEntity entity = new LogEntity(); + + entity.setAccount(UserUtils.getUser().getAccount()); + entity.setClassName("com.adc.da.report.controller.ReportManageConroller"); + entity.setOperateTime(format.format(new Date())); + entity.setMethod("downloadPic"); + entity.setUsid(UserUtils.getUserId()); + entity.setReportName(reportName); + entity.setDescription(desc); + logService.insert(entity); + } /** * 权限审批流程 添加报告按钮 可添加的报告 diff --git a/adc-da-report/src/main/java/com/adc/da/report/service/impl/IReportServiceImpl.java b/adc-da-report/src/main/java/com/adc/da/report/service/impl/IReportServiceImpl.java index e557c76..14cf88c 100644 --- a/adc-da-report/src/main/java/com/adc/da/report/service/impl/IReportServiceImpl.java +++ b/adc-da-report/src/main/java/com/adc/da/report/service/impl/IReportServiceImpl.java @@ -118,6 +118,8 @@ public class IReportServiceImpl extends ServiceImpl @Resource private UserEODao userEODao; + @Resource + private ILogService logService; @Override @@ -705,9 +707,24 @@ public class IReportServiceImpl extends ServiceImpl reportDetailVo.setDownPower(1); } } + //报告日志管理 + reportLog(reportDetailVo.getName(),"预览"); return Result.success(reportDetailVo); } + public void reportLog(String reportName,String desc){ + SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + LogEntity entity = new LogEntity(); + + entity.setAccount(UserUtils.getUser().getAccount()); + entity.setClassName("com.adc.da.report.service.impl.IReportServiceImpl"); + entity.setOperateTime(format.format(new Date())); + entity.setMethod("reportDetail"); + entity.setUsid(UserUtils.getUserId()); + entity.setReportName(reportName); + entity.setDescription(desc); + logService.insert(entity); + } /** * 创建htmlstring * diff --git a/adc-da-report/src/main/java/com/adc/da/report/service/impl/ITtReportManageActServiceImpl.java b/adc-da-report/src/main/java/com/adc/da/report/service/impl/ITtReportManageActServiceImpl.java index 31cd257..8ad2cdd 100644 --- a/adc-da-report/src/main/java/com/adc/da/report/service/impl/ITtReportManageActServiceImpl.java +++ b/adc-da-report/src/main/java/com/adc/da/report/service/impl/ITtReportManageActServiceImpl.java @@ -2,11 +2,14 @@ package com.adc.da.report.service.impl; import cn.hutool.core.bean.BeanUtil; +import com.adc.da.login.util.UserUtils; import com.adc.da.report.dao.mysql.PowerApplyDao; import com.adc.da.report.dao.mysql.ReportDao; import com.adc.da.report.dao.mysql.TtReportManageActDao; +import com.adc.da.report.eo.LogEntity; import com.adc.da.report.eo.ReportEntity; import com.adc.da.report.eo.TtReportManageAct; +import com.adc.da.report.service.ILogService; import com.adc.da.report.service.IReportContentService; import com.adc.da.report.service.ITtReportManageActService; import com.adc.da.report.vo.DeleteParamRequestVO; @@ -22,7 +25,9 @@ import org.springframework.util.ObjectUtils; import javax.annotation.Resource; import java.io.IOException; +import java.text.SimpleDateFormat; import java.util.ArrayList; +import java.util.Date; import java.util.List; /** @@ -38,6 +43,9 @@ public class ITtReportManageActServiceImpl extends ServiceImplhAy6vlsdmh{X`lM*miMgjykCX?s{alu431Gtbyl0Xcoc#{ldV3-+ZhRtno z-$lI&5>Qc8)QB2`lRy*_mstAdi)EE%`JfLz`WK`;J)tbAym+f_pRd2}{?0jlPWM-i zSLJ`4JaZPfjtQF@`htXsm$HrRiiBc^jem+v8kDl}kv3?jB4blZHbBmt*=4hvJqGQy z*~k3>9x#&!Z64y`0C_XnZ}SL`Dju_`AZznDPuR`EKN;XDn|VB~c*fXg70=l`&kHtH zylBgg0|vch(96c@D>g2#DqgcW$RQ*By5g{+fAD19<4$-R-CA$|(ixdpI+e*arjof> zGG{TPJ?HdnZ+6lhPIn?!Oz((fA@PVm3w!n6o>)2;PbIU8qeFGRA#3&uR%({9T=9nH zP2RGY@3wm9yX7U7o;t-5&HJ3t z)YG8&K=UCVS(G@5cq%JfZe)pKK=ZL-{fShMlhEAEQpHKlCx+D9oZU_|o{FxCo7g|q ze8!;WbA~K}Q;BYl_i9e@h1a6Z9rx8lo!;KK$;U}VckYU1_C@16(uwFg0~`CCc(OC& zq|>pCroga8STZYje=jLtIHEaiQd+?o&8Ug`OTN;aHRv2G6=RxlzIJD-rDfk}zU4d3 z)m&rIAZ{Cm4ynVQQh(8-#fEUTJLaqH_@A*fSa@PPEtZ6viU}v2(jkX&OK@$%ZKG5Sk$7p)Z`_v!-G^?xJ80X#a=7_;;cLxkE!nTg&Sl+YI=U5MC?sP z6{-F-PRe{CmzTrRa~G0$WiIU~<1Hc;6>Ew0M~1Nmi`tDc8c(o*RWjeIs`@}E z@I95IRCSH8peCe-xvV}I2?YyW-g$yqp+HC#xS}%>3KY1qGvqIDRmeBO!cG&Q7ZczH z%H6;8qWl1NNCU5xc4}gRW`3ZBpJ?S5+W3uj{-C3n#1;wkoD|}A*&j3^pHIi2wZ)q^ zs7a8AGJY1N7V#98hHVwj$6^M#lXa5t0oIFlyIj#hTJj=aC$a-lm-QkYkicLr{z+OD zor=2@U2`fXS*6%moNX%OZrS3Ki@b+>1qD440OFcrSCq-ZX8G^igw=y1irxPfYk~0Q l3(g9UP(4Is(Dam5ypXAiRY}l2!g=T=RY|IitPOj=Rup^J7lIMg z#OSN>-7nw=@Dmv4T#SkF;hdTI&zbp8IbVvK3bS8-efR{7;EkpaYjY@JU5xd(idscN z6Yc;vSglSIVx!eIDK=|jB%^GxFX$ei;}{CdwySq^&o-b7t}Lo&TRqd3=E7ix97R#0ge%^1ab!v!un6nQPdB5zKl zuv;ku441fUxWZL~$5n?s?`KY4%22^Ihw$b->Dr8;i~)+XhU?rg3}=Mmrr{R19U^Wj zna;?QAq-VC8SYp#oJuELNivdAio1qp3z{wNZnr#{E}xOKRo^q*=Yd11=Y~s*6b}uL zY!wweHaxLJPpMQqGd$;o_gRgPy)?YywV@yVTcgqM0k1ih_R^*~TOu2D=!>Geb;?=; zNN#Jd#t1? z7wL!$$J=mP{M_T@woJ&H$IERx9x#E4VmVA=viv#;c23C0%Mq+S{+7U?_XGocCN%#e z;hHugaZl$SDf>u4O*@4H^Hm!?Dx>lI=sS8==ZD`>lpkuRxZ08iv7}Sz?ET0cntjR~ z-Y}0As%T@rU&QJTqCZ6lrM$NDvf5P90_4gPrZHV|m2#OGf`#NuG%}M}QsyPGXG`7) zH|WJ&v6SqwtFTlN6%Oc3@D~dd3$luZibVx^EEYH!i;6@RB%;#VdiT}s;N)k<&Mq~kZ)G1+1%vqrE0D_P~s)qYaz4X%OTGzgyS diff --git a/adc-da-report/target/classes/com/adc/da/report/service/impl/ITtReportManageActServiceImpl.class b/adc-da-report/target/classes/com/adc/da/report/service/impl/ITtReportManageActServiceImpl.class index 2f128353956a243bbd22849b30ac9007f43d9488..f30b9df3bcd84faeeb8e197de92a80a0050fdcc5 100644 GIT binary patch delta 2923 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