|
@@ -49,12 +49,8 @@ import com.fdkankan.scene.service.IUserService;
|
|
import com.fdkankan.scene.service.IVideoSceneProgressService;
|
|
import com.fdkankan.scene.service.IVideoSceneProgressService;
|
|
import com.fdkankan.web.user.SSOUser;
|
|
import com.fdkankan.web.user.SSOUser;
|
|
import java.io.File;
|
|
import java.io.File;
|
|
-import java.util.ArrayList;
|
|
|
|
-import java.util.Date;
|
|
|
|
-import java.util.HashMap;
|
|
|
|
-import java.util.List;
|
|
|
|
-import java.util.Map;
|
|
|
|
-import java.util.Objects;
|
|
|
|
|
|
+import java.util.*;
|
|
|
|
+
|
|
import lombok.extern.slf4j.Slf4j;
|
|
import lombok.extern.slf4j.Slf4j;
|
|
import org.apache.commons.lang3.StringUtils;
|
|
import org.apache.commons.lang3.StringUtils;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
@@ -114,6 +110,9 @@ public class SceneServiceImpl extends ServiceImpl<ISceneMapper, Scene> implement
|
|
@Value("${expected-time}")
|
|
@Value("${expected-time}")
|
|
private String expectedTime;
|
|
private String expectedTime;
|
|
|
|
|
|
|
|
+ @Value("${scene.expired.month:#{null}}")
|
|
|
|
+ private Integer expiredMonth;
|
|
|
|
+
|
|
@Override
|
|
@Override
|
|
public ResultData isLogin(String num, SSOUser ssoUser) throws Exception {
|
|
public ResultData isLogin(String num, SSOUser ssoUser) throws Exception {
|
|
|
|
|
|
@@ -137,6 +136,12 @@ public class SceneServiceImpl extends ServiceImpl<ISceneMapper, Scene> implement
|
|
|
|
|
|
JSONObject jsonObject = new JSONObject();
|
|
JSONObject jsonObject = new JSONObject();
|
|
|
|
|
|
|
|
+ //判断本地资源是否已本删除,如果已删除,前端根据字段值为true提示用户不能使用某些功能,需要重算
|
|
|
|
+ Date algorithmTime = sceneProEntity.getCreateTime();
|
|
|
|
+ if (!ObjectUtils.isEmpty(expiredMonth) && com.fdkankan.common.util.DateUtil.delay(algorithmTime, expiredMonth, Calendar.MONTH).before(new Date())) {
|
|
|
|
+ jsonObject.put("sourceExpired", true);
|
|
|
|
+ }
|
|
|
|
+
|
|
List<SceneResource> exclude = new ArrayList<>();
|
|
List<SceneResource> exclude = new ArrayList<>();
|
|
SceneResource excludeEntity = new SceneResource();
|
|
SceneResource excludeEntity = new SceneResource();
|
|
excludeEntity.setKeyWord("data");
|
|
excludeEntity.setKeyWord("data");
|