修改实务认知得分和智能评分规则

src/main/java/com/sztzjy/fund_investment/config/security/TokenProvider.java

@@ -132,7 +132,7 @@ public class TokenProvider {
 
     //生成智云平台32字节密钥
     public static void main(String[] args) {
-        getJWTUserByZhiYun("eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJjb2xsZWdlIjoi5ryU56S65a2m6ZmiIiwiaWNpYnRTY2hvb2xJZCI6NCwibWQ1UHdkIjoiNDYtRjktNEMtOEQtRTEtNEYtQjMtNjYtODAtODUtMDctNjgtRkYtMUItN0YtMkEiLCJyb2xlaWQiOiI0Iiwic2V4Ijoi55S3IiwidXNlcklkIjoiNDkyIiwic3R1ZGVudElkIjoiNDA1MSIsInBhc3N3b3JkIjoiMTIzcXdlIiwiY2xhc3NJZCI6IjIxNiIsImljaWJ0Q2xhc3NJZCI6MjA5LCJtYWpvciI6IuS6p-WTgea8lOekuuS4k-S4miIsInNjaG9vbCI6IuWkqeaLqeWkp-WtpiIsInNjaG9vbElkIjoiMjMyIiwibmFtZSI6InR6czAwNiIsInN0dWRlbnRObyI6InR6czAwNiIsImFwcGxpY2F0aW9uSWQiOiIxMjIiLCJjbGFzcyI6IuWkqeaLqea8lOekujbnj60iLCJ1c2VybmFtZSI6InR6czAwNiJ9.P6EmI0cQoAZwuoPJrwRjtjZNSCANUtxcRebQTtm0HOI");
+        getJWTUserByZhiYun("eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJjb2xsZWdlIjoi5ryU56S65a2m6ZmiIiwiaWNpYnRTY2hvb2xJZCI6NCwibWQ1UHdkIjoiNDYtRjktNEMtOEQtRTEtNEYtQjMtNjYtODAtODUtMDctNjgtRkYtMUItN0YtMkEiLCJyb2xlaWQiOiI0Iiwic2V4Ijoi55S3IiwidXNlcklkIjoiNDkyIiwic3R1ZGVudElkIjoiNDA1MSIsInBhc3N3b3JkIjoiMTIzcXdlIiwiY2xhc3NJZCI6IjIxNiIsImljaWJ0Q2xhc3NJZCI6MjA5LCJtYWpvciI6IuS6p-WTgea8lOekuuS4k-S4miIsInNjaG9vbCI6IuWkqeaLqeWkp-WtpiIsInNjaG9vbElkIjoiMjMyIiwibmFtZSI6InR6czAwNiIsInN0dWRlbnRObyI6InR6czAwNiIsImFwcGxpY2F0aW9uSWQiOiIxMjIiLCJjbGFzcyI6IuWkqeaLqea8lOekujbnj60iLCJ1c2VybmFtZSI6InR6czAwNiJ9.252uWMvke17Es1P82g3xHMTx6yfAGKt0jU3Q0TJC_9I");
 //        String prefix = "zy_wh_mnjy_";
 //        String generatedKey = generateKey(prefix);
 //        System.out.println("Generated Key: " + generatedKey);

src/main/java/com/sztzjy/fund_investment/controller/UserController.java

@@ -7,10 +7,7 @@ import com.sztzjy.fund_investment.config.exception.UnAuthorizedException;
 import com.sztzjy.fund_investment.config.security.JwtUser;
 import com.sztzjy.fund_investment.config.security.LoginResult;
 import com.sztzjy.fund_investment.config.security.TokenProvider;
-import com.sztzjy.fund_investment.entity.Flow;
-import com.sztzjy.fund_investment.entity.PerformanceScore;
-import com.sztzjy.fund_investment.entity.PerformanceScoreExample;
-import com.sztzjy.fund_investment.entity.User;
+import com.sztzjy.fund_investment.entity.*;
 import com.sztzjy.fund_investment.entity.dto.EvaluationLevel;
 import com.sztzjy.fund_investment.entity.dto.PerformanceTrainingScoreDto;
 import com.sztzjy.fund_investment.mapper.FlowMapper;
@@ -31,10 +28,7 @@ import org.springframework.security.authentication.UsernamePasswordAuthenticatio
 import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.context.SecurityContextHolder;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import java.lang.reflect.Field;
@@ -218,7 +212,7 @@ public class UserController {
                 flow1.setFlowId(uuid);
                 flowMapper.insert(flow1);
                 map.put("flowId", uuid);
-            }else {
+            } else {
                 map.put("flowId", flow.getFlowId());
             }
             return new ResultEntity(HttpStatus.OK, map);
@@ -226,6 +220,47 @@ public class UserController {
     }
 
 
+    @ApiOperation("根据用户Code查询该用户是否存在个人赛用户数据，存在则返回，不存在则新增后返回，用于智云3.0创建用户后调用该接口创建用户个人赛")
+    @PostMapping("/checkOrCreateForexSimulationUser")
+    @AnonymousAccess
+    public String checkOrCreateForexSimulationUser(@RequestBody List<ZYUserInfo> zyUserInfoList) {
+        List<User> users = new ArrayList<>();
+        for (int i = 0; i < zyUserInfoList.size(); i++) {
+            ZYUserInfo zyUserInfo = zyUserInfoList.get(i);
+            Integer zyUserId = zyUserInfo.getUserId();
+            String username = zyUserInfo.getUsername();   // studentid
+            User user = userMapper.selectByPrimaryKey(String.valueOf(zyUserId));
+            if (user != null) {
+                continue;
+            }
+            User stuUser = new User();
+            stuUser.setUserid(String.valueOf(zyUserId));
+            stuUser.setStudentId(zyUserInfo.getUsername());
+            stuUser.setName(zyUserInfo.getName());
+            stuUser.setUsername(username);
+            stuUser.setClassId(zyUserInfo.getClassId().toString());
+            stuUser.setClassName(zyUserInfo.getClassName());
+            stuUser.setPassword(zyUserInfo.getPassword());
+            stuUser.setPhone(zyUserInfo.getPhone());
+            stuUser.setRoleId( zyUserInfo.getRoleId()); //3教师  4学生
+            stuUser.setSchoolId(zyUserInfo.getSchoolId().toString());
+            stuUser.setSchoolName(zyUserInfo.getSchoolName());
+            stuUser.setCreateTime(new Date());
+            users.add(stuUser);
+        }
+        if (users.isEmpty()) {
+            return "账号已全部存在";
+        }
+        try {
+            userMapper.batchInsertStudents(users);
+            return "ok";
+        } catch (Exception e) {
+            e.printStackTrace();
+            return "false";
+        }
+    }
+
+
     /* 封装MAP并生成flow表数据
      * @author xcj
      * @Date 2024/1/3

src/main/java/com/sztzjy/fund_investment/entity/ZYUserInfo.java

@@ -0,0 +1,25 @@
+package com.sztzjy.fund_investment.entity;
+
+import lombok.Data;
+
+/**
+ * @Author xcj
+ * @Date 2024/8/7
+ */
+@Data
+public class ZYUserInfo {
+    private String username;
+    private String password;
+    private String name;
+    private Integer userId;
+    private  Integer roleId;
+    private Integer schoolId;
+    private String schoolName;
+    private Integer classId;
+    private String className;
+    private String phone;
+    private Long collegeId;
+    private  String collegeName;
+    private Long majorId;
+    private String majorName;
+}

src/main/java/com/sztzjy/fund_investment/mapper/UserMapper.java

@@ -41,4 +41,5 @@ public interface UserMapper {
 
     List<UserDto>getStudentScoreDetails(@Param("schoolId") String schoolId, @Param("classId")String classId, @Param("studentIdOrName")String studentIdOrName);
 
+    void batchInsertStudents(@Param("list") List<User> users);
 }

src/main/resources/mappers/UserMapper.xml

@@ -2,22 +2,22 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.sztzjy.fund_investment.mapper.UserMapper">
     <resultMap id="BaseResultMap" type="com.sztzjy.fund_investment.entity.User">
-    <id column="userid" jdbcType="VARCHAR" property="userid" />
-    <result column="name" jdbcType="VARCHAR" property="name" />
-    <result column="student_id" jdbcType="VARCHAR" property="studentId" />
-    <result column="class_name" jdbcType="VARCHAR" property="className" />
-    <result column="class_id" jdbcType="VARCHAR" property="classId" />
-    <result column="username" jdbcType="VARCHAR" property="username" />
-    <result column="password" jdbcType="VARCHAR" property="password" />
-    <result column="phone" jdbcType="VARCHAR" property="phone" />
-    <result column="role_id" jdbcType="INTEGER" property="roleId" />
-    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
-    <result column="school_id" jdbcType="VARCHAR" property="schoolId" />
-    <result column="school_name" jdbcType="VARCHAR" property="schoolName" />
-    <result column="un" jdbcType="VARCHAR" property="un" />
-    <result column="dis" jdbcType="VARCHAR" property="dis" />
-    <result column="access_token" jdbcType="VARCHAR" property="accessToken" />
-    <result column="login_type" jdbcType="INTEGER" property="loginType" />
+        <id column="userid" jdbcType="VARCHAR" property="userid"/>
+        <result column="name" jdbcType="VARCHAR" property="name"/>
+        <result column="student_id" jdbcType="VARCHAR" property="studentId"/>
+        <result column="class_name" jdbcType="VARCHAR" property="className"/>
+        <result column="class_id" jdbcType="VARCHAR" property="classId"/>
+        <result column="username" jdbcType="VARCHAR" property="username"/>
+        <result column="password" jdbcType="VARCHAR" property="password"/>
+        <result column="phone" jdbcType="VARCHAR" property="phone"/>
+        <result column="role_id" jdbcType="INTEGER" property="roleId"/>
+        <result column="create_time" jdbcType="TIMESTAMP" property="createTime"/>
+        <result column="school_id" jdbcType="VARCHAR" property="schoolId"/>
+        <result column="school_name" jdbcType="VARCHAR" property="schoolName"/>
+        <result column="un" jdbcType="VARCHAR" property="un"/>
+        <result column="dis" jdbcType="VARCHAR" property="dis"/>
+        <result column="access_token" jdbcType="VARCHAR" property="accessToken"/>
+        <result column="login_type" jdbcType="INTEGER" property="loginType"/>
     </resultMap>
     <sql id="Example_Where_Clause">
         <where>
@@ -37,7 +37,8 @@
                                 </when>
                                 <when test="criterion.listValue">
                                     and ${criterion.condition}
-                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                                    <foreach close=")" collection="criterion.value" item="listItem" open="("
+                                             separator=",">
                                         #{listItem}
                                     </foreach>
                                 </when>
@@ -66,7 +67,8 @@
                                 </when>
                                 <when test="criterion.listValue">
                                     and ${criterion.condition}
-                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                                    <foreach close=")" collection="criterion.value" item="listItem" open="("
+                                             separator=",">
                                         #{listItem}
                                     </foreach>
                                 </when>
@@ -78,26 +80,28 @@
         </where>
     </sql>
     <sql id="Base_Column_List">
-    userid, name, student_id, class_name, class_id, username, password, phone, role_id, 
+        userid
+        , name, student_id, class_name, class_id, username, password, phone, role_id,
     create_time, school_id, school_name, un, dis, access_token, login_type
     </sql>
 
     <select id="selectByUn" parameterType="java.lang.String" resultMap="BaseResultMap">
         select
-    <include refid="Base_Column_List" />
+        <include refid="Base_Column_List"/>
         from wx_user
         where un = #{un,jdbcType=VARCHAR}
     </select>
 
-  <select id="selectByExample" parameterType="com.sztzjy.fund_investment.entity.UserExample" resultMap="BaseResultMap">
+    <select id="selectByExample" parameterType="com.sztzjy.fund_investment.entity.UserExample"
+            resultMap="BaseResultMap">
         select
         <if test="distinct">
             distinct
         </if>
-    <include refid="Base_Column_List" />
+        <include refid="Base_Column_List"/>
         from wx_user
         <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
+            <include refid="Example_Where_Clause"/>
         </if>
         <if test="orderByClause != null">
             order by ${orderByClause}
@@ -105,18 +109,19 @@
     </select>
     <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
         select
-    <include refid="Base_Column_List" />
+        <include refid="Base_Column_List"/>
         from wx_user
         where userid = #{userid,jdbcType=VARCHAR}
     </select>
     <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
-    delete from wx_user
+        delete
+        from wx_user
         where userid = #{userid,jdbcType=VARCHAR}
     </delete>
     <delete id="deleteByExample" parameterType="com.sztzjy.fund_investment.entity.UserExample">
         delete from wx_user
         <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
+            <include refid="Example_Where_Clause"/>
         </if>
     </delete>
     <insert id="insert" parameterType="com.sztzjy.fund_investment.entity.User">
@@ -236,10 +241,11 @@
             </if>
         </trim>
     </insert>
-  <select id="countByExample" parameterType="com.sztzjy.fund_investment.entity.UserExample" resultType="java.lang.Long">
+    <select id="countByExample" parameterType="com.sztzjy.fund_investment.entity.UserExample"
+            resultType="java.lang.Long">
         select count(*) from wx_user
         <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
+            <include refid="Example_Where_Clause"/>
         </if>
     </select>
     <update id="updateByExampleSelective" parameterType="map">
@@ -295,7 +301,7 @@
             </if>
         </set>
         <if test="_parameter != null">
-      <include refid="Update_By_Example_Where_Clause" />
+            <include refid="Update_By_Example_Where_Clause"/>
         </if>
     </update>
     <update id="updateByExample" parameterType="map">
@@ -317,7 +323,7 @@
         access_token = #{record.accessToken,jdbcType=VARCHAR},
         login_type = #{record.loginType,jdbcType=INTEGER}
         <if test="_parameter != null">
-      <include refid="Update_By_Example_Where_Clause" />
+            <include refid="Update_By_Example_Where_Clause"/>
         </if>
     </update>
     <update id="updateByPrimaryKeySelective" parameterType="com.sztzjy.fund_investment.entity.User">
@@ -431,4 +437,17 @@
     </select>
 
 
+    <insert id="batchInsertStudents" parameterType="java.util.List">
+        insert into wx_user (userid, name, student_id,
+        class_name, class_id, username,
+        password, phone, role_id,
+        create_time, school_id, school_name)
+        values
+        <foreach collection="list" item="student" separator=",">
+            (#{student.userid,jdbcType=VARCHAR}, #{student.name,jdbcType=VARCHAR}, #{student.studentId,jdbcType=VARCHAR},
+            #{student.className,jdbcType=VARCHAR}, #{student.classId,jdbcType=VARCHAR}, #{student.username,jdbcType=VARCHAR},
+            #{student.password,jdbcType=VARCHAR}, #{student.phone,jdbcType=VARCHAR}, #{student.roleId,jdbcType=INTEGER},
+            #{student.createTime,jdbcType=TIMESTAMP}, #{student.schoolId,jdbcType=VARCHAR}, #{student.schoolName,jdbcType=VARCHAR})
+        </foreach>
+    </insert>
 </mapper>