Merge branch 'v3.7.0.3' of http://39.98.45.134:8090/station/YeeAmosFireAutoSysRoot into v3.7.0.3

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

@@ -35,14 +35,14 @@ public class View3dController extends BaseController {
 	@Autowired
 	private IView3dService view3dService;
 
-	@Permission
+	
 	@ApiOperation(httpMethod = "POST", value = "点3d坐标设置", notes = "按照点类型3d坐标设置" )
 	@PostMapping(value = "/point/bind",produces = "application/json;charset=UTF-8")
 	public CommonResponse setPoint3dPosition(@ApiParam(name = "参数",required = true) @RequestBody List<BindPointBo> pointBoList){
 		return view3dService.setPoint3dPosition(pointBoList);
 	}
 	
-	@Permission
+	
 	@ApiOperation(value = "区域树查询", notes = "区域树查询")
     @GetMapping(value = "/region/tree")
     public CommonResponse getRegionTree() {
@@ -52,7 +52,7 @@ public class View3dController extends BaseController {
         return CommonResponseUtil.success(riskSourceService.findRegionTree(channelType,orgCode));
     }
 	
-	@Permission
+	
 	@ApiOperation(value = "区域详情查询", notes = "区域详情查询")
     @GetMapping(value = "region/detail/{riskSourceId}")
     public CommonResponse getRegionDetail(@PathVariable("riskSourceId") Long riskSourceId) {
@@ -62,7 +62,7 @@ public class View3dController extends BaseController {
         return CommonResponseUtil.success(riskSourceService.findRegionById(riskSourceId,orgCode,channelType));
     }
 	
-	@Permission
+	
 	@ApiOperation(value = "区域绑定", notes = "区域绑定")
 	@PostMapping(value="region/bind")
 	public CommonResponse batchSaveRegionUe4(@ApiParam(name = "区域参数列表",required = true) @RequestBody List<BindRegionBo> regionBoList) {
@@ -76,14 +76,14 @@ public class View3dController extends BaseController {
         return CommonResponseUtil.success();
     }
 	
-	@Permission
+	
 	@ApiOperation(value = "点类型查询", notes = "点类型查询")
     @GetMapping(value = "point/type")
     public CommonResponse getPointType() {
         return CommonResponseUtil.success(view3dService.getPointType());
     }
 	
-	@Permission
+	
 	@ApiOperation(value = "按照分类查询点树", notes = "按照分类查询点树")
     @GetMapping(value = "point/tree/{type}")
     public CommonResponse getPointTreeByType(@PathVariable(value="type") String type) {
@@ -96,14 +96,14 @@ public class View3dController extends BaseController {
 		return CommonResponseUtil.failure(type + " 类型不存在");
     }
 	
-	@Permission
+	
 	@ApiOperation(value = "按照不同类型查询点详情", notes = "按照不同类型查询点详情")
     @GetMapping(value = "point/detail")
     public CommonResponse getPointDetail(@RequestParam String type,@RequestParam Long pointId) {
 		return CommonResponseUtil.success(view3dService.getPointDetailByTypeAndId(type,pointId));
     }
 	
-	@Permission
+	
 	@ApiOperation(value = "一周安全指数趋势查询", notes = "一周安全指数趋势查询")
     @GetMapping(value = "safetyIndex/week")
     public CommonResponse safetyIndexWeek(String type,Long pointId) {
@@ -112,7 +112,7 @@ public class View3dController extends BaseController {
 		return CommonResponseUtil.success(view3dService.getSafetyIndexWeek(orgCode));
     }
 
-	@Permission
+	
     @ApiOperation(value = "今日安全指数查询",notes = "按照日期查询安全指数及分类数据")
 	@GetMapping(value = "/statistics/safetyIndex")
 	public CommonResponse getSafetyIndexInfoByDate(@RequestParam(name = "date",required = false) String date){
@@ -121,7 +121,7 @@ public class View3dController extends BaseController {
 		return CommonResponseUtil.success(view3dService.getSafetyIndexInfoByDate(orgCode,date));
 	}
 
-	@Permission
+	
 	@ApiOperation(value = "今日安全指数详情",notes = "今日安全指数详情")
 	@GetMapping(value = "/safetyIndex/detail/{type}")
 	public CommonResponse getSafetyIndexDetail(@ApiParam(value = "risk-风险异常,check-巡检异常,equip-设备故障") @PathVariable String type){
@@ -130,7 +130,7 @@ public class View3dController extends BaseController {
 		return CommonResponseUtil.success(view3dService.getSafetyIndexDetail(type,orgCode));
 	}
 
-	@Permission
+	
 	@ApiOperation(value = "查询上线的年日",notes = "查询上线年日：10年101")
 	@GetMapping(value = "/online/date")
 	public CommonResponse getSystemOnlineDate(){
@@ -140,7 +140,7 @@ public class View3dController extends BaseController {
 		return CommonResponseUtil.success(view3dService.getSystemOnlineDate(orgCode));
 	}
 	
-	@Permission
+	
 	@ApiOperation(value = "今日巡检统计接口",notes = "今日巡检统计接口")
 	@GetMapping(value = "statistics/check")
 	public CommonResponse getStatisticsCheck(){
@@ -157,14 +157,14 @@ public class View3dController extends BaseController {
 		return CommonResponseUtil.success(view3dService.getSafetyExecuteListTop5(type,orgCode));
 	}
 	
-	@Permission
+	
 	@ApiOperation(value = "今日值班统计",notes = "今日值班统计")
 	@GetMapping(value = "statistics/duty")
 	public CommonResponse getStatisticsDuty(){
 		return CommonResponseUtil.success(view3dService.getStatisticsDuty());
 	}
 
-	@Permission
+	
 	@ApiOperation(value = "异常区域信息查询",notes = "异常区域信息查询")
 	@GetMapping(value = "region/exception/list")
 	public CommonResponse getExceptionRegion(){
@@ -174,7 +174,7 @@ public class View3dController extends BaseController {
 		return CommonResponseUtil.success(exceptionRegionVoList);
 	}
 	
-	@Permission
+	
 	@ApiOperation(value = "设备状态信息查询",notes = "设备状态信息查询")
 	@GetMapping(value = "equipStatus/list")
 	public CommonResponse getEquipStatusList(){
@@ -183,7 +183,7 @@ public class View3dController extends BaseController {
 		return CommonResponseUtil.success(view3dService.getEquipStatusList(orgCode));
 	}
 	
-	@Permission
+	
 	@ApiOperation(value = "3d视图点显示",notes = "3d视图点显示")
 	@GetMapping(value = "initViewNode")
 	public CommonResponse initViewNode(String type,Long riskSourceId){
@@ -192,7 +192,7 @@ public class View3dController extends BaseController {
 		return CommonResponseUtil.success(view3dService.initViewErrorNode(type,riskSourceId,orgCode));
 	}
 
-	@Permission
+	
 	@ApiOperation(value = "按照点类型查询点列表",notes = "按照点类型查询点列表")
 	@GetMapping(value = "point/list")
 	public CommonResponse get3dPointsByType(@RequestParam(required = false,defaultValue = "grain") String model){
@@ -207,7 +207,7 @@ public class View3dController extends BaseController {
 		return CommonResponseUtil.success();
 	}
 
-	@Permission
+	
 	@ApiOperation(value = "安全指数日流生成",notes = "安全指数日流生成定时任务")
 	@GetMapping(value = "safetyIndex/schJobTest")
 	public CommonResponse safetyIndexLog(@ApiParam(value = "格式:yyyy-MM-dd") @RequestParam String runData){
@@ -220,7 +220,7 @@ public class View3dController extends BaseController {
      *
      * @return
      */
-    @Permission
+    
     @ApiOperation(httpMethod = "GET", value = "二级区域风险等级，风险值", notes = "二级区域风险等级，风险值")
     @RequestMapping(value = "/secondLevelRiskSource", produces = "application/json;charset=UTF-8", method = RequestMethod.GET)
     public CommonResponse queryRiskSourceSecondLevel() {
@@ -234,7 +234,7 @@ public class View3dController extends BaseController {
      * 初始化三维视图节点
      * </pre>
      */
-	@Permission
+	
     @GetMapping(value = "/init3dViewNode", produces = "application/json;charset=UTF-8")
     @ApiOperation(value = "初始化三维视图节点", notes = "初始化三维视图节点")
     public CommonResponse init3dViewNode(
@@ -246,7 +246,7 @@ public class View3dController extends BaseController {
         return CommonResponseUtil.success(view3dService.find3dViewDataByType(type,riskSourceId,orgCode,abnormalStatus));
     }
     
-	@Permission
+	
     @PostMapping(value = "/retrieve/all",produces = "application/json;charset=UTF-8")
 	@ApiOperation(value = "右侧边栏搜索", notes = "右侧边栏搜索")
 	public CommonResponse retrieveAll(
@@ -269,7 +269,7 @@ public class View3dController extends BaseController {
     			token,appKey,product);
     }
 
-	@Permission
+	
 	@PostMapping(value = "/retrieve3/all",produces = "application/json;charset=UTF-8")
 	@ApiOperation(value = "右侧边栏搜索", notes = "右侧边栏搜索")
 	public CommonResponse retrieve3All(
@@ -293,21 +293,21 @@ public class View3dController extends BaseController {
 				token,appKey,product);
 	}
     
-	@Permission
+	
     @ApiOperation(value = "等级查询",notes = "等级查询")
 	@GetMapping(value = "point/level")
 	public CommonResponse pointLevel(@ApiParam(value = "点类型") @RequestParam String type){
 		return CommonResponseUtil.success(view3dService.pointLevelList(type));
 	}
 	
-	@Permission
+	
 	@ApiOperation(value = "重新区域下包含点",notes = "重新区域下包含点")
 	@GetMapping(value = "point/list/{regionId}")
 	public CommonResponse listPointsByRegion(@PathVariable Long regionId, @RequestParam(required = false, defaultValue = "all") String type){
 		return  CommonResponseUtil.success(view3dService.listPointsByRegionId(regionId,type));
 	}
 
-	@Permission
+	
 	@ApiOperation(value = "今日值班列表",notes = "今日值班列表")
 	@GetMapping(value = "dutyList")
 	public CommonResponse dutyList(){