diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/agv/ndcone/AgvNdcOneDeviceDriver.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/agv/ndcone/AgvNdcOneDeviceDriver.java index 33f9330..705c9e0 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/agv/ndcone/AgvNdcOneDeviceDriver.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/agv/ndcone/AgvNdcOneDeviceDriver.java @@ -360,7 +360,7 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic //判断是否已下发充电任务 Dict dict1 = dictService.getDictByName3("station",String.valueOf(this.agvaddr),null); if(ObjectUtil.isNotEmpty(dict1)){ - log.info("当前车辆{}已分配充电桩{},退出后续判断",carno,dict1.getPara1()); + log.info("当前车辆{}已分配充电桩{},退出后续判断",this.agvaddr,dict1.getPara1()); }else{ //未下发,判断是否有空闲充电桩 Dict dict = dictService.getDictByName2("station"); diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/dict/SysDictController.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/dict/SysDictController.java index 66b7adb..dce07f4 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/dict/SysDictController.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/dict/SysDictController.java @@ -67,6 +67,14 @@ public class SysDictController { return new ResponseEntity<>(HttpStatus.NO_CONTENT); } + @PostMapping("/initDict") + @Log("初始化字典") + @ApiOperation("初始化字典") + public ResponseEntity initDict(@Validated @RequestBody Dict dto){ + dictService.initDict(dto); + return new ResponseEntity<>(HttpStatus.NO_CONTENT); + } + @Log("删除字典") @ApiOperation("删除字典") @DeleteMapping @@ -94,6 +102,13 @@ public class SysDictController { return new ResponseEntity<>(dictMap, HttpStatus.OK); } + @GetMapping("/showDetail2") + @Log("查询字典明细") + @ApiOperation("查询字典明细") + public ResponseEntity showDetail2(@RequestParam String name){ + return new ResponseEntity<>(dictService.getDictByName(name), HttpStatus.OK); + } + @Log("新增字典详情") @ApiOperation("新增字典详情") @PostMapping("/dictDetail") diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dict/ISysDictService.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dict/ISysDictService.java index ec58e1a..459fb7c 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dict/ISysDictService.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dict/ISysDictService.java @@ -41,6 +41,9 @@ public interface ISysDictService extends IService { */ void updateDict(Dict dto); + void initDict(Dict dto); + + /** * 通过id批量删除字典 * @param ids diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dict/impl/SysDictServiceImpl.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dict/impl/SysDictServiceImpl.java index bc055c2..28a6bec 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dict/impl/SysDictServiceImpl.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dict/impl/SysDictServiceImpl.java @@ -94,6 +94,24 @@ public class SysDictServiceImpl extends ServiceImpl impleme }); } + @Override + @Transactional(rollbackFor = Exception.class) + public void initDict(Dict dto) { + Dict dict = sysDictMapper.selectById(dto.getDict_id()); + if (ObjectUtil.isEmpty(dict)) { + throw new BadRequestException("字典不存在"); + } + String currentUserId = SecurityUtils.getCurrentUserId(); + String currentNickName = SecurityUtils.getCurrentNickName(); + dict.setValue("0"); + dict.setPara2(""); + dict.setPara3("充电桩空闲"); + dict.setUpdate_id(currentUserId); + dict.setUpdate_name(currentNickName); + dict.setUpdate_time(DateUtil.now()); + sysDictMapper.updateById(dict); + } + @Override @Transactional(rollbackFor = Exception.class) public void deleteBatchByIds(Set ids) { diff --git a/acs/nladmin-ui/src/views/system/param/index.vue b/acs/nladmin-ui/src/views/system/param/index.vue index 3baee45..e7d0a7f 100644 --- a/acs/nladmin-ui/src/views/system/param/index.vue +++ b/acs/nladmin-ui/src/views/system/param/index.vue @@ -14,6 +14,16 @@ > 配置自动充电 + + 充电桩管理 + + @@ -81,6 +92,7 @@ import crudOperation from '@crud/CRUD.operation' import udOperation from '@crud/UD.operation' import pagination from '@crud/Pagination' import TubeDialog2 from '@/views/system/param/tubeDialog2.vue' +import StationDialog from '@/views/system/param/stationDialog.vue' const defaultForm = { id: null, @@ -92,7 +104,7 @@ const defaultForm = { } export default { name: 'Param', - components: { pagination, crudOperation, udOperation, TubeDialog2 }, + components: { pagination, crudOperation, udOperation, TubeDialog2, StationDialog }, mixins: [presenter(), header(), form(defaultForm), crud()], cruds() { return CRUD({ title: '系统参数', url: 'api/param', idField: 'id', sort: 'id,desc', crudMethod: { ...crudParam }, @@ -113,6 +125,7 @@ export default { del: ['admin', 'param:del'] }, showView2: false, + showStation: false, rules: { id: [ { required: true, message: '不能为空', trigger: 'blur' } @@ -144,6 +157,9 @@ export default { }, divOpen() { this.showView2 = true + }, + divOpenStation() { + this.showStation = true } } } diff --git a/acs/nladmin-ui/src/views/system/param/param.js b/acs/nladmin-ui/src/views/system/param/param.js index 2b22df7..54a6071 100644 --- a/acs/nladmin-ui/src/views/system/param/param.js +++ b/acs/nladmin-ui/src/views/system/param/param.js @@ -46,4 +46,20 @@ export function setParam(data) { }) } -export default { add, edit, del, getValueByCode, queryParam, setParam } +export function showDetail2(params) { + return request({ + url: 'api/dict/showDetail2', + method: 'get', + params + }) +} + +export function initDict(data) { + return request({ + url: 'api/dict/initDict', + method: 'post', + data + }) +} + +export default { add, edit, del, getValueByCode, queryParam, setParam, showDetail2, initDict } diff --git a/acs/nladmin-ui/src/views/system/param/stationDialog.vue b/acs/nladmin-ui/src/views/system/param/stationDialog.vue new file mode 100644 index 0000000..f0ad362 --- /dev/null +++ b/acs/nladmin-ui/src/views/system/param/stationDialog.vue @@ -0,0 +1,150 @@ + + + + +