|
@@ -1,12 +1,11 @@
|
|
|
package com.dgtly.web.controller.system;
|
|
package com.dgtly.web.controller.system;
|
|
|
|
|
|
|
|
-import java.util.ArrayList;
|
|
|
|
|
-import java.util.HashMap;
|
|
|
|
|
|
|
+
|
|
|
import java.util.List;
|
|
import java.util.List;
|
|
|
-import java.util.Map;
|
|
|
|
|
|
|
|
|
|
|
|
+import com.alibaba.fastjson2.JSON;
|
|
|
import com.dgtly.common.utils.StringUtils;
|
|
import com.dgtly.common.utils.StringUtils;
|
|
|
-import com.dgtly.system.domain.OrderSalesParameter;
|
|
|
|
|
|
|
+import lombok.extern.slf4j.Slf4j;
|
|
|
import org.apache.shiro.authz.annotation.RequiresPermissions;
|
|
import org.apache.shiro.authz.annotation.RequiresPermissions;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.stereotype.Controller;
|
|
import org.springframework.stereotype.Controller;
|
|
@@ -27,6 +26,7 @@ import com.dgtly.common.core.page.TableDataInfo;
|
|
|
* @author chenyn
|
|
* @author chenyn
|
|
|
* @date 2023-06-13
|
|
* @date 2023-06-13
|
|
|
*/
|
|
*/
|
|
|
|
|
+@Slf4j
|
|
|
@Controller
|
|
@Controller
|
|
|
@RequestMapping("/system/configuration")
|
|
@RequestMapping("/system/configuration")
|
|
|
public class AlertConfigurationController extends BaseController
|
|
public class AlertConfigurationController extends BaseController
|
|
@@ -88,10 +88,7 @@ public class AlertConfigurationController extends BaseController
|
|
|
@ResponseBody
|
|
@ResponseBody
|
|
|
public AjaxResult addSave(AlertConfiguration alertConfiguration)
|
|
public AjaxResult addSave(AlertConfiguration alertConfiguration)
|
|
|
{
|
|
{
|
|
|
- /* int num = alertConfigurationService.selectAlertConfigurationListFilter(alertConfiguration);
|
|
|
|
|
- if ( num==1){
|
|
|
|
|
- return error("弹幕通知只能有一个该组织下启动,请先关闭该组织下已启动的后重新添加");
|
|
|
|
|
- }*/
|
|
|
|
|
|
|
+ log.info("11111111111{}", JSON.toJSON(alertConfiguration));
|
|
|
//如果userType为空,则添加所有人通知
|
|
//如果userType为空,则添加所有人通知
|
|
|
if (StringUtils.isEmpty(alertConfiguration.getUserType())){
|
|
if (StringUtils.isEmpty(alertConfiguration.getUserType())){
|
|
|
alertConfiguration.setUserType("2");
|
|
alertConfiguration.setUserType("2");
|
|
@@ -99,6 +96,8 @@ public class AlertConfigurationController extends BaseController
|
|
|
return toAjax(alertConfigurationService.insertAlertConfiguration(alertConfiguration));
|
|
return toAjax(alertConfigurationService.insertAlertConfiguration(alertConfiguration));
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
+
|
|
|
|
|
+
|
|
|
/**
|
|
/**
|
|
|
* 修改弹框配置
|
|
* 修改弹框配置
|
|
|
*/
|
|
*/
|
|
@@ -118,6 +117,9 @@ public class AlertConfigurationController extends BaseController
|
|
|
@ResponseBody
|
|
@ResponseBody
|
|
|
public AjaxResult editSave(AlertConfiguration alertConfiguration)
|
|
public AjaxResult editSave(AlertConfiguration alertConfiguration)
|
|
|
{
|
|
{
|
|
|
|
|
+
|
|
|
|
|
+ log.info("新增弹框配置");
|
|
|
|
|
+ log.info("222222222{}", JSON.toJSON(alertConfiguration));
|
|
|
//如果userType为空,则添加所有人通知
|
|
//如果userType为空,则添加所有人通知
|
|
|
if (StringUtils.isEmpty(alertConfiguration.getUserType())){
|
|
if (StringUtils.isEmpty(alertConfiguration.getUserType())){
|
|
|
alertConfiguration.setUserType("2");
|
|
alertConfiguration.setUserType("2");
|