diff --git a/nladmin-system/src/main/java/org/nl/modules/system/rest/ParamController.java b/nladmin-system/src/main/java/org/nl/modules/system/rest/ParamController.java index cb650ea52..d9ae404e6 100644 --- a/nladmin-system/src/main/java/org/nl/modules/system/rest/ParamController.java +++ b/nladmin-system/src/main/java/org/nl/modules/system/rest/ParamController.java @@ -73,10 +73,10 @@ public class ParamController { paramService.download(paramService.queryAll(whereJson), response); } - @PostMapping("/getStageCodeByCode") - @Log("根据编码获取舞台编码") - @ApiOperation("根据编码获取舞台编码") - public ResponseEntity getStageCodeByCode(@RequestBody String code) { + @PostMapping("/getValueByCode") + @Log("根据编码获取值") + @ApiOperation("根据编码获取值") + public ResponseEntity getValueByCode(@RequestBody String code) { return new ResponseEntity<>(paramService.findByCode(code), HttpStatus.CREATED); } } diff --git a/nladmin-system/src/main/java/org/nl/modules/system/service/dto/ParamDto.java b/nladmin-system/src/main/java/org/nl/modules/system/service/dto/ParamDto.java index 9ac580e26..4c4a961ad 100644 --- a/nladmin-system/src/main/java/org/nl/modules/system/service/dto/ParamDto.java +++ b/nladmin-system/src/main/java/org/nl/modules/system/service/dto/ParamDto.java @@ -25,11 +25,15 @@ public class ParamDto implements Serializable { private String is_delete; - private String create_by; + private Long create_id; + + private Long update_optid; + + private String create_name; private String create_time; - private String update_by; + private String update_optname; private String update_time; } diff --git a/nladmin-system/src/main/java/org/nl/modules/system/service/impl/ParamServiceImpl.java b/nladmin-system/src/main/java/org/nl/modules/system/service/impl/ParamServiceImpl.java index d06cb1ccd..292052290 100644 --- a/nladmin-system/src/main/java/org/nl/modules/system/service/impl/ParamServiceImpl.java +++ b/nladmin-system/src/main/java/org/nl/modules/system/service/impl/ParamServiceImpl.java @@ -2,6 +2,7 @@ package org.nl.modules.system.service.impl; +import cn.dev33.satoken.stp.StpUtil; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.IdUtil; import com.alibaba.fastjson.JSONArray; @@ -73,11 +74,15 @@ public class ParamServiceImpl implements ParamService { @Transactional(rollbackFor = Exception.class) public void create(ParamDto dto) { String currentUsername = SecurityUtils.getCurrentUsername(); + Long currentId = StpUtil.getLoginIdAsLong(); + String now = DateUtil.now(); dto.setId(IdUtil.simpleUUID()); - dto.setCreate_by(currentUsername); - dto.setUpdate_by(currentUsername); + dto.setCreate_id(currentId); + dto.setUpdate_optid(currentId); + dto.setCreate_name(currentUsername); + dto.setUpdate_optname(currentUsername); dto.setUpdate_time(now); dto.setCreate_time(now); @@ -94,8 +99,10 @@ public class ParamServiceImpl implements ParamService { String currentUsername = SecurityUtils.getCurrentUsername(); String now = DateUtil.now(); + + dto.setUpdate_optid(StpUtil.getLoginIdAsLong()); dto.setUpdate_time(now); - dto.setUpdate_by(currentUsername); + dto.setUpdate_optname(currentUsername); WQLObject wo = WQLObject.getWQLObject("sys_param"); JSONObject json = JSONObject.parseObject( JSONObject.toJSONString(dto)); @@ -122,9 +129,9 @@ public class ParamServiceImpl implements ParamService { map.put("备注", param.getRemark()); map.put("是否启用", param.getIs_active()); map.put("是否删除", param.getIs_delete()); - map.put("创建者", param.getCreate_by()); + map.put("创建者", param.getCreate_name()); map.put("创建时间", param.getCreate_time()); - map.put("修改者", param.getUpdate_by()); + map.put("修改者", param.getUpdate_optname()); map.put("修改时间", param.getUpdate_time()); list.add(map); } diff --git a/nladmin-system/src/main/java/org/nl/modules/system/wql/sys.xls b/nladmin-system/src/main/java/org/nl/modules/system/wql/sys.xls index cc0336ee5..ed6deb8e7 100644 Binary files a/nladmin-system/src/main/java/org/nl/modules/system/wql/sys.xls and b/nladmin-system/src/main/java/org/nl/modules/system/wql/sys.xls differ diff --git a/nladmin-ui/src/api/system/param.js b/nladmin-ui/src/api/system/param.js index 07a8e5c94..c2ded2244 100644 --- a/nladmin-ui/src/api/system/param.js +++ b/nladmin-ui/src/api/system/param.js @@ -24,12 +24,12 @@ export function edit(data) { }) } -export function getStageCodeByCode(code) { +export function getValueByCode(code) { return request({ - url: 'api/param/getStageCodeByCode', + url: 'api/param/getValueByCode', method: 'post', data: code }) } -export default { add, edit, del, getStageCodeByCode } +export default { add, edit, del, getValueByCode } diff --git a/nladmin-ui/src/main.js b/nladmin-ui/src/main.js index 77b320a5e..2647e8fcb 100644 --- a/nladmin-ui/src/main.js +++ b/nladmin-ui/src/main.js @@ -44,6 +44,8 @@ import request from '@/utils/request' // 实现 form generator 使用自己定 import { addDateRange, handleTree, parseTime, resetForm, selectDictLabel, selectDictLabels } from '@/utils/nladmin' +import { getValueByCode } from '@/api/system/param' + LogicFlow.use(Menu) Vue.component('tinymce', Tinymce) @@ -56,6 +58,7 @@ Vue.prototype.addDateRange = addDateRange Vue.prototype.selectDictLabel = selectDictLabel Vue.prototype.selectDictLabels = selectDictLabels Vue.prototype.handleTree = handleTree +Vue.prototype.getValueByCode = getValueByCode Vue.use(scroll) diff --git a/nladmin-ui/src/views/system/monitor/device/index.vue b/nladmin-ui/src/views/system/monitor/device/index.vue index 7f6596baf..904947a9b 100644 --- a/nladmin-ui/src/views/system/monitor/device/index.vue +++ b/nladmin-ui/src/views/system/monitor/device/index.vue @@ -103,7 +103,7 @@ export default { }, initStageData() { // 获取舞台编码 - paramCrud.getStageCodeByCode(this.stageParam).then(res => { + this.getValueByCode(this.stageParam).then(res => { if (res.value !== undefined) { crudStage.getNewStageDataByCode(res.value).then(res => { data = JSON.parse(res.stage_data) diff --git a/nladmin-ui/src/views/system/param/index.vue b/nladmin-ui/src/views/system/param/index.vue index a8987f40b..dfc8963c2 100644 --- a/nladmin-ui/src/views/system/param/index.vue +++ b/nladmin-ui/src/views/system/param/index.vue @@ -58,7 +58,7 @@ 是 - +