|
@@ -10,6 +10,8 @@ import com.persagy.entity.NettyMessage;
|
|
import com.persagy.entity.ZktAlarmRecordDO;
|
|
import com.persagy.entity.ZktAlarmRecordDO;
|
|
import com.persagy.repository.AlarmRecordRepository;
|
|
import com.persagy.repository.AlarmRecordRepository;
|
|
import com.persagy.service.AlarmHandleService;
|
|
import com.persagy.service.AlarmHandleService;
|
|
|
|
+import com.persagy.service.impl.UserDefinePeriod;
|
|
|
|
+import com.persagy.utils.DateUtils;
|
|
import com.persagy.utils.LockUtil;
|
|
import com.persagy.utils.LockUtil;
|
|
import io.swagger.annotations.Api;
|
|
import io.swagger.annotations.Api;
|
|
import lombok.extern.slf4j.Slf4j;
|
|
import lombok.extern.slf4j.Slf4j;
|
|
@@ -20,6 +22,8 @@ import org.springframework.web.bind.annotation.RequestMapping;
|
|
import org.springframework.web.bind.annotation.RestController;
|
|
import org.springframework.web.bind.annotation.RestController;
|
|
|
|
|
|
import javax.transaction.Transactional;
|
|
import javax.transaction.Transactional;
|
|
|
|
+import java.time.LocalDateTime;
|
|
|
|
+import java.time.format.DateTimeFormatter;
|
|
import java.util.*;
|
|
import java.util.*;
|
|
import java.util.concurrent.atomic.AtomicInteger;
|
|
import java.util.concurrent.atomic.AtomicInteger;
|
|
|
|
|
|
@@ -37,9 +41,14 @@ public class HelloWorld {
|
|
AlarmInfoCache alarmInfoCache;
|
|
AlarmInfoCache alarmInfoCache;
|
|
@Autowired
|
|
@Autowired
|
|
AlarmRecordRepository alarmRecordRepository;
|
|
AlarmRecordRepository alarmRecordRepository;
|
|
|
|
+ @Autowired
|
|
|
|
+ UserDefinePeriod userDefinePeriod;
|
|
|
|
+
|
|
@PostMapping("/")
|
|
@PostMapping("/")
|
|
- public String world(@RequestBody JSONObject jsonObject) throws Exception {
|
|
|
|
- return "hello world!";
|
|
|
|
|
|
+ public String world() throws Exception {
|
|
|
|
+ LocalDateTime localDateTime = LocalDateTime.parse("20211109070000", DateTimeFormatter.ofPattern(DateUtils.sdfTime));
|
|
|
|
+ boolean b = userDefinePeriod.inUserDefinePeriod(DateUtils.localDateTime2Date(localDateTime));
|
|
|
|
+ return String.valueOf(b);
|
|
}
|
|
}
|
|
@PostMapping("/testMesage")
|
|
@PostMapping("/testMesage")
|
|
public String testMesage(@RequestBody JSONObject jsonObject) throws Exception {
|
|
public String testMesage(@RequestBody JSONObject jsonObject) throws Exception {
|