创建考生

yiming
1 parent 248d518e
Showing 5 changed files with 27 additions and 101 deletions
src/main/java/com/bsth/controller/ddexam/DdexamController.java
src/main/java/com/bsth/entity/sys/SysUser.java
src/main/java/com/bsth/service/ddexam/DdexamService.java
src/main/java/com/bsth/service/ddexam/impl/DdexamServiceImpl.java
src/main/resources/static/pages/ddexam/index.html
@@ -23,8 +23,8 @@ public class DdexamController {
     //创建账号
     @RequestMapping("initialization")
-    public Map initializationAll(@RequestParam Integer rs ,@RequestParam Long userName){
-        return ddexamService.initializationAll(rs,userName);
+    public Map initializationAll(@RequestParam String name ,@RequestParam Long userName){
+        return ddexamService.initializationAll(name,userName);
     }
     //初始化
     @RequestMapping("initialization2")
 package com.bsth.entity.sys;
+import com.bsth.security.util.SecurityUtils;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 import javax.persistence.*;
 import java.io.Serializable;
@@ -144,4 +146,16 @@ public class SysUser implements Serializable {
 	public void setParentID(String parentID) {
 		this.parentID = parentID;
 	}
+
+	public  SysUser(){
+	}
+	public  SysUser(String name,String userName,SysUser loginUser){
+		this.createDate=new Date();
+		this.enabled=true;
+		this.name=name;
+		this.password=new BCryptPasswordEncoder(4).encode("123456");
+		this.userName=userName;
+		this.ksstatus="1"; //状态  表示今日账户已用
+		this.parentID=String.valueOf(loginUser.getId());
+	}
 }
@@ -8,7 +8,7 @@ import java.util.Map;
 public interface DdexamService {
-    public Map initializationAll(Integer rs,Long userName);
+    public Map initializationAll(String name,Long userName);
     public Map initializationAll2(Long userName);
@@ -194,12 +194,12 @@ public class DdexamServiceImpl implements DdexamService {
     //考生人初始化  单线程 测试1：执行中途再次执行是否同步 测试2：
     @Override
     @Transactional //事务
-    public synchronized Map initializationAll(Integer rs,Long userName) {
+    public synchronized Map initializationAll(String name,Long userName) {
         Long start = System.currentTimeMillis();
         Map m = new HashMap<>();
         try {  //用户当天分配完直接改状态  无二次分配的可能
+            SysUser loginUser=SecurityUtils.getCurrentUser();
             List<SysUser> userList = sysUserRepository.findBySusUserAll(); //已有的用户   不考虑用户角色表  正常情况下创建必分配
-            Map suerMap = new HashMap();
             for (SysUser s :userList){
                 if(Long.parseLong(s.getUserName())  == userName ){
                     m.put("code","创建失败 账号重复");
@@ -209,7 +209,8 @@ public class DdexamServiceImpl implements DdexamService {
             new Thread() {
                 public  synchronized  void run() {
-                    if(usercreateType(rs,userName)){
+                    SysUser user = new SysUser(name,String.valueOf(userName),loginUser);
+                    if(createUser(user)){
                         log.info("考试初始化创建成功");
                         kk();
                     }
@@ -358,83 +359,7 @@ public class DdexamServiceImpl implements DdexamService {
         return true;
     }
-    //创建考试人数 并分配线路信息
-    public synchronized Boolean  usercreateType(int st,Long userName){
-        int usernum = sysUserRepository.findAll_distinct().size();
-        SysUser user = new SysUser();//总人数
-        for (int i = 0; i < st; i++) { //创建考试人数
-            int username = usernum++;
-            user = new SysUser();
-            user.setCreateDate(new Date());
-            user.setEnabled(true);
-            user.setName(String.valueOf(userName + i));
-            user.setPassword(new BCryptPasswordEncoder(4).encode("123456"));
-            user.setUserName(String.valueOf(userName + i));
-            user.setKsstatus("1"); //状态  表示今日账户已用
-            sysUserRepository.save(user); //添加  -------**--
-            
-            BsthCSysUserRoles userRoles = new BsthCSysUserRoles();
-            userRoles.setUsers(user.getId());
-            userRoles.setRoles(73); //统一用73考生
-            bsthCSysUserRolesRepository.save(userRoles); //添加  -------**--
-            List<LineConfigSt> lineConfigList = lineConfigStRepository.findAll(); //线调 线路相关配置信息
-            Integer linebumber = lineRepository.findAll().size(); //线路数量 线路code
-            String [] mtline = {"A线","B线","C线","D线","E线","F线"}; //对应模板6条线 换成线路name
-            List<LineInformationSt> litst = (List<LineInformationSt>) LineInformationStRepository.findAll(); //所有模板线路标准和线路
-            if(litst.size() != 6){
-                return false;
-            }
-            String lineCodeStr = "";
-            for(int j = 0 ; j < litst.size() ; j++){  //6个  <6
-                LineSt linest = litst.get(j).getLine(); //旧line
-                LineInformationSt Limst = litst.get(j); 
-                Line line = new Line();
-                BeanUtils.copyProperties(linest,line); //copy
-                Integer linecodeId = linebumber++ ;
-                line.setId(linecodeId);
-                line.setLineCode(linecodeId.toString());
-                line.setName(mtline[j]+"-"+user.getName());
-                line.setCoLineCode(linest.getLineCode());
-                lineRepository.save(line);  //线路添加
-                //----------------线路--------------------------//
-                LineInformation lifat = new LineInformation();  //线路标准
-                BeanUtils.copyProperties(Limst,lifat);
-                lifat.setLine(line);
-                lineInformationRepository.save(lifat); //线路标准信息条件
-                //-------------------线路标准-----------------------//
-                for(LineConfigSt cfgt : lineConfigList){
-                    if(cfgt.getLine().getLineCode().equals(linest.getLineCode())){
-                        LineConfig config = new LineConfig();
-                        BeanUtils.copyProperties(cfgt,config); //copy
-                        config.setLine(line);
-                        lineConfigRepository.save(config);
-                    }
-                }
-                //-------------------线调 线路相关配置信息-----------------------//
-                
-                List<StationRouteSt> srstList = stationRouteStRepository.findByLine(linest.getLineCode());
-                List<StationRoute> srstListAll = new ArrayList<>();
-                for(StationRouteSt route : srstList){
-                    StationRoute srt = new StationRoute();
-                    BeanUtils.copyProperties(route,srt); //copy
-                    srt.setLine(line);
-                    srt.setLineCode(linecodeId.toString());
-                    srstListAll.add(srt);
-                }
-                stationRouteRepository.saveAll(srstListAll);//添加站点
-                //-------------------站点-----------------------//
-                lineCodeStr += linecodeId.toString()+",";  //线调线路
-                inforealType(line);
-            }
-            RealControAuthority raty = new RealControAuthority();
-            raty.setUserId(user.getId());
-            raty.setLineCodeStr(lineCodeStr);
-            raty.setPattern(1); //可用
-            realControAuthorityRepository.save(raty);
-            //-------------------分配本次线调权限-----------------------//
-        }
-        return true;
-    }
+
     //添加排班
     public void inforealType(Line line){
@@ -495,19 +420,10 @@ public class DdexamServiceImpl implements DdexamService {
                     continue;
                 textList.add(text + ";");
             }
-            SysUser loginUser = SecurityUtils.getCurrentUser();
             for(int i = 0; i < textList.size(); i++) {
                 String text = textList.get(i);
                 String[] split = text.split(",");
-                SysUser user = new SysUser();
-                user.setCreateDate(new Date());
-                user.setEnabled(true);
-                user.setName(split[1].trim());
-                user.setPassword(new BCryptPasswordEncoder(4).encode("123456"));
-                user.setUserName(split[0].trim());
-                user.setKsstatus("1"); //状态  表示今日账户已用
-                user.setLastLoginDate(new Date());
-                user.setParentID(String.valueOf(loginUser.getId()));
+                SysUser user = new SysUser(split[1].trim(),split[0].trim(),SecurityUtils.getCurrentUser());
                 userList.add(user);
             }
             List<SysUser> users = sysUserRepository.findBySusUserAll();
@@ -55,14 +55,14 @@
             <div class="tes">
                 <label class="col-md-12 sizell">请输入学号：</label>
                 <div class="col-md-9 scm">
-                    <input id="userName" type="text" class="form-control" name="rnumber" autocomplete="off"  oninput="value=value.replace(/[^\d]/g,'')"/>
+                    <input id="userName" type="text" class="form-control" name="userName" autocomplete="off"  oninput="value=value.replace(/[^\d]/g,'')"/>
                 </div>
-                <label class="col-md-12 sizell">请输入考试人数：</label>
+                <label class="col-md-12 sizell">请输入姓名：</label>
                 <div class="col-md-9 scm">
-                    <input id="rnumber" type="text" class="form-control" name="rnumber" autocomplete="off"  oninput="value=value.replace(/[^\d]/g,'')"/>
+                    <input id="name" type="text" class="form-control" name="name" autocomplete="off" />
                     <h6>人数过大时，耗时较久，请耐心等待</h6>
                 </div>
@@ -140,13 +140,9 @@
     function onckil(){
-        if($("#rnumber").val() == undefined || $("#rnumber").val() == null || $("#rnumber").val() == "" || $("#rnumber").val() > 100){
-            layer.msg('考试人数未输入或人数过大,请正确输入...');
-            return 
-        }
         var params ={
             userName :  $("#userName").val(),
-            rs : $("#rnumber").val()
+            name : $("#name").val()
         }
         var i = layer.load(2);
         $.post('/ddexam/initialization',params,function(data) {