sxyanzhu
/
jhprjv2
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: sxyanzhu:c52ea9d74ed429cf1cf2caee6c7f44705448dc52
Branches Tags
sxyanzhu:dev_caq
sxyanzhu:dev
sxyanzhu:dev_xds
sxyanzhu:main
sxyanzhu:release
..
compare: sxyanzhu:36a64089b81c11f9880b5043d4efa763f99433e6
Branches Tags
sxyanzhu:dev_caq
sxyanzhu:dev
sxyanzhu:dev_xds
sxyanzhu:main
sxyanzhu:release

No commits in common. "c52ea9d74ed429cf1cf2caee6c7f44705448dc52" and "36a64089b81c11f9880b5043d4efa763f99433e6" have entirely different histories.
c52ea9d74e ... 36a64089b8

4 changed files with 8 additions and 19 deletions
Show Stats Expand all files Collapse all files

6
ruoyi-ui/src/views/trouble/pshProblemmodifyDraft/index.vue
View File

@ -59,7 +59,7 @@
icon="el-icon-plus"
size="mini"
@click="handleAdd"
v-hasPermi="['trouble:smzSspProblemmodifyDraft:add']"
v-hasPermi="['trouble:sspMarks:add']"
>新增</el-button>
</el-col>
<el-col :span="1.5">
@ -70,7 +70,7 @@
size="mini"
@click="dataSynchronization"
:disabled="single"
v-hasPermi="['trouble:smzSspProblemmodifyDraft:add']"
v-hasPermi="['trouble:sspMarks:add']"
>数据同步</el-button>
</el-col>
<el-col :span="1.5">
@ -82,7 +82,7 @@
size="mini"
@click="batchSubmitForm"
:disabled="multiple"
v-hasPermi="['trouble:smzSspProblemmodifyDraft:add']"
v-hasPermi="['trouble:sspMarks:add']"
>批量提交</el-button>
</el-tooltip>
</el-col>

6
ruoyi-ui/src/views/trouble/sspProblemmodifyDraft/index.vue
View File

@ -59,7 +59,7 @@
icon="el-icon-plus"
size="mini"
@click="handleAdd"
v-hasPermi="['trouble:smzSspProblemmodifyDraft:add']"
v-hasPermi="['trouble:sspMarks:add']"
>新增</el-button>
</el-col>
<el-col :span="1.5">
@ -70,7 +70,7 @@
size="mini"
@click="dataSynchronization"
:disabled="single"
v-hasPermi="['trouble:smzSspProblemmodifyDraft:add']"
v-hasPermi="['trouble:sspMarks:add']"
>数据同步</el-button>
</el-col>
<el-col :span="1.5">
@ -82,7 +82,7 @@
size="mini"
@click="batchSubmitForm"
:disabled="multiple"
v-hasPermi="['trouble:smzSspProblemmodifyDraft:add']"
v-hasPermi="['trouble:sspMarks:add']"
>批量提交</el-button>
</el-tooltip>
</el-col>

11
yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/BgWorkFileController.java
View File

@ -1,7 +1,6 @@
package com.yanzhu.jh.bigscreen.web.controller;
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.utils.SecurityUtils;
import com.ruoyi.system.service.ISysDeptService;
@ -43,14 +42,4 @@ public class BgWorkFileController extends BaseController {
return getDataTable(workFileService.selectWorkFileListLimit20(workFile));
}
/**
* 根据文件归属查询文件
* @param fileId
* @return
*/
@GetMapping("/workFileRead")
public AjaxResult workFileRead(Long fileId){
return success();
}
}

4
yanzhu-jh/src/main/java/com/yanzhu/jh/publics/AIBoxController.java
View File

@ -32,10 +32,10 @@ public class AIBoxController extends BaseController {
private static final Logger logger = LoggerFactory.getLogger("AIBoxController");
/**
* aibox推送预警数据
* 获取部门列表
*/
@PostMapping("/v1/push")
public void push(@RequestBody Map<String,Object> dataMap)
public void list(@RequestBody Map<String,Object> dataMap)
{
try{
List<Map<String,Object>> list = (List<Map<String,Object>>)dataMap.get("BehaviorResults");