挂失解挂

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

@@ -60,11 +60,11 @@ public enum OperateType {
     ADDRESS_INFO_CONFIRM(""),
 
     //挂失解挂
-    CARD_LOSS("卡挂失"),
-    CARD_RELEASE_LOSS("卡解挂"),
-    OBU_LOSS("签挂失"),
-    OBU_RELEASE_LOSS("签解挂"),
+    CARD_LOSS("单卡挂失"),
+    OBU_LOSS("单签挂失"),
     CARD_OBU_LOSS("卡签挂失"),
+    CARD_RELEASE_LOSS("单卡解挂"),
+    OBU_RELEASE_LOSS("单签解挂"),
     CARD_OBU_RELEASE_LOSS("卡签解挂"),
 
     //发行产品

zhywpt-app-managew/src/main/java/cn/com/taiji/managew/dto/ass/AssDeviceLossReqDTO.java

@@ -44,9 +44,9 @@ public class AssDeviceLossReqDTO extends AbstractBizRequestDTO {
     @ApiModelProperty(value = "行驶证反面")
     private String vehNegImgUrl;
 
-    //员工openId
-    @ApiModelProperty(value = "员工openId")
-    private String staffOpenId;
+    //员工Id
+    @ApiModelProperty(value = "员工Id")
+    private String staffId;
 
     @Override
     protected void validate(ViolationValidator validator) {
@@ -58,12 +58,12 @@ public class AssDeviceLossReqDTO extends AbstractBizRequestDTO {
             validator.validFieldNotBlank("obuId", obuId);
         }
         if (getOrderSource() == SourceType.SERVICE_HALL) {
-            validator.validFieldNotBlank("staffOpenId", staffOpenId);
+            validator.validFieldNotBlank("staffId", staffId);
             validator.validFieldNotBlank("vehPosImgUrl", vehPosImgUrl);
             validator.validFieldNotBlank("vehNegImgUrl", vehNegImgUrl);
         }
         if (getOrderSource() == SourceType.WEB){
-            validator.validFieldNotBlank("staffOpenId", staffOpenId);
+            validator.validFieldNotBlank("staffId", staffId);
         }
     }
 }

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

@@ -85,6 +85,8 @@ public class AssDeviceLossManagerImpl extends AbstractManagewManager implements
             default:
                 throw new ManagerException("业务类型出错！");
         }
+
+        logger.info("=>返回结果：订单号{}，状态码{}，状态信息{}",response.getOrderNo(), response.getCode(),response.getMsg());
         // 保存日志操作日志
         persistOperateLog(operateType, response.getOrderNo(), source, findOpenIdByToken(reqDto.getAccessToken()), "挂失解挂操作" + response.getMsg());
 

zhywpt-service-ias/src/main/java/cn/com/taiji/ias/manager/MyCommHandleManager.java

@@ -28,6 +28,8 @@ public class MyCommHandleManager extends AbstractCommHandleManager {
     private ChannelSendHandler channelSendHandler;
     @Autowired
     private OrderServiceHandler orderServiceHandler;
+    @Autowired
+    private DeviceServiceHandler deviceServiceHandler;
 
     public MyCommHandleManager() {
         super(IasServiceSystem.ISSUES);
@@ -41,6 +43,7 @@ public class MyCommHandleManager extends AbstractCommHandleManager {
         registerJsonService(provinceHandler);
         registerJsonService(channelSendHandler);
         registerJsonService(orderServiceHandler);
+        registerJsonService(deviceServiceHandler);
     }
 
     @Override

zhywpt-service-ias/src/main/java/cn/com/taiji/ias/manager/device/CardLossManager.java

@@ -29,6 +29,7 @@ public class CardLossManager extends AbstractDeviceLossManager implements LogMan
      * 7. 保存日志
      */
     public DeviceLossCommResponse serviceHandle(CardLossRequest request) throws ServiceHandleException {
+        logger.info("处理卡挂失业务{}",request.toString());
         long begin = System.currentTimeMillis();
         DeviceLossCommResponse response = new DeviceLossCommResponse();
         try {
@@ -71,5 +72,6 @@ public class CardLossManager extends AbstractDeviceLossManager implements LogMan
     @Override
     public void doSaveLog(CardLossRequest request, DeviceLossCommResponse response, IasInterfaceLog log) {
         toSaveLog(log);
+        logger.info("卡挂失处理结束{}",response.toString());
     }
 }

zhywpt-service-ias/src/main/java/cn/com/taiji/ias/manager/device/CardObuLossManager.java

@@ -30,6 +30,7 @@ public class CardObuLossManager extends AbstractDeviceLossManager implements Log
      * 7. 保存日志
      */
     public DeviceLossCommResponse serviceHandle(CardObuLossRequest request) throws ServiceHandleException {
+        logger.info("处理卡签挂失{}", request.toString());
         long begin = System.currentTimeMillis();
         DeviceLossCommResponse response = new DeviceLossCommResponse();
         try {
@@ -79,5 +80,6 @@ public class CardObuLossManager extends AbstractDeviceLossManager implements Log
     @Override
     public void doSaveLog(CardObuLossRequest request, DeviceLossCommResponse response, IasInterfaceLog log) {
         toSaveLog(log);
+        logger.info("卡签挂失处理结束{}",response.toString());
     }
 }

zhywpt-service-ias/src/main/java/cn/com/taiji/ias/manager/device/CardObuReleaseLossManager.java

@@ -30,6 +30,7 @@ public class CardObuReleaseLossManager extends AbstractDeviceLossManager impleme
      * 7. 保存日志
      */
     public DeviceLossCommResponse serviceHandle(CardObuReleaseRequest request) throws ServiceHandleException {
+        logger.info("卡签解挂开始{}", request.toString());
         long begin = System.currentTimeMillis();
         //响应
         DeviceLossCommResponse response = new DeviceLossCommResponse();
@@ -79,5 +80,6 @@ public class CardObuReleaseLossManager extends AbstractDeviceLossManager impleme
     @Override
     public void doSaveLog(CardObuReleaseRequest request, DeviceLossCommResponse response, IasInterfaceLog log) {
         toSaveLog(log);
+        logger.info("卡签解挂处理结束{}",response.toString());
     }
 }

zhywpt-service-ias/src/main/java/cn/com/taiji/ias/manager/device/CardReleaseLossManager.java

@@ -28,6 +28,7 @@ public class CardReleaseLossManager extends AbstractDeviceLossManager implements
      * 7. 保存日志
      */
     public DeviceLossCommResponse serviceHandle(CardReleaseRequest request) throws ServiceHandleException {
+        logger.info("卡解挂开始{}", request.toString());
         long begin = System.currentTimeMillis();
         //响应
         DeviceLossCommResponse response = new DeviceLossCommResponse();
@@ -71,5 +72,6 @@ public class CardReleaseLossManager extends AbstractDeviceLossManager implements
     @Override
     public void doSaveLog(CardReleaseRequest request, DeviceLossCommResponse response, IasInterfaceLog log) {
         toSaveLog(log);
+        logger.info("卡解挂处理结束{}",response.toString());
     }
 }

zhywpt-service-ias/src/main/java/cn/com/taiji/ias/manager/device/ObuLossManager.java

@@ -28,6 +28,7 @@ public class ObuLossManager extends AbstractDeviceLossManager implements LogMana
      * 7. 保存日志
      */
     public DeviceLossCommResponse serviceHandle(ObuLossRequest request) throws ServiceHandleException {
+        logger.info("处理签挂失{}", request.toString());
         long begin = System.currentTimeMillis();
         //响应
         DeviceLossCommResponse response = new DeviceLossCommResponse();
@@ -70,5 +71,6 @@ public class ObuLossManager extends AbstractDeviceLossManager implements LogMana
     @Override
     public void doSaveLog(ObuLossRequest request, DeviceLossCommResponse response, IasInterfaceLog log) {
         toSaveLog(log);
+        logger.info("签挂失处理结束{}",response.toString());
     }
 }

zhywpt-service-ias/src/main/java/cn/com/taiji/ias/manager/device/ObuReleaseLossManager.java

@@ -28,6 +28,7 @@ public class ObuReleaseLossManager extends AbstractDeviceLossManager implements
      * 7. 保存日志
      */
     public DeviceLossCommResponse serviceHandle(ObuReleaseRequest request) throws ServiceHandleException {
+        logger.info("签解挂开始{}", request.toString());
         long begin = System.currentTimeMillis();
         //响应
         DeviceLossCommResponse response = new DeviceLossCommResponse();
@@ -71,5 +72,6 @@ public class ObuReleaseLossManager extends AbstractDeviceLossManager implements
     @Override
     public void doSaveLog(ObuReleaseRequest request, DeviceLossCommResponse response, IasInterfaceLog log) {
         toSaveLog(log);
+        logger.info("签解挂处理结束{}",response.toString());
     }
 }