From 4b46911e23532261c23e937c84ead16313d503ac Mon Sep 17 00:00:00 2001
From: wenhui <1455474577@qq.com>
Date: Tue, 8 Mar 2022 14:24:30 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=9F=A5=E8=AF=A2=E6=8E=88?=
 =?UTF-8?q?=E6=9D=83=E5=8D=A1=E6=97=A5=E5=BF=97=E6=8E=A5=E5=8F=A3=EF=BC=8C?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=9F=A5=E8=AF=A2=E5=8D=A1=E8=AE=BE=E5=A4=87?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/XhpcCardServiceImpl.java     | 51 ++++++++++++++++++-
 .../resources/mapper/TIccardLogMapper.xml     |  1 +
 2 files changed, 50 insertions(+), 2 deletions(-)

diff --git a/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/service/impl/XhpcCardServiceImpl.java b/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/service/impl/XhpcCardServiceImpl.java
index e04fb831..615d0a39 100644
--- a/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/service/impl/XhpcCardServiceImpl.java
+++ b/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/service/impl/XhpcCardServiceImpl.java
@@ -114,8 +114,8 @@ public class XhpcCardServiceImpl implements IXhpcCardService {
             dataDTO.setDeviceNumber(tIccardDevice.getSerialnumber());
             Integer corpindex = tIccardDevice.getCorpindex();
             if (corpindex != null) {
-                TIccardUsers tIccardUser = tIccardUsersMapper.selectByPrimaryKey(tIccardDevice.getCorpindex());
-                dataDTO.setGrantOperator(tIccardUser.getUsername());
+                XhpcOperator xhpcOperator = xhpcOperatorMapper.selectOneByCorpNoAndTenantId(String.valueOf(corpindex), tokenService.getLoginUser().getSysUser().getTenantId());
+                dataDTO.setGrantOperator(xhpcOperator.getName());
             }
             dataDTO.setType(tIccardDevice.getType());
             listOfAuthorizedDevices.getData().add(dataDTO);
@@ -136,6 +136,52 @@ public class XhpcCardServiceImpl implements IXhpcCardService {
             return R.fail(404, "指定资源不存在");
         }
         tIccardDeviceMapper.updateCardDeviceStatusIsDel(deviceId);
+        //todo 增加卡授权删除日志
+        ////write log info
+        //tIccardInfo = tIccardInfoMapper.selectByPrimaryKey(cardId);
+        //TIccardLog tIccardLog = new TIccardLog();
+        //tIccardLog.setUniqueid(tIccardInfo.getCardno());
+        //tIccardLog.setType((byte) 0);
+        //tIccardLog.setOperate((byte) 5);
+        //tIccardLog.setOperatorid(Integer.valueOf(tIccardInfo.getCorpno()));
+        //tIccardLog.setCreatetime(new Date());
+        //CardLogInfo cardLogInfo = new CardLogInfo();
+        ///**
+        // * {
+        // *   "cardInfo": {
+        // *     "cardID": "A721DCD7",
+        // *     "cardNo": "2020101304",
+        // *     "cardType": 0,
+        // *     "password": null,
+        // *     "userIndex": 0,
+        // *     "corpNo": "100002",
+        // *     "cashPledge": 0,
+        // *     "balance": 0,
+        // *     "status": 3,
+        // *     "prepay": 0
+        // *   },
+        // *   "operatorId": 1044,
+        // *   "operate": 5
+        // * }
+        // */
+        //cardLogInfo.setOperate(5);
+        //cardLogInfo.setOperatorId(Long.valueOf(tIccardInfo.getCorpno()));
+        //CardLogInfo.CardInfoDTO cardInfoDTO = new CardLogInfo.CardInfoDTO();
+        //cardInfoDTO.setCardID(tIccardInfo.getCardid());
+        //cardInfoDTO.setCardNo(tIccardInfo.getCardno());
+        //cardInfoDTO.setCardType(tIccardInfo.getCardtype());
+        //cardInfoDTO.setPassword(tIccardInfo.getPassword());
+        //cardInfoDTO.setUserIndex(tIccardInfo.getUserindex());
+        //cardInfoDTO.setCorpNo(tIccardInfo.getCorpno());
+        //cardInfoDTO.setCashPledge(tIccardInfo.getCashpledge());
+        //cardInfoDTO.setBalance(tIccardInfo.getBalance());
+        //cardInfoDTO.setStatus(tIccardInfo.getStatus());
+        //// todo prepay doesn't have
+        //cardInfoDTO.setPrepay(null);
+        //cardLogInfo.setCardInfo(cardInfoDTO);
+        //String str = JSONUtil.toJsonStr(cardLogInfo);
+        //tIccardLog.setLog(str);
+        //tIccardLogMapper.insertSelective(tIccardLog);
         return R.ok();
     }
 
@@ -372,6 +418,7 @@ public class XhpcCardServiceImpl implements IXhpcCardService {
         tIccardInfoMapper.updateByPrimaryKeySelective(tIccardInfo);
         xhpcCardMapper.insertSelective(xhpcIcCardInfo);
         //todo 增加绑定日志
+
         return R.ok();
     }
 
diff --git a/xhpc-modules/xhpc-card/src/main/resources/mapper/TIccardLogMapper.xml b/xhpc-modules/xhpc-card/src/main/resources/mapper/TIccardLogMapper.xml
index 1ff8889b..3ab8b52b 100644
--- a/xhpc-modules/xhpc-card/src/main/resources/mapper/TIccardLogMapper.xml
+++ b/xhpc-modules/xhpc-card/src/main/resources/mapper/TIccardLogMapper.xml
@@ -27,6 +27,7 @@
         FROM
         t_iccard_log
         <where>
+            type = 0
             <if test="logStartTime!=null and logStartTime!='' ">
                 AND createTime &gt;= #{logStartTime}
             </if>