0

.nvmrc

@@ -0,0 +1 @@
+24.1.0

.vscode/settings.json

@@ -0,0 +1,26 @@
+{
+    "files.autoSave": "afterDelay",
+    "files.autoSaveDelay": 1000,
+    "code-runner.clearPreviousOutput": true,
+    "code-runner.ignoreSelection": true,
+    "code-runner.saveFileBeforeRun": true,
+    "code-runner.runInTerminal": true,
+    "code-runner.preserveFocus": true,
+    "code-runner.fileDirectoryAsCwd": true,
+    "code-runner.showExecutionMessage": true,
+    "code-runner.enableAppInsights": false,
+    "code-runner.respectShebang": true,
+    "code-runner.terminalRoot": "~",
+    "terminal.integrated.allowChords": false,
+    "terminal.integrated.confirmOnExit": "never",
+    "terminal.integrated.persistentSessionReviveProcess": "never",
+    "terminal.integrated.tabs.enabled": true,
+    "terminal.integrated.tabs.hideCondition": "never",
+    "terminal.integrated.enablePersistentSessions": false,
+    "workbench.editor.enablePreview": false,
+    "workbench.editor.closeOnFileDelete": true,
+    "accessibility.signals.terminalBell": {
+        "sound": "off"
+    },
+    "terminal.integrated.enableVisualBell": false
+}

.vscode/tasks.json

@@ -0,0 +1,20 @@
+{
+    "version": "2.0.0",
+    "tasks": [
+        {
+            "label": "Kill Running Process and Run Code",
+            "type": "shell",
+            "command": "pkill -f 'node ${file}' || true && node ${file}",
+            "group": {
+                "kind": "build",
+                "isDefault": true
+            },
+            "presentation": {
+                "reveal": "always",
+                "panel": "new",
+                "clear": true
+            },
+            "problemMatcher": []
+        }
+    ]
+}

package.json

@@ -8,10 +8,12 @@
   },
   "scripts": {
     "predev": "node scripts/check-node-version.js",
-    "dev": "cross-env NODE_ENV=development node src/app.js",
+    "dev": "./scripts/use-node-version.sh cross-env NODE_ENV=development node src/app.js",
     "prestart": "node scripts/check-node-version.js",
-    "start": "cross-env NODE_ENV=production node src/app.js",
-    "test": "echo \"Error: no test specified\" && exit 1"
+    "start": "./scripts/use-node-version.sh cross-env NODE_ENV=production node src/app.js",
+    "test": "./scripts/use-node-version.sh node",
+    "node": "./scripts/use-node-version.sh node",
+    "check-version": "./scripts/use-node-version.sh node -v"
   },
   "engines": {
     "node": "24.1.0"
@@ -40,4 +42,4 @@
   "devDependencies": {
     "cross-env": "^7.0.3"
   }
-}
+}

scripts/check-node-version.js

@@ -9,28 +9,67 @@ const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
 
 // 读取 .nvmrc 文件获取所需的 Node.js 版本
-const requiredVersion = fs.readFileSync(path.join(__dirname, '..', '.nvmrc'), 'utf8').trim();
+let requiredVersion;
+try {
+  requiredVersion = fs.readFileSync(path.join(__dirname, '..', '.nvmrc'), 'utf8').trim();
+} catch (error) {
+  console.error('错误: 无法读取 .nvmrc 文件');
+  process.exit(1);
+}
+
 const currentVersion = process.version.slice(1); // 移除版本号前的 'v'
 
 console.log(`检查 Node.js 版本...`);
 console.log(`当前版本: ${currentVersion}`);
 console.log(`所需版本: ${requiredVersion}`);
 
-// 比较版本号的主要部分
-const currentMajor = parseInt(currentVersion.split('.')[0], 10);
-const requiredMajor = parseInt(requiredVersion.split('.')[0], 10);
+// 解析版本号的所有部分
+const parseVersion = (version) => {
+  const parts = version.split('.').map(Number);
+  return {
+    major: parts[0],
+    minor: parts[1] || 0,
+    patch: parts[2] || 0
+  };
+};
+
+const current = parseVersion(currentVersion);
+const required = parseVersion(requiredVersion);
 
-if (currentMajor !== requiredMajor) {
+// 检查版本是否匹配
+const isVersionMatch = 
+  current.major === required.major &&
+  current.minor >= required.minor;
+
+if (!isVersionMatch) {
   console.error(`\n错误: Node.js 版本不匹配!`);
   console.error(`本项目需要 Node.js ${requiredVersion}`);
   console.error(`当前使用的是 Node.js ${currentVersion}`);
   
   console.error(`\n请尝试以下方法之一:`);
-  console.error(`1. 如果已安装 nvm: 运行 'nvm use ${requiredVersion}'`);
-  console.error(`2. 安装所需版本: 'nvm install ${requiredVersion}'`);
-  console.error(`3. 从 https://nodejs.org/ 下载并安装 Node.js ${requiredVersion}`);
+  console.error(`1. 使用项目提供的版本切换脚本:`);
+  console.error(`   ./scripts/use-node-version.sh node -v`);
+  console.error(`2. 如果已安装 nvm: 运行 'nvm use ${requiredVersion}'`);
+  console.error(`3. 安装所需版本: 'nvm install ${requiredVersion}'`);
+  console.error(`4. 从 https://nodejs.org/ 下载并安装 Node.js ${requiredVersion}`);
   
   process.exit(1);
 }
 
-console.log(`Node.js 版本检查通过!`);
+// 检查是否已安装 nvm
+try {
+  execSync('command -v nvm', { stdio: 'ignore' });
+  // 如果 nvm 可用，尝试自动切换版本
+  try {
+    execSync(`. "${process.env.NVM_DIR}/nvm.sh" && nvm use ${requiredVersion}`, { 
+      stdio: 'inherit',
+      shell: '/bin/bash'
+    });
+  } catch (error) {
+    // 如果自动切换失败，继续执行，因为当前版本已经匹配
+  }
+} catch (error) {
+  // nvm 未安装，但当前版本已经匹配，所以继续执行
+}
+
+console.log(`\n✓ Node.js 版本检查通过! (${currentVersion})`);

scripts/use-node-version.sh

@@ -0,0 +1,28 @@
+#!/bin/bash
+
+# 检查是否安装了 nvm
+if [ -z "$(command -v nvm)" ]; then
+  echo "Error: nvm is not installed"
+  echo "Please install nvm first: https://github.com/nvm-sh/nvm#installing-and-updating"
+  exit 1
+fi
+
+# 获取 .nvmrc 中指定的版本
+NODE_VERSION=$(cat .nvmrc)
+
+# 检查是否已安装所需版本
+if ! nvm ls $NODE_VERSION > /dev/null 2>&1; then
+  echo "Required Node.js version $NODE_VERSION is not installed"
+  echo "Installing Node.js $NODE_VERSION..."
+  nvm install $NODE_VERSION
+fi
+
+# 使用指定版本
+echo "Switching to Node.js $NODE_VERSION..."
+. "$(dirname $(command -v nvm))/nvm.sh" # 加载 nvm
+nvm use $NODE_VERSION
+
+# 执行传入的命令
+if [ $# -gt 0 ]; then
+  exec "$@"
+fi

src/api/mps/mpsScoreController.js

@@ -63,11 +63,14 @@ export async function GetMPSSchoolLikeNum(ctx) {
 
 // 获取区县人数
 export async function GetMPSDistrictPersonNum(ctx) {
-    const param = {
+    let param = {
         DistrictID: ctx.query.DistrictID || '0', //所在区
-        Year: ctx.query.Year || ArrYear[1].Name,
+        Year: ctx.query.Year || ArrYear[0].Name,
     };
 
+    if (param.DistrictID==10 || param.DistrictID==12 || param.DistrictID==15 || param.DistrictID==16 )
+        param.Year=ArrYear[0].Name;
+
     let info=null;
     if (param.DistrictID!="NaN"){
 

src/test/build.test.js

@@ -0,0 +1,41 @@
+import commonModel from '../model/commonModel.js';
+
+async function runScript(){
+    try {
+        const sql="select ID from MiaoguoLiteracy order by ID;"
+        let list = await commonModel.RunSql(null,sql);
+        for(let i=0;i<list.length;i++){
+            if (i % 1000 == 0)
+                console.log("i:"+i+" ID:"+list[i].ID);
+            let item =await commonModel.RunSql(null,"select * from MiaoguoLiteracy where ID="+list[i].ID+";");
+            let json;
+            try {
+                json = JSON.parse(item[0].JSONString);
+            } catch (parseError) {
+                console.error('JSON Parse Error at ID:', list[i].ID);
+                console.error('Error details:', parseError);
+                continue;
+            }
+            if (json && json.CHN && json.CHN.BiShunArr && json.CHN.BiShunArr.length>0){
+                console.log(i+" "+json.CHN.HanZi);
+                
+                delete json.CHN.BiShunArr;
+                let obj={};
+                obj.ID=list[i].ID;
+                obj.JSONString=JSON.stringify(json);
+
+                await commonModel.RunSql(obj,"update MiaoguoLiteracy set ? where ID="+list[i].ID+";");
+            }
+            //console.log(json);
+            //console.log(item.length);
+        }
+        console.log("完成");
+    } catch (error) {
+        console.error('Error executing script:', error);
+    }
+}
+
+// 处理Promise并添加错误捕获
+runScript().catch(error => {
+    console.error('Error in runScript:', error);
+});