ZhangManMan 2 anni fa
parent
commit
64ce29f65d

+ 1 - 1
src/main/java/com/sky/ioc/config/LoginAspect.java

@@ -25,7 +25,7 @@ public class LoginAspect {
     @Autowired
     private RedisUtil redisUtil;
 
- //   @Around("execution(* com.sky.ioc..*Controller.*(..))")
+    @Around("execution(* com.sky.ioc..*Controller.*(..))")
     public Object aroundLog(ProceedingJoinPoint joinPoint) throws Throwable {
         ServletRequestAttributes sra = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
         HttpServletRequest request = sra.getRequest();

+ 3 - 4
src/main/java/com/sky/ioc/service/Parking/impl/ParkingServiceImpl.java

@@ -46,10 +46,9 @@ public class ParkingServiceImpl implements ParkingService {
         Integer total = parkMapper.getTotalParkByCompanyIdAndDeptIdAndType(iocParam,1);//违停*/
 
         ThreadLocalRandom random = ThreadLocalRandom.current();
-        int totalParking = random.nextInt(1000, 3000);
-        int dayParking = random.nextInt(1000,totalParking);
-
-        int breakRuleParking = random.nextInt(10,50);
+        int totalParking = 274;
+        int dayParking = random.nextInt(150,170);
+        int breakRuleParking = random.nextInt(0,10);
         int unParking = totalParking - dayParking;
         float compare = (float) Math.random();
         DecimalFormat decimalFormat = new DecimalFormat("#.0");

+ 1 - 1
src/main/java/com/sky/ioc/service/fitness/impl/HealthServiceImpl.java

@@ -52,7 +52,7 @@ public class HealthServiceImpl implements HealthService {
         objects.get(2).put("value",totalSubHealthPerson);
         objects.get(2).put("compare",compare);
         objects.get(3).put("value","高血压");
-        indeicator.setWorthAttention("员⼯使⽤意愿较低,建议深⼊调研员⼯需求,调整⼩屋布置策略喔");
+        indeicator.setWorthAttention("员⼯使⽤意愿较低,建议调整⼩屋布置策略喔");
         indeicator.setList(objects);
         return ReturnMsg.ok(indeicator);
     }

+ 12 - 12
src/main/java/com/sky/ioc/service/space/impl/SpaceServiceImpl.java

@@ -57,10 +57,10 @@ public class SpaceServiceImpl implements SpaceService {
     @Override
     public ReturnMsg getBuildingSituation() {
         JSONObject jsonObject = new JSONObject();
-        jsonObject.put("builtArea", 112893);
+        jsonObject.put("builtArea", 32277);
         jsonObject.put("layersInt", 21);
-        jsonObject.put("serviceLife", 60);
-        jsonObject.put("constructionPeriod", 80);
+        jsonObject.put("serviceLife", 15);
+        jsonObject.put("constructionPeriod", 15);
         return ReturnMsg.ok(jsonObject);
     }
 
@@ -211,19 +211,19 @@ public class SpaceServiceImpl implements SpaceService {
     public ReturnMsg getSpaceOverview() {
         JSONArray jsonArray = new JSONArray();
         JSONObject jsonObject = new JSONObject();
-        jsonObject.put("total", 2000);
-        jsonObject.put("occupancy", 1800);
-        jsonObject.put("percentage", 0.75);
+        jsonObject.put("total", 18);
+        jsonObject.put("occupancy", 14);
+        jsonObject.put("percentage", 0.77);
 
         JSONObject jsonObject2 = new JSONObject();
-        jsonObject2.put("total", 2000);
-        jsonObject2.put("occupancy", 1800);
-        jsonObject2.put("percentage", 0.97);
+        jsonObject2.put("total", 274);
+        jsonObject2.put("occupancy",160 );
+        jsonObject2.put("percentage", 0.58);
 
         JSONObject jsonObject3 = new JSONObject();
-        jsonObject3.put("total", 2000);
-        jsonObject3.put("occupancy", 1800);
-        jsonObject3.put("percentage", 0.93);
+        jsonObject3.put("total", 244);
+        jsonObject3.put("occupancy", 94);
+        jsonObject3.put("percentage", 0.38);
         jsonArray.add(jsonObject);
         jsonArray.add(jsonObject2);
         jsonArray.add(jsonObject3);