Browse Source

BUg修复

jichaobo 2 years ago
parent
commit
8ae2641d35

+ 2 - 2
service-fire/service-fire-biz/src/main/java/com/usky/fire/controller/web/BscEnterpriseAutonomyController.java

@@ -48,8 +48,8 @@ public class BscEnterpriseAutonomyController {
      */
     @GetMapping("streetCompany")
     public ApiResult<Void> streetCompany() {
-//        bscEnterpriseAutonomyService.patrolInspection();
-        bscEnterpriseAutonomyService.enterpriseAutonomyTask();
+        bscEnterpriseAutonomyService.patrolInspection();
+//        bscEnterpriseAutonomyService.enterpriseAutonomyTask();
         return ApiResult.success();
     }
 

+ 5 - 1
service-fire/service-fire-biz/src/main/java/com/usky/fire/service/impl/BscEnterpriseAutonomyServiceImpl.java

@@ -593,7 +593,11 @@ public class BscEnterpriseAutonomyServiceImpl extends AbstractCrudService<BscEnt
                         if (undoneCount == 0 && completedCount == 0) {
                             map1.put("value", 0);
                         } else {
-                            map1.put("value", completedCount / (undoneCount + completedCount) * 100);
+//                            completedCount = 1;
+//                            undoneCount = 3;
+                            double Ratio = Arith.div(completedCount, undoneCount + completedCount, 2) * 100;
+                            map1.put("value", Ratio);
+//                            map1.put("value", completedCount / (undoneCount + completedCount) * 100);
                         }
 
                         map1.put("mark", "%");

+ 2 - 2
service-fire/service-fire-biz/src/main/resources/bootstrap.yml

@@ -14,10 +14,10 @@ spring:
     nacos:
       discovery:
         # 服务注册地址
-        server-addr: usky-cloud-nacos:8848
+        server-addr: 172.16.120.165:8848
       config:
         # 配置中心地址
-        server-addr: usky-cloud-nacos:8848
+        server-addr: 172.16.120.165:8848
         # 配置文件格式
         file-extension: yml
         # 共享配置