字典和参数设置更新

app/models/Config.py

@@ -16,15 +16,15 @@ class Config(db.Model):
 
     def to_json(self):
         return {
-            'config_id': self.config_id,
-            'config_name': self.config_name,
-            'config_key': self.dicconfig_keyt_type,
-            'config_value': self.config_value,
-            'config_type': self.config_type,
-            'create_by': self.create_by,
-            'create_time': self.create_time,
-            'update_by': self.update_by,
-            'update_time': self.update_time,
+            'configId': self.config_id,
+            'configName': self.config_name,
+            'configKey': self.config_key,
+            'configValue': self.config_value,
+            'configType': self.config_type,
+            'createBy': self.create_by,
+            'createTime': self.create_time,
+            'updateBy': self.update_by,
+            'updateTime': self.update_time,
             'remark': self.remark,
         }
 

app/models/DictType.py

@@ -17,14 +17,14 @@ class DictType(db.Model):
 
     def to_json(self):
         return {
-            'dict_id': self.dict_id,
-            'dict_name': self.dict_name,
-            'dict_type': self.dict_type,
+            'dictId': self.dict_id,
+            'dictName': self.dict_name,
+            'dictType': self.dict_type,
             'status': self.status,
-            'create_by': self.create_by,
-            'create_time': self.create_time,
-            'update_by': self.update_by,
-            'update_time': self.update_time,
+            'createBy': self.create_by,
+            'createTime': self.create_time,
+            'updateBy': self.update_by,
+            'updateTime': self.update_time,
             'remark': self.remark,
         }
 

app/routes/__init__.py

@@ -6,3 +6,4 @@ from . import organization
 from . import online
 from . import dictdata
 from . import config
+from . import dicttype

app/routes/config.py

@@ -8,4 +8,28 @@ from sqlalchemy import desc
 def sysconfig_get_value(configKey):
     data = Config.query.filter(Config.config_key == configKey).first()
 
-    return jsonify({'code': 200, 'msg': data.config_value})
+    return jsonify({'code': 200, 'msg': data.config_value})
+
+
+@base.route('/system/config/list', methods=['GET'])
+def sys_config_list():
+    filters = []
+    if 'configName' in request.args:
+        filters.append(Config.config_name.like('%' + request.args['configName'] + '%'))
+    if 'configKey' in request.args:
+        filters.append(Config.config_key.like('%' + request.args['configKey'] + '%'))
+    if 'configType' in request.args:
+        filters.append(Config.config_type.like('%' + request.args['configType'] + '%'))
+
+
+    if 'params[beginTime]' in request.args and 'params[endTime]' in request.args:
+        filters.append(Config.create_time >  request.args['params[beginTime]'])
+        filters.append(Config.create_time <  request.args['params[endTime]'])
+
+    page = request.args.get('pageNum', 1, type=int)
+    rows = request.args.get('pageSize', 10, type=int)
+    pagination = Config.query.filter(*filters).paginate(
+        page, per_page=rows, error_out=False)
+    config_list = pagination.items
+
+    return jsonify({'msg': '操作成功', 'code': 200, 'rows': [config.to_json() for config in config_list], 'total': len(config_list)})

app/routes/dictdata.py

@@ -8,4 +8,26 @@ from sqlalchemy import desc
 def sysdictdata_get_by_type(dictType):
     data_list = DictData.query.filter(DictData.dict_type == dictType)
 
-    return jsonify({'msg': '操作成功', 'code': 200, 'data': [data.to_json() for data in data_list]})
+    return jsonify({'msg': '操作成功', 'code': 200, 'data': [data.to_json() for data in data_list]})
+
+
+@base.route('/system/dict/data/list', methods=['GET'])
+def sysdict_data_list():
+    filters = []
+    if 'dictLabel' in request.args:
+        filters.append(DictData.dict_label.like('%' + request.args['dictLabel'] + '%'))
+    if 'dictType' in request.args:
+        filters.append(DictData.dict_type.like('%' + request.args['dictType'] + '%'))
+
+    if 'status' in request.args:
+        filters.append(DictData.status == request.args['status'])
+
+    page = request.args.get('pageNum', 1, type=int)
+    rows = request.args.get('pageSize', 10, type=int)
+    pagination = DictData.query.filter(*filters).paginate(
+        page, per_page=rows, error_out=False)
+    data_list = pagination.items
+
+    return jsonify({'msg': '操作成功', 'code': 200, 'rows': [data.to_json() for data in data_list], 'total': len(data_list)})
+
+ 

app/routes/dicttype.py

@@ -0,0 +1,42 @@
+from ..base import base
+from ..models import DictData, DictType
+from flask import render_template, request, jsonify
+from sqlalchemy import asc
+from sqlalchemy import desc
+
+@base.route('/system/dict/type/list', methods=['GET'])
+def sysdict_type_list():
+    filters = []
+    if 'dictName' in request.args:
+        filters.append(DictType.dict_name.like('%' + request.args['dictName'] + '%'))
+    if 'dictType' in request.args:
+        filters.append(DictType.dict_type.like('%' + request.args['dictType'] + '%'))
+
+    if 'status' in request.args:
+        filters.append(DictType.status == request.args['status'])
+
+
+    if 'params[beginTime]' in request.args and 'params[endTime]' in request.args:
+        filters.append(DictType.create_time >  request.args['params[beginTime]'])
+        filters.append(DictType.create_time <  request.args['params[endTime]'])
+
+    page = request.args.get('pageNum', 1, type=int)
+    rows = request.args.get('pageSize', 10, type=int)
+    pagination = DictType.query.filter(*filters).paginate(
+        page, per_page=rows, error_out=False)
+    types = pagination.items
+
+    return jsonify({'msg': '操作成功', 'code': 200, 'rows': [type.to_json() for type in types], 'total': len(types)})
+
+@base.route('/system/dict/type/<id>', methods=['GET'])
+def sysdict_type_get_by_id(id):
+    type = DictData.query.get(id)
+
+    return jsonify({'msg': '操作成功', 'code': 200, 'data': type.to_json()})
+
+@base.route('/system/dict/type/optionselect', methods=['GET'])
+def sysdict_type_all():
+    types = DictData.query.all()
+
+    return jsonify({'msg': '操作成功', 'code': 200, 'data': [type.to_json() for type in types]})   
+