李剑-节假日信息维护功能开发-解决保存结束报错的问题，完成所有功能，完成功能说明书。

src/main/java/platform/modules/government/web/SupermeController.java

@@ -1082,7 +1082,6 @@ public class SupermeController extends BaseController {
 		Map<String,String> mapTemplateFileInfo = holidayExcelTemplateUtil.getTemplateFileInfo();
 		modelMap.put("templateFileUrl",mapTemplateFileInfo.get("templateFileUrl"));
 		modelMap.put("templateFileName",mapTemplateFileInfo.get("templateFileName"));
-
 		modelMap.put("fileUrl", setFileUrl());
 		return BASE_SUPER_PATH + "holiday/holiday_add";
 	}
@@ -1138,14 +1137,18 @@ public class SupermeController extends BaseController {
 
 
 	@OperationLog(value = "假日信息保存")
+	@ResponseBody
 	@PostMapping(value = "/holiday/save")
-	public ResponseMessage saveHoliday(@RequestParam(value = "id", defaultValue = "-1") int id,
+	public ModelMap saveHoliday(@RequestParam(value = "id", defaultValue = "-1") int id,
 									   @RequestParam(value = "configName", defaultValue = "") String configName,
 									   @RequestParam(value = "configKey", defaultValue = "") String configKey,
 									   @RequestParam(value = "configValue", defaultValue = "") String configValue) throws Exception {
+		ModelMap messagesMap = new ModelMap();
 
 		if(IsTooFrequently()) {
-			return ResponseMessage.success("操作过于频繁，请稍后再试!");
+			messagesMap.put("status", FAILURE);
+			messagesMap.put("message", "操作过于频繁，请稍后再试!");
+			return messagesMap;
 		}
 
 		SysConfig ent2Save;
@@ -1169,11 +1172,13 @@ public class SupermeController extends BaseController {
 			sysConfigService.save(ent2Save);
 		}
 
-		return ResponseMessage.success("保存成功!");
+		messagesMap.put("status", SUCCESS);
+		messagesMap.put("message", "保存成功!");
+		return messagesMap;
 
 	}
 
-	///super/isExistHoliday
+
 	/**
 	 * 同一年份假日信息是否存在
 	 *

src/main/resources/static/js/super/holiday/holiday_add.js

@@ -38,7 +38,7 @@ $(function () {
                 url: pagePath + "/super/holiday/save",
                 dataType: "json",
                 success: function (data) {
-                    if (data.success) {
+                    if (data.status == "success") {
                         succeedMessage(data.message);
                         setTimeClose();
                     } else {

src/main/resources/templates/admin/super/holiday/holiday_add.html

@@ -12,7 +12,7 @@
     <form class="form form-horizontal" id="form-holiday-add">
 		<input type="hidden" id="id" th:value="${id}" th:name="id"/>
 		<div class="row cl">
-			<label class="form-label col-xs-4 col-sm-2"><span class="c-red">*</span>假日信息名称：</label>
+			<label class="form-label col-xs-4 col-sm-2"><span class="c-red">*</span>名称：</label>
 			<div class="formControls col-xs-8 col-sm-9">
 				<input type="text" class="input-text" required value="" th:value="${configName}"  th:id="configName" th:name="configName"/>
 			</div>
@@ -26,7 +26,7 @@
 		</div>
 
 		<div class="row cl">
-			<label class="form-label col-xs-4 col-sm-2"><span class="c-red">*</span>假日信息配置：</label>
+			<label class="form-label col-xs-4 col-sm-2"><span class="c-red">*</span>假日数据：</label>
 			<div class="formControls col-xs-8 col-sm-9">
 				<input type="text" class="input-text" required value="" th:value="${configValue}"  th:id="configValue" th:name="configValue"/>
 			</div>
@@ -78,7 +78,7 @@
 		fileSizeLimit: 100 * 1024 * 1024,
 		fileSingleSizeLimit: 100 * 1024 * 1024,
 		//fileNumLimit: 1,
-		serverUrl:pagePath + '/super/holiday/import'//'/myboot/super/holiday/import' // TODO: 这个地方要改的，不然发布到生产环境无法上传
+		serverUrl:pagePath + '/super/holiday/import'
 	};
 
 	var webUploadDoc = new $WebUploadDoc(options);

src/main/resources/templates/admin/super/holiday/holiday_list.html

@@ -48,7 +48,12 @@
                 <td th:text="*{configValue}"></td>
                 <td class="td-manage">
                     <a title="修改" href="javascript:;"  th:onclick="'javascript:holiday_edit(\'修改假日数据\',\'/super/holiday/edit/'+*{id}+'\',\'800\',\'500\');'" class="ml-5" style="text-decoration:none">修改</a>
-                    <a title="废弃" href="javascript:;"  th:onclick="'javascript:holiday_del(\'/super/holiday/delete/'+*{id}+'\');'" class="ml-5" style="text-decoration:none">废弃</a>
+                    <!--
+                    // 这里的逻辑删除，会造成麻烦：
+                    //  因为configKey是再数据库里去重的，所以逻辑删除的configKey（比如：year_2023），一样不可用了
+                    //  且用户也看不到这个configKey（逻辑删除了，列表里不显示）
+                    -->
+                    <!--<a title="废弃" href="javascript:;"  th:onclick="'javascript:holiday_del(\'/super/holiday/delete/'+*{id}+'\');'" class="ml-5" style="text-decoration:none">废弃</a>-->
                 </td>
             </tr>
             </tbody>