|
|
|
@ -32,6 +32,7 @@ import com.baiye.util.SecurityUtils;
|
|
|
|
|
import lombok.RequiredArgsConstructor;
|
|
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
|
|
import org.springframework.beans.factory.annotation.Value;
|
|
|
|
|
import org.springframework.cache.annotation.CachePut;
|
|
|
|
|
import org.springframework.cache.annotation.Cacheable;
|
|
|
|
|
import org.springframework.data.domain.Page;
|
|
|
|
|
import org.springframework.data.domain.PageRequest;
|
|
|
|
@ -162,7 +163,7 @@ public class TaskServiceImpl implements TaskService {
|
|
|
|
|
private void createTask(Long taskId, Long id, String taskName, Integer isForm, Long labelOrganizeId, String remark) {
|
|
|
|
|
Task task = new Task();
|
|
|
|
|
task.setId(taskId);
|
|
|
|
|
task.setIsEncryption(DefaultNumberConstants.ZERO_NUMBER);
|
|
|
|
|
task.setEncryptionType(DefaultNumberConstants.ZERO_NUMBER);
|
|
|
|
|
//设置默认值
|
|
|
|
|
task.setIsDistribution(DefaultNumberConstants.ZERO_NUMBER);
|
|
|
|
|
task.setTaskType(DefaultNumberConstants.ONE_NUMBER);
|
|
|
|
@ -323,7 +324,7 @@ public class TaskServiceImpl implements TaskService {
|
|
|
|
|
Task task = taskRepository.findById(taskId).orElseGet(Task::new);
|
|
|
|
|
Long id = task.getId();
|
|
|
|
|
String taskName = task.getTaskName();
|
|
|
|
|
Integer isEncryption = task.getIsEncryption();
|
|
|
|
|
Integer isEncryption = task.getEncryptionType();
|
|
|
|
|
switch (type) {
|
|
|
|
|
// 任务名称查询并set到缓存中
|
|
|
|
|
case 0:
|
|
|
|
@ -333,7 +334,7 @@ public class TaskServiceImpl implements TaskService {
|
|
|
|
|
redisUtils.set(taskNameKey, taskName, 2592000);// 缓存三十天
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
case 1:
|
|
|
|
|
default:
|
|
|
|
|
// 任务加密状态查询并set到缓存中
|
|
|
|
|
String taskIsEncryptionKey = KeyFieldConstants.TASK_ENCRYPTION_KEY + id;
|
|
|
|
|
if (!redisUtils.hasKey(taskIsEncryptionKey)) {
|
|
|
|
@ -442,15 +443,17 @@ public class TaskServiceImpl implements TaskService {
|
|
|
|
|
public void updateTaskEncryption(Long taskId) {
|
|
|
|
|
Task task = taskRepository.findById(taskId).orElseGet(Task::new);
|
|
|
|
|
if (task.getIsDistribution() == 0) {
|
|
|
|
|
task.setIsEncryption(1);
|
|
|
|
|
task.setEncryptionType(1);
|
|
|
|
|
} else {
|
|
|
|
|
task.setIsEncryption(0);
|
|
|
|
|
task.setEncryptionType(0);
|
|
|
|
|
}
|
|
|
|
|
taskRepository.save(task);
|
|
|
|
|
String key = "task:encryption:" + taskId;
|
|
|
|
|
if (!redisUtils.hasKey(key)) {
|
|
|
|
|
redisUtils.set(key, String.valueOf(task.getIsEncryption()), 2592000);
|
|
|
|
|
redisUtils.set(key, String.valueOf(task.getEncryptionType()), 2592000);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@ -529,4 +532,17 @@ public class TaskServiceImpl implements TaskService {
|
|
|
|
|
}
|
|
|
|
|
return null;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@Override
|
|
|
|
|
public Boolean updateTaskEncryption(Long taskId, Integer encryptionType) {
|
|
|
|
|
Task task = taskRepository.findById(taskId).orElseGet(Task::new);
|
|
|
|
|
task.setEncryptionType(encryptionType);
|
|
|
|
|
taskRepository.save(task);
|
|
|
|
|
String name = KeyFieldConstants.TASK_NAME_KEY + taskId;
|
|
|
|
|
String key = KeyFieldConstants.TASK_ENCRYPTION_KEY + taskId;
|
|
|
|
|
redisUtils.del(name);
|
|
|
|
|
redisUtils.del(key);
|
|
|
|
|
redisUtils.set(key, String.valueOf(task.getEncryptionType()), 2592000);
|
|
|
|
|
return Boolean.TRUE;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|