From c98fcfb656c40d74b757a1169c257459cc3f5897 Mon Sep 17 00:00:00 2001 From: orgin Date: Mon, 5 Feb 2024 12:54:28 +0800 Subject: [PATCH 1/6] =?UTF-8?q?fix:app=E6=A8=A1=E5=9D=97=20system?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/controller/LoginController.java | 57 ++++++++++++++++++- .../jeecg/modules/model/SysLoginModel.java | 55 ++++++++++++++++++ .../jeecg/modules/service/LoginService.java | 37 +++++++++++- 3 files changed, 146 insertions(+), 3 deletions(-) create mode 100644 jeecg-module-app/src/main/java/org/jeecg/modules/model/SysLoginModel.java diff --git a/jeecg-module-app/src/main/java/org/jeecg/modules/controller/LoginController.java b/jeecg-module-app/src/main/java/org/jeecg/modules/controller/LoginController.java index 97883e0e..8cbb320a 100644 --- a/jeecg-module-app/src/main/java/org/jeecg/modules/controller/LoginController.java +++ b/jeecg-module-app/src/main/java/org/jeecg/modules/controller/LoginController.java @@ -1,11 +1,64 @@ package org.jeecg.modules.controller; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import com.alibaba.fastjson.JSONObject; +import io.swagger.annotations.ApiOperation; +import org.apache.shiro.SecurityUtils; +import org.jeecg.common.api.vo.Result; +import org.jeecg.common.constant.CacheConstant; +import org.jeecg.common.constant.CommonConstant; +import org.jeecg.common.system.util.JwtUtil; +import org.jeecg.common.system.vo.LoginUser; +import org.jeecg.common.util.PasswordUtil; +import org.jeecg.common.util.oConvertUtils; +import org.jeecg.modules.base.entity.postgre.SysDepart; +import org.jeecg.modules.base.entity.postgre.SysUser; +import org.jeecg.modules.model.SysLoginModel; +import org.jeecg.modules.service.LoginService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.util.List; @RestController @RequestMapping("") public class LoginController { + @Autowired + private LoginService loginService; + /** + * app登录 + * @param sysLoginModel + * @return + * @throws Exception + */ + @RequestMapping(value = "/mLogin", method = RequestMethod.POST) + public Result mLogin(@RequestBody SysLoginModel sysLoginModel) { + return loginService.mLogin(sysLoginModel); + } + + /** + * 退出登录 + * @param request + * @param response + * @return + */ + @RequestMapping(value = "/logout") + public Result logout(HttpServletRequest request, HttpServletResponse response) { + //用户退出逻辑 + return loginService.logout(request, response); + } + + /** + * 后台生成图形验证码 ：有效 + * @param response + * @param key + */ + @ApiOperation("获取验证码") + @GetMapping(value = "/randomImage/{key}") + public Result randomImage(HttpServletResponse response,@PathVariable("key") String key) { + return loginService.randomImage(response, key); + } } diff --git a/jeecg-module-app/src/main/java/org/jeecg/modules/model/SysLoginModel.java b/jeecg-module-app/src/main/java/org/jeecg/modules/model/SysLoginModel.java new file mode 100644 index 00000000..859a71dc --- /dev/null +++ b/jeecg-module-app/src/main/java/org/jeecg/modules/model/SysLoginModel.java @@ -0,0 +1,55 @@ +package org.jeecg.modules.model; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; + +/** + * 登录表单 + * + * @Author scott + * @since 2019-01-18 + */ +@ApiModel(value="登录对象", description="登录对象") +public class SysLoginModel { + @ApiModelProperty(value = "账号") + private String username; + @ApiModelProperty(value = "密码") + private String password; + @ApiModelProperty(value = "验证码") + private String captcha; + @ApiModelProperty(value = "验证码key") + private String checkKey; + + public String getUsername() { + return username; + } + + public void setUsername(String username) { + this.username = username; + } + + public String getPassword() { + return password; + } + + public void setPassword(String password) { + this.password = password; + } + + public String getCaptcha() { + return captcha; + } + + public void setCaptcha(String captcha) { + this.captcha = captcha; + } + + public String getCheckKey() { + return checkKey; + } + + public void setCheckKey(String checkKey) { + this.checkKey = checkKey; + } + +} diff --git a/jeecg-module-app/src/main/java/org/jeecg/modules/service/LoginService.java b/jeecg-module-app/src/main/java/org/jeecg/modules/service/LoginService.java index aa56963f..b755cd72 100644 --- a/jeecg-module-app/src/main/java/org/jeecg/modules/service/LoginService.java +++ b/jeecg-module-app/src/main/java/org/jeecg/modules/service/LoginService.java @@ -1,11 +1,46 @@ package org.jeecg.modules.service; +import com.alibaba.fastjson.JSONObject; +import org.jeecg.common.api.vo.Result; +import org.jeecg.modules.base.entity.postgre.SysEmail; +import org.jeecg.modules.model.SysLoginModel; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.stereotype.Component; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; @Component -@FeignClient("armd-system") +@FeignClient(value = "armd-system", path = "/sys") public interface LoginService { + /** + * 登录 + * @return + */ + @GetMapping("/mLogin") + Result mLogin(SysLoginModel sysLoginModel); + /** + * 登出 + * @return + */ + @GetMapping("/logout") + Result logout(HttpServletRequest request, HttpServletResponse response); + + /** + * 图形验证码 + */ + @GetMapping("/randomImage/{key}") + Result randomImage(HttpServletResponse response,@PathVariable("key") String key); + + /** + * 图形验证码 + * @return + */ + @PostMapping("/checkCaptcha") + Result checkCaptcha(); } From bc55ad61b65b076dc6edcd86a8becd94f03fb5e7 Mon Sep 17 00:00:00 2001 From: orgin Date: Mon, 5 Feb 2024 12:57:43 +0800 Subject: [PATCH 2/6] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E5=8C=85=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/controller/LoginController.java | 20 +++++-------------- .../modules/feignclient/AlarmService.java | 4 ++++ .../modules/feignclient/AnalysisService.java | 4 ++++ .../modules/feignclient/MessageService.java | 4 ++++ .../modules/feignclient/StationService.java | 4 ++++ .../SystemClient.java} | 5 ++--- .../jeecg/modules/feignclient/WebService.java | 15 ++++++++++++++ .../jeecg/modules/service/AlarmService.java | 4 ---- .../modules/service/AnalysisService.java | 4 ---- .../jeecg/modules/service/MessageService.java | 4 ---- .../jeecg/modules/service/StationService.java | 4 ---- .../org/jeecg/modules/service/WebService.java | 4 ---- 12 files changed, 38 insertions(+), 38 deletions(-) create mode 100644 jeecg-module-app/src/main/java/org/jeecg/modules/feignclient/AlarmService.java create mode 100644 jeecg-module-app/src/main/java/org/jeecg/modules/feignclient/AnalysisService.java create mode 100644 jeecg-module-app/src/main/java/org/jeecg/modules/feignclient/MessageService.java create mode 100644 jeecg-module-app/src/main/java/org/jeecg/modules/feignclient/StationService.java rename jeecg-module-app/src/main/java/org/jeecg/modules/{service/LoginService.java => feignclient/SystemClient.java} (90%) create mode 100644 jeecg-module-app/src/main/java/org/jeecg/modules/feignclient/WebService.java delete mode 100644 jeecg-module-app/src/main/java/org/jeecg/modules/service/AlarmService.java delete mode 100644 jeecg-module-app/src/main/java/org/jeecg/modules/service/AnalysisService.java delete mode 100644 jeecg-module-app/src/main/java/org/jeecg/modules/service/MessageService.java delete mode 100644 jeecg-module-app/src/main/java/org/jeecg/modules/service/StationService.java delete mode 100644 jeecg-module-app/src/main/java/org/jeecg/modules/service/WebService.java diff --git a/jeecg-module-app/src/main/java/org/jeecg/modules/controller/LoginController.java b/jeecg-module-app/src/main/java/org/jeecg/modules/controller/LoginController.java index 8cbb320a..0d93fafe 100644 --- a/jeecg-module-app/src/main/java/org/jeecg/modules/controller/LoginController.java +++ b/jeecg-module-app/src/main/java/org/jeecg/modules/controller/LoginController.java @@ -2,31 +2,21 @@ package org.jeecg.modules.controller; import com.alibaba.fastjson.JSONObject; import io.swagger.annotations.ApiOperation; -import org.apache.shiro.SecurityUtils; import org.jeecg.common.api.vo.Result; -import org.jeecg.common.constant.CacheConstant; -import org.jeecg.common.constant.CommonConstant; -import org.jeecg.common.system.util.JwtUtil; -import org.jeecg.common.system.vo.LoginUser; -import org.jeecg.common.util.PasswordUtil; -import org.jeecg.common.util.oConvertUtils; -import org.jeecg.modules.base.entity.postgre.SysDepart; -import org.jeecg.modules.base.entity.postgre.SysUser; import org.jeecg.modules.model.SysLoginModel; -import org.jeecg.modules.service.LoginService; +import org.jeecg.modules.feignclient.SystemClient; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import java.util.List; @RestController @RequestMapping("") public class LoginController { @Autowired - private LoginService loginService; + private SystemClient systemClient; /** * app登录 @@ -36,7 +26,7 @@ public class LoginController { */ @RequestMapping(value = "/mLogin", method = RequestMethod.POST) public Result mLogin(@RequestBody SysLoginModel sysLoginModel) { - return loginService.mLogin(sysLoginModel); + return systemClient.mLogin(sysLoginModel); } /** @@ -48,7 +38,7 @@ public class LoginController { @RequestMapping(value = "/logout") public Result logout(HttpServletRequest request, HttpServletResponse response) { //用户退出逻辑 - return loginService.logout(request, response); + return systemClient.logout(request, response); } /** @@ -59,6 +49,6 @@ public class LoginController { @ApiOperation("获取验证码") @GetMapping(value = "/randomImage/{key}") public Result randomImage(HttpServletResponse response,@PathVariable("key") String key) { - return loginService.randomImage(response, key); + return systemClient.randomImage(response, key); } } diff --git a/jeecg-module-app/src/main/java/org/jeecg/modules/feignclient/AlarmService.java b/jeecg-module-app/src/main/java/org/jeecg/modules/feignclient/AlarmService.java new file mode 100644 index 00000000..47cd76a7 --- /dev/null +++ b/jeecg-module-app/src/main/java/org/jeecg/modules/feignclient/AlarmService.java @@ -0,0 +1,4 @@ +package org.jeecg.modules.feignclient; + +public interface AlarmService { +} diff --git a/jeecg-module-app/src/main/java/org/jeecg/modules/feignclient/AnalysisService.java b/jeecg-module-app/src/main/java/org/jeecg/modules/feignclient/AnalysisService.java new file mode 100644 index 00000000..0bd39e0e --- /dev/null +++ b/jeecg-module-app/src/main/java/org/jeecg/modules/feignclient/AnalysisService.java @@ -0,0 +1,4 @@ +package org.jeecg.modules.feignclient; + +public interface AnalysisService { +} diff --git a/jeecg-module-app/src/main/java/org/jeecg/modules/feignclient/MessageService.java b/jeecg-module-app/src/main/java/org/jeecg/modules/feignclient/MessageService.java new file mode 100644 index 00000000..04d29c4c --- /dev/null +++ b/jeecg-module-app/src/main/java/org/jeecg/modules/feignclient/MessageService.java @@ -0,0 +1,4 @@ +package org.jeecg.modules.feignclient; + +public interface MessageService { +} diff --git a/jeecg-module-app/src/main/java/org/jeecg/modules/feignclient/StationService.java b/jeecg-module-app/src/main/java/org/jeecg/modules/feignclient/StationService.java new file mode 100644 index 00000000..630b5152 --- /dev/null +++ b/jeecg-module-app/src/main/java/org/jeecg/modules/feignclient/StationService.java @@ -0,0 +1,4 @@ +package org.jeecg.modules.feignclient; + +public interface StationService { +} diff --git a/jeecg-module-app/src/main/java/org/jeecg/modules/service/LoginService.java b/jeecg-module-app/src/main/java/org/jeecg/modules/feignclient/SystemClient.java similarity index 90% rename from jeecg-module-app/src/main/java/org/jeecg/modules/service/LoginService.java rename to jeecg-module-app/src/main/java/org/jeecg/modules/feignclient/SystemClient.java index b755cd72..5f87e85e 100644 --- a/jeecg-module-app/src/main/java/org/jeecg/modules/service/LoginService.java +++ b/jeecg-module-app/src/main/java/org/jeecg/modules/feignclient/SystemClient.java @@ -1,8 +1,7 @@ -package org.jeecg.modules.service; +package org.jeecg.modules.feignclient; import com.alibaba.fastjson.JSONObject; import org.jeecg.common.api.vo.Result; -import org.jeecg.modules.base.entity.postgre.SysEmail; import org.jeecg.modules.model.SysLoginModel; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.stereotype.Component; @@ -15,7 +14,7 @@ import javax.servlet.http.HttpServletResponse; @Component @FeignClient(value = "armd-system", path = "/sys") -public interface LoginService { +public interface SystemClient { /** * 登录 diff --git a/jeecg-module-app/src/main/java/org/jeecg/modules/feignclient/WebService.java b/jeecg-module-app/src/main/java/org/jeecg/modules/feignclient/WebService.java new file mode 100644 index 00000000..94bc614d --- /dev/null +++ b/jeecg-module-app/src/main/java/org/jeecg/modules/feignclient/WebService.java @@ -0,0 +1,15 @@ +package org.jeecg.modules.feignclient; + +import com.alibaba.fastjson.JSONObject; +import org.jeecg.common.api.vo.Result; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.stereotype.Component; +import org.springframework.web.bind.annotation.GetMapping; + +@Component +@FeignClient(value = "armd-web-statistics", path = "/sys") +public interface WebService { + + @GetMapping("/webStatistics/findStationList") + Result findStationList(); +} diff --git a/jeecg-module-app/src/main/java/org/jeecg/modules/service/AlarmService.java b/jeecg-module-app/src/main/java/org/jeecg/modules/service/AlarmService.java deleted file mode 100644 index 20f719ce..00000000 --- a/jeecg-module-app/src/main/java/org/jeecg/modules/service/AlarmService.java +++ /dev/null @@ -1,4 +0,0 @@ -package org.jeecg.modules.service; - -public interface AlarmService { -} diff --git a/jeecg-module-app/src/main/java/org/jeecg/modules/service/AnalysisService.java b/jeecg-module-app/src/main/java/org/jeecg/modules/service/AnalysisService.java deleted file mode 100644 index f691ddc8..00000000 --- a/jeecg-module-app/src/main/java/org/jeecg/modules/service/AnalysisService.java +++ /dev/null @@ -1,4 +0,0 @@ -package org.jeecg.modules.service; - -public interface AnalysisService { -} diff --git a/jeecg-module-app/src/main/java/org/jeecg/modules/service/MessageService.java b/jeecg-module-app/src/main/java/org/jeecg/modules/service/MessageService.java deleted file mode 100644 index 41695aa2..00000000 --- a/jeecg-module-app/src/main/java/org/jeecg/modules/service/MessageService.java +++ /dev/null @@ -1,4 +0,0 @@ -package org.jeecg.modules.service; - -public interface MessageService { -} diff --git a/jeecg-module-app/src/main/java/org/jeecg/modules/service/StationService.java b/jeecg-module-app/src/main/java/org/jeecg/modules/service/StationService.java deleted file mode 100644 index a0d8afd3..00000000 --- a/jeecg-module-app/src/main/java/org/jeecg/modules/service/StationService.java +++ /dev/null @@ -1,4 +0,0 @@ -package org.jeecg.modules.service; - -public interface StationService { -} diff --git a/jeecg-module-app/src/main/java/org/jeecg/modules/service/WebService.java b/jeecg-module-app/src/main/java/org/jeecg/modules/service/WebService.java deleted file mode 100644 index 79e1625c..00000000 --- a/jeecg-module-app/src/main/java/org/jeecg/modules/service/WebService.java +++ /dev/null @@ -1,4 +0,0 @@ -package org.jeecg.modules.service; - -public interface WebService { -} From 01fd821a10490836dc4353c3d05cecca4de04639 Mon Sep 17 00:00:00 2001 From: qiaoqinzheng Date: Mon, 5 Feb 2024 12:57:52 +0800 Subject: [PATCH 3/6] =?UTF-8?q?DATA=5FBASE=E5=88=A0=E9=99=A4=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E6=97=B6=EF=BC=8C=E5=9B=A0=E4=B8=BA=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E8=B7=AF=E5=BE=84=E9=97=AE=E9=A2=98=E6=8F=90=E7=A4=BA=E5=88=A0?= =?UTF-8?q?=E9=99=A4=E5=A4=B1=E8=B4=A5=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/org/jeecg/common/util/FTPUtil.java | 59 +++++++++++++++++-- .../jeecg/modules/base/dto/AnalysesDto.java | 2 + .../system/mapper/GardsSampleDataMapper.java | 2 +- .../mapper/xml/GardsSampleDataMapper.xml | 11 ++-- .../impl/GardsSampleDataServiceImpl.java | 49 +++++++++------ 5 files changed, 93 insertions(+), 30 deletions(-) diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/FTPUtil.java b/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/FTPUtil.java index 0bb70f56..cb3427fd 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/FTPUtil.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/FTPUtil.java @@ -356,6 +356,45 @@ public class FTPUtil { } } + /* + * 批量删除FTP文件 返回删除失败的文件路径 + * */ + public boolean removeFiles(String path){ + boolean success = false; + // 连接FTP服务 + final FTPClient ftpClient = this.LoginFTP(); + //判断ftp是否连接成功 + if (ObjectUtil.isNull(ftpClient)){ + log.error("FTPUtil.removeFiles(): FTPClient is null"); + } + InputStream inputStream = null; + try { + inputStream = ftpClient.retrieveFileStream(path); + //读取文件路径的流 如果文件存在则读取流数据不为空 + if (Objects.nonNull(inputStream)) { + //删除文件 + success = ftpClient.deleteFile(path); + } + //日志输出文件删除状态 + log.info(path + " Delete Status:"+success); + } catch (Exception e) { + log.error("FTPUtil.removeFiles()删除文件[{}]失败: {}", path, e.getMessage()); + } finally { + // 关闭FTP连接 + try { + if (Objects.nonNull(inputStream)) { + inputStream.close(); + } + if (ObjectUtil.isNotNull(ftpClient)) { + ftpClient.disconnect(); + } + } catch (IOException e) { + e.printStackTrace(); + } + } + return success; + } + /* * 批量删除FTP文件 返回删除失败的文件路径 * */ @@ -369,12 +408,19 @@ public class FTPUtil { return paths; } for (String path : paths) { + boolean success = false; try { - if (StrUtil.isBlank(path)) continue; - boolean success = ftpClient.deleteFile(path); - if (success) continue; - failList.add(path); - log.error("FTPUtil.removeFiles()删除文件[{}]失败", path); + if (StrUtil.isBlank(path)) { + continue; + } + if (Objects.nonNull(ftpClient.retrieveFileStream(path))) { + success = ftpClient.deleteFile(path); + log.info(path + " Delete Status:"+success); + } else { + log.info(path + " Delete Status:false"); + failList.add(path); + log.error("FTPUtil.removeFiles()删除文件[{}]失败", path); + } } catch (Exception e) { failList.add(path); log.error("FTPUtil.removeFiles()删除文件[{}]失败: {}", path, e.getMessage()); @@ -382,8 +428,9 @@ public class FTPUtil { } // 关闭FTP连接 try { - if (ObjectUtil.isNotNull(ftpClient)) + if (ObjectUtil.isNotNull(ftpClient)) { ftpClient.disconnect(); + } } catch (IOException e) { e.printStackTrace(); } diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/dto/AnalysesDto.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/dto/AnalysesDto.java index 7e6ba90d..6db94d0b 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/dto/AnalysesDto.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/dto/AnalysesDto.java @@ -5,6 +5,8 @@ import lombok.Data; @Data public class AnalysesDto { + private Integer sampleId; + private String baselinePath; private String lcPath; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/GardsSampleDataMapper.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/GardsSampleDataMapper.java index fee55dfe..2039e979 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/GardsSampleDataMapper.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/GardsSampleDataMapper.java @@ -19,6 +19,6 @@ public interface GardsSampleDataMapper extends BaseMapper void delBatch(@Param("tableNames") List tableNames, @Param("sampleId") Integer sampleId); - AnalysesDto getAnalysis(@Param("owner") String owner, + List getAnalysis(@Param("owner") String owner, @Param("sampleId") Integer sampleId); } diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/GardsSampleDataMapper.xml b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/GardsSampleDataMapper.xml index 5f83e28a..55ba83d2 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/GardsSampleDataMapper.xml +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/GardsSampleDataMapper.xml @@ -25,11 +25,12 @@