Merge branch 'master' of https://gogs.tjp.com.cn/maoming/python-fastapi-mm-zhcs-yj-api

models/three_proofing_responsible_base.py

@@ -14,6 +14,10 @@ class ThreeProofingResponsiblePerson(Base):
     position = Column(String(255), nullable=True, comment='职务')
     phone = Column(String(50),  comment='手机号码')
     telephone = Column(String(255),  comment='办公电话')
+    longitude =Column(String(255),  comment='经度')
+    latitude =Column(String(255),  comment='纬度')
+    location_time =Column(DateTime,  comment='最近一次打点时间')
+    responsible_type =Column(String(255),  comment='责任类型（三防、危化、森防）')
     order_num = Column(Integer, default=100, comment='排序顺序')
     user_id = Column(Integer, comment='用户id')
     create_time = Column(DateTime, default=datetime.now, comment='数据创建时间')

routers/api/ThreeProofingResponsible/__init__.py

@@ -4,6 +4,7 @@
 from fastapi import APIRouter, Request, Depends
 
 from . import person
+from . import person_new
 from . import type_data
 from . import person_self
 from . import import_status
@@ -13,4 +14,5 @@ router.include_router(person.router, prefix="/person", tags=["人员管理"])
 router.include_router(person_self.router, prefix="/person_self", tags=["用户自己信息"])
 
 router.include_router(type_data.router, prefix="/type_data", tags=["类型管理"])
-router.include_router(import_status.router, prefix="/import_status", tags=["导入情况"])
+router.include_router(import_status.router, prefix="/import_status", tags=["导入情况"])
+router.include_router(person_new.router, prefix="/person_new", tags=["责任人管理"])

routers/api/ThreeProofingResponsible/person_new.py

@@ -0,0 +1,1192 @@
+from fastapi import APIRouter, Request, Depends, HTTPException, Query, BackgroundTasks
+from sqlalchemy.exc import IntegrityError
+from fastapi.responses import HTMLResponse, FileResponse
+from fastapi.responses import JSONResponse,StreamingResponse
+from database import get_db
+from sqlalchemy import text, exists, and_, or_, not_
+from sqlalchemy.orm import Session
+from models import *
+import json
+import random
+import os
+from sqlalchemy import create_engine, select
+from typing import Optional
+from utils.StripTagsHTMLParser import *
+from utils.three_proofing_responsible_util import *
+from utils.ry_system_util import *
+from common.db import db_event_management, db_user, db_area, db_emergency_plan
+from common.security import valid_access_token
+import traceback
+from utils import *
+from datetime import datetime, timedelta
+import pandas as pd
+import xlrd
+from common.db import db_dept
+from exceptions import AppException, HmacException
+from common.enc import mpfun, three_proofing_responsible_person_data
+from common.db import db_czrz
+from common.auth_user import *
+
+router = APIRouter()
+
+
+
+@router.post('/{zrlx}/create')
+async def create_contact(
+zrlx:str,
+    request: Request,
+    auth_user: AuthUser = Depends(find_auth_user),
+    db: Session = Depends(get_db),
+    body=Depends(remove_xss_json),
+    user_id=Depends(valid_access_token)
+):
+    try:
+        lx = '三防'
+        if zrlx=='sf':
+            lx = '三防'
+        if zrlx=='sf1':
+            lx = '森防'
+        if zrlx=='wh':
+            lx = '危化'
+        if zrlx=='sf':
+            return JSONResponse(status_code=404,content={"code":404,"msg":"责任人类型未查询到"})
+        # 提取请求数据
+        unit_name = body['unit_name']
+        name = body['name']
+        area_code = body['area_code']
+        area_info = id_get_area_info(db, body['area_code'])
+        area_code2 = '440900000000'
+        if area_info:
+            area_code2 = area_info.area_code
+        position = body['position']
+        phone = body['phone']
+        telephone= ''
+        if 'telephone' in body:
+            telephone=body['telephone']
+        order_num = -1
+        if 'order_num'in body:
+            order_num=body['order_num']
+        unit_id = db_dept.get_dept_id_by_name(db, unit_name)
+        user_id_1 = db_user.get_user_id_by_phonenumber(db,phone)
+
+        # 创建新的记录
+        new_person = ThreeProofingResponsiblePerson(
+            unit_id=unit_id,
+            unit_name=unit_name,
+            name=name,
+            area_code2=area_code2,
+            area_code=area_code,
+            position=position,
+            phone=phone,
+            responsible_type= lx,
+            telephone=telephone,
+            user_id = user_id_1,
+            order_num=order_num,
+            create_by=user_id
+        )
+        # 添加到数据库会话并提交
+        type_list = body['type_list']
+        if isinstance(type_list,list) and len(type_list)>0:
+            db.add(new_person)
+            db.commit()
+
+            three_proofing_responsible_person_data.sign_table()
+
+        else:
+            return JSONResponse(status_code=404,content={
+                'code': 404,
+                'msg': '责任类型不能为空'
+            })
+        try:
+            for type_info in type_list:
+                type_parent_id = type_info['type_parent_id']#get_type_parent_id_by_type_id(db,type_id)
+                for type_id in type_info['children']:
+                    new_person_type = ThreeProofingResponsiblePersonType(
+                        type_parent_id = type_parent_id,
+                        type_id = type_id,
+                        person_id = new_person.id,
+                        create_by=user_id
+                    )
+                    db.add(new_person_type)
+                if type_parent_id in ('5','7','9'):
+                    if 'children2' in type_info:
+                        for other_type_id in type_info['children2']:
+                            new_person_other_type = ThreeProofingResponsiblePersonOtherType(
+                                type_parent_id=type_parent_id,
+                                other_type_id=other_type_id,
+                                person_id=new_person.id,
+                                create_by=user_id
+                            )
+                            db.add(new_person_other_type)
+                if type_parent_id in ('4','5','7','10','11'):
+                    dept_name = None
+                    if 'dept_name' in type_info:
+                        dept_name = type_info['dept_name']
+                    other_type_2_name = None
+                    if 'other_type_2_name' in type_info:
+                        other_type_2_name = type_info['other_type_2_name']
+                    denger_point_name = None
+                    if 'denger_point_name' in type_info:
+                        denger_point_name = type_info['denger_point_name']
+                    new_person_other_info = ThreeProofingResponsiblePersonOtherInfo(
+                        type_parent_id = type_parent_id,
+                        dept_name = dept_name,
+                        other_type_2_name = other_type_2_name,
+                        denger_point_name = denger_point_name,
+                        person_id = new_person.id,
+                        create_by=user_id
+                    )
+                    db.add(new_person_other_info)
+        except:
+            db.rollback()
+            traceback.print_exc()
+            new_person.del_flag='2'
+
+        db.commit()
+
+        db_czrz.log(db, auth_user, "系统管理", f"后台管理新建三防责任人管理人员信息成功", request.client.host)
+
+        # 返回创建成功的响应
+        return {
+            "code": 200,
+            "msg": "创建成功",
+            "data": None
+        }
+    except Exception as e:
+        # 处理异常
+        db.rollback()
+        traceback.print_exc()
+        raise HTTPException(status_code=500, detail=str(e))
+
+
+
+@router.put('/location_update')
+async def update_contact(
+    request: Request,
+    auth_user: AuthUser = Depends(find_auth_user),
+    db: Session = Depends(get_db),
+    body=Depends(remove_xss_json),
+    user_id=Depends(valid_access_token)
+):
+    try:
+        query = db.query(ThreeProofingResponsiblePerson)
+        query = query.filter(ThreeProofingResponsiblePerson.del_flag == '0')
+        query = query.filter(ThreeProofingResponsiblePerson.user_id == user_id)
+        for info in query.all():
+            info.longitude = body['longitude']
+            info.latitude = body['latitude']
+            info.location_time = datetime.now
+        db.commit()
+    except Exception as e:
+        # 处理异常
+        db.rollback()
+        traceback.print_exc()
+        raise HTTPException(status_code=500, detail=str(e))
+
+@router.put('/{zrlx}/update')
+async def update_contact(
+zrlx:str,
+    request: Request,
+    auth_user: AuthUser = Depends(find_auth_user),
+    db: Session = Depends(get_db),
+    body=Depends(remove_xss_json),
+    user_id=Depends(valid_access_token)
+):
+    try:
+        lx = '三防'
+        if zrlx=='sf':
+            lx = '三防'
+        if zrlx=='sf1':
+            lx = '森防'
+        if zrlx=='wh':
+            lx = '危化'
+        if zrlx=='sf':
+            return JSONResponse(status_code=404,content={"code":404,"msg":"责任人类型未查询到"})
+        # 提取请求数据
+        id = body['id']
+        person = get_person_info_by_id(db,id)
+
+        if not person:
+            return JSONResponse(status_code=404, content={
+                'errcode': 404,
+                'errmsg': '责任人不存在'
+            })
+
+        person.unit_name = body['unit_name']
+        person.name = body['name']
+        person.area_code = body['area_code']
+        area_info = id_get_area_info(db, body['area_code'])
+        
+        if area_info:
+            person.area_code2 = area_info.area_code
+        person.position = body['position']
+        person.phone = mpfun.enc_data(body['phone'])
+        
+        if 'telephone' in body:
+            person.telephone = mpfun.enc_data(body['telephone'])
+        person.order_num = body['order_num']
+        
+        if body['order_num']=='':
+            person.order_num = -1
+        person.unit_id = db_dept.get_dept_id_by_name(db, body['unit_name'])
+
+        person.update_by = user_id
+        person.update_time = datetime.now()
+        person.sign = three_proofing_responsible_person_data.get_sign_hmac(person)
+        
+
+        type_list = body['type_list']
+        old_person_type_list=get_person_type_by_person_id(db,person.id)
+        
+        for old_person_type in old_person_type_list:
+            old_person_type.del_flag='2'
+        old_person_other_info_list = get_person_other_info_by_person_id(db,person.id)
+        
+        for old_person_other_info in old_person_other_info_list:
+            old_person_other_info.del_flag = '2'
+        old_person_other_type_list = get_person_other_type_by_person_id(db,person.id)
+        
+        for old_person_other_type in old_person_other_type_list:
+            old_person_other_type.del_flag = '2'
+
+        for type_info in type_list:
+            type_parent_id = type_info['type_parent_id']  # get_type_parent_id_by_type_id(db,type_id)
+            for type_id in type_info['children']:
+                new_person_type = ThreeProofingResponsiblePersonType(
+                    type_parent_id=type_parent_id,
+                    type_id=type_id,
+                    person_id=id,
+                    create_by=user_id
+                )
+                db.add(new_person_type)
+            if type_parent_id in ('5', '7', '9'):
+                if 'children2' in type_info:
+                    for other_type_id in type_info['children2']:
+                        new_person_other_type = ThreeProofingResponsiblePersonOtherType(
+                            type_parent_id=type_parent_id,
+                            other_type_id=other_type_id,
+                            person_id=person.id,
+                            create_by=user_id
+                        )
+                        db.add(new_person_other_type)
+            if type_parent_id in ('4', '5', '7', '10', '11'):
+                dept_name = None
+                if 'dept_name' in type_info:
+                    dept_name = type_info['dept_name']
+                other_type_2_name = None
+                if 'other_type_2_name' in type_info:
+                    other_type_2_name = type_info['other_type_2_name']
+                denger_point_name = None
+                if 'denger_point_name' in type_info:
+                    denger_point_name = type_info['denger_point_name']
+                new_person_other_info = ThreeProofingResponsiblePersonOtherInfo(
+                    type_parent_id=type_parent_id,
+                    dept_name=dept_name,
+                    other_type_2_name=other_type_2_name,
+                    denger_point_name=denger_point_name,
+                    person_id=person.id,
+                    create_by=user_id
+                )
+                db.add(new_person_other_info)
+        # 更新到数据库会话并提交
+        db.commit()
+
+        db_czrz.log(db, auth_user, "系统管理", f"后台管理更新三防责任人管理人员信息成功", request.client.host)
+
+        # 返回创建成功的响应
+        return {
+            "code": 200,
+            "msg": "更新成功",
+            "data": None
+        }
+    except Exception as e:
+        # 处理异常
+        db.rollback()
+        traceback.print_exc()
+        raise HTTPException(status_code=500, detail=str(e))
+
+
+@router.get('/{zrlx}/list')
+async def get_emergency_contact_list(
+zrlx:str,
+        type_parent_id: str = Query(None, description='单位名称'),
+        area_code:str = Query(None, description='单位名称'),
+        Name: str = Query(None, description='联系人'),
+        page: int = Query(1, gt=0, description='页码'),
+        pageSize: int = Query(10, gt=0, description='每页条目数量'),
+        db: Session = Depends(get_db),
+        user_id=Depends(valid_access_token)
+):
+    try:
+        lx = '三防'
+        if zrlx=='sf':
+            lx = '三防'
+        if zrlx=='sf1':
+            lx = '森防'
+        if zrlx=='wh':
+            lx = '危化'
+        if zrlx=='sf':
+            return JSONResponse(status_code=404,content={"code":404,"msg":"责任人类型未查询到"})
+        # 构建查询
+        query = db.query(ThreeProofingResponsiblePerson)
+        query = query.filter(ThreeProofingResponsiblePerson.del_flag == '0')
+        query = query.filter(ThreeProofingResponsiblePerson.responsible_type.like(f'%{lx}%'))
+        # 应用查询条件
+        if type_parent_id:
+            person_list = get_person_list_by_type_parent_id(db,type_parent_id)
+            query = query.filter(ThreeProofingResponsiblePerson.id.in_(person_list))
+        if Name:
+            query = query.filter(ThreeProofingResponsiblePerson.name.like(f'%{Name}%'))
+
+        def get_area_chli(area_list : list,parent_id : int):
+
+            areas = parent_id_get_area_info(db,parent_id)
+            if areas:
+                for area in areas:
+                    area_list.append(area.id)
+                    get_area_chli(area_list, area.id)
+            return area_list
+
+        # if area_code:
+        #     query = query.filter(ThreeProofingResponsiblePerson.area_code.in_(get_area_chli([area_code],area_code)))
+        # '''440900000000'''
+        if area_code:
+            area_info = id_get_area_info(db,area_code)
+            if area_info:
+                area_code = area_info.area_code
+                area_code=area_code.replace('0000000000','').replace('00000000','').replace('000000','').replace('000','')
+                query = query.filter(ThreeProofingResponsiblePerson.area_code2.like(f'%{area_code}%') )
+        # if area_code:
+        #     query = query.filter(ThreeProofingResponsiblePerson.area_code==area_code)
+
+        # 计算总条目数
+        total_items = query.count()
+
+        # 排序
+
+        query = query.order_by(ThreeProofingResponsiblePerson.order_num.asc())
+        query = query.order_by(ThreeProofingResponsiblePerson.create_time.desc())
+        # 执行分页查询
+        contact_infos = query.offset((page - 1) * pageSize).limit(pageSize).all()
+
+        for info in contact_infos:
+            if three_proofing_responsible_person_data.sign_valid_row(info) == False:
+                raise HmacException(500, "三防责任人管理人员信息表验证异常，已被非法篡改")
+
+        # 将查询结果转换为列表形式的字典
+        contact_infos_list = []
+        for info in contact_infos:
+            type_parent_id_list = get_type_parent_id_by_person_id(db,info.id)
+            type_parent_list = []
+            type_parent_list2 = []
+            for type_parent in type_parent_id_list:
+                if type_parent not in type_parent_list2:
+                    dict_data = get_dict_data_info(db,'three_proofing',type_parent)
+                    type_parent_list2.append(type_parent)
+                    type_parent_list.append({"type_parent_id":type_parent,"type_parent":dict_data.dict_label})
+            area_info = id_get_area_info(db,info.area_code)
+            user_info = user_id_get_user_info(db,info.create_by)
+            nick_name = ''
+            if user_info:
+                nick_name = user_info.nick_name
+            area_list = db_area.id_get_area_parent_list(db,info.area_code,[])
+            if info.order_num ==-1:
+                order_num = ''
+            else:
+                order_num = str(info.order_num)
+            contact_infos_list.append({
+                "id": info.id,
+                "unit_id": info.unit_id,
+                "unit_name": info.unit_name,
+                "name": info.name,
+                "area_list":area_list,
+                "area_code": info.area_code,
+                "area_name": area_info.area_name,
+                "position": info.position,
+                "phone": mpfun.dec_data(info.phone),
+                "telephone": mpfun.dec_data(info.telephone),
+                "order_num": order_num,
+                "online_status":'0',
+                "create_time": info.create_time.strftime('%Y-%m-%d %H:%M:%S'),
+                "create_by":info.create_by,
+                "create_user":nick_name,
+                "type_parent_list":type_parent_list
+            })
+        # 返回结果+
+        return {
+            "code": 200,
+            "msg": "成功",
+            "data": contact_infos_list,
+            "total": total_items
+        }
+    
+    except HmacException as e:
+        return {
+            "code": e.code,
+            "msg": e.msg
+        }
+
+    except Exception as e:
+        # 处理异常
+        traceback.print_exc()
+        raise HTTPException(status_code=500, detail=str(e))
+
+
+@router.get('/{zrlx}/export')
+async def get_emergency_contact_list(
+zrlx:str,
+        request: Request,
+        type_parent_id: str = Query(None, description='单位名称'),
+        area_code: str = Query(None, description='单位名称'),
+        Name: str = Query(None, description='联系人'),
+        page: int = Query(1, gt=0, description='页码'),
+        pageSize: int = Query(10, gt=0, description='每页条目数量'),
+        db: Session = Depends(get_db),
+        auth_user: AuthUser = Depends(find_auth_user),
+        user_id=Depends(valid_access_token)
+):
+    try:
+        lx = '三防'
+        if zrlx=='sf':
+            lx = '三防'
+        if zrlx=='sf1':
+            lx = '森防'
+        if zrlx=='wh':
+            lx = '危化'
+        if zrlx=='sf':
+            return JSONResponse(status_code=404,content={"code":404,"msg":"责任人类型未查询到"})
+        # 构建查询
+        query = db.query(ThreeProofingResponsiblePerson)
+        query = query.filter(ThreeProofingResponsiblePerson.del_flag == '0')
+        query = query.filter(ThreeProofingResponsiblePerson.responsible_type.like(f'%{lx}%'))
+        # 应用查询条件
+        if type_parent_id:
+            person_list = get_person_list_by_type_parent_id(db, type_parent_id)
+            query = query.filter(ThreeProofingResponsiblePerson.id.in_(person_list))
+        if Name:
+            query = query.filter(ThreeProofingResponsiblePerson.name.like(f'%{Name}%'))
+
+        def get_area_chli(area_list: list, parent_id: int):
+
+            areas = parent_id_get_area_info(db, parent_id)
+            if areas:
+                for area in areas:
+                    area_list.append(area.id)
+                    get_area_chli(area_list, area.id)
+            return area_list
+
+        # if area_code:
+        #     query = query.filter(ThreeProofingResponsiblePerson.area_code.in_(get_area_chli([area_code],area_code)))
+        # '''440900000000'''
+        if area_code:
+            area_info = id_get_area_info(db, area_code)
+            if area_info:
+                area_code = area_info.area_code
+                area_code = area_code.replace('0000000000', '').replace('00000000', '').replace('000000', '').replace(
+                    '000', '')
+                query = query.filter(ThreeProofingResponsiblePerson.area_code2.like(f'%{area_code}%'))
+        # if area_code:
+        #     query = query.filter(ThreeProofingResponsiblePerson.area_code==area_code)
+
+        # 计算总条目数
+        total_items = query.count()
+
+        # 排序
+
+        query = query.order_by(ThreeProofingResponsiblePerson.order_num.asc())
+        query = query.order_by(ThreeProofingResponsiblePerson.create_time.desc())
+        # 执行分页查询
+        contact_infos = query.all()
+
+        for info in contact_infos:
+            if three_proofing_responsible_person_data.sign_valid_row(info) == False:
+                raise HmacException(500, "三防责任人管理人员信息表验证异常，已被非法篡改")
+
+        # 将查询结果转换为列表形式的字典
+        contact_infos_list = []
+        for info in contact_infos:
+            type_parent_id_list = get_type_parent_id_by_person_id(db, info.id)
+            type_parent_list = []
+            type_parent_list2 = []
+            for type_parent in type_parent_id_list:
+                if type_parent not in type_parent_list2:
+                    dict_data = get_dict_data_info(db, 'three_proofing', type_parent)
+                    type_parent_list2.append(type_parent)
+                    type_parent_list.append(dict_data.dict_label)
+            area_info = id_get_area_info(db, info.area_code)
+            user_info = user_id_get_user_info(db, info.create_by)
+            area_list = db_area.id_get_area_parent_list(db, info.area_code, [])
+            area_list = '/'.join([i['label'] for i in area_list])
+            if info.order_num == -1:
+                order_num = ''
+            else:
+                order_num = str(info.order_num)
+            contact_infos_list.append({
+                "id": info.id,
+                "单位ID": info.unit_id,
+                "单位名称": info.unit_name,
+                "姓名": info.name,
+                "区划列表": area_list,
+                "区划编码": info.area_code,
+                "区划": area_info.area_name,
+                "职务": info.position,
+                "手机号码": mpfun.dec_data(info.phone),
+                "办公电话": mpfun.dec_data(info.telephone),
+                "排序顺序": order_num,
+                "创建时间": info.create_time.strftime('%Y-%m-%d %H:%M:%S'),
+                "责任类型": '、'.join(type_parent_list)
+            })
+        # 返回结果+
+        import pandas as pd
+        from io import BytesIO
+        # 将查询结果转换为 DataFrame
+        df = pd.DataFrame(contact_infos_list)
+
+        # 将 DataFrame 导出为 Excel 文件
+        output = BytesIO()
+        with pd.ExcelWriter(output, engine='openpyxl') as writer:
+            df.to_excel(writer, index=False)
+
+        # 设置响应头
+        output.seek(0)
+        from urllib.parse import quote
+        encoded_filename = f'三防责任人清单{datetime.now().strftime("%Y%m%d%H%mi%s")}.xlsx'
+        encoded_filename = quote(encoded_filename, encoding='utf-8')
+        headers = {
+            'Content-Disposition': f'attachment; filename*=UTF-8\'\'{encoded_filename}',
+            'Content-Type': 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'
+        }
+
+        db_czrz.log(db, auth_user, "三防责任人管理", f"三防责任人清单导出数据成功", request.client.host)
+
+        # 返回文件流
+        return StreamingResponse(output, headers=headers)
+        #
+        # return {
+        #     "code": 200,
+        #     "msg": "成功",
+        #     "data": contact_infos_list,
+        #     "total": total_items
+        # }
+
+    except HmacException as e:
+        return JSONResponse(status_code=e.code, content={
+            "code": e.code,
+            "msg": e.msg
+        })
+        # return {
+        #     "code": e.code,
+        #     "msg": e.msg
+        # }
+
+    except Exception as e:
+        # 处理异常
+        traceback.print_exc()
+        return JSONResponse(status_code=500, content={"code": 500, "msg": f"Internal server error: {str(e)}"})
+
+
+@router.get('/{zrlx}/info/{id}')
+async def get_emergency_contact_id_info(
+zrlx:str,
+        id: str,
+        db: Session = Depends(get_db),
+        user_id=Depends(valid_access_token)
+):
+    try:
+        lx = '三防'
+        if zrlx=='sf':
+            lx = '三防'
+        if zrlx=='sf1':
+            lx = '森防'
+        if zrlx=='wh':
+            lx = '危化'
+        if zrlx=='sf':
+            return JSONResponse(status_code=404,content={"code":404,"msg":"责任人类型未查询到"})
+        contact = get_person_info_by_id(db,id)
+        if not contact:
+            return JSONResponse(status_code=404, content={
+                'errcode': 404,
+                'errmsg': '联系人不存在'
+            })
+        # 将查询结果转换为列表形式的字典
+        area_info = id_get_area_info(db,contact.area_code)
+        user_info = user_id_get_user_info(db,contact.create_by)
+        nick_name = ''
+        if user_info:
+            nick_name = user_info.nick_name
+        area_list = db_area.id_get_area_parent_list(db, contact.area_code, [])
+        if contact.order_num == -1:
+            order_num = ''
+        else:
+            order_num = str(contact.order_num)
+        contact_result = {
+            "id": contact.id,
+            "unit_id": contact.unit_id,
+            "unit_name": contact.unit_name,
+            "name": contact.name,
+            "area_list":area_list,
+            "area_code":contact.area_code,
+            "area_name": area_info.area_name,
+            "position": contact.position,
+            "phone": mpfun.dec_data(contact.phone),
+            "telephone":mpfun.dec_data(contact.telephone),
+            "order_num":order_num,
+            "online_status":'0',
+            "create_time": contact.create_time.strftime('%Y-%m-%d %H:%M:%S'),
+            "create_by":contact.create_by,
+            "create_user":nick_name,
+            "type_list":[]
+        }
+        type_parent_id_list = []
+        type_list = get_person_type_by_person_id(db,contact.id)
+        for type_info in type_list:
+            if type_info.type_parent_id not in type_parent_id_list:
+                type_parent_id_list.append(type_info.type_parent_id)
+
+        for type_parent_id in type_parent_id_list:
+            dict_data = get_dict_data_info(db, 'three_proofing', type_parent_id)
+            type_data = {"type_parent_id": type_parent_id, "type_parent": dict_data.dict_label,"children":[],"labelData":[]}
+            for type_info in get_person_type_by_person_id_and_type_parent_id(db,contact.id,type_parent_id):
+                type_data_info = get_type_info_by_id(db,type_info.type_id)
+                # type_data['children'].append({"id": type_info.type_id, "label": type_data_info.type_name})
+                type_data['children'].append(type_info.type_id)
+                type_data['labelData'].append( type_data_info.type_name)
+            other_info = get_person_other_info_by_person_id_and_type_parent_id(db, contact.id, type_parent_id)
+            if other_info:
+                type_data['dept_name'] = other_info.dept_name
+                type_data['denger_point_name'] = other_info.denger_point_name
+                type_data['other_type_2_name'] = other_info.other_type_2_name
+            other_type_list = get_person_other_type_by_person_id_and_type_parent_id(db, contact.id, type_parent_id)
+            if other_type_list:
+                type_data['children2'] = []
+                type_data['other_type_label'] = []
+            for other_type in other_type_list:
+                other_type_info = get_other_type_info_by_id(db, other_type.other_type_id)
+                label= ''
+                if other_type_info:
+                    label = other_type_info.type_name
+                # type_data['children2'].append({"id": other_type.other_type_id, "label": label})
+                type_data['children2'].append(other_type.other_type_id)
+                type_data['other_type_label'].append(label)
+
+            contact_result['type_list'].append(type_data)
+        # 返回结果
+        return {
+            "code": 200,
+            "msg": "成功",
+            "data": contact_result
+        }
+    except Exception as e:
+        # 处理异常
+        traceback.print_exc()
+        raise HTTPException(status_code=500, detail=str(e))
+
+
+
+
+@router.delete('/{zrlx}/delete')
+async def delete_emergency_plans(
+zrlx:str,
+    request: Request,
+    ids: list,
+    db: Session = Depends(get_db),
+    body=Depends(remove_xss_json),
+    auth_user: AuthUser = Depends(find_auth_user),
+    user_id=Depends(valid_access_token)
+):
+    try:
+        lx = '三防'
+        if zrlx=='sf':
+            lx = '三防'
+        if zrlx=='sf1':
+            lx = '森防'
+        if zrlx=='wh':
+            lx = '危化'
+        if zrlx=='sf':
+            return JSONResponse(status_code=404,content={"code":404,"msg":"责任人类型未查询到"})
+        # 提取请求数据
+        query = db.query(ThreeProofingResponsiblePerson)
+        query = query.filter(ThreeProofingResponsiblePerson.del_flag != '2')
+        query = query.filter(ThreeProofingResponsiblePerson.id.in_(ids))
+        contacts = query.all()
+        if not contacts:
+            return JSONResponse(status_code=404, content={
+                'errcode': 404,
+                'errmsg': '联系人不存在'
+            })
+        for contact in contacts:
+            contact.del_flag = '2'
+            contact.update_by = user_id
+            contact.update_time = datetime.now()
+            contact.sign = three_proofing_responsible_person_data.get_sign_hmac(contact)
+        # 更新到数据库会话并提交
+        db.commit()
+
+        db_czrz.log(db, auth_user, "系统管理", f"后台管理删除三防责任人管理人员信息成功", request.client.host)
+
+        # 返回创建成功的响应
+        return {
+            "code": 200,
+            "msg": "删除成功",
+            "data": None
+        }
+    except Exception as e:
+        # 处理异常
+        traceback.print_exc()
+        raise HTTPException(status_code=500, detail=str(e))
+
+
+@router.delete('/{zrlx}/delete/{id}')
+async def delete_emergency_plans(
+zrlx:str,
+    request: Request,
+    id: int,
+    db: Session = Depends(get_db),
+    body=Depends(remove_xss_json),
+    auth_user: AuthUser = Depends(find_auth_user),
+    user_id=Depends(valid_access_token)
+):
+    try:
+        lx = '三防'
+        if zrlx=='sf':
+            lx = '三防'
+        if zrlx=='sf1':
+            lx = '森防'
+        if zrlx=='wh':
+            lx = '危化'
+        if zrlx=='sf':
+            return JSONResponse(status_code=404,content={"code":404,"msg":"责任人类型未查询到"})
+        contact = get_person_info_by_id(db, id)
+        if not contact:
+            return JSONResponse(status_code=404, content={
+                'errcode': 404,
+                'errmsg': '联系人不存在'
+            })
+        contact.del_flag = '2'
+        contact.update_by = user_id
+        contact.update_time = datetime.now()
+        contact.sign = three_proofing_responsible_person_data.get_sign_hmac(contact)
+        # 更新到数据库会话并提交
+        db.commit()
+
+        db_czrz.log(db, auth_user, "系统管理", f"后台管理删除三防责任人管理人员信息成功", request.client.host)
+
+        # 返回创建成功的响应
+        return {
+            "code": 200,
+            "msg": "删除成功",
+            "data": None
+        }
+    except Exception as e:
+        # 处理异常
+        traceback.print_exc()
+        raise HTTPException(status_code=500, detail=str(e))
+
+def string_type_parent_id_create_data(db,string,type_parent_id,file_info,new_person,user_id,row) :
+    type_name_list = [i for i in string.split('，')]
+    reslte = []
+    for type_name in type_name_list:
+        type_id = get_type_id_by_type_parent_id_and_type_name(db, type_parent_id, type_name)
+        if type_id:
+            new_person_type = ThreeProofingResponsiblePersonType(
+                type_parent_id=type_parent_id,
+                type_id=type_id,
+                person_id=new_person.id,
+                create_by=user_id
+            )
+            reslte.append(new_person_type)
+        else:
+            file_info.remark= file_info.remark+f'\n行<{row+1}>责任类别未找到<{type_name}>'
+            return reslte ,False
+    return reslte ,True
+
+def other_type_string_type_parent_id_create_data(db,string,type_parent_id,file_info,new_person,user_id,row) :
+    type_name_list = [i for i in string.split('，')]
+    reslte = []
+    for other_type_name in type_name_list:
+        other_type_id = get_other_type_id_by_type_parent_id_and_other_type_name(db, type_parent_id, other_type_name)
+        if other_type_id:
+            new_person_type = ThreeProofingResponsiblePersonOtherType(
+                type_parent_id=type_parent_id,
+                other_type_id=other_type_id,
+                person_id=new_person.id,
+                create_by=user_id
+            )
+            reslte.append(new_person_type)
+        else:
+            file_info.remark= file_info.remark+f'\n行<{row+1}>责任类别未找到<{other_type_name}>'
+            file_info.error_num +=1
+            return reslte ,False
+    return reslte ,True
+
+def import_data(db,file_path,user_id,file_info):
+
+    import_status = True
+    try:
+        book = xlrd.open_workbook(file_path)
+        sheet = book.sheet_by_index(0)
+    except :
+        file_info.remark = file_info.remark + f'\n文件打开失败，请核实文件格式为xlsx/xlx>'
+        file_info.error_num +=1
+        import_status = False
+    data = []
+    for row in range(4, sheet.nrows):
+        # 姓名
+        name = sheet.cell(row, 0).value
+        if name == '':
+            file_info.remark = file_info.remark+f'\n行<{row+1}>姓名不能为空<{name}>'
+            file_info.error_num +=1
+            import_status = False
+        # 所属单位
+        unit_name = sheet.cell(row, 1).value
+        if unit_name == '':
+            file_info.remark = file_info.remark+f'\n行<{row+1}>所属单位不能为空<{unit_name}>'
+            file_info.error_num +=1
+            import_status = False
+        unit_id = db_dept.get_dept_id_by_name(db, unit_name)
+        # 职务
+        position = sheet.cell(row, 2).value
+        if position =='':
+            file_info.remark = file_info.remark+f'\n行<{row+1}>职务不能为空<{position}>'
+            file_info.error_num +=1
+            import_status = False
+
+        # 电话号码（如有多个手机号请用“，”分隔)
+        phone = str(sheet.cell(row, 3).value)
+        if phone =='':
+            file_info.remark = file_info.remark+f'\n行<{row+1}>电话号码不能为空<{phone}>'
+            file_info.error_num +=1
+            import_status = False
+        phone_list = [i for i in phone.split('，')]
+        user_id_1=-1
+        for i in phone_list:
+            user_id_1 = db_user.get_user_id_by_phonenumber(db, i)
+            if user_id_1 != -1:
+                break
+
+        # 办公电话
+        # （选填，格式：区号-电话号码)
+        telephone = sheet.cell(row, 4).value
+
+        # 排位顺序
+        # （选填，请输入排序号1-9999，排序号数值越小越靠前，不填则默认排至最末）
+        order_num = sheet.cell(row, 5).value
+        if order_num == '':
+            order_num=-1
+        area_name = sheet.cell(row, 7).value
+        if area_name=='':
+            area_code=2
+            area_code2='440900000000'
+        else:
+            area_code=get_area_info_by_area_name(db,area_name)
+            if area_code is None:
+                file_info.remark = file_info.remark+f'\n行<{row+1}>责任区域未找到'
+                file_info.error_num +=1
+                import_status = False
+            area_code2 = area_code.area_code
+            area_code = area_code.id
+        
+        new_person = ThreeProofingResponsiblePerson(
+            unit_id=unit_id,
+            unit_name=unit_name,
+            name=name,
+            area_code2=area_code2,
+            area_code=area_code,
+            position=position,
+            phone=phone.replace,
+            telephone=telephone,
+            user_id=user_id_1,
+            order_num=order_num,
+            create_by=user_id,
+            sign = ''
+        )
+        data.append(new_person)
+        db.add(new_person)
+        db.commit()
+
+
+        # 党委政府
+        a1 = sheet.cell(row, 6).value
+        if a1 != '':
+            new_type_list,status = string_type_parent_id_create_data(db,a1,'1',file_info,new_person,user_id,row)
+            if status:
+                db.add_all(new_type_list)
+                data +=new_type_list
+            else:
+                import_status = status
+            # type_name_list = [i for i in a1.split('，')]
+            # for type_name in type_name_list:
+            #     type_id = get_type_id_by_type_parent_id_and_type_name(db, '1', type_name)
+            #     if type_id:
+            #         pass
+        # 三防指挥部
+        b1 = sheet.cell(row, 8).value
+        if b1 != '':
+            new_type_list,status = string_type_parent_id_create_data(db,b1,'2',file_info,new_person,user_id,row)
+            if status:
+                db.add_all(new_type_list)
+                data +=new_type_list
+            else:
+                import_status = status
+
+        b2 = sheet.cell(row, 9).value
+
+        # 应急部门
+        c1 = sheet.cell(row, 10).value
+        if c1!='':
+            new_type_list, status = string_type_parent_id_create_data(db, c1, '3', file_info, new_person, user_id,row)
+
+            if status:
+                db.add_all(new_type_list)
+                data += new_type_list
+            else:
+                import_status = status
+        # 成员单位
+        d1 = sheet.cell(row, 11).value
+        if d1!='':
+            new_type_list, status = string_type_parent_id_create_data(db, d1, '4', file_info, new_person, user_id,row)
+
+            if status:
+                db.add_all(new_type_list)
+                data += new_type_list
+            else:
+                import_status = status
+        d2 = sheet.cell(row, 12).value
+        if d2!='':
+            dept_name = d2
+            new_person_other_info = ThreeProofingResponsiblePersonOtherInfo(
+                type_parent_id='4',
+                dept_name=dept_name,
+                person_id=new_person.id,
+                create_by=user_id
+            )
+            db.add(new_person_other_info)
+            data.append(new_person_other_info)
+        # 重点部门
+        e1 = sheet.cell(row, 13).value
+        if e1!='':
+            new_type_list, status = string_type_parent_id_create_data(db, e1, '5', file_info, new_person, user_id,row)
+
+            if status:
+                db.add_all(new_type_list)
+                data += new_type_list
+            else:
+                import_status = status
+        e2 = sheet.cell(row, 14).value
+        if e2!='':
+            dept_name = e2
+            new_person_other_info = ThreeProofingResponsiblePersonOtherInfo(
+                type_parent_id='5',
+                dept_name=dept_name,
+                person_id=new_person.id,
+                create_by=user_id
+            )
+            db.add(new_person_other_info)
+            data.append(new_person_other_info)
+        e3 = sheet.cell(row, 15).value
+        if e3!='':
+            new_type_list,status = other_type_string_type_parent_id_create_data(db,e3,'5',file_info,new_person,user_id,row)
+
+            if status:
+                db.add_all(new_type_list)
+                data +=new_type_list
+            else:
+                import_status = status
+
+        # 行政村
+        f1 = sheet.cell(row, 16).value
+        if f1!='':
+            new_type_list, status = string_type_parent_id_create_data(db, f1, '6', file_info, new_person, user_id,row)
+
+            if status:
+                db.add_all(new_type_list)
+                data += new_type_list
+            else:
+                import_status = status
+
+        # 水利工程
+        g1 = sheet.cell(row, 17).value
+        if g1!='':
+            new_type_list, status = string_type_parent_id_create_data(db, g1, '7', file_info, new_person, user_id,row)
+
+            if status:
+                db.add_all(new_type_list)
+                data += new_type_list
+            else:
+                import_status = status
+        g2 = sheet.cell(row, 18).value
+        if g2!='':
+            dept_name = g2
+            new_person_other_info = ThreeProofingResponsiblePersonOtherInfo(
+                type_parent_id='7',
+                dept_name=dept_name,
+                person_id=new_person.id,
+                create_by=user_id
+            )
+            db.add(new_person_other_info)
+            data.append(new_person_other_info)
+        g3 = sheet.cell(row, 19).value
+        if g3!='':
+            new_type_list, status = other_type_string_type_parent_id_create_data(db, g3, '11', file_info, new_person, user_id,
+                                                                      row)
+
+            if status:
+                db.add_all(new_type_list)
+                data += new_type_list
+            else:
+                import_status = status
+
+        # 受威胁转移
+        h1 = sheet.cell(row, 20).value
+        if h1!='':
+            new_type_list, status = string_type_parent_id_create_data(db, h1, '8', file_info, new_person, user_id,row)
+
+            if status:
+                db.add_all(new_type_list)
+                data += new_type_list
+            else:
+                import_status = status
+
+        # 抢险队伍
+        j1 = sheet.cell(row, 21).value
+        if j1!='':
+            new_type_list, status = string_type_parent_id_create_data(db, j1, '9', file_info, new_person, user_id,row)
+
+            if status:
+                db.add_all(new_type_list)
+                data += new_type_list
+            else:
+                import_status = status
+        j2 = sheet.cell(row, 22).value
+        if j2!='':
+            new_type_list, status = other_type_string_type_parent_id_create_data(db, j2, '9', file_info, new_person, user_id,
+                                                                      row)
+
+            if status:
+                db.add_all(new_type_list)
+                data += new_type_list
+            else:
+                import_status = status
+        # 地质灾害
+        k1 = sheet.cell(row, 23).value
+        if k1!='':
+            new_type_list, status = string_type_parent_id_create_data(db, k1, '10', file_info, new_person, user_id,row)
+
+            if status:
+                db.add_all(new_type_list)
+                data += new_type_list
+            else:
+                import_status = status
+        k2 = sheet.cell(row, 24).value
+        if k2!='':
+            denger_point_name = k2
+            new_person_other_info = ThreeProofingResponsiblePersonOtherInfo(
+                type_parent_id='10',
+                denger_point_name=denger_point_name,
+                person_id=new_person.id,
+                create_by=user_id
+            )
+            db.add(new_person_other_info)
+            data.append(new_person_other_info)
+
+        # 其他
+        l1 = sheet.cell(row, 25).value
+        if l1!='':
+            new_type_list, status = string_type_parent_id_create_data(db, l1, '11', file_info, new_person, user_id,row)
+
+            if status:
+                db.add_all(new_type_list)
+                data += new_type_list
+            else:
+                import_status = status
+        l2 = sheet.cell(row, 26).value
+        if l2!='':
+            other_type_2_name = l2
+            new_person_other_info = ThreeProofingResponsiblePersonOtherInfo(
+                type_parent_id='11',
+                other_type_2_name=other_type_2_name,
+                person_id=new_person.id,
+                create_by=user_id
+            )
+            db.add(new_person_other_info)
+            data.append(new_person_other_info)
+
+
+    db.commit()
+    if import_status == False:
+        # print(1111111)
+        for info in data:
+            db.delete(info)
+    file_info.status = 2
+    db.commit()
+
+    three_proofing_responsible_person_data.sign_table()
+
+@router.post('/{zrlx}/createImport')
+async def create_contact(
+zrlx:str,
+    request: Request,
+    background_tasks: BackgroundTasks,
+    db: Session = Depends(get_db),
+    body=Depends(remove_xss_json),
+    auth_user: AuthUser = Depends(find_auth_user),
+    user_id=Depends(valid_access_token)
+):
+    try:
+        lx = '三防'
+        if zrlx=='sf':
+            lx = '三防'
+        if zrlx=='sf1':
+            lx = '森防'
+        if zrlx=='wh':
+            lx = '危化'
+        if zrlx=='sf':
+            return JSONResponse(status_code=404,content={"code":404,"msg":"责任人类型未查询到"})
+        # 提取请求数据
+        filename = body['filename']
+        file_name_desc = body['file_name_desc']
+        if len(filename) == 0:
+            raise Exception()
+
+        file_path = f'/data/upload/mergefile/uploads/{filename}'
+
+        # 检查文件是否存在
+        if not os.path.isfile(file_path):
+            return JSONResponse(status_code=404, content={
+                'errcode': 404,
+                'errmsg': f'{filename}不存在'
+            })
+
+        new_file = ThreeProofingResponsiblePersonImportFileStatus(
+            file_uuid=filename,
+            file_name = file_name_desc,
+            status = '1',
+            remark = '',
+            user_id=user_id
+        )
+        db.add(new_file)
+        db.commit()
+        background_tasks.add_task(import_data,db,file_path, user_id,new_file)
+
+        
+        db_czrz.log(db, auth_user, "系统管理", f"后台管理导入三防责任人管理人员信息成功", request.client.host)
+
+        # 返回创建成功的响应
+        return {
+            "code": 200,
+            "msg": "成功",
+            "data": None
+        }
+
+    except AppException as e:
+        return {
+            "code": 500,
+            "msg": e.msg
+        }
+
+    except Exception as e:
+        traceback.print_exc()
+        # 处理异常
+        db.rollback()
+        raise HTTPException(status_code=500, detail=str(e))
+

routers/api/spatialAnalysis/point.py

@@ -29,10 +29,35 @@ from multiprocessing import Pool, cpu_count
 import json
 import time
 import math
+from shapely import wkb
+from shapely.geometry import Point
 
 
 router = APIRouter()
 
+def get_geom(db,iszjcj,pac):
+    if iszjcj=='zj':
+        pac = pac[:6]
+        zjcjtable = 'tp_geojson_data_qx'
+    elif iszjcj=='cj':
+        pac = pac[:9]
+        zjcjtable = 'tp_geojson_data_zj'
+    sql = f"""select name, ST_AsBinary(geometry) as geometry from {zjcjtable} where pac like '{pac}%'"""
+    result = db.execute(sql)
+    infos = result.fetchall()
+    return  infos
+
+def get_contains(db,iszjcj,pac,lon,lat):
+    if iszjcj=='zj':
+        pac = pac[:6]
+        zjcjtable = 'tp_geojson_data_qx'
+    elif iszjcj=='cj':
+        pac = pac[:9]
+        zjcjtable = 'tp_geojson_data_zj'
+    sql = f"""select 1 from {zjcjtable} where pac like '{pac}%' and ST_Intersects(geometry, ST_SRID(POINT({lon}, {lat}), 4326))"""
+    result = db.execute(sql)
+    infos = result.fetchall()
+    return  len(infos)
 @router.post("/get_info")
 @router.get("/get_info")
 async def get_infos(
@@ -84,7 +109,12 @@ async def get_infos(
         videos = get_videos(db,dict_value,latitude_min,latitude_max,longitude_min,longitude_max,iszjcj)
         infos = get_points(db,option,latitude_min,latitude_max,longitude_min,longitude_max,iszjcj,pac)
         # 动态分组逻辑
-        groups = group_points(videos+infos, distance_threshold)
+        if 'iszjcj' in body:
+            iszjcj = body['iszjcj']
+            pac = body['pac']
+            groups = group_points(videos + infos, distance_threshold,db,iszjcj,pac)
+        else:
+            groups = group_points(videos+infos, distance_threshold)
 
         print("4",time.time())
 
@@ -175,7 +205,7 @@ def calculate_distance(point1, point2):
     c = 2 * atan2(sqrt(a), sqrt(1 - a))
     return R * c
 
-def group_points(points, distance_threshold):
+def group_points(points, distance_threshold,db=get_db(),iszjcj='',pac=''):
     grid_size = calculate_grid_size(distance_threshold)
     grid = defaultdict(lambda:{"count":0}) #,"list":[]
     groups = []
@@ -211,6 +241,61 @@ def group_points(points, distance_threshold):
 
     groups = list(grid.values())
 
+    if iszjcj!='':
+        geom = get_geom(db, iszjcj, pac)
+        result = []
+        for group in groups:
+            for name, wkb_bytes in geom:
+                poly = wkb.loads(wkb_bytes)
+                lon, lat = group['longitude'], group['latitude']
+                pt = Point(lat, lon)
+                # print("contains?", poly.contains(pt))
+                if poly.contains(pt):
+                    result.append(group)
+
+        groups = result
+    return groups
+
+
+def new_group_points(points, distance_threshold, db=get_db(), iszjcj='', pac=''):
+    grid = defaultdict(lambda: {"count": 0})  # ,"list":[]
+
+    if iszjcj != '':
+
+        grid_size = calculate_grid_size(distance_threshold)
+        grid1 = defaultdict(lambda: {"count": 0})
+        for point in points:
+            grid_key = get_grid_key(float(point.latitude), float(point.longitude), grid_size)
+            grid1['%s-%s'%grid_key+'-'+str(point.dataType)]['dataType'] = point.dataType
+            grid1['%s-%s'%grid_key+'-'+str(point.dataType)]['name'] = point.dict_label
+            grid1['%s-%s'%grid_key+'-'+str(point.dataType)]['latitude'] = float(point.latitude)
+            grid1['%s-%s'%grid_key+'-'+str(point.dataType)]['longitude'] = float(point.longitude)
+            grid1['%s-%s' % grid_key+'-'+str(point.dataType)]['count'] += 1
+
+
+        points = list(grid1.values())
+        geom = get_geom(db, iszjcj, pac)
+        for name, wkb_bytes in geom:
+            poly = wkb.loads(wkb_bytes)
+        if len(geom)==0:
+            return []
+        for point in points:
+            lon, lat = float(point['longitude']),float(point['latitude'])
+            pt = Point(lat, lon)
+            # print(poly.contains(pt))
+            if poly.contains(pt):
+                if grid[str(point['dataType'])]['count']==0:
+                    grid[str(point['dataType'])]['dataType'] = point['dataType']
+                    grid[str(point['dataType'])]['name'] = point['name']
+                grid[str(point['dataType'])]['count']+= point['count']
+
+    else:
+        for point in points:
+            if grid[str(point.dataType)]['count']==0:
+                grid[str(point.dataType)]['dataType'] = point.dataType
+                grid[str(point.dataType)]['name'] = point.dict_label
+            grid[str(point.dataType)]['count']+=1
+    groups = list(grid.values())
     return groups
 
 def get_videos(db:Session,dict_value,latitude_min,latitude_max,longitude_min,longitude_max,iszjcj=''):
@@ -262,17 +347,17 @@ def get_points(db:Session,option,latitude_min,latitude_max,longitude_min,longitu
     # 使用参数化查询避免 SQL 注入
     if isinstance(option, list):
         option = tuple(option)
-    if iszjcj=='zj':
-        zd = ',T2.name as pacname,T2.pac,T2.parent_pac'
-        pac = pac[:6]
-        zjcjtable = f"""select * from tp_geojson_data_qx where pac like '{pac}%'"""
-        que = f' JOIN ({zjcjtable}) T2 on ST_Intersects(T2.geometry, ST_SRID(POINT(A.longitude, A.latitude), 4326))'
-    elif iszjcj=='cj':
-        pac = pac[:9]
-        zjcjtable = f"""select * from tp_geojson_data_zj where pac like '{pac}%'"""
-        que = f'LEFT JOIN ({zjcjtable}) T2 on ST_Intersects(T2.geometry, ST_SRID(POINT(A.longitude, A.latitude), 4326))'
-    else:
-        que=''
+    # if iszjcj=='zj':
+    #     zd = ',T2.name as pacname,T2.pac,T2.parent_pac'
+    #     pac = pac[:6]
+    #     zjcjtable = f"""select * from tp_geojson_data_qx where pac like '{pac}%'"""
+    #     que = f' JOIN ({zjcjtable}) T2 on ST_Intersects(T2.geometry, ST_SRID(POINT(A.longitude, A.latitude), 4326))'
+    # elif iszjcj=='cj':
+    #     pac = pac[:9]
+    #     zjcjtable = f"""select * from tp_geojson_data_zj where pac like '{pac}%'"""
+    #     que = f'LEFT JOIN ({zjcjtable}) T2 on ST_Intersects(T2.geometry, ST_SRID(POINT(A.longitude, A.latitude), 4326))'
+    # else:
+    que=''
     query = text(f"""
         SELECT 
             A.`name`,A.`id`,A.dataType,A.longitude,A.latitude,A.infoType 
@@ -303,6 +388,35 @@ def get_points(db:Session,option,latitude_min,latitude_max,longitude_min,longitu
     infos = result.fetchall()
     return infos
 
+def notloncations_get_points(db:Session,option):
+    # 使用参数化查询避免 SQL 注入
+    if isinstance(option, list):
+        option = tuple(option)
+    query = text("""
+        SELECT 
+            A.`name`,A.`id`,A.dataType,A.longitude,A.latitude,A.infoType,B.dict_label
+        FROM (
+            SELECT 
+                *,
+                ROW_NUMBER() OVER (PARTITION BY longitude, latitude, `name` 
+                                   ORDER BY longitude, latitude, `name`) AS rn
+            FROM 
+                `point_data` 
+            WHERE 
+                longitude > 0 
+                AND dataType IN :option 
+        ) AS A  JOIN
+ (SELECT dict_value as dataType,dict_label FROM sys_dict_data where dict_type='point_type') B on A.dataType=B.dataType
+        WHERE rn = 1
+    """)
+
+    # 执行查询并传递参数
+    result = db.execute(query, {
+        'option': option
+    })
+    infos = result.fetchall()
+    return infos
+
 @router.post("/get_geojson")
 async def get_geojson(
         body = Depends(remove_xss_json),
@@ -400,6 +514,58 @@ WHERE parent_pac = '{pac}';"""
         traceback.print_exc()
         raise HTTPException(status_code=status.HTTP_500_INTERNAL_SERVER_ERROR, detail=str(e))
 
+
+
+@router.post("/count/get_count_point_info")
+async def get_counts(
+        body = Depends(remove_xss_json),
+        # zoom_level: float = Query(..., description="Zoom level for clustering"),
+        # latitude_min: float = Query(..., description="Minimum latitude"),
+        # latitude_max: float = Query(..., description="Maximum latitude"),
+        # longitude_min: float = Query(..., description="Minimum longitude"),
+        # longitude_max: float = Query(..., description="Maximum longitude"),
+        # dict_value: str = Query(None),
+        # option:str  = Query(None),
+        db:  Session = Depends(get_db)
+):
+    try:
+        # 根据缩放级别动态调整分组粒度
+
+        zoom_levels = {'qx': 256.25,
+        'zj': 178.125,
+        'cj': 69.0625}
+        distance_threshold = zoom_levels['qx']
+        option = body['option'].split(',')
+        print("1",time.time())
+        iszjcj = ''
+        pac = ''
+        infos = notloncations_get_points(db,option)
+
+        # 动态分组逻辑
+        if 'iszjcj' in body:
+            iszjcj = body['iszjcj']
+            pac = body['pac']
+            if iszjcj!='':
+                distance_threshold = zoom_levels[iszjcj]
+            groups = new_group_points( infos, distance_threshold,db,iszjcj,pac)
+        else:
+            groups = new_group_points(infos, distance_threshold)
+
+
+        print("4",time.time())
+
+        return {"code": 200,
+                "msg": "操作成功",
+                "data": groups}
+    except Exception as e:
+        # 处理异常
+        traceback.print_exc()
+        raise HTTPException(status_code=status.HTTP_500_INTERNAL_SERVER_ERROR, detail=str(e))
+
+
+
+
+
 # @router.post("/get_map_img")
 # async def get_map_img(
 #     body: Dict[str, Any] = Depends(remove_xss_json),