Merge branch 'xuhj-dev' into 'master'

烽火应用资源对接

See merge request dcuc-tjdsj/app-service!97

dcuc-app-model/src/main/java/com/dragoninfo/dcuc/app/dto/appindex/FhResourceRespDTO.java

@@ -116,8 +116,8 @@ public class FhResourceRespDTO {
     /**
      * 业务使用场景代码
      */
-    @JsonProperty("YYSYCJDM")
-    private String yysycjdm;
+    @JsonProperty("YWSYCJDM")
+    private String ywsycjdm;
 
     /**
      * 应用系统地市编码

dcuc-app-service/src/main/java/com/dragoninfo/dcuc/app/business/impl/FhAppSyncBusinessImpl.java

@@ -1,6 +1,8 @@
 package com.dragoninfo.dcuc.app.business.impl;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.date.DateTime;
+import cn.hutool.core.date.DateUtil;
 import com.dragoninfo.dcuc.app.business.IFhAppSyncBusiness;
 import com.dragoninfo.dcuc.app.config.FhAppSyncProperties;
 import com.dragoninfo.dcuc.app.dto.appindex.*;
@@ -29,6 +31,7 @@ import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
 import org.springframework.web.client.RestTemplate;
 
+import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.stream.Collectors;
@@ -154,11 +157,14 @@ public class FhAppSyncBusinessImpl implements IFhAppSyncBusiness {
         app.setDeleted(BooleanEnum.FALSE.value);
         String sxrq = dto.getSxrq();
         if (!StringUtils.isEmpty(sxrq)) {
-            app.setLineTime(sxrq);
+            long sxrqL = Long.parseLong(sxrq);
             SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
             try {
-                Date parse = format.parse(sxrq);
+                Date date = DateUtil.date(sxrqL);
+                String formatDate = DateUtil.formatDate(date);
+                Date parse = format.parse(formatDate);
                 app.setRegistrationTime(parse);
+                app.setLineTime(formatDate);
             } catch (Exception e) {
                 log.error("日期解析异常");
             }
@@ -189,14 +195,16 @@ public class FhAppSyncBusinessImpl implements IFhAppSyncBusiness {
     protected ResponseDTO<FhAppIndexRespDTO> getAppResource() {
         String address = fhAppSyncProperties.getAddress();
         log.info("同步应用资源地址:{}", address);
-        // TODO 封装请求条件入参确认
         RequestParam requestParam = new RequestParam();
         requestParam.setResourceType("0");
-//        requestParam.setCondition();
+        requestParam.setCondition("");
         FhAppIndexReqDTO reqDTO = new FhAppIndexReqDTO();
-//        reqDTO.setFrom();
-//        reqDTO.setTo();
-//        reqDTO.setMessageSequence();
+        reqDTO.setFrom("120000000000");
+        reqDTO.setTo("120000000000");
+        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyyMMddHHmmssSSS");
+        String now = simpleDateFormat.format(new Date());
+        reqDTO.setMessageSequence(now);
+        log.info("同步应用资源请求参数:{}", requestParam);
         reqDTO.setRequestParam(requestParam);
 
         HttpEntity<FhAppIndexReqDTO> httpEntity = new HttpEntity<>(reqDTO);

dcuc-app-service/src/test/java/com/dragoninfo/dcuc/app/business/impl/FhAppSyncBusinessImplTerst.java

@@ -1,9 +1,7 @@
 package com.dragoninfo.dcuc.app.business.impl;
 
-import com.dragoninfo.dcuc.app.business.impl.FhAppSyncBusinessImpl;
 import com.dragoninfo.dcuc.app.config.FhAppSyncProperties;
 import com.dragoninfo.dcuc.app.dto.appindex.FhAppIndexRespDTO;
-import com.dragoninfo.dcuc.app.dto.appindex.FhResourceRespDTO;
 import com.dragoninfo.dcuc.app.entity.ApplyInfo;
 import com.dragoninfo.dcuc.common.http.SkipSslVerificationHttpRequestFactory;
 import com.dragoninfo.dcuc.common.utils.ResponseUtil;
@@ -13,9 +11,11 @@ import com.dragonsoft.duceap.base.entity.http.ResponseDTO;
 import com.dragonsoft.duceap.commons.util.ObjectUtils;
 import com.github.dreamhead.moco.HttpServer;
 import com.github.dreamhead.moco.Runner;
-import org.junit.*;
+import org.junit.AfterClass;
+import org.junit.Assert;
+import org.junit.BeforeClass;
+import org.junit.Test;
 import org.junit.platform.commons.util.StringUtils;
-import org.mockito.Mock;
 import org.mockito.Mockito;
 import org.springframework.web.client.RestTemplate;