From be29c89f44515327ca919445ff30ed948bf067cd Mon Sep 17 00:00:00 2001
From: xuefei <564615061@qq.com>
Date: 星期五, 25 十二月 2020 09:09:54 +0800
Subject: [PATCH] 新接口修改
---
platform-modules/platform-zhyl/src/main/java/cn/cetc54/platform/zhyl/api/IndexNewController.java | 81 +++++++++++++++++++++++++++++++++++-----
1 files changed, 71 insertions(+), 10 deletions(-)
diff --git a/platform-modules/platform-zhyl/src/main/java/cn/cetc54/platform/zhyl/api/IndexNewController.java b/platform-modules/platform-zhyl/src/main/java/cn/cetc54/platform/zhyl/api/IndexNewController.java
index 20141a6..27b500e 100644
--- a/platform-modules/platform-zhyl/src/main/java/cn/cetc54/platform/zhyl/api/IndexNewController.java
+++ b/platform-modules/platform-zhyl/src/main/java/cn/cetc54/platform/zhyl/api/IndexNewController.java
@@ -85,6 +85,23 @@
@GetMapping("/getSocialAffair")
@ApiOperation(value = "绀句細浜嬪姟")
public Object getSocialAffair(){
+ List<Object> l = new ArrayList<>();
+ l.add(new String[]{"1鏈�","2鏈�","3鏈�","4鏈�","5鏈�","6鏈�","7鏈�","8鏈�","9鏈�","10鏈�","11鏈�","12鏈�"});
+ l.add(new int[]{10, 8, 13, 16, 12, 18, 12, 16, 18, 10, 16, 13});
+ l.add(new int[]{12, 23, 16, 14, 16, 12, 16, 13, 18, 12, 19, 11});
+
+ Map<String,Object> resMap = new HashMap<>();
+ resMap.put("values",l);
+ resMap.put("num1",30); //娈嬬柧琛ュ姪浜烘暟
+ resMap.put("num2",144); //娈嬬柧琛ュ姪閲戦
+ resMap.put("num3",1.1); //绱绂讳笘浜哄憳
+ resMap.put("num4",12); //绱缁撳鐧昏
+ resMap.put("num5",20.1);//閲嶅害娈嬬柧浜哄憳
+ resMap.put("num6",10.2);//鍥伴毦娈嬬柧浜哄憳
+ return ResultUtil.data(resMap);
+
+ }
+ public Object getSocialAffair1(){
List<List<Integer>> values = new ArrayList<>();
values.add(new ArrayList<>());
values.add(new ArrayList<>());
@@ -113,16 +130,19 @@
public Result getPensionService(){
List<StatisVO> list = new ArrayList<>();
- for (int i=0;i<3;i++){
- StatisVO vo = new StatisVO();
- vo.money = NumberUtil.generateBySet(400,1200,1)[0];
- vo.num = NumberUtil.generateBySet(1200,1900,1)[0];
- list.add(vo);
- }
- int n1 = 63;//鍏昏�佹満鏋勬�绘暟
- int n2 = 8769;//搴婁綅鏁�
- int n3 = 458;//鏈烘瀯涓暟
- int n4 = 13876;//鏈烘瀯浜烘暟
+// for (int i=0;i<3;i++){
+// StatisVO vo = new StatisVO();
+// vo.money = NumberUtil.generateBySet(400,1200,1)[0];
+// vo.num = NumberUtil.generateBySet(1200,1900,1)[0];
+// list.add(vo);
+// }
+ list.add(new StatisVO(54,134));
+ list.add(new StatisVO(48,121));
+ list.add(new StatisVO(32,89));
+ int n1 = 73;//鍏昏�佹満鏋勬�绘暟
+ float n2 = 14.6f;//搴婁綅鏁�
+ int n3 = 36;//鏈烘瀯涓暟
+ int n4 = 563;//鏈烘瀯浜烘暟
Map<String,Object> resMap = new HashMap<>();
resMap.put("list",list);
@@ -167,10 +187,49 @@
resMap.put("yearOut",yearOut);
return ResultUtil.data(resMap);
}
+ public Object getChildService1(){
+ List<Object> l = new ArrayList<>();
+ l.add(new String[]{"1鏈�","2鏈�","3鏈�","4鏈�","5鏈�","6鏈�","7鏈�","8鏈�","9鏈�","10鏈�","11鏈�","12鏈�"});
+ l.add(new float[]{24, 26, 28, 22, 26,28, 21, 20, 27, 29, 22, 24});
+ l.add(new float[]{2,4, 3, 5, 2,1, 3, 2, 1.2f, 1.6f, 1.8f, 2});
+ l.add(new float[]{3, 4, 3.4f, 3.6f, 3.9f,2.3f, 4, 4.4f, 3, 3.2f, 2.9f, 4});
+
+
+ int avgNum = 10;
+ int yearAdd = 899;
+ int yearOut = 124;
+
+ Map<String,Object> resMap = new HashMap<>();
+ resMap.put("values",l);
+ resMap.put("totalNum",18900);
+ resMap.put("avgNum",avgNum);
+ resMap.put("yearAdd",yearAdd);
+ resMap.put("yearOut",yearOut);
+ return ResultUtil.data(resMap);
+ }
@GetMapping("/getZongHe")
@ApiOperation(value = "缁煎悎鍒嗘瀽")
public Object getZongHe(){
+ List<Object> l = new ArrayList<>();
+ l.add(new String[]{"1鏈�","2鏈�","3鏈�","4鏈�","5鏈�","6鏈�","7鏈�","8鏈�","9鏈�","10鏈�","11鏈�","12鏈�"});
+ l.add(new int[]{12,16,13,17,18,15,13,17,18,15,11,12});
+ l.add(new int[]{15,19,20,17,19,23 ,20,17,19,23,19,23});
+
+
+
+ Map<String,Object> resMap = new HashMap<>();
+ resMap.put("values",l);
+ resMap.put("checkTotalNum",192);//绱澶嶆牳娆℃暟
+ resMap.put("proportion",85);//澶嶆牳鐜�
+ resMap.put("errNum",65);//璁㈠崟澶嶆牳鏁�
+ resMap.put("totalNum",236598);//璁㈠崟鎬绘暟
+ resMap.put("totalServiceNum",300);//璁㈠崟鎬绘暟
+ resMap.put("totalServiceTime",8659);//璁㈠崟鏈嶅姟鏃堕暱
+ return ResultUtil.data(resMap);
+
+ }
+ public Object getZongHe1(){
List<List<Integer>> values = new ArrayList<>();
values.add(new ArrayList<>());
values.add(new ArrayList<>());
@@ -213,6 +272,8 @@
}
@Data
+ @NoArgsConstructor
+ @AllArgsConstructor
class StatisVO{
int num;
int money;
--
Gitblit v1.9.1