Merge remote-tracking branch 'origin/feature/item_appeal' into feature/item_appeal

esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/utils/HttpUtil.java

@@ -4,6 +4,7 @@ import com.elink.esua.epdc.commons.tools.exception.RenException;
 import com.elink.esua.epdc.commons.tools.redis.RedisKeys;
 import com.elink.esua.epdc.commons.tools.redis.RedisUtils;
 import com.elink.esua.httpclient.HttpClientUtils;
+import com.elink.esua.httpclient.ResultDto;
 import org.mybatis.logging.Logger;
 import org.mybatis.logging.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -64,14 +65,14 @@ public class HttpUtil {
             paramsMap.put("geometry", urlParams.get("geometry"));
         }
 
-        String data = httpClientUtils.sendPostAndHeader(GET_GIS_COORDINATE_URL, paramsMap, headerMap).getResult();
+        ResultDto result = httpClientUtils.sendPostAndHeader(GET_GIS_COORDINATE_URL, paramsMap, headerMap);
 
-        if (null == data) {
+        if (null == result) {
             throw new RenException("地理坐标获取失败");
         }
 
 //        redisUtils.set(key, data, RedisUtils.DEFAULT_EXPIRE);
-        return data;
+        return result.getResult();
     }
 
     /**
@@ -95,14 +96,14 @@ public class HttpUtil {
         paramsMap.put("outFields", "网格名称,网格编码");
         paramsMap.put("f", "pjson");
 
-        String data = httpClientUtils.sendPostAndHeader(GET_COMPANY_URL, paramsMap, headerMap).getResult();
+        ResultDto result = httpClientUtils.sendPostAndHeader(GET_COMPANY_URL, paramsMap, headerMap);
 
-        if (null == data) {
+        if (null == result) {
             throw new RenException("公司信息获取失败");
         }
 
-        redisUtils.set(key, data, RedisUtils.DEFAULT_EXPIRE);
-        return data;
+        redisUtils.set(key, result.getResult(), RedisUtils.DEFAULT_EXPIRE);
+        return result.getResult();
     }
 
 }

esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/ItemLawSubmitDTO.java

@@ -163,7 +163,7 @@ public class ItemLawSubmitDTO implements Serializable {
     /**
      * 语音时长
      */
-    private String duration;
+    private int duration;
 
     /**
      * 图片

esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/SubmitItemFormDTO.java

@@ -112,7 +112,7 @@ public class SubmitItemFormDTO implements Serializable {
     /**
      * 语音时长
      */
-    private String duration;
+    private int duration;
 
     /**
      * 联系人

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/entity/ItemEntity.java

@@ -233,7 +233,7 @@ public class ItemEntity extends BaseEpdcEntity {
     /**
      * 语音时长
      */
-    private String duration;
+    private int duration;
 
     /**
      * 联系人