tianzeOrg
/
tianze-pro
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

增加测试类中修改登录用户身份

Browse Source
beetlsql3-dev
Mlxa0324 3 years ago
parent 1fc5e1e097
commit f446ff3fec
8 changed files with 354 additions and 210 deletions
Show Stats Download Patch File Download Diff File

22
admin-core/src/main/java/com/ibeetl/admin/core/conf/MVCConf.java
Unescape Escape View File

@ -45,9 +45,9 @@ public class MVCConf implements WebMvcConfigurer, InitializingBean {
// String appName;
// 开发用的模拟当前用户和机构
Long useId;
Long orgId;
// Long useId;
//
// Long orgId;
String mvcTestPath;
@ -110,8 +110,8 @@ public class MVCConf implements WebMvcConfigurer, InitializingBean {
@Override
public void afterPropertiesSet() throws Exception {
this.useId = env.getProperty("user.id", Long.class);
this.orgId = env.getProperty("user.orgId", Long.class);
// this.useId = env.getProperty("user.id", Long.class);
// this.orgId = env.getProperty("user.orgId", Long.class);
this.mvcTestPath = env.getProperty("mvc.test.path");
Map<String, Object> var = new HashMap<>(5);
String appName = env.getProperty("app.name");
@ -145,12 +145,16 @@ class SessionInterceptor implements HandlerInterceptor {
@Override
public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler)
throws Exception {
if (conf.useId != null && conf.orgId != null
// 方便运行时，修改环境变量参数，用于测试类变更登录用户
Long userId = conf.env.getProperty("user.id", Long.class);
Long orgId = conf.env.getProperty("user.orgId", Long.class);
if (userId != null && orgId != null
&& request.getSession().getAttribute(CorePlatformService.ACCESS_CURRENT_USER) == null) {
// 模拟用户登录，用于快速开发,未来用rember么代替？
CoreUser user = conf.userService.getUserById(conf.useId);
CoreOrg org = conf.userService.getOrgById(conf.orgId);
List<CoreOrg> orgs = conf.userService.getUserOrg(conf.useId, org.getId());
CoreUser user = conf.userService.getUserById(userId);
CoreOrg org = conf.userService.getOrgById(orgId);
List<CoreOrg> orgs = conf.userService.getUserOrg(userId, org.getId());
request.getSession().setAttribute(CorePlatformService.ACCESS_CURRENT_USER, user);
request.getSession().setAttribute(CorePlatformService.ACCESS_CURRENT_ORG, org);
request.getSession().setAttribute(CorePlatformService.ACCESS_USER_ORGS, orgs);

68
admin-test/src/main/java/com/ibeetl/admin/test/util/test/TestEnvUtil.java
Unescape Escape View File

@ -0,0 +1,68 @@
package com.ibeetl.admin.test.util.test;
import java.lang.reflect.Field;
import java.lang.reflect.Method;
import java.util.Map;
/**
* 测试类的环境参数工具
*/
public class TestEnvUtil {
/**
* 不会覆盖原有的配置，在高优先级的环境配置文件上Put
* 方便后面remove就可以放开原有的配置参数
*
* @param name
* @param value
* @throws Exception
*/
public static void setProperty(String name, String value)throws Exception {
Map<String, String> modifiableEnvironment = getModifiableEnvironment();
modifiableEnvironment.put(name, value);
}
/**
* 获取变量
* @param name
* @return
* @throws Exception
*/
public static String getProperty(String name)throws Exception {
return getModifiableEnvironment().get(name);
}
/**
通过反射的⽅式从
中获取存储环境变量的
，返回的
是可变的
*
Runtime
Map
Map
* Copy from https://stackoverflow.com/questions/580085/is-it-possible-to-set-an-environment-variable-at-runtime-from-java
*
* @return Map<String, String></String,String>
* @throws Exception e
*/
@SuppressWarnings("unchecked")
private static Map<String, String> getModifiableEnvironment() throws Exception {
Class<?> pe = Class.forName("java.lang.ProcessEnvironment");
Method getenv = pe.getDeclaredMethod("getenv");
getenv.setAccessible(true);
Object unmodifiableEnvironment = getenv.invoke(null);
Class<?> map = Class.forName("java.util.Collections$UnmodifiableMap");
Field m = map.getDeclaredField("m");
m.setAccessible(true);
return(Map<String, String>) m.get(unmodifiableEnvironment);
}
/**
* 删除暂存的配置变量
* @param name
*/
public static void removeProperty(String name) throws Exception {
getModifiableEnvironment().remove(name);
}
}

220
data_base_design/天泽数据大平台.pdb
Unescape Escape View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<?PowerDesigner AppLocale="UTF16" ID="{BA33ABB7-B246-4DB0-85DE-396EDDB46458}" Label="" LastModificationDate="1664368582" Name="cjks" Objects="1178" Symbols="105" Target="MySQL 5.0" Type="{CDE44E21-9669-11D1-9914-006097355D9B}" signature="PDM_DATA_MODEL_XML" version="16.5.0.3982"?>
<?PowerDesigner AppLocale="UTF16" ID="{BA33ABB7-B246-4DB0-85DE-396EDDB46458}" Label="" LastModificationDate="1664375810" Name="cjks" Objects="1161" Symbols="103" Target="MySQL 5.0" Type="{CDE44E21-9669-11D1-9914-006097355D9B}" signature="PDM_DATA_MODEL_XML" version="16.5.0.3982"?>
<!-- do not edit this file -->
<Model xmlns:a="attribute" xmlns:c="collection" xmlns:o="object">
@ -4285,8 +4285,8 @@ Shadow=0</a:DisplayPreferences>
<o:ExtendedDependencySymbol Id="o19">
<a:CreationDate>1661869705</a:CreationDate>
<a:ModificationDate>1662042403</a:ModificationDate>
<a:Rect>((236972,-9765), (241244,-4665))</a:Rect>
<a:ListOfPoints>((241244,-9765),(241244,-9539),(237272,-9539),(237272,-4665))</a:ListOfPoints>
<a:Rect>((236975,-9765), (241244,-4665))</a:Rect>
<a:ListOfPoints>((241244,-9765),(241244,-9539),(237275,-9539),(237275,-4665))</a:ListOfPoints>
<a:CornerStyle>1</a:CornerStyle>
<a:ArrowStyle>8</a:ArrowStyle>
<a:LineColor>16744576</a:LineColor>
@ -4366,8 +4366,8 @@ Shadow=0</a:DisplayPreferences>
<o:ExtendedDependencySymbol Id="o31">
<a:CreationDate>1661871292</a:CreationDate>
<a:ModificationDate>1662042403</a:ModificationDate>
<a:Rect>((206132,531), (253215,8532))</a:Rect>
<a:ListOfPoints>((206132,8532),(213754,8532),(213754,831),(253215,831))</a:ListOfPoints>
<a:Rect>((206132,531), (252499,8532))</a:Rect>
<a:ListOfPoints>((206132,8532),(214114,8532),(214114,831),(252499,831))</a:ListOfPoints>
<a:CornerStyle>1</a:CornerStyle>
<a:ArrowStyle>8</a:ArrowStyle>
<a:LineColor>16744576</a:LineColor>
@ -4387,8 +4387,8 @@ Shadow=0</a:DisplayPreferences>
<o:ExtendedDependencySymbol Id="o34">
<a:CreationDate>1661873621</a:CreationDate>
<a:ModificationDate>1662047569</a:ModificationDate>
<a:Rect>((246268,43472), (264930,44072))</a:Rect>
<a:ListOfPoints>((246268,43775),(262159,43775),(262159,43772),(264930,43772))</a:ListOfPoints>
<a:Rect>((246268,43472), (265430,44072))</a:Rect>
<a:ListOfPoints>((246268,43775),(262159,43775),(262159,43772),(265430,43772))</a:ListOfPoints>
<a:CornerStyle>1</a:CornerStyle>
<a:ArrowStyle>8</a:ArrowStyle>
<a:LineColor>16744576</a:LineColor>
@ -4408,8 +4408,8 @@ Shadow=0</a:DisplayPreferences>
<o:ExtendedDependencySymbol Id="o38">
<a:CreationDate>1661873633</a:CreationDate>
<a:ModificationDate>1663942424</a:ModificationDate>
<a:Rect>((276082,55755), (276682,70644))</a:Rect>
<a:ListOfPoints>((276382,70644),(276382,55755))</a:ListOfPoints>
<a:Rect>((276077,55755), (276677,70644))</a:Rect>
<a:ListOfPoints>((276377,70644),(276377,55755))</a:ListOfPoints>
<a:CornerStyle>1</a:CornerStyle>
<a:ArrowStyle>8</a:ArrowStyle>
<a:LineColor>16744576</a:LineColor>
@ -4429,8 +4429,8 @@ Shadow=0</a:DisplayPreferences>
<o:ExtendedDependencySymbol Id="o41">
<a:CreationDate>1661955336</a:CreationDate>
<a:ModificationDate>1662048056</a:ModificationDate>
<a:Rect>((262886,18534), (281960,23328))</a:Rect>
<a:ListOfPoints>((262886,18534),(262886,23028),(281960,23028))</a:ListOfPoints>
<a:Rect>((262886,18534), (282577,23328))</a:Rect>
<a:ListOfPoints>((262886,18534),(262886,23028),(282577,23028))</a:ListOfPoints>
<a:CornerStyle>1</a:CornerStyle>
<a:ArrowStyle>8</a:ArrowStyle>
<a:LineColor>16744576</a:LineColor>
@ -4471,8 +4471,8 @@ Shadow=0</a:DisplayPreferences>
<o:ExtendedDependencySymbol Id="o48">
<a:CreationDate>1661960819</a:CreationDate>
<a:ModificationDate>1662647010</a:ModificationDate>
<a:Rect>((307768,27554), (308637,43057))</a:Rect>
<a:ListOfPoints>((307768,43057),(307768,35670),(308337,35670),(308337,27554))</a:ListOfPoints>
<a:Rect>((307474,27554), (308074,43057))</a:Rect>
<a:ListOfPoints>((307788,43057),(307788,35670),(307774,35670),(307774,27554))</a:ListOfPoints>
<a:CornerStyle>1</a:CornerStyle>
<a:ArrowStyle>8</a:ArrowStyle>
<a:LineColor>16744576</a:LineColor>
@ -4533,8 +4533,8 @@ Shadow=0</a:DisplayPreferences>
<o:ExtendedDependencySymbol Id="o58">
<a:CreationDate>1661961447</a:CreationDate>
<a:ModificationDate>1662048058</a:ModificationDate>
<a:Rect>((237341,16629), (295834,24711))</a:Rect>
<a:ListOfPoints>((237341,16629),(237341,24411),(295834,24411))</a:ListOfPoints>
<a:Rect>((237341,16629), (295830,24711))</a:Rect>
<a:ListOfPoints>((237341,16629),(237341,24411),(295830,24411))</a:ListOfPoints>
<a:CornerStyle>1</a:CornerStyle>
<a:ArrowStyle>8</a:ArrowStyle>
<a:LineColor>16744576</a:LineColor>
@ -4554,8 +4554,8 @@ Shadow=0</a:DisplayPreferences>
<o:ExtendedDependencySymbol Id="o60">
<a:CreationDate>1662020600</a:CreationDate>
<a:ModificationDate>1663511274</a:ModificationDate>
<a:Rect>((308526,-926), (328444,24981))</a:Rect>
<a:ListOfPoints>((328444,-926),(328444,11662),(308826,11662),(308826,24981))</a:ListOfPoints>
<a:Rect>((307941,-926), (328444,24981))</a:Rect>
<a:ListOfPoints>((328444,-926),(328444,11662),(308241,11662),(308241,24981))</a:ListOfPoints>
<a:CornerStyle>1</a:CornerStyle>
<a:ArrowStyle>8</a:ArrowStyle>
<a:LineColor>16744576</a:LineColor>
@ -4575,8 +4575,8 @@ Shadow=0</a:DisplayPreferences>
<o:ExtendedDependencySymbol Id="o63">
<a:CreationDate>1662020790</a:CreationDate>
<a:ModificationDate>1662647017</a:ModificationDate>
<a:Rect>((284882,31246), (286111,48451))</a:Rect>
<a:ListOfPoints>((286111,48451),(286111,37421),(285182,37421),(285182,31246))</a:ListOfPoints>
<a:Rect>((285355,31246), (285955,48451))</a:Rect>
<a:ListOfPoints>((285670,48451),(285670,37421),(285655,37421),(285655,31246))</a:ListOfPoints>
<a:CornerStyle>1</a:CornerStyle>
<a:ArrowStyle>8</a:ArrowStyle>
<a:LineColor>16744576</a:LineColor>
@ -4596,8 +4596,8 @@ Shadow=0</a:DisplayPreferences>
<o:ExtendedDependencySymbol Id="o65">
<a:CreationDate>1662045015</a:CreationDate>
<a:ModificationDate>1664295296</a:ModificationDate>
<a:Rect>((248596,52557), (276562,53260))</a:Rect>
<a:ListOfPoints>((248596,53260),(262008,53260),(262008,52857),(276562,52857))</a:ListOfPoints>
<a:Rect>((248596,52557), (276545,53260))</a:Rect>
<a:ListOfPoints>((248596,53260),(262008,53260),(262008,52857),(276545,52857))</a:ListOfPoints>
<a:CornerStyle>1</a:CornerStyle>
<a:ArrowStyle>8</a:ArrowStyle>
<a:LineColor>16744576</a:LineColor>
@ -4617,8 +4617,8 @@ Shadow=0</a:DisplayPreferences>
<o:ExtendedDependencySymbol Id="o68">
<a:CreationDate>1662046228</a:CreationDate>
<a:ModificationDate>1662647031</a:ModificationDate>
<a:Rect>((302016,-1243), (302616,27790))</a:Rect>
<a:ListOfPoints>((302023,-1243),(302023,15258),(302316,15258),(302316,27790))</a:ListOfPoints>
<a:Rect>((301722,-1243), (302322,27790))</a:Rect>
<a:ListOfPoints>((302023,-1243),(302023,15258),(302022,15258),(302022,27790))</a:ListOfPoints>
<a:CornerStyle>1</a:CornerStyle>
<a:ArrowStyle>8</a:ArrowStyle>
<a:LineColor>16744576</a:LineColor>
@ -4638,8 +4638,8 @@ Shadow=0</a:DisplayPreferences>
<o:ExtendedDependencySymbol Id="o71">
<a:CreationDate>1662047541</a:CreationDate>
<a:ModificationDate>1662047695</a:ModificationDate>
<a:Rect>((250779,30697), (297019,31870))</a:Rect>
<a:ListOfPoints>((250779,31870),(278057,31870),(278057,30997),(297019,30997))</a:ListOfPoints>
<a:Rect>((250779,30697), (296962,31870))</a:Rect>
<a:ListOfPoints>((250779,31870),(278057,31870),(278057,30997),(296962,30997))</a:ListOfPoints>
<a:CornerStyle>1</a:CornerStyle>
<a:ArrowStyle>8</a:ArrowStyle>
<a:LineColor>16744576</a:LineColor>
@ -4680,8 +4680,8 @@ Shadow=0</a:DisplayPreferences>
<o:ExtendedDependencySymbol Id="o77">
<a:CreationDate>1662647833</a:CreationDate>
<a:ModificationDate>1662647877</a:ModificationDate>
<a:Rect>((284029,14785), (284830,27625))</a:Rect>
<a:ListOfPoints>((284830,14785),(284830,20457),(284329,20457),(284329,27625))</a:ListOfPoints>
<a:Rect>((284540,14785), (285140,27625))</a:Rect>
<a:ListOfPoints>((284830,14785),(284830,20457),(284840,20457),(284840,27625))</a:ListOfPoints>
<a:CornerStyle>1</a:CornerStyle>
<a:ArrowStyle>8</a:ArrowStyle>
<a:LineColor>16744576</a:LineColor>
@ -4719,8 +4719,8 @@ Shadow=0</a:DisplayPreferences>
<o:ExtendedDependencySymbol Id="o83">
<a:CreationDate>1662810688</a:CreationDate>
<a:ModificationDate>1663748414</a:ModificationDate>
<a:Rect>((296432,28995), (338650,29922))</a:Rect>
<a:ListOfPoints>((338650,28995),(319044,28995),(319044,29622),(296432,29622))</a:ListOfPoints>
<a:Rect>((296402,28995), (338650,29922))</a:Rect>
<a:ListOfPoints>((338650,28995),(319044,28995),(319044,29622),(296402,29622))</a:ListOfPoints>
<a:CornerStyle>1</a:CornerStyle>
<a:ArrowStyle>8</a:ArrowStyle>
<a:LineColor>16744576</a:LineColor>
@ -4740,8 +4740,8 @@ Shadow=0</a:DisplayPreferences>
<o:ExtendedDependencySymbol Id="o85">
<a:CreationDate>1662865795</a:CreationDate>
<a:ModificationDate>1663518168</a:ModificationDate>
<a:Rect>((286927,15194), (337794,23674))</a:Rect>
<a:ListOfPoints>((337794,15194),(319320,15194),(319320,23374),(286927,23374))</a:ListOfPoints>
<a:Rect>((287322,15194), (337794,23674))</a:Rect>
<a:ListOfPoints>((337794,15194),(319320,15194),(319320,23374),(287322,23374))</a:ListOfPoints>
<a:CornerStyle>1</a:CornerStyle>
<a:ArrowStyle>8</a:ArrowStyle>
<a:LineColor>16744576</a:LineColor>
@ -4809,7 +4809,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1623769937</a:CreationDate>
<a:ModificationDate>1662650462</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
<a:Rect>((-9331,11854), (6591,25350))</a:Rect>
<a:Rect>((-8992,11854), (6252,25350))</a:Rect>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor>
@ -4861,7 +4861,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1623770338</a:CreationDate>
<a:ModificationDate>1662650462</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
<a:Rect>((-9283,-14307), (6639,89))</a:Rect>
<a:Rect>((-8944,-14307), (6300,89))</a:Rect>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor>
@ -4965,7 +4965,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1623828456</a:CreationDate>
<a:ModificationDate>1661907266</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
<a:Rect>((8540,1660), (34844,17856))</a:Rect>
<a:Rect>((9126,1660), (34258,17856))</a:Rect>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor>
@ -4990,7 +4990,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1623828633</a:CreationDate>
<a:ModificationDate>1661907266</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
<a:Rect>((10906,-10357), (31586,-461))</a:Rect>
<a:Rect>((11358,-10357), (31134,-461))</a:Rect>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor>
@ -5015,7 +5015,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1623828682</a:CreationDate>
<a:ModificationDate>1661907266</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
<a:Rect>((10673,-24326), (31353,-14430))</a:Rect>
<a:Rect>((11125,-24326), (30901,-14430))</a:Rect>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor>
@ -5040,7 +5040,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1623828725</a:CreationDate>
<a:ModificationDate>1661907266</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
<a:Rect>((8374,-37056), (34246,-28060))</a:Rect>
<a:Rect>((8950,-37056), (33670,-28060))</a:Rect>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor>
@ -5065,7 +5065,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1623828770</a:CreationDate>
<a:ModificationDate>1661907266</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
<a:Rect>((14749,18471), (33699,35567))</a:Rect>
<a:Rect>((15160,18471), (33288,35567))</a:Rect>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor>
@ -5090,7 +5090,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1623840859</a:CreationDate>
<a:ModificationDate>1661907266</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
<a:Rect>((32440,-12234), (49660,2162))</a:Rect>
<a:Rect>((32810,-12234), (49290,2162))</a:Rect>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor>
@ -5115,7 +5115,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1623841366</a:CreationDate>
<a:ModificationDate>1661907266</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
<a:Rect>((32317,-26863), (49537,-12467))</a:Rect>
<a:Rect>((32687,-26863), (49167,-12467))</a:Rect>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor>
@ -5140,7 +5140,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1623842834</a:CreationDate>
<a:ModificationDate>1664366507</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
<a:Rect>((72334,37006), (96042,69402))</a:Rect>
<a:Rect>((72858,37006), (95518,69402))</a:Rect>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor>
@ -5190,7 +5190,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1623845296</a:CreationDate>
<a:ModificationDate>1664366507</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
<a:Rect>((96086,38154), (115036,48050))</a:Rect>
<a:Rect>((96497,38154), (114625,48050))</a:Rect>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor>
@ -5240,7 +5240,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1623859834</a:CreationDate>
<a:ModificationDate>1664366507</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
<a:Rect>((125429,37287), (146109,48083))</a:Rect>
<a:Rect>((125881,37287), (145657,48083))</a:Rect>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor>
@ -5292,7 +5292,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1623860248</a:CreationDate>
<a:ModificationDate>1662449601</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
<a:Rect>((73569,-8788), (94683,8308))</a:Rect>
<a:Rect>((74032,-8788), (94220,8308))</a:Rect>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor>
@ -5317,7 +5317,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1623860509</a:CreationDate>
<a:ModificationDate>1662971416</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
<a:Rect>((94707,-8538), (111495,7658))</a:Rect>
<a:Rect>((95067,-8538), (111135,7658))</a:Rect>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor>
@ -5342,7 +5342,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1623861067</a:CreationDate>
<a:ModificationDate>1662971416</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
<a:Rect>((113499,8387), (139803,26383))</a:Rect>
<a:Rect>((114085,8387), (139217,26383))</a:Rect>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor>
@ -5367,7 +5367,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1623861149</a:CreationDate>
<a:ModificationDate>1662971416</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
<a:Rect>((116611,-4663), (137291,6133))</a:Rect>
<a:Rect>((117063,-4663), (136839,6133))</a:Rect>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor>
@ -5392,7 +5392,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1623861203</a:CreationDate>
<a:ModificationDate>1662449601</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
<a:Rect>((140356,-5055), (155846,8441))</a:Rect>
<a:Rect>((140685,-5055), (155517,8441))</a:Rect>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor>
@ -5417,7 +5417,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1623861290</a:CreationDate>
<a:ModificationDate>1662971416</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
<a:Rect>((116311,-17563), (136991,-6767))</a:Rect>
<a:Rect>((116763,-17563), (136539,-6767))</a:Rect>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor>
@ -5469,7 +5469,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1623862594</a:CreationDate>
<a:ModificationDate>1661907266</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
<a:Rect>((57397,-26488), (70291,-14792))</a:Rect>
<a:Rect>((57664,-26488), (70024,-14792))</a:Rect>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor>
@ -5494,7 +5494,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1623862978</a:CreationDate>
<a:ModificationDate>1662650462</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
<a:Rect>((-37002,-12538), (-9400,958))</a:Rect>
<a:Rect>((-36385,-12538), (-10017,958))</a:Rect>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor>
@ -5519,7 +5519,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1623863676</a:CreationDate>
<a:ModificationDate>1662650462</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
<a:Rect>((-43569,-23338), (-30675,-14342))</a:Rect>
<a:Rect>((-43302,-23338), (-30942,-14342))</a:Rect>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor>
@ -5544,7 +5544,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1623864141</a:CreationDate>
<a:ModificationDate>1662650462</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
<a:Rect>((-29673,-23338), (-9857,-14342))</a:Rect>
<a:Rect>((-29241,-23338), (-10289,-14342))</a:Rect>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor>
@ -5569,7 +5569,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1623895431</a:CreationDate>
<a:ModificationDate>1662650462</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
<a:Rect>((-57383,-23188), (-44489,-14192))</a:Rect>
<a:Rect>((-57116,-23188), (-44756,-14192))</a:Rect>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor>
@ -5594,7 +5594,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1625926250</a:CreationDate>
<a:ModificationDate>1664366507</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
<a:Rect>((42339,28637), (66913,46633))</a:Rect>
<a:Rect>((42884,28637), (66368,46633))</a:Rect>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor>
@ -5644,7 +5644,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1628307450</a:CreationDate>
<a:ModificationDate>1662650462</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
<a:Rect>((-42778,-32668), (-31614,-25472))</a:Rect>
<a:Rect>((-42552,-32668), (-31840,-25472))</a:Rect>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor>
@ -5669,7 +5669,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1628307767</a:CreationDate>
<a:ModificationDate>1662650462</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
<a:Rect>((-30095,-35818), (-9847,-24122))</a:Rect>
<a:Rect>((-29653,-35818), (-10289,-24122))</a:Rect>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor>
@ -5694,7 +5694,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1628340137</a:CreationDate>
<a:ModificationDate>1661907266</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
<a:Rect>((37596,20648), (49954,26044))</a:Rect>
<a:Rect>((37876,20648), (49674,26044))</a:Rect>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor>
@ -5719,7 +5719,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1631242896</a:CreationDate>
<a:ModificationDate>1662650462</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
<a:Rect>((-7690,-35277), (4338,-26281))</a:Rect>
<a:Rect>((-7444,-35277), (4092,-26281))</a:Rect>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor>
@ -5744,7 +5744,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1631243538</a:CreationDate>
<a:ModificationDate>1662650462</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
<a:Rect>((-7615,-23577), (4413,-15481))</a:Rect>
<a:Rect>((-7369,-23577), (4167,-15481))</a:Rect>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor>
@ -5769,7 +5769,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1661850632</a:CreationDate>
<a:ModificationDate>1662449601</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
<a:Rect>((295266,51445), (321138,62241))</a:Rect>
<a:Rect>((295842,51445), (320562,62241))</a:Rect>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor>
@ -5794,7 +5794,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1661872432</a:CreationDate>
<a:ModificationDate>1662047569</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
<a:Rect>((263687,41487), (288693,55883))</a:Rect>
<a:Rect>((264242,41487), (288138,55883))</a:Rect>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor>
@ -5873,7 +5873,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1661862847</a:CreationDate>
<a:ModificationDate>1662042403</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
<a:Rect>((223324,10331), (251358,22927))</a:Rect>
<a:Rect>((223951,10331), (250731,22927))</a:Rect>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor>
@ -5952,7 +5952,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1661868858</a:CreationDate>
<a:ModificationDate>1662042403</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
<a:Rect>((221377,-4665), (253305,5231))</a:Rect>
<a:Rect>((222097,-4665), (252585,5231))</a:Rect>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor>
@ -6085,7 +6085,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1661949359</a:CreationDate>
<a:ModificationDate>1662042403</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
<a:Rect>((281953,22110), (309555,33806))</a:Rect>
<a:Rect>((282570,22110), (308938,33806))</a:Rect>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor>
@ -6245,7 +6245,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1661960474</a:CreationDate>
<a:ModificationDate>1662042403</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
<a:Rect>((288345,38233), (328059,48129))</a:Rect>
<a:Rect>((289250,38233), (327154,48129))</a:Rect>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor>
@ -6675,7 +6675,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1663937886</a:CreationDate>
<a:ModificationDate>1663937955</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
<a:Rect>((36448,2552), (62752,20548))</a:Rect>
<a:Rect>((37034,2552), (62166,20548))</a:Rect>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor>
@ -15942,13 +15942,13 @@ COLLATE = utf8_general_ci</a:PhysicalOptions>
</o:Table>
<o:Table Id="o191">
<a:ObjectID>520E1690-D890-46CE-A852-B26097FAB204</a:ObjectID>
<a:Name>teacher_open_course_homework_question_log</a:Name>
<a:Code>teacher_open_course_homework_question_log</a:Code>
<a:Name>teacher_open_course_question_log</a:Name>
<a:Code>teacher_open_course_question_log</a:Code>
<a:CreationDate>1661850632</a:CreationDate>
<a:Creator>lx</a:Creator>
<a:ModificationDate>1664295243</a:ModificationDate>
<a:ModificationDate>1664375810</a:ModificationDate>
<a:Modifier>lx</a:Modifier>
<a:Comment>我的课程-题库作业-做题日志</a:Comment>
<a:Comment>我的课程-题库-做题日志</a:Comment>
<a:PhysicalOptions>auto_increment = 1
ENGINE = InnoDB
DEFAULT CHARACTER SET = utf8
@ -15957,11 +15957,11 @@ COLLATE = utf8_general_ci</a:PhysicalOptions>
<c:Columns>
<o:Column Id="o888">
<a:ObjectID>009A23DE-07AF-4EA6-BBDD-26850AABC8AC</a:ObjectID>
<a:Name>teacher_open_course_homework_question_log_id</a:Name>
<a:Code>teacher_open_course_homework_question_log_id</a:Code>
<a:Name>teacher_open_course_question_log_id</a:Name>
<a:Code>teacher_open_course_question_log_id</a:Code>
<a:CreationDate>1661850778</a:CreationDate>
<a:Creator>lx</a:Creator>
<a:ModificationDate>1662044402</a:ModificationDate>
<a:ModificationDate>1664375810</a:ModificationDate>
<a:Modifier>lx</a:Modifier>
<a:Comment>学生做题日志ID</a:Comment>
<a:DataType>bigint</a:DataType>
@ -15969,16 +15969,28 @@ COLLATE = utf8_general_ci</a:PhysicalOptions>
</o:Column>
<o:Column Id="o889">
<a:ObjectID>E732E580-555A-47D5-864B-E868302C4391</a:ObjectID>
<a:Name>teacher_open_course_question_homework_id</a:Name>
<a:Code>teacher_open_course_question_homework_id</a:Code>
<a:Name>teacher_open_course_question_log_from_id</a:Name>
<a:Code>teacher_open_course_question_log_from_id</a:Code>
<a:CreationDate>1661850778</a:CreationDate>
<a:Creator>lx</a:Creator>
<a:ModificationDate>1662044402</a:ModificationDate>
<a:ModificationDate>1664375810</a:ModificationDate>
<a:Modifier>lx</a:Modifier>
<a:Comment>题库作业ID</a:Comment>
<a:Comment>来源ID</a:Comment>
<a:DataType>bigint</a:DataType>
</o:Column>
<o:Column Id="o890">
<a:ObjectID>7C5AFA02-3CF4-4C0D-9180-02F37466098A</a:ObjectID>
<a:Name>teacher_open_course_question_log_from_type</a:Name>
<a:Code>teacher_open_course_question_log_from_type</a:Code>
<a:CreationDate>1664294920</a:CreationDate>
<a:Creator>lx</a:Creator>
<a:ModificationDate>1664375810</a:ModificationDate>
<a:Modifier>lx</a:Modifier>
<a:Comment>来源类型（枚举）</a:Comment>
<a:DataType>varchar(50)</a:DataType>
<a:Length>50</a:Length>
</o:Column>
<o:Column Id="o891">
<a:ObjectID>8F40D113-4306-4501-9973-FFAA88015492</a:ObjectID>
<a:Name>resources_question_snapshot_id</a:Name>
<a:Code>resources_question_snapshot_id</a:Code>
@ -15989,64 +16001,52 @@ COLLATE = utf8_general_ci</a:PhysicalOptions>
<a:Comment>题目快照ID</a:Comment>
<a:DataType>bigint</a:DataType>
</o:Column>
<o:Column Id="o891">
<o:Column Id="o892">
<a:ObjectID>96FF607B-0F40-4825-9A6C-89CD8C1C5F1B</a:ObjectID>
<a:Name>teacher_open_course_homework_question_log_answer</a:Name>
<a:Code>teacher_open_course_homework_question_log_answer</a:Code>
<a:Name>teacher_open_course_question_log_answer</a:Name>
<a:Code>teacher_open_course_question_log_answer</a:Code>
<a:CreationDate>1664182126</a:CreationDate>
<a:Creator>87966</a:Creator>
<a:ModificationDate>1664182237</a:ModificationDate>
<a:Modifier>87966</a:Modifier>
<a:ModificationDate>1664375810</a:ModificationDate>
<a:Modifier>lx</a:Modifier>
<a:Comment>学生提交的答案</a:Comment>
<a:DataType>varchar(1000)</a:DataType>
<a:Length>1000</a:Length>
</o:Column>
<o:Column Id="o892">
<o:Column Id="o893">
<a:ObjectID>7492312E-B2F8-4A26-A165-E1D31D254D90</a:ObjectID>
<a:Name>teacher_open_course_homework_question_log_upload_file</a:Name>
<a:Code>teacher_open_course_homework_question_log_upload_file</a:Code>
<a:Name>teacher_open_course_question_log_upload_file</a:Name>
<a:Code>teacher_open_course_question_log_upload_file</a:Code>
<a:CreationDate>1662044183</a:CreationDate>
<a:Creator>lx</a:Creator>
<a:ModificationDate>1664182126</a:ModificationDate>
<a:Modifier>87966</a:Modifier>
<a:ModificationDate>1664375810</a:ModificationDate>
<a:Modifier>lx</a:Modifier>
<a:Comment>附件，学生端上传附件（单文件）</a:Comment>
<a:DataType>varchar(1000)</a:DataType>
<a:Length>1000</a:Length>
</o:Column>
<o:Column Id="o893">
<o:Column Id="o894">
<a:ObjectID>C06A272B-5147-40B7-8E49-1E6B509123F6</a:ObjectID>
<a:Name>teacher_open_course_homework_question_log_add_time</a:Name>
<a:Code>teacher_open_course_homework_question_log_add_time</a:Code>
<a:Name>teacher_open_course_question_log_add_time</a:Name>
<a:Code>teacher_open_course_question_log_add_time</a:Code>
<a:CreationDate>1661869211</a:CreationDate>
<a:Creator>lx</a:Creator>
<a:ModificationDate>1664182115</a:ModificationDate>
<a:Modifier>87966</a:Modifier>
<a:ModificationDate>1664375810</a:ModificationDate>
<a:Modifier>lx</a:Modifier>
<a:Comment>创建时间</a:Comment>
<a:DataType>datetime</a:DataType>
</o:Column>
<o:Column Id="o894">
<o:Column Id="o895">
<a:ObjectID>4EFDDD7C-101B-4ECE-A88D-B680589D6BEA</a:ObjectID>
<a:Name>teacher_open_course_homework_question_log_status</a:Name>
<a:Code>teacher_open_course_homework_question_log_status</a:Code>
<a:Name>teacher_open_course_question_log_status</a:Name>
<a:Code>teacher_open_course_question_log_status</a:Code>
<a:CreationDate>1664181836</a:CreationDate>
<a:Creator>87966</a:Creator>
<a:ModificationDate>1664182121</a:ModificationDate>
<a:Modifier>87966</a:Modifier>
<a:ModificationDate>1664375810</a:ModificationDate>
<a:Modifier>lx</a:Modifier>
<a:Comment>状态（1正常 2删除）</a:Comment>
<a:DataType>int</a:DataType>
</o:Column>
<o:Column Id="o895">
<a:ObjectID>7C5AFA02-3CF4-4C0D-9180-02F37466098A</a:ObjectID>
<a:Name>teacher_open_course_homework_question_log_from_type</a:Name>
<a:Code>teacher_open_course_homework_question_log_from_type</a:Code>
<a:CreationDate>1664294920</a:CreationDate>
<a:Creator>lx</a:Creator>
<a:ModificationDate>1664295281</a:ModificationDate>
<a:Modifier>lx</a:Modifier>
<a:Comment>来源类型（枚举）</a:Comment>
<a:DataType>varchar(50)</a:DataType>
<a:Length>50</a:Length>
</o:Column>
<o:Column Id="o896">
<a:ObjectID>AFCB9E46-93E2-4570-BB62-5B78208D9BAB</a:ObjectID>
<a:Name>student_id</a:Name>

158
data_base_design/天泽数据大平台.pdm
Unescape Escape View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<?PowerDesigner AppLocale="UTF16" ID="{BA33ABB7-B246-4DB0-85DE-396EDDB46458}" Label="" LastModificationDate="1664375810" Name="cjks" Objects="1161" Symbols="103" Target="MySQL 5.0" Type="{CDE44E21-9669-11D1-9914-006097355D9B}" signature="PDM_DATA_MODEL_XML" version="16.5.0.3982"?>
<?PowerDesigner AppLocale="UTF16" ID="{BA33ABB7-B246-4DB0-85DE-396EDDB46458}" Label="" LastModificationDate="1664375810" Name="cjks" Objects="1150" Symbols="103" Target="MySQL 5.0" Type="{CDE44E21-9669-11D1-9914-006097355D9B}" signature="PDM_DATA_MODEL_XML" version="16.5.0.3982"?>
<!-- do not edit this file -->
<Model xmlns:a="attribute" xmlns:c="collection" xmlns:o="object">
@ -4245,8 +4245,8 @@ Shadow=0</a:DisplayPreferences>
<o:ExtendedDependencySymbol Id="o12">
<a:CreationDate>1661870719</a:CreationDate>
<a:ModificationDate>1662042403</a:ModificationDate>
<a:Rect>((217597,-9765), (237341,-4365))</a:Rect>
<a:ListOfPoints>((217597,-9765),(217597,-4665),(237341,-4665))</a:ListOfPoints>
<a:Rect>((217597,-9765), (237341,-4161))</a:Rect>
<a:ListOfPoints>((217597,-9765),(217597,-4461),(237341,-4461))</a:ListOfPoints>
<a:CornerStyle>1</a:CornerStyle>
<a:ArrowStyle>8</a:ArrowStyle>
<a:LineColor>16744576</a:LineColor>
@ -4265,8 +4265,8 @@ Shadow=0</a:DisplayPreferences>
<o:ExtendedDependencySymbol Id="o16">
<a:CreationDate>1661870223</a:CreationDate>
<a:ModificationDate>1662042403</a:ModificationDate>
<a:Rect>((237341,-10555), (274056,-4365))</a:Rect>
<a:ListOfPoints>((274056,-10555),(274056,-4665),(237341,-4665))</a:ListOfPoints>
<a:Rect>((237341,-10555), (274056,-4161))</a:Rect>
<a:ListOfPoints>((274056,-10555),(274056,-4461),(237341,-4461))</a:ListOfPoints>
<a:CornerStyle>1</a:CornerStyle>
<a:ArrowStyle>8</a:ArrowStyle>
<a:LineColor>16744576</a:LineColor>
@ -4285,8 +4285,8 @@ Shadow=0</a:DisplayPreferences>
<o:ExtendedDependencySymbol Id="o19">
<a:CreationDate>1661869705</a:CreationDate>
<a:ModificationDate>1662042403</a:ModificationDate>
<a:Rect>((236975,-9765), (241244,-4665))</a:Rect>
<a:ListOfPoints>((241244,-9765),(241244,-9539),(237275,-9539),(237275,-4665))</a:ListOfPoints>
<a:Rect>((236979,-9765), (241244,-4461))</a:Rect>
<a:ListOfPoints>((241244,-9765),(241244,-9539),(237279,-9539),(237279,-4461))</a:ListOfPoints>
<a:CornerStyle>1</a:CornerStyle>
<a:ArrowStyle>8</a:ArrowStyle>
<a:LineColor>16744576</a:LineColor>
@ -4306,8 +4306,8 @@ Shadow=0</a:DisplayPreferences>
<o:ExtendedDependencySymbol Id="o22">
<a:CreationDate>1661869302</a:CreationDate>
<a:ModificationDate>1662042403</a:ModificationDate>
<a:Rect>((237041,5231), (237641,10331))</a:Rect>
<a:ListOfPoints>((237341,5231),(237341,10331))</a:ListOfPoints>
<a:Rect>((237041,5027), (237641,10597))</a:Rect>
<a:ListOfPoints>((237341,5027),(237341,10597))</a:ListOfPoints>
<a:CornerStyle>1</a:CornerStyle>
<a:ArrowStyle>8</a:ArrowStyle>
<a:LineColor>16744576</a:LineColor>
@ -4326,8 +4326,8 @@ Shadow=0</a:DisplayPreferences>
<o:ExtendedDependencySymbol Id="o25">
<a:CreationDate>1661869157</a:CreationDate>
<a:ModificationDate>1662042403</a:ModificationDate>
<a:Rect>((173166,-9765), (237341,-4365))</a:Rect>
<a:ListOfPoints>((173166,-9765),(173166,-4665),(237341,-4665))</a:ListOfPoints>
<a:Rect>((173166,-9765), (237341,-4161))</a:Rect>
<a:ListOfPoints>((173166,-9765),(173166,-4461),(237341,-4461))</a:ListOfPoints>
<a:CornerStyle>1</a:CornerStyle>
<a:ArrowStyle>8</a:ArrowStyle>
<a:LineColor>16744576</a:LineColor>
@ -4346,8 +4346,8 @@ Shadow=0</a:DisplayPreferences>
<o:ExtendedDependencySymbol Id="o28">
<a:CreationDate>1661869096</a:CreationDate>
<a:ModificationDate>1662042403</a:ModificationDate>
<a:Rect>((194111,-9765), (237341,-4365))</a:Rect>
<a:ListOfPoints>((194111,-9765),(194111,-4665),(237341,-4665))</a:ListOfPoints>
<a:Rect>((194111,-9765), (237341,-4161))</a:Rect>
<a:ListOfPoints>((194111,-9765),(194111,-4461),(237341,-4461))</a:ListOfPoints>
<a:CornerStyle>1</a:CornerStyle>
<a:ArrowStyle>8</a:ArrowStyle>
<a:LineColor>16744576</a:LineColor>
@ -4366,8 +4366,8 @@ Shadow=0</a:DisplayPreferences>
<o:ExtendedDependencySymbol Id="o31">
<a:CreationDate>1661871292</a:CreationDate>
<a:ModificationDate>1662042403</a:ModificationDate>
<a:Rect>((206132,531), (252499,8532))</a:Rect>
<a:ListOfPoints>((206132,8532),(214114,8532),(214114,831),(252499,831))</a:ListOfPoints>
<a:Rect>((206132,508), (251641,8532))</a:Rect>
<a:ListOfPoints>((206132,8532),(214545,8532),(214545,808),(251641,808))</a:ListOfPoints>
<a:CornerStyle>1</a:CornerStyle>
<a:ArrowStyle>8</a:ArrowStyle>
<a:LineColor>16744576</a:LineColor>
@ -4387,8 +4387,8 @@ Shadow=0</a:DisplayPreferences>
<o:ExtendedDependencySymbol Id="o34">
<a:CreationDate>1661873621</a:CreationDate>
<a:ModificationDate>1662047569</a:ModificationDate>
<a:Rect>((246268,43472), (265430,44072))</a:Rect>
<a:ListOfPoints>((246268,43775),(262159,43775),(262159,43772),(265430,43772))</a:ListOfPoints>
<a:Rect>((246268,43682), (266029,44282))</a:Rect>
<a:ListOfPoints>((246268,43775),(262159,43775),(262159,43982),(266029,43982))</a:ListOfPoints>
<a:CornerStyle>1</a:CornerStyle>
<a:ArrowStyle>8</a:ArrowStyle>
<a:LineColor>16744576</a:LineColor>
@ -4408,8 +4408,8 @@ Shadow=0</a:DisplayPreferences>
<o:ExtendedDependencySymbol Id="o38">
<a:CreationDate>1661873633</a:CreationDate>
<a:ModificationDate>1663942424</a:ModificationDate>
<a:Rect>((276077,55755), (276677,70644))</a:Rect>
<a:ListOfPoints>((276377,70644),(276377,55755))</a:ListOfPoints>
<a:Rect>((276072,55453), (276672,70644))</a:Rect>
<a:ListOfPoints>((276372,70644),(276372,55453))</a:ListOfPoints>
<a:CornerStyle>1</a:CornerStyle>
<a:ArrowStyle>8</a:ArrowStyle>
<a:LineColor>16744576</a:LineColor>
@ -4429,8 +4429,8 @@ Shadow=0</a:DisplayPreferences>
<o:ExtendedDependencySymbol Id="o41">
<a:CreationDate>1661955336</a:CreationDate>
<a:ModificationDate>1662048056</a:ModificationDate>
<a:Rect>((262886,18534), (282577,23328))</a:Rect>
<a:ListOfPoints>((262886,18534),(262886,23028),(282577,23028))</a:ListOfPoints>
<a:Rect>((262886,18534), (283315,23535))</a:Rect>
<a:ListOfPoints>((262886,18534),(262886,23235),(283315,23235))</a:ListOfPoints>
<a:CornerStyle>1</a:CornerStyle>
<a:ArrowStyle>8</a:ArrowStyle>
<a:LineColor>16744576</a:LineColor>
@ -4471,8 +4471,8 @@ Shadow=0</a:DisplayPreferences>
<o:ExtendedDependencySymbol Id="o48">
<a:CreationDate>1661960819</a:CreationDate>
<a:ModificationDate>1662647010</a:ModificationDate>
<a:Rect>((307474,27554), (308074,43057))</a:Rect>
<a:ListOfPoints>((307788,43057),(307788,35670),(307774,35670),(307774,27554))</a:ListOfPoints>
<a:Rect>((306801,27571), (307812,43062))</a:Rect>
<a:ListOfPoints>((307812,43062),(307812,35670),(307101,35670),(307101,27571))</a:ListOfPoints>
<a:CornerStyle>1</a:CornerStyle>
<a:ArrowStyle>8</a:ArrowStyle>
<a:LineColor>16744576</a:LineColor>
@ -4533,8 +4533,8 @@ Shadow=0</a:DisplayPreferences>
<o:ExtendedDependencySymbol Id="o58">
<a:CreationDate>1661961447</a:CreationDate>
<a:ModificationDate>1662048058</a:ModificationDate>
<a:Rect>((237341,16629), (295830,24711))</a:Rect>
<a:ListOfPoints>((237341,16629),(237341,24411),(295830,24411))</a:ListOfPoints>
<a:Rect>((237341,16629), (295826,24860))</a:Rect>
<a:ListOfPoints>((237341,16629),(237341,24560),(295826,24560))</a:ListOfPoints>
<a:CornerStyle>1</a:CornerStyle>
<a:ArrowStyle>8</a:ArrowStyle>
<a:LineColor>16744576</a:LineColor>
@ -4554,8 +4554,8 @@ Shadow=0</a:DisplayPreferences>
<o:ExtendedDependencySymbol Id="o60">
<a:CreationDate>1662020600</a:CreationDate>
<a:ModificationDate>1663511274</a:ModificationDate>
<a:Rect>((307941,-926), (328444,24981))</a:Rect>
<a:ListOfPoints>((328444,-926),(328444,11662),(308241,11662),(308241,24981))</a:ListOfPoints>
<a:Rect>((307242,-926), (328444,25106))</a:Rect>
<a:ListOfPoints>((328444,-926),(328444,11662),(307542,11662),(307542,25106))</a:ListOfPoints>
<a:CornerStyle>1</a:CornerStyle>
<a:ArrowStyle>8</a:ArrowStyle>
<a:LineColor>16744576</a:LineColor>
@ -4575,8 +4575,8 @@ Shadow=0</a:DisplayPreferences>
<o:ExtendedDependencySymbol Id="o63">
<a:CreationDate>1662020790</a:CreationDate>
<a:ModificationDate>1662647017</a:ModificationDate>
<a:Rect>((285355,31246), (285955,48451))</a:Rect>
<a:ListOfPoints>((285670,48451),(285670,37421),(285655,37421),(285655,31246))</a:ListOfPoints>
<a:Rect>((285142,31108), (286521,48461))</a:Rect>
<a:ListOfPoints>((285142,48461),(285142,37421),(286221,37421),(286221,31108))</a:ListOfPoints>
<a:CornerStyle>1</a:CornerStyle>
<a:ArrowStyle>8</a:ArrowStyle>
<a:LineColor>16744576</a:LineColor>
@ -4596,8 +4596,8 @@ Shadow=0</a:DisplayPreferences>
<o:ExtendedDependencySymbol Id="o65">
<a:CreationDate>1662045015</a:CreationDate>
<a:ModificationDate>1664295296</a:ModificationDate>
<a:Rect>((248596,52557), (276545,53260))</a:Rect>
<a:ListOfPoints>((248596,53260),(262008,53260),(262008,52857),(276545,52857))</a:ListOfPoints>
<a:Rect>((248596,52379), (276525,53260))</a:Rect>
<a:ListOfPoints>((248596,53260),(262008,53260),(262008,52679),(276525,52679))</a:ListOfPoints>
<a:CornerStyle>1</a:CornerStyle>
<a:ArrowStyle>8</a:ArrowStyle>
<a:LineColor>16744576</a:LineColor>
@ -4617,8 +4617,8 @@ Shadow=0</a:DisplayPreferences>
<o:ExtendedDependencySymbol Id="o68">
<a:CreationDate>1662046228</a:CreationDate>
<a:ModificationDate>1662647031</a:ModificationDate>
<a:Rect>((301722,-1243), (302322,27790))</a:Rect>
<a:ListOfPoints>((302023,-1243),(302023,15258),(302022,15258),(302022,27790))</a:ListOfPoints>
<a:Rect>((301371,-1243), (302023,27797))</a:Rect>
<a:ListOfPoints>((302023,-1243),(302023,15258),(301671,15258),(301671,27797))</a:ListOfPoints>
<a:CornerStyle>1</a:CornerStyle>
<a:ArrowStyle>8</a:ArrowStyle>
<a:LineColor>16744576</a:LineColor>
@ -4638,8 +4638,8 @@ Shadow=0</a:DisplayPreferences>
<o:ExtendedDependencySymbol Id="o71">
<a:CreationDate>1662047541</a:CreationDate>
<a:ModificationDate>1662047695</a:ModificationDate>
<a:Rect>((250779,30697), (296962,31870))</a:Rect>
<a:ListOfPoints>((250779,31870),(278057,31870),(278057,30997),(296962,30997))</a:ListOfPoints>
<a:Rect>((250779,30569), (296894,31870))</a:Rect>
<a:ListOfPoints>((250779,31870),(278057,31870),(278057,30869),(296894,30869))</a:ListOfPoints>
<a:CornerStyle>1</a:CornerStyle>
<a:ArrowStyle>8</a:ArrowStyle>
<a:LineColor>16744576</a:LineColor>
@ -4659,8 +4659,8 @@ Shadow=0</a:DisplayPreferences>
<o:ExtendedDependencySymbol Id="o74">
<a:CreationDate>1662048005</a:CreationDate>
<a:ModificationDate>1662048061</a:ModificationDate>
<a:Rect>((230014,25632), (295754,27797))</a:Rect>
<a:ListOfPoints>((230014,27797),(230014,25932),(295754,25932))</a:ListOfPoints>
<a:Rect>((230014,25717), (295754,27797))</a:Rect>
<a:ListOfPoints>((230014,27797),(230014,26017),(295754,26017))</a:ListOfPoints>
<a:CornerStyle>1</a:CornerStyle>
<a:ArrowStyle>8</a:ArrowStyle>
<a:LineColor>16744576</a:LineColor>
@ -4680,8 +4680,8 @@ Shadow=0</a:DisplayPreferences>
<o:ExtendedDependencySymbol Id="o77">
<a:CreationDate>1662647833</a:CreationDate>
<a:ModificationDate>1662647877</a:ModificationDate>
<a:Rect>((284540,14785), (285140,27625))</a:Rect>
<a:ListOfPoints>((284830,14785),(284830,20457),(284840,20457),(284840,27625))</a:ListOfPoints>
<a:Rect>((284830,14785), (285751,27639))</a:Rect>
<a:ListOfPoints>((284830,14785),(284830,20457),(285451,20457),(285451,27639))</a:ListOfPoints>
<a:CornerStyle>1</a:CornerStyle>
<a:ArrowStyle>8</a:ArrowStyle>
<a:LineColor>16744576</a:LineColor>
@ -4719,8 +4719,8 @@ Shadow=0</a:DisplayPreferences>
<o:ExtendedDependencySymbol Id="o83">
<a:CreationDate>1662810688</a:CreationDate>
<a:ModificationDate>1663748414</a:ModificationDate>
<a:Rect>((296402,28995), (338650,29922))</a:Rect>
<a:ListOfPoints>((338650,28995),(319044,28995),(319044,29622),(296402,29622))</a:ListOfPoints>
<a:Rect>((296366,28995), (338650,29852))</a:Rect>
<a:ListOfPoints>((338650,28995),(319044,28995),(319044,29552),(296366,29552))</a:ListOfPoints>
<a:CornerStyle>1</a:CornerStyle>
<a:ArrowStyle>8</a:ArrowStyle>
<a:LineColor>16744576</a:LineColor>
@ -4740,8 +4740,8 @@ Shadow=0</a:DisplayPreferences>
<o:ExtendedDependencySymbol Id="o85">
<a:CreationDate>1662865795</a:CreationDate>
<a:ModificationDate>1663518168</a:ModificationDate>
<a:Rect>((287322,15194), (337794,23674))</a:Rect>
<a:ListOfPoints>((337794,15194),(319320,15194),(319320,23374),(287322,23374))</a:ListOfPoints>
<a:Rect>((287794,15194), (337794,23866))</a:Rect>
<a:ListOfPoints>((337794,15194),(319320,15194),(319320,23566),(287794,23566))</a:ListOfPoints>
<a:CornerStyle>1</a:CornerStyle>
<a:ArrowStyle>8</a:ArrowStyle>
<a:LineColor>16744576</a:LineColor>
@ -4809,7 +4809,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1623769937</a:CreationDate>
<a:ModificationDate>1662650462</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
<a:Rect>((-8992,11854), (6252,25350))</a:Rect>
<a:Rect>((-8585,12140), (5845,25064))</a:Rect>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor>
@ -4861,7 +4861,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1623770338</a:CreationDate>
<a:ModificationDate>1662650462</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
<a:Rect>((-8944,-14307), (6300,89))</a:Rect>
<a:Rect>((-8537,-14000), (5893,-218))</a:Rect>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor>
@ -4965,7 +4965,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1623828456</a:CreationDate>
<a:ModificationDate>1661907266</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
<a:Rect>((9126,1660), (34258,17856))</a:Rect>
<a:Rect>((9827,2008), (33557,17508))</a:Rect>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor>
@ -4990,7 +4990,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1623828633</a:CreationDate>
<a:ModificationDate>1661907266</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
<a:Rect>((11358,-10357), (31134,-461))</a:Rect>
<a:Rect>((11900,-10153), (30592,-665))</a:Rect>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor>
@ -5015,7 +5015,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1623828682</a:CreationDate>
<a:ModificationDate>1661907266</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
<a:Rect>((11125,-24326), (30901,-14430))</a:Rect>
<a:Rect>((11667,-24122), (30359,-14634))</a:Rect>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor>
@ -5040,7 +5040,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1623828725</a:CreationDate>
<a:ModificationDate>1661907266</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
<a:Rect>((8950,-37056), (33670,-28060))</a:Rect>
<a:Rect>((9640,-36872), (32980,-28244))</a:Rect>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor>
@ -5065,7 +5065,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1623828770</a:CreationDate>
<a:ModificationDate>1661907266</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
<a:Rect>((15160,18471), (33288,35567))</a:Rect>
<a:Rect>((15653,18839), (32795,35199))</a:Rect>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor>
@ -5090,7 +5090,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1623840859</a:CreationDate>
<a:ModificationDate>1661907266</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
<a:Rect>((32810,-12234), (49290,2162))</a:Rect>
<a:Rect>((33254,-11927), (48846,1855))</a:Rect>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor>
@ -5115,7 +5115,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1623841366</a:CreationDate>
<a:ModificationDate>1661907266</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
<a:Rect>((32687,-26863), (49167,-12467))</a:Rect>
<a:Rect>((33131,-26556), (48723,-12774))</a:Rect>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor>
@ -5140,7 +5140,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1623842834</a:CreationDate>
<a:ModificationDate>1664366507</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
<a:Rect>((72858,37006), (95518,69402))</a:Rect>
<a:Rect>((73486,37723), (94890,68685))</a:Rect>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor>
@ -5190,7 +5190,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1623845296</a:CreationDate>
<a:ModificationDate>1664366507</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
<a:Rect>((96497,38154), (114625,48050))</a:Rect>
<a:Rect>((96990,38358), (114132,47846))</a:Rect>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor>
@ -5240,7 +5240,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1623859834</a:CreationDate>
<a:ModificationDate>1664366507</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
<a:Rect>((125881,37287), (145657,48083))</a:Rect>
<a:Rect>((126423,37512), (145115,47858))</a:Rect>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor>
@ -5292,7 +5292,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1623860248</a:CreationDate>
<a:ModificationDate>1662449601</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
<a:Rect>((74032,-8788), (94220,8308))</a:Rect>
<a:Rect>((74587,-8420), (93665,7940))</a:Rect>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor>
@ -5317,7 +5317,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1623860509</a:CreationDate>
<a:ModificationDate>1662971416</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
<a:Rect>((95067,-8538), (111135,7658))</a:Rect>
<a:Rect>((95498,-8190), (110704,7310))</a:Rect>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor>
@ -5342,7 +5342,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1623861067</a:CreationDate>
<a:ModificationDate>1662971416</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
<a:Rect>((114085,8387), (139217,26383))</a:Rect>
<a:Rect>((114786,8776), (138516,25994))</a:Rect>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor>
@ -5367,7 +5367,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1623861149</a:CreationDate>
<a:ModificationDate>1662971416</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
<a:Rect>((117063,-4663), (136839,6133))</a:Rect>
<a:Rect>((117605,-4438), (136297,5908))</a:Rect>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor>
@ -5392,7 +5392,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1623861203</a:CreationDate>
<a:ModificationDate>1662449601</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
<a:Rect>((140685,-5055), (155517,8441))</a:Rect>
<a:Rect>((141079,-4769), (155123,8155))</a:Rect>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor>
@ -5417,7 +5417,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1623861290</a:CreationDate>
<a:ModificationDate>1662971416</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
<a:Rect>((116763,-17563), (136539,-6767))</a:Rect>
<a:Rect>((117305,-17338), (135997,-6992))</a:Rect>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor>
@ -5469,7 +5469,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1623862594</a:CreationDate>
<a:ModificationDate>1661907266</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
<a:Rect>((57664,-26488), (70024,-14792))</a:Rect>
<a:Rect>((57984,-26243), (69704,-15037))</a:Rect>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor>
@ -5494,7 +5494,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1623862978</a:CreationDate>
<a:ModificationDate>1662650462</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
<a:Rect>((-36385,-12538), (-10017,958))</a:Rect>
<a:Rect>((-35647,-12252), (-10755,672))</a:Rect>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor>
@ -5519,7 +5519,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1623863676</a:CreationDate>
<a:ModificationDate>1662650462</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
<a:Rect>((-43302,-23338), (-30942,-14342))</a:Rect>
<a:Rect>((-42982,-23154), (-31262,-14526))</a:Rect>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor>
@ -5544,7 +5544,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1623864141</a:CreationDate>
<a:ModificationDate>1662650462</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
<a:Rect>((-29241,-23338), (-10289,-14342))</a:Rect>
<a:Rect>((-28723,-23154), (-10807,-14526))</a:Rect>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor>
@ -5569,7 +5569,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1623895431</a:CreationDate>
<a:ModificationDate>1662650462</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
<a:Rect>((-57116,-23188), (-44756,-14192))</a:Rect>
<a:Rect>((-56796,-23004), (-45076,-14376))</a:Rect>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor>
@ -5594,7 +5594,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1625926250</a:CreationDate>
<a:ModificationDate>1664366507</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
<a:Rect>((42884,28637), (66368,46633))</a:Rect>
<a:Rect>((43536,29026), (65716,46244))</a:Rect>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor>
@ -5644,7 +5644,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1628307450</a:CreationDate>
<a:ModificationDate>1662650462</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
<a:Rect>((-42552,-32668), (-31840,-25472))</a:Rect>
<a:Rect>((-42281,-32525), (-32111,-25615))</a:Rect>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor>
@ -5669,7 +5669,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1628307767</a:CreationDate>
<a:ModificationDate>1662650462</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
<a:Rect>((-29653,-35818), (-10289,-24122))</a:Rect>
<a:Rect>((-29124,-35573), (-10818,-24367))</a:Rect>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor>
@ -5694,7 +5694,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1628340137</a:CreationDate>
<a:ModificationDate>1661907266</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
<a:Rect>((37876,20648), (49674,26044))</a:Rect>
<a:Rect>((38210,20750), (49340,25942))</a:Rect>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor>
@ -5719,7 +5719,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1631242896</a:CreationDate>
<a:ModificationDate>1662650462</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
<a:Rect>((-7444,-35277), (4092,-26281))</a:Rect>
<a:Rect>((-7148,-35093), (3796,-26465))</a:Rect>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor>
@ -5744,7 +5744,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1631243538</a:CreationDate>
<a:ModificationDate>1662650462</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
<a:Rect>((-7369,-23577), (4167,-15481))</a:Rect>
<a:Rect>((-7073,-23414), (3871,-15644))</a:Rect>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor>
@ -5769,7 +5769,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1661850632</a:CreationDate>
<a:ModificationDate>1662449601</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
<a:Rect>((295842,51445), (320562,62241))</a:Rect>
<a:Rect>((296531,51670), (319873,62016))</a:Rect>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor>
@ -5794,7 +5794,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1661872432</a:CreationDate>
<a:ModificationDate>1662047569</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
<a:Rect>((264242,41487), (288138,55883))</a:Rect>
<a:Rect>((264907,41794), (287473,55576))</a:Rect>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor>
@ -5873,7 +5873,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1661862847</a:CreationDate>
<a:ModificationDate>1662042403</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
<a:Rect>((223951,10331), (250731,22927))</a:Rect>
<a:Rect>((224702,10597), (249980,22661))</a:Rect>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor>
@ -5952,7 +5952,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1661868858</a:CreationDate>
<a:ModificationDate>1662042403</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
<a:Rect>((222097,-4665), (252585,5231))</a:Rect>
<a:Rect>((222959,-4461), (251723,5027))</a:Rect>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor>
@ -6085,7 +6085,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1661949359</a:CreationDate>
<a:ModificationDate>1662042403</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
<a:Rect>((282570,22110), (308938,33806))</a:Rect>
<a:Rect>((283308,22355), (308200,33561))</a:Rect>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor>
@ -6245,7 +6245,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1661960474</a:CreationDate>
<a:ModificationDate>1662042403</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
<a:Rect>((289250,38233), (327154,48129))</a:Rect>
<a:Rect>((290333,38437), (326071,47925))</a:Rect>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor>
@ -6675,7 +6675,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1663937886</a:CreationDate>
<a:ModificationDate>1663937955</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
<a:Rect>((37034,2552), (62166,20548))</a:Rect>
<a:Rect>((37735,2941), (61465,20159))</a:Rect>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor>

2
web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseQuestionLogService.java
Unescape Escape View File

@ -167,7 +167,7 @@ public class TeacherOpenCourseQuestionLogService extends CoreBaseService<Teacher
// 不需要判断空，控制类层已经用@NotEmpty判断过了。
questionLogMap.forEach((resourcesQuestionSnapshotId, answerSet) -> {
// 答案逗号隔开
String answersText = join(answerSet, ",");
String answersText = join(answerSet.toArray(), ",");
// 构建实体
TeacherOpenCourseQuestionLog questionLog = new TeacherOpenCourseQuestionLog();
questionLog.setTeacherOpenCourseQuestionLogFromType(fromType);

4
web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseQuestionLogController.java
Unescape Escape View File

@ -1,5 +1,6 @@
package com.ibeetl.jlw.web;
import cn.hutool.core.lang.Assert;
import cn.jlw.Interceptor.SCoreUser;
import cn.jlw.validate.ValidateConfig;
import com.ibeetl.admin.core.annotation.Function;
@ -214,8 +215,7 @@ public class TeacherOpenCourseQuestionLogController{
TeacherOpenCourseQuestionLogFromTypeEnum fromType,
@SCoreUser
CoreUser coreUser) {
// TODO 测试阶段，禁用身份判断
// Assert.isTrue(coreUser.isStudent(), "非学生身份，无法提交!");
Assert.isTrue(coreUser.isStudent(), "非学生身份，无法提交!");
teacherOpenCourseQuestionLogService.addQuestionLog(questionLogMap, fromType);
return JsonResult.success();
}

14
web/src/test/java/com/ibeetl/jlw/web/TeacherOpenCourseMergeSchoolClassControllerTest.java
Unescape Escape View File

@ -1,7 +1,6 @@
package com.ibeetl.jlw.web;
import base.BaseTest;
import com.google.common.collect.Maps;
import com.ibeetl.admin.core.util.BeanUtil;
import com.ibeetl.jlw.entity.TeacherOpenCourseMergeSchoolClass;
import org.apache.commons.logging.Log;
@ -11,9 +10,7 @@ import org.springframework.http.MediaType;
import org.springframework.test.web.servlet.RequestBuilder;
import org.springframework.test.web.servlet.request.MockMvcRequestBuilders;
import org.springframework.test.web.servlet.result.MockMvcResultMatchers;
import org.springframework.util.MultiValueMapAdapter;
import java.util.Map;
import org.springframework.util.MultiValueMap;
import static com.ibeetl.admin.test.util.test.RandomUtils.randomPojo;
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
@ -65,19 +62,18 @@ public class TeacherOpenCourseMergeSchoolClassControllerTest extends BaseTest {
// 自动填充属性
TeacherOpenCourseMergeSchoolClass teacherOpenCourseMergeSchoolClass = randomPojo(TeacherOpenCourseMergeSchoolClass.class);
Map<String, String> stringMap = BeanUtil.beanToMapStr(teacherOpenCourseMergeSchoolClass);
MultiValueMapAdapter multiValueMapAdapter = new MultiValueMapAdapter(Maps.newHashMap());
stringMap.forEach(multiValueMapAdapter::add);
MultiValueMap<String, String> multiValueMap = BeanUtil.beanToStrMultiMap(teacherOpenCourseMergeSchoolClass);
//构造请求参数
RequestBuilder rb = MockMvcRequestBuilders.post(MODEL + "/add.json").contentType(MediaType.APPLICATION_FORM_URLENCODED_VALUE)
.params(multiValueMapAdapter);
.params(multiValueMap);
//发送请求，验证返回结果
String result = mvc.perform(rb)
.andExpect(status().isOk())
.andExpect(MockMvcResultMatchers.jsonPath("$.code").value("0"))
.andReturn().getResponse().getContentAsString();
log.info(result);
System.out.println(result);
}
@Test

76
web/src/test/java/com/ibeetl/jlw/web/TeacherOpenCourseQuestionLogControllerTest.java
Unescape Escape View File

@ -0,0 +1,76 @@
package com.ibeetl.jlw.web;
import base.BaseTest;
import cn.hutool.core.util.ObjectUtil;
import com.ibeetl.admin.test.util.test.TestEnvUtil;
import com.ibeetl.jlw.dao.StudentDao;
import com.ibeetl.jlw.entity.Student;
import com.ibeetl.jlw.enums.TeacherOpenCourseQuestionLogFromTypeEnum;
import org.junit.Assert;
import org.junit.jupiter.api.Test;
import org.springframework.http.MediaType;
import org.springframework.test.web.servlet.RequestBuilder;
import org.springframework.test.web.servlet.request.MockMvcRequestBuilders;
import org.springframework.test.web.servlet.result.MockMvcResultMatchers;
import org.springframework.util.CollectionUtils;
import javax.annotation.Resource;
import java.util.List;
import static com.ibeetl.admin.test.util.test.RandomUtils.randomSet;
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
class TeacherOpenCourseQuestionLogControllerTest extends BaseTest {
private static final String MODEL = "/jlw/teacherOpenCourseQuestionLog";
private static final String API = "/api/teacherOpenCourseQuestionLog";
@Resource
StudentDao studentDao;
/**
* 和题目有关的做题提交方法
*
* 参数： questionLogMap <题目ID, [数组：前端传递过来不需要考虑排序和重复问题]> 例： {"10086": ["D", "A", "B", "A"]}
* 参数： fromType 来源类型
*/
@Test
void addQuestionLog() throws Exception {
String params = "{\"1574684340254842880\": [\"错\"], \"1574684340271620097\": [\"D\",\"A\", \"C\"]}";
// 随机取一个学生的登录信息
List<Student> studentList = studentDao.execute(
"select org_id, user_id " +
"from student " +
"where student_status = 1 and org_id is not null and user_id is not null " +
"order by rand() limit 1");
Assert.assertTrue("学生表为空，程序中断！", ObjectUtil.isNotEmpty(studentList));
// 学生ID
Student student = CollectionUtils.firstElement(studentList);
// 换学生身份登录系统
TestEnvUtil.setProperty("user.id", student.getUserId().toString());
TestEnvUtil.setProperty("user.orgId", student.getOrgId().toString());
// 随机来源类型
TeacherOpenCourseQuestionLogFromTypeEnum fromTypeEnum = CollectionUtils
.firstElement(randomSet(TeacherOpenCourseQuestionLogFromTypeEnum.class));
//构造请求参数
RequestBuilder rb = MockMvcRequestBuilders.post(MODEL + "/addQuestionLog.json")
.contentType(MediaType.APPLICATION_JSON_VALUE)
.param("fromType", fromTypeEnum.name())
.content(params);
//发送请求，验证返回结果
String result = mvc.perform(rb)
.andExpect(status().isOk())
.andExpect(MockMvcResultMatchers.jsonPath("$.code").value("0"))
.andReturn().getResponse().getContentAsString();
// 换回去原始的登录方式
TestEnvUtil.removeProperty("user.id");
TestEnvUtil.removeProperty("user.orgId");
System.out.println(result);
}
}
Write Preview
Loading…
Cancel
Save