完成存栏变动-数据源切换2:

1、销售历史记录曲线

huimv-env-platform/huimv-env-produce/src/main/java/com/huimv/env/produce/controller/SalesDetailController.java

@@ -56,7 +56,25 @@ public class SalesDetailController {
     }
 
     private Result getRemoteSaleHistory(Map<String, String> paramsMap) {
-        return null;
+        HttpHeaders httpHeaders = new HttpHeaders();
+        MediaType type = MediaType.parseMediaType("application/json;charset=UTF-8");
+        httpHeaders.setContentType(type);
+//        MultiValueMap<String, Object> map=new LinkedMultiValueMap<>();
+        HashMap<String, Object> map = new HashMap<>();
+        map.put("farmCode", paramsMap.get("farmCode"));
+        map.put("months", paramsMap.get("months"));
+//        System.out.println("远程调用参数="+map);
+        HttpEntity<Map<String, Object>> objectHttpEntity = new HttpEntity<>(map, httpHeaders);
+        //读取真实数据
+        String remoteUrl = "http://123.60.134.84:10001/breed/api/v1.0.0/sales/getSaleList";
+        ResponseEntity<String> entity = restTemplate.postForEntity(remoteUrl, objectHttpEntity, String.class);
+        System.out.println("body="+entity.getBody());
+        if(entity.getStatusCode().toString().contains("200")){
+            String body = entity.getBody();
+            return new Result(ResultCode.SUCCESS,JSONArray.parseArray(JSON.parseObject(body).getString("data")));
+        }else{
+            return new Result(ResultCode.FAIL,"调取远程数据出错.");
+        }
     }
 
     //查询

huimv-env-platform/huimv-env-produce/src/main/java/com/huimv/env/produce/service/impl/CostServiceImpl.java

@@ -32,10 +32,11 @@ public class CostServiceImpl extends ServiceImpl<CostMapper, Cost> implements Co
     @Override
     public Result getCostInYearAndMonth(Map<String, String> paramsMap) {
         DateUtil dateUtil = new DateUtil();
-        String farmCode = paramsMap.get("farmCode");
-        if(farmCode == null){
-            farmCode = globalFarmCode;
-        }
+//        String farmCode = paramsMap.get("farmCode");
+//        if(farmCode == null){
+//            farmCode = globalFarmCode;
+//        }
+        String farmCode = globalFarmCode;
         QueryWrapper<Cost> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("farm_code",farmCode);
 //        queryWrapper.eq("year",dateUtil.getThisYear());

huimv-env-platform/huimv-env-produce/src/main/java/com/huimv/env/produce/service/impl/SalesDetailServiceImpl.java

@@ -214,12 +214,23 @@ public class SalesDetailServiceImpl extends ServiceImpl<SalesDetailMapper, Sales
 //        if(farmCode == null){
 //            farmCode = DEFAULT_FARM_CODE;
 //        }
+        String months = paramsMap.get("months");
         String farmCode = DEFAULT_FARM_CODE;
         //查询明细表
         QueryWrapper<SalesDetail> detailQueryWrapper = new QueryWrapper<>();
         detailQueryWrapper.eq("farm_code",farmCode);
-        detailQueryWrapper.orderByAsc("id");
+        detailQueryWrapper.orderByDesc("id");
+        detailQueryWrapper.last("LIMIT "+months);
         List<SalesDetail> salesDetailList = salesDetailMapper.selectList(detailQueryWrapper);
-        return new Result(ResultCode.SUCCESS,salesDetailList);
+        JSONArray resultJa = new JSONArray();
+        for(int a=salesDetailList.size()-1;a>=0;a--){
+            SalesDetail salesDetail = salesDetailList.get(a);
+            JSONObject resultJo = new JSONObject();
+            resultJa.add(resultJo);
+            resultJo.put("quantity",salesDetail.getSaleCount());
+            resultJo.put("money",salesDetail.getSaleMoney());
+            resultJo.put("month",salesDetail.getAddDate());
+        }
+        return new Result(ResultCode.SUCCESS,resultJa);
     }
 }

huimv-env-platform/huimv-env-produce/src/main/resources/application.properties

@@ -1,5 +1,5 @@
-spring.profiles.active=dev
-#spring.profiles.active=prod
+#spring.profiles.active=dev
+spring.profiles.active=prod
 
 # mysql:/cache:
 device.online.access_mode=mysql