q792602257/FrameTour-BE
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'jackson'

Browse Source
This commit is contained in:
Jerry Yan
2025-07-27 14:23:21 +08:00
parent 0ca7cd694e f8de4abd09
commit 9a6a90b58e
46 changed files with 805 additions and 254 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/com/ycwl/basic/task/DownloadNotificationTasker.java
View File

@@ -138,8 +138,9 @@ public class DownloadNotificationTasker {
CouponQueryReq query = new CouponQueryReq();
query.setScenicId(item.getScenicId());
query.setType(3);
query.setStatus(1);
List<CouponRespVO> coupons = couponMapper.selectByQuery(query);
if (coupons.isEmpty()) {
if (coupons.isEmpty() || StringUtils.isBlank(coupons.getFirst().getBroadcast())) {
remarkMap.put("value", "视频即将删除，花点小钱买下回忆");
} else {
remarkMap.put("value", coupons.getFirst().getBroadcast());

4
src/main/java/com/ycwl/basic/task/DynamicTaskGenerator.java
View File

@@ -1,6 +1,6 @@
package com.ycwl.basic.task;
import com.alibaba.fastjson.JSONObject;
import com.ycwl.basic.utils.JacksonUtil;
import com.ycwl.basic.biz.TemplateBiz;
import com.ycwl.basic.facebody.FaceBodyFactory;
import com.ycwl.basic.facebody.adapter.AliFaceBodyAdapter;
@@ -116,7 +116,7 @@ public class DynamicTaskGenerator {
IFaceBodyAdapter faceBodyAdapter;
if (scenicConfig.getFaceType() != null) {
faceBodyAdapter = FaceBodyFactory.getAdapter(scenicConfig.getFaceType());
faceBodyAdapter.loadConfig(JSONObject.parseObject(scenicConfig.getFaceConfigJson(), Map.class));
faceBodyAdapter.loadConfig(JacksonUtil.parseObject(scenicConfig.getFaceConfigJson(), Map.class));
} else {
faceBodyAdapter = FaceBodyFactory.use();
}

36
src/main/java/com/ycwl/basic/task/N9eSyncTask.java
View File

@@ -3,9 +3,7 @@ package com.ycwl.basic.task;
import cn.hutool.core.codec.Base64;
import cn.hutool.core.date.LocalDateTimeUtil;
import cn.hutool.http.HttpUtil;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.ycwl.basic.utils.JacksonUtil;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -15,7 +13,7 @@ import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
import cn.hutool.http.HttpResponse;
import java.util.Date;
import java.util.*;
import java.util.concurrent.TimeUnit;
@@ -32,12 +30,12 @@ public class N9eSyncTask {
String auth = "Basic " + Base64.encode("user001:ccc26da7b9aba533cbb263a36c07dcc4");
// 构建请求体
JSONObject requestBody = new JSONObject();
JSONArray queries = new JSONArray();
JSONObject query = new JSONObject();
Map<String, Object> requestBody = new HashMap<>();
List<Map<String, Object>> queries = new ArrayList<>();
Map<String, Object> query = new HashMap<>();
query.put("key", "group_ids");
query.put("op", "==");
JSONArray values = new JSONArray();
List<Integer> values = new ArrayList<>();
values.add(4);
query.put("values", values);
queries.add(query);
@@ -47,23 +45,27 @@ public class N9eSyncTask {
HttpResponse response = HttpUtil.createPost("https://n9e.jerryyan.top/v1/n9e/target/list")
.header("Authorization", auth)
.header("Content-Type", "application/json")
.body(requestBody.toJSONString())
.body(JacksonUtil.toJSONString(requestBody))
.execute();
JSONObject respData = JSON.parseObject(response.body());
if (StringUtils.isNotBlank(respData.getString("err"))) {
Map<String, Object> respData = JacksonUtil.parseObject(response.body(), Map.class);
String err = (String) respData.get("err");
if (StringUtils.isNotBlank(err)) {
log.warn("N9E信息获取失败");
return;
}
JSONObject data = respData.getJSONObject("dat");
if (data.getInteger("total") <= 0) {
@SuppressWarnings("unchecked")
Map<String, Object> data = (Map<String, Object>) respData.get("dat");
Integer total = (Integer) data.get("total");
if (total == null || total <= 0) {
log.warn("N9E信息为空");
return;
}
JSONArray list = data.getJSONArray("list");
@SuppressWarnings("unchecked")
List<Map<String, Object>> list = (List<Map<String, Object>>) data.get("list");
list.forEach(item -> {
JSONObject itemObj = (JSONObject) item;
String ident = itemObj.getString("ident");
Long updateAt = itemObj.getLong("update_at");
String ident = (String) item.get("ident");
Number updateAtNum = (Number) item.get("update_at");
Long updateAt = updateAtNum != null ? updateAtNum.longValue() : 0L;
redisTemplate.opsForValue().set("ext_device:online:" + ident, updateAt.toString(), 1, TimeUnit.DAYS);
});
}