|
@@ -279,16 +279,16 @@ public class AssetServiceImpl implements AssetService {
|
|
|
DecimalFormat decimalFormat = new DecimalFormat("#.0");
|
|
|
compare = Float.parseFloat(decimalFormat.format(compare));
|
|
|
|
|
|
- objects.get(0).put("value",9800);
|
|
|
+ objects.get(0).put("value",1200);
|
|
|
objects.get(0).put("compare",compare);
|
|
|
|
|
|
- objects.get(1).put("value",145000);
|
|
|
+ objects.get(1).put("value",12000);
|
|
|
objects.get(1).put("compare",compare);
|
|
|
|
|
|
- objects.get(2).put("value",79.8);
|
|
|
+ objects.get(2).put("value",120);
|
|
|
objects.get(2).put("compare",compare);
|
|
|
|
|
|
- objects.get(3).put("value",5);
|
|
|
+ objects.get(3).put("value",120);
|
|
|
objects.get(3).put("compare",compare);
|
|
|
indeicator.setWorthAttention("内容");
|
|
|
indeicator.setList(objects);
|
|
@@ -305,4 +305,25 @@ public class AssetServiceImpl implements AssetService {
|
|
|
List<Label> labels1 = GeneralMethod.getInstance().dataGeneration(param, labKey);
|
|
|
return ReturnMsg.ok(labels1);
|
|
|
}
|
|
|
+
|
|
|
+ @Override
|
|
|
+ public ReturnMsg getAssetNumber() {
|
|
|
+ String[] param = {"固定资产一级分类","平均使用时间"};
|
|
|
+ String[] labKey = {"办公类","局房类","个人办公类","类别3"};
|
|
|
+ // ThreadLocalRandom random = ThreadLocalRandom.current();
|
|
|
+ List<Label> list = new ArrayList<>();
|
|
|
+ ThreadLocalRandom random = ThreadLocalRandom.current();
|
|
|
+ for (int i = 0; i < labKey.length; i++) {
|
|
|
+ Label label = new Label();
|
|
|
+ JSONObject jsonObject = new JSONObject();
|
|
|
+ int i1 = random.nextInt(2, 10);
|
|
|
+ jsonObject.put(param[1],i1);
|
|
|
+ int i0 = random.nextInt(30, 150);
|
|
|
+ jsonObject.put(param[0],i0);
|
|
|
+ label.setJsonObject(jsonObject);
|
|
|
+ label.setLabel(labKey[i]);
|
|
|
+ list.add(label);
|
|
|
+ }
|
|
|
+ return ReturnMsg.ok(list);
|
|
|
+ }
|
|
|
}
|