Merge branch 'master' into wn

suser/src/main/java/com/xhkjedu/suser/mapper/system/UserComponentMapper.java

@@ -0,0 +1,12 @@
+package com.xhkjedu.suser.mapper.system;
+
+import com.xhkjedu.base.TkMapper;
+import com.xhkjedu.suser.model.system.TUserComponent;
+
+/**
+ * @Description：用户组件
+ * @Author: WN
+ * @Date: 2024/7/19 14:44:39
+ **/
+public interface UserComponentMapper extends TkMapper<TUserComponent> {
+}

suser/src/main/java/com/xhkjedu/suser/model/system/TUserComponent.java

@@ -0,0 +1,36 @@
+package com.xhkjedu.suser.model.system;
+
+import lombok.Data;
+
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+/**
+ * @Description：用户组件表
+ * @Author: WN
+ * @Date: 2024/7/19 14:39:09
+ **/
+@Table(name = "t_user_component")
+@Data
+public class TUserComponent {
+    @Id
+    private Integer ucid;
+
+    //用户id
+    private Integer userid;
+
+    //组件code
+    private String ccode;
+
+    //组件宽（份数）
+    private Integer cwidth;
+
+    //组件高（份数）
+    private Integer cheight;
+
+    //组件排序
+    private Integer corder;
+
+    //创建时间
+    private Integer createtime;
+}

suser/src/main/java/com/xhkjedu/suser/service/system/UserService.java

@@ -6,14 +6,14 @@ import com.xhkjedu.suser.config.ConfigKey;
 import com.xhkjedu.suser.mapper.gradeclass.ClassMapper;
 import com.xhkjedu.suser.mapper.gradeclass.ClassTeacherMapper;
 import com.xhkjedu.suser.mapper.gradeclass.SchoolMapper;
-import com.xhkjedu.suser.mapper.subjectbook.TeacherPowersbMapper;
 import com.xhkjedu.suser.mapper.system.MsgMapper;
-import com.xhkjedu.suser.mapper.system.UserLogMapper;
+import com.xhkjedu.suser.mapper.system.UserComponentMapper;
 import com.xhkjedu.suser.mapper.system.UserMapper;
 import com.xhkjedu.suser.mapper.system.UserUsecretMapper;
 import com.xhkjedu.suser.model.gradeclass.TClassTeacher;
 import com.xhkjedu.suser.model.system.TMsg;
 import com.xhkjedu.suser.model.system.TUser;
+import com.xhkjedu.suser.model.system.TUserComponent;
 import com.xhkjedu.suser.model.system.TUserUsecret;
 import com.xhkjedu.suser.utils.PoiUtils;
 import com.xhkjedu.suser.utils.SMSSender;
@@ -62,9 +62,7 @@ public class UserService extends JedisUtil {
     @Resource
     private UserUsecretMapper userUsecretMapper;
     @Resource
-    private TeacherPowersbMapper teacherPowersbMapper;
-    @Resource
-    private UserLogMapper userLogMapper;
+    private UserComponentMapper userComponentMapper;
 
     /**
      * 添加用户信息
@@ -74,6 +72,7 @@ public class UserService extends JedisUtil {
      * @Author ywx
      * @Date 2020/6/2 9:45
      **/
+    @Transactional(rollbackFor = Exception.class)
     public ResultVo save(TUser user) {
         Integer schoolid = user.getSchoolid();
         Integer usernum = schoolMapper.getUserNumById(schoolid);
@@ -108,7 +107,25 @@ public class UserService extends JedisUtil {
         user.setErrornum(0);
         user.setLoginname(N_Utils.strTrim(user.getLoginname()));
         userMapper.insertUseGeneratedKeys(user);
-        return new ResultVo(0, "保存成功", user.getId());
+        Integer userid = user.getId();
+        if(user.getUsertype() == 1){
+            List<TUserComponent> initComponents = UserUtil.listInitComponents();
+            List<TUserComponent> saveComponents = new ArrayList<>();
+            Integer timestamp = N_Utils.getSecondTimestamp();
+            for (TUserComponent userComponent : initComponents) {
+                TUserComponent sc = new TUserComponent();
+                sc.setUserid(userid);
+                sc.setCcode(userComponent.getCcode());
+                sc.setCwidth(userComponent.getCwidth());
+                sc.setCheight(userComponent.getCheight());
+                sc.setCorder(userComponent.getCorder());
+                sc.setCreatetime(timestamp);
+                saveComponents.add(sc);
+            }
+            userComponentMapper.insertList(saveComponents);
+        }
+
+        return new ResultVo(0, "保存成功", userid);
     }
 
     /**
@@ -435,7 +452,23 @@ public class UserService extends JedisUtil {
             user.setUserlock(0);
             user.setErrornum(0);
             userMapper.insertUseGeneratedKeys(user);
-            //teacherList.add(user);
+            int timestamp = N_Utils.getSecondTimestamp();
+            userid = user.getId();
+
+            //初始化首页组件
+            List<TUserComponent> initComponents = UserUtil.listInitComponents();
+            List<TUserComponent> saveComponents = new ArrayList<>();
+            for(TUserComponent userComponent : initComponents){
+                TUserComponent sc = new TUserComponent();
+                sc.setUserid(userid);
+                sc.setCcode(userComponent.getCcode());
+                sc.setCwidth(userComponent.getCwidth());
+                sc.setCheight(userComponent.getCheight());
+                sc.setCorder(userComponent.getCorder());
+                sc.setCreatetime(timestamp);
+                saveComponents.add(sc);
+            }
+            userComponentMapper.insertList(saveComponents);
 
             //处理用户班级
             Integer grageid = user.getGrageid();
@@ -443,8 +476,7 @@ public class UserService extends JedisUtil {
             List<Integer> classids = user.getClassids();
             if (N_Utils.isListEmpty(classids)) return new AsyncResult<>(true);
 
-            userid = user.getId();
-            int timestamp = N_Utils.getSecondTimestamp();
+
             for (Integer classid : classids) {
                 TClassTeacher ct = new TClassTeacher();
                 ct.setTeacherid(userid);
@@ -454,6 +486,7 @@ public class UserService extends JedisUtil {
                 ct.setCreatetime(timestamp);
                 ctlst.add(ct);
             }
+
         } else {
             if (schoolid != u.getSchoolid()) {
                 usersExisted.add(u);

suser/src/main/java/com/xhkjedu/suser/utils/UserUtil.java

@@ -1,5 +1,6 @@
 package com.xhkjedu.suser.utils;
 
+import com.xhkjedu.suser.model.system.TUserComponent;
 import com.xhkjedu.utils.N_Utils;
 import com.xhkjedu.vo.ResultVo;
 import lombok.extern.slf4j.Slf4j;
@@ -81,4 +82,52 @@ public class UserUtil {
             }
         }
     }
+
+    /*
+     * @Description 初始化组件
+     * @Date 2024/12/9 16:23:01
+     * @Author WN
+     * @Param []
+     * @Return java.util.List<com.xhkjedu.suser.model.system.TUserComponent>
+     **/
+    public static List<TUserComponent> listInitComponents(){
+        List<TUserComponent> initComponents = new ArrayList<>();
+        TUserComponent uc1 = new TUserComponent();
+        uc1.setCcode("HomeWorkNoticeResearch");
+        uc1.setCwidth(1);
+        uc1.setCheight(1);
+        uc1.setCorder(1);
+        initComponents.add(uc1);
+
+        TUserComponent uc2 = new TUserComponent();
+        uc2.setCcode("MySpace");
+        uc2.setCwidth(1);
+        uc2.setCheight(1);
+        uc2.setCorder(2);
+        initComponents.add(uc2);
+
+        TUserComponent uc3 = new TUserComponent();
+        uc3.setCcode("CommonUse");
+        uc3.setCwidth(1);
+        uc3.setCheight(1);
+        uc3.setCorder(2);
+        initComponents.add(uc3);
+
+        TUserComponent uc4 = new TUserComponent();
+        uc4.setCcode("PreviewHomeworkRecite");
+        uc4.setCwidth(2);
+        uc4.setCheight(1);
+        uc4.setCorder(4);
+        initComponents.add(uc4);
+
+        TUserComponent uc5 = new TUserComponent();
+        uc5.setCcode("SchoolResourceLibrary");
+        uc5.setCwidth(1);
+        uc5.setCheight(1);
+        uc5.setCorder(5);
+        initComponents.add(uc5);
+
+        return initComponents;
+
+    }
 }