设置全局scenario值

src/main/java/com/hivekion/statistic/bean/BattleConsumeStatistic.java

@@ -0,0 +1,33 @@
+package com.hivekion.statistic.bean;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+@Data
+public class BattleConsumeStatistic {
+
+    private String resourceId;
+
+    private Double ammunition;
+
+    private Integer death;
+
+    private Integer injured;
+
+    private Double fuel;
+
+    private Double food;
+
+    private Double water;
+
+    private Double medical;
+
+    private String lat;
+
+    private String lng;
+
+
+    private String consumeDateStr;
+}

src/main/java/com/hivekion/statistic/controller/StatisticController.java

@@ -1,6 +1,7 @@
 package com.hivekion.statistic.controller;
 
 import com.hivekion.common.entity.ResponseData;
+import com.hivekion.statistic.bean.BattleConsumeStatistic;
 import com.hivekion.statistic.bean.StatisticBean;
 import com.hivekion.statistic.service.StatisticService;
 import javax.annotation.Resource;
@@ -8,6 +9,8 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * [类的简要说明]
  * <p>
@@ -30,4 +33,9 @@ public class StatisticController {
 
     return ResponseData.success(statisticService.statistic(resourceId));
   }
+
+  public ResponseData<List<BattleConsumeStatistic>> listBattleConsumeStatistic(){
+      List<BattleConsumeStatistic> qryList = this.statisticService.listBattleConsumeStatistic();
+      return ResponseData.success(qryList);
+  }
 }

src/main/java/com/hivekion/statistic/service/StatisticService.java

@@ -1,7 +1,10 @@
 package com.hivekion.statistic.service;
 
+import com.hivekion.statistic.bean.BattleConsumeStatistic;
 import com.hivekion.statistic.bean.StatisticBean;
 
+import java.util.List;
+
 /**
  * [类的简要说明]
  * <p>
@@ -13,4 +16,6 @@ import com.hivekion.statistic.bean.StatisticBean;
  */
 public interface StatisticService {
   StatisticBean statistic(String  resourceId);
+
+  List<BattleConsumeStatistic> listBattleConsumeStatistic();
 }

src/main/java/com/hivekion/statistic/service/impl/StatisticServiceImpl.java

@@ -8,17 +8,21 @@ import com.hivekion.baseData.entity.OrgSupplier;
 import com.hivekion.baseData.service.FightpowerstaffService;
 import com.hivekion.baseData.service.OrgSupplierService;
 import com.hivekion.scenario.bean.BattleSuppleVo;
+import com.hivekion.scenario.entity.BattleConsume;
 import com.hivekion.scenario.entity.BattleSupplier;
 import com.hivekion.scenario.entity.ScenarioOrgPost;
 import com.hivekion.scenario.entity.ScenarioResource;
+import com.hivekion.scenario.service.IBattleConsumeService;
 import com.hivekion.scenario.service.IBattleSupplierService;
 import com.hivekion.scenario.service.IScenarioOrgPostService;
 import com.hivekion.scenario.service.ScenarioResourceService;
+import com.hivekion.statistic.bean.BattleConsumeStatistic;
 import com.hivekion.statistic.bean.StatisticBean;
 import com.hivekion.statistic.service.StatisticService;
 import com.hivekion.supplier.entity.SuppliesDict;
 import com.hivekion.supplier.service.SuppliesDictService;
 
+import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
@@ -63,6 +67,9 @@ public class StatisticServiceImpl implements StatisticService {
   @Resource
   private ScenarioResourceService resourceService;
 
+  @Resource
+  private IBattleConsumeService battleConsumeService;
+
 
   @Override
   public StatisticBean statistic(String resourceId) {
@@ -166,4 +173,19 @@ public class StatisticServiceImpl implements StatisticService {
     return statisticBean;
   }
 
+  @Override
+  public List<BattleConsumeStatistic> listBattleConsumeStatistic() {
+    List<BattleConsume> qryList = this.battleConsumeService.list();
+    List<BattleConsumeStatistic> qryResult = new ArrayList<>();
+    qryList.stream().forEach(battleConsume -> {
+      BattleConsumeStatistic battleConsumeStatistic = new BattleConsumeStatistic();
+      BeanUtil.copyProperties(battleConsume,battleConsumeStatistic);
+      DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+      String consumeDateStr = dateTimeFormatter.format(battleConsume.getConsumeDate());
+      battleConsumeStatistic.setConsumeDateStr(consumeDateStr);
+      qryResult.add(battleConsumeStatistic);
+    });
+    return qryResult;
+  }
+
 }