优化

WebRoot/ymfz/routes/std/reg/std_reg.js

@@ -28,13 +28,13 @@ app.controller("StdRegCtrl", [
             $scope.artArr = response.entity.art_science_status.split(",");
             for (const art of $scope.artArr) {
               for (const st of $rootScope.StdCategoryArray) {
-                if (art == st.dict_value) {
+                if (art === st.dict_value) {
                   $scope.YmStdCategoryArray.push(st);
                   break;
                 }
               }
             }
-            if ($scope.YmStdCategoryArray.length == 1) {
+            if ($scope.YmStdCategoryArray.length === 1) {
               $scope.StdReg.std_param3 =
                 $scope.YmStdCategoryArray[0].dict_value;
             }
@@ -49,9 +49,9 @@ app.controller("StdRegCtrl", [
 
     if ($rootScope.ArtStdReg !== undefined) {
       $scope.StdReg = angular.extend({}, $rootScope.ArtStdReg);
-      if ($scope.StdReg.reg_status == "IdCard") {
+      if ($scope.StdReg.reg_status === "IdCard") {
         $scope.curStep = "NoCrownPhotoWarning";
-      } else if ($scope.StdReg.reg_status == "NoCrownPhoto") {
+      } else if ($scope.StdReg.reg_status === "NoCrownPhoto") {
         $scope.curStep = "StdExtendInfo";
         $scope.findProvinceArtScience();
       }
@@ -120,32 +120,32 @@ app.controller("StdRegCtrl", [
      * 选择生源地
      */
     $scope.chooseProvince = function (p) {
-      if (p.reg_status == "InActive") {
+      if (p.reg_status === "InActive") {
         var msg = "未开放【" + p.province_name + "】考生注册！";
-        if (p.reg_fetch_param != undefined) msg = p.reg_fetch_param;
+        if (p.reg_fetch_param !== undefined) msg = p.reg_fetch_param;
         $.alert(msg);
         return;
       }
       $scope.currentProvince = p;
       $scope.StdReg.std_province = p.province_id;
       $scope.StdReg.province_name = p.province_name;
-      if (p.province_id + "" == "90") {
+      if (p.province_id + "" === "90") {
         // 外国，护照
         $scope.curStep = "PassportWarning";
         $scope.StdReg.cert_type = "Passport";
-      } else if (p.province_id + "" == "71") {
+      } else if (p.province_id + "" === "71") {
         // 台湾，台湾居民往来大陆通行证,澳门，香港 港澳居民来往内地通行证
         $scope.curStep = "IdCard71Warning";
         $scope.StdReg.cert_type = "TaiWanPass";
       } else if (
-        p.province_id + "" == "80" ||
-        p.province_id + "" == "81" ||
-        p.province_id + "" == "82"
+        p.province_id + "" === "80" ||
+        p.province_id + "" === "81" ||
+        p.province_id + "" === "82"
       ) {
         // 澳门，香港 港澳居民来往内地通行证
         $scope.curStep = "HongKongMacaoPass";
         $scope.StdReg.cert_type = "TaiWanPass";
-      } else if (p.ksh_status == "Active") {
+      } else if (p.ksh_status === "Active") {
         // 必须有高考报名号
         $scope.curStep = "ExamIdWarning";
       } else {
@@ -159,8 +159,8 @@ app.controller("StdRegCtrl", [
     $scope.checkExamId = function () {
       $scope.StdReg.exam_id = $.trim($scope.StdReg.exam_id);
       if (
-        $scope.StdReg.exam_id == undefined ||
-        $scope.StdReg.exam_id.length == 0
+        $scope.StdReg.exam_id === undefined ||
+        $scope.StdReg.exam_id.length === 0
       ) {
         $.alert("高考报名号必须填写！");
         return false;
@@ -313,7 +313,7 @@ app.controller("StdRegCtrl", [
         $scope.StdReg.link_mobile &&
         $scope.StdReg.std_mobile === $scope.StdReg.link_mobile
       ) {
-        $.alert("紧急联系电话与本人手机号码不能相同！");
+        $.alert("紧急联系人电话与本人手机号码不能相同！");
         return false;
       }
 
@@ -473,7 +473,7 @@ app.controller("StdRegCtrl", [
           $scope.showLiveCheckLoading = false;
           //   location.reload();
           $.hideLoading();
-          if (res && res.result == 1) {
+          if (res && res.result === 1) {
             $scope.curStep = "StdExtendInfo";
           }
         }

sql/fz_update.sql

@@ -147,3 +147,56 @@ CREATE TABLE `ly_room_model_photo`
   CHARACTER SET = utf8
   COLLATE = utf8_general_ci COMMENT = '模特拍照表'
   ROW_FORMAT = Dynamic;
+
+
+
+-- 2024-11-08 活体识别相关表
+INSERT INTO `cf_enrol_param`(`PARAM_TYPE`, `PARAM_NAME`, `PARAM_VALUE`, `PARAM_NOTE`) VALUES ('Enrol', 'TencentLiveInfoType', '0', '活体识别获取结果类型');
+INSERT INTO `cf_enrol_param`(`PARAM_TYPE`, `PARAM_NAME`, `PARAM_VALUE`, `PARAM_NOTE`) VALUES ('Enrol', 'TencentLiveRedirectUrl', 'https://10047.qmth.com.cn/bk/wechat/wechat.jsp', '跳转地址');
+INSERT INTO `cf_enrol_param`(`PARAM_TYPE`, `PARAM_NAME`, `PARAM_VALUE`, `PARAM_NOTE`) VALUES ('Enrol', 'TencentLiveRuleId', '1', '活体识别业务唯一标识');
+INSERT INTO `cf_enrol_param`(`PARAM_TYPE`, `PARAM_NAME`, `PARAM_VALUE`, `PARAM_NOTE`) VALUES ('Enrol', 'TencentLiveSecretId', 'AKIDEJCwMdidMr8C7pYFpDTbcgYSSXP8fyAB', '活体识别ID');
+INSERT INTO `cf_enrol_param`(`PARAM_TYPE`, `PARAM_NAME`, `PARAM_VALUE`, `PARAM_NOTE`) VALUES ('Enrol', 'TencentLiveSecretKey', 'ymTyLWcXEhzBD6rfbSDoIZhjkgeV9f4J', '活体识别秘钥');
+
+
+CREATE TABLE `tx_liveness_detail`
+(
+    `id`               int(0)                                                  NOT NULL AUTO_INCREMENT COMMENT '主键',
+    `biz_token`        varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT 'token',
+    `req_time`         bigint(0)                                               NULL DEFAULT NULL COMMENT '请求时间',
+    `seq`              varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '请求的唯一标记',
+    `id_card`          varchar(20) CHARACTER SET utf8 COLLATE utf8_general_ci  NULL DEFAULT NULL COMMENT '身份证号',
+    `name`             varchar(80) CHARACTER SET utf8 COLLATE utf8_general_ci  NULL DEFAULT NULL COMMENT '姓名',
+    `sim`              varchar(10) CHARACTER SET utf8 COLLATE utf8_general_ci  NULL DEFAULT NULL COMMENT '相似度',
+    `need_charge`      bit(1)                                                  NULL DEFAULT NULL COMMENT '是否需要收费0：不收费，1：收费',
+    `error_code`       int(0)                                                  NULL DEFAULT NULL COMMENT '本次活体一比一最终结果',
+    `error_msg`        varchar(500) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '本次活体一比一最终结果描述',
+    `live_status`      int(0)                                                  NULL DEFAULT NULL COMMENT '本次活体结果',
+    `live_msg`         varchar(500) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '本次活体结果描述',
+    `compare_status`   int(0)                                                  NULL DEFAULT NULL COMMENT '本次一比一结果',
+    `compare_msg`      varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci  NULL DEFAULT NULL COMMENT '本次一比一结果描述',
+    `compare_lib_type` varchar(20) CHARACTER SET utf8 COLLATE utf8_general_ci  NULL DEFAULT NULL COMMENT '比对库源类型',
+    `liveness_mode`    int(0)                                                  NULL DEFAULT NULL COMMENT '活体检测类型',
+    PRIMARY KEY (`id`) USING BTREE
+) COMMENT = '活体识别对账流水记录表';
+
+CREATE TABLE `tx_std_live_log`
+(
+    `id`          int(0)                                                  NOT NULL AUTO_INCREMENT COMMENT '主键',
+    `std_id`      int(0)                                                  NULL DEFAULT NULL COMMENT '考生ID',
+    `biz_token`   varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '腾讯活体识别token',
+    `create_time` datetime(0)                                             NULL DEFAULT NULL COMMENT '创建时间',
+    `pull_flag`   varchar(4) CHARACTER SET utf8 COLLATE utf8_general_ci   NULL DEFAULT NULL COMMENT '是否拉取标志：0:未拉取，1：已成功拉取',
+    PRIMARY KEY (`id`) USING BTREE
+) COMMENT = '考生请求token记录表';
+
+CREATE TABLE `tx_std_material_log`
+(
+    `id`          int(0)                                          NOT NULL AUTO_INCREMENT,
+    `std_id`      int(0)                                          NULL DEFAULT NULL COMMENT '考生ID',
+    `std_photo`   text CHARACTER SET utf8 COLLATE utf8_general_ci NULL COMMENT '考生base64图片',
+    `create_time` datetime(0)                                     NULL DEFAULT NULL COMMENT '创建时间',
+    PRIMARY KEY (`id`) USING BTREE
+) COMMENT = '考生失败材料记录表';
+
+-- 附中成绩查询
+INSERT INTO `frame_res`(`RES_ID`, `RES_NAME`, `RES_ALIAS`, `RES_URL`, `RES_PID`, `RES_LEVEL`, `RES_TYPE`, `RES_CSS`, `RES_STATUS`, `RES_ORDER`, `RES_DESC`) VALUES (605001, '成绩查询', '附中成绩查询', '/art/score/ymfz', 600000, 2, 'Page', 'icon-directions	', 'Active', 605001, NULL);

sql/update.sql

@@ -90,4 +90,31 @@ CREATE TABLE `ly_room_model_photo`
 -- 2024-11-08
 ALTER TABLE `tx_std_live_log`
     ADD INDEX `IDX_01`(`biz_token`),
-    ADD INDEX `IDX_02`(`std_id`);
+    ADD INDEX `IDX_02`(`std_id`);
+
+-- 考生报考详情报表
+INSERT INTO `frame_report`(`REPORT_NAME`, `REPORT_ALIAS`, `RES_ID`, `REPORT_SQL`, `REPORT_PARAM`, `REPORT_PARAM_FLAG`, `REPORT_SUFFIX`, `INDEX_FLAG`, `UPDATE_TIME`, `MAX_SIZE`, `CURRENT_SIZE`) VALUES ('StdRegEnrolReport', '考生报考详情导出', NULL, 'SELECT\r\n	r.std_name,\r\n	r.cert_id,\r\n	r.std_sex,\r\n	r.exam_id,\r\n	r.std_mobile,\r\n	case when e.pay_status = \'Active\' then \'已缴费\' else \'未缴费\' end pay_status,\r\n	e.aspect_name,\r\n	ep.province_name \r\nFROM\r\n	std_enrol e,\r\n	std_reg r\r\n	LEFT JOIN cf_enrol_province ep ON ep.province_id = r.std_province \r\nWHERE\r\n	e.std_id = r.std_id \r\n	AND ( e.aspect_name =?  OR 1 =?) \r\n	AND ( e.pay_status =?  OR 1 =?) \r\n	AND ( r.std_sex =?  OR 1 =?) \r\n	AND ( r.province_flag =?  OR 1 =?)', 'aspect_name?\r\npay_status?\r\nstd_sex?\r\nprovince_flag?', NULL, 'LocalDateTime', 'Active', NULL, NULL, NULL);
+INSERT INTO `frame_report_detail`(`REPORT_NAME`, `FIELD_ORDER`, `FIELD_NAME`, `FIELD_LENGTH`, `FIELD_TEXT`, `FIELD_DATE_TYPE`, `FIELD_STATUS`, `DICT_NAME`) VALUES ('StdRegEnrolReport', 1, 'std_name', 20, '考生姓名', 'java.lang.String', 'Active', NULL);
+INSERT INTO `frame_report_detail`(`REPORT_NAME`, `FIELD_ORDER`, `FIELD_NAME`, `FIELD_LENGTH`, `FIELD_TEXT`, `FIELD_DATE_TYPE`, `FIELD_STATUS`, `DICT_NAME`) VALUES ('StdRegEnrolReport', 2, 'cert_id', 20, '证件号码', 'java.lang.String', 'Active', NULL);
+INSERT INTO `frame_report_detail`(`REPORT_NAME`, `FIELD_ORDER`, `FIELD_NAME`, `FIELD_LENGTH`, `FIELD_TEXT`, `FIELD_DATE_TYPE`, `FIELD_STATUS`, `DICT_NAME`) VALUES ('StdRegEnrolReport', 3, 'exam_id', 20, '高考报名号', 'java.lang.String', 'Active', NULL);
+INSERT INTO `frame_report_detail`(`REPORT_NAME`, `FIELD_ORDER`, `FIELD_NAME`, `FIELD_LENGTH`, `FIELD_TEXT`, `FIELD_DATE_TYPE`, `FIELD_STATUS`, `DICT_NAME`) VALUES ('StdRegEnrolReport', 4, 'std_sex', 10, '性别', 'java.lang.String', 'Active', NULL);
+INSERT INTO `frame_report_detail`(`REPORT_NAME`, `FIELD_ORDER`, `FIELD_NAME`, `FIELD_LENGTH`, `FIELD_TEXT`, `FIELD_DATE_TYPE`, `FIELD_STATUS`, `DICT_NAME`) VALUES ('StdRegEnrolReport', 5, 'std_mobile', 20, '联系电话', 'java.lang.String', 'Active', NULL);
+INSERT INTO `frame_report_detail`(`REPORT_NAME`, `FIELD_ORDER`, `FIELD_NAME`, `FIELD_LENGTH`, `FIELD_TEXT`, `FIELD_DATE_TYPE`, `FIELD_STATUS`, `DICT_NAME`) VALUES ('StdRegEnrolReport', 6, 'province_name', 20, '高考所在省份', 'java.lang.String', 'Active', NULL);
+INSERT INTO `frame_report_detail`(`REPORT_NAME`, `FIELD_ORDER`, `FIELD_NAME`, `FIELD_LENGTH`, `FIELD_TEXT`, `FIELD_DATE_TYPE`, `FIELD_STATUS`, `DICT_NAME`) VALUES ('StdRegEnrolReport', 7, 'aspect_name', 20, '报考专业', 'java.lang.String', 'Active', NULL);
+INSERT INTO `frame_report_detail`(`REPORT_NAME`, `FIELD_ORDER`, `FIELD_NAME`, `FIELD_LENGTH`, `FIELD_TEXT`, `FIELD_DATE_TYPE`, `FIELD_STATUS`, `DICT_NAME`) VALUES ('StdRegEnrolReport', 8, 'pay_status', 10, '是否缴费', 'java.lang.String', 'Active', NULL);
+
+-- 准考证下载考生报表
+INSERT INTO `frame_report`(`REPORT_NAME`, `REPORT_ALIAS`, `RES_ID`, `REPORT_SQL`, `REPORT_PARAM`, `REPORT_PARAM_FLAG`, `REPORT_SUFFIX`, `INDEX_FLAG`, `UPDATE_TIME`, `MAX_SIZE`, `CURRENT_SIZE`) VALUES ('TicketStdDownloadReport', '准考证下载考生导出', NULL, 'select r.std_name,r.cert_id,r.exam_id,r.std_sex,r.std_mobile from std_reg r,std_enrol e\r\n where r.std_id=e.std_id and e.pay_status=\'Active\'\r\n  and (r.province_flag = ? or 1=?)\r\n	and r.std_id in (select distinct std_id from std_log where log_type=\'DownloadTicket\')', 'province_flag?', NULL, 'LocalDateTime', 'Active', NULL, NULL, NULL);
+INSERT INTO `frame_report_detail`(`REPORT_NAME`, `FIELD_ORDER`, `FIELD_NAME`, `FIELD_LENGTH`, `FIELD_TEXT`, `FIELD_DATE_TYPE`, `FIELD_STATUS`, `DICT_NAME`) VALUES ('TicketStdDownloadReport', 1, 'std_name', 20, '考生姓名', 'java.lang.String', 'Active', NULL);
+INSERT INTO `frame_report_detail`(`REPORT_NAME`, `FIELD_ORDER`, `FIELD_NAME`, `FIELD_LENGTH`, `FIELD_TEXT`, `FIELD_DATE_TYPE`, `FIELD_STATUS`, `DICT_NAME`) VALUES ('TicketStdDownloadReport', 2, 'cert_id', 20, '证件号码', 'java.lang.String', 'Active', NULL);
+INSERT INTO `frame_report_detail`(`REPORT_NAME`, `FIELD_ORDER`, `FIELD_NAME`, `FIELD_LENGTH`, `FIELD_TEXT`, `FIELD_DATE_TYPE`, `FIELD_STATUS`, `DICT_NAME`) VALUES ('TicketStdDownloadReport', 3, 'exam_id', 20, '高考报名号', 'java.lang.String', 'Active', NULL);
+INSERT INTO `frame_report_detail`(`REPORT_NAME`, `FIELD_ORDER`, `FIELD_NAME`, `FIELD_LENGTH`, `FIELD_TEXT`, `FIELD_DATE_TYPE`, `FIELD_STATUS`, `DICT_NAME`) VALUES ('TicketStdDownloadReport', 4, 'std_sex', 10, '性别', 'java.lang.String', 'Active', NULL);
+INSERT INTO `frame_report_detail`(`REPORT_NAME`, `FIELD_ORDER`, `FIELD_NAME`, `FIELD_LENGTH`, `FIELD_TEXT`, `FIELD_DATE_TYPE`, `FIELD_STATUS`, `DICT_NAME`) VALUES ('TicketStdDownloadReport', 5, 'std_mobile', 20, '联系电话', 'java.lang.String', 'Active', NULL);
+
+-- 准考证未下载考生报表
+INSERT INTO `frame_report`(`REPORT_NAME`, `REPORT_ALIAS`, `RES_ID`, `REPORT_SQL`, `REPORT_PARAM`, `REPORT_PARAM_FLAG`, `REPORT_SUFFIX`, `INDEX_FLAG`, `UPDATE_TIME`, `MAX_SIZE`, `CURRENT_SIZE`) VALUES ('TicketStdNotDownloadReport', '准考证未下载考生导出', NULL, 'select r.std_name,r.cert_id,r.exam_id,r.std_sex,r.std_mobile from std_reg r,std_enrol e\r\n where r.std_id=e.std_id and e.pay_status=\'Active\'\r\n  and (r.province_flag = ? or 1=?)\r\n	and r.std_id not in (select distinct std_id from std_log where log_type=\'DownloadTicket\')', 'province_flag?', NULL, 'LocalDateTime', 'Active', NULL, NULL, NULL);
+INSERT INTO `frame_report_detail`(`REPORT_NAME`, `FIELD_ORDER`, `FIELD_NAME`, `FIELD_LENGTH`, `FIELD_TEXT`, `FIELD_DATE_TYPE`, `FIELD_STATUS`, `DICT_NAME`) VALUES ('TicketStdNotDownloadReport', 1, 'std_name', 20, '考生姓名', 'java.lang.String', 'Active', NULL);
+INSERT INTO `frame_report_detail`(`REPORT_NAME`, `FIELD_ORDER`, `FIELD_NAME`, `FIELD_LENGTH`, `FIELD_TEXT`, `FIELD_DATE_TYPE`, `FIELD_STATUS`, `DICT_NAME`) VALUES ('TicketStdNotDownloadReport', 2, 'cert_id', 20, '证件号码', 'java.lang.String', 'Active', NULL);
+INSERT INTO `frame_report_detail`(`REPORT_NAME`, `FIELD_ORDER`, `FIELD_NAME`, `FIELD_LENGTH`, `FIELD_TEXT`, `FIELD_DATE_TYPE`, `FIELD_STATUS`, `DICT_NAME`) VALUES ('TicketStdNotDownloadReport', 3, 'exam_id', 20, '高考报名号', 'java.lang.String', 'Active', NULL);
+INSERT INTO `frame_report_detail`(`REPORT_NAME`, `FIELD_ORDER`, `FIELD_NAME`, `FIELD_LENGTH`, `FIELD_TEXT`, `FIELD_DATE_TYPE`, `FIELD_STATUS`, `DICT_NAME`) VALUES ('TicketStdNotDownloadReport', 4, 'std_sex', 10, '性别', 'java.lang.String', 'Active', NULL);
+INSERT INTO `frame_report_detail`(`REPORT_NAME`, `FIELD_ORDER`, `FIELD_NAME`, `FIELD_LENGTH`, `FIELD_TEXT`, `FIELD_DATE_TYPE`, `FIELD_STATUS`, `DICT_NAME`) VALUES ('TicketStdNotDownloadReport', 5, 'std_mobile', 20, '联系电话', 'java.lang.String', 'Active', NULL);