diff --git a/admin-console/src/main/java/cn/jlw/Interceptor/getSCoreUser.java b/admin-console/src/main/java/cn/jlw/Interceptor/GetSCoreUser.java similarity index 89% rename from admin-console/src/main/java/cn/jlw/Interceptor/getSCoreUser.java rename to admin-console/src/main/java/cn/jlw/Interceptor/GetSCoreUser.java index 251edf33..dd0ca133 100644 --- a/admin-console/src/main/java/cn/jlw/Interceptor/getSCoreUser.java +++ b/admin-console/src/main/java/cn/jlw/Interceptor/GetSCoreUser.java @@ -3,6 +3,7 @@ package cn.jlw.Interceptor; import com.ibeetl.admin.core.entity.CoreUser; import com.ibeetl.admin.core.service.CorePlatformService; +import org.springframework.context.annotation.Configuration; import org.springframework.core.MethodParameter; import org.springframework.web.bind.support.WebDataBinderFactory; import org.springframework.web.context.request.NativeWebRequest; @@ -13,9 +14,10 @@ import javax.servlet.http.HttpServletRequest; //将从token中获取的member获取出来 -public class getSCoreUser implements HandlerMethodArgumentResolver { +@Configuration +public class GetSCoreUser implements HandlerMethodArgumentResolver { - public getSCoreUser() { + public GetSCoreUser() { } @Override diff --git a/admin-core/src/main/java/com/ibeetl/admin/core/util/servlet/ServletUtils.java b/admin-core/src/main/java/com/ibeetl/admin/core/util/servlet/ServletUtils.java new file mode 100644 index 00000000..fac9bce8 --- /dev/null +++ b/admin-core/src/main/java/com/ibeetl/admin/core/util/servlet/ServletUtils.java @@ -0,0 +1,95 @@ +package com.ibeetl.admin.core.util.servlet; + +import cn.hutool.core.io.IoUtil; +import cn.hutool.core.util.StrUtil; +import cn.hutool.extra.servlet.ServletUtil; +import cn.hutool.json.JSONUtil; +import org.springframework.http.MediaType; +import org.springframework.web.context.request.RequestAttributes; +import org.springframework.web.context.request.RequestContextHolder; +import org.springframework.web.context.request.ServletRequestAttributes; + +import javax.servlet.ServletRequest; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.net.URLEncoder; + +/** + * 客户端工具类 + * + * @author mlx + */ +public class ServletUtils { + + /** + * 返回 JSON 字符串 + * + * @param response 响应 + * @param object 对象，会序列化成 JSON 字符串 + */ + @SuppressWarnings("deprecation") // 必须使用 APPLICATION_JSON_UTF8_VALUE，否则会乱码 + public static void writeJSON(HttpServletResponse response, Object object) { + String content = JSONUtil.toJsonStr(object); + ServletUtil.write(response, content, MediaType.APPLICATION_JSON_UTF8_VALUE); + } + + /** + * 返回附件 + * + * @param response 响应 + * @param filename 文件名 + * @param content 附件内容 + * @throws IOException + */ + public static void writeAttachment(HttpServletResponse response, String filename, byte[] content) throws IOException { + // 设置 header 和 contentType + response.setHeader("Content-Disposition", "attachment;filename=" + URLEncoder.encode(filename, "UTF-8")); + response.setContentType(MediaType.APPLICATION_OCTET_STREAM_VALUE); + // 输出附件 + IoUtil.write(response.getOutputStream(), false, content); + } + + /** + * @param request 请求 + * @return ua + */ + public static String getUserAgent(HttpServletRequest request) { + String ua = request.getHeader("User-Agent"); + return ua != null ? ua : ""; + } + + /** + * 获得请求 + * + * @return HttpServletRequest + */ + public static HttpServletRequest getRequest() { + RequestAttributes requestAttributes = RequestContextHolder.getRequestAttributes(); + if (!(requestAttributes instanceof ServletRequestAttributes)) { + return null; + } + return ((ServletRequestAttributes) requestAttributes).getRequest(); + } + + public static String getUserAgent() { + HttpServletRequest request = getRequest(); + if (request == null) { + return null; + } + return getUserAgent(request); + } + + public static String getClientIP() { + HttpServletRequest request = getRequest(); + if (request == null) { + return null; + } + return ServletUtil.getClientIP(request); + } + + public static boolean isJsonRequest(ServletRequest request) { + return StrUtil.startWithIgnoreCase(request.getContentType(), MediaType.APPLICATION_JSON_VALUE); + } + +} diff --git a/admin-core/src/main/java/com/ibeetl/admin/core/util/user/CacheUserUtil.java b/admin-core/src/main/java/com/ibeetl/admin/core/util/user/CacheUserUtil.java new file mode 100644 index 00000000..50d6c750 --- /dev/null +++ b/admin-core/src/main/java/com/ibeetl/admin/core/util/user/CacheUserUtil.java @@ -0,0 +1,55 @@ +package com.ibeetl.admin.core.util.user; + +import com.ibeetl.admin.core.entity.CoreUser; +import com.ibeetl.admin.core.service.CorePlatformService; + +import java.util.Objects; + +import static com.ibeetl.admin.core.util.servlet.ServletUtils.getRequest; + +/** + *

+ * 当前登录用户的 + *

+ * + * @author mlx + * @date 2022/9/27 + * @modified + */ + +public class CacheUserUtil { + + /** + * 获取当前登录用户 + * @return + */ + public static CoreUser getUser() { + CoreUser user = (CoreUser) getRequest().getSession().getAttribute(CorePlatformService.ACCESS_CURRENT_USER); + Objects.requireNonNull(user, "用户未登录或状态已超时！"); + return user; + } + + /** + * 获取当前登录用户的用户名 + * @return + */ + public static String getUserName() { + return getUser().getName(); + } + + /** + * 获取当前登录用户ID + * @return + */ + public static Long getUserId() { + return getUser().getId(); + } + + /** + * 获取当前登录用户的Code + * @return + */ + public static String getUserCode() { + return getUser().getCode(); + } +} diff --git a/admin-test/src/main/java/com/ibeetl/admin/test/base/BaseDbAndRedisUnitTest1.java b/admin-test/src/main/java/com/ibeetl/admin/test/base/BaseDbAndRedisUnitTest1.java deleted file mode 100644 index a419446a..00000000 --- a/admin-test/src/main/java/com/ibeetl/admin/test/base/BaseDbAndRedisUnitTest1.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.ibeetl.admin.test.base; - -import com.ibeetl.admin.test.config.RedisTestConfiguration; -import com.ibeetl.admin.test.config.SqlInitializationTestConfiguration; -import com.qeedata.data.beetlsql.dynamic.BeetlSqlBeanRegister; -import com.qeedata.data.beetlsql.dynamic.configure.DynamicBeetlSqlAutoConfiguration; -import org.junit.runner.RunWith; -import org.springframework.boot.autoconfigure.data.redis.RedisAutoConfiguration; -import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; -import org.springframework.boot.autoconfigure.jdbc.DataSourceTransactionManagerAutoConfiguration; -import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.context.annotation.Import; -import org.springframework.test.context.ActiveProfiles; -import org.springframework.test.context.jdbc.Sql; -import org.springframework.test.context.junit4.SpringRunner; - -/** - *

- * 测试基类 暂时不能用 - * TODO 暂时不能用 - *

- * - * @author mlx - * @date 2022/9/24 - * @modified - */ -@SpringBootTest(classes = {BaseDbAndRedisUnitTest1.Application.class}, webEnvironment = SpringBootTest.WebEnvironment.NONE) -@RunWith(SpringRunner.class) -@AutoConfigureMockMvc -@ActiveProfiles("test") -@Sql(scripts = "/sql/clean.sql", executionPhase = Sql.ExecutionPhase.AFTER_TEST_METHOD) // 每个单元测试结束后，清理 DB -public class BaseDbAndRedisUnitTest1 { - - @Import({ - // DB 配置类 - DataSourceAutoConfiguration.class, // Spring DB 自动配置类 - DataSourceTransactionManagerAutoConfiguration.class, // Spring 事务自动配置类 - SqlInitializationTestConfiguration.class, // SQL 初始化 - // BeetlSql 配置类 - BeetlSqlBeanRegister.class, - DynamicBeetlSqlAutoConfiguration.class, // 动态多数据源BeetlSql - // Redis 配置类 - RedisTestConfiguration.class, // Redis 测试配置类，用于启动 RedisServer - RedisAutoConfiguration.class, // Spring Redis 自动配置类 - }) - public static class Application { - } -} diff --git a/admin-test/src/main/java/com/ibeetl/admin/test/base/BaseMockitoUnitTest.java b/admin-test/src/main/java/com/ibeetl/admin/test/base/BaseMockitoUnitTest.java index 051ea9e9..d8226965 100644 --- a/admin-test/src/main/java/com/ibeetl/admin/test/base/BaseMockitoUnitTest.java +++ b/admin-test/src/main/java/com/ibeetl/admin/test/base/BaseMockitoUnitTest.java @@ -6,7 +6,7 @@ import org.mockito.junit.jupiter.MockitoExtension; /** * 纯 Mockito 的单元测试 * - * @author 芋道源码 + * @author mlx */ @ExtendWith(MockitoExtension.class) public class BaseMockitoUnitTest { diff --git a/admin-test/src/main/java/com/ibeetl/admin/test/util/test/AssertUtils.java b/admin-test/src/main/java/com/ibeetl/admin/test/util/test/AssertUtils.java index 2fe31f03..c713ee56 100644 --- a/admin-test/src/main/java/com/ibeetl/admin/test/util/test/AssertUtils.java +++ b/admin-test/src/main/java/com/ibeetl/admin/test/util/test/AssertUtils.java @@ -11,7 +11,7 @@ import java.util.Objects; /** * 单元测试，assert 断言工具类 * - * @author 芋道源码 + * @author mlx */ public class AssertUtils { diff --git a/admin-test/src/main/java/com/ibeetl/admin/test/util/test/RandomUtils.java b/admin-test/src/main/java/com/ibeetl/admin/test/util/test/RandomUtils.java index e4644281..76dc59e0 100644 --- a/admin-test/src/main/java/com/ibeetl/admin/test/util/test/RandomUtils.java +++ b/admin-test/src/main/java/com/ibeetl/admin/test/util/test/RandomUtils.java @@ -18,7 +18,7 @@ import static java.lang.Math.min; /** * 随机工具类 * - * @author 芋道源码 + * @author mlx */ public class RandomUtils { diff --git a/data_base_design/天泽数据大平台.pdb b/data_base_design/天泽数据大平台.pdb index 021306c6..3fd40a8a 100644 --- a/data_base_design/天泽数据大平台.pdb +++ b/data_base_design/天泽数据大平台.pdb @@ -1,5 +1,5 @@ - + @@ -4245,8 +4245,8 @@ Shadow=0 1661870719 1662042403 -((217597,-9765), (237341,-4161)) -((217597,-9765),(217597,-4461),(237341,-4461)) +((217597,-9765), (237341,-4365)) +((217597,-9765),(217597,-4665),(237341,-4665)) 1 8 16744576 @@ -4265,8 +4265,8 @@ Shadow=0 1661870223 1662042403 -((237341,-10555), (274056,-4161)) -((274056,-10555),(274056,-4461),(237341,-4461)) +((237341,-10555), (274056,-4365)) +((274056,-10555),(274056,-4665),(237341,-4665)) 1 8 16744576 @@ -4285,8 +4285,8 @@ Shadow=0 1661869705 1662042403 -((236979,-9765), (241244,-4461)) -((241244,-9765),(241244,-9539),(237279,-9539),(237279,-4461)) +((236975,-9765), (241244,-4665)) +((241244,-9765),(241244,-9539),(237275,-9539),(237275,-4665)) 1 8 16744576 @@ -4306,8 +4306,8 @@ Shadow=0 1661869302 1662042403 -((237041,5027), (237641,10597)) -((237341,5027),(237341,10597)) +((237041,5231), (237641,10331)) +((237341,5231),(237341,10331)) 1 8 16744576 @@ -4326,8 +4326,8 @@ Shadow=0 1661869157 1662042403 -((173166,-9765), (237341,-4161)) -((173166,-9765),(173166,-4461),(237341,-4461)) +((173166,-9765), (237341,-4365)) +((173166,-9765),(173166,-4665),(237341,-4665)) 1 8 16744576 @@ -4346,8 +4346,8 @@ Shadow=0 1661869096 1662042403 -((194111,-9765), (237341,-4161)) -((194111,-9765),(194111,-4461),(237341,-4461)) +((194111,-9765), (237341,-4365)) +((194111,-9765),(194111,-4665),(237341,-4665)) 1 8 16744576 @@ -4366,8 +4366,8 @@ Shadow=0 1661871292 1662042403 -((206132,508), (251641,8532)) -((206132,8532),(214545,8532),(214545,808),(251641,808)) +((206132,531), (252498,8532)) +((206132,8532),(214115,8532),(214115,831),(252498,831)) 1 8 16744576 @@ -4387,8 +4387,8 @@ Shadow=0 1661873621 1662047569 -((246268,43682), (266029,44282)) -((246268,43775),(262159,43775),(262159,43982),(266029,43982)) +((246268,43472), (265431,44072)) +((246268,43775),(262159,43775),(262159,43772),(265431,43772)) 1 8 16744576 @@ -4408,8 +4408,8 @@ Shadow=0 1661873633 1663942424 -((276073,55453), (276673,70644)) -((276373,70644),(276373,55453)) +((276078,55755), (276678,70644)) +((276378,70644),(276378,55755)) 1 8 16744576 @@ -4429,8 +4429,8 @@ Shadow=0 1661955336 1662048056 -((262886,18534), (283315,23535)) -((262886,18534),(262886,23235),(283315,23235)) +((262886,18534), (282578,23328)) +((262886,18534),(262886,23028),(282578,23028)) 1 8 16744576 @@ -4471,8 +4471,8 @@ Shadow=0 1661960819 1662647010 -((306801,27571), (307812,43062)) -((307812,43062),(307812,35670),(307101,35670),(307101,27571)) +((307473,27554), (308073,43057)) +((307788,43057),(307788,35670),(307773,35670),(307773,27554)) 1 8 16744576 @@ -4533,8 +4533,8 @@ Shadow=0 1661961447 1662048058 -((237341,16629), (295826,24860)) -((237341,16629),(237341,24560),(295826,24560)) +((237341,16629), (295830,24711)) +((237341,16629),(237341,24411),(295830,24411)) 1 8 16744576 @@ -4554,8 +4554,8 @@ Shadow=0 1662020600 1663511274 -((307242,-926), (328444,25106)) -((328444,-926),(328444,11662),(307542,11662),(307542,25106)) +((307940,-926), (328444,24981)) +((328444,-926),(328444,11662),(308240,11662),(308240,24981)) 1 8 16744576 @@ -4575,8 +4575,8 @@ Shadow=0 1662020790 1662647017 -((285142,31108), (286521,48461)) -((285142,48461),(285142,37421),(286221,37421),(286221,31108)) +((285356,31246), (285956,48451)) +((285669,48451),(285669,37421),(285656,37421),(285656,31246)) 1 8 16744576 @@ -4595,9 +4595,9 @@ Shadow=0 1662045015 -1662047569 -((248996,52379), (276525,52979)) -((248996,52871),(262008,52871),(262008,52679),(276525,52679)) +1664182251 +((248996,52557), (276545,53157)) +((248996,52628),(262008,52628),(262008,52857),(276545,52857)) 1 8 16744576 @@ -4617,8 +4617,8 @@ Shadow=0 1662046228 1662647031 -((301371,-1243), (302023,27797)) -((302023,-1243),(302023,15258),(301671,15258),(301671,27797)) +((301722,-1243), (302322,27790)) +((302023,-1243),(302023,15258),(302022,15258),(302022,27790)) 1 8 16744576 @@ -4638,8 +4638,8 @@ Shadow=0 1662047541 1662047695 -((250779,30569), (296894,31870)) -((250779,31870),(278057,31870),(278057,30869),(296894,30869)) +((250779,30697), (296962,31870)) +((250779,31870),(278057,31870),(278057,30997),(296962,30997)) 1 8 16744576 @@ -4659,8 +4659,8 @@ Shadow=0 1662048005 1662048061 -((230014,25717), (295754,27797)) -((230014,27797),(230014,26017),(295754,26017)) +((230014,25632), (295754,27797)) +((230014,27797),(230014,25932),(295754,25932)) 1 8 16744576 @@ -4680,8 +4680,8 @@ Shadow=0 1662647833 1662647877 -((284830,14785), (285751,27639)) -((284830,14785),(284830,20457),(285451,20457),(285451,27639)) +((284541,14785), (285141,27625)) +((284830,14785),(284830,20457),(284841,20457),(284841,27625)) 1 8 16744576 @@ -4719,8 +4719,8 @@ Shadow=0 1662810688 1663748414 -((296366,28995), (338650,29852)) -((338650,28995),(319044,28995),(319044,29552),(296366,29552)) +((296402,28995), (338650,29922)) +((338650,28995),(319044,28995),(319044,29622),(296402,29622)) 1 8 16744576 @@ -4740,8 +4740,8 @@ Shadow=0 1662865795 1663518168 -((287795,15194), (337794,23866)) -((337794,15194),(319320,15194),(319320,23566),(287795,23566)) +((287323,15194), (337794,23674)) +((337794,15194),(319320,15194),(319320,23374),(287323,23374)) 1 8 16744576 @@ -4760,9 +4760,9 @@ Shadow=0 1623769194 -1662982681 +1664294915 -1 -((-8713,51503), (5717,66145)) +((-9119,51176), (6123,66472)) 12615680 16570034 12632256 @@ -4787,7 +4787,7 @@ LABL 0 新宋体,8,N 1623769937 1662650462 -1 -((-8585,12140), (5845,25064)) +((-8991,11854), (6251,25350)) 12615680 16570034 12632256 @@ -4839,7 +4839,7 @@ LABL 0 新宋体,8,N 1623770338 1662650462 -1 -((-8537,-14000), (5893,-218)) +((-8943,-14307), (6299,89)) 12615680 16570034 12632256 @@ -4916,9 +4916,9 @@ LABL 0 新宋体,8,N 1623826338 -1662982681 +1664294915 -1 -((42066,49567), (67344,57337)) +((41316,49404), (68094,57500)) 12615680 16570034 12632256 @@ -4943,7 +4943,7 @@ LABL 0 新宋体,8,N 1623828456 1661907266 -1 -((9827,2008), (33557,17508)) +((9127,1660), (34257,17856)) 12615680 16570034 12632256 @@ -4968,7 +4968,7 @@ LABL 0 新宋体,8,N 1623828633 1661907266 -1 -((11900,-10153), (30592,-665)) +((11359,-10357), (31133,-461)) 12615680 16570034 12632256 @@ -4993,7 +4993,7 @@ LABL 0 新宋体,8,N 1623828682 1661907266 -1 -((11667,-24122), (30359,-14634)) +((11126,-24326), (30900,-14430)) 12615680 16570034 12632256 @@ -5018,7 +5018,7 @@ LABL 0 新宋体,8,N 1623828725 1661907266 -1 -((9640,-36872), (32980,-28244)) +((8951,-37056), (33669,-28060)) 12615680 16570034 12632256 @@ -5043,7 +5043,7 @@ LABL 0 新宋体,8,N 1623828770 1661907266 -1 -((15653,18839), (32795,35199)) +((15161,18471), (33287,35567)) 12615680 16570034 12632256 @@ -5068,7 +5068,7 @@ LABL 0 新宋体,8,N 1623840859 1661907266 -1 -((33254,-11927), (48846,1855)) +((32811,-12234), (49289,2162)) 12615680 16570034 12632256 @@ -5093,7 +5093,7 @@ LABL 0 新宋体,8,N 1623841366 1661907266 -1 -((33131,-26556), (48723,-12774)) +((32688,-26863), (49166,-12467)) 12615680 16570034 12632256 @@ -5118,7 +5118,7 @@ LABL 0 新宋体,8,N 1623842834 1662449601 -1 -((73486,37723), (94890,68685)) +((72859,37006), (95517,69402)) 12615680 16570034 12632256 @@ -5141,9 +5141,9 @@ LABL 0 新宋体,8,N 1623845173 -1662982681 +1664294915 -1 -((97679,49822), (123343,66182)) +((96916,49454), (124106,66550)) 12615680 16570034 12632256 @@ -5168,7 +5168,7 @@ LABL 0 新宋体,8,N 1623845296 1662971416 -1 -((96990,38358), (114132,47846)) +((96498,38154), (114624,48050)) 12615680 16570034 12632256 @@ -5191,9 +5191,9 @@ LABL 0 新宋体,8,N 1623859429 -1662982681 +1664294915 -1 -((126318,49651), (150048,66869)) +((125618,49262), (150748,67258)) 12615680 16570034 12632256 @@ -5218,7 +5218,7 @@ LABL 0 新宋体,8,N 1623859834 1662971416 -1 -((126423,37512), (145115,47858)) +((125882,37287), (145656,48083)) 12615680 16570034 12632256 @@ -5270,7 +5270,7 @@ LABL 0 新宋体,8,N 1623860248 1662449601 -1 -((74587,-8420), (93665,7940)) +((74033,-8788), (94219,8308)) 12615680 16570034 12632256 @@ -5295,7 +5295,7 @@ LABL 0 新宋体,8,N 1623860509 1662971416 -1 -((95498,-8190), (110704,7310)) +((95068,-8538), (111134,7658)) 12615680 16570034 12632256 @@ -5320,7 +5320,7 @@ LABL 0 新宋体,8,N 1623861067 1662971416 -1 -((114786,8776), (138516,25994)) +((114086,8387), (139216,26383)) 12615680 16570034 12632256 @@ -5345,7 +5345,7 @@ LABL 0 新宋体,8,N 1623861149 1662971416 -1 -((117605,-4438), (136297,5908)) +((117064,-4663), (136838,6133)) 12615680 16570034 12632256 @@ -5370,7 +5370,7 @@ LABL 0 新宋体,8,N 1623861203 1662449601 -1 -((141079,-4769), (155123,8155)) +((140686,-5055), (155516,8441)) 12615680 16570034 12632256 @@ -5395,7 +5395,7 @@ LABL 0 新宋体,8,N 1623861290 1662971416 -1 -((117305,-17338), (135997,-6992)) +((116764,-17563), (136538,-6767)) 12615680 16570034 12632256 @@ -5447,7 +5447,7 @@ LABL 0 新宋体,8,N 1623862594 1661907266 -1 -((57984,-26243), (69704,-15037)) +((57665,-26488), (70023,-14792)) 12615680 16570034 12632256 @@ -5472,7 +5472,7 @@ LABL 0 新宋体,8,N 1623862978 1662650462 -1 -((-35647,-12252), (-10755,672)) +((-36384,-12538), (-10018,958)) 12615680 16570034 12632256 @@ -5497,7 +5497,7 @@ LABL 0 新宋体,8,N 1623863676 1662650462 -1 -((-42982,-23154), (-31262,-14526)) +((-43301,-23338), (-30943,-14342)) 12615680 16570034 12632256 @@ -5522,7 +5522,7 @@ LABL 0 新宋体,8,N 1623864141 1662650462 -1 -((-28723,-23154), (-10807,-14526)) +((-29240,-23338), (-10290,-14342)) 12615680 16570034 12632256 @@ -5547,7 +5547,7 @@ LABL 0 新宋体,8,N 1623895431 1662650462 -1 -((-56796,-23004), (-45076,-14376)) +((-57115,-23188), (-44757,-14192)) 12615680 16570034 12632256 @@ -5572,7 +5572,7 @@ LABL 0 新宋体,8,N 1625926250 1661907266 -1 -((43536,29026), (65716,46244)) +((42885,28637), (66367,46633)) 12615680 16570034 12632256 @@ -5595,9 +5595,9 @@ LABL 0 新宋体,8,N 1627129933 -1663689104 +1664294915 -1 -((98172,67457), (113378,74367)) +((97742,67314), (113808,74510)) 12615680 16570034 12632256 @@ -5622,7 +5622,7 @@ LABL 0 新宋体,8,N 1628307450 1662650462 -1 -((-42281,-32525), (-32111,-25615)) +((-42551,-32668), (-31841,-25472)) 12615680 16570034 12632256 @@ -5647,7 +5647,7 @@ LABL 0 新宋体,8,N 1628307767 1662650462 -1 -((-29124,-35573), (-10818,-24367)) +((-29652,-35818), (-10290,-24122)) 12615680 16570034 12632256 @@ -5672,7 +5672,7 @@ LABL 0 新宋体,8,N 1628340137 1661907266 -1 -((38210,20750), (49340,25942)) +((37876,20648), (49674,26044)) 12615680 16570034 12632256 @@ -5697,7 +5697,7 @@ LABL 0 新宋体,8,N 1631242896 1662650462 -1 -((-7148,-35093), (3796,-26465)) +((-7443,-35277), (4091,-26281)) 12615680 16570034 12632256 @@ -5722,7 +5722,7 @@ LABL 0 新宋体,8,N 1631243538 1662650462 -1 -((-7073,-23414), (3871,-15644)) +((-7368,-23577), (4166,-15481)) 12615680 16570034 12632256 @@ -5747,7 +5747,7 @@ LABL 0 新宋体,8,N 1661850632 1662449601 -1 -((296531,51670), (319873,62016)) +((295843,51445), (320561,62241)) 12615680 16570034 12632256 @@ -5772,7 +5772,7 @@ LABL 0 新宋体,8,N 1661872432 1662047569 -1 -((264907,41794), (287473,55576)) +((264243,41487), (288137,55883)) 12615680 16570034 12632256 @@ -5851,7 +5851,7 @@ LABL 0 新宋体,8,N 1661862847 1662042403 -1 -((224702,10597), (249980,22661)) +((223952,10331), (250730,22927)) 12615680 16570034 12632256 @@ -5930,7 +5930,7 @@ LABL 0 新宋体,8,N 1661868858 1662042403 -1 -((222959,-4461), (251723,5027)) +((222098,-4665), (252584,5231)) 12615680 16570034 12632256 @@ -6063,7 +6063,7 @@ LABL 0 新宋体,8,N 1661949359 1662042403 -1 -((283308,22355), (308200,33561)) +((282571,22110), (308937,33806)) 12615680 16570034 12632256 @@ -6223,7 +6223,7 @@ LABL 0 新宋体,8,N 1661960474 1662042403 -1 -((290333,38437), (326071,47925)) +((289251,38233), (327153,48129)) 12615680 16570034 12632256 @@ -6273,9 +6273,9 @@ LABL 0 新宋体,8,N 1662044179 -1662047569 +1664182251 -1 -((239120,50172), (259774,60288)) +((239120,49840), (259774,60288)) 0 12615680 16570034 @@ -6653,7 +6653,7 @@ LABL 0 新宋体,8,N 1663937886 1663937955 -1 -((37735,2941), (61465,20159)) +((37035,2552), (62165,20548)) 12615680 16570034 12632256 @@ -14612,10 +14612,11 @@ COLLATE = utf8_general_ci teacher_open_course_homework_id 1663942430 lx -1664170757 +1664176259 87966 题库作业ID bigint +1 1B732079-0BAA-432C-900D-C8C3CBF52938 @@ -15848,7 +15849,7 @@ COLLATE = utf8_general_ci teacher_open_course_homework_question_log 1661850632 lx -1662045090 +1664295243 lx 我的课程-题库作业-做题日志 auto_increment = 1 @@ -15881,52 +15882,86 @@ COLLATE = utf8_general_ci bigint -7492312E-B2F8-4A26-A165-E1D31D254D90 -student_upload_file -student_upload_file -1662044183 -lx -1662044827 -lx -附件，学生端上传附件（单文件） -varchar(200) -200 +8F40D113-4306-4501-9973-FFAA88015492 +resources_question_snapshot_id +resources_question_snapshot_id +1664182126 +87966 +1664182237 +87966 +题目快照ID +bigint -908C4B9C-AFDD-46B4-9E2F-BC84BEB3395B -student_score -student_score -1662044856 -lx -1662044948 -lx -学生得分 -float +96FF607B-0F40-4825-9A6C-89CD8C1C5F1B +teacher_open_course_homework_question_log_answer +teacher_open_course_homework_question_log_answer +1664182126 +87966 +1664182237 +87966 +学生提交的答案 +varchar(1000) +1000 -10DDF717-440B-465D-A18F-E9935C9BA8E4 -reply_content -reply_content -1662044856 +7492312E-B2F8-4A26-A165-E1D31D254D90 +teacher_open_course_homework_question_log_upload_file +teacher_open_course_homework_question_log_upload_file +1662044183 lx -1662044948 -lx -老师评语 -varchar(500) -500 +1664182126 +87966 +附件，学生端上传附件（单文件） +varchar(1000) +1000 C06A272B-5147-40B7-8E49-1E6B509123F6 -create_time -create_time +teacher_open_course_homework_question_log_add_time +teacher_open_course_homework_question_log_add_time 1661869211 lx -1662044179 -lx +1664182115 +87966 创建时间 datetime +4EFDDD7C-101B-4ECE-A88D-B680589D6BEA +teacher_open_course_homework_question_log_status +teacher_open_course_homework_question_log_status +1664181836 +87966 +1664182121 +87966 +状态（1正常 2删除） +int + + +7C5AFA02-3CF4-4C0D-9180-02F37466098A +teacher_open_course_homework_question_log_from_type +teacher_open_course_homework_question_log_from_type +1664294920 +lx +1664295281 +lx +来源类型（枚举） +varchar(50) +50 + + +AFCB9E46-93E2-4570-BB62-5B78208D9BAB +student_id +student_id +1664294881 +lx +1664294915 +lx +学生ID +bigint + + F8795A3A-9DD9-4F5A-906A-E6964444570C org_id org_id @@ -15937,7 +15972,7 @@ COLLATE = utf8_general_ci 组织ID bigint - + 1993A879-EC68-450A-B775-D7C2671BDA96 user_id user_id @@ -15950,7 +15985,7 @@ COLLATE = utf8_general_ci - + FF4A3064-63A4-4FAD-A71D-F66FD27F3A94 Key_1 Key_1 @@ -15964,7 +15999,7 @@ COLLATE = utf8_general_ci - + @@ -15988,7 +16023,7 @@ COLLATE = utf8_general_ci } - + 03C2172E-8A06-48E0-8C25-4102C8253653 core_setting_id core_setting_id @@ -16000,7 +16035,7 @@ COLLATE = utf8_general_ci bigint 1 - + 5090D458-E136-4D46-9D89-930A55ED9A2C setting_key setting_key @@ -16012,7 +16047,7 @@ COLLATE = utf8_general_ci varchar(100) 100 - + 0D922C4C-8420-482B-87B6-B0E99FBA62E0 setting_value setting_value @@ -16023,7 +16058,7 @@ COLLATE = utf8_general_ci 配置项 text - + A89D7A99-CD44-4F4E-8337-14A5D4BEE13E core_setting_stauts core_setting_stauts @@ -16034,7 +16069,7 @@ COLLATE = utf8_general_ci 状态 （1正常 2删除） int - + D4790CD3-3634-4FB5-B1F8-DDCA61E7AC11 create_time create_time @@ -16045,7 +16080,7 @@ COLLATE = utf8_general_ci 创建时间 datetime - + A9346C05-5EA0-4D30-A522-9DD5B13FCE7E org_id org_id @@ -16056,7 +16091,7 @@ COLLATE = utf8_general_ci 组织ID bigint - + D46E4A36-6D0D-4F64-9C58-CAC3D1285F24 user_id user_id @@ -16069,7 +16104,7 @@ COLLATE = utf8_general_ci - + 8E777505-B813-4D1D-8C5F-B6F9747BA0F4 Key_1 Key_1 @@ -16078,12 +16113,12 @@ COLLATE = utf8_general_ci 1662045362 lx - + - + @@ -16101,7 +16136,7 @@ DEFAULT CHARACTER SET = utf8 COLLATE = utf8_general_ci - + 18F050CC-F084-477F-8759-28E1D015FE0B teacher_open_course_score_dashboard_id teacher_open_course_score_dashboard_id @@ -16113,7 +16148,7 @@ COLLATE = utf8_general_ci bigint 1 - + C33241B0-D288-44ED-8554-C7086F839648 student_id student_id @@ -16124,7 +16159,7 @@ COLLATE = utf8_general_ci 学生ID bigint - + 155275C4-795A-4763-9C39-3FDF35ECECCA signin_score signin_score @@ -16135,7 +16170,7 @@ COLLATE = utf8_general_ci 签到成绩 float - + 26A9701D-C572-427D-8AD8-4D4D9DDC105D course_score course_score @@ -16146,7 +16181,7 @@ COLLATE = utf8_general_ci 章节练习成绩 float - + B1C7AFAC-3115-4EEF-855F-7578BE5C5555 real_operation_score real_operation_score @@ -16157,7 +16192,7 @@ COLLATE = utf8_general_ci 课程实操成绩 float - + AC3C7572-A095-42DE-99A5-3E8D2B9D3602 question_homework_score question_homework_score @@ -16168,7 +16203,7 @@ COLLATE = utf8_general_ci 作业成绩 float - + CB0FDAE5-DDBD-42D1-8E59-3B91E44A45C8 exam_score exam_score @@ -16179,7 +16214,7 @@ COLLATE = utf8_general_ci 考试成绩 float - + A37D010B-5B7E-4815-AC10-65C79F878234 chat_score chat_score @@ -16190,7 +16225,7 @@ COLLATE = utf8_general_ci 互动成绩 float - + D91526BC-31BA-4121-9416-7DB95281202C total_score total_score @@ -16201,7 +16236,7 @@ COLLATE = utf8_general_ci 总成绩 float - + 95464B6A-6611-4674-BBA4-EF869A472F84 manual_score manual_score @@ -16212,7 +16247,7 @@ COLLATE = utf8_general_ci 手动调整的分数 float - + 8E062DAC-DA29-4940-AEC3-1B8EFB468904 last_score last_score @@ -16223,7 +16258,7 @@ COLLATE = utf8_general_ci 最终成绩 float - + 696B62F5-6BCE-4377-8F04-F452C9FE5368 last_status last_status @@ -16235,7 +16270,7 @@ COLLATE = utf8_general_ci varchar(10) 10 - + D2334132-07CC-40C5-8A37-6F95CC12A041 org_id org_id @@ -16246,7 +16281,7 @@ COLLATE = utf8_general_ci 组织ID bigint - + 7BBBDC7F-C5E3-424A-AC3C-00E94E564F45 user_id user_id @@ -16257,7 +16292,7 @@ COLLATE = utf8_general_ci 用户ID bigint - + CE5A2441-64A4-4C2A-8646-8D6CFE6C2A73 create_time create_time @@ -16270,7 +16305,7 @@ COLLATE = utf8_general_ci - + 6B3359F7-B844-4B95-9C3B-A4AAFBA27617 Key_1 Key_1 @@ -16279,12 +16314,12 @@ COLLATE = utf8_general_ci 1662045706 lx - + - + @@ -16307,7 +16342,7 @@ COLLATE = utf8_general_ci } - + 318651DC-E71A-449A-96A8-19F27C71F4AC teacher_open_course_notice_id teacher_open_course_notice_id @@ -16319,7 +16354,7 @@ COLLATE = utf8_general_ci bigint 1 - + F972E98C-839A-4F8E-B2B7-A92F064483DB school_class_ids school_class_ids @@ -16331,7 +16366,7 @@ COLLATE = utf8_general_ci varchar(2000) 2000 - + E3F89C48-E4A1-4B9B-AE85-66EE2378EC58 teacher_open_course_ids teacher_open_course_ids @@ -16343,7 +16378,7 @@ COLLATE = utf8_general_ci varchar(2000) 2000 - + 9072D638-91A2-45E3-B01A-56FD07AC2DBC notice_title notice_title @@ -16355,7 +16390,7 @@ COLLATE = utf8_general_ci varchar(100) 100 - + 2AED03DE-64F7-47AF-810B-CC78F23EEF22 notice_content notice_content @@ -16367,7 +16402,7 @@ COLLATE = utf8_general_ci varchar(100) 100 - + 08862E80-7DDC-40DF-8E1B-DCFED6B33AC8 create_time create_time @@ -16378,7 +16413,7 @@ COLLATE = utf8_general_ci 创建时间 datetime - + A04525A6-FB16-4CCC-9753-4907D73BA676 create_by_teacher_id create_by_teacher_id @@ -16389,7 +16424,7 @@ COLLATE = utf8_general_ci 消息创建--老师ID bigint - + 3B6BA47A-A3E1-41B3-B8E8-B877AF7DFB5B org_id org_id @@ -16400,7 +16435,7 @@ COLLATE = utf8_general_ci 组织ID bigint - + E49B7F20-513A-4E10-BEE8-D5B768200303 user_id user_id @@ -16411,7 +16446,7 @@ COLLATE = utf8_general_ci 用户ID bigint - + C28FF8AA-D0BD-4EFE-8BEE-802D56989498 del_flag del_flag @@ -16424,7 +16459,7 @@ COLLATE = utf8_general_ci - + 3D2650BD-129F-48EC-B75C-872417A4E822 Key_1 Key_1 @@ -16433,12 +16468,12 @@ COLLATE = utf8_general_ci 1662046440 lx - + - + @@ -16461,7 +16496,7 @@ COLLATE = utf8_general_ci } - + 3DB701D7-DA2C-4296-853B-38D2E719CCA6 teacher_open_course_knowledge_point_id teacher_open_course_knowledge_point_id @@ -16473,7 +16508,7 @@ COLLATE = utf8_general_ci bigint 1 - + 171BF047-E676-4C5B-89B3-8B25136416A7 teacher_open_course_id teacher_open_course_id @@ -16484,7 +16519,7 @@ COLLATE = utf8_general_ci 课程开课ID bigint - + 0B7D7F9A-015D-42DD-8116-30CEC65236D8 chapter_id chapter_id @@ -16495,7 +16530,7 @@ COLLATE = utf8_general_ci 章节ID bigint - + E622D525-8AFB-4926-AE32-117E18C429E0 teacher_open_course_knowledge_point_title teacher_open_course_knowledge_point_title @@ -16507,7 +16542,7 @@ COLLATE = utf8_general_ci varchar(100) 100 - + B1BD789A-9684-4E7A-AD8A-BE79C7B6C7C8 teacher_open_course_knowledge_point_content teacher_open_course_knowledge_point_content @@ -16519,7 +16554,7 @@ COLLATE = utf8_general_ci varchar(4000) 4000 - + C44A8ACF-B4BC-4140-9003-1ADAC230C1DA teacher_open_course_knowledge_point_status teacher_open_course_knowledge_point_status @@ -16530,7 +16565,7 @@ COLLATE = utf8_general_ci 状态 （1正常 2删除） int - + 35B92FEF-A383-4FD2-AAC3-10355BCA6896 create_time create_time @@ -16541,7 +16576,7 @@ COLLATE = utf8_general_ci 创建时间 datetime - + 2745088B-3993-46E7-9035-2EF382FEC082 org_id org_id @@ -16552,7 +16587,7 @@ COLLATE = utf8_general_ci 组织ID bigint - + 9699889E-0268-4565-971A-41D449A2A5F2 user_id user_id @@ -16565,7 +16600,7 @@ COLLATE = utf8_general_ci - + 75299271-38A3-44A7-824D-00792734CF12 Key_1 Key_1 @@ -16574,12 +16609,12 @@ COLLATE = utf8_general_ci 1662047767 lx - + - + @@ -16597,7 +16632,7 @@ DEFAULT CHARACTER SET = utf8 COLLATE = utf8_general_ci - + 326FA1E3-0BA3-420E-8242-ED8A4A4F0617 student_client_link_id student_client_link_id @@ -16609,7 +16644,7 @@ COLLATE = utf8_general_ci bigint 1 - + E2FC1BD3-0EBA-4330-A432-204E68A01861 student_client_link_order student_client_link_order @@ -16620,7 +16655,7 @@ COLLATE = utf8_general_ci 导航栏排序 int - + A897CD71-A97A-450E-92FA-72474727C640 student_client_link_title student_client_link_title @@ -16632,7 +16667,7 @@ COLLATE = utf8_general_ci varchar(50) 50 - + B988F3BD-EEE2-40FB-9E5E-73ABC59935D9 student_client_link_content student_client_link_content @@ -16644,7 +16679,7 @@ COLLATE = utf8_general_ci varchar(2000) 2000 - + C9FBBBB6-7477-4B29-8A15-08222FB01DE8 student_client_link_type student_client_link_type @@ -16656,7 +16691,7 @@ COLLATE = utf8_general_ci varchar(50) 50 - + B5987B41-6AE9-469F-A36F-48C3C9674252 student_client_link_img student_client_link_img @@ -16667,7 +16702,7 @@ COLLATE = utf8_general_ci 链接图片（可用于轮播大图，icon小图等功能） text - + DD99CF28-4303-4935-8168-CE022C8C31CD student_client_link_status student_client_link_status @@ -16678,7 +16713,7 @@ COLLATE = utf8_general_ci 状态（ 1 正常 2删除） int - + 963FA155-9A25-41BA-8B52-209536B76758 student_client_link_open_type student_client_link_open_type @@ -16690,7 +16725,7 @@ COLLATE = utf8_general_ci varchar(50) 50 - + 05CE988B-2AF5-4A63-9451-25A9EF95C5DB create_time create_time @@ -16701,7 +16736,7 @@ COLLATE = utf8_general_ci 创建时间 datetime - + 1E5FBB70-DADA-4251-9BDA-85E132223109 user_id user_id @@ -16712,7 +16747,7 @@ COLLATE = utf8_general_ci 用户ID bigint - + F1483087-727F-4BFE-97BA-9692FD8D1AB2 org_id org_id @@ -16725,7 +16760,7 @@ COLLATE = utf8_general_ci - + B095A5B3-D6C4-40C4-B986-497B3849ED54 Key_1 Key_1 @@ -16734,12 +16769,12 @@ COLLATE = utf8_general_ci 1662554252 lx - + - + @@ -16757,7 +16792,7 @@ DEFAULT CHARACTER SET = utf8 COLLATE = utf8_general_ci - + CCCB7690-1E0F-4355-AC7A-ABB58CC8632B university_system_id university_system_id @@ -16769,7 +16804,7 @@ COLLATE = utf8_general_ci bigint 1 - + B0D08F82-9D1C-42E8-B332-4422FC72BF67 university_system_name university_system_name @@ -16781,7 +16816,7 @@ COLLATE = utf8_general_ci varchar(100) 100 - + 8A8F809D-A11E-4F1E-AB4B-C8B02D1DA3AB university_system_contact university_system_contact @@ -16793,7 +16828,7 @@ COLLATE = utf8_general_ci varchar(50) 50 - + 1F10D7BD-3F66-4E4E-AA41-06A06D9D00D1 university_system_contact_tel university_system_contact_tel @@ -16805,7 +16840,7 @@ COLLATE = utf8_general_ci varchar(20) 20 - + 139361B7-C257-4094-9BCE-1F8A44668480 university_system_add_time university_system_add_time @@ -16816,7 +16851,7 @@ COLLATE = utf8_general_ci 创建时间 datetime - + 7BA84D60-66CD-47EA-8DCB-025AEFC85CFF university_system_status university_system_status @@ -16827,7 +16862,7 @@ COLLATE = utf8_general_ci 状态 （1正常 2删除） int - + EE6D1A35-06C2-4560-B40B-D1E87CA5F291 university_faculty_id university_faculty_id @@ -16838,7 +16873,7 @@ COLLATE = utf8_general_ci 院系ID（学院ID） int - + 87AEE496-5BD2-4A50-ACC8-980A708FC4DB user_id user_id @@ -16849,7 +16884,7 @@ COLLATE = utf8_general_ci 用户ID bigint - + 6D140299-48E6-4630-99C8-D96E361AB3B1 org_id org_id @@ -16862,7 +16897,7 @@ COLLATE = utf8_general_ci - + F02FEAFC-6CDC-461B-BCD4-A60CB97164BA Key_1 Key_1 @@ -16871,12 +16906,12 @@ COLLATE = utf8_general_ci 1662648377 lx - + - + @@ -16894,7 +16929,7 @@ DEFAULT CHARACTER SET = utf8 COLLATE = utf8_general_ci - + 884F2204-DCE1-485E-A4B2-D4378BEE2044 university_faculty_id university_faculty_id @@ -16906,7 +16941,7 @@ COLLATE = utf8_general_ci bigint 1 - + 2AB481C3-D261-4ADD-B9F9-146124372F4B university_faculty_name university_faculty_name @@ -16918,7 +16953,7 @@ COLLATE = utf8_general_ci varchar(100) 100 - + 04BE427C-8D5A-48B8-808F-80D87158F9E4 university_faculty_contact university_faculty_contact @@ -16930,7 +16965,7 @@ COLLATE = utf8_general_ci varchar(50) 50 - + A6EF43AB-F19B-4BE5-B34E-D4AE59D57B17 university_faculty_contact_tel university_faculty_contact_tel @@ -16942,7 +16977,7 @@ COLLATE = utf8_general_ci varchar(20) 20 - + C8BE2BF4-F676-43CB-A1CE-369836C8D540 university_faculty_contact_address university_faculty_contact_address @@ -16954,7 +16989,7 @@ COLLATE = utf8_general_ci varchar(200) 200 - + 68386B1B-1359-4E14-80BB-D40EB3E6D05E universities_colleges_id universities_colleges_id @@ -16965,7 +17000,7 @@ COLLATE = utf8_general_ci 院校ID （院系的上一级） bigint - + 34891715-8E26-4F10-A789-93454383373B university_faculty_status university_faculty_status @@ -16976,7 +17011,7 @@ COLLATE = utf8_general_ci 状态（ 1 正常 2删除） int - + 7EA4E9C0-C919-4B3F-8300-66888606CDFE university_faculty_add_time university_faculty_add_time @@ -16987,7 +17022,7 @@ COLLATE = utf8_general_ci 创建时间 datetime - + 860EA0A3-DB84-4B76-BB61-CD32C4838D5E user_id user_id @@ -16998,7 +17033,7 @@ COLLATE = utf8_general_ci 用户ID bigint - + 6D5D545B-7423-4471-B969-D5AD4F7D6459 org_id org_id @@ -17011,7 +17046,7 @@ COLLATE = utf8_general_ci - + 8827D654-DDB8-4D1E-A500-362CE79333F8 Key_1 Key_1 @@ -17020,12 +17055,12 @@ COLLATE = utf8_general_ci 1662648708 lx - + - + @@ -17043,7 +17078,7 @@ DEFAULT CHARACTER SET = utf8 COLLATE = utf8_general_ci - + 5288224C-53C1-4C24-B9E9-054F89E3408E teacher_open_course_schedule_session_class_id teacher_open_course_schedule_session_class_id @@ -17055,7 +17090,7 @@ COLLATE = utf8_general_ci bigint 1 - + 9F4A9A8A-17A5-4DDE-B4C8-5B1CAB398160 teacher_open_course_schedule_session_class_name teacher_open_course_schedule_session_class_name @@ -17067,7 +17102,7 @@ COLLATE = utf8_general_ci varchar(100) 100 - + 9BC97CEE-44E7-4253-BD67-61CE17D5A991 teacher_open_course_schedule_session_class_parent_id teacher_open_course_schedule_session_class_parent_id @@ -17079,7 +17114,7 @@ COLLATE = utf8_general_ci bigint 1 - + B86F6DCB-0565-4214-A6DA-1A973CE66EA1 org_id org_id @@ -17090,7 +17125,7 @@ COLLATE = utf8_general_ci 组织ID bigint - + 056FDBB3-D0F8-4845-BD40-72B5A4B1932F user_id user_id @@ -17101,7 +17136,7 @@ COLLATE = utf8_general_ci 用户ID bigint - + 095D37B8-4403-4981-AFB2-8D79C7F04A9A teacher_open_course_schedule_session_class_add_time teacher_open_course_schedule_session_class_add_time @@ -17114,7 +17149,7 @@ COLLATE = utf8_general_ci - + 8F5B1BAF-BE16-44DE-8DF5-9A1EAD731C04 Key_1 Key_1 @@ -17123,12 +17158,12 @@ COLLATE = utf8_general_ci 1662808852 lx - + - + @@ -17146,7 +17181,7 @@ DEFAULT CHARACTER SET = utf8 COLLATE = utf8_general_ci - + 6392E614-144C-4A81-B339-C428F15B45D9 teacher_open_course_schedule_session_id teacher_open_course_schedule_session_id @@ -17158,7 +17193,7 @@ COLLATE = utf8_general_ci bigint 1 - + 84F8C272-4766-4209-9667-728323948B7D teacher_open_course_schedule_session_add_time teacher_open_course_schedule_session_add_time @@ -17169,7 +17204,7 @@ COLLATE = utf8_general_ci 创建时间 datetime - + 379DA977-579C-4E07-B57C-A112F3DDE178 teacher_open_course_schedule_session_status teacher_open_course_schedule_session_status @@ -17180,7 +17215,7 @@ COLLATE = utf8_general_ci 状态（1正常 2删除） int - + D506683D-A194-4D05-ADB9-BB50C1250024 teacher_open_course_id teacher_open_course_id @@ -17191,7 +17226,7 @@ COLLATE = utf8_general_ci 课程开课ID bigint - + 3C52ADED-57C3-4912-BE68-3F75ADDB2382 teacher_id teacher_id @@ -17202,7 +17237,7 @@ COLLATE = utf8_general_ci 教师ID bigint - + 8CD1F62C-46A8-4CF0-B2BD-294B7516B104 school_class_Ids school_class_Ids @@ -17214,7 +17249,7 @@ COLLATE = utf8_general_ci varchar(4000) 4000 - + 7A7E2C88-8FF1-48BA-A8DF-4A9A96368B9B teacher_open_course_schedule_session_start_date teacher_open_course_schedule_session_start_date @@ -17226,7 +17261,7 @@ COLLATE = utf8_general_ci varchar(20) 20 - + 9BEAE88E-4EA1-4171-8315-D61CE82BCADD teacher_open_course_schedule_session_end_date teacher_open_course_schedule_session_end_date @@ -17238,7 +17273,7 @@ COLLATE = utf8_general_ci varchar(20) 20 - + 01EA483A-4478-44D1-8032-98E2EB7DCB79 teacher_open_course_schedule_session_week_num teacher_open_course_schedule_session_week_num @@ -17249,7 +17284,7 @@ COLLATE = utf8_general_ci 周次 int - + A6D7EF46-7437-4280-B26D-396E02AF3FBD org_id org_id @@ -17260,7 +17295,7 @@ COLLATE = utf8_general_ci 组织ID bigint - + 4DCDE709-2B62-4BCE-B430-60038263BD7B user_id user_id @@ -17273,7 +17308,7 @@ COLLATE = utf8_general_ci - + F50CC5A3-3465-4699-8F69-A29E98FE137C Key_1 Key_1 @@ -17282,12 +17317,12 @@ COLLATE = utf8_general_ci 1662809607 lx - + - + @@ -17305,7 +17340,7 @@ DEFAULT CHARACTER SET = utf8 COLLATE = utf8_general_ci - + E2A6360D-5714-41B5-955B-89945A175C59 teacher_open_course_merge_teacher_id teacher_open_course_merge_teacher_id @@ -17317,7 +17352,7 @@ COLLATE = utf8_general_ci bigint 1 - + B09D0BDB-132E-4575-8B29-2EE351C1FE23 teacher_open_course_id teacher_open_course_id @@ -17328,7 +17363,7 @@ COLLATE = utf8_general_ci 课程开课ID bigint - + 7E53D94D-754B-44D9-959E-A49A6AFCA849 teacher_id teacher_id @@ -17339,7 +17374,7 @@ COLLATE = utf8_general_ci 教师ID bigint - + 3A68DDB6-31E8-415D-B94B-92B9DF070D92 teacher_open_course_merge_teacher_status teacher_open_course_merge_teacher_status @@ -17350,7 +17385,7 @@ COLLATE = utf8_general_ci 状态（1启用 2禁用） int - + 7B27FB20-159E-4340-AF84-992446D3D88E teacher_open_course_merge_teacher_add_time teacher_open_course_merge_teacher_add_time @@ -17361,7 +17396,7 @@ COLLATE = utf8_general_ci 创建时间 datetime - + 90845833-CF23-465B-B143-5499ABC48D61 teacher_open_course_merge_teacher_auth_code teacher_open_course_merge_teacher_auth_code @@ -17374,7 +17409,7 @@ COLLATE = utf8_general_ci 10 1 - + 279FE47F-88A8-4633-A510-B081884ABC72 org_id org_id @@ -17385,7 +17420,7 @@ COLLATE = utf8_general_ci 组织ID bigint - + CB1C06E4-C2EC-48D0-B1DA-529BE729E99E user_id user_id @@ -17398,7 +17433,7 @@ COLLATE = utf8_general_ci - + C35D2586-F094-4112-8601-9F10D6A9DB41 Key_1 Key_1 @@ -17407,12 +17442,12 @@ COLLATE = utf8_general_ci 1662865695 lx - + - + @@ -17430,7 +17465,7 @@ DEFAULT CHARACTER SET = utf8 COLLATE = utf8_general_ci - + 17B370CF-378E-4E64-A980-89882213C82C teacher_open_course_merge_school_class_id teacher_open_course_merge_school_class_id @@ -17442,7 +17477,7 @@ COLLATE = utf8_general_ci bigint 1 - + 236A83D5-0BEE-4129-8525-6B8D3A1B4EC6 teacher_open_course_id teacher_open_course_id @@ -17453,7 +17488,7 @@ COLLATE = utf8_general_ci 教师开课ID bigint - + 6EEFBCF7-F309-4402-9BC6-A8BD70197B84 school_class_id school_class_id @@ -17464,7 +17499,7 @@ COLLATE = utf8_general_ci 班级ID bigint - + CD1F7C9F-FAA1-48E5-B65E-A4677E110748 teacher_open_course_merge_school_class_status teacher_open_course_merge_school_class_status @@ -17475,7 +17510,7 @@ COLLATE = utf8_general_ci 状态（1启用 2禁用） int - + C090103F-8A84-4BDA-A330-9AE196279EB2 teacher_open_course_merge_school_class_add_time teacher_open_course_merge_school_class_add_time @@ -17486,7 +17521,7 @@ COLLATE = utf8_general_ci 创建时间 datetime - + 7B7183A9-BB12-43ED-B36E-F3143A525E40 org_id org_id @@ -17497,7 +17532,7 @@ COLLATE = utf8_general_ci 组织ID bigint - + 9174FB98-B263-42AB-9B54-6F9CBBA31A42 user_id user_id @@ -17510,7 +17545,7 @@ COLLATE = utf8_general_ci - + 2AFFDC6B-82E6-4E75-8F04-36F0FCDAD767 Key_1 Key_1 @@ -17519,12 +17554,12 @@ COLLATE = utf8_general_ci 1662982569 lx - + - + @@ -17542,7 +17577,7 @@ DEFAULT CHARACTER SET = utf8 COLLATE = utf8_general_ci - + FB211503-CF3E-4103-B61C-2E325317C715 data_contest_application_id data_contest_application_id @@ -17554,7 +17589,7 @@ COLLATE = utf8_general_ci bigint 1 - + 3EA632DB-A439-4642-9D80-00C4162E3D55 data_contest_application_name data_contest_application_name @@ -17565,7 +17600,7 @@ COLLATE = utf8_general_ci 大赛名称 int - + 5EEBC61F-D540-4B9F-BC81-9A7686F4CDF5 data_contest_application_host_name data_contest_application_host_name @@ -17577,7 +17612,7 @@ COLLATE = utf8_general_ci varchar(200) 200 - + 1C6BBDA4-F9EE-4CA1-BB5D-06670A2F4123 data_contest_application_technical_name data_contest_application_technical_name @@ -17589,7 +17624,7 @@ COLLATE = utf8_general_ci varchar(200) 200 - + E13737EE-A348-45CD-8CB2-7121F0BEB925 data_contest_application_lowest_number data_contest_application_lowest_number @@ -17600,7 +17635,7 @@ COLLATE = utf8_general_ci 参与最低人数 int - + 36AD5B45-E7B1-4921-B976-F32F2FB68819 data_contest_application_highest_number data_contest_application_highest_number @@ -17611,7 +17646,7 @@ COLLATE = utf8_general_ci 参与最高人数 int - + 15593A04-28EB-46C8-A5F2-55297E67B2C5 data_contest_application_status data_contest_application_status @@ -17622,7 +17657,7 @@ COLLATE = utf8_general_ci 状态（ 1 正常 2删除） int - + 1D111CDF-52D5-4666-86F0-EE3A6253D200 data_contest_application_model data_contest_application_model @@ -17634,7 +17669,7 @@ COLLATE = utf8_general_ci varchar(50) 50 - + 6A6E7C74-8503-4C41-A3CC-AB7600975C83 data_contest_application_add_time data_contest_application_add_time @@ -17645,7 +17680,7 @@ COLLATE = utf8_general_ci 创建时间 datetime - + 618BF08C-52DE-4104-878C-F4C852499EDC user_id user_id @@ -17656,7 +17691,7 @@ COLLATE = utf8_general_ci 用户ID bigint - + 86EE9B2C-375E-43DD-A5E3-442A1C7B68F8 org_id org_id @@ -17667,7 +17702,7 @@ COLLATE = utf8_general_ci 组织ID bigint - + 69E30F12-548D-4F86-AF60-423761BC363F data_contest_application_apply_start_time data_contest_application_apply_start_time @@ -17678,7 +17713,7 @@ COLLATE = utf8_general_ci 报名开始时间 datetime - + B033AC6A-AD19-4BDB-9C21-160BD3FFB825 data_contest_application_apply_end_time data_contest_application_apply_end_time @@ -17689,7 +17724,7 @@ COLLATE = utf8_general_ci 报名结束时间 datetime - + D39E9505-70CC-448B-8D7D-99F588F8426D data_contest_application_try_play_start_time data_contest_application_try_play_start_time @@ -17700,7 +17735,7 @@ COLLATE = utf8_general_ci 试玩开始时间 datetime - + 8E5672AE-76FC-48A1-A626-8074CAA46BB3 data_contest_application_try_play_end_time data_contest_application_try_play_end_time @@ -17711,7 +17746,7 @@ COLLATE = utf8_general_ci 试玩结束时间 datetime - + 97B3D96F-68C3-4E5E-9859-86A1A64A0E55 data_contest_application_stage_start_time data_contest_application_stage_start_time @@ -17722,7 +17757,7 @@ COLLATE = utf8_general_ci 大赛开始时间 datetime - + 0A898BC9-890E-496F-8263-ED3A460A3574 data_contest_application_stage_end_time data_contest_application_stage_end_time @@ -17733,7 +17768,7 @@ COLLATE = utf8_general_ci 大赛结束时间 datetime - + 6359ED80-8E01-41C8-A409-10DEEDFF293C data_contest_application_shrink_img data_contest_application_shrink_img @@ -17745,7 +17780,7 @@ COLLATE = utf8_general_ci varchar(1000) 1000 - + ECEF8ECF-C531-4ADE-8BBA-25BE7DD95249 data_contest_application_carousel_img data_contest_application_carousel_img @@ -17759,7 +17794,7 @@ COLLATE = utf8_general_ci - + B03D33F0-85A3-419F-8575-83AC3B8F2AAF Key_1 Key_1 @@ -17768,12 +17803,12 @@ COLLATE = utf8_general_ci 1663686482 87966 - + - + @@ -17791,7 +17826,7 @@ DEFAULT CHARACTER SET = utf8 COLLATE = utf8_general_ci - + 37C90E98-0F71-453A-9BB7-BCF0E255B57E teacher_open_course_schedule_session_snap_id teacher_open_course_schedule_session_snap_id @@ -17803,7 +17838,7 @@ COLLATE = utf8_general_ci bigint 1 - + F2F5E447-FAD6-4BE6-BA46-51C24C2BDBD4 teacher_open_course_schedule_session_id teacher_open_course_schedule_session_id @@ -17814,7 +17849,7 @@ COLLATE = utf8_general_ci 关联排课ID bigint - + 70519675-39D3-4A62-BE68-038DF130B07D teacher_open_course_id teacher_open_course_id @@ -17825,7 +17860,7 @@ COLLATE = utf8_general_ci 教师开课ID bigint - + A7BF3423-E11D-416F-A731-F45356E01DA9 teacher_open_course_schedule_session_snap_status teacher_open_course_schedule_session_snap_status @@ -17836,7 +17871,7 @@ COLLATE = utf8_general_ci 状态（1正常 2删除） int - + 2A1826B2-F029-47F5-88EA-8E840861A445 teacher_open_course_schedule_session_tag_name teacher_open_course_schedule_session_tag_name @@ -17848,7 +17883,7 @@ COLLATE = utf8_general_ci varchar(100) 100 - + 70662FD1-C20F-4B7C-BFED-66B4A94EBD61 teacher_open_course_schedule_session_tag_duration teacher_open_course_schedule_session_tag_duration @@ -17859,7 +17894,7 @@ COLLATE = utf8_general_ci 课程时长（分钟） int - + 3E372D23-EA27-45DF-A011-4B6D6383E811 teacher_open_course_schedule_session_day_time teacher_open_course_schedule_session_day_time @@ -17871,7 +17906,7 @@ COLLATE = utf8_general_ci varchar(20) 20 - + 16A7E02B-46FB-4640-86EE-AABB4E9C3E1A teacher_open_course_schedule_session_tag_start_time teacher_open_course_schedule_session_tag_start_time @@ -17883,7 +17918,7 @@ COLLATE = utf8_general_ci varchar(10) 10 - + 6FFBF9E4-D1A0-45F1-B109-BA039EB05C86 teacher_open_course_schedule_session_tag_end_time teacher_open_course_schedule_session_tag_end_time @@ -17895,7 +17930,7 @@ COLLATE = utf8_general_ci varchar(10) 10 - + 6C030A2B-C219-4C7D-A44D-EA4A86820E5C teacher_open_course_schedule_session_class_name teacher_open_course_schedule_session_class_name @@ -17907,7 +17942,7 @@ COLLATE = utf8_general_ci varchar(255) 255 - + 24CA63C4-331D-4E55-A333-A20B4A6DE11F teacher_open_course_schedule_session_snap_add_time teacher_open_course_schedule_session_snap_add_time @@ -17918,7 +17953,7 @@ COLLATE = utf8_general_ci 创建时间 datetime - + CB6EFB98-C675-42D2-8BE1-87A762BAFBA1 org_id org_id @@ -17929,7 +17964,7 @@ COLLATE = utf8_general_ci 组织ID bigint - + 2C5F2D72-CD86-4110-B751-E1A9F8DC1EE4 user_id user_id @@ -17942,7 +17977,7 @@ COLLATE = utf8_general_ci - + 34B82EA4-DFF5-4DAA-8DC5-88016A7E9853 Key_1 Key_1 @@ -17951,12 +17986,12 @@ COLLATE = utf8_general_ci 1663743144 87966 - + - + @@ -17974,7 +18009,7 @@ DEFAULT CHARACTER SET = utf8 COLLATE = utf8_general_ci - + AC155EE6-EF64-45BB-B846-41E20125AC83 resources_question_snapshot_id resources_question_snapshot_id @@ -17986,7 +18021,7 @@ COLLATE = utf8_general_ci bigint 1 - + D00F59E0-A483-453B-B382-AD18F74C0ABB from_id from_id @@ -18003,7 +18038,7 @@ COLLATE = utf8_general_ci - + 4CD5F796-DD7D-4978-9E99-2F93C55A9DE6 from_type from_type @@ -18016,7 +18051,7 @@ COLLATE = utf8_general_ci 100 1 - + 7CC923C5-15FB-416F-9848-3A6074318CB7 course_info_id course_info_id @@ -18027,7 +18062,7 @@ COLLATE = utf8_general_ci 课程ID bigint - + C2F9DA27-4C8F-4E1C-8FC7-097B5D5E2112 question_type question_type @@ -18039,7 +18074,7 @@ COLLATE = utf8_general_ci int(2) 2 - + D0F029A5-D1D5-41C6-A45A-8C02F71554D4 question_score question_score @@ -18052,7 +18087,7 @@ COLLATE = utf8_general_ci 3 1 - + 0ECC9C70-B0C6-4B6A-AA55-900348999E97 question_stem question_stem @@ -18064,7 +18099,7 @@ COLLATE = utf8_general_ci varchar(3000) 3000 - + 3A2CD667-596E-4179-A1C3-C84574CC2D35 question_option_a question_option_a @@ -18076,7 +18111,7 @@ COLLATE = utf8_general_ci varchar(1000) 1000 - + 904C4226-FB16-49BB-BD20-7D4B75F9F84D question_option_b question_option_b @@ -18088,7 +18123,7 @@ COLLATE = utf8_general_ci varchar(1000) 1000 - + 65D90F75-0EE9-4B45-9ABA-E0134A1861B6 question_option_c question_option_c @@ -18100,7 +18135,7 @@ COLLATE = utf8_general_ci varchar(1000) 1000 - + 5372673F-EFA4-43E1-A307-9015247C3F08 question_option_d question_option_d @@ -18112,7 +18147,7 @@ COLLATE = utf8_general_ci varchar(1000) 1000 - + 73EBF1AA-5D7F-49B4-BDDD-F43924A73C10 question_option_e question_option_e @@ -18124,7 +18159,7 @@ COLLATE = utf8_general_ci varchar(1000) 1000 - + 7AF50FDC-012A-42EB-A0EA-ADE08E1C234B question_answer question_answer @@ -18136,7 +18171,7 @@ COLLATE = utf8_general_ci varchar(255) 255 - + C73F0E11-433D-4331-98DF-1BFDFDBC7071 question_analysis question_analysis @@ -18148,7 +18183,7 @@ COLLATE = utf8_general_ci varchar(3000) 3000 - + ECFF01FA-E7F1-4AC3-A90C-02D6558F5528 question_status question_status @@ -18160,7 +18195,7 @@ COLLATE = utf8_general_ci int(2) 2 - + 97AAC8D6-13BD-4D2E-9C79-FF779394577C user_id user_id @@ -18171,7 +18206,7 @@ COLLATE = utf8_general_ci 后台用户ID bigint - + 81D26B2E-3769-4C43-A6F5-CBCD440252BC org_id org_id @@ -18184,7 +18219,7 @@ COLLATE = utf8_general_ci - + 7392447A-2744-4FA6-A36F-A826153E895A Key_1 Key_1 @@ -18193,17 +18228,17 @@ COLLATE = utf8_general_ci 1664171022 87966 - + - + - + BFEA4109-96F9-4074-AF58-B84D6574A7FC PUBLIC PUBLIC @@ -18331,7 +18366,7 @@ COLLATE = utf8_general_ci - + ABEFC813-1056-4507-A9A7-809C149B4ABE 1661954753 lx @@ -18554,7 +18589,7 @@ COLLATE = utf8_general_ci - + 5963E417-B2CE-431D-988A-B3493AAE5EE4 MySQL 5.0 MYSQL50 diff --git a/data_base_design/天泽数据大平台.pdm b/data_base_design/天泽数据大平台.pdm index f3093023..edcd92e7 100644 --- a/data_base_design/天泽数据大平台.pdm +++ b/data_base_design/天泽数据大平台.pdm @@ -1,5 +1,5 @@ - + @@ -4245,8 +4245,8 @@ Shadow=0 1661870719 1662042403 -((217597,-9765), (237341,-4161)) -((217597,-9765),(217597,-4461),(237341,-4461)) +((217597,-9765), (237341,-4365)) +((217597,-9765),(217597,-4665),(237341,-4665)) 1 8 16744576 @@ -4265,8 +4265,8 @@ Shadow=0 1661870223 1662042403 -((237341,-10555), (274056,-4161)) -((274056,-10555),(274056,-4461),(237341,-4461)) +((237341,-10555), (274056,-4365)) +((274056,-10555),(274056,-4665),(237341,-4665)) 1 8 16744576 @@ -4285,8 +4285,8 @@ Shadow=0 1661869705 1662042403 -((236979,-9765), (241244,-4461)) -((241244,-9765),(241244,-9539),(237279,-9539),(237279,-4461)) +((236975,-9765), (241244,-4665)) +((241244,-9765),(241244,-9539),(237275,-9539),(237275,-4665)) 1 8 16744576 @@ -4306,8 +4306,8 @@ Shadow=0 1661869302 1662042403 -((237041,5027), (237641,10597)) -((237341,5027),(237341,10597)) +((237041,5231), (237641,10331)) +((237341,5231),(237341,10331)) 1 8 16744576 @@ -4326,8 +4326,8 @@ Shadow=0 1661869157 1662042403 -((173166,-9765), (237341,-4161)) -((173166,-9765),(173166,-4461),(237341,-4461)) +((173166,-9765), (237341,-4365)) +((173166,-9765),(173166,-4665),(237341,-4665)) 1 8 16744576 @@ -4346,8 +4346,8 @@ Shadow=0 1661869096 1662042403 -((194111,-9765), (237341,-4161)) -((194111,-9765),(194111,-4461),(237341,-4461)) +((194111,-9765), (237341,-4365)) +((194111,-9765),(194111,-4665),(237341,-4665)) 1 8 16744576 @@ -4366,8 +4366,8 @@ Shadow=0 1661871292 1662042403 -((206132,508), (251641,8532)) -((206132,8532),(214545,8532),(214545,808),(251641,808)) +((206132,531), (252498,8532)) +((206132,8532),(214115,8532),(214115,831),(252498,831)) 1 8 16744576 @@ -4387,8 +4387,8 @@ Shadow=0 1661873621 1662047569 -((246268,43682), (266029,44282)) -((246268,43775),(262159,43775),(262159,43982),(266029,43982)) +((246268,43472), (265431,44072)) +((246268,43775),(262159,43775),(262159,43772),(265431,43772)) 1 8 16744576 @@ -4408,8 +4408,8 @@ Shadow=0 1661873633 1663942424 -((276073,55453), (276673,70644)) -((276373,70644),(276373,55453)) +((276078,55755), (276678,70644)) +((276378,70644),(276378,55755)) 1 8 16744576 @@ -4429,8 +4429,8 @@ Shadow=0 1661955336 1662048056 -((262886,18534), (283315,23535)) -((262886,18534),(262886,23235),(283315,23235)) +((262886,18534), (282578,23328)) +((262886,18534),(262886,23028),(282578,23028)) 1 8 16744576 @@ -4471,8 +4471,8 @@ Shadow=0 1661960819 1662647010 -((306801,27571), (307812,43062)) -((307812,43062),(307812,35670),(307101,35670),(307101,27571)) +((307473,27554), (308073,43057)) +((307788,43057),(307788,35670),(307773,35670),(307773,27554)) 1 8 16744576 @@ -4533,8 +4533,8 @@ Shadow=0 1661961447 1662048058 -((237341,16629), (295826,24860)) -((237341,16629),(237341,24560),(295826,24560)) +((237341,16629), (295830,24711)) +((237341,16629),(237341,24411),(295830,24411)) 1 8 16744576 @@ -4554,8 +4554,8 @@ Shadow=0 1662020600 1663511274 -((307242,-926), (328444,25106)) -((328444,-926),(328444,11662),(307542,11662),(307542,25106)) +((307940,-926), (328444,24981)) +((328444,-926),(328444,11662),(308240,11662),(308240,24981)) 1 8 16744576 @@ -4575,8 +4575,8 @@ Shadow=0 1662020790 1662647017 -((285142,31108), (286521,48461)) -((285142,48461),(285142,37421),(286221,37421),(286221,31108)) +((285356,31246), (285956,48451)) +((285669,48451),(285669,37421),(285656,37421),(285656,31246)) 1 8 16744576 @@ -4595,9 +4595,9 @@ Shadow=0 1662045015 -1664182251 -((248996,52379), (276525,52979)) -((248996,52628),(262008,52628),(262008,52679),(276525,52679)) +1664295296 +((248596,52557), (276545,53260)) +((248596,53260),(262008,53260),(262008,52857),(276545,52857)) 1 8 16744576 @@ -4617,8 +4617,8 @@ Shadow=0 1662046228 1662647031 -((301371,-1243), (302023,27797)) -((302023,-1243),(302023,15258),(301671,15258),(301671,27797)) +((301722,-1243), (302322,27790)) +((302023,-1243),(302023,15258),(302022,15258),(302022,27790)) 1 8 16744576 @@ -4638,8 +4638,8 @@ Shadow=0 1662047541 1662047695 -((250779,30569), (296894,31870)) -((250779,31870),(278057,31870),(278057,30869),(296894,30869)) +((250779,30697), (296962,31870)) +((250779,31870),(278057,31870),(278057,30997),(296962,30997)) 1 8 16744576 @@ -4659,8 +4659,8 @@ Shadow=0 1662048005 1662048061 -((230014,25717), (295754,27797)) -((230014,27797),(230014,26017),(295754,26017)) +((230014,25632), (295754,27797)) +((230014,27797),(230014,25932),(295754,25932)) 1 8 16744576 @@ -4680,8 +4680,8 @@ Shadow=0 1662647833 1662647877 -((284830,14785), (285751,27639)) -((284830,14785),(284830,20457),(285451,20457),(285451,27639)) +((284541,14785), (285141,27625)) +((284830,14785),(284830,20457),(284841,20457),(284841,27625)) 1 8 16744576 @@ -4719,8 +4719,8 @@ Shadow=0 1662810688 1663748414 -((296366,28995), (338650,29852)) -((338650,28995),(319044,28995),(319044,29552),(296366,29552)) +((296402,28995), (338650,29922)) +((338650,28995),(319044,28995),(319044,29622),(296402,29622)) 1 8 16744576 @@ -4740,8 +4740,8 @@ Shadow=0 1662865795 1663518168 -((287795,15194), (337794,23866)) -((337794,15194),(319320,15194),(319320,23566),(287795,23566)) +((287323,15194), (337794,23674)) +((337794,15194),(319320,15194),(319320,23374),(287323,23374)) 1 8 16744576 @@ -4760,9 +4760,9 @@ Shadow=0 1623769194 -1662982681 +1664294915 -1 -((-8713,51503), (5717,66145)) +((-9119,51176), (6123,66472)) 12615680 16570034 12632256 @@ -4787,7 +4787,7 @@ LABL 0 新宋体,8,N 1623769937 1662650462 -1 -((-8585,12140), (5845,25064)) +((-8991,11854), (6251,25350)) 12615680 16570034 12632256 @@ -4839,7 +4839,7 @@ LABL 0 新宋体,8,N 1623770338 1662650462 -1 -((-8537,-14000), (5893,-218)) +((-8943,-14307), (6299,89)) 12615680 16570034 12632256 @@ -4916,9 +4916,9 @@ LABL 0 新宋体,8,N 1623826338 -1662982681 +1664294915 -1 -((42066,49567), (67344,57337)) +((41316,49404), (68094,57500)) 12615680 16570034 12632256 @@ -4943,7 +4943,7 @@ LABL 0 新宋体,8,N 1623828456 1661907266 -1 -((9827,2008), (33557,17508)) +((9127,1660), (34257,17856)) 12615680 16570034 12632256 @@ -4968,7 +4968,7 @@ LABL 0 新宋体,8,N 1623828633 1661907266 -1 -((11900,-10153), (30592,-665)) +((11359,-10357), (31133,-461)) 12615680 16570034 12632256 @@ -4993,7 +4993,7 @@ LABL 0 新宋体,8,N 1623828682 1661907266 -1 -((11667,-24122), (30359,-14634)) +((11126,-24326), (30900,-14430)) 12615680 16570034 12632256 @@ -5018,7 +5018,7 @@ LABL 0 新宋体,8,N 1623828725 1661907266 -1 -((9640,-36872), (32980,-28244)) +((8951,-37056), (33669,-28060)) 12615680 16570034 12632256 @@ -5043,7 +5043,7 @@ LABL 0 新宋体,8,N 1623828770 1661907266 -1 -((15653,18839), (32795,35199)) +((15161,18471), (33287,35567)) 12615680 16570034 12632256 @@ -5068,7 +5068,7 @@ LABL 0 新宋体,8,N 1623840859 1661907266 -1 -((33254,-11927), (48846,1855)) +((32811,-12234), (49289,2162)) 12615680 16570034 12632256 @@ -5093,7 +5093,7 @@ LABL 0 新宋体,8,N 1623841366 1661907266 -1 -((33131,-26556), (48723,-12774)) +((32688,-26863), (49166,-12467)) 12615680 16570034 12632256 @@ -5118,7 +5118,7 @@ LABL 0 新宋体,8,N 1623842834 1662449601 -1 -((73486,37723), (94890,68685)) +((72859,37006), (95517,69402)) 12615680 16570034 12632256 @@ -5141,9 +5141,9 @@ LABL 0 新宋体,8,N 1623845173 -1662982681 +1664294915 -1 -((97679,49822), (123343,66182)) +((96916,49454), (124106,66550)) 12615680 16570034 12632256 @@ -5168,7 +5168,7 @@ LABL 0 新宋体,8,N 1623845296 1662971416 -1 -((96990,38358), (114132,47846)) +((96498,38154), (114624,48050)) 12615680 16570034 12632256 @@ -5191,9 +5191,9 @@ LABL 0 新宋体,8,N 1623859429 -1662982681 +1664294915 -1 -((126318,49651), (150048,66869)) +((125618,49262), (150748,67258)) 12615680 16570034 12632256 @@ -5218,7 +5218,7 @@ LABL 0 新宋体,8,N 1623859834 1662971416 -1 -((126423,37512), (145115,47858)) +((125882,37287), (145656,48083)) 12615680 16570034 12632256 @@ -5270,7 +5270,7 @@ LABL 0 新宋体,8,N 1623860248 1662449601 -1 -((74587,-8420), (93665,7940)) +((74033,-8788), (94219,8308)) 12615680 16570034 12632256 @@ -5295,7 +5295,7 @@ LABL 0 新宋体,8,N 1623860509 1662971416 -1 -((95498,-8190), (110704,7310)) +((95068,-8538), (111134,7658)) 12615680 16570034 12632256 @@ -5320,7 +5320,7 @@ LABL 0 新宋体,8,N 1623861067 1662971416 -1 -((114786,8776), (138516,25994)) +((114086,8387), (139216,26383)) 12615680 16570034 12632256 @@ -5345,7 +5345,7 @@ LABL 0 新宋体,8,N 1623861149 1662971416 -1 -((117605,-4438), (136297,5908)) +((117064,-4663), (136838,6133)) 12615680 16570034 12632256 @@ -5370,7 +5370,7 @@ LABL 0 新宋体,8,N 1623861203 1662449601 -1 -((141079,-4769), (155123,8155)) +((140686,-5055), (155516,8441)) 12615680 16570034 12632256 @@ -5395,7 +5395,7 @@ LABL 0 新宋体,8,N 1623861290 1662971416 -1 -((117305,-17338), (135997,-6992)) +((116764,-17563), (136538,-6767)) 12615680 16570034 12632256 @@ -5447,7 +5447,7 @@ LABL 0 新宋体,8,N 1623862594 1661907266 -1 -((57984,-26243), (69704,-15037)) +((57665,-26488), (70023,-14792)) 12615680 16570034 12632256 @@ -5472,7 +5472,7 @@ LABL 0 新宋体,8,N 1623862978 1662650462 -1 -((-35647,-12252), (-10755,672)) +((-36384,-12538), (-10018,958)) 12615680 16570034 12632256 @@ -5497,7 +5497,7 @@ LABL 0 新宋体,8,N 1623863676 1662650462 -1 -((-42982,-23154), (-31262,-14526)) +((-43301,-23338), (-30943,-14342)) 12615680 16570034 12632256 @@ -5522,7 +5522,7 @@ LABL 0 新宋体,8,N 1623864141 1662650462 -1 -((-28723,-23154), (-10807,-14526)) +((-29240,-23338), (-10290,-14342)) 12615680 16570034 12632256 @@ -5547,7 +5547,7 @@ LABL 0 新宋体,8,N 1623895431 1662650462 -1 -((-56796,-23004), (-45076,-14376)) +((-57115,-23188), (-44757,-14192)) 12615680 16570034 12632256 @@ -5572,7 +5572,7 @@ LABL 0 新宋体,8,N 1625926250 1661907266 -1 -((43536,29026), (65716,46244)) +((42885,28637), (66367,46633)) 12615680 16570034 12632256 @@ -5595,9 +5595,9 @@ LABL 0 新宋体,8,N 1627129933 -1663689104 +1664294915 -1 -((98172,67457), (113378,74367)) +((97742,67314), (113808,74510)) 12615680 16570034 12632256 @@ -5622,7 +5622,7 @@ LABL 0 新宋体,8,N 1628307450 1662650462 -1 -((-42281,-32525), (-32111,-25615)) +((-42551,-32668), (-31841,-25472)) 12615680 16570034 12632256 @@ -5647,7 +5647,7 @@ LABL 0 新宋体,8,N 1628307767 1662650462 -1 -((-29124,-35573), (-10818,-24367)) +((-29652,-35818), (-10290,-24122)) 12615680 16570034 12632256 @@ -5672,7 +5672,7 @@ LABL 0 新宋体,8,N 1628340137 1661907266 -1 -((38210,20750), (49340,25942)) +((37876,20648), (49674,26044)) 12615680 16570034 12632256 @@ -5697,7 +5697,7 @@ LABL 0 新宋体,8,N 1631242896 1662650462 -1 -((-7148,-35093), (3796,-26465)) +((-7443,-35277), (4091,-26281)) 12615680 16570034 12632256 @@ -5722,7 +5722,7 @@ LABL 0 新宋体,8,N 1631243538 1662650462 -1 -((-7073,-23414), (3871,-15644)) +((-7368,-23577), (4166,-15481)) 12615680 16570034 12632256 @@ -5747,7 +5747,7 @@ LABL 0 新宋体,8,N 1661850632 1662449601 -1 -((296531,51670), (319873,62016)) +((295843,51445), (320561,62241)) 12615680 16570034 12632256 @@ -5772,7 +5772,7 @@ LABL 0 新宋体,8,N 1661872432 1662047569 -1 -((264907,41794), (287473,55576)) +((264243,41487), (288137,55883)) 12615680 16570034 12632256 @@ -5851,7 +5851,7 @@ LABL 0 新宋体,8,N 1661862847 1662042403 -1 -((224702,10597), (249980,22661)) +((223952,10331), (250730,22927)) 12615680 16570034 12632256 @@ -5930,7 +5930,7 @@ LABL 0 新宋体,8,N 1661868858 1662042403 -1 -((222959,-4461), (251723,5027)) +((222098,-4665), (252584,5231)) 12615680 16570034 12632256 @@ -6063,7 +6063,7 @@ LABL 0 新宋体,8,N 1661949359 1662042403 -1 -((283308,22355), (308200,33561)) +((282571,22110), (308937,33806)) 12615680 16570034 12632256 @@ -6223,7 +6223,7 @@ LABL 0 新宋体,8,N 1661960474 1662042403 -1 -((290333,38437), (326071,47925)) +((289251,38233), (327153,48129)) 12615680 16570034 12632256 @@ -6273,9 +6273,9 @@ LABL 0 新宋体,8,N 1662044179 -1664182251 +1664295296 -1 -((239120,49840), (259774,60288)) +((238720,49900), (259374,62488)) 0 12615680 16570034 @@ -6653,7 +6653,7 @@ LABL 0 新宋体,8,N 1663937886 1663937955 -1 -((37735,2941), (61465,20159)) +((37035,2552), (62165,20548)) 12615680 16570034 12632256 @@ -15849,8 +15849,8 @@ COLLATE = utf8_general_ci teacher_open_course_homework_question_log 1661850632 lx -1664182248 -87966 +1664295243 +lx 我的课程-题库作业-做题日志 auto_increment = 1 ENGINE = InnoDB @@ -15939,6 +15939,29 @@ COLLATE = utf8_general_ci int +7C5AFA02-3CF4-4C0D-9180-02F37466098A +teacher_open_course_homework_question_log_from_type +teacher_open_course_homework_question_log_from_type +1664294920 +lx +1664295281 +lx +来源类型（枚举） +varchar(50) +50 + + +AFCB9E46-93E2-4570-BB62-5B78208D9BAB +student_id +student_id +1664294881 +lx +1664294915 +lx +学生ID +bigint + + F8795A3A-9DD9-4F5A-906A-E6964444570C org_id org_id @@ -15949,7 +15972,7 @@ COLLATE = utf8_general_ci 组织ID bigint - + 1993A879-EC68-450A-B775-D7C2671BDA96 user_id user_id @@ -15962,7 +15985,7 @@ COLLATE = utf8_general_ci - + FF4A3064-63A4-4FAD-A71D-F66FD27F3A94 Key_1 Key_1 @@ -15976,7 +15999,7 @@ COLLATE = utf8_general_ci - + @@ -16000,7 +16023,7 @@ COLLATE = utf8_general_ci } - + 03C2172E-8A06-48E0-8C25-4102C8253653 core_setting_id core_setting_id @@ -16012,7 +16035,7 @@ COLLATE = utf8_general_ci bigint 1 - + 5090D458-E136-4D46-9D89-930A55ED9A2C setting_key setting_key @@ -16024,7 +16047,7 @@ COLLATE = utf8_general_ci varchar(100) 100 - + 0D922C4C-8420-482B-87B6-B0E99FBA62E0 setting_value setting_value @@ -16035,7 +16058,7 @@ COLLATE = utf8_general_ci 配置项 text - + A89D7A99-CD44-4F4E-8337-14A5D4BEE13E core_setting_stauts core_setting_stauts @@ -16046,7 +16069,7 @@ COLLATE = utf8_general_ci 状态 （1正常 2删除） int - + D4790CD3-3634-4FB5-B1F8-DDCA61E7AC11 create_time create_time @@ -16057,7 +16080,7 @@ COLLATE = utf8_general_ci 创建时间 datetime - + A9346C05-5EA0-4D30-A522-9DD5B13FCE7E org_id org_id @@ -16068,7 +16091,7 @@ COLLATE = utf8_general_ci 组织ID bigint - + D46E4A36-6D0D-4F64-9C58-CAC3D1285F24 user_id user_id @@ -16081,7 +16104,7 @@ COLLATE = utf8_general_ci - + 8E777505-B813-4D1D-8C5F-B6F9747BA0F4 Key_1 Key_1 @@ -16090,12 +16113,12 @@ COLLATE = utf8_general_ci 1662045362 lx - + - + @@ -16113,7 +16136,7 @@ DEFAULT CHARACTER SET = utf8 COLLATE = utf8_general_ci - + 18F050CC-F084-477F-8759-28E1D015FE0B teacher_open_course_score_dashboard_id teacher_open_course_score_dashboard_id @@ -16125,7 +16148,7 @@ COLLATE = utf8_general_ci bigint 1 - + C33241B0-D288-44ED-8554-C7086F839648 student_id student_id @@ -16136,7 +16159,7 @@ COLLATE = utf8_general_ci 学生ID bigint - + 155275C4-795A-4763-9C39-3FDF35ECECCA signin_score signin_score @@ -16147,7 +16170,7 @@ COLLATE = utf8_general_ci 签到成绩 float - + 26A9701D-C572-427D-8AD8-4D4D9DDC105D course_score course_score @@ -16158,7 +16181,7 @@ COLLATE = utf8_general_ci 章节练习成绩 float - + B1C7AFAC-3115-4EEF-855F-7578BE5C5555 real_operation_score real_operation_score @@ -16169,7 +16192,7 @@ COLLATE = utf8_general_ci 课程实操成绩 float - + AC3C7572-A095-42DE-99A5-3E8D2B9D3602 question_homework_score question_homework_score @@ -16180,7 +16203,7 @@ COLLATE = utf8_general_ci 作业成绩 float - + CB0FDAE5-DDBD-42D1-8E59-3B91E44A45C8 exam_score exam_score @@ -16191,7 +16214,7 @@ COLLATE = utf8_general_ci 考试成绩 float - + A37D010B-5B7E-4815-AC10-65C79F878234 chat_score chat_score @@ -16202,7 +16225,7 @@ COLLATE = utf8_general_ci 互动成绩 float - + D91526BC-31BA-4121-9416-7DB95281202C total_score total_score @@ -16213,7 +16236,7 @@ COLLATE = utf8_general_ci 总成绩 float - + 95464B6A-6611-4674-BBA4-EF869A472F84 manual_score manual_score @@ -16224,7 +16247,7 @@ COLLATE = utf8_general_ci 手动调整的分数 float - + 8E062DAC-DA29-4940-AEC3-1B8EFB468904 last_score last_score @@ -16235,7 +16258,7 @@ COLLATE = utf8_general_ci 最终成绩 float - + 696B62F5-6BCE-4377-8F04-F452C9FE5368 last_status last_status @@ -16247,7 +16270,7 @@ COLLATE = utf8_general_ci varchar(10) 10 - + D2334132-07CC-40C5-8A37-6F95CC12A041 org_id org_id @@ -16258,7 +16281,7 @@ COLLATE = utf8_general_ci 组织ID bigint - + 7BBBDC7F-C5E3-424A-AC3C-00E94E564F45 user_id user_id @@ -16269,7 +16292,7 @@ COLLATE = utf8_general_ci 用户ID bigint - + CE5A2441-64A4-4C2A-8646-8D6CFE6C2A73 create_time create_time @@ -16282,7 +16305,7 @@ COLLATE = utf8_general_ci - + 6B3359F7-B844-4B95-9C3B-A4AAFBA27617 Key_1 Key_1 @@ -16291,12 +16314,12 @@ COLLATE = utf8_general_ci 1662045706 lx - + - + @@ -16319,7 +16342,7 @@ COLLATE = utf8_general_ci } - + 318651DC-E71A-449A-96A8-19F27C71F4AC teacher_open_course_notice_id teacher_open_course_notice_id @@ -16331,7 +16354,7 @@ COLLATE = utf8_general_ci bigint 1 - + F972E98C-839A-4F8E-B2B7-A92F064483DB school_class_ids school_class_ids @@ -16343,7 +16366,7 @@ COLLATE = utf8_general_ci varchar(2000) 2000 - + E3F89C48-E4A1-4B9B-AE85-66EE2378EC58 teacher_open_course_ids teacher_open_course_ids @@ -16355,7 +16378,7 @@ COLLATE = utf8_general_ci varchar(2000) 2000 - + 9072D638-91A2-45E3-B01A-56FD07AC2DBC notice_title notice_title @@ -16367,7 +16390,7 @@ COLLATE = utf8_general_ci varchar(100) 100 - + 2AED03DE-64F7-47AF-810B-CC78F23EEF22 notice_content notice_content @@ -16379,7 +16402,7 @@ COLLATE = utf8_general_ci varchar(100) 100 - + 08862E80-7DDC-40DF-8E1B-DCFED6B33AC8 create_time create_time @@ -16390,7 +16413,7 @@ COLLATE = utf8_general_ci 创建时间 datetime - + A04525A6-FB16-4CCC-9753-4907D73BA676 create_by_teacher_id create_by_teacher_id @@ -16401,7 +16424,7 @@ COLLATE = utf8_general_ci 消息创建--老师ID bigint - + 3B6BA47A-A3E1-41B3-B8E8-B877AF7DFB5B org_id org_id @@ -16412,7 +16435,7 @@ COLLATE = utf8_general_ci 组织ID bigint - + E49B7F20-513A-4E10-BEE8-D5B768200303 user_id user_id @@ -16423,7 +16446,7 @@ COLLATE = utf8_general_ci 用户ID bigint - + C28FF8AA-D0BD-4EFE-8BEE-802D56989498 del_flag del_flag @@ -16436,7 +16459,7 @@ COLLATE = utf8_general_ci - + 3D2650BD-129F-48EC-B75C-872417A4E822 Key_1 Key_1 @@ -16445,12 +16468,12 @@ COLLATE = utf8_general_ci 1662046440 lx - + - + @@ -16473,7 +16496,7 @@ COLLATE = utf8_general_ci } - + 3DB701D7-DA2C-4296-853B-38D2E719CCA6 teacher_open_course_knowledge_point_id teacher_open_course_knowledge_point_id @@ -16485,7 +16508,7 @@ COLLATE = utf8_general_ci bigint 1 - + 171BF047-E676-4C5B-89B3-8B25136416A7 teacher_open_course_id teacher_open_course_id @@ -16496,7 +16519,7 @@ COLLATE = utf8_general_ci 课程开课ID bigint - + 0B7D7F9A-015D-42DD-8116-30CEC65236D8 chapter_id chapter_id @@ -16507,7 +16530,7 @@ COLLATE = utf8_general_ci 章节ID bigint - + E622D525-8AFB-4926-AE32-117E18C429E0 teacher_open_course_knowledge_point_title teacher_open_course_knowledge_point_title @@ -16519,7 +16542,7 @@ COLLATE = utf8_general_ci varchar(100) 100 - + B1BD789A-9684-4E7A-AD8A-BE79C7B6C7C8 teacher_open_course_knowledge_point_content teacher_open_course_knowledge_point_content @@ -16531,7 +16554,7 @@ COLLATE = utf8_general_ci varchar(4000) 4000 - + C44A8ACF-B4BC-4140-9003-1ADAC230C1DA teacher_open_course_knowledge_point_status teacher_open_course_knowledge_point_status @@ -16542,7 +16565,7 @@ COLLATE = utf8_general_ci 状态 （1正常 2删除） int - + 35B92FEF-A383-4FD2-AAC3-10355BCA6896 create_time create_time @@ -16553,7 +16576,7 @@ COLLATE = utf8_general_ci 创建时间 datetime - + 2745088B-3993-46E7-9035-2EF382FEC082 org_id org_id @@ -16564,7 +16587,7 @@ COLLATE = utf8_general_ci 组织ID bigint - + 9699889E-0268-4565-971A-41D449A2A5F2 user_id user_id @@ -16577,7 +16600,7 @@ COLLATE = utf8_general_ci - + 75299271-38A3-44A7-824D-00792734CF12 Key_1 Key_1 @@ -16586,12 +16609,12 @@ COLLATE = utf8_general_ci 1662047767 lx - + - + @@ -16609,7 +16632,7 @@ DEFAULT CHARACTER SET = utf8 COLLATE = utf8_general_ci - + 326FA1E3-0BA3-420E-8242-ED8A4A4F0617 student_client_link_id student_client_link_id @@ -16621,7 +16644,7 @@ COLLATE = utf8_general_ci bigint 1 - + E2FC1BD3-0EBA-4330-A432-204E68A01861 student_client_link_order student_client_link_order @@ -16632,7 +16655,7 @@ COLLATE = utf8_general_ci 导航栏排序 int - + A897CD71-A97A-450E-92FA-72474727C640 student_client_link_title student_client_link_title @@ -16644,7 +16667,7 @@ COLLATE = utf8_general_ci varchar(50) 50 - + B988F3BD-EEE2-40FB-9E5E-73ABC59935D9 student_client_link_content student_client_link_content @@ -16656,7 +16679,7 @@ COLLATE = utf8_general_ci varchar(2000) 2000 - + C9FBBBB6-7477-4B29-8A15-08222FB01DE8 student_client_link_type student_client_link_type @@ -16668,7 +16691,7 @@ COLLATE = utf8_general_ci varchar(50) 50 - + B5987B41-6AE9-469F-A36F-48C3C9674252 student_client_link_img student_client_link_img @@ -16679,7 +16702,7 @@ COLLATE = utf8_general_ci 链接图片（可用于轮播大图，icon小图等功能） text - + DD99CF28-4303-4935-8168-CE022C8C31CD student_client_link_status student_client_link_status @@ -16690,7 +16713,7 @@ COLLATE = utf8_general_ci 状态（ 1 正常 2删除） int - + 963FA155-9A25-41BA-8B52-209536B76758 student_client_link_open_type student_client_link_open_type @@ -16702,7 +16725,7 @@ COLLATE = utf8_general_ci varchar(50) 50 - + 05CE988B-2AF5-4A63-9451-25A9EF95C5DB create_time create_time @@ -16713,7 +16736,7 @@ COLLATE = utf8_general_ci 创建时间 datetime - + 1E5FBB70-DADA-4251-9BDA-85E132223109 user_id user_id @@ -16724,7 +16747,7 @@ COLLATE = utf8_general_ci 用户ID bigint - + F1483087-727F-4BFE-97BA-9692FD8D1AB2 org_id org_id @@ -16737,7 +16760,7 @@ COLLATE = utf8_general_ci - + B095A5B3-D6C4-40C4-B986-497B3849ED54 Key_1 Key_1 @@ -16746,12 +16769,12 @@ COLLATE = utf8_general_ci 1662554252 lx - + - + @@ -16769,7 +16792,7 @@ DEFAULT CHARACTER SET = utf8 COLLATE = utf8_general_ci - + CCCB7690-1E0F-4355-AC7A-ABB58CC8632B university_system_id university_system_id @@ -16781,7 +16804,7 @@ COLLATE = utf8_general_ci bigint 1 - + B0D08F82-9D1C-42E8-B332-4422FC72BF67 university_system_name university_system_name @@ -16793,7 +16816,7 @@ COLLATE = utf8_general_ci varchar(100) 100 - + 8A8F809D-A11E-4F1E-AB4B-C8B02D1DA3AB university_system_contact university_system_contact @@ -16805,7 +16828,7 @@ COLLATE = utf8_general_ci varchar(50) 50 - + 1F10D7BD-3F66-4E4E-AA41-06A06D9D00D1 university_system_contact_tel university_system_contact_tel @@ -16817,7 +16840,7 @@ COLLATE = utf8_general_ci varchar(20) 20 - + 139361B7-C257-4094-9BCE-1F8A44668480 university_system_add_time university_system_add_time @@ -16828,7 +16851,7 @@ COLLATE = utf8_general_ci 创建时间 datetime - + 7BA84D60-66CD-47EA-8DCB-025AEFC85CFF university_system_status university_system_status @@ -16839,7 +16862,7 @@ COLLATE = utf8_general_ci 状态 （1正常 2删除） int - + EE6D1A35-06C2-4560-B40B-D1E87CA5F291 university_faculty_id university_faculty_id @@ -16850,7 +16873,7 @@ COLLATE = utf8_general_ci 院系ID（学院ID） int - + 87AEE496-5BD2-4A50-ACC8-980A708FC4DB user_id user_id @@ -16861,7 +16884,7 @@ COLLATE = utf8_general_ci 用户ID bigint - + 6D140299-48E6-4630-99C8-D96E361AB3B1 org_id org_id @@ -16874,7 +16897,7 @@ COLLATE = utf8_general_ci - + F02FEAFC-6CDC-461B-BCD4-A60CB97164BA Key_1 Key_1 @@ -16883,12 +16906,12 @@ COLLATE = utf8_general_ci 1662648377 lx - + - + @@ -16906,7 +16929,7 @@ DEFAULT CHARACTER SET = utf8 COLLATE = utf8_general_ci - + 884F2204-DCE1-485E-A4B2-D4378BEE2044 university_faculty_id university_faculty_id @@ -16918,7 +16941,7 @@ COLLATE = utf8_general_ci bigint 1 - + 2AB481C3-D261-4ADD-B9F9-146124372F4B university_faculty_name university_faculty_name @@ -16930,7 +16953,7 @@ COLLATE = utf8_general_ci varchar(100) 100 - + 04BE427C-8D5A-48B8-808F-80D87158F9E4 university_faculty_contact university_faculty_contact @@ -16942,7 +16965,7 @@ COLLATE = utf8_general_ci varchar(50) 50 - + A6EF43AB-F19B-4BE5-B34E-D4AE59D57B17 university_faculty_contact_tel university_faculty_contact_tel @@ -16954,7 +16977,7 @@ COLLATE = utf8_general_ci varchar(20) 20 - + C8BE2BF4-F676-43CB-A1CE-369836C8D540 university_faculty_contact_address university_faculty_contact_address @@ -16966,7 +16989,7 @@ COLLATE = utf8_general_ci varchar(200) 200 - + 68386B1B-1359-4E14-80BB-D40EB3E6D05E universities_colleges_id universities_colleges_id @@ -16977,7 +17000,7 @@ COLLATE = utf8_general_ci 院校ID （院系的上一级） bigint - + 34891715-8E26-4F10-A789-93454383373B university_faculty_status university_faculty_status @@ -16988,7 +17011,7 @@ COLLATE = utf8_general_ci 状态（ 1 正常 2删除） int - + 7EA4E9C0-C919-4B3F-8300-66888606CDFE university_faculty_add_time university_faculty_add_time @@ -16999,7 +17022,7 @@ COLLATE = utf8_general_ci 创建时间 datetime - + 860EA0A3-DB84-4B76-BB61-CD32C4838D5E user_id user_id @@ -17010,7 +17033,7 @@ COLLATE = utf8_general_ci 用户ID bigint - + 6D5D545B-7423-4471-B969-D5AD4F7D6459 org_id org_id @@ -17023,7 +17046,7 @@ COLLATE = utf8_general_ci - + 8827D654-DDB8-4D1E-A500-362CE79333F8 Key_1 Key_1 @@ -17032,12 +17055,12 @@ COLLATE = utf8_general_ci 1662648708 lx - + - + @@ -17055,7 +17078,7 @@ DEFAULT CHARACTER SET = utf8 COLLATE = utf8_general_ci - + 5288224C-53C1-4C24-B9E9-054F89E3408E teacher_open_course_schedule_session_class_id teacher_open_course_schedule_session_class_id @@ -17067,7 +17090,7 @@ COLLATE = utf8_general_ci bigint 1 - + 9F4A9A8A-17A5-4DDE-B4C8-5B1CAB398160 teacher_open_course_schedule_session_class_name teacher_open_course_schedule_session_class_name @@ -17079,7 +17102,7 @@ COLLATE = utf8_general_ci varchar(100) 100 - + 9BC97CEE-44E7-4253-BD67-61CE17D5A991 teacher_open_course_schedule_session_class_parent_id teacher_open_course_schedule_session_class_parent_id @@ -17091,7 +17114,7 @@ COLLATE = utf8_general_ci bigint 1 - + B86F6DCB-0565-4214-A6DA-1A973CE66EA1 org_id org_id @@ -17102,7 +17125,7 @@ COLLATE = utf8_general_ci 组织ID bigint - + 056FDBB3-D0F8-4845-BD40-72B5A4B1932F user_id user_id @@ -17113,7 +17136,7 @@ COLLATE = utf8_general_ci 用户ID bigint - + 095D37B8-4403-4981-AFB2-8D79C7F04A9A teacher_open_course_schedule_session_class_add_time teacher_open_course_schedule_session_class_add_time @@ -17126,7 +17149,7 @@ COLLATE = utf8_general_ci - + 8F5B1BAF-BE16-44DE-8DF5-9A1EAD731C04 Key_1 Key_1 @@ -17135,12 +17158,12 @@ COLLATE = utf8_general_ci 1662808852 lx - + - + @@ -17158,7 +17181,7 @@ DEFAULT CHARACTER SET = utf8 COLLATE = utf8_general_ci - + 6392E614-144C-4A81-B339-C428F15B45D9 teacher_open_course_schedule_session_id teacher_open_course_schedule_session_id @@ -17170,7 +17193,7 @@ COLLATE = utf8_general_ci bigint 1 - + 84F8C272-4766-4209-9667-728323948B7D teacher_open_course_schedule_session_add_time teacher_open_course_schedule_session_add_time @@ -17181,7 +17204,7 @@ COLLATE = utf8_general_ci 创建时间 datetime - + 379DA977-579C-4E07-B57C-A112F3DDE178 teacher_open_course_schedule_session_status teacher_open_course_schedule_session_status @@ -17192,7 +17215,7 @@ COLLATE = utf8_general_ci 状态（1正常 2删除） int - + D506683D-A194-4D05-ADB9-BB50C1250024 teacher_open_course_id teacher_open_course_id @@ -17203,7 +17226,7 @@ COLLATE = utf8_general_ci 课程开课ID bigint - + 3C52ADED-57C3-4912-BE68-3F75ADDB2382 teacher_id teacher_id @@ -17214,7 +17237,7 @@ COLLATE = utf8_general_ci 教师ID bigint - + 8CD1F62C-46A8-4CF0-B2BD-294B7516B104 school_class_Ids school_class_Ids @@ -17226,7 +17249,7 @@ COLLATE = utf8_general_ci varchar(4000) 4000 - + 7A7E2C88-8FF1-48BA-A8DF-4A9A96368B9B teacher_open_course_schedule_session_start_date teacher_open_course_schedule_session_start_date @@ -17238,7 +17261,7 @@ COLLATE = utf8_general_ci varchar(20) 20 - + 9BEAE88E-4EA1-4171-8315-D61CE82BCADD teacher_open_course_schedule_session_end_date teacher_open_course_schedule_session_end_date @@ -17250,7 +17273,7 @@ COLLATE = utf8_general_ci varchar(20) 20 - + 01EA483A-4478-44D1-8032-98E2EB7DCB79 teacher_open_course_schedule_session_week_num teacher_open_course_schedule_session_week_num @@ -17261,7 +17284,7 @@ COLLATE = utf8_general_ci 周次 int - + A6D7EF46-7437-4280-B26D-396E02AF3FBD org_id org_id @@ -17272,7 +17295,7 @@ COLLATE = utf8_general_ci 组织ID bigint - + 4DCDE709-2B62-4BCE-B430-60038263BD7B user_id user_id @@ -17285,7 +17308,7 @@ COLLATE = utf8_general_ci - + F50CC5A3-3465-4699-8F69-A29E98FE137C Key_1 Key_1 @@ -17294,12 +17317,12 @@ COLLATE = utf8_general_ci 1662809607 lx - + - + @@ -17317,7 +17340,7 @@ DEFAULT CHARACTER SET = utf8 COLLATE = utf8_general_ci - + E2A6360D-5714-41B5-955B-89945A175C59 teacher_open_course_merge_teacher_id teacher_open_course_merge_teacher_id @@ -17329,7 +17352,7 @@ COLLATE = utf8_general_ci bigint 1 - + B09D0BDB-132E-4575-8B29-2EE351C1FE23 teacher_open_course_id teacher_open_course_id @@ -17340,7 +17363,7 @@ COLLATE = utf8_general_ci 课程开课ID bigint - + 7E53D94D-754B-44D9-959E-A49A6AFCA849 teacher_id teacher_id @@ -17351,7 +17374,7 @@ COLLATE = utf8_general_ci 教师ID bigint - + 3A68DDB6-31E8-415D-B94B-92B9DF070D92 teacher_open_course_merge_teacher_status teacher_open_course_merge_teacher_status @@ -17362,7 +17385,7 @@ COLLATE = utf8_general_ci 状态（1启用 2禁用） int - + 7B27FB20-159E-4340-AF84-992446D3D88E teacher_open_course_merge_teacher_add_time teacher_open_course_merge_teacher_add_time @@ -17373,7 +17396,7 @@ COLLATE = utf8_general_ci 创建时间 datetime - + 90845833-CF23-465B-B143-5499ABC48D61 teacher_open_course_merge_teacher_auth_code teacher_open_course_merge_teacher_auth_code @@ -17386,7 +17409,7 @@ COLLATE = utf8_general_ci 10 1 - + 279FE47F-88A8-4633-A510-B081884ABC72 org_id org_id @@ -17397,7 +17420,7 @@ COLLATE = utf8_general_ci 组织ID bigint - + CB1C06E4-C2EC-48D0-B1DA-529BE729E99E user_id user_id @@ -17410,7 +17433,7 @@ COLLATE = utf8_general_ci - + C35D2586-F094-4112-8601-9F10D6A9DB41 Key_1 Key_1 @@ -17419,12 +17442,12 @@ COLLATE = utf8_general_ci 1662865695 lx - + - + @@ -17442,7 +17465,7 @@ DEFAULT CHARACTER SET = utf8 COLLATE = utf8_general_ci - + 17B370CF-378E-4E64-A980-89882213C82C teacher_open_course_merge_school_class_id teacher_open_course_merge_school_class_id @@ -17454,7 +17477,7 @@ COLLATE = utf8_general_ci bigint 1 - + 236A83D5-0BEE-4129-8525-6B8D3A1B4EC6 teacher_open_course_id teacher_open_course_id @@ -17465,7 +17488,7 @@ COLLATE = utf8_general_ci 教师开课ID bigint - + 6EEFBCF7-F309-4402-9BC6-A8BD70197B84 school_class_id school_class_id @@ -17476,7 +17499,7 @@ COLLATE = utf8_general_ci 班级ID bigint - + CD1F7C9F-FAA1-48E5-B65E-A4677E110748 teacher_open_course_merge_school_class_status teacher_open_course_merge_school_class_status @@ -17487,7 +17510,7 @@ COLLATE = utf8_general_ci 状态（1启用 2禁用） int - + C090103F-8A84-4BDA-A330-9AE196279EB2 teacher_open_course_merge_school_class_add_time teacher_open_course_merge_school_class_add_time @@ -17498,7 +17521,7 @@ COLLATE = utf8_general_ci 创建时间 datetime - + 7B7183A9-BB12-43ED-B36E-F3143A525E40 org_id org_id @@ -17509,7 +17532,7 @@ COLLATE = utf8_general_ci 组织ID bigint - + 9174FB98-B263-42AB-9B54-6F9CBBA31A42 user_id user_id @@ -17522,7 +17545,7 @@ COLLATE = utf8_general_ci - + 2AFFDC6B-82E6-4E75-8F04-36F0FCDAD767 Key_1 Key_1 @@ -17531,12 +17554,12 @@ COLLATE = utf8_general_ci 1662982569 lx - + - + @@ -17554,7 +17577,7 @@ DEFAULT CHARACTER SET = utf8 COLLATE = utf8_general_ci - + FB211503-CF3E-4103-B61C-2E325317C715 data_contest_application_id data_contest_application_id @@ -17566,7 +17589,7 @@ COLLATE = utf8_general_ci bigint 1 - + 3EA632DB-A439-4642-9D80-00C4162E3D55 data_contest_application_name data_contest_application_name @@ -17577,7 +17600,7 @@ COLLATE = utf8_general_ci 大赛名称 int - + 5EEBC61F-D540-4B9F-BC81-9A7686F4CDF5 data_contest_application_host_name data_contest_application_host_name @@ -17589,7 +17612,7 @@ COLLATE = utf8_general_ci varchar(200) 200 - + 1C6BBDA4-F9EE-4CA1-BB5D-06670A2F4123 data_contest_application_technical_name data_contest_application_technical_name @@ -17601,7 +17624,7 @@ COLLATE = utf8_general_ci varchar(200) 200 - + E13737EE-A348-45CD-8CB2-7121F0BEB925 data_contest_application_lowest_number data_contest_application_lowest_number @@ -17612,7 +17635,7 @@ COLLATE = utf8_general_ci 参与最低人数 int - + 36AD5B45-E7B1-4921-B976-F32F2FB68819 data_contest_application_highest_number data_contest_application_highest_number @@ -17623,7 +17646,7 @@ COLLATE = utf8_general_ci 参与最高人数 int - + 15593A04-28EB-46C8-A5F2-55297E67B2C5 data_contest_application_status data_contest_application_status @@ -17634,7 +17657,7 @@ COLLATE = utf8_general_ci 状态（ 1 正常 2删除） int - + 1D111CDF-52D5-4666-86F0-EE3A6253D200 data_contest_application_model data_contest_application_model @@ -17646,7 +17669,7 @@ COLLATE = utf8_general_ci varchar(50) 50 - + 6A6E7C74-8503-4C41-A3CC-AB7600975C83 data_contest_application_add_time data_contest_application_add_time @@ -17657,7 +17680,7 @@ COLLATE = utf8_general_ci 创建时间 datetime - + 618BF08C-52DE-4104-878C-F4C852499EDC user_id user_id @@ -17668,7 +17691,7 @@ COLLATE = utf8_general_ci 用户ID bigint - + 86EE9B2C-375E-43DD-A5E3-442A1C7B68F8 org_id org_id @@ -17679,7 +17702,7 @@ COLLATE = utf8_general_ci 组织ID bigint - + 69E30F12-548D-4F86-AF60-423761BC363F data_contest_application_apply_start_time data_contest_application_apply_start_time @@ -17690,7 +17713,7 @@ COLLATE = utf8_general_ci 报名开始时间 datetime - + B033AC6A-AD19-4BDB-9C21-160BD3FFB825 data_contest_application_apply_end_time data_contest_application_apply_end_time @@ -17701,7 +17724,7 @@ COLLATE = utf8_general_ci 报名结束时间 datetime - + D39E9505-70CC-448B-8D7D-99F588F8426D data_contest_application_try_play_start_time data_contest_application_try_play_start_time @@ -17712,7 +17735,7 @@ COLLATE = utf8_general_ci 试玩开始时间 datetime - + 8E5672AE-76FC-48A1-A626-8074CAA46BB3 data_contest_application_try_play_end_time data_contest_application_try_play_end_time @@ -17723,7 +17746,7 @@ COLLATE = utf8_general_ci 试玩结束时间 datetime - + 97B3D96F-68C3-4E5E-9859-86A1A64A0E55 data_contest_application_stage_start_time data_contest_application_stage_start_time @@ -17734,7 +17757,7 @@ COLLATE = utf8_general_ci 大赛开始时间 datetime - + 0A898BC9-890E-496F-8263-ED3A460A3574 data_contest_application_stage_end_time data_contest_application_stage_end_time @@ -17745,7 +17768,7 @@ COLLATE = utf8_general_ci 大赛结束时间 datetime - + 6359ED80-8E01-41C8-A409-10DEEDFF293C data_contest_application_shrink_img data_contest_application_shrink_img @@ -17757,7 +17780,7 @@ COLLATE = utf8_general_ci varchar(1000) 1000 - + ECEF8ECF-C531-4ADE-8BBA-25BE7DD95249 data_contest_application_carousel_img data_contest_application_carousel_img @@ -17771,7 +17794,7 @@ COLLATE = utf8_general_ci - + B03D33F0-85A3-419F-8575-83AC3B8F2AAF Key_1 Key_1 @@ -17780,12 +17803,12 @@ COLLATE = utf8_general_ci 1663686482 87966 - + - + @@ -17803,7 +17826,7 @@ DEFAULT CHARACTER SET = utf8 COLLATE = utf8_general_ci - + 37C90E98-0F71-453A-9BB7-BCF0E255B57E teacher_open_course_schedule_session_snap_id teacher_open_course_schedule_session_snap_id @@ -17815,7 +17838,7 @@ COLLATE = utf8_general_ci bigint 1 - + F2F5E447-FAD6-4BE6-BA46-51C24C2BDBD4 teacher_open_course_schedule_session_id teacher_open_course_schedule_session_id @@ -17826,7 +17849,7 @@ COLLATE = utf8_general_ci 关联排课ID bigint - + 70519675-39D3-4A62-BE68-038DF130B07D teacher_open_course_id teacher_open_course_id @@ -17837,7 +17860,7 @@ COLLATE = utf8_general_ci 教师开课ID bigint - + A7BF3423-E11D-416F-A731-F45356E01DA9 teacher_open_course_schedule_session_snap_status teacher_open_course_schedule_session_snap_status @@ -17848,7 +17871,7 @@ COLLATE = utf8_general_ci 状态（1正常 2删除） int - + 2A1826B2-F029-47F5-88EA-8E840861A445 teacher_open_course_schedule_session_tag_name teacher_open_course_schedule_session_tag_name @@ -17860,7 +17883,7 @@ COLLATE = utf8_general_ci varchar(100) 100 - + 70662FD1-C20F-4B7C-BFED-66B4A94EBD61 teacher_open_course_schedule_session_tag_duration teacher_open_course_schedule_session_tag_duration @@ -17871,7 +17894,7 @@ COLLATE = utf8_general_ci 课程时长（分钟） int - + 3E372D23-EA27-45DF-A011-4B6D6383E811 teacher_open_course_schedule_session_day_time teacher_open_course_schedule_session_day_time @@ -17883,7 +17906,7 @@ COLLATE = utf8_general_ci varchar(20) 20 - + 16A7E02B-46FB-4640-86EE-AABB4E9C3E1A teacher_open_course_schedule_session_tag_start_time teacher_open_course_schedule_session_tag_start_time @@ -17895,7 +17918,7 @@ COLLATE = utf8_general_ci varchar(10) 10 - + 6FFBF9E4-D1A0-45F1-B109-BA039EB05C86 teacher_open_course_schedule_session_tag_end_time teacher_open_course_schedule_session_tag_end_time @@ -17907,7 +17930,7 @@ COLLATE = utf8_general_ci varchar(10) 10 - + 6C030A2B-C219-4C7D-A44D-EA4A86820E5C teacher_open_course_schedule_session_class_name teacher_open_course_schedule_session_class_name @@ -17919,7 +17942,7 @@ COLLATE = utf8_general_ci varchar(255) 255 - + 24CA63C4-331D-4E55-A333-A20B4A6DE11F teacher_open_course_schedule_session_snap_add_time teacher_open_course_schedule_session_snap_add_time @@ -17930,7 +17953,7 @@ COLLATE = utf8_general_ci 创建时间 datetime - + CB6EFB98-C675-42D2-8BE1-87A762BAFBA1 org_id org_id @@ -17941,7 +17964,7 @@ COLLATE = utf8_general_ci 组织ID bigint - + 2C5F2D72-CD86-4110-B751-E1A9F8DC1EE4 user_id user_id @@ -17954,7 +17977,7 @@ COLLATE = utf8_general_ci - + 34B82EA4-DFF5-4DAA-8DC5-88016A7E9853 Key_1 Key_1 @@ -17963,12 +17986,12 @@ COLLATE = utf8_general_ci 1663743144 87966 - + - + @@ -17986,7 +18009,7 @@ DEFAULT CHARACTER SET = utf8 COLLATE = utf8_general_ci - + AC155EE6-EF64-45BB-B846-41E20125AC83 resources_question_snapshot_id resources_question_snapshot_id @@ -17998,7 +18021,7 @@ COLLATE = utf8_general_ci bigint 1 - + D00F59E0-A483-453B-B382-AD18F74C0ABB from_id from_id @@ -18015,7 +18038,7 @@ COLLATE = utf8_general_ci - + 4CD5F796-DD7D-4978-9E99-2F93C55A9DE6 from_type from_type @@ -18028,7 +18051,7 @@ COLLATE = utf8_general_ci 100 1 - + 7CC923C5-15FB-416F-9848-3A6074318CB7 course_info_id course_info_id @@ -18039,7 +18062,7 @@ COLLATE = utf8_general_ci 课程ID bigint - + C2F9DA27-4C8F-4E1C-8FC7-097B5D5E2112 question_type question_type @@ -18051,7 +18074,7 @@ COLLATE = utf8_general_ci int(2) 2 - + D0F029A5-D1D5-41C6-A45A-8C02F71554D4 question_score question_score @@ -18064,7 +18087,7 @@ COLLATE = utf8_general_ci 3 1 - + 0ECC9C70-B0C6-4B6A-AA55-900348999E97 question_stem question_stem @@ -18076,7 +18099,7 @@ COLLATE = utf8_general_ci varchar(3000) 3000 - + 3A2CD667-596E-4179-A1C3-C84574CC2D35 question_option_a question_option_a @@ -18088,7 +18111,7 @@ COLLATE = utf8_general_ci varchar(1000) 1000 - + 904C4226-FB16-49BB-BD20-7D4B75F9F84D question_option_b question_option_b @@ -18100,7 +18123,7 @@ COLLATE = utf8_general_ci varchar(1000) 1000 - + 65D90F75-0EE9-4B45-9ABA-E0134A1861B6 question_option_c question_option_c @@ -18112,7 +18135,7 @@ COLLATE = utf8_general_ci varchar(1000) 1000 - + 5372673F-EFA4-43E1-A307-9015247C3F08 question_option_d question_option_d @@ -18124,7 +18147,7 @@ COLLATE = utf8_general_ci varchar(1000) 1000 - + 73EBF1AA-5D7F-49B4-BDDD-F43924A73C10 question_option_e question_option_e @@ -18136,7 +18159,7 @@ COLLATE = utf8_general_ci varchar(1000) 1000 - + 7AF50FDC-012A-42EB-A0EA-ADE08E1C234B question_answer question_answer @@ -18148,7 +18171,7 @@ COLLATE = utf8_general_ci varchar(255) 255 - + C73F0E11-433D-4331-98DF-1BFDFDBC7071 question_analysis question_analysis @@ -18160,7 +18183,7 @@ COLLATE = utf8_general_ci varchar(3000) 3000 - + ECFF01FA-E7F1-4AC3-A90C-02D6558F5528 question_status question_status @@ -18172,7 +18195,7 @@ COLLATE = utf8_general_ci int(2) 2 - + 97AAC8D6-13BD-4D2E-9C79-FF779394577C user_id user_id @@ -18183,7 +18206,7 @@ COLLATE = utf8_general_ci 后台用户ID bigint - + 81D26B2E-3769-4C43-A6F5-CBCD440252BC org_id org_id @@ -18196,7 +18219,7 @@ COLLATE = utf8_general_ci - + 7392447A-2744-4FA6-A36F-A826153E895A Key_1 Key_1 @@ -18205,17 +18228,17 @@ COLLATE = utf8_general_ci 1664171022 87966 - + - + - + BFEA4109-96F9-4074-AF58-B84D6574A7FC PUBLIC PUBLIC @@ -18343,7 +18366,7 @@ COLLATE = utf8_general_ci - + ABEFC813-1056-4507-A9A7-809C149B4ABE 1661954753 lx @@ -18566,7 +18589,7 @@ COLLATE = utf8_general_ci - + 5963E417-B2CE-431D-988A-B3493AAE5EE4 MySQL 5.0 MYSQL50 diff --git a/doc/sql/mysql/tianze-pro.sql b/doc/sql/mysql/tianze-pro.sql index 13c45f12..87cdcb5d 100644 --- a/doc/sql/mysql/tianze-pro.sql +++ b/doc/sql/mysql/tianze-pro.sql @@ -28626,9 +28626,6 @@ alter table teacher_open_course_homework comment '我的课程-题库作业'; -- Records of teacher_open_course_homework -- ---------------------------- --- ---------------------------- --- Table structure for teacher_open_course_homework_question_log --- ---------------------------- drop table if exists teacher_open_course_homework_question_log; /*==============================================================*/ @@ -28643,6 +28640,8 @@ create table teacher_open_course_homework_question_log teacher_open_course_homework_question_log_upload_file varchar(1000) comment '附件，学生端上传附件（单文件）', teacher_open_course_homework_question_log_add_time datetime comment '创建时间', teacher_open_course_homework_question_log_status int comment '状态（1正常 2删除）', + teacher_open_course_homework_question_log_from_type varchar(50) comment '来源类型（枚举）', + student_id bigint comment '学生ID', org_id bigint comment '组织ID', user_id bigint comment '用户ID', primary key (teacher_open_course_homework_question_log_id) @@ -28654,6 +28653,7 @@ COLLATE = utf8_general_ci; alter table teacher_open_course_homework_question_log comment '我的课程-题库作业-做题日志'; + -- ---------------------------- -- Records of teacher_open_course_homework_question_log -- ---------------------------- diff --git a/web/src/main/java/cn/jlw/Interceptor/getFile.java b/web/src/main/java/cn/jlw/Interceptor/GetFile.java similarity index 99% rename from web/src/main/java/cn/jlw/Interceptor/getFile.java rename to web/src/main/java/cn/jlw/Interceptor/GetFile.java index c5222b44..061e41e1 100644 --- a/web/src/main/java/cn/jlw/Interceptor/getFile.java +++ b/web/src/main/java/cn/jlw/Interceptor/GetFile.java @@ -14,6 +14,7 @@ import org.apache.commons.io.FileUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.springframework.context.annotation.Configuration; import org.springframework.core.MethodParameter; import org.springframework.web.bind.support.WebDataBinderFactory; import org.springframework.web.context.request.NativeWebRequest; @@ -36,7 +37,9 @@ import java.util.concurrent.Future; import java.util.concurrent.atomic.AtomicLong; //将从request中获取的file获取出来并存入临时文件夹中 -public class getFile implements HandlerMethodArgumentResolver { + +@Configuration +public class GetFile implements HandlerMethodArgumentResolver { private ExecutorService pool = Executors.newCachedThreadPool(); @@ -51,7 +54,7 @@ public class getFile implements HandlerMethodArgumentResolver { } } - public getFile() { + public GetFile() { } @Override diff --git a/web/src/main/java/cn/jlw/Interceptor/getIp.java b/web/src/main/java/cn/jlw/Interceptor/GetIp.java similarity index 87% rename from web/src/main/java/cn/jlw/Interceptor/getIp.java rename to web/src/main/java/cn/jlw/Interceptor/GetIp.java index 4b727f94..4ea924a1 100644 --- a/web/src/main/java/cn/jlw/Interceptor/getIp.java +++ b/web/src/main/java/cn/jlw/Interceptor/GetIp.java @@ -1,6 +1,7 @@ package cn.jlw.Interceptor; import cn.jlw.util.IpUtils; +import org.springframework.context.annotation.Configuration; import org.springframework.core.MethodParameter; import org.springframework.web.bind.support.WebDataBinderFactory; import org.springframework.web.context.request.NativeWebRequest; @@ -9,9 +10,10 @@ import org.springframework.web.method.support.ModelAndViewContainer; import javax.servlet.http.HttpServletRequest; -public class getIp implements HandlerMethodArgumentResolver { +@Configuration +public class GetIp implements HandlerMethodArgumentResolver { - public getIp() { + public GetIp() { } @Override diff --git a/web/src/main/java/cn/jlw/Interceptor/getReferer.java b/web/src/main/java/cn/jlw/Interceptor/GetReferer.java similarity index 90% rename from web/src/main/java/cn/jlw/Interceptor/getReferer.java rename to web/src/main/java/cn/jlw/Interceptor/GetReferer.java index aa06f688..f2afc59e 100644 --- a/web/src/main/java/cn/jlw/Interceptor/getReferer.java +++ b/web/src/main/java/cn/jlw/Interceptor/GetReferer.java @@ -1,6 +1,7 @@ package cn.jlw.Interceptor; import org.apache.commons.lang3.StringUtils; +import org.springframework.context.annotation.Configuration; import org.springframework.core.MethodParameter; import org.springframework.web.bind.support.WebDataBinderFactory; import org.springframework.web.context.request.NativeWebRequest; @@ -9,10 +10,11 @@ import org.springframework.web.method.support.ModelAndViewContainer; import javax.servlet.http.HttpServletRequest; -public class getReferer implements HandlerMethodArgumentResolver { +@Configuration +public class GetReferer implements HandlerMethodArgumentResolver { - public getReferer() { + public GetReferer() { } @Override diff --git a/web/src/main/java/cn/jlw/Interceptor/getTStudent.java b/web/src/main/java/cn/jlw/Interceptor/GetTStudent.java similarity index 88% rename from web/src/main/java/cn/jlw/Interceptor/getTStudent.java rename to web/src/main/java/cn/jlw/Interceptor/GetTStudent.java index 6c6a4814..1abece93 100644 --- a/web/src/main/java/cn/jlw/Interceptor/getTStudent.java +++ b/web/src/main/java/cn/jlw/Interceptor/GetTStudent.java @@ -1,6 +1,7 @@ package cn.jlw.Interceptor; import com.ibeetl.jlw.entity.Student; +import org.springframework.context.annotation.Configuration; import org.springframework.core.MethodParameter; import org.springframework.web.bind.support.WebDataBinderFactory; import org.springframework.web.context.request.NativeWebRequest; @@ -11,9 +12,10 @@ import javax.servlet.http.HttpServletRequest; //将从token中获取的member获取出来 -public class getTStudent implements HandlerMethodArgumentResolver { +@Configuration +public class GetTStudent implements HandlerMethodArgumentResolver { - public getTStudent() { + public GetTStudent() { } @Override diff --git a/web/src/main/java/cn/jlw/Interceptor/InterceptorConfig.java b/web/src/main/java/cn/jlw/Interceptor/InterceptorConfig.java index cbf57eb4..fd0632a7 100644 --- a/web/src/main/java/cn/jlw/Interceptor/InterceptorConfig.java +++ b/web/src/main/java/cn/jlw/Interceptor/InterceptorConfig.java @@ -12,6 +12,7 @@ import org.springframework.web.servlet.config.annotation.InterceptorRegistry; import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry; import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; +import javax.annotation.Resource; import java.util.List; import java.util.ResourceBundle; @@ -20,6 +21,12 @@ import java.util.ResourceBundle; @Configuration public class InterceptorConfig implements WebMvcConfigurer { + @Resource private GetSCoreUser getSCoreUser; + @Resource private GetFile getFile; + @Resource private GetTStudent getTStudent; + @Resource private GetReferer getReferer; + @Resource private GetIp getIp; + private final Log log = LogFactory.getLog(this.getClass()); private static String p = new FileEntity().getParentPath(); @@ -75,11 +82,11 @@ public class InterceptorConfig implements WebMvcConfigurer { */ @Override public void addArgumentResolvers(List argumentResolvers) { - argumentResolvers.add(new getSCoreUser()); - argumentResolvers.add(new getFile()); - argumentResolvers.add(new getTStudent()); - argumentResolvers.add(new getReferer()); - argumentResolvers.add(new getIp()); + argumentResolvers.add(getSCoreUser); + argumentResolvers.add(getFile); + argumentResolvers.add(getTStudent); + argumentResolvers.add(getReferer); + argumentResolvers.add(getIp); } } \ No newline at end of file diff --git a/web/src/main/java/cn/jlw/util/ChunkUploadUtil.java b/web/src/main/java/cn/jlw/util/ChunkUploadUtil.java index 6d6bb45a..cde87730 100644 --- a/web/src/main/java/cn/jlw/util/ChunkUploadUtil.java +++ b/web/src/main/java/cn/jlw/util/ChunkUploadUtil.java @@ -1,18 +1,15 @@ package cn.jlw.util; -import cn.jlw.Interceptor.getFile; -import cn.jlw.aliPay.utils.StringUtils; +import cn.jlw.Interceptor.GetFile; import org.apache.commons.io.FileUtils; import org.springframework.stereotype.Component; import java.io.File; import java.io.IOException; import java.io.RandomAccessFile; -import java.lang.reflect.InvocationTargetException; import java.nio.ByteBuffer; import java.nio.channels.FileChannel; -import java.util.UUID; /** * @author ：TLT @@ -22,7 +19,7 @@ import java.util.UUID; @Component public class ChunkUploadUtil { - public boolean chunkUploadByMappedByteBuffer(getFile.MultipartFileParam param, String filePath,String tempName) throws Exception { + public boolean chunkUploadByMappedByteBuffer(GetFile.MultipartFileParam param, String filePath, String tempName) throws Exception { String fileName = param.getMultipartFile().getOriginalFilename(); String format = fileName.substring(fileName.lastIndexOf(".")); @@ -86,7 +83,7 @@ public class ChunkUploadUtil { * * @return */ - public boolean checkUploadPartStatus(getFile.MultipartFileParam param, String fileName, String filePath) throws IOException { + public boolean checkUploadPartStatus(GetFile.MultipartFileParam param, String fileName, String filePath) throws IOException { File confFile = new File(filePath, fileName + ".conf"); if(confFile.exists()){ byte[] completeStatusList = FileUtils.readFileToByteArray(confFile); @@ -102,7 +99,7 @@ public class ChunkUploadUtil { * * @return */ - public boolean checkUploadStatus(getFile.MultipartFileParam param, String fileName, String filePath) throws IOException { + public boolean checkUploadStatus(GetFile.MultipartFileParam param, String fileName, String filePath) throws IOException { File confFile = new File(filePath, fileName + ".conf"); RandomAccessFile confAccessFile = new RandomAccessFile(confFile, "rw"); //设置文件长度 diff --git a/web/src/main/java/cn/jlw/util/ConvertM3U8.java b/web/src/main/java/cn/jlw/util/ConvertM3U8.java index 7720bdca..78ef1657 100644 --- a/web/src/main/java/cn/jlw/util/ConvertM3U8.java +++ b/web/src/main/java/cn/jlw/util/ConvertM3U8.java @@ -12,7 +12,8 @@ import java.util.List; import java.util.Map; import java.util.ResourceBundle; import java.util.concurrent.ConcurrentHashMap; -import static cn.jlw.Interceptor.getFile.p; + +import static cn.jlw.Interceptor.GetFile.p; /** * mp4转换m3u8工具类 diff --git a/web/src/main/java/cn/jlw/util/zxing.java b/web/src/main/java/cn/jlw/util/zxing.java index 1ed35e02..81e5c38a 100644 --- a/web/src/main/java/cn/jlw/util/zxing.java +++ b/web/src/main/java/cn/jlw/util/zxing.java @@ -1,6 +1,6 @@ package cn.jlw.util; -import cn.jlw.Interceptor.getFile; +import cn.jlw.Interceptor.GetFile; import cn.jlw.aliPay.utils.StringUtils; import com.google.zxing.BarcodeFormat; import com.google.zxing.EncodeHintType; @@ -11,19 +11,21 @@ import com.google.zxing.qrcode.QRCodeWriter; import com.google.zxing.qrcode.decoder.ErrorCorrectionLevel; import com.ibeetl.admin.core.util.TimeTool; import org.apache.tomcat.util.codec.binary.Base64; -import sun.font.FontDesignMetrics; import javax.imageio.ImageIO; import javax.servlet.ServletOutputStream; import java.awt.*; import java.awt.geom.RoundRectangle2D; import java.awt.image.BufferedImage; -import java.io.*; +import java.io.ByteArrayOutputStream; +import java.io.File; +import java.io.IOException; +import java.io.InputStream; import java.net.MalformedURLException; import java.net.URL; -import java.sql.Time; -import java.util.*; -import java.util.List; +import java.util.HashMap; +import java.util.Map; +import java.util.Objects; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -215,7 +217,7 @@ public class zxing { if(headImg.contains("http")){ head = disposeImage(getRemoteBufferedImage(headImg),160,160); }else { - File goodsImgFile = new File(getFile.p+headImg); + File goodsImgFile = new File(GetFile.p+headImg); head = disposeImage(imageIoRead(goodsImgFile),160,160); } BufferedImage code = disposeImage(imageIoRead(codeFile),300,300); @@ -372,7 +374,7 @@ public class zxing { //File groundFile = new File("D://1.png"); - File groundFile = new File(getFile.p+File.separator + "filesystem" + File.separator + "temp" +File.separator+"groundGood.png"); + File groundFile = new File(GetFile.p+File.separator + "filesystem" + File.separator + "temp" +File.separator+"groundGood.png"); BufferedImage ground = imageIoRead(groundFile); int width = ground.getWidth(); @@ -388,7 +390,7 @@ public class zxing { goodsImg = disposeImage(getRemoteBufferedImage(imgUrl),500,500); }else { //File goodsImgFile = new File(imgUrl); - File goodsImgFile = new File(getFile.p+imgUrl); + File goodsImgFile = new File(GetFile.p+imgUrl); goodsImg = disposeImage(imageIoRead(goodsImgFile),500,500); } diff --git a/web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseHomeworkQuestionLogDao.java b/web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseHomeworkQuestionLogDao.java index 1d205232..448e2d51 100644 --- a/web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseHomeworkQuestionLogDao.java +++ b/web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseHomeworkQuestionLogDao.java @@ -10,7 +10,7 @@ import org.beetl.sql.mapper.annotation.Update; import java.util.List; /** - * 开课作业日志 Dao + * 做题日志 Dao */ @SqlResource("jlw.teacherOpenCourseHomeworkQuestionLog") public interface TeacherOpenCourseHomeworkQuestionLogDao extends BaseMapper{ diff --git a/web/src/main/java/com/ibeetl/jlw/entity/ResourcesQuestionOptionEntity.java b/web/src/main/java/com/ibeetl/jlw/entity/ResourcesQuestionOptionEntity.java index ce093582..acd9c0eb 100644 --- a/web/src/main/java/com/ibeetl/jlw/entity/ResourcesQuestionOptionEntity.java +++ b/web/src/main/java/com/ibeetl/jlw/entity/ResourcesQuestionOptionEntity.java @@ -1,5 +1,6 @@ package com.ibeetl.jlw.entity; +import cn.hutool.core.collection.ConcurrentHashSet; import cn.hutool.core.lang.Assert; import cn.hutool.core.util.ArrayUtil; import cn.hutool.core.util.ObjectUtil; @@ -7,7 +8,6 @@ import cn.hutool.core.util.ReflectUtil; import java.lang.reflect.Field; import java.util.*; -import java.util.concurrent.CopyOnWriteArrayList; import static org.apache.commons.lang3.StringUtils.join; import static org.apache.commons.lang3.StringUtils.upperCase; @@ -56,9 +56,9 @@ public class ResourcesQuestionOptionEntity { * @param answerMap <题目，ABCD..> * @return */ - public List getAnswerList(Map answerMap) { + public Set getAnswerList(Map answerMap) { // 最后的答案 - List answerList = new CopyOnWriteArrayList<>(); + Set answerList = new ConcurrentHashSet<>(); answerMap.forEach((optionText, newAnswer) -> { optionTextMap.forEach((optionText2, isAnswer) -> { if (optionText2.equals(optionText) && isAnswer) { @@ -130,9 +130,9 @@ public class ResourcesQuestionOptionEntity { } // 如果没有选项，可能是单选或者其他类型的题目 - List answerList = optionEntity.getAnswerList(answerMap); - List defaultAnswer = Collections.singletonList(questionAnswer); - List answer = ObjectUtil.isNotEmpty(answerList)? answerList: defaultAnswer; + Set answerList = optionEntity.getAnswerList(answerMap); + Set defaultAnswer = Collections.singleton(questionAnswer); + Set answer = ObjectUtil.isNotEmpty(answerList)? answerList: defaultAnswer; // 乱序后的正确答案赋值 ReflectUtil.setFieldValue(obj, answerFieldName, join(answer, ",")); } diff --git a/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseHomeworkQuestionLog.java b/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseHomeworkQuestionLog.java index 4270ec53..4745d38c 100644 --- a/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseHomeworkQuestionLog.java +++ b/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseHomeworkQuestionLog.java @@ -10,7 +10,7 @@ import java.util.Date; /* * 我的课程-题库作业-做题日志 -* gen by Spring Boot2 Admin 2022-09-26 +* gen by Spring Boot2 Admin 2022-09-28 */ public class TeacherOpenCourseHomeworkQuestionLog extends BaseEntity{ @@ -27,7 +27,6 @@ public class TeacherOpenCourseHomeworkQuestionLog extends BaseEntity{ private Long teacherOpenCourseQuestionHomeworkId ; //题目快照ID - @Dict(type="resources_question_snapshot.question_stem.question_status=1") private Long resourcesQuestionSnapshotId ; @@ -48,6 +47,14 @@ public class TeacherOpenCourseHomeworkQuestionLog extends BaseEntity{ private Integer teacherOpenCourseHomeworkQuestionLogStatus ; + //来源类型（枚举） + + private String teacherOpenCourseHomeworkQuestionLogFromType ; + + //学生ID + + private Long studentId ; + //组织ID private Long orgId ; @@ -150,6 +157,32 @@ public class TeacherOpenCourseHomeworkQuestionLog extends BaseEntity{ this.teacherOpenCourseHomeworkQuestionLogStatus = teacherOpenCourseHomeworkQuestionLogStatus; } + /**来源类型（枚举） + *@return + */ + public String getTeacherOpenCourseHomeworkQuestionLogFromType(){ + return teacherOpenCourseHomeworkQuestionLogFromType; + } + /**来源类型（枚举） + *@param teacherOpenCourseHomeworkQuestionLogFromType + */ + public void setTeacherOpenCourseHomeworkQuestionLogFromType(String teacherOpenCourseHomeworkQuestionLogFromType){ + this.teacherOpenCourseHomeworkQuestionLogFromType = teacherOpenCourseHomeworkQuestionLogFromType; + } + + /**学生ID + *@return + */ + public Long getStudentId(){ + return studentId; + } + /**学生ID + *@param studentId + */ + public void setStudentId(Long studentId){ + this.studentId = studentId; + } + /**组织ID *@return */ diff --git a/web/src/main/java/com/ibeetl/jlw/job/ImageAutoJob.java b/web/src/main/java/com/ibeetl/jlw/job/ImageAutoJob.java index 27809455..485d9b45 100644 --- a/web/src/main/java/com/ibeetl/jlw/job/ImageAutoJob.java +++ b/web/src/main/java/com/ibeetl/jlw/job/ImageAutoJob.java @@ -20,7 +20,7 @@ import java.math.RoundingMode; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -import static cn.jlw.Interceptor.getFile.p; +import static cn.jlw.Interceptor.GetFile.p; import static java.lang.Thread.sleep; public class ImageAutoJob implements Job { diff --git a/web/src/main/java/com/ibeetl/jlw/service/CourseInfoService.java b/web/src/main/java/com/ibeetl/jlw/service/CourseInfoService.java index 90171f0d..3ad14543 100644 --- a/web/src/main/java/com/ibeetl/jlw/service/CourseInfoService.java +++ b/web/src/main/java/com/ibeetl/jlw/service/CourseInfoService.java @@ -1,7 +1,7 @@ package com.ibeetl.jlw.service; -import cn.jlw.Interceptor.getFile; +import cn.jlw.Interceptor.GetFile; import cn.jlw.util.ToolUtils; import com.ibeetl.admin.core.service.CoreBaseService; import com.ibeetl.admin.core.service.CorePlatformService; @@ -762,7 +762,7 @@ public class CourseInfoService extends CoreBaseService{ //文件夹路径 String saveUrl = File.separator + "filesystem" + File.separator + "courseInfo" + File.separator + System.currentTimeMillis() + File.separator ; - String path = getFile.p + saveUrl; + String path = GetFile.p + saveUrl; File m = new File(path); if(!m.exists()){ @@ -778,7 +778,7 @@ public class CourseInfoService extends CoreBaseService{ if(null != courseInfoList && courseInfoList.size()>0){ String p = saveUrl + System.currentTimeMillis() + ".docx"; - String url = getFile.p + p; + String url = GetFile.p + p; FileInputStream fis = new FileInputStream(file); diff --git a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseHomeworkQuestionLogService.java b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseHomeworkQuestionLogService.java index 18944c37..f0870459 100644 --- a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseHomeworkQuestionLogService.java +++ b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseHomeworkQuestionLogService.java @@ -21,7 +21,7 @@ import java.util.ArrayList; import java.util.List; /** - * 开课作业日志 Service + * 做题日志 Service * 当分布式ID开启后请勿使用insert(*,true) */ @@ -58,7 +58,7 @@ public class TeacherOpenCourseHomeworkQuestionLogService extends CoreBaseService try { teacherOpenCourseHomeworkQuestionLogDao.deleteTeacherOpenCourseHomeworkQuestionLogByIds(ids); } catch (Exception e) { - throw new PlatformException("批量删除开课作业日志失败", e); + throw new PlatformException("批量删除做题日志失败", e); } } diff --git a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseHomeworkService.java b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseHomeworkService.java index 07b36131..bcbbe294 100644 --- a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseHomeworkService.java +++ b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseHomeworkService.java @@ -1,7 +1,5 @@ package com.ibeetl.jlw.service; -import cn.hutool.core.map.MapUtil; -import cn.hutool.core.util.ObjectUtil; import cn.hutool.extra.validation.BeanValidationResult; import cn.hutool.extra.validation.ValidationUtil; import cn.jlw.util.ToolUtils; @@ -29,14 +27,12 @@ import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.util.ArrayList; -import java.util.Collections; import java.util.List; -import java.util.Map; import static cn.hutool.json.JSONUtil.toJsonStr; +import static com.ibeetl.admin.core.util.user.CacheUserUtil.getUserId; import static com.ibeetl.jlw.entity.ResourcesQuestionOptionEntity.shuffleOrderOptions; import static com.ibeetl.jlw.web.query.TeacherOpenCourseHomeworkQuery.TeacherOpenCourseHomeworkTypeEnum.getClazzByEnum; -import static java.util.stream.Collectors.groupingBy; /** * 开课作业 Service @@ -51,6 +47,8 @@ public class TeacherOpenCourseHomeworkService extends CoreBaseServicequeryByCondition(PageQuery query){ PageQuery ret = teacherOpenCourseHomeworkDao.queryByCondition(query); queryListAfter(ret.getList()); @@ -199,15 +197,19 @@ public class TeacherOpenCourseHomeworkService extends CoreBaseService resourcesQuestionSnapshots = new ArrayList<>(); TeacherOpenCourseHomework homework = getInfo(teacherOpenCourseHomeworkId); - cn.hutool.core.lang.Assert.notNull(homework, "未查询到"); + cn.hutool.core.lang.Assert.notNull(homework, "未查询到作业ID对应的题目！"); TeacherOpenCourseHomeworkSettingQuery settingQuery = new TeacherOpenCourseHomeworkSettingQuery(); settingQuery.setTeacherOpenCourseHomeworkId(teacherOpenCourseHomeworkId); TeacherOpenCourseHomeworkSetting hwSetting = teacherOpenCourseHomeworkSettingService.getInfo(settingQuery); + ResourcesQuestionSnapshotQuery questionSnapshotQuery = new ResourcesQuestionSnapshotQuery(); + questionSnapshotQuery.setFromId(teacherOpenCourseHomeworkId); + // 作答次数 if (TRUE_CONST.equals(hwSetting.getTeacherOpenCourseHomeworkSettingDoCount())) { // TODO 逻辑不一定要在这里写 + getUserId(); } // 答卷后显示答案解析 @@ -220,10 +222,13 @@ public class TeacherOpenCourseHomeworkService extends CoreBaseService resourcesQuestionSnapshots) { - // 安全判空 - if (ObjectUtil.isEmpty(resourcesQuestionSnapshots)) { - return; - } - // 题目根据类型分组 - Map> questionTypeMap = resourcesQuestionSnapshots.stream() - .collect(groupingBy(ResourcesQuestionSnapshot::getQuestionType)); - - - // 同一道大题内，乱序 - questionTypeMap.forEach((questionType, questionSnapshots) -> { - Collections.shuffle(questionSnapshots); - }); - - - // 大题数字升序 - MapUtil.sort(questionTypeMap); + return resourcesQuestionSnapshots; } } diff --git a/web/src/main/java/com/ibeetl/jlw/web/HandsOnController.java b/web/src/main/java/com/ibeetl/jlw/web/HandsOnController.java index 840b7f9c..f3bd8731 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/HandsOnController.java +++ b/web/src/main/java/com/ibeetl/jlw/web/HandsOnController.java @@ -1,59 +1,33 @@ package com.ibeetl.jlw.web; -import cn.jlw.Interceptor.RFile; import cn.jlw.Interceptor.SCoreUser; -import cn.jlw.Interceptor.getFile; -import cn.jlw.util.ToolUtils; import cn.jlw.validate.ValidateConfig; +import com.ibeetl.admin.core.annotation.Function; import com.ibeetl.admin.core.entity.CoreUser; import com.ibeetl.admin.core.file.FileService; -import com.ibeetl.admin.core.util.ConvertUtil; -import com.ibeetl.admin.core.util.PlatformException; -import com.ibeetl.admin.core.util.TimeTool; import com.ibeetl.admin.core.web.JsonResult; +import com.ibeetl.jlw.entity.HandsOn; +import com.ibeetl.jlw.entity.HandsOnSimulationTasks; +import com.ibeetl.jlw.service.HandsOnService; +import com.ibeetl.jlw.service.HandsOnSimulationTasksService; +import com.ibeetl.jlw.web.query.HandsOnQuery; +import com.ibeetl.jlw.web.query.HandsOnSimulationTasksQuery; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.poi.hssf.usermodel.*; -import org.apache.poi.ss.usermodel.Cell; -import org.apache.poi.ss.usermodel.HorizontalAlignment; -import org.apache.poi.ss.usermodel.Row; -import org.apache.poi.ss.usermodel.Sheet; -import org.apache.poi.xssf.usermodel.XSSFWorkbook; import org.beetl.sql.core.engine.PageQuery; import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; -import org.springframework.web.servlet.ModelAndView; - +import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.RestController; -import org.springframework.validation.annotation.Validated; - -import com.ibeetl.admin.console.web.dto.DictExcelImportData; -import com.ibeetl.admin.console.web.query.UserQuery; -import com.ibeetl.admin.core.annotation.Function; -import com.ibeetl.jlw.entity.*; -import com.ibeetl.jlw.service.*; -import com.ibeetl.jlw.web.query.*; +import org.springframework.web.servlet.ModelAndView; import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import java.io.File; -import java.io.FileInputStream; -import java.io.InputStream; -import java.util.ArrayList; import java.util.Date; import java.util.List; -import java.util.Map; -import java.math.BigDecimal; - -import javax.annotation.Resource; /** * HandsOn 课程实操 接口 diff --git a/web/src/main/java/com/ibeetl/jlw/web/HandsOnSimulationTasksController.java b/web/src/main/java/com/ibeetl/jlw/web/HandsOnSimulationTasksController.java index 31557408..7cf07450 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/HandsOnSimulationTasksController.java +++ b/web/src/main/java/com/ibeetl/jlw/web/HandsOnSimulationTasksController.java @@ -1,58 +1,28 @@ package com.ibeetl.jlw.web; -import cn.jlw.Interceptor.RFile; import cn.jlw.Interceptor.SCoreUser; -import cn.jlw.Interceptor.getFile; -import cn.jlw.util.ToolUtils; import cn.jlw.validate.ValidateConfig; +import com.ibeetl.admin.core.annotation.Function; import com.ibeetl.admin.core.entity.CoreUser; import com.ibeetl.admin.core.file.FileService; -import com.ibeetl.admin.core.util.ConvertUtil; -import com.ibeetl.admin.core.util.PlatformException; -import com.ibeetl.admin.core.util.TimeTool; import com.ibeetl.admin.core.web.JsonResult; +import com.ibeetl.jlw.entity.HandsOnSimulationTasks; +import com.ibeetl.jlw.service.HandsOnSimulationTasksService; +import com.ibeetl.jlw.web.query.HandsOnSimulationTasksQuery; import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.poi.hssf.usermodel.*; -import org.apache.poi.ss.usermodel.Cell; -import org.apache.poi.ss.usermodel.HorizontalAlignment; -import org.apache.poi.ss.usermodel.Row; -import org.apache.poi.ss.usermodel.Sheet; -import org.apache.poi.xssf.usermodel.XSSFWorkbook; import org.beetl.sql.core.engine.PageQuery; import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; -import org.springframework.web.servlet.ModelAndView; - +import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.RestController; -import org.springframework.validation.annotation.Validated; - -import com.ibeetl.admin.console.web.dto.DictExcelImportData; -import com.ibeetl.admin.console.web.query.UserQuery; -import com.ibeetl.admin.core.annotation.Function; -import com.ibeetl.jlw.entity.*; -import com.ibeetl.jlw.service.*; -import com.ibeetl.jlw.web.query.*; +import org.springframework.web.servlet.ModelAndView; import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import java.io.File; -import java.io.FileInputStream; -import java.io.InputStream; -import java.util.ArrayList; -import java.util.Date; import java.util.List; -import java.util.Map; -import java.math.BigDecimal; - -import javax.annotation.Resource; /** * HandsOnSimulationTasks 课程实操-实训任务 接口 diff --git a/web/src/main/java/com/ibeetl/jlw/web/ResourcesQuestionController.java b/web/src/main/java/com/ibeetl/jlw/web/ResourcesQuestionController.java index e4da3ec1..e5860bf7 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/ResourcesQuestionController.java +++ b/web/src/main/java/com/ibeetl/jlw/web/ResourcesQuestionController.java @@ -1,7 +1,7 @@ package com.ibeetl.jlw.web; +import cn.jlw.Interceptor.GetFile; import cn.jlw.Interceptor.RFile; -import cn.jlw.Interceptor.getFile; import cn.jlw.validate.ValidateConfig; import com.ibeetl.admin.core.annotation.Function; import com.ibeetl.admin.core.file.FileService; @@ -330,7 +330,7 @@ public class ResourcesQuestionController{ XSSFWorkbook workbook = null; InputStream is = null; try { - is = new FileInputStream(getFile.p + File.separator +"filesystem"+ File.separator +"template"+ File.separator+ "题库导入模板.xlsx"); + is = new FileInputStream(GetFile.p + File.separator +"filesystem"+ File.separator +"template"+ File.separator+ "题库导入模板.xlsx"); workbook = new XSSFWorkbook(is); diff --git a/web/src/main/java/com/ibeetl/jlw/web/StudentController.java b/web/src/main/java/com/ibeetl/jlw/web/StudentController.java index 28043b79..5ec5d0fb 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/StudentController.java +++ b/web/src/main/java/com/ibeetl/jlw/web/StudentController.java @@ -1,6 +1,5 @@ package com.ibeetl.jlw.web; -import cn.hutool.core.util.ObjectUtil; import cn.jlw.Interceptor.*; import cn.jlw.token.TokenService; import cn.jlw.util.JupyterNotebookUtils; @@ -2273,7 +2272,7 @@ public class StudentController{ XSSFWorkbook workbook = null; InputStream is = null; try { - is = new FileInputStream(getFile.p + File.separator +"filesystem"+ File.separator +"template"+ File.separator+ "学生导入模板.xlsx"); + is = new FileInputStream(GetFile.p + File.separator +"filesystem"+ File.separator +"template"+ File.separator+ "学生导入模板.xlsx"); workbook = new XSSFWorkbook(is); diff --git a/web/src/main/java/com/ibeetl/jlw/web/TeacherController.java b/web/src/main/java/com/ibeetl/jlw/web/TeacherController.java index 25b5d876..06066366 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/TeacherController.java +++ b/web/src/main/java/com/ibeetl/jlw/web/TeacherController.java @@ -1,8 +1,8 @@ package com.ibeetl.jlw.web; +import cn.jlw.Interceptor.GetFile; import cn.jlw.Interceptor.RFile; import cn.jlw.Interceptor.SCoreUser; -import cn.jlw.Interceptor.getFile; import cn.jlw.util.JupyterNotebookUtils; import cn.jlw.util.ToolUtils; import cn.jlw.validate.ValidateConfig; @@ -1274,7 +1274,7 @@ public class TeacherController{ XSSFWorkbook workbook = null; InputStream is = null; try { - is = new FileInputStream(getFile.p + File.separator +"filesystem"+ File.separator +"template"+ File.separator+ "教师导入模板.xlsx"); + is = new FileInputStream(GetFile.p + File.separator +"filesystem"+ File.separator +"template"+ File.separator+ "教师导入模板.xlsx"); workbook = new XSSFWorkbook(is); diff --git a/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseHomeworkController.java b/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseHomeworkController.java index f2fb4cb2..67f4ca66 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseHomeworkController.java +++ b/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseHomeworkController.java @@ -192,7 +192,7 @@ public class TeacherOpenCourseHomeworkController { } /** - * 根据类型添加作业（题目作业，附件作业） + * 教师端-根据类型添加作业（题目作业，附件作业） * @param teacherOpenCourseHomeworkQuery * @param result * @param coreUser @@ -215,13 +215,13 @@ public class TeacherOpenCourseHomeworkController { } /** - * 学生端-获取作业 + * 学生端-根绝作业配置信息，获取作业 * @param teacherOpenCourseHomeworkId 开课作业ID * @return */ @PostMapping(MODEL + "/homeworkDetail.json") @Function("teacherOpenCourseHomework.query") - public JsonResult homeworkDetail(Long teacherOpenCourseHomeworkId) { + public JsonResult homeworkDetail(Long teacherOpenCourseHomeworkId, @SCoreUser CoreUser coreUser) { return JsonResult.success(teacherOpenCourseHomeworkService.homeworkDetail(teacherOpenCourseHomeworkId)); } diff --git a/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseHomeworkQuestionLogController.java b/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseHomeworkQuestionLogController.java index 955a1a50..0d5e6c95 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseHomeworkQuestionLogController.java +++ b/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseHomeworkQuestionLogController.java @@ -25,7 +25,7 @@ import javax.annotation.Resource; import java.util.List; /** - * 开课作业日志 我的课程-题库作业-做题日志 接口 + * 做题日志 我的课程-题库作业-做题日志 接口 * 切记不要对非线程安全的静态变量进行写操作 */ diff --git a/web/src/main/java/com/ibeetl/jlw/web/query/ResourcesQuestionSnapshotQuery.java b/web/src/main/java/com/ibeetl/jlw/web/query/ResourcesQuestionSnapshotQuery.java index 26caab31..0cab3f3e 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/query/ResourcesQuestionSnapshotQuery.java +++ b/web/src/main/java/com/ibeetl/jlw/web/query/ResourcesQuestionSnapshotQuery.java @@ -49,6 +49,11 @@ public class ResourcesQuestionSnapshotQuery extends PageParam { @Query(name = "组织机构ID", display = false) private Long orgId; + /** + * 同一道大题，是否乱序。SQL处理 + */ + private Boolean rand; + private String fromIdPlural; private String courseInfoIdPlural; private String questionTypePlural; @@ -233,4 +238,12 @@ public class ResourcesQuestionSnapshotQuery extends PageParam { public void set_given(String _given) { this._given = _given; } + + public Boolean getRand() { + return rand; + } + + public void setRand(Boolean rand) { + this.rand = rand; + } } diff --git a/web/src/main/java/com/ibeetl/jlw/web/query/TeacherOpenCourseHomeworkQuestionLogQuery.java b/web/src/main/java/com/ibeetl/jlw/web/query/TeacherOpenCourseHomeworkQuestionLogQuery.java index 925ba800..e69b4fc4 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/query/TeacherOpenCourseHomeworkQuestionLogQuery.java +++ b/web/src/main/java/com/ibeetl/jlw/web/query/TeacherOpenCourseHomeworkQuestionLogQuery.java @@ -9,7 +9,7 @@ import javax.validation.constraints.NotNull; import java.util.Date; /** - *开课作业日志查询 + *做题日志查询 */ public class TeacherOpenCourseHomeworkQuestionLogQuery extends PageParam { @NotNull(message = "ID不能为空", groups =ValidateConfig.UPDATE.class) @@ -17,7 +17,7 @@ public class TeacherOpenCourseHomeworkQuestionLogQuery extends PageParam { private Long teacherOpenCourseHomeworkQuestionLogId; @Query(name = "题库作业ID", display = true,type=Query.TYPE_DICT,dict="teacher_open_course_homework.teacher_open_course_homework_name.teacher_open_course_homework_status=1") private Long teacherOpenCourseQuestionHomeworkId; - @Query(name = "题目快照ID", display = true,type=Query.TYPE_DICT,dict="resources_question_snapshot.question_stem.question_status=1") + @Query(name = "题目快照ID", display = false) private Long resourcesQuestionSnapshotId; @Query(name = "学生提交的答案", display = false) private String teacherOpenCourseHomeworkQuestionLogAnswer; @@ -27,6 +27,10 @@ public class TeacherOpenCourseHomeworkQuestionLogQuery extends PageParam { private Date teacherOpenCourseHomeworkQuestionLogAddTime; @Query(name = "状态（1正常 2删除）", display = true,type=Query.TYPE_DICT,dict="global_status") private Integer teacherOpenCourseHomeworkQuestionLogStatus; + @Query(name = "来源类型（枚举）", display = false) + private String teacherOpenCourseHomeworkQuestionLogFromType; + @Query(name = "学生ID", display = false) + private Long studentId; @Query(name = "组织ID", display = false) private Long orgId; @Query(name = "用户ID", display = false) @@ -36,6 +40,7 @@ public class TeacherOpenCourseHomeworkQuestionLogQuery extends PageParam { private String teacherOpenCourseQuestionHomeworkIdPlural; private String resourcesQuestionSnapshotIdPlural; private String teacherOpenCourseHomeworkQuestionLogStatusPlural; + private String studentIdPlural; private String orgIdPlural; private String userIdPlural; @@ -85,6 +90,18 @@ public class TeacherOpenCourseHomeworkQuestionLogQuery extends PageParam { public void setTeacherOpenCourseHomeworkQuestionLogStatus(Integer teacherOpenCourseHomeworkQuestionLogStatus ){ this.teacherOpenCourseHomeworkQuestionLogStatus = teacherOpenCourseHomeworkQuestionLogStatus; } + public String getTeacherOpenCourseHomeworkQuestionLogFromType(){ + return teacherOpenCourseHomeworkQuestionLogFromType; + } + public void setTeacherOpenCourseHomeworkQuestionLogFromType(String teacherOpenCourseHomeworkQuestionLogFromType ){ + this.teacherOpenCourseHomeworkQuestionLogFromType = teacherOpenCourseHomeworkQuestionLogFromType; + } + public Long getStudentId(){ + return studentId; + } + public void setStudentId(Long studentId ){ + this.studentId = studentId; + } public Long getOrgId(){ return orgId; } @@ -107,6 +124,8 @@ public class TeacherOpenCourseHomeworkQuestionLogQuery extends PageParam { pojo.setTeacherOpenCourseHomeworkQuestionLogUploadFile(this.getTeacherOpenCourseHomeworkQuestionLogUploadFile()); pojo.setTeacherOpenCourseHomeworkQuestionLogAddTime(this.getTeacherOpenCourseHomeworkQuestionLogAddTime()); pojo.setTeacherOpenCourseHomeworkQuestionLogStatus(this.getTeacherOpenCourseHomeworkQuestionLogStatus()); + pojo.setTeacherOpenCourseHomeworkQuestionLogFromType(this.getTeacherOpenCourseHomeworkQuestionLogFromType()); + pojo.setStudentId(this.getStudentId()); pojo.setOrgId(this.getOrgId()); pojo.setUserId(this.getUserId()); return pojo; @@ -136,6 +155,12 @@ public class TeacherOpenCourseHomeworkQuestionLogQuery extends PageParam { public void setTeacherOpenCourseHomeworkQuestionLogStatusPlural(String teacherOpenCourseHomeworkQuestionLogStatusPlural){ this.teacherOpenCourseHomeworkQuestionLogStatusPlural = teacherOpenCourseHomeworkQuestionLogStatusPlural; } + public String getStudentIdPlural(){ + return studentIdPlural; + } + public void setStudentIdPlural(String studentIdPlural){ + this.studentIdPlural = studentIdPlural; + } public String getOrgIdPlural(){ return orgIdPlural; } diff --git a/web/src/main/resources/sql/jlw/resourcesQuestionSnapshot.md b/web/src/main/resources/sql/jlw/resourcesQuestionSnapshot.md index 12e9a925..d7e36c2a 100644 --- a/web/src/main/resources/sql/jlw/resourcesQuestionSnapshot.md +++ b/web/src/main/resources/sql/jlw/resourcesQuestionSnapshot.md @@ -441,6 +441,12 @@ getValuesByQuery @if(!isEmpty(orgIdPlural)){ and find_in_set(t.org_id,#orgIdPlural#) @} + order by question_type + @// 同一大题，是否随机排序 + @if(rand == true){ + ,rand() + @} + asc diff --git a/web/src/main/resources/sql/jlw/teacherOpenCourseHomeworkQuestionLog.md b/web/src/main/resources/sql/jlw/teacherOpenCourseHomeworkQuestionLog.md index f8c23729..4da13d28 100644 --- a/web/src/main/resources/sql/jlw/teacherOpenCourseHomeworkQuestionLog.md +++ b/web/src/main/resources/sql/jlw/teacherOpenCourseHomeworkQuestionLog.md @@ -46,6 +46,15 @@ queryByCondition and find_in_set(t.teacher_open_course_homework_question_log_status,#teacherOpenCourseHomeworkQuestionLogStatusPlural#) @} @} + @if(!isEmpty(teacherOpenCourseHomeworkQuestionLogFromType)){ + and t.teacher_open_course_homework_question_log_from_type =#teacherOpenCourseHomeworkQuestionLogFromType# + @} + @if(!isEmpty(studentId)){ + and t.student_id =#studentId# + @} + @if(!isEmpty(studentIdPlural)){ + and find_in_set(t.student_id,#studentIdPlural#) + @} @if(!isEmpty(orgId)){ and t.org_id =#orgId# @} @@ -106,6 +115,15 @@ queryByConditionQuery and find_in_set(t.teacher_open_course_homework_question_log_status,#teacherOpenCourseHomeworkQuestionLogStatusPlural#) @} @} + @if(!isEmpty(teacherOpenCourseHomeworkQuestionLogFromType)){ + and t.teacher_open_course_homework_question_log_from_type =#teacherOpenCourseHomeworkQuestionLogFromType# + @} + @if(!isEmpty(studentId)){ + and t.student_id =#studentId# + @} + @if(!isEmpty(studentIdPlural)){ + and find_in_set(t.student_id,#studentIdPlural#) + @} @if(!isEmpty(orgId)){ and t.org_id =#orgId# @} @@ -194,6 +212,20 @@ updateGivenByIds teacher_open_course_homework_question_log_status = #teacherOpenCourseHomeworkQuestionLogStatus# , @} @} + @if(contain("teacherOpenCourseHomeworkQuestionLogFromType",_given)){ + @if(isEmpty(teacherOpenCourseHomeworkQuestionLogFromType)){ + teacher_open_course_homework_question_log_from_type = null , + @}else{ + teacher_open_course_homework_question_log_from_type = #teacherOpenCourseHomeworkQuestionLogFromType# , + @} + @} + @if(contain("studentId",_given)){ + @if(isEmpty(studentId)){ + student_id = null , + @}else{ + student_id = #studentId# , + @} + @} @if(contain("orgId",_given)){ @if(isEmpty(orgId)){ org_id = null , @@ -244,6 +276,12 @@ getTeacherOpenCourseHomeworkQuestionLogValues @}else{ and t.teacher_open_course_homework_question_log_status != 2 @} + @if(!isEmpty(teacherOpenCourseHomeworkQuestionLogFromType)){ + and t.teacher_open_course_homework_question_log_from_type =#teacherOpenCourseHomeworkQuestionLogFromType# + @} + @if(!isEmpty(studentId)){ + and t.student_id =#studentId# + @} @if(!isEmpty(orgId)){ and t.org_id =#orgId# @} @@ -296,6 +334,15 @@ getValuesByQuery and find_in_set(t.teacher_open_course_homework_question_log_status,#teacherOpenCourseHomeworkQuestionLogStatusPlural#) @} @} + @if(!isEmpty(teacherOpenCourseHomeworkQuestionLogFromType)){ + and t.teacher_open_course_homework_question_log_from_type =#teacherOpenCourseHomeworkQuestionLogFromType# + @} + @if(!isEmpty(studentId)){ + and t.student_id =#studentId# + @} + @if(!isEmpty(studentIdPlural)){ + and find_in_set(t.student_id,#studentIdPlural#) + @} @if(!isEmpty(orgId)){ and t.org_id =#orgId# @} diff --git a/web/src/main/resources/static/js/jlw/teacherOpenCourseHomeworkQuestionLog/del.js b/web/src/main/resources/static/js/jlw/teacherOpenCourseHomeworkQuestionLog/del.js index 59d329e9..bd80aeef 100644 --- a/web/src/main/resources/static/js/jlw/teacherOpenCourseHomeworkQuestionLog/del.js +++ b/web/src/main/resources/static/js/jlw/teacherOpenCourseHomeworkQuestionLog/del.js @@ -9,7 +9,7 @@ layui.define(['table', 'teacherOpenCourseHomeworkQuestionLogApi'], function(expo if(data==null){ return ; } - Common.openConfirm("确认要删除这些开课作业日志?",function(){ + Common.openConfirm("确认要删除这些做题日志?",function(){ var ids =Common.concatBatchId(data,"teacherOpenCourseHomeworkQuestionLogId"); teacherOpenCourseHomeworkQuestionLogApi.del(ids,function(){ Common.info("删除成功"); diff --git a/web/src/main/resources/static/js/jlw/teacherOpenCourseHomeworkQuestionLog/index.js b/web/src/main/resources/static/js/jlw/teacherOpenCourseHomeworkQuestionLog/index.js index e790a9b7..dd228694 100644 --- a/web/src/main/resources/static/js/jlw/teacherOpenCourseHomeworkQuestionLog/index.js +++ b/web/src/main/resources/static/js/jlw/teacherOpenCourseHomeworkQuestionLog/index.js @@ -49,11 +49,11 @@ layui.define([ 'form', 'laydate', 'table' ], function(exports) { hide:$.isEmpty(sx_['teacherOpenCourseQuestionHomeworkIdText'])?false:sx_['teacherOpenCourseQuestionHomeworkIdText'], }, { - field : 'resourcesQuestionSnapshotIdText', //数据字典类型为 resources_question_snapshot.question_stem.question_status=1 + field : 'resourcesQuestionSnapshotId', title : '题目快照ID', align:"center", hideField :false, - hide:$.isEmpty(sx_['resourcesQuestionSnapshotIdText'])?false:sx_['resourcesQuestionSnapshotIdText'], + hide:$.isEmpty(sx_['resourcesQuestionSnapshotId'])?false:sx_['resourcesQuestionSnapshotId'], }, { field : 'teacherOpenCourseHomeworkQuestionLogAnswer', @@ -83,6 +83,20 @@ layui.define([ 'form', 'laydate', 'table' ], function(exports) { hideField :false, hide:$.isEmpty(sx_['teacherOpenCourseHomeworkQuestionLogStatusText'])?false:sx_['teacherOpenCourseHomeworkQuestionLogStatusText'], }, + { + field : 'teacherOpenCourseHomeworkQuestionLogFromType', + title : '来源类型（枚举）', + align:"center", + hideField :false, + hide:$.isEmpty(sx_['teacherOpenCourseHomeworkQuestionLogFromType'])?false:sx_['teacherOpenCourseHomeworkQuestionLogFromType'], + }, + { + field : 'studentId', + title : '学生ID', + align:"center", + hideField :false, + hide:$.isEmpty(sx_['studentId'])?false:sx_['studentId'], + }, { field : 'orgId', title : '组织ID', @@ -127,7 +141,7 @@ layui.define([ 'form', 'laydate', 'table' ], function(exports) { toolbar = { add: function () { var url = "/jlw/teacherOpenCourseHomeworkQuestionLog/add.do"; - Common.openDlg(url,"开课作业日志管理>新增"); + Common.openDlg(url,"做题日志管理>新增"); }, edit: function () { var data = Common.getOneFromTable(table,"teacherOpenCourseHomeworkQuestionLogTable"); @@ -135,7 +149,7 @@ layui.define([ 'form', 'laydate', 'table' ], function(exports) { return ; } var url = "/jlw/teacherOpenCourseHomeworkQuestionLog/add.do?teacherOpenCourseHomeworkQuestionLogId="+data.teacherOpenCourseHomeworkQuestionLogId; - Common.openDlg(url,"开课作业日志管理>"+data.teacherOpenCourseHomeworkQuestionLogId+">编辑"); + Common.openDlg(url,"做题日志管理>"+data.teacherOpenCourseHomeworkQuestionLogId+">编辑"); }, del: function () { layui.use(['del'], function(){ @@ -163,7 +177,7 @@ layui.define([ 'form', 'laydate', 'table' ], function(exports) { var data = obj.data; if (obj.event === 'edit') { var url = "/jlw/teacherOpenCourseHomeworkQuestionLog/add.do?teacherOpenCourseHomeworkQuestionLogId="+data.teacherOpenCourseHomeworkQuestionLogId; - Common.openDlg(url,"开课作业日志管理>"+data.teacherOpenCourseHomeworkQuestionLogId+">编辑"); + Common.openDlg(url,"做题日志管理>"+data.teacherOpenCourseHomeworkQuestionLogId+">编辑"); }else if(obj.event === "del"){ layer.confirm('是否确定删除该信息？', function (index) { var ret = Common.postAjax("/jlw/teacherOpenCourseHomeworkQuestionLog/delete.json",{ids:data.teacherOpenCourseHomeworkQuestionLogId}); diff --git a/web/src/main/resources/templates/jlw/teacherOpenCourseHomeworkQuestionLog/add.html b/web/src/main/resources/templates/jlw/teacherOpenCourseHomeworkQuestionLog/add.html index c32c1fed..d930ebf1 100644 --- a/web/src/main/resources/templates/jlw/teacherOpenCourseHomeworkQuestionLog/add.html +++ b/web/src/main/resources/templates/jlw/teacherOpenCourseHomeworkQuestionLog/add.html @@ -13,8 +13,7 @@
- +
@@ -52,6 +51,22 @@ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
diff --git a/web/src/main/resources/templates/jlw/teacherOpenCourseHomeworkQuestionLog/edit.html b/web/src/main/resources/templates/jlw/teacherOpenCourseHomeworkQuestionLog/edit.html index 78d4b5fa..2547e004 100644 --- a/web/src/main/resources/templates/jlw/teacherOpenCourseHomeworkQuestionLog/edit.html +++ b/web/src/main/resources/templates/jlw/teacherOpenCourseHomeworkQuestionLog/edit.html @@ -13,8 +13,7 @@
- +
@@ -52,6 +51,22 @@
+
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
diff --git a/web/src/test/java/com/ibeetl/jlw/web/TeacherOpenCourseHomeworkControllerTest.java b/web/src/test/java/com/ibeetl/jlw/web/TeacherOpenCourseHomeworkControllerTest.java index 423a70de..34a72074 100644 --- a/web/src/test/java/com/ibeetl/jlw/web/TeacherOpenCourseHomeworkControllerTest.java +++ b/web/src/test/java/com/ibeetl/jlw/web/TeacherOpenCourseHomeworkControllerTest.java @@ -193,6 +193,7 @@ class TeacherOpenCourseHomeworkControllerTest extends BaseTest { // 断言 Assert.assertTrue(ObjectUtil.isNotEmpty(homeworkList)); + // 开课作业ID Long teacherOpenCourseHomeworkId = RandomUtil.randomEle(homeworkList).getTeacherOpenCourseHomeworkId(); //构造请求参数