From 18174a848fd39a3bd6f67bdb0d2eb89bf497a0b6 Mon Sep 17 00:00:00 2001 From: cfl Date: Fri, 8 Sep 2023 20:33:12 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=BF=BD=E8=AE=BF=E8=AE=B0?= =?UTF-8?q?=E5=BD=95=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/lyms/talkonlineweb/aop/LogsAspect.java | 56 ++++++++++++++++++++++ .../controller/XljcPatientController.java | 5 ++ .../controller/XljcTraceController.java | 27 +++++++++++ .../talkonlineweb/domain/LymsXljcRecordTrace.java | 2 +- .../com/lyms/talkonlineweb/enums/TraceWayEnum.java | 32 +++++++++++++ .../talkonlineweb/request/XljcTraceRequest.java | 4 ++ .../talkonlineweb/result/XljcArchiveResult.java | 2 + .../lyms/talkonlineweb/result/XljcTraceRecord.java | 8 ++++ .../main/resources/mapper/LymsXljcRecordMapper.xml | 1 + .../resources/mapper/LymsXljcRecordTraceMapper.xml | 21 ++++++-- 10 files changed, 152 insertions(+), 6 deletions(-) create mode 100644 talkonlineweb/src/main/java/com/lyms/talkonlineweb/aop/LogsAspect.java create mode 100644 talkonlineweb/src/main/java/com/lyms/talkonlineweb/enums/TraceWayEnum.java diff --git a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/aop/LogsAspect.java b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/aop/LogsAspect.java new file mode 100644 index 0000000..e703a30 --- /dev/null +++ b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/aop/LogsAspect.java @@ -0,0 +1,56 @@ +package com.lyms.talkonlineweb.aop; + +import lombok.extern.log4j.Log4j2; +import lombok.extern.slf4j.Slf4j; +import org.aspectj.lang.JoinPoint; +import org.aspectj.lang.annotation.AfterReturning; +import org.aspectj.lang.annotation.Aspect; +import org.aspectj.lang.annotation.Before; +import org.aspectj.lang.annotation.Pointcut; +import org.springframework.stereotype.Component; +import org.springframework.web.context.request.RequestContextHolder; +import org.springframework.web.context.request.ServletRequestAttributes; + +import javax.servlet.http.HttpServletRequest; +import java.util.Arrays; + +/** + * @Author: cfl + * @Description:切面日志管理 + * @Date:Created in 2023/9/8 19:03. + */ +@Aspect +@Component +@Log4j2 +public class LogsAspect { + + + ThreadLocal startTime = new ThreadLocal(); + + @Pointcut("execution(public * com.lyms.talkonlineweb.controller..*.*(..))") + public void webLog(){} + + @Before("webLog()") + public void doBefore(JoinPoint joinPoint) throws Throwable { + startTime.set(System.currentTimeMillis()); + // 接收到请求，记录请求内容 + ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes(); + HttpServletRequest request = attributes.getRequest(); + + // 记录下请求内容 + log.info("请求URL : " + request.getRequestURL().toString()); + log.info("请求方式HTTP_METHOD : " + request.getMethod()); + log.info("IP地址 : " + request.getRemoteAddr()); + log.info("设计类CLASS_METHOD : " + joinPoint.getSignature().getDeclaringTypeName() + "." + joinPoint.getSignature().getName()); + log.info("参数ARGS : " + Arrays.toString(joinPoint.getArgs())); + + } + + @AfterReturning(returning = "ret", pointcut = "webLog()") + public void doAfterReturning(Object ret) throws Throwable { + //处理完返回内容 + log.info("返回RESPONSE : " + ret); + log.info("时间SPEND TIME : " + (System.currentTimeMillis() - startTime.get())); + } + +} diff --git a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/XljcPatientController.java b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/XljcPatientController.java index 0e00613..bd633ce 100644 --- a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/XljcPatientController.java +++ b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/XljcPatientController.java @@ -9,6 +9,7 @@ import com.lyms.talkonlineweb.result.BaseResponse; import com.lyms.talkonlineweb.result.XljcPatientResult; import com.lyms.talkonlineweb.service.LymsUserService; import com.lyms.talkonlineweb.service.LymsXljcRecordService; +import com.lyms.talkonlineweb.util.BeanUtils; import com.lyms.talkonlineweb.util.StringUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -44,6 +45,10 @@ public class XljcPatientController { Page page = new Page<>(current,size); Page patientResults = lymsXljcRecordService.queryPatientList(page,patientRequest); + for(XljcPatientResult result : patientResults.getRecords()){ + result.setSexText(BeanUtils.tranferSexToText(result.getSex())); + } + return BaseResponse.ok(patientResults); } diff --git a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/XljcTraceController.java b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/XljcTraceController.java index c5c8a3c..823591a 100644 --- a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/XljcTraceController.java +++ b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/XljcTraceController.java @@ -2,17 +2,20 @@ package com.lyms.talkonlineweb.controller; import cn.afterturn.easypoi.excel.ExcelExportUtil; import cn.afterturn.easypoi.excel.entity.ExportParams; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.lyms.talkonlineweb.annotation.TokenRequired; import com.lyms.talkonlineweb.domain.LymsUser; import com.lyms.talkonlineweb.domain.LymsXljcRecordTrace; import com.lyms.talkonlineweb.enums.TraceStatusEnum; +import com.lyms.talkonlineweb.enums.TraceWayEnum; import com.lyms.talkonlineweb.request.XljcTraceRequest; import com.lyms.talkonlineweb.result.BaseResponse; import com.lyms.talkonlineweb.result.XljcTraceRecord; import com.lyms.talkonlineweb.service.LymsUserService; import com.lyms.talkonlineweb.service.LymsXljcRecordTraceService; import com.lyms.talkonlineweb.util.BeanUtils; +import com.lyms.talkonlineweb.util.DateUtil; import com.lyms.talkonlineweb.util.StringUtil; import org.apache.poi.ss.usermodel.Workbook; import org.springframework.beans.factory.annotation.Autowired; @@ -21,6 +24,7 @@ import org.springframework.web.bind.annotation.*; import javax.servlet.ServletOutputStream; import javax.servlet.http.HttpServletResponse; import java.net.URLEncoder; +import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -75,6 +79,29 @@ public class XljcTraceController { return BaseResponse.ok(traceRecords); } + @GetMapping("/list/his/{archId}") + @TokenRequired + public BaseResponse traceArchHis(@PathVariable("archId") Integer archId, @RequestHeader String authorization){ + //参数处理 + //LymsUser curUser=lymsUserService.getUserByToken(authorization); + QueryWrapper queryWrapper = new QueryWrapper(); + queryWrapper.eq("arch_id",archId); + queryWrapper.eq("next_examine_status",TraceStatusEnum.HAVE_TRACE.getCode()); + List lymsXljcRecordTraces = lymsXljcRecordTraceService.list(queryWrapper); + List records = new ArrayList<>(); + for(LymsXljcRecordTrace recordTrace : lymsXljcRecordTraces){ + XljcTraceRecord record = new XljcTraceRecord(); + record.setTraceDate(DateUtil.getyyyy_MM_dd_HH_mm_ss(recordTrace.getTraceTime())); + record.setTracePerson(recordTrace.getTracePerson()); + record.setTraceWayText(TraceWayEnum.getName(recordTrace.getTraceWay())); + record.setResult(recordTrace.getResult()); + record.setNextExamineDate(DateUtil.getyyyy_MM_dd1(recordTrace.getNextExamineDate())); + records.add(record); + } + + return BaseResponse.ok(records); + } + @PostMapping("/export") @TokenRequired public void traceListExport(@RequestBody XljcTraceRequest xljcTraceRequest, diff --git a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/domain/LymsXljcRecordTrace.java b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/domain/LymsXljcRecordTrace.java index fb7d51d..2301f18 100644 --- a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/domain/LymsXljcRecordTrace.java +++ b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/domain/LymsXljcRecordTrace.java @@ -64,7 +64,7 @@ public class LymsXljcRecordTrace implements Serializable { private String tracePerson; /** - * 追访方式 + * 追访方式 1 电话追访 2 上门追访 3 其他 */ @TableField(value = "trace_way") private Integer traceWay; diff --git a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/enums/TraceWayEnum.java b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/enums/TraceWayEnum.java new file mode 100644 index 0000000..edb60e4 --- /dev/null +++ b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/enums/TraceWayEnum.java @@ -0,0 +1,32 @@ +package com.lyms.talkonlineweb.enums; + +import lombok.Getter; + +/** + * 追访方式 + * + */ +@Getter +public enum TraceWayEnum { + + WAY_TEL(1,"电话追访"), + WAY_HOME(2,"上门追访"), + WAY_OTHER(3,"其他"); + + private Integer code; + private String name; + + TraceWayEnum(Integer code, String name){ + this.code = code; + this.name = name; + } + public static String getName(Integer code) { + TraceWayEnum[] values = TraceWayEnum.values(); + for (TraceWayEnum value : values) { + if (value.getCode().equals(code)) { + return value.getName(); + } + } + return ""; + } +} diff --git a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/request/XljcTraceRequest.java b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/request/XljcTraceRequest.java index bb7ef50..82aa3b9 100644 --- a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/request/XljcTraceRequest.java +++ b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/request/XljcTraceRequest.java @@ -9,6 +9,10 @@ public class XljcTraceRequest { private Integer overDays; + private Integer overDaysMin; + + private Integer overDaysMax; + private String traceTimeStart; private String traceTimeEnd; diff --git a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/result/XljcArchiveResult.java b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/result/XljcArchiveResult.java index 39cfa9f..a98a423 100644 --- a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/result/XljcArchiveResult.java +++ b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/result/XljcArchiveResult.java @@ -21,4 +21,6 @@ public class XljcArchiveResult { @Excel(name = "电话", width = 15,orderNum = "5") private String tel; + + private String birth; } diff --git a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/result/XljcTraceRecord.java b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/result/XljcTraceRecord.java index a79eb21..6537f50 100644 --- a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/result/XljcTraceRecord.java +++ b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/result/XljcTraceRecord.java @@ -8,8 +8,12 @@ import lombok.Data; @ExcelTarget("lyms_xljc_examine_trace") public class XljcTraceRecord extends XljcArchiveResult{ + + private Integer traceId; + private Integer archId; + private Integer rid; @Excel(name = "序号", width = 10,orderNum = "0") @@ -32,6 +36,10 @@ public class XljcTraceRecord extends XljcArchiveResult{ @Excel(name = "追访结果", width = 15,orderNum = "10") private String result; + private String tracePerson; + + private String traceWayText; + diff --git a/talkonlineweb/src/main/resources/mapper/LymsXljcRecordMapper.xml b/talkonlineweb/src/main/resources/mapper/LymsXljcRecordMapper.xml index 5b2f856..5b82054 100644 --- a/talkonlineweb/src/main/resources/mapper/LymsXljcRecordMapper.xml +++ b/talkonlineweb/src/main/resources/mapper/LymsXljcRecordMapper.xml @@ -184,6 +184,7 @@ a.tel, a.age, a.sex, + a.birth, case when r.upload_status = 0 then '未上传' else '已上传' end uploadStatusText, r.upload_time uploadTime, r.examine_time examineTime, diff --git a/talkonlineweb/src/main/resources/mapper/LymsXljcRecordTraceMapper.xml b/talkonlineweb/src/main/resources/mapper/LymsXljcRecordTraceMapper.xml index 2178fc9..9c2effa 100644 --- a/talkonlineweb/src/main/resources/mapper/LymsXljcRecordTraceMapper.xml +++ b/talkonlineweb/src/main/resources/mapper/LymsXljcRecordTraceMapper.xml @@ -22,8 +22,10 @@ -- 1.8.3.1