From 5a401ffd80ba6a35eb470018e9769b932bad8453 Mon Sep 17 00:00:00 2001 From: wuweida <2918581207@qq.com> Date: Thu, 23 Jun 2022 11:31:35 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=94=A8=E6=88=B7=E7=99=BB?= =?UTF-8?q?=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...iDiController.java => QidiController.java} | 2 +- .../controller/UserLoginController.java | 24 +++++++++++++++++++ .../monitormanage/entity/UserLogin.java | 16 +++++++++++++ .../monitormanage/mapper/UserLoginMapper.java | 12 ++++++++++ .../monitormanage/service/MonitorService.java | 3 ++- .../service/UserLoginService.java | 24 +++++++++++++++++++ 6 files changed, 79 insertions(+), 2 deletions(-) rename src/main/java/com/hisense/monitormanage/controller/{QiDiController.java => QidiController.java} (99%) create mode 100644 src/main/java/com/hisense/monitormanage/controller/UserLoginController.java create mode 100644 src/main/java/com/hisense/monitormanage/entity/UserLogin.java create mode 100644 src/main/java/com/hisense/monitormanage/mapper/UserLoginMapper.java create mode 100644 src/main/java/com/hisense/monitormanage/service/UserLoginService.java diff --git a/src/main/java/com/hisense/monitormanage/controller/QiDiController.java b/src/main/java/com/hisense/monitormanage/controller/QidiController.java similarity index 99% rename from src/main/java/com/hisense/monitormanage/controller/QiDiController.java rename to src/main/java/com/hisense/monitormanage/controller/QidiController.java index d44d39a..d94117a 100644 --- a/src/main/java/com/hisense/monitormanage/controller/QiDiController.java +++ b/src/main/java/com/hisense/monitormanage/controller/QidiController.java @@ -22,7 +22,7 @@ import java.util.Map; @RestController @RequestMapping("api/project") @Api(tags = "启迪中台") -public class QiDiController { +public class QidiController { @Autowired private SedimentTrailService sedimentTrailService; diff --git a/src/main/java/com/hisense/monitormanage/controller/UserLoginController.java b/src/main/java/com/hisense/monitormanage/controller/UserLoginController.java new file mode 100644 index 0000000..51f05b1 --- /dev/null +++ b/src/main/java/com/hisense/monitormanage/controller/UserLoginController.java @@ -0,0 +1,24 @@ +package com.hisense.monitormanage.controller; + +import com.hisense.monitormanage.entity.Result; +import com.hisense.monitormanage.service.UserLoginService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequestMapping("api/project") +public class UserLoginController { + + @Autowired + private UserLoginService userLoginService; + + @PostMapping("login") + public Result login(String username,String password){ + String login = userLoginService.login(username, password); + Result success = Result.success(login); + return success; + } + +} diff --git a/src/main/java/com/hisense/monitormanage/entity/UserLogin.java b/src/main/java/com/hisense/monitormanage/entity/UserLogin.java new file mode 100644 index 0000000..aab7375 --- /dev/null +++ b/src/main/java/com/hisense/monitormanage/entity/UserLogin.java @@ -0,0 +1,16 @@ +package com.hisense.monitormanage.entity; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +@Data +@TableName("t_user_login") +public class UserLogin { + @TableId + private Integer id; + + private String username; + + private String password; +} diff --git a/src/main/java/com/hisense/monitormanage/mapper/UserLoginMapper.java b/src/main/java/com/hisense/monitormanage/mapper/UserLoginMapper.java new file mode 100644 index 0000000..0fdaeb2 --- /dev/null +++ b/src/main/java/com/hisense/monitormanage/mapper/UserLoginMapper.java @@ -0,0 +1,12 @@ +package com.hisense.monitormanage.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.hisense.monitormanage.entity.UserLogin; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; + +public interface UserLoginMapper extends BaseMapper { + + @Select("select * from t_user_login") + UserLogin getUserByName(); +} diff --git a/src/main/java/com/hisense/monitormanage/service/MonitorService.java b/src/main/java/com/hisense/monitormanage/service/MonitorService.java index 3445184..9a6c466 100644 --- a/src/main/java/com/hisense/monitormanage/service/MonitorService.java +++ b/src/main/java/com/hisense/monitormanage/service/MonitorService.java @@ -589,7 +589,7 @@ public class MonitorService { //获取当前时间和前一天的UTC时间 Map condition = new HashMap<>(); ZonedDateTime endUTC = ZonedDateTime.now(ZoneOffset.UTC); - ZonedDateTime startUTC = endUTC.minusDays(60); + ZonedDateTime startUTC = endUTC.minusDays(30); DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyyMMdd'T'HHmmss'Z'"); condition.put("checkStatus",0); condition.put("startTime",dateTimeFormatter.format(startUTC)); @@ -626,6 +626,7 @@ public class MonitorService { ResponseEntity responseEntity2 = restTemplate.exchange(url, HttpMethod.POST, request2, JSONObject.class ); JSONObject entityBody2 = responseEntity2.getBody(); List results2 = (List) entityBody2.get("results"); + log.info("循环次数：" + i); if(!results2.isEmpty()){ list.addAll(results); } diff --git a/src/main/java/com/hisense/monitormanage/service/UserLoginService.java b/src/main/java/com/hisense/monitormanage/service/UserLoginService.java new file mode 100644 index 0000000..d1be78e --- /dev/null +++ b/src/main/java/com/hisense/monitormanage/service/UserLoginService.java @@ -0,0 +1,24 @@ +package com.hisense.monitormanage.service; + +import cn.hutool.crypto.SecureUtil; +import com.hisense.monitormanage.entity.UserLogin; +import com.hisense.monitormanage.mapper.UserLoginMapper; +import lombok.extern.log4j.Log4j2; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +@Service +@Log4j2 +public class UserLoginService { + + @Autowired + private UserLoginMapper userLoginMapper; + + public String login(String username,String password){ + UserLogin user = userLoginMapper.getUserByName(); + if (user.getUsername().equals(username) && user.getPassword().equals(SecureUtil.md5(password))){ + return "登录成功"; + } + return "账号或密码错误"; + } +}