|
@@ -1,5 +1,7 @@
|
|
package com.rongwei.safecommon.utils;
|
|
package com.rongwei.safecommon.utils;
|
|
|
|
|
|
|
|
+import cn.hutool.json.JSONArray;
|
|
|
|
+import cn.hutool.json.JSONUtil;
|
|
import com.alibaba.fastjson.JSONObject;
|
|
import com.alibaba.fastjson.JSONObject;
|
|
import com.google.common.collect.Lists;
|
|
import com.google.common.collect.Lists;
|
|
import com.rongwei.commonservice.serial.service.SysSerialNumberService;
|
|
import com.rongwei.commonservice.serial.service.SysSerialNumberService;
|
|
@@ -10,12 +12,9 @@ import com.rongwei.rwcommon.utils.StringUtils;
|
|
import com.rongwei.rwcommonentity.commonservers.vo.SysNotifyAnnounceVo;
|
|
import com.rongwei.rwcommonentity.commonservers.vo.SysNotifyAnnounceVo;
|
|
import com.rongwei.rwcommonentity.commonservers.vo.SysSerialVo;
|
|
import com.rongwei.rwcommonentity.commonservers.vo.SysSerialVo;
|
|
import com.rongwei.safecommon.fegin.CXCommonFeginClient;
|
|
import com.rongwei.safecommon.fegin.CXCommonFeginClient;
|
|
-import jodd.util.ArraysUtil;
|
|
|
|
-import org.apache.commons.collections.ListUtils;
|
|
|
|
import org.slf4j.Logger;
|
|
import org.slf4j.Logger;
|
|
import org.slf4j.LoggerFactory;
|
|
import org.slf4j.LoggerFactory;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
-import org.springframework.scheduling.annotation.Async;
|
|
|
|
import org.springframework.stereotype.Component;
|
|
import org.springframework.stereotype.Component;
|
|
import org.springframework.web.context.request.RequestContextHolder;
|
|
import org.springframework.web.context.request.RequestContextHolder;
|
|
import org.springframework.web.context.request.ServletRequestAttributes;
|
|
import org.springframework.web.context.request.ServletRequestAttributes;
|
|
@@ -25,7 +24,7 @@ import javax.servlet.http.HttpServletRequest;
|
|
import java.time.LocalDate;
|
|
import java.time.LocalDate;
|
|
import java.util.Calendar;
|
|
import java.util.Calendar;
|
|
import java.util.Date;
|
|
import java.util.Date;
|
|
-import java.util.LinkedList;
|
|
|
|
|
|
+import java.util.HashMap;
|
|
import java.util.List;
|
|
import java.util.List;
|
|
import java.util.stream.Collectors;
|
|
import java.util.stream.Collectors;
|
|
|
|
|
|
@@ -202,4 +201,28 @@ public class CXCommonUtils {
|
|
return startLocalDate.toEpochDay() - LocalDate.now().toEpochDay();
|
|
return startLocalDate.toEpochDay() - LocalDate.now().toEpochDay();
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+
|
|
|
|
+ /**
|
|
|
|
+ * 删除消息提醒
|
|
|
|
+ *
|
|
|
|
+ * @param notifyType
|
|
|
|
+ * @param roption
|
|
|
|
+ * @return
|
|
|
|
+ * @date 2024/1/29 17:12
|
|
|
|
+ * @author shangmi
|
|
|
|
+ *
|
|
|
|
+ */
|
|
|
|
+
|
|
|
|
+ public static void deleteSendNotify(String notifyType, String roption){
|
|
|
|
+ JSONArray data = JSONUtil.parseArray(commonFeginClient.list(new HashMap<String, Object>() {{
|
|
|
|
+ this.put("NOTIFYTYPE", notifyType);
|
|
|
|
+ this.put("ROPTION", roption);
|
|
|
|
+ }}).getData());
|
|
|
|
+
|
|
|
|
+ if (!data.isEmpty()) {
|
|
|
|
+ List<String> ids = data.stream().map(info -> JSONUtil.parseObj(info).get("id").toString()).collect(Collectors.toList());
|
|
|
|
+ commonFeginClient.delete(ids);
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+
|
|
}
|
|
}
|