fix20230104

apps/manage/view_dict.py

-# from flask import current_app, request, jsonify
-# from apps.manage import api_power
-# from apps.models import *
-# from apps.util import login_required, verify_btoken
-# from apps.utils.response_code import RET
-#
-#
-# # 导航目录列表
-# @api_power.route('/listField', methods=['GET'])
-# @login_required
-# def list_fields():
-#     '''导航目录列表'''
-#     try:
-#         field = Industry.query.all()
-#         data = [{"id": i.id,
-#                  "name": i.name,
-#                  "statu": i.statu,  # 启用状态1启用，2禁用
-#                  "cate": "一级产业" if i.fid == 0 else "二级产业"} for i in field]
-#     except Exception as e:
-#         current_app.logger.error(e)
-#         return jsonify(code=RET.DBERR, msg="数据异常")
-#
-#     return jsonify(code=RET.OK, msg="获取成功", data=data)
-#
-#
-# # 导航信息编辑
-# @api_power.route('/modifyFields', methods=['POST'])
-# @login_required
-# def modify_fields():
-#     '''导航信息修改'''
-#     token = request.headers["token"]
-#     user = verify_btoken(token)
-#     user_role = user.role  # 用户角色
-#     if user_role != 1:
-#         return jsonify(code=RET.ROLEERR, msg="暂无权限")
-#
-#     req_dict = request.get_json()
-#     _id = req_dict.get('id')  # 行业id
-#     name = req_dict.get("newname")  # 行业新名字
-#
-#     try:
-#         field = Industry.query.get(_id)
-#         field.name = name
-#         db.session.commit()
-#     except Exception as e:
-#         current_app.logger.error(e)
-#         return jsonify(code=RET.DBERR, msg="数据异常")
-#
-#     return jsonify(code=RET.OK, msg="修改成功")
-#
-#
-# # 导航状态修改
-# @api_power.route('/fieldStatu', methods=['POST'])
-# @login_required
-# def field_statu():
-#     '''导航信息修改'''
-#     token = request.headers["token"]
-#     user = verify_btoken(token)
-#     user_role = user.role  # 用户角色
-#     if user_role != 1:
-#         return jsonify(code=RET.ROLEERR, msg="暂无权限")
-#
-#     req_dict = request.get_json()
-#     _id = req_dict.get('id')  # 行业id
-#     statu = req_dict.get("statu")  # 状态值1启用，2禁用
-#
-#     try:
-#         field = Industry.query.get(_id)
-#         if statu == 1:
-#             field.statu = 2
-#         else:
-#             field.statu = 1
-#         db.session.commit()
-#     except Exception as e:
-#         current_app.logger.error(e)
-#         return jsonify(code=RET.DBERR, msg="数据异常")
-#
-#     return jsonify(code=RET.OK, msg="修改成功")
-#
-#
+from flask import current_app, request, jsonify
+from apps.manage import api_power
+from apps.models import *
+from apps.util import login_required, verify_btoken
+from apps.utils.response_code import RET
+
+
+# 导航目录列表
+@api_power.route('/listField', methods=['GET'])
+@login_required
+def list_fields():
+    '''导航目录列表'''
+    try:
+        field = Industry.query.all()
+        data = [{"id": i.id,
+                 "name": i.name,
+                 "statu": i.statu,  # 启用状态1启用，2禁用
+                 "cate": "一级产业" if i.fid == 0 else "二级产业"} for i in field]
+    except Exception as e:
+        current_app.logger.error(e)
+        return jsonify(code=RET.DBERR, msg="数据异常")
+    return jsonify(code=RET.OK, msg="获取成功", data=data)
+
+
+# 导航信息编辑
+@api_power.route('/modifyFields', methods=['POST'])
+@login_required
+def modify_fields():
+    '''导航信息修改'''
+    # token = request.headers["token"]
+    # user = verify_btoken(token)
+    # user_role = user.role  # 用户角色
+    # if user_role != 1:
+    #     return jsonify(code=RET.ROLEERR, msg="暂无权限")
+
+    req_dict = request.get_json()
+    _id = req_dict.get('id')  # 行业id
+    name = req_dict.get("newname")  # 行业新名字
+
+    try:
+        field = Industry.query.get(_id)
+        field.name = name
+        db.session.commit()
+    except Exception as e:
+        current_app.logger.error(e)
+        return jsonify(code=RET.DBERR, msg="数据异常")
+    return jsonify(code=RET.OK, msg="修改成功")
+
+
+# 导航状态修改
+@api_power.route('/fieldStatu', methods=['POST'])
+@login_required
+def field_statu():
+    '''导航信息修改'''
+    # token = request.headers["token"]
+    # user = verify_btoken(token)
+    # user_role = user.role  # 用户角色
+    # if user_role != 1:
+    #     return jsonify(code=RET.ROLEERR, msg="暂无权限")
+
+    req_dict = request.get_json()
+    _id = req_dict.get('id')  # 行业id
+    statu = req_dict.get("statu")  # 状态值1启用，2禁用
+
+    try:
+        field = Industry.query.get(_id)
+        if statu == 1:
+            field.statu = 2
+        else:
+            field.statu = 1
+        db.session.commit()
+    except Exception as e:
+        current_app.logger.error(e)
+        return jsonify(code=RET.DBERR, msg="数据异常")
+    return jsonify(code=RET.OK, msg="修改成功")
+
+
 # '''导航一'''
 #
 #

apps/manage/view_user.py

@@ -9,6 +9,58 @@ from apps.util import login_required
 """局内用户"""
 
 
+# 获取角色
+@api_power.route("/getRole", methods=["GET"])
+@login_required
+def roleinfo():
+    try:
+        chart_obj_list = OrganizationChart.query.all()
+        data_li = []
+        for chart_obj in chart_obj_list:
+            # if chart_obj.id > 43:
+            data_dic = {}
+            data_dic.update({"id": chart_obj.id, "three_role": chart_obj.three_role})
+            data_li.append(data_dic)
+        return jsonify(code=RET.OK, data=data_li, msg="查询成功！")
+
+    except Exception as e:
+        current_app.logger.error(e)
+        return jsonify(code=RET.DBERR, msg="数据库查询错误")
+
+
+# 构造当前机构部门的层级下拉框数据,用于新增/编辑角色接口
+@api_power.route("/OrgDownBox", methods=["GET"])
+# @login_required
+def org_downbox():
+    # 获取固定
+    # 1. 获取第一级(机构数据)
+    gover = Government.query.all()
+    gover_data = [{"label": i.name, "value": i.id} for i in gover]
+    for gover in gover_data:
+        gover_id = gover['value']
+
+        # 2. 获取该机构下的部门
+        goverment = Government.query.get(gover_id)
+        sections = goverment.sections  # 查询当前机构下的部门list
+        if not sections:
+            continue
+        sec_data = [{"label": sec.name, "value": sec.id} for sec in sections]
+        # 把部门数据作为children添加到 gover_data
+        gover.update({"children": sec_data})
+
+        # 3. 获取该机构下的部门
+        for sec in sec_data:
+            sec_id = sec['value']
+            section = Section.query.get(sec_id)
+            groups = section.groups  # 查询当前部门下的组list
+            if not groups:
+                continue
+            groups_data = [{"id": group.id, "name": group.name} for group in groups]
+            sec.update({"children": groups_data})
+            print(sec)
+    return jsonify(code=RET.OK, data=gover_data, msg="查询成功！")
+
+
 # 局内用户新增
 @api_power.route("/AddUser", methods=["POST"])
 @login_required
@@ -101,7 +153,9 @@ def user_list_inside():
                "section": i.belong_department if i.belong_department else "-",
                "role": i.org.three_role if i.org.three_role else "-",
                "mobile": i.mobile if i.mobile else "-",
-               "status": "通过" if i.status == 1 else "在审" if i.status == 2 else "驳回"} for i in result]
+               # "status": "通过" if i.status == 1 else "在审" if i.status == 2 else "驳回"
+               "status": i.status
+               } for i in result]
         data = {"df": df, "size": size}
         return jsonify(code=RET.OK, msg="查询成功", data=data)
     except Exception as e:
@@ -286,79 +340,3 @@ def update_status():
         db.session.rollback()
         current_app.logger.error(e)
         return jsonify(code=RET.DBERR, msg="数据库操作错误")
-
-# # 局内用户筛选条件
-# @api_power.route("/manage/fields", methods=["GET"])
-# def manage_field():
-#     ''''''
-#     try:
-#         gover = Government.query.all()
-#         data = {"status": [{"label": "通过", "value": 1}, {"label": "在审", "value": 2}, {"label": "驳回", "value": 3}],
-#                 "goverment": [{"label": i.name, "value": i.id} for i in gover]}
-#         return jsonify(code=RET.OK, msg="查询成功", data=data)
-#     except Exception as e:
-#         current_app.logger.error(e)
-#         return jsonify(code=RET.DBERR, msg="数据库操作错误")
-#
-#
-# # 局内用户筛选条件2, 根据机构获取部门
-# @api_power.route("/manage/fieldt", methods=["POST"])
-# def manage_fielt():
-#     ''''''
-#     req_dict = request.get_json()
-#     _id = req_dict.get("id")  # 机构id
-#     try:
-#         gover = Government.query.get(_id)
-#         section = gover.sections
-#         data = [{"label": i.name, "value": i.id} for i in section]
-#
-#         return jsonify(code=RET.OK, msg="查询成功", data=data)
-#     except Exception as e:
-#         current_app.logger.error(e)
-#         return jsonify(code=RET.DBERR, msg="数据库操作错误")
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-# # 删除用户(批量删除，单个删除)
-# @api_power.route("/deleteUser", methods=["POST"])
-# @login_required
-# def delete_user():
-#     req_dict = request.get_json()
-#     ids = req_dict.get("id")  # list[1,2,3]
-#
-#     # 校验参数完整性
-#     if not all([ids]):
-#         return jsonify(code=RET.PARAMERR, msg="参数不完整")
-#     try:
-#         for i in ids:
-#             user = User.query.get(i)
-#             db.session.delete(user)
-#         db.session.commit()
-#         return jsonify(code=RET.OK, msg="删除成功")
-#     except Exception as e:
-#         db.session.rollback()
-#         current_app.logger.error(e)
-#         return jsonify(code=RET.DBERR, msg="删除失败")
-#
-#
-# # 职级（角色）列表获取
-# @api_power.route("/getRole", methods=["GET"])
-# @login_required
-# def get_role():
-#     try:
-#         roles = Role.query.all()
-#
-#         data = [{"value": role.id,
-#                  "label": role.role_name} for role in roles]
-#         return jsonify(code=RET.OK, msg="查询成功", data=data)
-#     except Exception as e:
-#         current_app.logger.error(e)
-#         return jsonify(code=RET.DBERR, msg="数据库操作错误")

apps/view_index/view.py

@@ -113,9 +113,9 @@ def get_jjzb(district, year):
 
     try:
         if not district or district == '晋城市':
-            datas = City.query.filter_by(area='晋城市', year=year).first()
+            datas = City.query.filter_by(area='晋城市', year=year1).first()
         else:
-            datas = City.query.filter_by(area=district, year=year).first()
+            datas = City.query.filter_by(area=district, year=year1).first()
         df_dic = ''
         if datas:
             df_dic = {"GDP": '%.2f亿元' % (datas.GDP / 10000) if datas.GDP else "-亿元",  # 地区生产总值

apps/view_user/view.py

@@ -444,23 +444,11 @@ def register():
     """
     # 获取请求参数，转化字典
     req_dict = request.get_json()
-
     real_name = req_dict.get("real_name")  # 姓名
     mobile = req_dict.get('mobile')  # 联系电话
     belong_organization = req_dict.get("belong_organization")  # 所属机构
-    # age = req_dict.get("age")  # 年龄
-    # sex = req_dict.get("sex")  # 性别
-    # sms_code = req_dict.get("sms_code")  # 验证码
-    # is_organization_manager = req_dict.get("is_organization_manager")  # 是否是机构负责人
-    # charge_organization = req_dict.get("charge_organization")  # 是机构负责人的话，所负责的机构
-
     belong_department = req_dict.get("belong_department")  # 所属部门（政府）
-    # is_department_manager = req_dict.get("is_department_manager")  # 是否是部门负责人
-    # charge_department = req_dict.get("charge_department")  # 是部门负责人的话，所负责的部门
-
     position = req_dict.get("position")  # 职务
-
-    # name = req_dict.get("name")  # 用户名
     password = req_dict.get("password")  # 密码
     password_again = req_dict.get("password_again")  # 密码2
     sms_code = req_dict.get("sms_code")  # 验证码
@@ -497,19 +485,6 @@ def register():
         # if "123456" != sms_code:
         return jsonify(code=RET.DATAERR, msg="短信验证码错误")
 
-    # 用户名唯一(字母开头，长度4-15)
-    # try:
-        # patten = "^[a-zA-Z][\w]*[\w]*$"
-        # if re.match(patten, name) and re.match(patten, name).string == name:
-        #     user = User.query.filter_by(name=name).first()
-        #     if user:
-        #         return jsonify(code=RET.DATAEXIST, msg="用户名已存在")
-        # else:
-        #     return jsonify(code=RET.DATAERR, msg="用户名格式错误")
-    # except Exception as e:
-    #     current_app.logger.error(e)
-    #     return jsonify(code=RET.DBERR, msg="用户名格式错误")
-
     # 校验密码
     if password != password_again:
         return jsonify(code=RET.DATAERR, msg="密码不一致")
@@ -523,19 +498,16 @@ def register():
                                                                                          password) and re.search(
         r'[.!@#$%^&*()_+=-]+', password)):
         return jsonify(code=RET.DATAERR, msg="密码应设置为包含大小写字母、数字、特殊符号'!@#$%^&*()_+=-'")
-    # 密码不能使用用户名
-    # if password == name:
-    #     return jsonify(code=RET.DATAERR, msg="密码存在风险，不能与用户名相同！")
 
     # 判断并添加用户信息
     try:
         ouser = User.query.filter_by(mobile=mobile).first()
         print(ouser)
-        # if ouser and ouser.flag == 1 and ouser.status != 1:  # 外部访客被禁止
-        #     return jsonify(code=RET.DATAEXIST, msg="当前用户被禁止，请联系管理员")
+        if ouser and ouser.flag == 1 and ouser.status == 0:  # 外部访客被禁止
+            return jsonify(code=RET.DATAEXIST, msg="当前用户被禁止，请联系管理员")
 
-        # if ouser and ouser.flag == 2 and ouser.status == 2:  # 注册暂时未通过
-        #     return jsonify(code=RET.DATAEXIST, msg="手机号已注册,请耐心等待审核")
+        if ouser and ouser.flag == 2 and ouser.status == 2:  # 注册暂时未通过
+            return jsonify(code=RET.DATAEXIST, msg="手机号已注册,请耐心等待审核")
 
         if ouser and ouser.flag == 2 and ouser.status == 1:  # 内部用户再次注册
             return jsonify(code=RET.DATAEXIST, msg="手机号已注册,请勿重复注册")
@@ -544,40 +516,26 @@ def register():
             ouser.real_name = real_name  # 姓名
             ouser.mobile = mobile  # 联系电话
             ouser.belong_organization = belong_organization  # 所属机构
-            # ouser.is_organization_manager = is_organization_manager  # 是否为机构负责人
-            # ouser.charge_organization = charge_organization  # 是机构负责人的话，所负责的机构
 
             ouser.belong_department = belong_department  # 所属部门
-            # ouser.is_department_manager = is_department_manager  # 是否为部门负责人
-            # ouser.charge_department = charge_department  # 是部门负责人的话，所负责的部门
 
             ouser.position = position  # 职务
-            # ouser.name = name  # 用户名
             ouser.flag = 2  # 外部访问为1，内部人员为2
-            # ouser.status = 1  #
+            ouser.status = 2  # 审核
             ouser.password = password
         else:
             user = User(real_name=real_name,
                         mobile=mobile,
                         belong_organization=belong_organization,
-                        # is_organization_manager=is_organization_manager,
-                        # charge_organization=charge_organization,
                         belong_department=belong_department,
-                        # is_department_manager=is_department_manager,
-                        # charge_department=charge_department,
                         position=position,
-                        # name=name,
-                        flag=2, status=1, password=password)
+                        flag=2, status=2, password=password)
 
             db.session.add(user)
         db.session.commit()
     except Exception as e:
         current_app.logger.error(e)
         return jsonify(code=RET.DBERR, msg="数据库异常")
-    # except IntegrityError as e:
-    #     current_app.logger.error(e)
-    #     return jsonify(code=RET.DBERR, msg="手机号已被使用，请勿重复注册")
-
     return jsonify(code=RET.OK, msg="注册成功")