更新机构是否开启删除分组授权码

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/school/model/School.java

@@ -91,8 +91,8 @@ public class School implements Serializable {
     @Column(name = "sub_code", nullable = true)
     private String subCode;
 
-    @Column(name = "group_delete_code", nullable = true, length = 64)
-    private String groupDeleteCode;
+    @Column(name = "group_delete_check", nullable = false)
+    private boolean groupDeleteCheck;
 
     public Integer getId() {
         return id;
@@ -235,12 +235,12 @@ public class School implements Serializable {
         this.doubleTrack = doubleTrack;
     }
 
-    public String getGroupDeleteCode() {
-        return groupDeleteCode;
+    public boolean isGroupDeleteCheck() {
+        return groupDeleteCheck;
     }
 
-    public void setGroupDeleteCode(String groupDeleteCode) {
-        this.groupDeleteCode = groupDeleteCode;
+    public void setGroupDeleteCheck(boolean groupDeleteCheck) {
+        this.groupDeleteCheck = groupDeleteCheck;
     }
 
 }

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/school/service/impl/SchoolServiceImpl.java

@@ -146,6 +146,7 @@ public class SchoolServiceImpl extends BaseQueryService<School> implements Schoo
                 school.setCity("");
                 school.setCode(s.getCode());
                 school.setEnable(true);
+                school.setGroupDeleteCheck(false);
                 school.setDoubleTrack(false);
             }
             school.setName(s.getName());
@@ -170,6 +171,7 @@ public class SchoolServiceImpl extends BaseQueryService<School> implements Schoo
             school.setName(org.getString("name"));
             school.setLogoUrl(org.getString("logo"));
             school.setEnable(true);
+            school.setGroupDeleteCheck(false);
             school.setDoubleTrack(false);
             schools.add(school);
         }

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/utils/SolarHttpUtil.java

@@ -54,8 +54,10 @@ public class SolarHttpUtil {
     }
 
     /**
-     * @param params headers参数
-     * @param datas  requestParams参数
+     * @param params
+     *            headers参数
+     * @param datas
+     *            requestParams参数
      * @return
      */
     public String httpAction(Map<String, String> params, Map<String, Object> datas) {
@@ -74,8 +76,8 @@ public class SolarHttpUtil {
             conn.setRequestProperty(CONTENT_TYPE, APPLICATION_JSON);
             // 设置鉴权
             long time = System.currentTimeMillis();
-            String signature = SignatureInfo
-                    .build(SignatureType.SECRET, METHOD_POST, uri, time, accessKey, accessSecret);
+            String signature = SignatureInfo.build(SignatureType.SECRET, METHOD_POST, uri, time, accessKey,
+                    accessSecret);
             conn.setRequestProperty(AUTH, signature);
             conn.setRequestProperty("time", String.valueOf(time));
             // ssl
@@ -239,6 +241,7 @@ public class SolarHttpUtil {
                 school.setLogoUrl(org.getString("logo"));
                 school.setEnable(true);
                 school.setDoubleTrack(false);
+                school.setGroupDeleteCheck(false);
                 schools.add(school);
             }
         }
@@ -247,11 +250,13 @@ public class SolarHttpUtil {
     }
 
     public static void main(String[] args) throws Exception {
-        //        SolarHttpUtil orgUtil = new SolarHttpUtil("7bbdc11570bc474dbf50e0d4a5dff328",
-        //                "IOodRvbp2LspJTHOScgB7Yx8MRloMpyl", "https://solar.qmth.com.cn", "/api/open/org/query");
+        // SolarHttpUtil orgUtil = new
+        // SolarHttpUtil("7bbdc11570bc474dbf50e0d4a5dff328",
+        // "IOodRvbp2LspJTHOScgB7Yx8MRloMpyl", "https://solar.qmth.com.cn",
+        // "/api/open/org/query");
         //
-        //        String str = orgUtil.httpAction(null, null);
-        //        System.out.println(str);
+        // String str = orgUtil.httpAction(null, null);
+        // System.out.println(str);
         // int pageNumber = 1;
         // int pageSize = 1;
         //

stmms-web/src/main/java/cn/com/qmth/stmms/admin/exam/MarkGroupController.java

@@ -20,6 +20,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.core.task.AsyncTaskExecutor;
 import org.springframework.stereotype.Controller;
 import org.springframework.transaction.annotation.Transactional;
@@ -119,6 +120,9 @@ public class MarkGroupController extends BaseExamController {
     @Autowired
     private AsyncTaskExecutor taskExecutor;
 
+    @Value("${mark.group.delete}")
+    private String markDeleteCode;
+
     @Logging(menu = "大题管理查询", type = LogType.QUERY)
     @RequestMapping
     public String list(HttpServletRequest request, Model model, @RequestParam(required = false) String subjectCode) {
@@ -403,7 +407,7 @@ public class MarkGroupController extends BaseExamController {
             model.addAttribute("exam", examService.findById(examId));
             Exam exam = examService.findById(examId);
             School school = schoolService.findById(exam.getSchoolId());
-            model.addAttribute("deleteCheck", StringUtils.isNotBlank(school.getGroupDeleteCode()));
+            model.addAttribute("deleteCheck", school.isGroupDeleteCheck());
             return "modules/exam/groupEditFull";
         } else {
             redirectAttributes.addAttribute("subjectCode", subjectCode);
@@ -425,8 +429,8 @@ public class MarkGroupController extends BaseExamController {
         }
         Exam exam = examService.findById(examId);
         School school = schoolService.findById(exam.getSchoolId());
-        if (StringUtils.isNotBlank(school.getGroupDeleteCode()) && group.getLibraryCount() != 0
-                && group.getLeftCount() == 0 && !school.getGroupDeleteCode().equals(deleteCode)) {
+        if (school.isGroupDeleteCheck() && group.getLibraryCount() != 0 && group.getLeftCount() == 0
+                && !markDeleteCode.equals(deleteCode)) {
             addMessage(redirectAttributes, "删除分组授权码不正确");
             redirectAttributes.addAttribute("subjectCode", subjectCode);
             return "redirect:/admin/exam/group";

stmms-web/src/main/java/cn/com/qmth/stmms/admin/school/SchoolController.java

@@ -108,7 +108,7 @@ public class SchoolController extends BaseController {
             previous.setProvince(school.getProvince());
             previous.setCity(school.getCity());
             previous.setAddress(school.getAddress());
-            previous.setGroupDeleteCode(school.getGroupDeleteCode());
+            previous.setGroupDeleteCheck(school.isGroupDeleteCheck());
             previous.setDescription(school.getDescription());
             if (StringUtils.isBlank(previous.getAccessKey()) || StringUtils.isBlank(previous.getAccessSecret())) {
                 previous.resetAccessKeyAndSecret();

stmms-web/src/main/java/cn/com/qmth/stmms/api/controller/CoreController.java

@@ -978,6 +978,7 @@ public class CoreController extends BaseApiController {
             school.setSubCode(subCode);
             school.setEnable(true);
             school.setDoubleTrack(false);
+            school.setGroupDeleteCheck(false);
             school.setProvince(parent.getProvince());
             school.setCity(parent.getCity());
             school.setAddress(parent.getAddress());

stmms-web/src/main/webapp/WEB-INF/application.properties

@@ -19,6 +19,8 @@ exam.problem.type2=\u8bd5\u5377\u6a21\u7cca
 mark.activeExpireMinute=30
 mark.cleanTaskSchedule=0 0/10 6-23 * * ?
 mark.cleanLockSchedule=0 0 3 * * ?
+##\u5220\u9664\u5206\u7ec4\u6388\u6743\u7801
+mark.group.delete=hu8RabY3rd
 ##\u8bc4\u5377\u5458\u63a7\u5236
 marker.showBtnImportAndBtnUpdateImport=false
 marker.forceMode=

stmms-web/src/main/webapp/WEB-INF/views/modules/sys/schoolEdit.jsp

@@ -63,7 +63,7 @@
 	<div class="control-group">
         <label class="control-label">删除分组授权码</label>
         <div class="controls">
-            <input name="groupDeleteCode" value="${school. groupDeleteCode}"/>
+            <input name="groupDeleteCode" type="checkbox" <c:if test="${school.groupDeleteCode}">checked</c:if>/>
         </div>
     </div>
     <div class="control-group">

stmms-web/src/main/webapp/sql/stmms_ft.sql

@@ -26,7 +26,7 @@ CREATE TABLE `b_school`
 	`double_track`  tinyint(1)  NOT NULL COMMENT '双评轨迹',
     `access_key`    varchar(64)  DEFAULT NULL COMMENT 'AccessKey',
     `access_secret` varchar(64)  DEFAULT NULL COMMENT 'AccessSecret',
-    `group_delete_code` varchar(64)  DEFAULT NULL COMMENT '删除分组授权码',
+    `group_delete_check` tinyint(1)  NOT NULL COMMENT '开启删除分组授权码',
     `create_time`   datetime    NOT NULL COMMENT '创建时间',
     `update_time`   datetime     DEFAULT NULL COMMENT '修改时间',
     PRIMARY KEY (`id`),

stmms-web/src/main/webapp/sql/upgrade/1.3.14.sql

@@ -13,7 +13,7 @@ ALTER TABLE eb_inspect_history ADD COLUMN `inspect_round` 	int(11) NOT NULL COMM
 ALTER TABLE eb_exam_subject ADD COLUMN `selective` 	tinyint(1) NOT NULL DEFAULT 0 COMMENT '选做题科目';
 
 ALTER TABLE b_school ADD COLUMN `double_track`  tinyint(1)  NOT NULL DEFAULT 0 COMMENT '双评轨迹';
-ALTER TABLE b_school ADD COLUMN `group_delete_code` varchar(64)  DEFAULT NULL COMMENT '删除分组授权码';
+ALTER TABLE b_school ADD COLUMN `group_delete_check` tinyint(1)  NOT NULL COMMENT '开启删除分组授权码';
 
 -- 更新选做题科目数据
 UPDATE eb_exam_subject o,