Merge branch 'master' of http://git.hchbox.com/yuyou/client into master

src/main/java/com/yuyou/openapi/openapi/api/ABClient.java

@@ -12,6 +12,7 @@ import com.yuyou.openapi.openapi.service.ABClientService;
 import com.yuyou.openapi.openapi.utils.SecurityOperationUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -35,6 +36,7 @@ import java.util.List;
 public class ABClient {
 
     @Autowired
+    @Qualifier("ABClientServiceProxy")
     private ABClientService abClientService;
 
 

src/main/java/com/yuyou/openapi/openapi/dao/ZhangmenMessageRepository.java

@@ -5,5 +5,5 @@ import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 
 @Repository
-public interface ZhangmenOrderRepository extends JpaRepository<ZhangmenMessageDO,Long> {
+public interface ZhangmenMessageRepository extends JpaRepository<ZhangmenMessageDO,Long> {
 }

src/main/java/com/yuyou/openapi/openapi/model/convert/ABMessageConverter.java

@@ -1,8 +1,12 @@
 package com.yuyou.openapi.openapi.model.convert;
 
+import cn.hutool.core.date.DateUtil;
+import com.yuyou.openapi.openapi.common.security.SecurityConstants;
+import com.yuyou.openapi.openapi.common.security.SecurityService;
 import com.yuyou.openapi.openapi.model.dataobject.ABMessageDO;
 import com.yuyou.openapi.openapi.model.dto.ABMessageDTO;
 import com.yuyou.openapi.openapi.model.vo.ABClientInterMessageVO;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
 import org.springframework.util.CollectionUtils;
 
@@ -15,6 +19,7 @@ import java.util.List;
  * @version 1.0
  * @date 2020/8/10
  */
+@Slf4j
 public class ABMessageConverter {
 
     /**
@@ -44,6 +49,25 @@ public class ABMessageConverter {
         return dataList;
     }
 
+    /**
+     * 批量转DTO为DO
+     * @param list
+     * @return
+     */
+    public static List<ABMessageDO> convertABMessageDOFromDTO(List<ABMessageDTO> list) {
+        if (CollectionUtils.isEmpty(list)) {
+            return null;
+        }
+        List<ABMessageDO> abMessageDOs = new ArrayList<>();
+        list.forEach(each -> {
+            ABMessageDO abMessageDO = convertABMessageDOFromDTO(each);
+            if (abMessageDO != null) {
+                abMessageDOs.add(abMessageDO);
+            }
+        });
+        return abMessageDOs;
+    }
+
     /**
      * DTO层转为DO层
      * @param abMessageDTO
@@ -51,6 +75,20 @@ public class ABMessageConverter {
      */
     public static ABMessageDO convertABMessageDOFromDTO(ABMessageDTO abMessageDTO) {
         ABMessageDO abMessageDO = new ABMessageDO();
+        if (abMessageDTO == null) {
+            return abMessageDO;
+        }
+
+        BeanUtils.copyProperties(abMessageDTO, abMessageDO);
+        abMessageDO.setPushTime(DateUtil.date(abMessageDTO.getTimestamp() * 1000));
+        abMessageDO.setStartTime(DateUtil.date(abMessageDTO.getStartTime() * 1000));
+        // AES加密
+        try {
+            SecurityService.encrypt(abMessageDTO.getMobile(), SecurityConstants.PHONE);
+        } catch (Exception e) {
+            log.error("Encrypt Mobile raise Error, error is :", e);
+        }
+        abMessageDO.setPnum(abMessageDTO.getMobile());
         return abMessageDO;
     }
 }

src/main/java/com/yuyou/openapi/openapi/model/dataobject/ABMessageDO.java

@@ -67,4 +67,6 @@ public class ABMessageDO {
     @Column(name = "push_time")
     private Date pushTime;
 
+    @Column(name = "send_status")
+    private Integer sendStatus;
 }

src/main/java/com/yuyou/openapi/openapi/model/dataobject/ZhangmenMessageDO.java

@@ -13,7 +13,7 @@ import java.util.Date;
  * @date 2020/8/10
  */
 @Data
-@Table(name = "zhangmen_order")
+@Table(name = "zhangmen_message")
 public class ZhangmenMessageDO {
 
     /**
@@ -68,4 +68,7 @@ public class ZhangmenMessageDO {
      */
     @Column(name = "push_time")
     private Date pushTime;
+
+    @Column(name = "submit_status")
+    private Integer submitStatus;
 }

src/main/java/com/yuyou/openapi/openapi/service/impl/ABClientServiceImpl.java

@@ -1,6 +1,7 @@
 package com.yuyou.openapi.openapi.service.impl;
 
 import com.yuyou.openapi.openapi.dao.ABMessageRepository;
+import com.yuyou.openapi.openapi.model.convert.ABMessageConverter;
 import com.yuyou.openapi.openapi.model.dataobject.ABMessageDO;
 import com.yuyou.openapi.openapi.model.dto.ABMessageDTO;
 import com.yuyou.openapi.openapi.model.dto.ABZMMessageDTO;
@@ -38,7 +39,7 @@ public class ABClientServiceImpl implements ABClientService {
     @Override
     public boolean recordAndSendABClientMsg(List<ABMessageDTO> dtos) {
         // 调用接口进行入库
-        ArrayList<ABMessageDO> abMessageDOS = new ArrayList<>();
+        List<ABMessageDO> abMessageDOS = ABMessageConverter.convertABMessageDOFromDTO(dtos);
         // TODO: 2020/8/10 0010 加密存储
         List<ABMessageDO> dos = abMessageRepository.saveAll(abMessageDOS);
         if (CollectionUtils.isEmpty(dos)){
@@ -48,7 +49,7 @@ public class ABClientServiceImpl implements ABClientService {
         // TODO: 2020/8/10 0010 解密 发送
         // 调用异步任务进行转发AB单 - 这里是这有一条数据
         // 返回处理结果
-        abDownTask.doRunTask(dtos);
+        //abDownTask.doRunTask(dtos);
         return Boolean.TRUE;
     }
 

src/main/java/com/yuyou/openapi/openapi/service/impl/ABClientServiceProxy.java

@@ -0,0 +1,50 @@
+package com.yuyou.openapi.openapi.service.impl;
+
+import cn.hutool.core.codec.Base64;
+import cn.hutool.core.util.StrUtil;
+import com.yuyou.openapi.openapi.model.dto.ABMessageDTO;
+import com.yuyou.openapi.openapi.model.dto.ABZMMessageDTO;
+import com.yuyou.openapi.openapi.service.ABClientService;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * ABClientService代理类
+ *
+ * @author queyounan
+ * @version 1.0
+ * @date 2020/8/11
+ */
+@Service("ABClientServiceProxy")
+public class ABClientServiceProxy implements ABClientService {
+
+    @Resource(name = "ABClientServiceImpl")
+    private ABClientService abClientService;
+
+    @Override
+    public boolean recordAndSendABClientMsg(List<ABMessageDTO> list) {
+        // 解密List<ABMessageDTO>中的加密字段
+        list.forEach(each -> {
+            each.setActName(each.getActName());
+        });
+        return abClientService.recordAndSendABClientMsg(list);
+    }
+
+    @Override
+    public void recordZMClientMsg(ABZMMessageDTO dto) {
+
+    }
+
+    /**
+     * 解密加密字段
+     * @param base64Value
+     */
+    private String decryptBase64Value(String base64Value) {
+        if (StrUtil.isBlank(base64Value)) {
+            return base64Value;
+        }
+        return Base64.decodeStr(base64Value);
+    }
+}

src/main/java/com/yuyou/openapi/openapi/utils/SecurityOperationUtil.java

@@ -123,4 +123,9 @@ public class SecurityOperationUtil {
             throw new SecretException(ex);
         }
     }
+
+    public static void main(String[] args) throws SecretException {
+        String decryptValue = aesDecrypt("DqkOjL726BFVqAj5TNkgyw==", "AnOQ&1^lyobm%vUX");
+        System.out.println(decryptValue);
+    }
 }