From afb22090c509befbf68e7aaef00f06795d11337d Mon Sep 17 00:00:00 2001
From: 唐耀东 <18861537@qq.com>
Date: 星期一, 07 二月 2022 17:49:29 +0800
Subject: [PATCH] 设备，外设单元修改
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/DevPeripheralUnitController.java | 1 +
ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/DevEquipmentServiceImpl.java | 3 +++
ruoyi-admin/src/main/resources/application-prod.yml | 8 ++++----
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java | 3 ++-
ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/DevEquipmentVo.java | 2 ++
ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/ExternaController.java | 8 ++++----
6 files changed, 16 insertions(+), 9 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 e7c9614..bd43a9e 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
@@ -61,13 +61,13 @@
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> 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<DevPeripheralUnit> peripheralUnit = iDevPeripheralUnitService.list(new QueryWrapper<DevPeripheralUnit>());
//澶栬鍘傚晢
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/DevPeripheralUnitController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/DevPeripheralUnitController.java
index b86471c..9d8226c 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/DevPeripheralUnitController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/DevPeripheralUnitController.java
@@ -72,6 +72,7 @@
*/
@ApiOperation("鑾峰彇澶栬鍗曞厓璇︾粏淇℃伅")
@PreAuthorize("@ss.hasPermi('oa:peripheralUnit:query')")
+ @DataDictClass
@GetMapping("/{id}")
public AjaxResult<DevPeripheralUnitVo> getInfo(@ApiParam("涓婚敭")
@NotNull(message = "涓婚敭涓嶈兘涓虹┖")
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java
index 4261f17..465d994 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java
@@ -93,8 +93,9 @@
@PutMapping("/updatePwd")
public AjaxResult<Void> updatePwd(String oldPassword, String newPassword) {
LoginUser loginUser = getLoginUser();
+ SysUser sysUser = userService.selectUserById(loginUser.getUserId());
String userName = loginUser.getUsername();
- String password = loginUser.getPassword();
+ String password = sysUser.getPassword();
if (!SecurityUtils.matchesPassword(oldPassword, password)) {
return AjaxResult.error("淇敼瀵嗙爜澶辫触锛屾棫瀵嗙爜閿欒");
}
diff --git a/ruoyi-admin/src/main/resources/application-prod.yml b/ruoyi-admin/src/main/resources/application-prod.yml
index c88d932..fc82d3f 100644
--- a/ruoyi-admin/src/main/resources/application-prod.yml
+++ b/ruoyi-admin/src/main/resources/application-prod.yml
@@ -1,9 +1,9 @@
--- # 閰嶇疆涓存椂璺緞瀛樺偍
-spring:
- servlet:
- multipart:
+#spring:
+ #servlet:
+ #multipart:
# 涓存椂鏂囦欢瀛樺偍浣嶇疆 閬垮厤涓存椂鏂囦欢琚郴缁熸竻鐞嗘姤閿�
- location: /ruoyi/server/temp
+ #location: /ruoyi/server/temp
--- # 鐩戞帶閰嶇疆
spring:
diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/DevEquipmentVo.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/DevEquipmentVo.java
index 46f086f..25a4eac 100644
--- a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/DevEquipmentVo.java
+++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/DevEquipmentVo.java
@@ -45,6 +45,7 @@
@ExcelProperty(value = "璁惧绫诲瀷", converter = ExcelDictConvert.class)
@ExcelDictFormat(dictType = "DICT101")
@ApiModelProperty("璁惧绫诲瀷")
+ @Dict(dicCode = "DICT101")
private String type;
/**
@@ -89,6 +90,7 @@
@ExcelProperty(value = "尾宸ヤ綔棰戞", converter = ExcelDictConvert.class)
@ExcelDictFormat(dictType = "DICT102")
@ApiModelProperty("尾宸ヤ綔棰戞")
+ @Dict(dicCode = "DICT102")
private String frequencyBand;
/**
diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/DevEquipmentServiceImpl.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/DevEquipmentServiceImpl.java
index 740091a..63ef9bd 100644
--- a/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/DevEquipmentServiceImpl.java
+++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/DevEquipmentServiceImpl.java
@@ -158,6 +158,9 @@
if (StringUtils.isNotBlank(bo.getHostId())) {
po.setHostId(bo.getHostId());
}
+ if(StringUtils.isNotBlank(bo.getEdition())){
+ po.setEdition(bo.getEdition());
+ }
// if (StringUtils.isEmpty(bo.getNetworkId())) {
// po.setNetworkId(bo.getNetworkId());
// }
--
Gitblit v1.9.1