no message

serverConfig.xml

@@ -2,7 +2,7 @@
     <port>30001</port>
     <ipUrl>http://192.168.0.71:30001/</ipUrl>
     
-    <url>http://api-gateway.sasu.shanghaitech.edu.cn</url>
+    <url>https://api-gateway.sasu.shanghaitech.edu.cn</url>
     <sign>xxx90909082fsdahfjosadjfpoiwausjorip2hjklrhn1ioud0u124rx0qwejfokasjfolksaujfoas</sign>
     <appKey>1384855435661541376</appKey>
     <appSecret>lRPbWFMckxc5tth6ZQnJtsBwCYIH0CXjcf0rvFgSOD8=</appSecret>

src/biz/duinei/njzxshx.ts

@@ -89,6 +89,7 @@ export async function getData(req, res) {
     })
     ret["sljc"] = {title:"视力监测", dataList:sljc};
 
+    //todo 接口返回undefined
     let sljcData = await getReqApiData(xshxNENUM.查询年级各班级视力不良率, {gradeId:grade});
     let sljcqs = [];
     sljcData.forEach( info => {
@@ -108,7 +109,7 @@ export async function getData(req, res) {
     ret["shsjhdqk"] = {title:"社会实践活动情况", dataList:shsjhdqk};
 
     /**团队德育活动 */
-    // let cyksData = await getReqApiData(xshxNENUM.团队德育活动, {grade}) //todo
+    let cyksData = await getReqApiData(xshxNENUM.团队德育活动, {grade})
     let cyks = [
         {
             key:"参与课时",
@@ -227,6 +228,7 @@ export async function getData(req, res) {
     
     ret["bjwcl"] = {title:"班级完成率", dataList:bjwcl};
 
+    // let njtshdData = await getReqApiData(xshxNENUM.年级特色活动, {pageNo:1, pageSize:100, gradeId:grade}); //todo
     let njtshd = {
         titleList:["活动种类", "活动名称", "时间", "地点", "参与人数"],
         dataList:[
@@ -253,6 +255,7 @@ export async function getData(req, res) {
     // ];
     // ret["yjxy"] = {title:"预警-学业", dataList:yjxy};
 
+    // let yjcqData = await getReqApiData(xshxNENUM.预警出勤, {}, "POST", "data");
     let yjcq = [
         {
             key:"请假人数",

src/biz/duinei/xshxgr.ts

@@ -12,14 +12,19 @@ import { changeEnumValue } from "../../tools/eccEnum";
 
 export async function getData(req, res) {
     let ret:any = {};
-    let studentId = req.body.studentId || "bdbb8be6417e11ee9ec102031519086a";
+    // let studentId = req.body.studentId || "bdbb8be6417e11ee9ec102031519086a";
+    // let studentId = req.body.studentId || "4ff589fcc6c411edb04a0203151c9658";
+    // let studentId = req.body.studentId || "080c0e005eca11ef8f7a0a96d1b50e8f";
+    // let studentId = req.body.studentId || '1d0308e4c6c411edb04a0203151c9658';
+    let studentId = req.body.studentId || '23f5aa9ec6c411edb04a0203151c9658';
+    
     let excelData = xshxgrTableData();
     let cjExcelData = xycjTableData();
 
     let name = "";
     let gradeClass = "";
 
-    let schoolId = "";
+    let schoolId = "559254528fc7421d9a4e25aaa1caaad3";
     let classId = "";
 
     let baseData = await getReqApiData(xshxgrWENUM.获取学生列表, {studentId});
@@ -47,7 +52,7 @@ export async function getData(req, res) {
             let item = baseData[0] || {};
             name = item.studentName;
             gradeClass = item.className;
-            schoolId = item.schoolId;
+            // schoolId = item.schoolId;
             classId = item.classId;
             base.name = item.studentName || '';
             base.className = item.className || '';
@@ -175,7 +180,7 @@ export async function getData(req, res) {
     ret["sljc"] = {title:"视力监测", dataList:sljc};
 
     /**社会实践活动情况 */
-    // let shsjhdqkData = await getReqApiData(xshxgrWENUM.社会实践活动情况, {studentId}); //todo
+    let shsjhdqkData = await getReqApiData(xshxgrWENUM.社会实践活动情况, {studentId}); //todo
     let shsjhdqk = [
         {
             name:"社会考察",
@@ -224,8 +229,7 @@ export async function getData(req, res) {
     ret["tddyhd"] = {title:"团队德育活动", dataList:tddyhd};
 
     /**综合评价（统计等第） */
-    // let zhpjData = await getReqApiData(xshxgrWENUM.综合统计, {studentId}) //todo
-    let zhpjData = await getReqApiData(xshxgrWENUM.获取学生成绩综合信息, {studentId, type:"综合面试"}); //todo
+    // let zhpjData = await getReqApiData(xshxgrWENUM.获取学生成绩综合信息, {studentId, type:"综合面试"}); //todo
     let zhpj = [
         {
             key:"学习态度",
@@ -301,15 +305,27 @@ export async function getData(req, res) {
     ];
     ret["xycjzf"] = {title:"修业课程与学业成绩", dataList:xycjzf};
 
+    let gkcjData = await getReqApiData(xshxgrWENUM.获取学生各科成绩, {studentId});
+    let gkcjMap = {};
+    if (gkcjData.length) {
+        gkcjData[0].score.forEach( info => {
+            gkcjMap[info.subject] = {qz:info.score4, qm:info.score5};
+        })
+    }
+    
     let gkcj = [];
-
     let xkConf = {"yw":"语文", "sx":"数学", "yy":"英语", "df":"道法", "wl":"物理", "hx":"化学", "sw":"生物", "ls":"历史", "dl":"地理", "zz":"政治", "ty":"体育"};
     for (let key in xkConf) {
-        let qm = `${key}qm`;
-        let qz = `${key}qz`;
-        let xkqm = thisStuXycj[qm] || "-";
-        let xkqz = thisStuXycj[qz] || "-";
-        gkcj.push({key:xkConf[key], midTerm:xkqz, endTerm:xkqm});
+        if (gkcjMap[xkConf[key]] && Object.keys(gkcjMap[xkConf[key]]).length) {
+            gkcj.push({key:xkConf[key], midTerm:gkcjMap[xkConf[key]].qz, endTerm:gkcjMap[xkConf[key]].qm});
+        } else {
+            gkcj.push({key:xkConf[key], midTerm:'0', endTerm:'0'});
+        }
+        // let qm = `${key}qm`;
+        // let qz = `${key}qz`;
+        // let xkqm = thisStuXycj[qm] || "-";
+        // let xkqz = thisStuXycj[qz] || "-";
+        // gkcj.push({key:xkConf[key], midTerm:xkqz, endTerm:xkqm});
     }
     
     ret["gkcj"] = {title:"各科成绩", dataList:gkcj};
@@ -415,7 +431,7 @@ export async function getData(req, res) {
     // ret["dtjk"] = {title:"动态-健康", dataList:jkdt};
 
     /**todo 接口接入方式不一致，最后修改 */
-    let dtData = await postReqApiData(xshxgrWENUM.学生日常行为规范, {personId:studentId, schoolId, classId});
+    let dtData = await postReqApiData(xshxgrWENUM.学生日常行为规范, {personId:studentId, schoolId, classId, platformCode:"999999"});
     let dt = [
         {
             key:"思想品德",
@@ -466,6 +482,7 @@ export async function getData(req, res) {
     ];
     ret["cxjsysjnl"] = {title:"创新精神与实践能力", dataList:cxjsysjnl};
 
+    let cxjsysjnlData = await getReqApiData(xshxgrWENUM.创新精神与实践能力, {studentId, pageNo:1, pageSize:100});
     let cxjsysjnlChart = {
         titleList:[
             "时间", "类型", "课题名称", "指导老师", "是否跨学科"

src/biz/duinei/ztbx.ts

@@ -11,6 +11,7 @@ import { keyValuePackage, onceYBarChartPackage } from "../../dataPackage/inFront
 import { getKeyValueOut, getOnceYBarChartOut } from "../../dataPackage/out";
 import { systemConfig } from "../../config/serverConfig";
 import { tysjyTableData } from "../../data/table/duiwai";
+import { get } from "../../util/request";
 
 const ImgUrl = "img/对内/整体办学/";
 
@@ -21,41 +22,71 @@ export async function getData(req, res) {
     let excelData = ztbxTableData();
     let 统一excelData = tysjyTableData();
     
-    // let tqxxData = await getReqApiData(ztbxNENUM.天气信息, {});
-    // let tqxx = {
-    //   wendu: "14~19℃",
-    //   fengxiang: "西北311.0",
-    //   fengsu: "风速3级",
-    //   wrcd: "中度污染",
-    //   wrzb: 160,
-    //   jkts: "儿童、老年人呼吸系统疾病患者避免高强度的户外锻炼，一般人群减少户外运动。"
-    // };
-    // ret["tqxx"] = {title:"天气预报&空气质量", dataList:tqxxData};
-
-    //学生=================
+    let tqxxData:any = await get(`https://wis.qq.com/weather/common?source=pc&weather_type=observe|forecast_1h|forecast_24h|index|alarm|limit|tips|rise&province=上海&city=上海&county=浦东新区`, {}, {});
+    let tqxx = {
+      img:"",
+      wendu: "",
+      fengxiang: "",
+      fengsu: "",
+      wrcd: "中度污染",
+      wrzb: 160,
+      jkts: "儿童、老年人呼吸系统疾病患者避免高强度的户外锻炼，一般人群减少户外运动。"
+    };
+    if (tqxxData.data.observe) {
+      let observe = tqxxData.data.observe;
+      if (observe.weather_url) tqxx.img = observe.weather_url;
+      if (observe.degree) tqxx.wendu = observe.degree + "℃";
+      if (observe.wind_direction_name) tqxx.fengxiang = observe.wind_direction_name;
+      if (observe.wind_power) tqxx.fengsu = "风力等级" + observe.wind_power;
+    }
+    if (tqxxData.data.index.airconditioner) {
+      let airconditioner = tqxxData.data.index.airconditioner;
+      if (airconditioner.detail) tqxx.jkts = airconditioner.detail;
+    }
+    ret["tqxx"] = {title:"天气预报&空气质量", dataList:tqxx};
+
+    //今日出勤-学生=================
+    let xsbjData = await getReqApiData(ztbxNENUM.学生人数班级数量, {})
+    let bjsl = xsbjData.classNum;
+    let xsrsData = xsbjData.studentNum;
+    let xsrs = 0;
+    if (xsrsData) {
+      xsrsData.forEach( info=> {
+        let {code, name, value} = info;
+        xsrs += value;
+      })
+    }
+
     let startTime = moment(NowTime).format("YYYY-MM-DD 00:00:00");
-    let endTime = moment(NowTime).format("YYYY-MM-DD HH:mm:ss");
+    let endTime = moment(NowTime).format("YYYY-MM-DD 23:59:59");
     // {startDate:startTime, endDate:endTime}
-    let xscqData = await getReqApiData(ztbxNENUM.学生请假统计, {}, "POST");
+    // let xscqData = await getReqApiData(ztbxNENUM.学生请假统计, {}, "POST");
+    let xscqData事假 = await getReqApiData(ztbxNENUM.学生病假人数趋势, {type:1, beginDate:startTime, endDate:endTime});
+    let xscqData病假 = await getReqApiData(ztbxNENUM.学生病假人数趋势, {type:2, beginDate:startTime, endDate:endTime});
+    let xscqData其他 = await getReqApiData(ztbxNENUM.学生病假人数趋势, {type:3, beginDate:startTime, endDate:endTime});
+
+    let qjrs = parseInt(xscqData事假.data.list[0].num) + parseInt(xscqData病假.data.list[0].num) + parseInt(xscqData其他.data.list[0].num);
+    let xscql = 0;
+    if (xsrs && qjrs) xscql = Math.floor((xsrs - qjrs) / xsrs * 100) / 100;
     let jrcq = {
-      应到总人数:10,
-      请假人数:10,
-      出勤率:0.99,
+      应到总人数:xsrs,
+      请假人数:qjrs,
+      出勤率:xscql,
     };
     ret["jrcq"] = {title:"今日出勤", dataList:jrcq};
 
     let qjqk = [
       {
-        key:"感冒",
-        value:"5"
+        key:"事假",
+        value:xscqData事假.data.list[0].num
       },
       {
-        key:"流行病",
-        value:"17"
+        key:"病假",
+        value:xscqData病假.data.list[0].num
       },
       {
-        key:"事假",
-        value:"3"
+        key:"其他",
+        value:xscqData其他.data.list[0].num
       },
     ];
     ret["qjqk"] = {title:"请假情况", dataList:qjqk};
@@ -228,15 +259,6 @@ export async function getData(req, res) {
     ];
     ret["yysjc"] = {title:"饮用水检测", dataList:yysjc};
 
-    let xsbjData = await getReqApiData(ztbxNENUM.学生人数班级数量, {})
-    let bjsl = xsbjData.classNum;
-    let xsrsData = xsbjData.studentNum;
-    let xsrs = 0;
-    xsrsData.forEach( info=> {
-        let {code, name, value} = info;
-        xsrs += value;
-    })
-
     let baseDate = [
         {
             key:"学生人数",

src/biz/duiwai/spfxtc.ts

@@ -2,7 +2,7 @@
  * 水平分析弹窗
  */
 
-import { getReqApiData } from "../../data/interface/url";
+import { getReqApiData, postReqApiData } from "../../data/interface/url";
 import { spfxWENUM } from "../../config/interficeEnum";
 
 const ImgUrl = "img/对外/水平分析弹窗/";
@@ -378,7 +378,18 @@ export async function getData(req, res) {
 		},
 	];
     ret["slfx"] = {title:"视力分析", dataList:slfx};
-
+	
+    let baseData = await getReqApiData(spfxWENUM.获取学生列表, {studentId});
+    let schoolId = "559254528fc7421d9a4e25aaa1caaad3";
+    let classId = "";
+	if (baseData) {
+        if (baseData.length) {
+            let item = baseData[0] || {};
+            classId = item.classId;
+        }
+    }
+    let maximumcore = await postReqApiData(spfxWENUM.行为表现, {personId:studentId, schoolId, classId, platformCode:"999999"});
+	
     let xgfx = {
 		"evaluateTotalScore":"0",
 		"ageScore":"98",

src/biz/duiwai/xsdatc.ts

 /**
- * 学生档案弹窗
+ * 学生成长档案弹窗
  */
 
 import { getReqApiData } from "../../data/interface/url";
@@ -11,9 +11,11 @@ export async function getData(req, res) {
     let ret:any = {};
     // let {studentId, grade} = req.body;
     let studentId = req.body.studentId || "733f97c4425a11ee98a202031519086a";
-    let grade = req.body.grade || "六年级下";
+    // let grade = req.body.grade || "六年级下";
+    let grade = req.body.grade || 6;
 
     //成长相册 todo
+    // let czxcData = await getReqApiData(xsdaWENUM.学生照片, {studentId, gradeId:grade, type:2}); //type:类型（1：3D模型，2：照片）
     let czxcData = await getReqApiData(xsdaWENUM.学生照片, {studentId, grade, type:2}); //type:类型（1：3D模型，2：照片）
     ret["czxc"] = {title:"成长相册", dataList:czxcData || ""};
     
@@ -163,6 +165,7 @@ export async function getData(req, res) {
         }
     ];
     ret["zhsp"] = {title:"综合水平", dataList:zhsp};
+    let hqxsgkcj = await getReqApiData(xsdaWENUM.获取学生各科成绩, {studentId});
     let xkcjfb = [
 		{
 			"name":"语文",
@@ -333,6 +336,59 @@ export async function getData(req, res) {
     ];
     ret['kccy'] = {title:"课程参与", dataList:kccy};
 
+
+
+
+// ------------------------------------------------------------------------------
+
+    let jxtjData = await getReqApiData(xsdaWENUM.奖项统计, {pageNo:1, pageSize:100, gradeId:grade, studentId});
+    let jxtjCount = {gjj:0, sj:0, qj:0, zj:0, xj:0};
+    switch (jxtjData.list.awardLevel) {
+        case "国家级":
+            jxtjCount.gjj++;
+        break;
+        case "市级":
+            jxtjCount.sj++;
+        break;
+        case "区级":
+            jxtjCount.qj++;
+        break;
+        case "校级":
+            jxtjCount.xj++;
+        break;
+    }
+    let jxtj = [
+        {
+            key:"国家级奖项",
+            value:jxtjCount.gjj
+        },
+        {
+            key:"市级奖项",
+            value:jxtjCount.sj
+        },
+        {
+            key:"区级奖项",
+            value:jxtjCount.qj
+        },
+        {
+            key:"校级奖项",
+            value:jxtjCount.xj
+        },
+    ]
+    ret["jxtj"] = {title:"奖项统计", dataList:jxtj};
+
+
+
+
+
+
+// ----------------------------------------------------------------------------------
+
+
+
+
+
+    
     let hjcgData = await getReqApiData(xsdaWENUM.奖项统计, {studentId, pageNo:1, pageSize:100});
     // let hjcg = {
     //     gjj:[],

src/config/interficeEnum.ts

@@ -113,7 +113,8 @@ export enum xshxgrWENUM {
     奖项统计 = "/getStuAwards",
     各级各类活动参加 = "/getStuActivity",
     学生日常行为规范 = "/studentDimensionRadar",
-
+    社会实践活动情况 = "/getCountStuActivity",
+    创新精神与实践能力 = "/getStuActivity",
 }
 
 
@@ -128,13 +129,16 @@ export enum xsdaWENUM {
     // 体重成长记录 = "",
     视力记录 = "/getVision",
     学科成绩分布 = "/getStuScore",
+    获取学生各科成绩 = "/getStudentInfoScore",
     奖项统计 = "/getStuAwards",
 }
 
 
 /**水平分析弹窗 */
 export enum spfxWENUM {
+    获取学生列表 = "/getStudentList",
     九加一完成情况 = "/getCountStuTenComplete",
+    行为表现 = "/studentDimensionRadar",
 
 }
 
@@ -157,6 +161,7 @@ export enum ztbxNENUM {
     日程信息 = "/getCalendar",
     参加考勤人员名单 = "/getTeacherClockingNameList",
     教师当天请假人数 = "/getTeacherLeave",
+
 }
 
 
@@ -249,6 +254,8 @@ export enum xshxNENUM {
     学生九个一完成情况 = "/getCountStuTenComplete",
     查询各年级视力不良率 = "/getVisionDefect",
     查询年级各班级视力不良率 = "/getGradeClassVisionDefect",
+    团队德育活动 = "/getSchActivity",
+    年级特色活动 = "/getStuActivity",
 }
 
 

src/data/interface/url.ts

@@ -36,10 +36,10 @@ export async function getReqApiData(url:string, body:object, mothod?, dataNotInL
     //todo 没有找到对应接口，数据直接返回0
     if (!url) return 0;
 
-    let res:any = await get(`${systemConfig.url}${url}`, query, headers );
+    let res:any = await get(`${systemConfig.url}${url}`, query, headers);
 
     if (dataNotInList) return res[dataNotInList];
-    if (res.page) return res.page; 
+    if (res.page) return res.page;
     if (res.list) return res.list;
     // else return res.body;
     else return res;
@@ -68,13 +68,14 @@ export async function postReqApiData(url:string, body:object) {
 
     let query = { accessToken:token };
 
-    let res:any = await postForm(`${systemConfig.url}${url}?accessToken=${token}`, query, body,  headers );
-    // let res:any = await post(`${systemConfig.url}${url}?accessToken=${token}`, query, body,  headers );
+    // let res:any = await postForm(`${systemConfig.url}${url}?accessToken=${token}`, query, body,  headers );
+    let res:any = await post(`${systemConfig.url}${url}?accessToken=${token}`, query, body,  headers );
     
     if (res.retCode != "000000") {
         /**更新token */
         await updateToken();
-        res = await postForm(`${systemConfig.url}${url}?accessToken=${token}`, query, body,  headers );
+        // res = await postForm(`${systemConfig.url}${url}?accessToken=${token}`, query, body,  headers );
+        res = await post(`${systemConfig.url}${url}?accessToken=${token}`, query, body,  headers );
     }
 
     return res;
@@ -87,9 +88,10 @@ export async function postReqApiData(url:string, body:object) {
  */
 export async function updateToken() {
     let timeStamp = new Date().valueOf();
-    let appId = 'F3D05D1E729B366ABDEFBD5380815DA7';
-    // let appId = 'AD0CB88FD07BAB073EFEEE64ECD17B4D';
-    let appKey = '376f898f9ba7432f90c640d5485c194c';
+    // let appId = 'F3D05D1E729B366ABDEFBD5380815DA7';
+    // let appKey = '376f898f9ba7432f90c640d5485c194c';
+    let appId = 'AD0CB88FD07BAB073EFEEE64ECD17B4D';
+    let appKey = '03dd86de75dc41909158c4b15743a91f';
     let data = `${appId}${appKey}${timeStamp}`;
 
     const AppKey = systemConfig.appKey;
@@ -134,8 +136,10 @@ function hmacSHA1(data, key) {
  */
 export async function getBase64Str() {
     let timeStamp = new Date().valueOf();
-    let appId = 'F3D05D1E729B366ABDEFBD5380815DA7';
-    let appKey = '376f898f9ba7432f90c640d5485c194c';
+    // let appId = 'F3D05D1E729B366ABDEFBD5380815DA7';
+    // let appKey = '376f898f9ba7432f90c640d5485c194c';
+    let appId = 'AD0CB88FD07BAB073EFEEE64ECD17B4D';
+    let appKey = '03dd86de75dc41909158c4b15743a91f';
     let data = `${appId}${appKey}${timeStamp}`;
 
     const AppKey = systemConfig.appKey;
@@ -152,9 +156,10 @@ export async function getBase64Str() {
  */
 export async function getAppToken() {
     let timeStamp = new Date().valueOf();
-    let appId = 'F3D05D1E729B366ABDEFBD5380815DA7';
-    // let appId = 'AD0CB88FD07BAB073EFEEE64ECD17B4D';
-    let appKey = '376f898f9ba7432f90c640d5485c194c';
+    // let appId = 'F3D05D1E729B366ABDEFBD5380815DA7';
+    // let appKey = '376f898f9ba7432f90c640d5485c194c';
+    let appId = 'AD0CB88FD07BAB073EFEEE64ECD17B4D';
+    let appKey = '03dd86de75dc41909158c4b15743a91f';
     let data = `${appId}${appKey}${timeStamp}`;
 
     const AppKey = systemConfig.appKey;

src/main.ts

 import { httpServer } from "./net/http_server";
 import { initConfig, systemConfig } from "./config/serverConfig";
 import { initData } from "./data/dataInit";
-import { getAppToken } from "./data/interface/url";
+import { getAppToken, getReqApiData } from "./data/interface/url";
+import { xshxNENUM } from "./config/interficeEnum";
 
 
 async function lanuch() {
@@ -12,6 +13,10 @@ async function lanuch() {
     httpServer.createServer( systemConfig.port );
     console.log('This indicates that the server is started successfully.');
     await getAppToken();
+    
+    // let xsgrData = await getReqApiData(xshxNENUM.获取学生信息, {studentName:"孙聿宁"});
+    // let xsgrData = await getReqApiData(xshxNENUM.获取学生信息, {});
+    // console.log(xsgrData[0].studentId);
 }
 
 lanuch();

src/util/request.ts

@@ -33,7 +33,7 @@ export function post(url, query, reqBody, headers) {
                 resolve(body);
             }
             else {
-                // reject(error)
+                reject(error)
             }
         });
     })