From 567c6d93fffbb19bf3d944a73df655e0a7be26c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=B2=85?= <907037276@qq.com> Date: Thu, 21 Dec 2023 10:44:30 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81swagger=E6=8E=A5=E5=8F=A3=E6=96=87?= =?UTF-8?q?=E6=A1=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ibeetl/admin/core/dao/CoreUserDao.java | 2 + .../admin/core/service/CoreUserService.java | 4 ++ .../src/main/resources/sql/core/coreUser.md | 6 ++- .../java/com/ibeetl/jlw/dao/HsValuesDao.java | 16 +++++++ .../java/com/ibeetl/jlw/entity/HsValues.java | 46 +++++++++++++++++++ .../ibeetl/jlw/service/HsValuesService.java | 26 +++++++++++ .../com/ibeetl/jlw/web/AccountController.java | 39 ++++++++++++++++ web/src/main/resources/sql/jlw/HsValues.md | 3 ++ 8 files changed, 141 insertions(+), 1 deletion(-) create mode 100644 web/src/main/java/com/ibeetl/jlw/dao/HsValuesDao.java create mode 100644 web/src/main/java/com/ibeetl/jlw/entity/HsValues.java create mode 100644 web/src/main/java/com/ibeetl/jlw/service/HsValuesService.java create mode 100644 web/src/main/resources/sql/jlw/HsValues.md diff --git a/admin-core/src/main/java/com/ibeetl/admin/core/dao/CoreUserDao.java b/admin-core/src/main/java/com/ibeetl/admin/core/dao/CoreUserDao.java index 5ce7c5eb..8299865d 100644 --- a/admin-core/src/main/java/com/ibeetl/admin/core/dao/CoreUserDao.java +++ b/admin-core/src/main/java/com/ibeetl/admin/core/dao/CoreUserDao.java @@ -57,4 +57,6 @@ public interface CoreUserDao extends BaseMapper { List getCoreUserListAndOldIdIsNull(); CoreUser getCoreUserByOldId(Long oldId); + + CoreUser findByUsername(String username); } diff --git a/admin-core/src/main/java/com/ibeetl/admin/core/service/CoreUserService.java b/admin-core/src/main/java/com/ibeetl/admin/core/service/CoreUserService.java index 977aa6a9..47d2e9ef 100644 --- a/admin-core/src/main/java/com/ibeetl/admin/core/service/CoreUserService.java +++ b/admin-core/src/main/java/com/ibeetl/admin/core/service/CoreUserService.java @@ -288,4 +288,8 @@ public class CoreUserService extends CoreBaseService { public void updateUserId(Long newId,Long oldId){ coreUserDao.updateUserId(newId, oldId); } + + public CoreUser findByUsername(String username){ + return coreUserDao.findByUsername(username); + } } diff --git a/admin-core/src/main/resources/sql/core/coreUser.md b/admin-core/src/main/resources/sql/core/coreUser.md index 2822e78e..261b8f33 100644 --- a/admin-core/src/main/resources/sql/core/coreUser.md +++ b/admin-core/src/main/resources/sql/core/coreUser.md @@ -160,4 +160,8 @@ getCoreUserListAndOldIdIsNull getCoreUserByOldId === -select * from core_user where old_id = #oldId# \ No newline at end of file +select * from core_user where old_id = #oldId# + +findByUsername +=== + select * from core_user where CODE = #username# \ No newline at end of file diff --git a/web/src/main/java/com/ibeetl/jlw/dao/HsValuesDao.java b/web/src/main/java/com/ibeetl/jlw/dao/HsValuesDao.java new file mode 100644 index 00000000..78ac720a --- /dev/null +++ b/web/src/main/java/com/ibeetl/jlw/dao/HsValuesDao.java @@ -0,0 +1,16 @@ +package com.ibeetl.jlw.dao; + + +import com.ibeetl.jlw.entity.HsValues; +import org.beetl.sql.mapper.BaseMapper; +import org.beetl.sql.mapper.annotation.SqlResource; +import org.springframework.stereotype.Repository; + +import java.util.Date; + +@Repository +@SqlResource("jlw.hsValues") +public interface HsValuesDao extends BaseMapper { + + HsValues findByCreateTime(String createTime); +} diff --git a/web/src/main/java/com/ibeetl/jlw/entity/HsValues.java b/web/src/main/java/com/ibeetl/jlw/entity/HsValues.java new file mode 100644 index 00000000..390eb8fd --- /dev/null +++ b/web/src/main/java/com/ibeetl/jlw/entity/HsValues.java @@ -0,0 +1,46 @@ +package com.ibeetl.jlw.entity; + +import cn.jlw.validate.ValidateConfig; +import com.ibeetl.admin.core.entity.BaseEntity; +import org.beetl.sql.annotation.entity.AutoID; + +import javax.validation.constraints.NotNull; +import java.util.Date; + +public class HsValues extends BaseEntity { + + + @NotNull(message = "ID不能为空", groups = ValidateConfig.UPDATE.class) + // @SeqID(name = ORACLE_CORE_SEQ_NAME) + @AutoID + + private Integer id ; + + private Double hsValue; + + private Date createTime; + + public Integer getId() { + return id; + } + + public void setId(Integer id) { + this.id = id; + } + + public Double getHsValue() { + return hsValue; + } + + public void setHsValue(Double hsValue) { + this.hsValue = hsValue; + } + + public Date getCreateTime() { + return createTime; + } + + public void setCreateTime(Date createTime) { + this.createTime = createTime; + } +} diff --git a/web/src/main/java/com/ibeetl/jlw/service/HsValuesService.java b/web/src/main/java/com/ibeetl/jlw/service/HsValuesService.java new file mode 100644 index 00000000..53b30a53 --- /dev/null +++ b/web/src/main/java/com/ibeetl/jlw/service/HsValuesService.java @@ -0,0 +1,26 @@ +package com.ibeetl.jlw.service; + + +import com.ibeetl.jlw.dao.HsValuesDao; +import com.ibeetl.jlw.entity.HsValues; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.text.SimpleDateFormat; +import java.util.Date; + +@Service +@Transactional +public class HsValuesService { + + @Autowired + private HsValuesDao hsValuesDao; + + + + public HsValues findByCreateTime(String createTime){ + + return hsValuesDao.findByCreateTime(createTime); + } +} diff --git a/web/src/main/java/com/ibeetl/jlw/web/AccountController.java b/web/src/main/java/com/ibeetl/jlw/web/AccountController.java index 3e7ee62e..68bd559a 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/AccountController.java +++ b/web/src/main/java/com/ibeetl/jlw/web/AccountController.java @@ -21,6 +21,7 @@ import org.springframework.web.bind.annotation.RestController; import java.math.BigDecimal; import java.sql.*; +import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -56,6 +57,10 @@ public class AccountController { @Autowired private TeacherService teacherService; + @Autowired + private CoreUserService coreUserService; + @Autowired + private HsValuesService hsValuesService; private final static String URL = "jdbc:sqlserver://120.79.161.177:1433;databaseName=Test.Zhiyun_v2.0;trustServerCertificate=true;encrypt=true"; private final static String USER = "sa"; @@ -1048,4 +1053,38 @@ public class AccountController { } return JsonResult.success(); } + + @ApiOperation("智云2.0接口:GetListUserIdByUserName") + @GetMapping("GetListUserIdByUserName.json") + public JsonResult GetListUserIdByUserName(String studentNo) { + //根据逗号分隔studentNo + List userIds = new ArrayList<>(); + String[] studentNos = studentNo.split(","); + for(String s : studentNos){ + CoreUser coreUser = coreUserService.findByUsername(s); + if(coreUser!=null){ + userIds.add(coreUser.getOldId().intValue()); + } + } + return JsonResult.success(userIds); + } + + @ApiOperation("智云2.0接口:GetUserNameByUserId") + @GetMapping("GetUserNameByUserId.json") + public JsonResult GetUserNameByUserId(Integer userId) { + if (userId != null) { + CoreUser user = userService.findByOldId(Long.valueOf(userId)); + if (user != null) { + return JsonResult.success(user.getCode()); + } + } + return JsonResult.success(); + } + + @ApiOperation("智云2.0接口:GetBenchmarkRateOfReturn") + @GetMapping("GetBenchmarkRateOfReturn.json") + public JsonResult GetBenchmarkRateOfReturn(String createTime) { + HsValues hsValues = hsValuesService.findByCreateTime(createTime); + return JsonResult.success(hsValues); + } } diff --git a/web/src/main/resources/sql/jlw/HsValues.md b/web/src/main/resources/sql/jlw/HsValues.md new file mode 100644 index 00000000..b7f876da --- /dev/null +++ b/web/src/main/resources/sql/jlw/HsValues.md @@ -0,0 +1,3 @@ +findByCreateTime +=== + select * from hs_values where DATE_FORMAT(create_time, '%Y-%m-%d') = #createTime# \ No newline at end of file