挂失解挂日志完善

gly-base-core/src/main/java/cn/com/taiji/core/entity/dict/log/OperateType.java

@@ -58,6 +58,14 @@ public enum OperateType {
     ADDRESS_INFO_ADD_OR_UPDATE("收货地址新增或修改"),
     ADDRESS_INFO_DELETE("收货地址删除"),
     ADDRESS_INFO_CONFIRM(""),
+
+    //挂失解挂
+    CARD_LOSS("卡挂失"),
+    CARD_RELEASE_LOSS("卡解挂"),
+    OBU_LOSS("签挂失"),
+    OBU_RELEASE_LOSS("签解挂"),
+    CARD_OBU_LOSS("卡签挂失"),
+    CARD_OBU_RELEASE_LOSS("卡签解挂"),
     ;
     private final String value;
 

zhywpt-app-iaw/src/main/java/cn/com/taiji/iaw/manager/ass/AssDeviceLossManagerImpl.java

@@ -2,61 +2,71 @@ package cn.com.taiji.iaw.manager.ass;
 
 import cn.com.taiji.common.manager.ManagerException;
 import cn.com.taiji.core.entity.dict.basic.SourceType;
+import cn.com.taiji.core.entity.dict.log.OperateType;
 import cn.com.taiji.core.model.comm.protocol.ias.ass.*;
 import cn.com.taiji.iaw.dto.ass.AssDeviceLossReqDTO;
-import cn.com.taiji.iaw.manager.AbstractCommManager;
+import cn.com.taiji.iaw.manager.AbstractIawManager;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 
 @Service
-public class AssDeviceLossManagerImpl extends AbstractCommManager implements AssDeviceLossManager {
+public class AssDeviceLossManagerImpl extends AbstractIawManager implements AssDeviceLossManager {
     @Override
     public void loss(AssDeviceLossReqDTO reqDto) throws ManagerException {
         reqDto.validate();
         SourceType source = reqDto.getOrderSource();
-        DeviceLossCommResponse lossCommResponse = null;
+        OperateType operateType = null;
+        DeviceLossCommResponse response = null;
         switch (reqDto.getBusinessType()) {
             case 1:
+                operateType = OperateType.CARD_LOSS;
                 CardLossRequest cardLossRequest = new CardLossRequest();
                 BeanUtils.copyProperties(reqDto, cardLossRequest);
                 cardLossRequest.setLoginSource(source);
-                lossCommResponse = jsonPostRepeat(cardLossRequest);
+                response = jsonPostRepeat(cardLossRequest);
                 break;
             case 2:
+                operateType = OperateType.OBU_LOSS;
                 ObuLossRequest obuLossRequest = new ObuLossRequest();
                 BeanUtils.copyProperties(reqDto, obuLossRequest);
                 obuLossRequest.setLoginSource(source);
-                lossCommResponse = jsonPostRepeat(obuLossRequest);
+                response = jsonPostRepeat(obuLossRequest);
                 break;
             case 3:
+                operateType = OperateType.CARD_OBU_LOSS;
                 CardObuLossRequest cardObuLossRequest = new CardObuLossRequest();
                 BeanUtils.copyProperties(reqDto, cardObuLossRequest);
                 cardObuLossRequest.setLoginSource(source);
-                lossCommResponse = jsonPostRepeat(cardObuLossRequest);
+                response = jsonPostRepeat(cardObuLossRequest);
                 break;
             case 4:
+                operateType = OperateType.CARD_RELEASE_LOSS;
                 CardReleaseRequest cardReleaseRequest = new CardReleaseRequest();
                 BeanUtils.copyProperties(reqDto, cardReleaseRequest);
                 cardReleaseRequest.setLoginSource(source);
-                lossCommResponse = jsonPostRepeat(cardReleaseRequest);
+                response = jsonPostRepeat(cardReleaseRequest);
                 break;
             case 5:
+                operateType = OperateType.OBU_RELEASE_LOSS;
                 ObuReleaseRequest obuReleaseRequest = new ObuReleaseRequest();
                 BeanUtils.copyProperties(reqDto, obuReleaseRequest);
-                lossCommResponse = jsonPostRepeat(obuReleaseRequest);
+                response = jsonPostRepeat(obuReleaseRequest);
                 break;
             case 6:
+                operateType = OperateType.CARD_OBU_RELEASE_LOSS;
                 CardObuReleaseRequest cardObuReleaseRequest = new CardObuReleaseRequest();
                 BeanUtils.copyProperties(reqDto, cardObuReleaseRequest);
                 cardObuReleaseRequest.setLoginSource(source);
-                lossCommResponse = jsonPostRepeat(cardObuReleaseRequest);
+                response = jsonPostRepeat(cardObuReleaseRequest);
                 break;
             default:
                 throw new ManagerException("业务类型出错！");
         }
-        if (!"1".equals(lossCommResponse.getCode())) {
-            throw new ManagerException("出错了", lossCommResponse.getMsg());
+        // 保存日志操作日志
+        persistOperateLog(operateType, response.getOrderNo(), source, findOpenIdByToken(reqDto.getAccessToken()), "挂失解挂操作" + response.getMsg());
+
+        if (!"1".equals(response.getCode())) {
+            throw new ManagerException("出错了", response.getMsg());
         }
-        // todo 保存日志操作日志
     }
 }

zhywpt-app-managew/src/main/java/cn/com/taiji/managew/manager/ass/AssDeviceLossManagerImpl.java

@@ -6,6 +6,7 @@ import cn.com.taiji.core.entity.ass.AssOrderinfo;
 import cn.com.taiji.core.entity.basic.QtkVehicleInfo;
 import cn.com.taiji.core.entity.dict.ass.AssOrderType;
 import cn.com.taiji.core.entity.dict.basic.SourceType;
+import cn.com.taiji.core.entity.dict.log.OperateType;
 import cn.com.taiji.core.entity.user.Staff;
 import cn.com.taiji.core.model.comm.protocol.ias.ass.*;
 import cn.com.taiji.core.repo.jpa.ass.AssOrderinfoRepo;
@@ -14,7 +15,7 @@ import cn.com.taiji.core.repo.jpa.user.StaffRepo;
 import cn.com.taiji.managew.dto.ass.AssDeviceLossPageReqDTO;
 import cn.com.taiji.managew.dto.ass.AssDeviceLossPageResDTO;
 import cn.com.taiji.managew.dto.ass.AssDeviceLossReqDTO;
-import cn.com.taiji.managew.manager.AbstractCommManager;
+import cn.com.taiji.managew.manager.AbstractManagewManager;
 import cn.com.taiji.managew.repo.jpa.request.ass.AssDeviceLossPageRequest;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -24,7 +25,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 @Service
-public class AssDeviceLossManagerImpl extends AbstractCommManager implements AssDeviceLossManager {
+public class AssDeviceLossManagerImpl extends AbstractManagewManager implements AssDeviceLossManager {
 
     @Autowired
     private AssOrderinfoRepo orderInfoRepo;
@@ -37,50 +38,59 @@ public class AssDeviceLossManagerImpl extends AbstractCommManager implements Ass
     public void loss(AssDeviceLossReqDTO reqDto) throws ManagerException {
         reqDto.validate();
         SourceType source = reqDto.getOrderSource();
-        DeviceLossCommResponse lossCommResponse = null;
+        OperateType operateType = null;
+        DeviceLossCommResponse response = null;
         switch (reqDto.getBusinessType()) {
             case 1:
+                operateType = OperateType.CARD_LOSS;
                 CardLossRequest cardLossRequest = new CardLossRequest();
                 BeanUtils.copyProperties(reqDto, cardLossRequest);
                 cardLossRequest.setLoginSource(source);
-                lossCommResponse = jsonPostRepeat(cardLossRequest);
+                response = jsonPostRepeat(cardLossRequest);
                 break;
             case 2:
+                operateType = OperateType.OBU_LOSS;
                 ObuLossRequest obuLossRequest = new ObuLossRequest();
                 BeanUtils.copyProperties(reqDto, obuLossRequest);
                 obuLossRequest.setLoginSource(source);
-                lossCommResponse = jsonPostRepeat(obuLossRequest);
+                response = jsonPostRepeat(obuLossRequest);
                 break;
             case 3:
+                operateType = OperateType.CARD_OBU_LOSS;
                 CardObuLossRequest cardObuLossRequest = new CardObuLossRequest();
                 BeanUtils.copyProperties(reqDto, cardObuLossRequest);
                 cardObuLossRequest.setLoginSource(source);
-                lossCommResponse = jsonPostRepeat(cardObuLossRequest);
+                response = jsonPostRepeat(cardObuLossRequest);
                 break;
             case 4:
+                operateType = OperateType.CARD_RELEASE_LOSS;
                 CardReleaseRequest cardReleaseRequest = new CardReleaseRequest();
                 BeanUtils.copyProperties(reqDto, cardReleaseRequest);
                 cardReleaseRequest.setLoginSource(source);
-                lossCommResponse = jsonPostRepeat(cardReleaseRequest);
+                response = jsonPostRepeat(cardReleaseRequest);
                 break;
             case 5:
+                operateType = OperateType.OBU_RELEASE_LOSS;
                 ObuReleaseRequest obuReleaseRequest = new ObuReleaseRequest();
                 BeanUtils.copyProperties(reqDto, obuReleaseRequest);
-                lossCommResponse = jsonPostRepeat(obuReleaseRequest);
+                response = jsonPostRepeat(obuReleaseRequest);
                 break;
             case 6:
+                operateType = OperateType.CARD_OBU_RELEASE_LOSS;
                 CardObuReleaseRequest cardObuReleaseRequest = new CardObuReleaseRequest();
                 BeanUtils.copyProperties(reqDto, cardObuReleaseRequest);
                 cardObuReleaseRequest.setLoginSource(source);
-                lossCommResponse = jsonPostRepeat(cardObuReleaseRequest);
+                response = jsonPostRepeat(cardObuReleaseRequest);
                 break;
             default:
                 throw new ManagerException("业务类型出错！");
         }
-        if (!"1".equals(lossCommResponse.getCode())) {
-            throw new ManagerException("出错了", lossCommResponse.getMsg());
+        // 保存日志操作日志
+        persistOperateLog(operateType, response.getOrderNo(), source, findOpenIdByToken(reqDto.getAccessToken()), "挂失解挂操作" + response.getMsg());
+
+        if (!"1".equals(response.getCode())) {
+            throw new ManagerException("出错了", response.getMsg());
         }
-        // todo 保存日志操作日志
     }
 
     @Override
@@ -135,7 +145,7 @@ public class AssDeviceLossManagerImpl extends AbstractCommManager implements Ass
         }
         if (orderInfo.getOrderSource() == SourceType.SERVICE_HALL || orderInfo.getOrderSource() == SourceType.WEB) {
             Staff staff = staffRepo.findByOpenId(orderInfo.getStaffOpenId());
-            if(staff != null) {
+            if (staff != null) {
                 model.setAuditName(staff.getStaffName());
             }
         }