diff --git a/.obsidian/plugins/remember-cursor-position/cursor-positions.json b/.obsidian/plugins/remember-cursor-position/cursor-positions.json index 3c816b6..74ed1d8 100644 --- a/.obsidian/plugins/remember-cursor-position/cursor-positions.json +++ b/.obsidian/plugins/remember-cursor-position/cursor-positions.json @@ -1 +1 @@ -{"月度/8月/8月.md":{"scroll":23.3978,"cursor":{"from":{"ch":0,"line":352},"to":{"ch":0,"line":352}}},"材料/服务器.md":{"scroll":41.7002,"cursor":{"from":{"ch":10,"line":46},"to":{"ch":10,"line":46}}},"月度/9月/9月.md":{"scroll":48.0336,"cursor":{"from":{"ch":1,"line":408},"to":{"ch":1,"line":408}}},"月度/7月/7月.md":{"scroll":0,"cursor":{"from":{"ch":29,"line":147},"to":{"ch":29,"line":147}}},"月度/6月/6月.md":{"scroll":0,"cursor":{"from":{"ch":23,"line":120},"to":{"ch":23,"line":120}}},"月度/5月/5月.md":{"scroll":93.1957,"cursor":{"from":{"ch":20,"line":105},"to":{"ch":20,"line":105}}},"月度/4月/4月.md":{"scroll":120.1806,"cursor":{"from":{"ch":20,"line":139},"to":{"ch":20,"line":139}}},"月度/3月/3月.md":{"scroll":32.7083,"cursor":{"from":{"ch":6,"line":39},"to":{"ch":6,"line":39}}},"月度/7月/7月工作总结及8月工作计划.md":{"scroll":0,"cursor":{"from":{"ch":0,"line":0},"to":{"ch":0,"line":0}}},"月度/6月/6月份晨午检bug修复.md":{"scroll":307.9981,"cursor":{"from":{"ch":0,"line":0},"to":{"ch":0,"line":0}}},"月度/7月/设备管理中心研发记录.md":{"scroll":110.1015,"cursor":{"from":{"ch":0,"line":0},"to":{"ch":0,"line":0}}},"月度/8月/CA身份认证app/CA身份认证app流程图.md":{"scroll":5.8654,"cursor":{"from":{"ch":0,"line":0},"to":{"ch":0,"line":0}}},"月度/9月/常见病/20250903常见病优化沟通.md":{"scroll":0.7205,"cursor":{"from":{"ch":0,"line":0},"to":{"ch":0,"line":0}}},"月度/9月/汇海/对接主机/不登录模式接口文档.md":{"scroll":0,"cursor":{"from":{"ch":5,"line":8},"to":{"ch":5,"line":8}}},"月度/9月/汇海/对接主机/登录算法和密钥.md":{"scroll":0,"cursor":{"from":{"ch":0,"line":0},"to":{"ch":0,"line":0}}},"月度/9月/汇海/对接主机/华夏汇海接口文档.md":{"scroll":1134.2189,"cursor":{"from":{"ch":96,"line":1670},"to":{"ch":96,"line":1670}}},"材料/配置/Obsidian快捷键.md":{"scroll":0,"cursor":{"from":{"ch":18,"line":16},"to":{"ch":18,"line":16}}},"材料/配置/工具.md":{"scroll":0,"cursor":{"from":{"ch":50,"line":0},"to":{"ch":50,"line":0}}},"月度/9月/石榴籽-家校通/家校通需求.md":{"scroll":22.9513,"cursor":{"from":{"ch":13,"line":37},"to":{"ch":13,"line":37}}},"月度/9月/汇海/体质测试数据上传接口文档.md":{"scroll":64.4749,"cursor":{"from":{"ch":0,"line":0},"to":{"ch":0,"line":0}}},"月度/9月/汇海/解析汇海设备请求.md":{"scroll":1331.4598,"cursor":{"from":{"ch":0,"line":0},"to":{"ch":0,"line":0}}},"月度/9月/156中 中考模拟 初三.md":{"scroll":8.0497,"cursor":{"from":{"ch":0,"line":20},"to":{"ch":0,"line":20}}},"月度/10月/10月.md":{"scroll":121.091,"cursor":{"from":{"ch":96,"line":135},"to":{"ch":0,"line":135}}}} \ No newline at end of file +{"月度/8月/8月.md":{"scroll":23.3978,"cursor":{"from":{"ch":0,"line":352},"to":{"ch":0,"line":352}}},"材料/服务器.md":{"scroll":41.7002,"cursor":{"from":{"ch":10,"line":46},"to":{"ch":10,"line":46}}},"月度/9月/9月.md":{"scroll":48.0336,"cursor":{"from":{"ch":1,"line":408},"to":{"ch":1,"line":408}}},"月度/7月/7月.md":{"scroll":0,"cursor":{"from":{"ch":29,"line":147},"to":{"ch":29,"line":147}}},"月度/6月/6月.md":{"scroll":0,"cursor":{"from":{"ch":23,"line":120},"to":{"ch":23,"line":120}}},"月度/5月/5月.md":{"scroll":93.1957,"cursor":{"from":{"ch":20,"line":105},"to":{"ch":20,"line":105}}},"月度/4月/4月.md":{"scroll":120.1806,"cursor":{"from":{"ch":20,"line":139},"to":{"ch":20,"line":139}}},"月度/3月/3月.md":{"scroll":32.7083,"cursor":{"from":{"ch":6,"line":39},"to":{"ch":6,"line":39}}},"月度/7月/7月工作总结及8月工作计划.md":{"scroll":0,"cursor":{"from":{"ch":0,"line":0},"to":{"ch":0,"line":0}}},"月度/6月/6月份晨午检bug修复.md":{"scroll":307.9981,"cursor":{"from":{"ch":0,"line":0},"to":{"ch":0,"line":0}}},"月度/7月/设备管理中心研发记录.md":{"scroll":110.1015,"cursor":{"from":{"ch":0,"line":0},"to":{"ch":0,"line":0}}},"月度/8月/CA身份认证app/CA身份认证app流程图.md":{"scroll":5.8654,"cursor":{"from":{"ch":0,"line":0},"to":{"ch":0,"line":0}}},"月度/9月/常见病/20250903常见病优化沟通.md":{"scroll":0.7205,"cursor":{"from":{"ch":0,"line":0},"to":{"ch":0,"line":0}}},"月度/9月/汇海/对接主机/不登录模式接口文档.md":{"scroll":0,"cursor":{"from":{"ch":5,"line":8},"to":{"ch":5,"line":8}}},"月度/9月/汇海/对接主机/登录算法和密钥.md":{"scroll":0,"cursor":{"from":{"ch":0,"line":0},"to":{"ch":0,"line":0}}},"月度/9月/汇海/对接主机/华夏汇海接口文档.md":{"scroll":1134.2189,"cursor":{"from":{"ch":96,"line":1670},"to":{"ch":96,"line":1670}}},"材料/配置/Obsidian快捷键.md":{"scroll":0,"cursor":{"from":{"ch":18,"line":16},"to":{"ch":18,"line":16}}},"材料/配置/工具.md":{"scroll":0,"cursor":{"from":{"ch":50,"line":0},"to":{"ch":50,"line":0}}},"月度/9月/石榴籽-家校通/家校通需求.md":{"scroll":22.9513,"cursor":{"from":{"ch":13,"line":37},"to":{"ch":13,"line":37}}},"月度/9月/汇海/体质测试数据上传接口文档.md":{"scroll":64.4749,"cursor":{"from":{"ch":0,"line":0},"to":{"ch":0,"line":0}}},"月度/9月/汇海/解析汇海设备请求.md":{"scroll":1331.4598,"cursor":{"from":{"ch":0,"line":0},"to":{"ch":0,"line":0}}},"月度/9月/156中 中考模拟 初三.md":{"scroll":8.0497,"cursor":{"from":{"ch":0,"line":20},"to":{"ch":0,"line":20}}},"月度/10月/10月.md":{"scroll":142.8478,"cursor":{"from":{"ch":48,"line":155},"to":{"ch":48,"line":155}}}} \ No newline at end of file diff --git a/.obsidian/workspace.json b/.obsidian/workspace.json index d298981..1249731 100644 --- a/.obsidian/workspace.json +++ b/.obsidian/workspace.json @@ -4,11 +4,11 @@ "type": "split", "children": [ { - "id": "37491f982ae93475", + "id": "99ec7b3683ac1323", "type": "tabs", "children": [ { - "id": "50984f2c4b4d8025", + "id": "00c007f73c4e15d3", "type": "leaf", "state": { "type": "markdown", @@ -177,8 +177,7 @@ "title": "脚注" } } - ], - "currentTab": 2 + ] } ], "direction": "horizontal", @@ -200,21 +199,23 @@ "univer:Univer": false } }, - "active": "50984f2c4b4d8025", + "active": "00c007f73c4e15d3", "lastOpenFiles": [ + "材料/发票/乌市体测打车费/替票/dzfp_25657000000082317926_新疆青卫舜源信息科技有限公司.pdf", "月度/10月/10月.md", + "sportSql.md", + "月度/10月/日常体测监测/sportSQL/米东区.xlsx", + "月度/10月/日常体测监测/sportSQL/沙依巴克区.xlsx", + "月度/10月/日常体测监测/sportSQL/水磨沟区.xlsx", + "月度/10月/日常体测监测/sportSQL/新市区.xlsx", + "月度/10月/日常体测监测/sportSQL/总的.xlsx", + "月度/10月/日常体测监测/sportSQL/市辖区.xlsx", + "月度/10月/日常体测监测/sportSQL/头屯河区.xlsx", + "月度/10月/日常体测监测/sportSQL/天山区.xlsx", + "月度/10月/日常体测监测/sportSQL/乌鲁木齐各学校.xlsx", + "月度/10月/日常体测监测/sportSQL", "材料/服务器.md", - "月度/月度封面.base", - "材料/发票/乌市体测打车费-幸福中学/【T3出行-45.53元-1个行程】高德打车电子行程单.pdf", - "材料/发票/乌市体测打车费-幸福中学/【T3出行-45.53元-1个行程】高德打车电子发票.xml", - "材料/发票/乌市体测打车费-幸福中学/【T3出行-45.53元-1个行程】高德打车电子发票.pdf", - "材料/发票/乌市体测打车费-幸福中学", - "材料/发票/新建文件夹", "月度/10月/第86届中国教育装备展/智慧体育.md", - "月度/10月/第86届中国教育装备展/第86届中国教育装备展.zip", - "月度/10月/日常体测监测/测试登记表总表.xlsx", - "月度/10月/兵二/兵团二中高中二年级学生2025年度体测成绩导出.xls", - "月度/10月/兵二/兵团二中初中二年级学生2025年度体测成绩导出.xls", "月度/6月/6月.md", "月度/7月/7月.md", "月度/8月/8月.md", @@ -246,7 +247,6 @@ "月度/9月/汇海/对接主机/2.0/人脸特征值下载.md", "月度/9月/调查问卷.md", "月度/3月/3月.md", - "月度/9月/常见病/20250903常见病优化沟通.md", "月度/未命名.canvas", "月度/8月/ca身份认证/未命名.canvas", "未命名.canvas" diff --git a/月度/10月/10月.md b/月度/10月/10月.md index 8443dc8..9eb187a 100644 --- a/月度/10月/10月.md +++ b/月度/10月/10月.md @@ -22,8 +22,18 @@ option2: value2 ![[测试登记表总表.xlsx]] - - +# 10.16 +1.统计乌鲁木齐日常体测五率及人数 +[[米东区.xlsx]] +[[沙依巴克区.xlsx]] +[[市辖区.xlsx]] +[[水磨沟区.xlsx]] +[[天山区.xlsx]] +[[头屯河区.xlsx]] +[[乌鲁木齐各学校.xlsx]] +[[新市区.xlsx]] +[[总的.xlsx]] + # 10.21 @@ -109,10 +119,12 @@ option2: value2 # 10.28 -1.迁移中考体育系统生产数据库到达梦 +1.迁移中考体育系统生产数据库到达梦 用户名:EHIMSYS_SPORTS 密码:Zkty2025@1028 +部署中考体育系统10.10.35.23国产服务器上 + 2.晨午检本地测试达梦数据库 用户名:CHENWUJIAN 密码:Bh@123456 @@ -132,8 +144,15 @@ feat(database): 添加达梦数据库支持并优化统计查询 - 优化晨检模块的时间范围查询条件 - 修复学校安全记录模块的日期处理逻辑 -2. - - +2.迁移RyCwj项目到测试达梦 +用户名:RYCWJ +密码:Bh@123456 +feat(config): 添加达梦数据库配置并切换默认数据源 +- 新增 application-druiddm.yml 配置文件,支持 MySQL 数据库连接池配置 +- 新增 application-testdm.yml 配置文件,支持达梦数据库连接池配置 +- 修改 application.yml 默认激活配置为 testdm,使用达梦数据库 +- 更新 SysUserOnlineMapper.xml 中 saveOnline 方法,采用 MERGE 语法兼容达梦数据库 +- 调整 RyCwjTaskMapper.xml 查询条件,使用 TRUNC 函数适配达梦数据库日期比较逻辑 +- 优化 XML 文件格式,统一缩进风格提升可读性 diff --git a/月度/10月/日常体测监测/sportSQL/乌鲁木齐各学校.xlsx b/月度/10月/日常体测监测/sportSQL/乌鲁木齐各学校.xlsx new file mode 100644 index 0000000..8160a80 Binary files /dev/null and b/月度/10月/日常体测监测/sportSQL/乌鲁木齐各学校.xlsx differ diff --git a/月度/10月/日常体测监测/sportSQL/天山区.xlsx b/月度/10月/日常体测监测/sportSQL/天山区.xlsx new file mode 100644 index 0000000..30af3e1 Binary files /dev/null and b/月度/10月/日常体测监测/sportSQL/天山区.xlsx differ diff --git a/月度/10月/日常体测监测/sportSQL/头屯河区.xlsx b/月度/10月/日常体测监测/sportSQL/头屯河区.xlsx new file mode 100644 index 0000000..f93534d Binary files /dev/null and b/月度/10月/日常体测监测/sportSQL/头屯河区.xlsx differ diff --git a/月度/10月/日常体测监测/sportSQL/市辖区.xlsx b/月度/10月/日常体测监测/sportSQL/市辖区.xlsx new file mode 100644 index 0000000..1fc64c7 Binary files /dev/null and b/月度/10月/日常体测监测/sportSQL/市辖区.xlsx differ diff --git a/月度/10月/日常体测监测/sportSQL/总的.xlsx b/月度/10月/日常体测监测/sportSQL/总的.xlsx new file mode 100644 index 0000000..9ecb985 Binary files /dev/null and b/月度/10月/日常体测监测/sportSQL/总的.xlsx differ diff --git a/月度/10月/日常体测监测/sportSQL/新市区.xlsx b/月度/10月/日常体测监测/sportSQL/新市区.xlsx new file mode 100644 index 0000000..61b5bf7 Binary files /dev/null and b/月度/10月/日常体测监测/sportSQL/新市区.xlsx differ diff --git a/月度/10月/日常体测监测/sportSQL/水磨沟区.xlsx b/月度/10月/日常体测监测/sportSQL/水磨沟区.xlsx new file mode 100644 index 0000000..068bba0 Binary files /dev/null and b/月度/10月/日常体测监测/sportSQL/水磨沟区.xlsx differ diff --git a/月度/10月/日常体测监测/sportSQL/沙依巴克区.xlsx b/月度/10月/日常体测监测/sportSQL/沙依巴克区.xlsx new file mode 100644 index 0000000..20b1341 Binary files /dev/null and b/月度/10月/日常体测监测/sportSQL/沙依巴克区.xlsx differ diff --git a/月度/10月/日常体测监测/sportSQL/米东区.xlsx b/月度/10月/日常体测监测/sportSQL/米东区.xlsx new file mode 100644 index 0000000..4c3fb04 Binary files /dev/null and b/月度/10月/日常体测监测/sportSQL/米东区.xlsx differ