Ver Fonte

修改数据库初始化脚本顺序;增加获取签到表图片数量的API接口

luoshi há 6 anos atrás
pai
commit
37296fd65b

+ 24 - 0
stmms-web/src/main/java/cn/com/qmth/stmms/api/controller/ExamStudentController.java

@@ -93,6 +93,30 @@ public class ExamStudentController extends BaseApiController {
         return array;
     }
 
+    @AuthValidate("adminUser")
+    @RequestMapping(value = "/package/count/{examId}", method = RequestMethod.GET)
+    @ResponseBody
+    public JSONArray getPackageCount(HttpServletRequest request, HttpServletResponse response,
+            @PathVariable Integer examId, @RequestParam(required = false) Boolean upload) {
+        User user = RequestUtils.getApiUser(request);
+        JSONArray array = new JSONArray();
+        Exam exam = examService.findById(examId);
+        if (exam != null && exam.getSchoolId().equals(user.getSchoolId())) {
+            List<ExamPackage> list = upload != null ? packageService.list(examId, upload) : packageService.list(examId);
+            if (list != null) {
+                for (ExamPackage ep : list) {
+                    JSONObject obj = new JSONObject();
+                    obj.accumulate("code", ep.getCode());
+                    obj.accumulate("picCount", ep.getPicCount());
+                    array.add(obj);
+                }
+            }
+        } else {
+            throw ApiException.EXAM_NOT_ACCESSIBLED;
+        }
+        return array;
+    }
+
     @AuthValidate("adminUser")
     @RequestMapping(value = "/package/{examId}", method = RequestMethod.POST)
     @ResponseBody

+ 15 - 18
stmms-web/src/main/webapp/script/stmms_gx.sql

@@ -68,24 +68,6 @@ CREATE TABLE `b_school` (
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='学校表';
 
 
-
-# Dump of table b_school_user
-# ------------------------------------------------------------
-
-DROP TABLE IF EXISTS `b_school_user`;
-
-CREATE TABLE `b_school_user` (
-  `school_id` int(11) NOT NULL COMMENT '学校ID',
-  `user_id` int(11) NOT NULL COMMENT '用户ID',
-  PRIMARY KEY (`user_id`,`school_id`),
-  KEY `FK_f5a2c07727764f069e375c2d196` (`school_id`),
-  KEY `FK_30a064a4d1ff4c4d883750afe5e` (`user_id`),
-  CONSTRAINT `FK_30a064a4d1ff4c4d883750afe5e` FOREIGN KEY (`user_id`) REFERENCES `b_user` (`id`),
-  CONSTRAINT `FK_f5a2c07727764f069e375c2d196` FOREIGN KEY (`school_id`) REFERENCES `b_school` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='学习关联用户表';
-
-
-
 # Dump of table b_tag
 # ------------------------------------------------------------
 
@@ -123,6 +105,21 @@ CREATE TABLE `b_user` (
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='用户表';
 
 
+# Dump of table b_school_user
+# ------------------------------------------------------------
+
+DROP TABLE IF EXISTS `b_school_user`;
+
+CREATE TABLE `b_school_user` (
+  `school_id` int(11) NOT NULL COMMENT '学校ID',
+  `user_id` int(11) NOT NULL COMMENT '用户ID',
+  PRIMARY KEY (`user_id`,`school_id`),
+  KEY `FK_f5a2c07727764f069e375c2d196` (`school_id`),
+  KEY `FK_30a064a4d1ff4c4d883750afe5e` (`user_id`),
+  CONSTRAINT `FK_30a064a4d1ff4c4d883750afe5e` FOREIGN KEY (`user_id`) REFERENCES `b_user` (`id`),
+  CONSTRAINT `FK_f5a2c07727764f069e375c2d196` FOREIGN KEY (`school_id`) REFERENCES `b_school` (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='学习关联用户表';
+
 
 # Dump of table eb_exam
 # ------------------------------------------------------------