修复查询授权卡日志接口，修复查询卡设备列表接口

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());
+                XhpcOperator xhpcOperator = xhpcOperatorMapper.selectOneByCorpNoAndTenantId(String.valueOf(corpindex), tokenService.getLoginUser().getSysUser().getTenantId());
-                dataDTO.setGrantOperator(tIccardUser.getUsername());
+                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();
     }
 

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>