From b8b8756e078a0749786f17bdcb5bee5400708fda Mon Sep 17 00:00:00 2001 From: wenhui <1455474577@qq.com> Date: Tue, 8 Mar 2022 18:26:31 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A1=A5=E4=B8=8Atodo=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/XhpcCardServiceImpl.java | 102 +++++++++--------- .../resources/mapper/TIccardLogMapper.xml | 3 +- 2 files changed, 53 insertions(+), 52 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 2f0ce290..1dcd7ee6 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 @@ -136,52 +136,30 @@ 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); + //write log info + //填充log字段 + TIccardDevice tIccardDevice1 = tIccardDeviceMapper.selectDeletedStatusByDeviceId(deviceId); + DeviceLogInfo deviceLogInfo = new DeviceLogInfo(); + Long operatorId = tokenService.getLoginUser().getSysUser().getOperatorId(); + deviceLogInfo.setOperatorId(operatorId); + deviceLogInfo.setOperate(10); + DeviceLogInfo.DeviceInfoDTO deviceInfoDTO = new DeviceLogInfo.DeviceInfoDTO(); + deviceInfoDTO.setDevName(tIccardDevice1.getDevname()); + deviceInfoDTO.setDevType(tIccardDevice1.getDevtype()); + deviceInfoDTO.setSerialNumber(tIccardDevice1.getSerialnumber()); + deviceInfoDTO.setCorpIndex(Long.valueOf(tIccardDevice1.getCorpindex())); + XhpcOperator xhpcOperator = xhpcOperatorMapper.selectOneByCorpNoAndTenantId(String.valueOf(deviceInfoDTO.getCorpIndex()), tokenService.getLoginUser().getSysUser().getTenantId()); + deviceInfoDTO.setCorpName(xhpcOperator.getName()); + deviceLogInfo.setDeviceInfo(deviceInfoDTO); + //填充整体记录字段 + TIccardLog tIccardLog = new TIccardLog(); + tIccardLog.setUniqueid(tIccardDevice1.getSerialnumber()); + tIccardLog.setType((byte) 1); + tIccardLog.setOperate((byte) 10); + tIccardLog.setOperatorid(Math.toIntExact(operatorId)); + String log = JSONUtil.toJsonStr(deviceLogInfo); + tIccardLog.setLog(log); + tIccardLogMapper.insertSelective(tIccardLog); return R.ok(); } @@ -419,8 +397,32 @@ public class XhpcCardServiceImpl implements IXhpcCardService { tIccardInfo.setCashpledge(Math.toIntExact(bindCardInfo.getCashPledge())); tIccardInfoMapper.updateByPrimaryKeySelective(tIccardInfo); xhpcCardMapper.insertSelective(xhpcIcCardInfo); - //todo 增加绑定日志 - + //write log info + tIccardInfo = tIccardInfoMapper.selectByPrimaryKey(bindCardInfo.getCardRecordId()); + TIccardLog tIccardLog = new TIccardLog(); + tIccardLog.setUniqueid(tIccardInfo.getCardno()); + tIccardLog.setType((byte) 0); + tIccardLog.setOperate((byte) 11); + tIccardLog.setOperatorid(Math.toIntExact(sysUser.getOperatorId())); + tIccardLog.setCreatetime(new Date()); + CardLogInfo cardLogInfo = new CardLogInfo(); + cardLogInfo.setOperate(11); + cardLogInfo.setOperatorId(sysUser.getOperatorId()); + 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()); + cardInfoDTO.setPrepay(null); + cardLogInfo.setCardInfo(cardInfoDTO); + String str = JSONUtil.toJsonStr(cardLogInfo); + tIccardLog.setLog(str); + tIccardLogMapper.insertSelective(tIccardLog); return R.ok(); } @@ -520,7 +522,7 @@ public class XhpcCardServiceImpl implements IXhpcCardService { * } */ cardLogInfo.setOperate(5); - cardLogInfo.setOperatorId(Long.valueOf(tIccardInfo.getCorpno())); + cardLogInfo.setOperatorId(tokenService.getLoginUser().getSysUser().getOperatorId()); CardLogInfo.CardInfoDTO cardInfoDTO = new CardLogInfo.CardInfoDTO(); cardInfoDTO.setCardID(tIccardInfo.getCardid()); cardInfoDTO.setCardNo(tIccardInfo.getCardno()); @@ -531,7 +533,6 @@ public class XhpcCardServiceImpl implements IXhpcCardService { 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); @@ -836,7 +837,6 @@ public class XhpcCardServiceImpl implements IXhpcCardService { 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); 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 3ab8b52b..767e4a3e 100644 --- a/xhpc-modules/xhpc-card/src/main/resources/mapper/TIccardLogMapper.xml +++ b/xhpc-modules/xhpc-card/src/main/resources/mapper/TIccardLogMapper.xml @@ -99,7 +99,8 @@ FROM t_iccard_log WHERE - operate = 2 + type = 0 + and operate = 2 and uniqueID = #{uniqueId} limit #{currentPage},#{items}