11.25
This commit is contained in:
@@ -1 +1 @@
|
|||||||
{"月度/8月/8月.md":{"scroll":150.7352,"cursor":{"from":{"ch":20,"line":164},"to":{"ch":20,"line":164}}},"材料/服务器.md":{"scroll":20.5975,"cursor":{"from":{"ch":17,"line":31},"to":{"ch":29,"line":31}}},"月度/9月/9月.md":{"scroll":378.1023,"cursor":{"from":{"ch":26,"line":389},"to":{"ch":26,"line":389}}},"月度/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":31.0412,"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":108.9598,"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":1133.8083,"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":0,"cursor":{"from":{"ch":12,"line":0},"to":{"ch":0,"line":0}}},"月度/11月/11月.md":{"scroll":733.6071,"cursor":{"from":{"ch":14,"line":737},"to":{"ch":14,"line":737}}},"月度/10月/第86届中国教育装备展/智慧体育.md":{"scroll":0.0271,"cursor":{"from":{"ch":0,"line":0},"to":{"ch":0,"line":0}}},"月度/11月/家校协同/11.11家校协同会议.md":{"scroll":49.3825,"cursor":{"from":{"ch":0,"line":77},"to":{"ch":0,"line":77}}}}
|
{"月度/8月/8月.md":{"scroll":150.7352,"cursor":{"from":{"ch":20,"line":164},"to":{"ch":20,"line":164}}},"材料/服务器.md":{"scroll":0,"cursor":{"from":{"ch":0,"line":5},"to":{"ch":30,"line":5}}},"月度/9月/9月.md":{"scroll":378.1023,"cursor":{"from":{"ch":26,"line":389},"to":{"ch":26,"line":389}}},"月度/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":31.0412,"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":108.9598,"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":1133.8083,"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":0,"cursor":{"from":{"ch":12,"line":0},"to":{"ch":0,"line":0}}},"月度/11月/11月.md":{"scroll":854.5401,"cursor":{"from":{"ch":99,"line":860},"to":{"ch":99,"line":860}}},"月度/10月/第86届中国教育装备展/智慧体育.md":{"scroll":0.0271,"cursor":{"from":{"ch":0,"line":0},"to":{"ch":0,"line":0}}},"月度/11月/家校协同/11.11家校协同会议.md":{"scroll":49.3825,"cursor":{"from":{"ch":0,"line":77},"to":{"ch":0,"line":77}}}}
|
||||||
14
.obsidian/workspace.json
vendored
14
.obsidian/workspace.json
vendored
@@ -190,17 +190,18 @@
|
|||||||
},
|
},
|
||||||
"active": "366ad8652c5ff3b7",
|
"active": "366ad8652c5ff3b7",
|
||||||
"lastOpenFiles": [
|
"lastOpenFiles": [
|
||||||
|
"材料/服务器.md",
|
||||||
"月度/11月/11月.md",
|
"月度/11月/11月.md",
|
||||||
|
"月度/11月/晨午检/区域学制学校数.xls",
|
||||||
|
"月度/11月/晨午检/晨午检学制.xlsx",
|
||||||
|
"月度/11月/体测数据统计/2025年乌鲁木齐市报告书模版.docx",
|
||||||
|
"月度/11月/体测数据统计/2025年乌鲁木齐市报告书模版(1).docx",
|
||||||
|
"月度/11月/体测数据统计",
|
||||||
|
"材料/code/统计git提交.sh",
|
||||||
"月度/11月/常见病Epidata数据库-2025-模板/表3-3(大学)/表3-3 学生健康状况及影响因素调查表(大学版)_2025.REC",
|
"月度/11月/常见病Epidata数据库-2025-模板/表3-3(大学)/表3-3 学生健康状况及影响因素调查表(大学版)_2025.REC",
|
||||||
"月度/11月/常见病Epidata数据库-2025-模板/表3-3(大学)/表3-3 学生健康状况及影响因素调查表(大学版)_2025.QES",
|
"月度/11月/常见病Epidata数据库-2025-模板/表3-3(大学)/表3-3 学生健康状况及影响因素调查表(大学版)_2025.QES",
|
||||||
"月度/11月/常见病Epidata数据库-2025-模板/表3-3(大学)/表3-3 学生健康状况及影响因素调查表(大学版)_2025.chk",
|
"月度/11月/常见病Epidata数据库-2025-模板/表3-3(大学)/表3-3 学生健康状况及影响因素调查表(大学版)_2025.chk",
|
||||||
"月度/11月/常见病Epidata数据库-2025-模板/表3-2(中学)/表3-2学生健康状况及影响因素调查表_2025.REC",
|
"月度/11月/常见病Epidata数据库-2025-模板/表3-2(中学)/表3-2学生健康状况及影响因素调查表_2025.REC",
|
||||||
"月度/11月/常见病Epidata数据库-2025-模板/表3-2(中学)/表3-2学生健康状况及影响因素调查表_2025.QES",
|
|
||||||
"月度/11月/常见病Epidata数据库-2025-模板/表3-2(中学)/表3-2学生健康状况及影响因素调查表_2025.chk",
|
|
||||||
"月度/11月/常见病Epidata数据库-2025-模板/表3-1 (小学)/表3-1 学生健康状况及影响因素调查表(小学版)_2025.REC",
|
|
||||||
"月度/11月/常见病Epidata数据库-2025-模板/表3-1 (小学)/表3-1 学生健康状况及影响因素调查表(小学版)_2025.QES",
|
|
||||||
"月度/11月/常见病Epidata数据库-2025-模板/表3-1 (小学)/表3-1 学生健康状况及影响因素调查表(小学版)_2025.chk",
|
|
||||||
"月度/11月/常见病Epidata数据库-2025-模板/表2-3(幼儿园)/表2-3 学生重点常见病监测表(幼儿园版)_2025.REC",
|
|
||||||
"月度/11月/家校协同/晨午检_slices/mipmap-xxxhdpi/Frame_427319603.png",
|
"月度/11月/家校协同/晨午检_slices/mipmap-xxxhdpi/Frame_427319603.png",
|
||||||
"月度/11月/家校协同/晨午检_slices/mipmap-xxxhdpi/Frame_427319603(2).png",
|
"月度/11月/家校协同/晨午检_slices/mipmap-xxxhdpi/Frame_427319603(2).png",
|
||||||
"月度/11月/家校协同/晨午检_slices/mipmap-xxxhdpi/Frame_427319603(1).png",
|
"月度/11月/家校协同/晨午检_slices/mipmap-xxxhdpi/Frame_427319603(1).png",
|
||||||
@@ -211,7 +212,6 @@
|
|||||||
"月度/11月/家校协同/晨午检_slices/mipmap-xxxhdpi/Frame_427319601(2).png",
|
"月度/11月/家校协同/晨午检_slices/mipmap-xxxhdpi/Frame_427319601(2).png",
|
||||||
"月度/11月/家校协同/晨午检_slices/mipmap-xxxhdpi/Frame_427319601(1).png",
|
"月度/11月/家校协同/晨午检_slices/mipmap-xxxhdpi/Frame_427319601(1).png",
|
||||||
"月度/11月/家校协同/晨午检_slices/mipmap-xxhdpi/Frame_427319603.png",
|
"月度/11月/家校协同/晨午检_slices/mipmap-xxhdpi/Frame_427319603.png",
|
||||||
"材料/服务器.md",
|
|
||||||
"月度/11月/家校协同/11.11家校协同会议.md",
|
"月度/11月/家校协同/11.11家校协同会议.md",
|
||||||
"月度/8月/8月.md",
|
"月度/8月/8月.md",
|
||||||
"月度/9月/9月.md",
|
"月度/9月/9月.md",
|
||||||
|
|||||||
@@ -771,4 +771,91 @@ feat(epidata): 更新问卷数据处理逻辑
|
|||||||
- 调整 EpidataWen232025 实体类字段类型,将 num 和 date 字段由 Integer/Date 改为 String
|
- 调整 EpidataWen232025 实体类字段类型,将 num 和 date 字段由 Integer/Date 改为 String
|
||||||
- 在 BiaoChuli23ServiceImpl 中新增获取学生测试结果的方法调用
|
- 在 BiaoChuli23ServiceImpl 中新增获取学生测试结果的方法调用
|
||||||
- 增加生成唯一ID的方法 generateId,用于构建学生标识符
|
- 增加生成唯一ID的方法 generateId,用于构建学生标识符
|
||||||
- 修改 EpidataWen232025Converter 中的学生信息转换逻辑,移除旧字段映射并增加日期字段设置
|
- 修改 EpidataWen232025Converter 中的学生信息转换逻辑,移除旧字段映射并增加日期字段设置
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
# 11.24
|
||||||
|
1.<span style="color:#3EC1D3 !important;">常见病epidata</span>
|
||||||
|
feat(epidata): 更新问卷配置键并优化转换值计算逻辑
|
||||||
|
- 重构右眼和左眼转换值计算方法,提取公共逻辑
|
||||||
|
- 新增轴位转换逻辑,支持不同位数的轴位数值处理
|
||||||
|
- 实现等效球镜度数(SER/SEL)的精确计算
|
||||||
|
- 添加柱镜为负值时的特殊处理,设置转换值为999
|
||||||
|
- 优化代码结构,提高可读性和维护性
|
||||||
|
fix(epidata): 修正眼轴数据转换逻辑及等效球镜度数计算精度
|
||||||
|
- 修改 EpidataWen212025Converter 中柱镜转换逻辑为取绝对值的负数
|
||||||
|
- 简化轴位转换方法,实现大于90减90、小于90加90的规则
|
||||||
|
- 统一等效球镜度数(SER)计算结果保留两位小数
|
||||||
|
- 更新 EpidataWen232025Converter 类似逻辑以保持一致性
|
||||||
|
|
||||||
|
|
||||||
|
2.<span style="color:#3EC1D3 !important;">石榴籽</span>
|
||||||
|
**前端**
|
||||||
|
feat(book): 添加播客阅读时长和积分字段
|
||||||
|
- 在 Book 实体类中添加 readTime、readPoints 和 isSubmitPoints 字段
|
||||||
|
- 使用 Lombok @Data 注解替换手动 getter/setter 方法
|
||||||
|
- 更新 BookMapper.xml 文件以支持新字段的数据库映射
|
||||||
|
- 修改 BookDialog.vue 组件,增加阅读时长和积分相关表单项
|
||||||
|
- 调整权限按钮位置和表格列定义顺序
|
||||||
|
- 优化图片预览功能及上传逻辑
|
||||||
|
|
||||||
|
**小程序**
|
||||||
|
feat(yyjk): 更新页面UI设计与交互逻辑
|
||||||
|
- 修改标题和副标题样式,增强视觉层次感
|
||||||
|
- 调整食谱展示区域布局,优化用户阅读体验
|
||||||
|
- 更改颜色主题,统一使用绿色系提升界面美观度
|
||||||
|
- 重新设计“一键生成食谱”按钮样式及位置
|
||||||
|
- 添加加载状态动画提示用户正在生成食谱
|
||||||
|
- 优化食物图标显示位置与样式
|
||||||
|
- 调整推荐文章区域结构,去除冗余收藏按钮
|
||||||
|
- 更新页面背景渐变色与卡片圆角风格
|
||||||
|
- 增加餐品类别标签与热量信息展示
|
||||||
|
- 统一文字大小与间距设置提高可读性
|
||||||
|
|
||||||
|
3.<span style="color:#3EC1D3 !important;">晨午检</span>
|
||||||
|
fix(sys): 解决密码验证中HTML实体字符未解码问题
|
||||||
|
- 在密码验证前解码HTML实体字符&为&
|
||||||
|
- 添加调试日志输出帮助排查密码匹配问题
|
||||||
|
- 更新UserController中的密码更新逻辑以处理编码问题
|
||||||
|
- 确保新旧密码在验证前都经过相同的解码处理
|
||||||
|
- 优化密码比较逻辑提高准确性
|
||||||
|
- 移除不必要的System.out调试代码
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
# 11.25
|
||||||
|
1.<span style="color:#3EC1D3 !important;">石榴籽</span>
|
||||||
|
**小程序**
|
||||||
|
feat(address): 重构地址管理功能
|
||||||
|
- 新增地址表单页面,支持地区选择和详细地址输入
|
||||||
|
- 实现地址编辑和新增功能,统一跳转至表单页
|
||||||
|
- 添加设为默认地址功能
|
||||||
|
- 优化地址列表展示和操作按钮布局
|
||||||
|
- 更新小程序配置,添加地址相关权限和插件
|
||||||
|
- 调整环境配置baseUrl指向新服务器地址
|
||||||
|
- 完善地址保存逻辑和表单验证规则
|
||||||
|
feat(address): 集成地图选点功能并优化地址管理
|
||||||
|
- 在地址表单中添加地图选点功能,支持通过地图选择位置并自动填充地址信息
|
||||||
|
- 集成腾讯地图逆地理编码API,实现精确地址解析
|
||||||
|
- 添加地图预览功能,用户可点击查看所选位置的大图
|
||||||
|
- 优化地址列表页面,修复默认地址设置逻辑及事件冒泡问题
|
||||||
|
- 完善地址表单验证,提升用户体验和数据准确性
|
||||||
|
- 更新小程序配置文件,申请地理位置相关权限并完善权限描述
|
||||||
|
- 修复地址编辑时的数据回显问题,确保页面正常显示已有地址信息
|
||||||
|
- 后端接口优化,默认地址设置时自动将其他地址设为非默认状态
|
||||||
|
|
||||||
|
2.乌鲁木齐市<span style="color:#3EC1D3 !important;">日常体测</span>数据统计
|
||||||
|
[[2025年乌鲁木齐市报告书模版.docx]]
|
||||||
|
|
||||||
|
|
||||||
|
3.统计<span style="color:#3EC1D3 !important;">晨午检</span>学制
|
||||||
|
[[晨午检学制.xlsx]]
|
||||||
|
[[区域学制学校数.xls]]
|
||||||
|

|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
# 11.26
|
||||||
|
1.统计<span style="color:#3EC1D3 !important;">晨午检</span>2022年、2023年、2024年、2025年10月31日之前各地州上报率按月取平均数出来
|
||||||
BIN
月度/11月/体测数据统计/2025年乌鲁木齐市报告书模版.docx
Normal file
BIN
月度/11月/体测数据统计/2025年乌鲁木齐市报告书模版.docx
Normal file
Binary file not shown.
BIN
月度/11月/晨午检/区域学制学校数.xls
Normal file
BIN
月度/11月/晨午检/区域学制学校数.xls
Normal file
Binary file not shown.
BIN
月度/11月/晨午检/晨午检学制.xlsx
Normal file
BIN
月度/11月/晨午检/晨午检学制.xlsx
Normal file
Binary file not shown.
40
材料/code/统计git提交.sh
Normal file
40
材料/code/统计git提交.sh
Normal file
@@ -0,0 +1,40 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
# 存储各分支的总变化行数(新增+删除)
|
||||||
|
declare -A branch_total
|
||||||
|
|
||||||
|
# 遍历所有本地分支(排除 HEAD 指针)
|
||||||
|
for branch in $(git branch | grep -v "HEAD" | sed 's/^\* //'); do
|
||||||
|
echo "============================================="
|
||||||
|
echo "正在统计分支:$branch"
|
||||||
|
echo "============================================="
|
||||||
|
|
||||||
|
# 初始化当前分支的总行数
|
||||||
|
branch_total[$branch]=0
|
||||||
|
|
||||||
|
# 遍历当前分支的所有提交(按时间从早到晚)
|
||||||
|
git log "$branch" --reverse --pretty=format:"%h %ad %an" --date=short | while read commit date author; do
|
||||||
|
# 统计当前提交的新增+删除行数(无变化时输出 0)
|
||||||
|
lines=$(git diff --shortstat "$commit^..$commit" | awk '{print $4+$6}' | head -n1)
|
||||||
|
lines=${lines:-0} # 处理空值(首次提交无父提交时)
|
||||||
|
|
||||||
|
# 累加当前分支的总行数
|
||||||
|
branch_total[$branch]=$((branch_total[$branch] + lines))
|
||||||
|
|
||||||
|
# 输出当前提交的详情(日期 提交人 提交哈希 本次变化行数)
|
||||||
|
echo -e "$date\t$author\t$commit\t$lines"
|
||||||
|
done
|
||||||
|
|
||||||
|
# 输出当前分支的总变化行数
|
||||||
|
echo -e "分支 $branch 总变化行数:${branch_total[$branch]}\n"
|
||||||
|
done
|
||||||
|
|
||||||
|
# 输出所有分支的汇总排名(按总变化行数降序)
|
||||||
|
echo "============================================="
|
||||||
|
echo "所有分支总变化行数汇总(降序)"
|
||||||
|
echo "============================================="
|
||||||
|
for branch in $(printf "%s\n" "${!branch_total[@]}" | sort -nr -k1,1 --compress-program=gzip < <(for b in "${!branch_total[@]}"; do echo "${branch_total[$b]} $b"; done)); do
|
||||||
|
total=$(echo "$branch" | awk '{print $1}')
|
||||||
|
branch_name=$(echo "$branch" | awk '{print $2}')
|
||||||
|
echo "$branch_name: $total 行"
|
||||||
|
done
|
||||||
@@ -1,9 +1,10 @@
|
|||||||
# **阿里云**
|
# **阿里云**
|
||||||
## AccessKey
|
## AccessKey
|
||||||
**AccessKey ID:**
|
**AccessKey ID:**
|
||||||
LTAI5tQbMgHJsKpjY6gS2Ckm
|
LTAI5tA1irBCHTZP5EKjCq4s
|
||||||
**AccessKey Secret:**
|
**AccessKey Secret:**
|
||||||
y7m1ALcTij7dME7Wno4EgVnsHNPjOb
|
btqq3bLiSDBLXmWe23N1UO10zogs6Y
|
||||||
|
|
||||||
## #lpane
|
## #lpane
|
||||||
- 外部地址:http://47.109.23.162:22825/a70aef6b25
|
- 外部地址:http://47.109.23.162:22825/a70aef6b25
|
||||||
- 域名外部地址:http://lpane.binghuai.xyz/a70aef6b25
|
- 域名外部地址:http://lpane.binghuai.xyz/a70aef6b25
|
||||||
|
|||||||
Reference in New Issue
Block a user