From 4fc7f3a0b9d0f2b385e87fb2ee27cbeafcc35ea5 Mon Sep 17 00:00:00 2001
From: 唐耀东 <18861537@qq.com>
Date: 星期四, 18 八月 2022 14:16:00 +0800
Subject: [PATCH] 配置工具修改
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/ExternaController.java | 59 +++++++++++++++++++++++++++++++++++------------------------
1 files changed, 35 insertions(+), 24 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/ExternaController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/ExternaController.java
index 533a94e..75e4266 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/ExternaController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/ExternaController.java
@@ -1,6 +1,7 @@
package com.ruoyi.web.controller.common;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.ruoyi.common.annotation.DataDictClass;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.annotation.RepeatSubmit;
import com.ruoyi.common.core.domain.AjaxResult;
@@ -10,12 +11,10 @@
import com.ruoyi.common.enums.LogType;
import com.ruoyi.oa.domain.BsSchool;
import com.ruoyi.oa.domain.DevBatch;
+import com.ruoyi.oa.domain.DevManufacturer;
import com.ruoyi.oa.domain.DevPeripheralUnit;
import com.ruoyi.oa.domain.bo.DevEquipmentBo;
-import com.ruoyi.oa.service.IBsSchoolService;
-import com.ruoyi.oa.service.IDevBatchService;
-import com.ruoyi.oa.service.IDevEquipmentService;
-import com.ruoyi.oa.service.IDevPeripheralUnitService;
+import com.ruoyi.oa.service.*;
import com.ruoyi.system.service.ISysDictDataService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -51,30 +50,30 @@
private final IDevEquipmentService iDevEquipmentService;
+ private final IDevManufacturerService iDevManufacturerService;
+
/**
* 鍩虹淇℃伅
*/
@ApiOperation("鍩虹淇℃伅")
@Log(type = LogType.EQUIPMENT_LOG, operation = EquipmentLog.LOAD)
@GetMapping
- public AjaxResult externalAdd() {
+ public AjaxResult externaList() {
// 鏅烘帶璁惧绫诲瀷
- List<SysDictData> dict1 = dictDataService.list(new QueryWrapper<SysDictData>().lambda().eq(SysDictData::getDictType, "DICT101"));
+ List<SysDictData> dict1 = dictDataService.list(new QueryWrapper<SysDictData>().lambda().eq(SysDictData::getDictType, "DICT101").orderByAsc(SysDictData::getDictSort));
// 尾缃戠粶宸ヤ綔棰戞
- List<SysDictData> dict2 = dictDataService.list(new QueryWrapper<SysDictData>().lambda().eq(SysDictData::getDictType, "DICT102"));
+ List<SysDictData> dict2 = dictDataService.list(new QueryWrapper<SysDictData>().lambda().eq(SysDictData::getDictType, "DICT102").orderByAsc(SysDictData::getDictSort));
// 涓插彛閫氫俊娉㈢壒鐜�
- List<SysDictData> dict3 = dictDataService.list(new QueryWrapper<SysDictData>().lambda().eq(SysDictData::getDictType, "DICT103"));
- // 鍦ㄧ敤鐘舵��
- List<SysDictData> dict4 = dictDataService.list(new QueryWrapper<SysDictData>().lambda().eq(SysDictData::getDictType, "DICT104"));
- // 鍔炲灞傛
- List<SysDictData> dict5 = dictDataService.list(new QueryWrapper<SysDictData>().lambda().eq(SysDictData::getDictType, "DICT105"));
- // 瀛︾鑼冨洿
- List<SysDictData> dict6 = dictDataService.list(new QueryWrapper<SysDictData>().lambda().eq(SysDictData::getDictType, "DICT106"));
+ List<SysDictData> dict3 = dictDataService.list(new QueryWrapper<SysDictData>().lambda().eq(SysDictData::getDictType, "DICT103").orderByAsc(SysDictData::getDictSort));
// 閲囬泦鍛ㄦ湡
- List<SysDictData> dict7 = dictDataService.list(new QueryWrapper<SysDictData>().lambda().eq(SysDictData::getDictType, "DICT107"));
+ List<SysDictData> dict7 = dictDataService.list(new QueryWrapper<SysDictData>().lambda().eq(SysDictData::getDictType, "DICT107").orderByAsc(SysDictData::getDictSort));
+ //鍦ㄧ敤鐘舵��
+ List<SysDictData> dict4 = dictDataService.list(new QueryWrapper<SysDictData>().lambda().eq(SysDictData::getDictType, "DICT104").orderByAsc(SysDictData::getDictSort));
// 澶栬鍗曞厓
List<DevPeripheralUnit> peripheralUnit = iDevPeripheralUnitService.list(new QueryWrapper<DevPeripheralUnit>());
+ //澶栬鍘傚晢
+ List<DevManufacturer> peripheralFirm = iDevManufacturerService.list(new QueryWrapper<DevManufacturer>());
// 鎵规
List<DevBatch> batch = iDevBatchService.list(new QueryWrapper<DevBatch>());
// 楂樻牎
@@ -84,34 +83,46 @@
map.put("DICT102", dict2);
map.put("DICT103", dict3);
map.put("DICT104", dict4);
- map.put("DICT105", dict5);
- map.put("DICT106", dict6);
map.put("DICT107", dict7);
map.put("peripheralUnit", peripheralUnit);
+ map.put("peripheralFirm", peripheralFirm);
map.put("batch", batch);
map.put("school", school);
return AjaxResult.success(map);
}
/**
- * 鏂板鏅烘帶璁惧
+ * 璁惧鏍￠獙
*/
- @ApiOperation("鏂板鏅烘帶璁惧")
- @Log(type = LogType.EQUIPMENT_LOG, operation = EquipmentLog.WRITE)
+ @ApiOperation("璁惧鏍￠獙")
+ @Log(type = LogType.EQUIPMENT_LOG, operation = EquipmentLog.CHECK)
@RepeatSubmit()
@PostMapping("/equipment")
+ @DataDictClass
public AjaxResult equipmentAdd(@Validated(AddGroup.class) @RequestBody DevEquipmentBo bo) {
return AjaxResult.success(iDevEquipmentService.externalAdd(bo));
}
/**
- * 缂栬緫鏅烘帶璁惧
+ * 璁惧鍐欏叆鍙傛暟
*/
- @ApiOperation("鏂板鏅烘帶璁惧锛堝閮ㄨ皟鐢�-鍘绘帀鏉冮檺锛�")
+ @ApiOperation("璁惧鍐欏叆鍙傛暟")
@RepeatSubmit()
- @Log(type = LogType.EQUIPMENT_LOG, operation = EquipmentLog.SUBMIT_COMMENT)
- @PutMapping("/equipment")
+ @Log(type = LogType.EQUIPMENT_LOG, operation = EquipmentLog.WRITE)
+ @PostMapping("/edit")
public AjaxResult equipmentEdit(@Validated(AddGroup.class) @RequestBody DevEquipmentBo bo) {
return AjaxResult.success(iDevEquipmentService.equipmentEdit(bo));
}
+
+ /**
+ * 鎻愪氦澶囨敞
+ */
+ @ApiOperation("鎻愪氦澶囨敞")
+ @RepeatSubmit()
+ @Log(type = LogType.EQUIPMENT_LOG, operation = EquipmentLog.SUBMIT_COMMENT)
+ @PostMapping("/submitComment")
+ public AjaxResult submitComment(@Validated(AddGroup.class) @RequestBody DevEquipmentBo bo) {
+ iDevEquipmentService.submitComment(bo);
+ return AjaxResult.success();
+ }
}
--
Gitblit v1.9.1