住院采血日志写入修改

lis-common/src/main/java/com/czlis/common/core/domain/entity/SysOperLog.java

@@ -1,4 +1,4 @@
-package com.czlis.system.domain;
+package com.czlis.common.core.domain.entity;
 
 import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;

lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/mapper/SysOperLogMapper.java

@@ -1,8 +1,8 @@
-package com.czlis.system.mapper;
+package com.czlis.interfaceCommon.mapper;
 
 import java.util.List;
 
-import com.czlis.system.domain.SysOperLog;
+import com.czlis.common.core.domain.entity.SysOperLog;
 
 /**
  * 操作日志 数据层

lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/service/ISysOperLogService.java

@@ -1,8 +1,8 @@
-package com.czlis.system.service;
+package com.czlis.interfaceCommon.service;
 
 import java.util.List;
 
-import com.czlis.system.domain.SysOperLog;
+import com.czlis.common.core.domain.entity.SysOperLog;
 
 /**
  * 操作日志 服务层

lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/service/impl/SysOperLogServiceImpl.java

@@ -1,12 +1,12 @@
-package com.czlis.system.service.impl;
+package com.czlis.interfaceCommon.service.impl;
 
 import java.util.List;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import com.czlis.system.domain.SysOperLog;
+import com.czlis.common.core.domain.entity.SysOperLog;
-import com.czlis.system.mapper.SysOperLogMapper;
+import com.czlis.interfaceCommon.mapper.SysOperLogMapper;
-import com.czlis.system.service.ISysOperLogService;
+import com.czlis.interfaceCommon.service.ISysOperLogService;
 
 /**
  * 操作日志 服务层处理

lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/utils/LisInterfaceUtil.java

@@ -7,11 +7,25 @@ import cn.hutool.json.JSONObject;
 import cn.hutool.json.JSONUtil;
 import com.czlis.common.annotation.Async;
 import com.czlis.common.annotation.Log;
+import com.czlis.common.asyncmanager.AsyncManager;
 import com.czlis.common.config.RuoYiConfig;
+import com.czlis.common.core.domain.entity.SysOperLog;
+import com.czlis.common.core.domain.entity.SysUser;
+import com.czlis.common.core.domain.model.LoginUser;
+import com.czlis.common.core.text.Convert;
+import com.czlis.common.enums.BusinessStatus;
 import com.czlis.common.enums.BusinessType;
+import com.czlis.common.utils.ExceptionUtil;
+import com.czlis.common.utils.SecurityUtils;
+import com.czlis.common.utils.ServletUtils;
+import com.czlis.common.utils.StringUtils;
+import com.czlis.common.utils.ip.AddressUtils;
+import com.czlis.common.utils.ip.IpUtils;
+import com.czlis.common.utils.spring.SpringUtils;
 import com.czlis.interfaceCommon.constants.LisinterfaceNameConstants;
 import com.czlis.common.core.domain.Result;
 import com.czlis.interfaceCommon.mapper.LisInterfaceMapper;
+import com.czlis.interfaceCommon.service.ISysOperLogService;
 import com.czlis.interfaceCommon.service.LisInterfaceType;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
@@ -20,6 +34,7 @@ import javax.annotation.Resource;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.TimerTask;
 
 
 @Slf4j
@@ -52,6 +67,38 @@ public class LisInterfaceUtil {
         return new Result("-1","无效的接口方式,请检查参数设置！！");
     }
 
+    /**
+     * 内部写日志的接口调用
+     * @param type
+     * @param lisInterfaceType
+     * @param userId
+     * @return
+     */
+    public Result invokeLisInterfaceLog(String type, LisInterfaceType lisInterfaceType,String userId) {
+        try{
+            String interfaceType = commonUtil.getComOptValue("HISOPT","SP_INTER");
+            log.info("开始调用{}接口，入参：{}",type,interfaceType);
+            String inValue = lisInterfaceType.serializationJson();
+            log.info("接口入参：{}",inValue);
+            switch (interfaceType){
+                case "2":  //存储过程
+                    Result result = invokeSP(type, inValue);
+                    insertDBLog(userId,"0","",JSONUtil.toJsonStr(lisInterfaceType));
+                    return result;
+                case "3":  //http方式
+                    Result result1 = invokeHttp(type, inValue);
+                    insertDBLog(userId,"0","",JSONUtil.toJsonStr(lisInterfaceType));
+                    return result1;
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            log.error("调用lis接口报错：",e);
+            insertDBLog(userId,"-1",e.getMessage(),JSONUtil.toJsonStr(lisInterfaceType));
+
+        }
+        return new Result("-1","无效的接口方式,请检查参数设置！！");
+    }
+
     /**
      * 存储过程方式调用接口
      * @param type
@@ -148,5 +195,54 @@ public class LisInterfaceUtil {
 
     }
 
+    public void insertDBLog(String userId,String status,String errorMsg,String requestParam){
+        try {
+            // *========数据库日志=========*//
+            SysOperLog operLog = new SysOperLog();
+            operLog.setStatus(BusinessStatus.SUCCESS.ordinal());
+            // 请求的地址
+            String ip = IpUtils.getIpAddr();
+            operLog.setOperIp(ip);
+            operLog.setOperName(userId);
+            operLog.setOperUrl(StringUtils.substring(ServletUtils.getRequest().getRequestURI(), 0, 255));
+            // 设置action动作
+            operLog.setBusinessType(10);
+            // 设置标题
+            operLog.setTitle("接口调用-住院采血");
+            // 设置操作人类别
+            operLog.setOperatorType(1);
+            // 获取参数的信息，传入到数据库中。
+            operLog.setOperParam(requestParam);
+            //返回值
+            operLog.setJsonResult("返回值："+status+";返回信息："+errorMsg);
+            operLog.setStatus(Integer.parseInt(status));
+            operLog.setErrorMsg(errorMsg);
+
+            // 设置方法名称
+            operLog.setMethod(this.getClass().getName() + ".invokeLisInterfaceLog()");
+            // 设置请求方式
+            operLog.setRequestMethod(ServletUtils.getRequest().getMethod());
+            // 设置消耗时间
+            //operLog.setCostTime(System.currentTimeMillis() - TIME_THREADLOCAL.get());
+            // 保存数据库
+            AsyncManager.me().execute(recordOper(operLog));
+        } catch (Exception exp) {
+            // 记录本地异常日志
+            log.error("异常信息:{}", exp.getMessage());
+            exp.printStackTrace();
+        }
+    }
+
+    public static TimerTask recordOper(final SysOperLog operLog) {
+        return new TimerTask() {
+            @Override
+            public void run() {
+                // 远程查询操作地点
+                operLog.setOperLocation(AddressUtils.getRealAddressByIP(operLog.getOperIp()));
+                SpringUtils.getBean(ISysOperLogService.class).insertOperlog(operLog);
+            }
+        };
+    }
+
 }
 

lis-interfaceCommon/src/main/resources/mapper/SysOperLogMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.czlis.system.mapper.SysOperLogMapper">
+<mapper namespace="com.czlis.interfaceCommon.mapper.SysOperLogMapper">
 
 	<resultMap type="SysOperLog" id="SysOperLogResult">
 		<id     property="operId"         column="oper_id"        />

lis-system/src/main/java/com/czlis/system/aspectj/LogAspect.java

@@ -15,7 +15,7 @@ import com.czlis.common.utils.StringUtils;
 import com.czlis.common.utils.ip.IpUtils;
 import com.czlis.common.asyncmanager.AsyncManager;
 import com.czlis.system.manager.factory.AsyncFactory;
-import com.czlis.system.domain.SysOperLog;
+import com.czlis.common.core.domain.entity.SysOperLog;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.ArrayUtils;
 import org.aspectj.lang.JoinPoint;

lis-system/src/main/java/com/czlis/system/manager/factory/AsyncFactory.java

@@ -8,9 +8,9 @@ import com.czlis.common.utils.ip.AddressUtils;
 import com.czlis.common.utils.ip.IpUtils;
 import com.czlis.common.utils.spring.SpringUtils;
 import com.czlis.system.domain.SysLogininfor;
-import com.czlis.system.domain.SysOperLog;
+import com.czlis.common.core.domain.entity.SysOperLog;
 import com.czlis.system.service.ISysLogininforService;
-import com.czlis.system.service.ISysOperLogService;
+import com.czlis.interfaceCommon.service.ISysOperLogService;
 import eu.bitwalker.useragentutils.UserAgent;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

lis-system/src/main/java/com/czlis/system/web/controller/monitor/SysOperlogController.java

@@ -6,8 +6,8 @@ import com.czlis.common.core.domain.AjaxResult;
 import com.czlis.common.core.page.TableDataInfo;
 import com.czlis.common.enums.BusinessType;
 import com.czlis.common.utils.poi.ExcelUtil;
-import com.czlis.system.domain.SysOperLog;
+import com.czlis.common.core.domain.entity.SysOperLog;
-import com.czlis.system.service.ISysOperLogService;
+import com.czlis.interfaceCommon.service.ISysOperLogService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;

lis-system/src/main/java/com/czlis/system/web/controller/system/SysUserController.java

@@ -54,7 +54,8 @@ public class SysUserController extends BaseController {
     /**
      * 获取用户列表
      */
-    @PreAuthorize("@ss.hasPermi('system:user:list')")
+    @ApiOperation("获取用户列表")
+    //@PreAuthorize("@ss.hasPermi('system:user:list')")
     @GetMapping("/list")
     public TableDataInfo list(SysUser user) {
         startPage();

lis-system/src/main/java/com/czlis/system/web/service/SysLoginService.java

@@ -16,7 +16,6 @@ import com.czlis.common.exception.user.*;
 import com.czlis.common.utils.DateUtils;
 import com.czlis.common.utils.MessageUtils;
 import com.czlis.common.utils.StringUtils;
-import com.czlis.common.utils.bean.BeanUtils;
 import com.czlis.common.utils.ip.IpUtils;
 import com.czlis.common.asyncmanager.AsyncManager;
 import com.czlis.interfaceCommon.service.TokenService;

zybgcx/src/main/java/com/czlis/zybgcx/controller/ZybgcxController.java

@@ -35,6 +35,7 @@ public class ZybgcxController extends BaseController {
      * @param webGetReportsList
      * @return
      */
+    @Anonymous
     @ApiOperation("获取报告信息列表")
     @PostMapping("/ReportList")
     public Result getPatReportList(@RequestBody Web_getReportsList webGetReportsList){
@@ -47,6 +48,7 @@ public class ZybgcxController extends BaseController {
      * @param webGetResultMed
      * @return
      */
+    @Anonymous
     @ApiOperation("获取微生物报告单信息")
     @PostMapping("/MedList")
     public TableDataInfo getResultMed(@RequestBody Web_getResultMed webGetResultMed){
@@ -55,18 +57,21 @@ public class ZybgcxController extends BaseController {
         return getDataTable(resultMedList);
     }
 
+    @Anonymous
     @ApiOperation("获取pdf报告")
     @GetMapping("/pdf")
     public Result getPDFReportOne(Date jyrq,String yq,String ybh){
         return zybgcxService.getPDFReportOne(jyrq,yq,ybh);
     }
 
+    @Anonymous
     @ApiOperation("获取普通报告结果")
     @PostMapping("/result")
     public Result getLisResult(@RequestBody Web_result webResult){
         return zybgcxService.getLisResult(webResult);
     }
 
+    @Anonymous
     @ApiOperation("获取历史检验结果")
     @PostMapping("/fsresult")
     public Result getFSResult(@RequestBody Web_fs_printReport webFsPrintReport){
@@ -79,6 +84,7 @@ public class ZybgcxController extends BaseController {
      * @param bgdh 格式为：jyrq_yq_ybh
      * @return
      */
+    @Anonymous
     @ApiOperation("打印报告单")
     @PostMapping("/print")
     public Result printReport(@RequestBody String[] bgdh){

zycx/src/main/java/com/czlis/zycx/controller/ZycxController.java

@@ -33,6 +33,7 @@ public class ZycxController extends BaseController {
     @Autowired
     PackBarcodeUtil packBarcodeUtil;
 
+    @Anonymous
     @ApiOperation("获取申请单")
     @GetMapping("/query")
     //@PreAuthorize("@ss.hasPermi('zycx:interface:query')")
@@ -42,6 +43,7 @@ public class ZycxController extends BaseController {
         return new Result("0", "查询成功！", sqdInfoList);
     }
 
+    @Anonymous
     @ApiOperation("生成条码")
     @GetMapping("/add")
     public Result createSQD(String dept, String userid, String st, String et, String yljg) {
@@ -49,7 +51,7 @@ public class ZycxController extends BaseController {
         return zycxService.createSQD(dept, userid, st, et, yljg);
     }
 
-
+    @Anonymous
     @ApiOperation("执行条码")
     @GetMapping("/exec")
     public Result execSQD(String[] sqh, String userid, String status, String yljg) {
@@ -57,6 +59,7 @@ public class ZycxController extends BaseController {
         return zycxService.execSQD(sqh, userid, status, yljg);
     }
 
+    @Anonymous
     @ApiOperation("获取申请单明细数据")
     @GetMapping("/detail")
     public Result getSQDDetail(String sqh) {
@@ -64,6 +67,7 @@ public class ZycxController extends BaseController {
         return zycxService.getSQDDetail(sqh);
     }
 
+    @Anonymous
     @ApiOperation("获取申请单主表数据")
     @GetMapping("/reqmain")
     public Result getSQDMain(LabReqmain labReqmain) {
@@ -71,24 +75,28 @@ public class ZycxController extends BaseController {
         return zycxService.getSQDMain(labReqmain);
     }
 
+    @Anonymous
     @ApiOperation("封箱码查询")
     @GetMapping("/checkpackid")
     public Result checkpackid(String packid) {
         return packBarcodeUtil.checkpackid(packid);
     }
 
+    @Anonymous
     @ApiOperation("获取封箱申请单信息")
     @GetMapping("/getpackreq")
     public Result getpackreq(String sqh) {
         return packBarcodeUtil.getpackreq(sqh);
     }
 
+    @Anonymous
     @ApiOperation("封箱申请单")
     @PostMapping("/packup")
     public Result packup(@RequestBody List<LabReqpack> labReqpacks) {
         return packBarcodeUtil.packup(labReqpacks);
     }
 
+    @Anonymous
     @ApiOperation("打印封箱码")
     @GetMapping("/printpackid")
     public Result printpackid(String ksmc) {
@@ -101,6 +109,7 @@ public class ZycxController extends BaseController {
     }
 
 
+    @Anonymous
     @ApiOperation("打印送检清单")
     @PostMapping("/printSendSample")
     public Result printSendSample(@RequestBody String[] sqhArray){

zycx/src/main/java/com/czlis/zycx/service/impl/ZycxServiceImpl.java

@@ -2,6 +2,7 @@ package com.czlis.zycx.service.impl;
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.date.DateUtil;
+import cn.hutool.json.JSONUtil;
 import com.czlis.common.core.domain.Result;
 import com.czlis.common.core.domain.entity.lis.LabReqdetail;
 import com.czlis.common.core.domain.entity.lis.LabReqmain;
@@ -204,8 +205,10 @@ public class ZycxServiceImpl implements ZycxService {
         String retMsg = String.valueOf(map.get("retmsg"));
         log.info("生成条码存储过程出参：{},{}",retCode,retMsg);
         if(retCode.equals("0")){
+            lisInterfaceUtil.insertDBLog(userid,"0","生成条码成功！", JSONUtil.toJsonStr(map));
             return new Result("0","生成条码成功！");
         }else{
+            lisInterfaceUtil.insertDBLog(userid,"-1","生成条码失败！", JSONUtil.toJsonStr(map));
             return new Result("-1","生成条码失败！"+retMsg);
         }
     }
@@ -219,7 +222,8 @@ public class ZycxServiceImpl implements ZycxService {
         getReqInterface.setStime(st);
         getReqInterface.setEtime(et);
         getReqInterface.setYljg(yljg);
-        return lisInterfaceUtil.invokeLisInterface(LisinterfaceNameConstants.GETREQINTERFACE, getReqInterface);
+        //return lisInterfaceUtil.invokeLisInterface(LisinterfaceNameConstants.GETREQINTERFACE, getReqInterface);
+        return lisInterfaceUtil.invokeLisInterfaceLog(LisinterfaceNameConstants.GETREQINTERFACE,getReqInterface,userid);
     }
 
     public Result execSQDExecSP(String sqh,String userid,String status,String yljg){
@@ -235,8 +239,10 @@ public class ZycxServiceImpl implements ZycxService {
         String retMsg = String.valueOf(map.get("retmsg"));
         log.info("调用执行状态存储过程出参：{},{}",retCode,retMsg);
         if(retCode.equals("0")){
+            lisInterfaceUtil.insertDBLog(userid,"0","修改状态成功！", JSONUtil.toJsonStr(map));
             return new Result("0","修改状态成功！");
         }else{
+            lisInterfaceUtil.insertDBLog(userid,"-1","修改状态失败！", JSONUtil.toJsonStr(map));
             return new Result("-1","修改状态失败！"+retMsg);
         }
     }
@@ -246,7 +252,8 @@ public class ZycxServiceImpl implements ZycxService {
         setReqStatus.setStatus(status);
         setReqStatus.setSqh(sqh);
         setReqStatus.setUserid(userid);
-        return lisInterfaceUtil.invokeLisInterface(LisinterfaceNameConstants.SETREQSTATUS, setReqStatus);
+        //return lisInterfaceUtil.invokeLisInterface(LisinterfaceNameConstants.SETREQSTATUS, setReqStatus);
+        return lisInterfaceUtil.invokeLisInterfaceLog(LisinterfaceNameConstants.SETREQSTATUS, setReqStatus,userid);
     }
 
     public Result printBarCode(String sqh){