1、swagger接口文档

admin-core/src/main/java/com/ibeetl/admin/core/dao/CoreUserDao.java

@@ -57,4 +57,6 @@ public interface CoreUserDao extends BaseMapper<CoreUser> {
 
     List<CoreUser> getCoreUserListAndOldIdIsNull();
     CoreUser getCoreUserByOldId(Long oldId);
+
+    CoreUser findByUsername(String username);
 }

admin-core/src/main/java/com/ibeetl/admin/core/service/CoreUserService.java

@@ -288,4 +288,8 @@ public class CoreUserService extends CoreBaseService<CoreUser> {
 	public void updateUserId(Long newId,Long oldId){
 		coreUserDao.updateUserId(newId, oldId);
 	}
+
+	public CoreUser findByUsername(String username){
+		return  coreUserDao.findByUsername(username);
+	}
 }

admin-core/src/main/resources/sql/core/coreUser.md

@@ -160,4 +160,8 @@ getCoreUserListAndOldIdIsNull
 
 getCoreUserByOldId
 ===
-select * from core_user where old_id = #oldId#
+select * from core_user where old_id = #oldId#
+
+findByUsername
+===
+ select * from core_user where CODE = #username#

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> {
+
+    HsValues findByCreateTime(String createTime);
+}

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;
+    }
+}

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);
+    }
+}

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<Integer> 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);
+    }
 }

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#