diff --git a/adc-da-slrs/src/main/java/com/adc/da/Log/BusinessType.java b/adc-da-slrs/src/main/java/com/adc/da/Log/BusinessType.java index f99852a7..6a7716ef 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/Log/BusinessType.java +++ b/adc-da-slrs/src/main/java/com/adc/da/Log/BusinessType.java @@ -4,25 +4,29 @@ public enum BusinessType { /** * 其他 */ - OTHER, + 其他, /** * 新增 */ - INSERT, + 新增, /** * 修改 */ - UPDATE, + 修改, /** * 删除 */ - DELETE, + 删除, /** * 查询 */ - SEARCH, + 查询, /** * 下载 */ - DOWNLOAD, + 下载, + + 带水印下载, + + 预览, } diff --git a/adc-da-slrs/src/main/java/com/adc/da/Log/EpcLog.java b/adc-da-slrs/src/main/java/com/adc/da/Log/EpcLog.java index 128cbbe0..e1977d9f 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/Log/EpcLog.java +++ b/adc-da-slrs/src/main/java/com/adc/da/Log/EpcLog.java @@ -18,7 +18,7 @@ public @interface EpcLog { /** * 功能 */ - public BusinessType businessType() default BusinessType.OTHER; + public BusinessType businessType() default BusinessType.其他; String description(); diff --git a/adc-da-slrs/src/main/java/com/adc/da/Log/logs.java b/adc-da-slrs/src/main/java/com/adc/da/Log/logs.java index 457caa71..46cf6559 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/Log/logs.java +++ b/adc-da-slrs/src/main/java/com/adc/da/Log/logs.java @@ -79,18 +79,60 @@ public class logs { //特殊处理 if ("1".equals(speclaiFlag)){ - //这个是国内或者海外的查询接 + //这个是国内或者海外的查询接口 String gson=new Gson().toJson(returnValue); JSONObject jsonObject= JSON.parseObject(gson); JSONObject object= JSON.parseObject(jsonObject.getString("data")); - log.setSpecial(object.getString("standSort")+" "+object.getString("standNumber")+"-"+object.getString("standYear")+" "+object.getString("standName")+" "+speclaiValue); + if (null!=object.getString("standName") && !"".equals(object.getString("standName"))) { + log.setSpecial(object.getString("standSort") + " " + object.getString("standNumber") + "-" + object.getString("standYear") + " " + object.getString("standName") + " " + speclaiValue); + }else { + log.setSpecial(object.getString("standSort") + " " + object.getString("standNumber") + "-" + object.getString("standYear") + " " + object.getString("standEnName") + " " + speclaiValue); + } + }else if ("Invaliddownload1".equals(speclaiFlag) || "Invaliddownload2".equals(speclaiFlag) || "2".equals(speclaiFlag)){ + StringBuilder stringBuilder1=new StringBuilder(); + for (String s:logParams.keySet()){ + if (s.equals("standNumber")) { + stringBuilder1.append(logParams.get(s)[0]); + } else if (s.equals("standName")) { + stringBuilder1.append(" "+logParams.get(s)[0]); + } + } + stringBuilder1.append(" "+speclaiValue); + log.setSpecial(stringBuilder1.toString()); + }else if ("Foreigndownload1".equals(speclaiFlag) || "Foreigndownload2".equals(speclaiFlag) || "3".equals(speclaiFlag)){ + StringBuilder stringBuilder1=new StringBuilder(); + for (String s:logParams.keySet()){ + if (s.equals("standNumber")) { + stringBuilder1.append(logParams.get(s)[0]); + } else if (s.equals("standName")) { + stringBuilder1.append(" "+logParams.get(s)[0]); + } + } + stringBuilder1.append(" "+speclaiValue); + log.setSpecial(stringBuilder1.toString()); + }else if ("5".equals(speclaiFlag)){ + String gson=new Gson().toJson(returnValue); + JSONObject jsonObject= JSON.parseObject(gson); + JSONObject object= JSON.parseObject(jsonObject.getString("data")); + log.setSpecial(object.getString("standCode")+" "+object.getString("standName")+" "+speclaiValue); + }else if ("Buss".equals(speclaiFlag)){ + StringBuilder stringBuilder1=new StringBuilder(); + for (String s:logParams.keySet()){ + if (s.equals("standCode")) { + stringBuilder1.append(logParams.get(s)[0]); + } else if (s.equals("standName")) { + stringBuilder1.append(" "+logParams.get(s)[0]); + } + } + + log.setSpecial(stringBuilder1+" "+speclaiValue); } // ##请求开始时间 long endTime = System.currentTimeMillis(); // ##请求耗时 Long logElapsedTime = endTime - beginTime; log.setRunTime(logElapsedTime.intValue()); - log.setOperTime(DateTime.of(new Date())); + log.setOperTime(new Date()); // ##调用线程保存至log表 executor.execute(new SaveSystemLogThread(log, sysLogService)); } catch (Exception e) { diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java index 640a820f..f0993f03 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java @@ -1,6 +1,8 @@ package com.adc.da.slrs.sarBussionessStand.controller; +import com.adc.da.Log.BusinessType; +import com.adc.da.Log.EpcLog; import com.adc.da.common.ReadExcel; import com.adc.da.person.service.IPersonCollectEOService; import com.adc.da.slrs.sarBussionessStand.service.ISarBussionessStandService; @@ -8,6 +10,7 @@ import com.adc.da.slrs.sarResource.entity.TsResource; import com.adc.da.slrs.sarResource.service.ITsResourceService; import com.adc.da.slrs.sarStandardsInfo.entity.SarAdvanceSearchVO; import com.adc.da.slrs.sarStandardsInfo.entity.SarBussionessStandEOPage; +import com.adc.da.slrs.sarStandardsInfo.entity.SarStandardsInfo; import com.adc.da.slrs.sarUser.service.ITsUserService; import com.adc.da.sys.entity.DicTypeEO; import com.adc.da.sys.service.IDicTypeEOService; @@ -200,7 +203,7 @@ public class SarBussionessStandController extends BaseController getStandInfoById(String id) throws Exception { SarBussionessStand result = sarBussionessStandEOService.selectStandardsInfoByKey(id); String collectId = personCollectEOService.queryCollectByUserAndId(id); @@ -323,5 +326,26 @@ public class SarBussionessStandController extends BaseController @ApiOperation(value = "|SarStandardsInfoEO|详情") @GetMapping("/getStandInfoById") - @EpcLog(description = "国内详情查询",businessType = BusinessType.SEARCH,speclaiFlag = "1",speclaiValue = "查询详情") + @EpcLog(description = "国内或国外详情查询",businessType = BusinessType.查询,speclaiFlag = "1",speclaiValue = "查询详情") public ResponseMessage find(String id) throws Exception { SarStandardsInfo result = sarStandardsInfoEOService.selectStandardsInfoByKey(id); return Result.success(result); @@ -723,4 +723,46 @@ public class SarStandardsInfoController extends BaseController } + @ApiOperation(value = "国内预览日志") + @GetMapping("/logInvalid") + @EpcLog(description = "国内预览",businessType = BusinessType.预览 , speclaiFlag = "2" ,speclaiValue = "预览") + public String logInvalid(SarStandardsInfo sarStandardsInfo) { + return "1"; + } + + @ApiOperation(value = "海外预览日志") + @GetMapping("/logForeign") + @EpcLog(description = "海外预览",businessType = BusinessType.预览 , speclaiFlag = "3" ,speclaiValue = "预览") + public String logForeign(SarStandardsInfo sarStandardsInfo) { + return "1"; + } + + @ApiOperation(value = "国内下载不带水印") + @GetMapping("/logInvalidDownload1") + @EpcLog(description = "国内下载",businessType = BusinessType.下载 , speclaiFlag = "Invaliddownload1" ,speclaiValue = "下载") + public String logInvalidDownload(SarStandardsInfo sarStandardsInfo) { + return "1"; + } + + @ApiOperation(value = "国内下载带水印") + @GetMapping("/logInvalidDownload2") + @EpcLog(description = "国内下载",businessType = BusinessType.带水印下载 , speclaiFlag = "Invaliddownload2" ,speclaiValue = "下载") + public String logInvalidDownload2(SarStandardsInfo sarStandardsInfo) { + return "1"; + } + + @ApiOperation(value = "海外下载不带水印") + @GetMapping("/logForeignDownload1") + @EpcLog(description = "海外下载",businessType = BusinessType.下载 , speclaiFlag = "Foreigndownload1" ,speclaiValue = "下载") + public String logForeignDownload(SarStandardsInfo sarStandardsInfo) { + return "1"; + } + + @ApiOperation(value = "海外下载带水印") + @GetMapping("/logForeignDownload2") + @EpcLog(description = "海外下载",businessType = BusinessType.带水印下载 , speclaiFlag = "Foreigndownload2" ,speclaiValue = "下载") + public String logForeignDownload2(SarStandardsInfo sarStandardsInfo) { + return "1"; + } + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sysLog/entity/SysLog.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sysLog/entity/SysLog.java index 3dde3e60..bb1adb80 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sysLog/entity/SysLog.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sysLog/entity/SysLog.java @@ -3,11 +3,15 @@ package com.adc.da.slrs.sysLog.entity; import cn.hutool.core.date.DateTime; import com.adc.da.base.entity.BaseEntity; import com.baomidou.mybatisplus.annotation.TableField; +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.springframework.format.annotation.DateTimeFormat; + +import java.util.Date; /** *

@@ -31,7 +35,9 @@ public class SysLog extends BaseEntity { private String userId; @ApiModelProperty(value = "操作时间") - private DateTime operTime; + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date operTime; @ApiModelProperty(value = "操作类型") private String oper;