Skip to content

Y
YeeAmosFireAutoSysRoot
Commit 2fafbc75 authored by 万伟's avatar 万伟
Browse files
Options

还原代码3dControl

parent 071d9fe5
Hide whitespace changes
Inline Side-by-side
Showing with 34 additions and 51 deletions
YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/controller/View3dController.java
View file @ 2fafbc75
...@@ -45,9 +45,8 @@ public class View3dController extends BaseController { ...@@ -45,9 +45,8 @@ public class View3dController extends BaseController {
@ApiOperation(value = "区域树查询", notes = "区域树查询") @ApiOperation(value = "区域树查询", notes = "区域树查询")
@GetMapping(value = "/region/tree") @GetMapping(value = "/region/tree")
public CommonResponse getRegionTree() { public CommonResponse getRegionTree() {
// ReginParams reginParams =getSelectedOrgInfo(); ReginParams reginParams =getSelectedOrgInfo();
// String orgCode = this.getOrgCode(reginParams); String orgCode = this.getOrgCode(reginParams);
String orgCode ="1*2";
String channelType = this.getChannelType(); String channelType = this.getChannelType();
return CommonResponseUtil.success(riskSourceService.findRegionTree(channelType,orgCode)); return CommonResponseUtil.success(riskSourceService.findRegionTree(channelType,orgCode));
} }
...@@ -55,9 +54,8 @@ public class View3dController extends BaseController { ...@@ -55,9 +54,8 @@ public class View3dController extends BaseController {
@ApiOperation(value = "区域详情查询", notes = "区域详情查询") @ApiOperation(value = "区域详情查询", notes = "区域详情查询")
@GetMapping(value = "region/detail/{riskSourceId}") @GetMapping(value = "region/detail/{riskSourceId}")
public CommonResponse getRegionDetail(@PathVariable("riskSourceId") Long riskSourceId) { public CommonResponse getRegionDetail(@PathVariable("riskSourceId") Long riskSourceId) {
// ReginParams reginParams =getSelectedOrgInfo(); ReginParams reginParams =getSelectedOrgInfo();
// String orgCode = this.getOrgCode(reginParams); String orgCode = this.getOrgCode(reginParams);
String orgCode ="1*2";
String channelType = this.getChannelType(); String channelType = this.getChannelType();
return CommonResponseUtil.success(riskSourceService.findRegionById(riskSourceId,orgCode,channelType)); return CommonResponseUtil.success(riskSourceService.findRegionById(riskSourceId,orgCode,channelType));
} }
...@@ -83,9 +81,8 @@ public class View3dController extends BaseController { ...@@ -83,9 +81,8 @@ public class View3dController extends BaseController {
@GetMapping(value = "point/tree/{type}") @GetMapping(value = "point/tree/{type}")
public CommonResponse getPointTreeByType(@PathVariable(value="type") String type) { public CommonResponse getPointTreeByType(@PathVariable(value="type") String type) {
if(ResourceTypeDefEnum.containsTypeCode(type)) { if(ResourceTypeDefEnum.containsTypeCode(type)) {
// ReginParams reginParams =getSelectedOrgInfo(); ReginParams reginParams =getSelectedOrgInfo();
// String orgCode = this.getOrgCode(reginParams); String orgCode = this.getOrgCode(reginParams);
String orgCode ="1*2";
String channelType = this.getChannelType(); String channelType = this.getChannelType();
return CommonResponseUtil.success(view3dService.getPointTreeByType(type,orgCode,channelType)); return CommonResponseUtil.success(view3dService.getPointTreeByType(type,orgCode,channelType));
} }
...@@ -95,36 +92,32 @@ public class View3dController extends BaseController { ...@@ -95,36 +92,32 @@ public class View3dController extends BaseController {
@ApiOperation(value = "按照不同类型查询点详情", notes = "按照不同类型查询点详情") @ApiOperation(value = "按照不同类型查询点详情", notes = "按照不同类型查询点详情")
@GetMapping(value = "point/detail") @GetMapping(value = "point/detail")
public CommonResponse getPointDetail(String type,Long pointId) { public CommonResponse getPointDetail(String type,Long pointId) {
// ReginParams reginParams =getSelectedOrgInfo(); ReginParams reginParams =getSelectedOrgInfo();
// String orgCode = this.getOrgCode(reginParams); String orgCode = this.getOrgCode(reginParams);
String orgCode ="1*2";
return CommonResponseUtil.success(view3dService.getPointDetailByTypeAndId(type,pointId,orgCode)); return CommonResponseUtil.success(view3dService.getPointDetailByTypeAndId(type,pointId,orgCode));
} }
@ApiOperation(value = "一周安全指数趋势查询", notes = "一周安全指数趋势查询") @ApiOperation(value = "一周安全指数趋势查询", notes = "一周安全指数趋势查询")
@GetMapping(value = "safetyIndex/week") @GetMapping(value = "safetyIndex/week")
public CommonResponse safetyIndexWeek(String type,Long pointId) { public CommonResponse safetyIndexWeek(String type,Long pointId) {
// ReginParams reginParams =getSelectedOrgInfo(); ReginParams reginParams =getSelectedOrgInfo();
// String orgCode = this.getOrgCode(reginParams); String orgCode = this.getOrgCode(reginParams);
String orgCode ="1*2";
return CommonResponseUtil.success(view3dService.getSafetyIndexWeek(orgCode)); return CommonResponseUtil.success(view3dService.getSafetyIndexWeek(orgCode));
} }
@ApiOperation(value = "今日安全指数查询",notes = "按照日期查询安全指数及分类数据") @ApiOperation(value = "今日安全指数查询",notes = "按照日期查询安全指数及分类数据")
@GetMapping(value = "/statistics/safetyIndex") @GetMapping(value = "/statistics/safetyIndex")
public CommonResponse getSafetyIndexInfoByDate(@RequestParam(name = "date",required = false) String date){ public CommonResponse getSafetyIndexInfoByDate(@RequestParam(name = "date",required = false) String date){
// ReginParams reginParams =getSelectedOrgInfo(); ReginParams reginParams =getSelectedOrgInfo();
// String orgCode = this.getOrgCode(reginParams); String orgCode = this.getOrgCode(reginParams);
String orgCode ="1*2";
return CommonResponseUtil.success(view3dService.getSafetyIndexInfoByDate(orgCode,date)); return CommonResponseUtil.success(view3dService.getSafetyIndexInfoByDate(orgCode,date));
} }
@ApiOperation(value = "今日安全指数详情",notes = "今日安全指数详情") @ApiOperation(value = "今日安全指数详情",notes = "今日安全指数详情")
@GetMapping(value = "/safetyIndex/detail/{type}") @GetMapping(value = "/safetyIndex/detail/{type}")
public CommonResponse getSafetyIndexDetail(@ApiParam(value = "risk-风险异常,check-巡检异常,equip-设备故障") @PathVariable String type){ public CommonResponse getSafetyIndexDetail(@ApiParam(value = "risk-风险异常,check-巡检异常,equip-设备故障") @PathVariable String type){
// ReginParams reginParams =getSelectedOrgInfo(); ReginParams reginParams =getSelectedOrgInfo();
// String orgCode = this.getOrgCode(reginParams); String orgCode = this.getOrgCode(reginParams);
String orgCode ="1*2";
return CommonResponseUtil.success(view3dService.getSafetyIndexDetail(type,orgCode)); return CommonResponseUtil.success(view3dService.getSafetyIndexDetail(type,orgCode));
} }
...@@ -132,45 +125,40 @@ public class View3dController extends BaseController { ...@@ -132,45 +125,40 @@ public class View3dController extends BaseController {
@GetMapping(value = "/online/date") @GetMapping(value = "/online/date")
public CommonResponse getSystemOnlineDate(){ public CommonResponse getSystemOnlineDate(){
//TODO: 多机构暂时不支持 //TODO: 多机构暂时不支持
// ReginParams reginParams =getSelectedOrgInfo(); ReginParams reginParams =getSelectedOrgInfo();
// String orgCode = this.getOrgCode(reginParams); String orgCode = this.getOrgCode(reginParams);
String orgCode ="1*2";
return CommonResponseUtil.success(view3dService.getSystemOnlineDate(orgCode)); return CommonResponseUtil.success(view3dService.getSystemOnlineDate(orgCode));
} }
@ApiOperation(value = "今日巡检统计接口",notes = "今日巡检统计接口") @ApiOperation(value = "今日巡检统计接口",notes = "今日巡检统计接口")
@GetMapping(value = "statistics/check") @GetMapping(value = "statistics/check")
public CommonResponse getStatisticsCheck(){ public CommonResponse getStatisticsCheck(){
// ReginParams reginParams =getSelectedOrgInfo(); ReginParams reginParams =getSelectedOrgInfo();
// String orgCode = this.getOrgCode(reginParams); String orgCode = this.getOrgCode(reginParams);
String orgCode ="1*2";
return CommonResponseUtil.success(view3dService.getStatisticsCheck(orgCode)); return CommonResponseUtil.success(view3dService.getStatisticsCheck(orgCode));
} }
@ApiOperation(value = "异常显示最新5条",notes = "异常显示最新5条") @ApiOperation(value = "异常显示最新5条",notes = "异常显示最新5条")
@GetMapping(value = "safetyExecute/list/{type}") @GetMapping(value = "safetyExecute/list/{type}")
public CommonResponse getSafetyExecuteListTop5(@PathVariable("type")String type){ public CommonResponse getSafetyExecuteListTop5(@PathVariable("type")String type){
// ReginParams reginParams =getSelectedOrgInfo(); ReginParams reginParams =getSelectedOrgInfo();
// String orgCode = this.getOrgCode(reginParams); String orgCode = this.getOrgCode(reginParams);
String orgCode ="1*2";
return CommonResponseUtil.success(view3dService.getSafetyExecuteListTop5(type,orgCode)); return CommonResponseUtil.success(view3dService.getSafetyExecuteListTop5(type,orgCode));
} }
@ApiOperation(value = "今日值班统计",notes = "今日值班统计") @ApiOperation(value = "今日值班统计",notes = "今日值班统计")
@GetMapping(value = "statistics/duty") @GetMapping(value = "statistics/duty")
public CommonResponse getStatisticsDuty(){ public CommonResponse getStatisticsDuty(){
// ReginParams reginParams =getSelectedOrgInfo(); ReginParams reginParams =getSelectedOrgInfo();
// String orgCode = this.getOrgCode(reginParams); String orgCode = this.getOrgCode(reginParams);
String orgCode ="1*2";
return view3dService.getStatisticsDuty(getAppKey(),getProduct(),orgCode); return view3dService.getStatisticsDuty(getAppKey(),getProduct(),orgCode);
} }
@ApiOperation(value = "异常区域信息查询",notes = "异常区域信息查询") @ApiOperation(value = "异常区域信息查询",notes = "异常区域信息查询")
@GetMapping(value = "region/exception/list") @GetMapping(value = "region/exception/list")
public CommonResponse getExceptionRegion(){ public CommonResponse getExceptionRegion(){
// ReginParams reginParams =getSelectedOrgInfo(); ReginParams reginParams =getSelectedOrgInfo();
// String orgCode = this.getOrgCode(reginParams); String orgCode = this.getOrgCode(reginParams);
String orgCode ="1*2";
List<ExceptionRegionVo> exceptionRegionVoList = view3dService.getExceptionRegion(orgCode); List<ExceptionRegionVo> exceptionRegionVoList = view3dService.getExceptionRegion(orgCode);
return CommonResponseUtil.success(exceptionRegionVoList); return CommonResponseUtil.success(exceptionRegionVoList);
} }
...@@ -178,27 +166,24 @@ public class View3dController extends BaseController { ...@@ -178,27 +166,24 @@ public class View3dController extends BaseController {
@ApiOperation(value = "设备状态信息查询",notes = "设备状态信息查询") @ApiOperation(value = "设备状态信息查询",notes = "设备状态信息查询")
@GetMapping(value = "equipStatus/list") @GetMapping(value = "equipStatus/list")
public CommonResponse getEquipStatusList(){ public CommonResponse getEquipStatusList(){
// ReginParams reginParams =getSelectedOrgInfo(); ReginParams reginParams =getSelectedOrgInfo();
// String orgCode = this.getOrgCode(reginParams); String orgCode = this.getOrgCode(reginParams);
String orgCode ="1*2";
return CommonResponseUtil.success(view3dService.getEquipStatusList(orgCode)); return CommonResponseUtil.success(view3dService.getEquipStatusList(orgCode));
} }
@ApiOperation(value = "3d视图点显示",notes = "3d视图点显示") @ApiOperation(value = "3d视图点显示",notes = "3d视图点显示")
@GetMapping(value = "initViewNode") @GetMapping(value = "initViewNode")
public CommonResponse initViewNode(String type,Long riskSourceId){ public CommonResponse initViewNode(String type,Long riskSourceId){
// ReginParams reginParams =getSelectedOrgInfo(); ReginParams reginParams =getSelectedOrgInfo();
// String orgCode = this.getOrgCode(reginParams); String orgCode = this.getOrgCode(reginParams);
String orgCode ="1*2";
return CommonResponseUtil.success(view3dService.initViewErrorNode(type,riskSourceId,orgCode)); return CommonResponseUtil.success(view3dService.initViewErrorNode(type,riskSourceId,orgCode));
} }
@ApiOperation(value = "按照点类型查询点列表",notes = "按照点类型查询点列表") @ApiOperation(value = "按照点类型查询点列表",notes = "按照点类型查询点列表")
@GetMapping(value = "point/list") @GetMapping(value = "point/list")
public CommonResponse get3dPointsByType(@RequestParam(required = false,defaultValue = "grain") String model){ public CommonResponse get3dPointsByType(@RequestParam(required = false,defaultValue = "grain") String model){
// ReginParams reginParams =getSelectedOrgInfo(); ReginParams reginParams =getSelectedOrgInfo();
// String orgCode = this.getOrgCode(reginParams); String orgCode = this.getOrgCode(reginParams);
String orgCode ="1*2";
return view3dService.get3dPointsByModel(orgCode,model); return view3dService.get3dPointsByModel(orgCode,model);
} }
...@@ -225,9 +210,8 @@ public class View3dController extends BaseController { ...@@ -225,9 +210,8 @@ public class View3dController extends BaseController {
public CommonResponse init3dViewNode( public CommonResponse init3dViewNode(
@ApiParam(value = "节点类型", required = false) @RequestParam(required = false) String type, @ApiParam(value = "节点类型", required = false) @RequestParam(required = false) String type,
@ApiParam(value = "区域ID", required = false) @RequestParam(required = false) Long riskSourceId) { @ApiParam(value = "区域ID", required = false) @RequestParam(required = false) Long riskSourceId) {
// ReginParams reginParams =getSelectedOrgInfo(); ReginParams reginParams =getSelectedOrgInfo();
// String orgCode = this.getOrgCode(reginParams); String orgCode = this.getOrgCode(reginParams);
String orgCode ="1*2";
return CommonResponseUtil.success(view3dService.find3dViewDataByType(type,riskSourceId,orgCode)); return CommonResponseUtil.success(view3dService.find3dViewDataByType(type,riskSourceId,orgCode));
} }
...@@ -236,9 +220,8 @@ public class View3dController extends BaseController { ...@@ -236,9 +220,8 @@ public class View3dController extends BaseController {
public CommonResponse retrieveAll( public CommonResponse retrieveAll(
@RequestBody RetrieveParams params @RequestBody RetrieveParams params
) { ) {
// ReginParams reginParams =getSelectedOrgInfo(); ReginParams reginParams =getSelectedOrgInfo();
// String orgCode = this.getOrgCode(reginParams); String orgCode = this.getOrgCode(reginParams);
String orgCode ="1*2";
String token = this.getToken(); String token = this.getToken();
String appKey = this.getAppKey(); String appKey = this.getAppKey();
String product = this.getProduct(); String product = this.getProduct();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment