Merge branch 'dev_upgrade' of 172.16.10.76:station/YeeAmosFireAutoSysRoot into upgrade

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/controller/RiskSourceController.java

@@ -4,6 +4,7 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
@@ -45,6 +46,9 @@ import io.swagger.annotations.ApiParam;
 @Api(tags = "风险点API")
 public class RiskSourceController extends BaseController {
     private final Logger log = LoggerFactory.getLogger(RiskSourceController.class);
+
+    private final static String IS_RISK_AREA = "TRUE";
+
     @Autowired
     IRiskFactorService iRiskFactorService;
 
@@ -87,7 +91,7 @@ public class RiskSourceController extends BaseController {
      * @return
      */
     @Permission
-    @ApiOperation(httpMethod = "GET", value = "风险上升率", notes = "风险上升率")	
+    @ApiOperation(httpMethod = "GET", value = "风险上升率", notes = "风险上升率")
     @RequestMapping(value = "/riseuprate", produces = "application/json;charset=UTF-8", method = RequestMethod.GET)
     public CommonResponse queryForRiseUp() throws Exception {
         return CommonResponseUtil.success(riskSourceService.queryForRiseUp());
@@ -116,29 +120,29 @@ public class RiskSourceController extends BaseController {
     @ApiOperation(httpMethod = "GET", value = "获取风险点树型结构", notes = "获取风险点树型结构")
     @RequestMapping(value = "/riskSourceTress", produces = "application/json;charset=UTF-8", method = RequestMethod.GET)
     public CommonResponse getRiskSourceTress() {
-    	ReginParams reginParams =getSelectedOrgInfo();
-		String compCode=getOrgCode(reginParams);
+        ReginParams reginParams = getSelectedOrgInfo();
+        String compCode = getOrgCode(reginParams);
         List<RiskSourceTreeResponse> riskSources = riskSourceService.findRiskSourceTrees(compCode);
         return CommonResponseUtil.success(getRiskSourcesTree(riskSources));
     }
-    
+
     @Permission
     @ApiOperation(value = "远程同步", notes = "将本地 风险模型推送到远程同步")
     @PutMapping(value = "/synToEquipManage")
     public CommonResponse synToEquipManage() {
-        ReginParams reginParams =getSelectedOrgInfo();
-        String compCode=getOrgCode(reginParams);
-        if(!riskSourceService.isSynEquipManage()) {
+        ReginParams reginParams = getSelectedOrgInfo();
+        String compCode = getOrgCode(reginParams);
+        if (!riskSourceService.isSynEquipManage()) {
             return CommonResponseUtil.failure("同步功能未开启");
         }
-        List<RiskSourceTreeResponse> riskSources = riskSourceService.findRiskSourceTrees(compCode);
+        List<RiskSourceTreeResponse> riskSources = riskSourceService.findRiskSourceTrees(compCode).stream().filter(source -> IS_RISK_AREA.equalsIgnoreCase(source.getIsRegion())).collect(Collectors.toList());
         String synMsg = riskSourceService.synToEquipManage(getAppKey(), getProduct(), getToken(), SUCCESS, getRiskSourcesTree(riskSources));
         if (synMsg != null) {
             return CommonResponseUtil.failure(synMsg);
         }
         return CommonResponseUtil.success();
     }
-    
+
     /**
      * 获取区域树型结构
      *
@@ -149,12 +153,12 @@ public class RiskSourceController extends BaseController {
     @ApiOperation(httpMethod = "GET", value = "获取区域树型结构", notes = "获取区域树型结构")
     @RequestMapping(value = "/regionTress", produces = "application/json;charset=UTF-8", method = RequestMethod.GET)
     public CommonResponse getRegionTress() {
-    	ReginParams reginParams =getSelectedOrgInfo();
-		String compCode=getOrgCode(reginParams);
+        ReginParams reginParams = getSelectedOrgInfo();
+        String compCode = getOrgCode(reginParams);
         List<RiskSourceTreeResponse> riskSources = riskSourceService.findRiskSourceTrees(compCode);
         return CommonResponseUtil.success(getRegionTree(riskSources));
     }
-    
+
     @Permission
     //@Authorization(ingore = true)
     @ApiOperation(httpMethod = "GET", value = "统计级别为1的风险点下面", notes = "获取风险点树型结构")
@@ -184,8 +188,8 @@ public class RiskSourceController extends BaseController {
     @ApiOperation(httpMethod = "GET", value = "统计级别为1的风险点下面", notes = "获取风险点树型结构")
     @RequestMapping(value = "/riskSourceStatistics", produces = "application/json;charset=UTF-8", method = RequestMethod.GET)
     public CommonResponse riskSourceStatistics() throws Exception {
-    	ReginParams reginParams =getSelectedOrgInfo();
-		String compCode=getOrgCode(reginParams);
+        ReginParams reginParams = getSelectedOrgInfo();
+        String compCode = getOrgCode(reginParams);
         List<RiskSourceTreeResponse> riskSources = riskSourceService.findRiskSourceTrees(compCode);
         List<RiskSourceTreeResponse> treeRiskSources = getRiskSourcesTree(riskSources);
         return CommonResponseUtil.success(riskSourceStatistics(treeRiskSources));
@@ -322,7 +326,7 @@ public class RiskSourceController extends BaseController {
     }
 
     @Permission
-   // @Authorization(ingore = true)
+    // @Authorization(ingore = true)
     @ApiOperation(httpMethod = "GET", value = "统计级别为1的风险点下面设备统计", notes = "统计级别为1的风险点下面设备统计")
     @RequestMapping(value = "/equipStatistics/{type}", produces = "application/json;charset=UTF-8", method = RequestMethod.GET)
     public CommonResponse equipStatistics(@PathVariable(value = "type", required = true) String[] type) throws Exception {
@@ -525,7 +529,7 @@ public class RiskSourceController extends BaseController {
         }
         return treeList;
     }
-    
+
     private static List<RiskSourceTreeResponse> getRegionTree(List<RiskSourceTreeResponse> list) {
         List<RiskSourceTreeResponse> treeList = new ArrayList<RiskSourceTreeResponse>();
         for (RiskSourceTreeResponse tree : list) {
@@ -554,7 +558,7 @@ public class RiskSourceController extends BaseController {
                                                  @ApiParam(value = "分页参数", required = true) @RequestParam Integer pageNumber,
                                                  @ApiParam(value = "分页参数", required = true) @RequestParam Integer pageSize) {
         try {
-            Page<Map<String, Object>> list = riskSourceService.listFmeaPointInputitem(getToken(),getProduct(),getAppKey(),fmeaId, pageNumber, pageSize);
+            Page<Map<String, Object>> list = riskSourceService.listFmeaPointInputitem(getToken(), getProduct(), getAppKey(), fmeaId, pageNumber, pageSize);
             return CommonResponseUtil.success(list);
         } catch (Exception e) {
             log.error(e.getMessage(), e);
@@ -632,15 +636,15 @@ public class RiskSourceController extends BaseController {
         return CommonResponseUtil.success();
     }
 
-   // @Permission
+    // @Permission
 //  @Authorization(ingore = true)
     @ApiOperation(httpMethod = "PUT", value = "上传巡检数据", notes = "上传巡检数据")
     @RequestMapping(value = "/data/patroldata", produces = "application/json;charset=UTF-8", method = RequestMethod.PUT)
     public CommonResponse postPatrolData(@RequestBody ProtalDataRo protalData) throws Exception {
-    	log.info("上传巡检数据" + JSONObject.toJSONString(protalData));
-        ReginParams reginParams =getSelectedOrgInfo();
-        String compCode=getOrgCode(reginParams);
-        riskSourceService.processProtalData(getToken(),getProduct(),getAppKey(),protalData, compCode);
+        log.info("上传巡检数据" + JSONObject.toJSONString(protalData));
+        ReginParams reginParams = getSelectedOrgInfo();
+        String compCode = getOrgCode(reginParams);
+        riskSourceService.processProtalData(getToken(), getProduct(), getAppKey(), protalData, compCode);
         return CommonResponseUtil.success();
     }
 
@@ -714,8 +718,8 @@ public class RiskSourceController extends BaseController {
     @ApiOperation(httpMethod = "GET", value = "获取危险因素树二级节点", notes = "获取危险因素树二级节点")
     @RequestMapping(value = "/riskSourceSecondLevel", produces = "application/json;charset=UTF-8", method = RequestMethod.GET)
     public CommonResponse queryRiskSourceSecondLevel() {
-    	ReginParams reginParams =getSelectedOrgInfo();
-		String compCode=getOrgCode(reginParams);
+        ReginParams reginParams = getSelectedOrgInfo();
+        String compCode = getOrgCode(reginParams);
         return CommonResponseUtil.success(riskSourceService.queryRiskSourceSecondLevel(compCode));
     }