Compare commits
No commits in common. "c52ea9d74ed429cf1cf2caee6c7f44705448dc52" and "36a64089b81c11f9880b5043d4efa763f99433e6" have entirely different histories.
c52ea9d74e
...
36a64089b8
|
@ -59,7 +59,7 @@
|
||||||
icon="el-icon-plus"
|
icon="el-icon-plus"
|
||||||
size="mini"
|
size="mini"
|
||||||
@click="handleAdd"
|
@click="handleAdd"
|
||||||
v-hasPermi="['trouble:smzSspProblemmodifyDraft:add']"
|
v-hasPermi="['trouble:sspMarks:add']"
|
||||||
>新增</el-button>
|
>新增</el-button>
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="1.5">
|
<el-col :span="1.5">
|
||||||
|
@ -70,7 +70,7 @@
|
||||||
size="mini"
|
size="mini"
|
||||||
@click="dataSynchronization"
|
@click="dataSynchronization"
|
||||||
:disabled="single"
|
:disabled="single"
|
||||||
v-hasPermi="['trouble:smzSspProblemmodifyDraft:add']"
|
v-hasPermi="['trouble:sspMarks:add']"
|
||||||
>数据同步</el-button>
|
>数据同步</el-button>
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="1.5">
|
<el-col :span="1.5">
|
||||||
|
@ -82,7 +82,7 @@
|
||||||
size="mini"
|
size="mini"
|
||||||
@click="batchSubmitForm"
|
@click="batchSubmitForm"
|
||||||
:disabled="multiple"
|
:disabled="multiple"
|
||||||
v-hasPermi="['trouble:smzSspProblemmodifyDraft:add']"
|
v-hasPermi="['trouble:sspMarks:add']"
|
||||||
>批量提交</el-button>
|
>批量提交</el-button>
|
||||||
</el-tooltip>
|
</el-tooltip>
|
||||||
</el-col>
|
</el-col>
|
||||||
|
|
|
@ -59,7 +59,7 @@
|
||||||
icon="el-icon-plus"
|
icon="el-icon-plus"
|
||||||
size="mini"
|
size="mini"
|
||||||
@click="handleAdd"
|
@click="handleAdd"
|
||||||
v-hasPermi="['trouble:smzSspProblemmodifyDraft:add']"
|
v-hasPermi="['trouble:sspMarks:add']"
|
||||||
>新增</el-button>
|
>新增</el-button>
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="1.5">
|
<el-col :span="1.5">
|
||||||
|
@ -70,7 +70,7 @@
|
||||||
size="mini"
|
size="mini"
|
||||||
@click="dataSynchronization"
|
@click="dataSynchronization"
|
||||||
:disabled="single"
|
:disabled="single"
|
||||||
v-hasPermi="['trouble:smzSspProblemmodifyDraft:add']"
|
v-hasPermi="['trouble:sspMarks:add']"
|
||||||
>数据同步</el-button>
|
>数据同步</el-button>
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="1.5">
|
<el-col :span="1.5">
|
||||||
|
@ -82,7 +82,7 @@
|
||||||
size="mini"
|
size="mini"
|
||||||
@click="batchSubmitForm"
|
@click="batchSubmitForm"
|
||||||
:disabled="multiple"
|
:disabled="multiple"
|
||||||
v-hasPermi="['trouble:smzSspProblemmodifyDraft:add']"
|
v-hasPermi="['trouble:sspMarks:add']"
|
||||||
>批量提交</el-button>
|
>批量提交</el-button>
|
||||||
</el-tooltip>
|
</el-tooltip>
|
||||||
</el-col>
|
</el-col>
|
||||||
|
|
|
@ -1,7 +1,6 @@
|
||||||
package com.yanzhu.jh.bigscreen.web.controller;
|
package com.yanzhu.jh.bigscreen.web.controller;
|
||||||
|
|
||||||
import com.ruoyi.common.core.controller.BaseController;
|
import com.ruoyi.common.core.controller.BaseController;
|
||||||
import com.ruoyi.common.core.domain.AjaxResult;
|
|
||||||
import com.ruoyi.common.core.page.TableDataInfo;
|
import com.ruoyi.common.core.page.TableDataInfo;
|
||||||
import com.ruoyi.common.utils.SecurityUtils;
|
import com.ruoyi.common.utils.SecurityUtils;
|
||||||
import com.ruoyi.system.service.ISysDeptService;
|
import com.ruoyi.system.service.ISysDeptService;
|
||||||
|
@ -43,14 +42,4 @@ public class BgWorkFileController extends BaseController {
|
||||||
return getDataTable(workFileService.selectWorkFileListLimit20(workFile));
|
return getDataTable(workFileService.selectWorkFileListLimit20(workFile));
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* 根据文件归属查询文件
|
|
||||||
* @param fileId
|
|
||||||
* @return
|
|
||||||
*/
|
|
||||||
@GetMapping("/workFileRead")
|
|
||||||
public AjaxResult workFileRead(Long fileId){
|
|
||||||
return success();
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -32,10 +32,10 @@ public class AIBoxController extends BaseController {
|
||||||
private static final Logger logger = LoggerFactory.getLogger("AIBoxController");
|
private static final Logger logger = LoggerFactory.getLogger("AIBoxController");
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* aibox推送预警数据
|
* 获取部门列表
|
||||||
*/
|
*/
|
||||||
@PostMapping("/v1/push")
|
@PostMapping("/v1/push")
|
||||||
public void push(@RequestBody Map<String,Object> dataMap)
|
public void list(@RequestBody Map<String,Object> dataMap)
|
||||||
{
|
{
|
||||||
try{
|
try{
|
||||||
List<Map<String,Object>> list = (List<Map<String,Object>>)dataMap.get("BehaviorResults");
|
List<Map<String,Object>> list = (List<Map<String,Object>>)dataMap.get("BehaviorResults");
|
||||||
|
|
Loading…
Reference in New Issue