Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/enums/HomePageEnum.java

@@ -12,13 +12,13 @@ import lombok.AllArgsConstructor;
 public enum HomePageEnum {
 
     DISPATCHALARM("dispatchAlarm", "com.yeejoin.amos.boot.module.jcs.biz.service.impl.DispatchMapServiceImpl"),
-    DISPATCHTASK("dispatchTask", "com.yeejoin.amos.boot.module.jcs.biz.service.impl.DispatchMapServiceImpl"),
-    FIREALARM("fireAlarm", "com.yeejoin.amos.boot.module.jcs.biz.service.impl.DispatchMapServiceImpl"),
-    FAULT("fault", "com.yeejoin.amos.boot.module.jcs.biz.service.impl.DispatchMapServiceImpl"),
-    SHIELD("shield", "com.yeejoin.amos.boot.module.jcs.biz.service.impl.DispatchMapServiceImpl"),
-    WARNING("warning", "com.yeejoin.amos.boot.module.jcs.biz.service.impl.DispatchMapServiceImpl"),
-    NO("no", "com.yeejoin.amos.boot.module.jcs.biz.service.impl.DispatchMapServiceImpl"),
-    YES("yes", "com.yeejoin.amos.boot.module.jcs.biz.service.impl.DispatchMapServiceImpl");
+    DISPATCHTASK("dispatchTask", "com.yeejoin.amos.boot.module.jcs.biz.service.impl.DispatchTaskServiceImpl"),
+    FIREALARM("fireAlarm", "com.yeejoin.amos.boot.module.jcs.biz.service.impl.FireAlarmServiceImpl"),
+    FAULT("fault", "com.yeejoin.amos.boot.module.jcs.biz.service.impl.FaultServiceImpl"),
+    SHIELD("shield", "com.yeejoin.amos.boot.module.jcs.biz.service.impl.ShieldServiceImpl"),
+    WARNING("warning", "com.yeejoin.amos.boot.module.jcs.biz.service.impl.WarningServiceImpl"),
+    NO("no", "com.yeejoin.amos.boot.module.jcs.biz.service.impl.NoServiceImpl"),
+    YES("yes", "com.yeejoin.amos.boot.module.jcs.biz.service.impl.YesServiceImpl");
 
 
 

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/feign/EquipFeignClient.java

@@ -182,6 +182,6 @@ public interface EquipFeignClient {
      * 统计
      **/
     @RequestMapping(value = "/equipSpecificAlarm/getcountAlarmHandle/{type}", method = RequestMethod.GET)
-    ResponseModel<Integer> getCountEquipment(@PathVariable String type);
+    ResponseModel<Integer> getcountAlarmHandle(@PathVariable String type);
 
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/FaultServiceImpl.java

@@ -30,7 +30,7 @@ public class FaultServiceImpl implements IHomePageService {
     @Override
     public Object getHomePageData() {
 
-        ResponseModel<Integer> data=   quipFeignClient.getCountAlarm("BREAKDOWN");
-        return ResponseHelper.buildResponse(data!=null?data.getResult():0);
+        ResponseModel<Integer> data=   quipFeignClient1.getCountAlarm("BREAKDOWN");
+        return data!=null?data.getResult():0;
     }
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/FireAlarmServiceImpl.java

@@ -31,7 +31,7 @@ public class FireAlarmServiceImpl implements IHomePageService {
     @Override
     public Object getHomePageData() {
 
-        ResponseModel<Integer> data=   quipFeignClient.getCountAlarm("FIREALARM");
-        return ResponseHelper.buildResponse(data!=null?data.getResult():0);
+        ResponseModel<Integer> data=   quipFeignClient1.getCountAlarm("FIREALARM");
+        return data!=null?data.getResult():0;
     }
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/NoServiceImpl.java

@@ -30,7 +30,7 @@ public class NoServiceImpl implements IHomePageService {
     @Override
     public Object getHomePageData() {
 
-        ResponseModel<Integer> data=   quipFeignClient.getCountAlarm("NOTICE");
-        return ResponseHelper.buildResponse(data!=null?data.getResult():0);
+        ResponseModel<Integer> data=   quipFeignClient1.getcountAlarmHandle("no");
+        return data!=null?data.getResult():0;
     }
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/ShieldServiceImpl.java

@@ -30,7 +30,7 @@ public class ShieldServiceImpl implements IHomePageService {
     @Override
     public Object getHomePageData() {
 
-        ResponseModel<Integer> data=   quipFeignClient.getCountAlarm("SHIELD");
-        return ResponseHelper.buildResponse(data!=null?data.getResult():0);
+        ResponseModel<Integer> data=   quipFeignClient1.getCountAlarm("SHIELD");
+        return data!=null?data.getResult():0;
     }
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/WarningServiceImpl.java

@@ -30,7 +30,7 @@ public class WarningServiceImpl implements IHomePageService {
     @Override
     public Object getHomePageData() {
 
-        ResponseModel<Integer> data=   quipFeignClient.getCountAlarm("NOTICE");
-        return ResponseHelper.buildResponse(data!=null?data.getResult():0);
+        ResponseModel<Integer> data=   quipFeignClient1.getCountAlarm("NOTICE");
+        return data!=null?data.getResult():0;
     }
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/YesServiceImpl.java

 package com.yeejoin.amos.boot.module.jcs.biz.service.impl;
 
 import com.yeejoin.amos.boot.biz.common.service.IHomePageService;
+import com.yeejoin.amos.boot.module.common.api.feign.EquipFeignClient;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.typroject.tyboot.core.restful.utils.ResponseHelper;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
+
+import javax.annotation.PostConstruct;
 
 /**
  * @description:
@@ -11,12 +17,20 @@ import org.springframework.stereotype.Service;
 @Service
 public class YesServiceImpl implements IHomePageService {
 
-    //实现首页dispatchMap
+    @Autowired
+    EquipFeignClient quipFeignClient;
+    private  static  EquipFeignClient quipFeignClient1;
+
+    @PostConstruct
+    public void init(){
+        quipFeignClient1=  quipFeignClient;
+    }
 
+    //火警
     @Override
     public Object getHomePageData() {
 
-
-        return 0;
+        ResponseModel<Integer> data=   quipFeignClient1.getcountAlarmHandle("yes");
+        return data!=null?data.getResult():0;
     }
 }