From 9f4c4e77bd7936645d174f21a6abf8951b533e8d Mon Sep 17 00:00:00 2001
From: liuhaonan <konodioda2333@vip.qq.com>
Date: 星期二, 18 一月 2022 17:51:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ximon-admin/src/main/java/com/sandu/ximon/admin/security/CountSet.java | 32 +++++++++++++++-----------------
1 files changed, 15 insertions(+), 17 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/security/CountSet.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/security/CountSet.java
index a62bb80..9f8da02 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/security/CountSet.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/security/CountSet.java
@@ -1,36 +1,31 @@
package com.sandu.ximon.admin.security;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.sandu.common.service.impl.BaseServiceImpl;
+import com.sandu.ximon.admin.service.LampCountService;
import com.sandu.ximon.dao.domain.LampCount;
-import com.sandu.ximon.dao.mapper.LampCountMapper;
import lombok.AllArgsConstructor;
-import lombok.Data;
import lombok.extern.slf4j.Slf4j;
import org.springframework.scheduling.annotation.EnableScheduling;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.stereotype.Service;
import java.text.DateFormat;
import java.text.SimpleDateFormat;
-import java.time.LocalDateTime;
import java.util.Calendar;
-import java.util.Date;
@Component
@Slf4j
@AllArgsConstructor
-@RestController
-@RequestMapping("aaa")
@EnableScheduling
-public class CountSet extends BaseServiceImpl<LampCountMapper,LampCount> {
+@Service
+public class CountSet {
+ private final LampCountService lampCountService;
+
public String aVoid() {
- LampCount one = getOne(Wrappers.lambdaQuery(LampCount.class));
+ //LampCount one = getOne(Wrappers.lambdaQuery(LampCount.class));//
+ LampCount one= lampCountService.list().get(0);
int count=one.getCount();
String number =null;
-
DateFormat df = new SimpleDateFormat("yy");
DateFormat df1 = new SimpleDateFormat("MM");
DateFormat df2 = new SimpleDateFormat("dd");
@@ -49,15 +44,18 @@
count++;
one.setCount(count);
- updateById(one);
+ lampCountService.updateById(one);
return formattedDate+formattedDate1+formattedDate2+number;
}
@Scheduled(cron = "0 0 0 * * ?")
- public void reset(){
- LampCount one = getOne(Wrappers.lambdaQuery(LampCount.class));
+ public void reSetCount(){
+ //LampCount one = getOne(Wrappers.lambdaQuery(LampCount.class));
+ LampCount one= lampCountService.list().get(0);
one.setCount(4);
- updateById(one);
+ lampCountService.updateById(one);
}
+
+
}
--
Gitblit v1.9.3