|
@@ -37,11 +37,11 @@ public class AssetServiceImpl implements AssetService {
|
|
|
for (int i = 0; i < labKey.length; i++) {
|
|
|
Label label = new Label();
|
|
|
JSONObject jsonObject = new JSONObject();
|
|
|
- int i1 = random.nextInt(50, 120);
|
|
|
- int i2 = random.nextInt(50, 120);
|
|
|
- int i3 = random.nextInt(50, 120);
|
|
|
- int i4 = random.nextInt(50, 120);
|
|
|
- int i5 = random.nextInt(10, 100);
|
|
|
+ int i1 = random.nextInt(500, 620);
|
|
|
+ int i2 = random.nextInt(500, 620);
|
|
|
+ int i3 = random.nextInt(500, 620);
|
|
|
+ int i4 = random.nextInt(500, 620);
|
|
|
+ int i5 = random.nextInt(10, 90);
|
|
|
jsonObject.put(param[0],i1);
|
|
|
jsonObject.put(param[1],i2);
|
|
|
jsonObject.put(param[2],i3);
|
|
@@ -63,8 +63,8 @@ public class AssetServiceImpl implements AssetService {
|
|
|
for (int i = 0; i < labKey.length; i++) {
|
|
|
Label label = new Label();
|
|
|
JSONObject jsonObject = new JSONObject();
|
|
|
- int i2 = random.nextInt(2, 40);
|
|
|
- int i1 = random.nextInt(2, i2);
|
|
|
+ int i2 = random.nextInt(2, 15);
|
|
|
+ int i1 = random.nextInt(2, 8);
|
|
|
jsonObject.put(param[0],i1);
|
|
|
jsonObject.put(param[1],i2);
|
|
|
label.setJsonObject(jsonObject);
|
|
@@ -151,24 +151,24 @@ public class AssetServiceImpl implements AssetService {
|
|
|
Indeicator indeicator = new Indeicator();
|
|
|
List<JSONObject> objects = indeicator.getList();
|
|
|
ThreadLocalRandom random = ThreadLocalRandom.current();
|
|
|
- int yearAsset = random.nextInt(8000, 10000);//年度
|
|
|
+ /* int yearAsset = random.nextInt(8000, 10000);//年度
|
|
|
int personAsset= random.nextInt(50,100);//人均
|
|
|
int totalyear = random.nextInt(2,8);
|
|
|
- int totalAsset = random.nextInt(150000, 300000);
|
|
|
+ int totalAsset = random.nextInt(150000, 300000);*/
|
|
|
float compare = (float) Math.random();
|
|
|
DecimalFormat decimalFormat = new DecimalFormat("#.0");
|
|
|
compare = Float.parseFloat(decimalFormat.format(compare));
|
|
|
|
|
|
- objects.get(0).put("value",yearAsset);
|
|
|
+ objects.get(0).put("value",9800);
|
|
|
objects.get(0).put("compare",compare);
|
|
|
|
|
|
- objects.get(1).put("value",totalAsset);
|
|
|
+ objects.get(1).put("value",145000);
|
|
|
objects.get(1).put("compare",compare);
|
|
|
|
|
|
- objects.get(2).put("value",personAsset);
|
|
|
+ objects.get(2).put("value",79.8);
|
|
|
objects.get(2).put("compare",compare);
|
|
|
|
|
|
- objects.get(3).put("value",totalyear);
|
|
|
+ objects.get(3).put("value",5);
|
|
|
indeicator.setWorthAttention("内容");
|
|
|
indeicator.setList(objects);
|
|
|
return ReturnMsg.ok(indeicator);
|