Merge remote-tracking branch 'origin/dev' into dev

rs-datacenter/rs-datacenter-api/src/main/java/com/upyuns/platform/rs/datacenter/fegin/DatacenterFeign.java

+package com.upyuns.platform.rs.datacenter.fegin;
+
+import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
+import com.upyuns.platform.rs.datacenter.entity.RscpAreaInfo;
+import com.upyuns.platform.rs.datacenter.entity.RscpImageDataTotal;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+
+
+/**
+ * ${DESCRIPTION}
+ *
+ * @author wanghaobin
+ * @create 2017-06-21 8:11
+ */
+@FeignClient(value = "rs-datacenter", contextId = "datacenter-base")
+public interface DatacenterFeign {
+
+    @RequestMapping(value = "/web/areaInfo/app/unauth/Fegin/queryByCodeFegin", method = RequestMethod.GET)
+    public ObjectRestResponse<RscpAreaInfo> queryByCode(String areaCode);
+
+    @RequestMapping(value = "/web/imageData/app/unauth/Fegin/queryById", method = RequestMethod.GET)
+    public ObjectRestResponse<RscpImageDataTotal> queryById(String id);
+}

rs-datacenter/rs-datacenter-server/src/main/java/com/upyuns/platform/rs/datacenter/biz/RscpImageDataTotalBiz.java

 package com.upyuns.platform.rs.datacenter.biz;
 
+import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.convert.Convert;
 import com.github.wxiaoqi.security.common.biz.BaseBiz;
 import com.upyuns.platform.rs.datacenter.entity.RscpAreaImageTotal;
 import com.upyuns.platform.rs.datacenter.entity.RscpImageDataTotal;
@@ -17,17 +19,18 @@ public class RscpImageDataTotalBiz extends BaseBiz<RscpImageDataTotalMapper, Rsc
         return mapper.queryDataList(dto);
     }
 
-//    public List<RscpAreaImageTotal> queryDataList(RscpImageDataTotalController.QueryDTO dto) {
-//        List<RscpImageDataTotal> list = mapper.queryDataList(dto);
-//        List<RscpAreaImageTotal> list2 = CollUtil.newArrayList();
-//        if(CollUtil.isNotEmpty(list)) {
-//            list.forEach(to -> {
-//                to.getC
-//                return ;
-//            });
-//        }
-//        return mapper.queryDataList(dto);
-//    }
+    public List<RscpAreaImageTotal> queryDataAreaList(RscpImageDataTotalController.QueryDTO dto) {
+        List<RscpImageDataTotal> list = mapper.queryDataList(dto);
+        List<RscpAreaImageTotal> list2 = CollUtil.newArrayList();
+        if(CollUtil.isNotEmpty(list)) {
+            for(RscpImageDataTotal ridt : list) {
+                RscpAreaImageTotal rait = BeanUtil.toBean(ridt, RscpAreaImageTotal.class);
+                rait.setBeginTime(ridt.getImageTakeTime());
+                list2.add(rait);
+            }
+        }
+        return list2;
+    }
 
 
 }

rs-datacenter/rs-datacenter-server/src/main/java/com/upyuns/platform/rs/datacenter/rest/RscpImageDataTotalController.java

@@ -74,10 +74,15 @@ public class RscpImageDataTotalController extends BaseController<RscpImageDataTo
         if(RscpImageDataTotalController.QueryDTO.TYPE_AREA == dto.getType()) {
             return ObjectRestResponse.succ(rscpAreaImageTotalBiz.queryDataList(dto));
         }else {
-            return ObjectRestResponse.succ(baseBiz.queryDataList(dto));
+            return ObjectRestResponse.succ(baseBiz.queryDataAreaList(dto));
         }
     }
 
+    @RequestMapping(value = "/web/imageData/app/unauth/Fegin/queryByIds", method = RequestMethod.GET)
+    public ObjectRestResponse<List<RscpImageDataTotal>> queryById(String ids){
+        return ObjectRestResponse.succ(baseBiz.selectByAttrs(RscpImageDataTotal::getId, CollUtil.toList(ids.split(","))));
+    }
+
 
     @Data
     static public class QueryDTO {