From 40f6aa11c2899ea8c13c7cf66bc1981bdd7d141a Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Tue, 25 May 2021 13:51:50 +0800
Subject: [PATCH] screen-manage 更改数据库连接地址
---
screen-manage/src/main/resources/application-dev.yml | 3 +--
screen-manage/src/main/java/com/moral/api/service/impl/SysDictDataServiceImpl.java | 42 ++++++++++++++++++++----------------------
2 files changed, 21 insertions(+), 24 deletions(-)
diff --git a/screen-manage/src/main/java/com/moral/api/service/impl/SysDictDataServiceImpl.java b/screen-manage/src/main/java/com/moral/api/service/impl/SysDictDataServiceImpl.java
index 5c0cf16..7f49f18 100644
--- a/screen-manage/src/main/java/com/moral/api/service/impl/SysDictDataServiceImpl.java
+++ b/screen-manage/src/main/java/com/moral/api/service/impl/SysDictDataServiceImpl.java
@@ -53,14 +53,14 @@
Integer id = form.getId();
//������������������
QueryWrapper existWrapper = new QueryWrapper();
- existWrapper.eq("is_delete",Constants.NOT_DELETE);
- existWrapper.eq("id",id);
+ existWrapper.eq("is_delete", Constants.NOT_DELETE);
+ existWrapper.eq("id", id);
SysDictData existData = sysDictDataMapper.selectOne(existWrapper);
//������������
UpdateWrapper deleteWrapper = new UpdateWrapper();
- deleteWrapper.set("is_delete",Constants.DELETE);
- deleteWrapper.eq("id",id);
- sysDictDataMapper.update(null,deleteWrapper);
+ deleteWrapper.set("is_delete", Constants.DELETE);
+ deleteWrapper.eq("id", id);
+ sysDictDataMapper.update(null, deleteWrapper);
//������������
CacheUtils.clearDictionariesCache();
//������������������
@@ -80,19 +80,17 @@
existWrapper.eq("is_delete", Constants.NOT_DELETE);
existWrapper.eq("id", sysDictData.getId());
SysDictData existData = sysDictDataMapper.selectOne(existWrapper);
- //������key������������������������������������������������
- if(!ObjectUtils.isEmpty(sysDictData.getDataKey())){
- String key = sysDictData.getDataKey();
- QueryWrapper<SysDictData> wrapper = new QueryWrapper<>();
- wrapper.eq("is_delete", Constants.NOT_DELETE);
- wrapper.eq("dataKey", key);
- wrapper.eq("dict_type_id", existData.getDictTypeId());
- SysDictData existKeyData = sysDictDataMapper.selectOne(wrapper);
- if (!ObjectUtils.isEmpty(existKeyData)) {
- dto.setCode(ResponseCodeEnum.DICTDATA_KEY_EXIST.getCode());
- dto.setMsg(ResponseCodeEnum.DICTDATA_KEY_EXIST.getMsg());
- return dto;
- }
+ //������key������������
+ String key = sysDictData.getDataKey();
+ QueryWrapper<SysDictData> wrapper = new QueryWrapper<>();
+ wrapper.eq("is_delete", Constants.NOT_DELETE);
+ wrapper.eq("dataKey", key);
+ wrapper.eq("dict_type_id", existData.getDictTypeId());
+ SysDictData existKeyData = sysDictDataMapper.selectOne(wrapper);
+ if (!ObjectUtils.isEmpty(existKeyData)) {
+ dto.setCode(ResponseCodeEnum.DICTDATA_KEY_EXIST.getCode());
+ dto.setMsg(ResponseCodeEnum.DICTDATA_KEY_EXIST.getMsg());
+ return dto;
}
//������������
sysDictDataMapper.updateById(sysDictData);
@@ -151,7 +149,7 @@
/**
* @Description: ���������������������������������������������
* @Param: [typeName]
- * @return: java.util.Map<java.lang.String , java.lang.Object>
+ * @return: java.util.Map<java.lang.String , java.lang.Object>
* @Author: ���������
* @Date: 2021/4/16
*/
@@ -185,9 +183,9 @@
public Map<String, SysDictData> getDictDatasByType(String type) {
Map<String, List<SysDictData>> allDictData = getAllDictData();
List<SysDictData> sysDictDatas = allDictData.get(type);
- Map<String,SysDictData> result = new HashMap<>();
+ Map<String, SysDictData> result = new HashMap<>();
for (SysDictData sysDictData : sysDictDatas) {
- result.put(sysDictData.getDataKey(),sysDictData);
+ result.put(sysDictData.getDataKey(), sysDictData);
}
return result;
}
@@ -196,7 +194,7 @@
/**
* @Description: ������������������������������������������������������������Map Key��������������� value���������������
* @Param: []
- * @return: java.util.Map<java.lang.String , java.util.List < com.moral.api.entity.sysDictData>>
+ * @return: java.util.Map<java.lang.String , java.util.List < com.moral.api.entity.sysDictData>>
* @Author: ���������
* @Date: 2021/4/14
*/
diff --git a/screen-manage/src/main/resources/application-dev.yml b/screen-manage/src/main/resources/application-dev.yml
index ecc1f6f..4a6899a 100644
--- a/screen-manage/src/main/resources/application-dev.yml
+++ b/screen-manage/src/main/resources/application-dev.yml
@@ -55,8 +55,7 @@
filters: stat
type: com.alibaba.druid.pool.DruidDataSource
max-wait: 60000
- #url: jdbc:mysql://vp9l57dtd2vng7oxft1t.rwlb.rds.aliyuncs.com:3306/moral?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
- url: jdbc:mysql://vp9l57dtd2vng7oxft1t-rw4rm.rwlb.rds.aliyuncs.com:3306/moral?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
+ url: jdbc:mysql://rm-bp1pr3rx9m3fnkwsk.mysql.rds.aliyuncs.com:3306/moral?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
username: root
password: moral_123456
test-on-borrow: false
--
Gitblit v1.8.0