From 7dbacaec00252652a87dfc835c777bd7f687cfda Mon Sep 17 00:00:00 2001 From: shiyang Date: Thu, 9 Sep 2021 10:50:58 +0800 Subject: [PATCH] update --- .../talkonlineweb/annotation/LogAnnotation.java | 1 + .../com/lyms/talkonlineweb/aop/CrudCommandAop.java | 2 +- .../talkonlineweb/controller/DepartController.java | 41 +++++++++++++++++++--- .../controller/HospitalController.java | 10 ------ .../controller/LymsLogsController.java | 14 +++++--- 5 files changed, 49 insertions(+), 19 deletions(-) diff --git a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/annotation/LogAnnotation.java b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/annotation/LogAnnotation.java index fddaa1a..98ca7e9 100644 --- a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/annotation/LogAnnotation.java +++ b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/annotation/LogAnnotation.java @@ -6,5 +6,6 @@ import java.lang.annotation.*; @Retention(RetentionPolicy.RUNTIME) //注解在哪个阶段执行 @Documented //生成文档 public @interface LogAnnotation { + //可传入参数 String value() default ""; } diff --git a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/aop/CrudCommandAop.java b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/aop/CrudCommandAop.java index b8651e6..1d255e9 100644 --- a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/aop/CrudCommandAop.java +++ b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/aop/CrudCommandAop.java @@ -30,7 +30,7 @@ public class CrudCommandAop { public void logPoinCut() { } - //切面 配置通知 + //切面 配置通知,返回结果之后通知 @AfterReturning("logPoinCut()") public void saveSysLog(JoinPoint joinPoint) { System.out.println("切面。。。。。"); diff --git a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/DepartController.java b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/DepartController.java index fc0b6d4..30ca3f6 100644 --- a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/DepartController.java +++ b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/DepartController.java @@ -1,13 +1,11 @@ package com.lyms.talkonlineweb.controller; +import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.lyms.talkonlineweb.domain.*; import com.lyms.talkonlineweb.result.BaseResponse; -import com.lyms.talkonlineweb.service.HdepartInfoService; -import com.lyms.talkonlineweb.service.LymsDepartillService; -import com.lyms.talkonlineweb.service.LymsHdepartService; -import com.lyms.talkonlineweb.service.LymsIllnessService; +import com.lyms.talkonlineweb.service.*; import com.lyms.talkonlineweb.util.Constant; import com.lyms.talkonlineweb.util.JwtUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -36,6 +34,9 @@ public class DepartController { @Autowired private HdepartInfoService hdepartInfoService; + @Autowired + private LymsLogsCrudService lymsLogsCrudService; + /** * 获取科室列表 @@ -83,11 +84,14 @@ public class DepartController { public BaseResponse saveDepart(@RequestBody LymsHdepart depart, BindingResult result){ BaseResponse baseResponse=new BaseResponse(); baseResponse.setErrormsg(""); + //操作记录标识 + Integer hid=0; if(depart.getDid()==null){ depart.setCreatedtime(new Date()); LymsHdepart depart2=new LymsHdepart(); }else{ + hid=1; depart.setUpdatedTime(new Date()); } if(result.hasErrors()){ @@ -115,6 +119,8 @@ public class DepartController { departill.setIid(Integer.parseInt(iArr[i])); lymsDepartillService.save(departill); } + //保存操作记录 + lymsLogsCrud(depart,hid); baseResponse.setErrorcode(f==true?0:1); return baseResponse; @@ -128,7 +134,13 @@ public class DepartController { @GetMapping("delDepart") public BaseResponse delHosp(int did){ BaseResponse baseResponse=new BaseResponse(); + //操作记保存参数 + LymsHdepart depart=lymsHdepartService.getById(did); + boolean f=lymsHdepartService.removeById(did); + //保存操作记录 + lymsLogsCrud(depart,null); + baseResponse.setErrorcode(f==true?0:1); return baseResponse; } @@ -157,4 +169,25 @@ public class DepartController { return baseResponse; } + + /** + * 操作记录 + * @param depart + * @param hid + */ + public void lymsLogsCrud(LymsHdepart depart,Integer hid){ + LymsLogsCrud lymsLogsCrud=new LymsLogsCrud(); + if(null!=hid){ + lymsLogsCrud.setCrudtype(hid==1?"新增科室":"编辑科室"); + }else { + lymsLogsCrud.setCrudtype("删除科室"); + } + lymsLogsCrud.setUname(depart.getCreator()); + lymsLogsCrud.setHname(depart.getHname()); + lymsLogsCrud.setHdname(depart.getDname()); + lymsLogsCrud.setCreatdata(new Date()); + lymsLogsCrudService.save(lymsLogsCrud); + + } + } diff --git a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/HospitalController.java b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/HospitalController.java index a4bf0b9..5fbecd3 100644 --- a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/HospitalController.java +++ b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/HospitalController.java @@ -112,7 +112,6 @@ public class HospitalController { @PostMapping("saveHosp") public BaseResponse saveHosp(@RequestBody LymsHospital hospital){ BaseResponse baseResponse=new BaseResponse(); - if(hospital.getHid()==null){ hospital.setCreatedtime(new Date()); }else{ @@ -120,14 +119,6 @@ public class HospitalController { } boolean f=lymsHospitalService.saveOrUpdate(hospital); - //操作记录 - LymsLogsCrud lymsLogsCrud=new LymsLogsCrud(); - lymsLogsCrud.setUname(hospital.getCreator()); - lymsLogsCrud.setCrudtype(hospital.getHid()==null?"新增医院":"编辑医院"); - lymsLogsCrud.setHname(hospital.getHname()); - lymsLogsCrud.setCreatdata(new Date()); - lymsLogsCrudService.save(lymsLogsCrud); - baseResponse.setErrorcode(f==true?0:1); return baseResponse; } @@ -141,7 +132,6 @@ public class HospitalController { public BaseResponse delHosp(int hid){ BaseResponse baseResponse=new BaseResponse(); boolean f=lymsHospitalService.removeById(hid); - baseResponse.setErrorcode(f==true?0:1); return baseResponse; } diff --git a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/LymsLogsController.java b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/LymsLogsController.java index 22c2203..ee94596 100644 --- a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/LymsLogsController.java +++ b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/LymsLogsController.java @@ -23,11 +23,17 @@ public class LymsLogsController { * @return */ @GetMapping("logscrud") - public BaseResponse logscrud(LymsLogsCrud lymsLogsCrud, int current, int size){ + public BaseResponse logscrud(LymsLogsCrud lymsLogsCrud, Integer current, Integer size){ BaseResponse baseResponse=new BaseResponse(); - Page page=new Page<>(current,size); - Page lymsLogsCrudPage=lymsLogsCrudService.page(page,Wrappers.query(lymsLogsCrud).orderByDesc("creatdata")); - baseResponse.setObject(lymsLogsCrudPage); + try { + Page page=new Page<>(null==current?1:current,null==size?20:size); + Page lymsLogsCrudPage=lymsLogsCrudService.page(page,Wrappers.query(lymsLogsCrud).orderByDesc("creatdata")); + baseResponse.setObject(lymsLogsCrudPage); + baseResponse.setErrormsg("成功"); + } catch (Exception e) { + baseResponse.setErrormsg("失败"); + e.printStackTrace(); + } return baseResponse; } } -- 1.8.3.1