Merge remote-tracking branch 'origin/master'

src/main/java/com/rf/psychological/dao/model/PMEntity.java

@@ -13,14 +13,15 @@ import lombok.NoArgsConstructor;
 @AllArgsConstructor
 @Data
 public class PMEntity {
+
     /**
      *  本局开始时间
      */
-    //private String startTime;
+    private String startTime;
     /**
      * 本剧结束时间
      */
-    //private String endTime;
+    private String endTime;
     /**
      * 记录左边图片是九类中的哪一种
      */
@@ -49,21 +50,66 @@ public class PMEntity {
      * 主任务的挂载选择是否正确
      */
     private String mainTaskMissileCorrection;
+    /**
+     *前瞻性记忆任务的反应时间
+     */
+    private String prospectiveTaskReactionTime;
+    /**
+     * 前瞻性记忆任务的反应是否正确
+     */
+    private String prospectiveTaskCorrection;
 
+   /* *//**
+     *  本局开始时间
+     *//*
+    //private String startTime;
+    *//**
+     * 本剧结束时间
+     *//*
+    //private String endTime;
+    *//**
+     * 记录左边图片是九类中的哪一种
+     *//*
+    private String missile;
+    *//**
+     * 记录右边图片是36种的哪一种
+     *//*
+    private String compass;
+    *//**
+     * 1 主任务，2 前瞻性记忆任务
+     *//*
+    private String taskType;
+    *//**
+     * 主任务的方向选择反应时间
+     *//*
+    private String mainTaskDirectionReactionTime;
+    *//**
+     * 主任务的方向选择是否正确
+     *//*
+    private String mainTaskDirectionCorrection;
+    *//**
+     * 主任务的挂载反应时间
+     *//*
+    private String mainTaskMissileReactionTime;
+    *//**
+     * 主任务的挂载选择是否正确
+     *//*
+    private String mainTaskMissileCorrection;
 
-    /**
+
+    *//**
      * 主任务综合正确率
-     */
+     *//*
     private String mainTaskComCorrection;
 
 
-    /**
+    *//**
      * 前瞻性记忆任务的反应时间
-     */
+     *//*
     private String prospectiveTaskReactionTime;
-    /**
+    *//**
      * 前瞻性记忆任务的反应是否正确
-     */
+     *//*
     private String prospectiveTaskCorrection;
 
     private String cardNo;//ID
@@ -80,5 +126,5 @@ public class PMEntity {
     private String mainTaskMissileCorrectionResponse; // 主任务挂载正确反应 ['KeyA' | 'KeyS' | 'KeyD' | '']
     private String mainTaskMissileActualResponse;// 主任务挂载实际反应 ['KeyA' | 'KeyS' | 'KeyD' | '其他任意按键' | '']
     private String prospectiveTaskCorrectionResponse;// 前瞻性记忆任务正确反应  ['Space' | '']
-    private String prospectiveTaskActualResponse; // 前瞻性记忆任务实际反应  ['Space' | 'ArrowLeft' | 'ArrowRight' | '其他任意按键' | '']
+    private String prospectiveTaskActualResponse; // 前瞻性记忆任务实际反应  ['Space' | 'ArrowLeft' | 'ArrowRight' | '其他任意按键' | '']*/
 }

src/main/java/com/rf/psychological/file/FileController.java

@@ -260,8 +260,9 @@ public class FileController extends BaseController {
         String FILEDIR;
         String filePath = "static/pulse/";
         if (OSUtil.getOSname().equalsIgnoreCase("Windows")) {
-            //FILEDIR = "./pulse/data/";
-            FILEDIR = "C:/pulse/data";
+            //FILEDIR = "C:/pulse/data/";
+            File sourceFile = new File("./../");
+            FILEDIR = sourceFile.getCanonicalPath()+"/pulse/data";
         } else {
 //            FILEDIR = request.getServletContext().getRealPath(filePath);
             FILEDIR = "./data/";

src/main/java/com/rf/psychological/file/excel/ExcelClass.java

@@ -95,10 +95,10 @@ public class ExcelClass {
             excel.add(new ExcelBean("被试ID", "cardNo", 0));
             excel.add(new ExcelBean("姓名", "userName", 0));
             excel.add(new ExcelBean("年龄", "age", 0));
-            excel.add(new ExcelBean("单位名称旅", "org", 0));
+            /*excel.add(new ExcelBean("单位名称旅", "org", 0));
             excel.add(new ExcelBean("单位名称大队", "orgSub", 0));
             excel.add(new ExcelBean("飞行等级", "FXLevel", 0));
-            excel.add(new ExcelBean("现飞机型", "currentJX", 0));
+            excel.add(new ExcelBean("现飞机型", "currentJX", 0));*/
             excel.add(new ExcelBean("当前试次起始时间", "onceStartTime", 0));
 //            excel.add(new ExcelBean("刺激次数", "key", 0));
             excel.add(new ExcelBean("反应时长(ms)", "value", 0));
@@ -170,10 +170,10 @@ public class ExcelClass {
             excel.add(new ExcelBean("被试ID", "cardNo", 0));
             excel.add(new ExcelBean("姓名", "userName", 0));
             excel.add(new ExcelBean("年龄", "age", 0));
-            excel.add(new ExcelBean("单位名称旅", "org", 0));
+            /*excel.add(new ExcelBean("单位名称旅", "org", 0));
             excel.add(new ExcelBean("单位名称大队", "orgSub", 0));
             excel.add(new ExcelBean("飞行等级", "FXLevel", 0));
-            excel.add(new ExcelBean("现飞机型", "currentJX", 0));
+            excel.add(new ExcelBean("现飞机型", "currentJX", 0));*/
             excel.add(new ExcelBean("当前试次起始时间", "onceStartTime", 0));
 
             excel.add(new ExcelBean("试次反应时(ms)", "responseTime", 0));
@@ -206,10 +206,10 @@ public class ExcelClass {
             excel.add(new ExcelBean("被试ID", "cardNo", 0));
             excel.add(new ExcelBean("姓名", "userName", 0));
             excel.add(new ExcelBean("年龄", "age", 0));
-            excel.add(new ExcelBean("单位名称旅", "org", 0));
+           /* excel.add(new ExcelBean("单位名称旅", "org", 0));
             excel.add(new ExcelBean("单位名称大队", "orgSub", 0));
             excel.add(new ExcelBean("飞行等级", "FXLevel", 0));
-            excel.add(new ExcelBean("现飞机型", "currentJX", 0));
+            excel.add(new ExcelBean("现飞机型", "currentJX", 0));*/
             excel.add(new ExcelBean("当前试次起始时间", "onceStartTime", 0));
 
             excel.add(new ExcelBean("当前试次难度等级", "diff", 0));
@@ -236,10 +236,10 @@ public class ExcelClass {
             excel.add(new ExcelBean("被试ID", "cardNo", 0));
             excel.add(new ExcelBean("姓名", "userName", 0));
             excel.add(new ExcelBean("年龄", "age", 0));
-            excel.add(new ExcelBean("单位名称旅", "org", 0));
+            /*excel.add(new ExcelBean("单位名称旅", "org", 0));
             excel.add(new ExcelBean("单位名称大队", "orgSub", 0));
             excel.add(new ExcelBean("飞行等级", "FXLevel", 0));
-            excel.add(new ExcelBean("现飞机型", "currentJX", 0));
+            excel.add(new ExcelBean("现飞机型", "currentJX", 0));*/
             excel.add(new ExcelBean("当前试次起始时间", "onceStartTime", 0));
             excel.add(new ExcelBean("刺激类型", "type", 0));
             excel.add(new ExcelBean("当前试次反应时(ms)", "responseTime", 0));
@@ -260,10 +260,10 @@ public class ExcelClass {
             excel.add(new ExcelBean("被试ID", "cardNo", 0));
             excel.add(new ExcelBean("姓名", "userName", 0));
             excel.add(new ExcelBean("年龄", "age", 0));
-            excel.add(new ExcelBean("单位名称旅", "org", 0));
+            /*excel.add(new ExcelBean("单位名称旅", "org", 0));
             excel.add(new ExcelBean("单位名称大队", "orgSub", 0));
             excel.add(new ExcelBean("飞行等级", "FXLevel", 0));
-            excel.add(new ExcelBean("现飞机型", "currentJX", 0));
+            excel.add(new ExcelBean("现飞机型", "currentJX", 0));*/
             excel.add(new ExcelBean("当前试次起始时间", "onceStartTime", 0));
             excel.add(new ExcelBean("每轮得分", "currentEarn", 0));
             excel.add(new ExcelBean("每轮点击数", "numberPumps", 0));
@@ -279,10 +279,10 @@ public class ExcelClass {
             excel.add(new ExcelBean("被试ID", "cardNo", 0));
             excel.add(new ExcelBean("姓名", "userName", 0));
             excel.add(new ExcelBean("年龄", "age", 0));
-            excel.add(new ExcelBean("单位名称旅", "org", 0));
+            /*excel.add(new ExcelBean("单位名称旅", "org", 0));
             excel.add(new ExcelBean("单位名称大队", "orgSub", 0));
             excel.add(new ExcelBean("飞行等级", "FXLevel", 0));
-            excel.add(new ExcelBean("现飞机型", "currentJX", 0));
+            excel.add(new ExcelBean("现飞机型", "currentJX", 0));*/
             excel.add(new ExcelBean("当前试次起始时间", "onceStartTime", 0));
             excel.add(new ExcelBean("试次难度等级", "level", 0));
             excel.add(new ExcelBean("试次反应误差", "error", 0));
@@ -346,7 +346,7 @@ public class ExcelClass {
             excel.add(new ExcelBean("类型值", "emoAmp", 0));
             excel.add(new ExcelBean("选择的情绪类型", "userSelectEmoType", 0));
             excel.add(new ExcelBean("反应时（ms）", "responseTime", 0));
-            excel.add(new ExcelBean("正确率", "correct", 0));
+            excel.add(new ExcelBean("正确性", "correct", 0));
         } else if (Constant.QUEST_TYPE_ECAT.equals(flag)) {
             excel.add(new ExcelBean("序号", "index", 0));
             excel.add(new ExcelBean("情绪类型", "wordType", 0));
@@ -452,10 +452,10 @@ public class ExcelClass {
             excel.add(new ExcelBean("被试ID", "cardNo", 0));
             excel.add(new ExcelBean("姓名", "userName", 0));
             excel.add(new ExcelBean("年龄", "age", 0));
-            excel.add(new ExcelBean("单位名称旅", "org", 0));
+           /* excel.add(new ExcelBean("单位名称旅", "org", 0));
             excel.add(new ExcelBean("单位名称大队", "orgSub", 0));
             excel.add(new ExcelBean("飞行等级", "FXLevel", 0));
-            excel.add(new ExcelBean("现飞机型", "currentJX", 0));
+            excel.add(new ExcelBean("现飞机型", "currentJX", 0));*/
             excel.add(new ExcelBean("当前试次起始时间", "onceStartTime", 0));
             excel.add(new ExcelBean("试次难度等级", "level", 0));
             excel.add(new ExcelBean("本试次反应时(ms)", "reactionTime", 0));
@@ -472,8 +472,19 @@ public class ExcelClass {
             excel.add(new ExcelBean("词汇类型，0-具体，1-抽象", "type", 0));
             excel.add(new ExcelBean("词汇关系，0-相关，1-不相关", "relation", 0));
             excel.add(new ExcelBean("用户输入等级", "rank", 0));
-        } else if (Constant.QUEST_TYPE_PM.equals(flag)) {
-            excel.add(new ExcelBean("试次序号", "index", 0));
+        } /*else if (Constant.QUEST_TYPE_PM.equals(flag)) {
+            excel.add(new ExcelBean("开始时间", "startTime", 0));
+            excel.add(new ExcelBean("结束时间", "endTime", 0));
+            excel.add(new ExcelBean("左边图片选择", "missile", 0));
+            excel.add(new ExcelBean("右边图片选择", "compass", 0));
+            excel.add(new ExcelBean("任务类型", "taskType", 0));
+            excel.add(new ExcelBean("主任务方向选择反应时间", "mainTaskDirectionReactionTime", 0));
+            excel.add(new ExcelBean("主任务方向选择是否正确", "mainTaskDirectionCorrection", 0));
+            excel.add(new ExcelBean("主任务挂载反应时间", "mainTaskMissileReactionTime", 0));
+            excel.add(new ExcelBean("主任务挂载选择是否正确", "mainTaskMissileCorrection", 0));
+            excel.add(new ExcelBean("前瞻性记忆任务反应时间", "prospectiveTaskReactionTime", 0));
+            excel.add(new ExcelBean("前瞻性记忆任务反应是否正确", "prospectiveTaskCorrection", 0));
+           *//* excel.add(new ExcelBean("试次序号", "index", 0));
             excel.add(new ExcelBean("被试ID", "cardNo", 0));
             excel.add(new ExcelBean("姓名", "userName", 0));
             excel.add(new ExcelBean("年龄", "age", 0));
@@ -499,8 +510,8 @@ public class ExcelClass {
             excel.add(new ExcelBean("主任务挂载反应时间(ms)", "mainTaskMissileReactionTime", 0));
             excel.add(new ExcelBean("主任务挂载正确反应", "mainTaskMissileCorrectionResponse", 0));
             excel.add(new ExcelBean("主任务挂载实际反应", "mainTaskMissileActualResponse", 0));
-            excel.add(new ExcelBean("主任综合是否正确", "mainTaskComCorrection", 0));
-        }
+            excel.add(new ExcelBean("主任综合是否正确", "mainTaskComCorrection", 0));*//*
+        }*/
         map.put(0, excel);
         return map;
     }
@@ -519,10 +530,10 @@ public class ExcelClass {
         excel.add(new ExcelBean("被试ID", "cardNo", 0));
         excel.add(new ExcelBean("姓名", "userName", 0));
         excel.add(new ExcelBean("年龄", "age", 0));
-        excel.add(new ExcelBean("单位名称旅", "org", 0));
+        /*excel.add(new ExcelBean("单位名称旅", "org", 0));
         excel.add(new ExcelBean("单位名称大队", "orgSub", 0));
         excel.add(new ExcelBean("飞行等级", "FXLevel", 0));
-        excel.add(new ExcelBean("现飞机型", "currentJX", 0));
+        excel.add(new ExcelBean("现飞机型", "currentJX", 0));*/
 
         excel.add(new ExcelBean("题号", "questionNo", 0));
         excel.add(new ExcelBean("题目", "answer", 0));

src/main/java/com/rf/psychological/rest/ServerController.java

@@ -1693,7 +1693,7 @@ public class ServerController extends BaseController {
         try {
             for (int i = 0; i < datas.size(); i++) {
                 List<Object> users = datas.get(i);
-                if (users.isEmpty() || users.size() < 16) {
+                if (users.isEmpty() || users.size() < 3) {
                     result.append("第" + (i + 3) + "条数据信息不完整").append("\r\n");
                     isExist = true;
                     continue;
@@ -1713,7 +1713,12 @@ public class ServerController extends BaseController {
                     isExist = true;
                     continue;
                 }*/
-
+                String petName = users.get(0).toString();
+                if (petName.length() > 18 || petName.contains(" ")) {
+                    result.append("第" + (i + 3) + "条数据姓名长度大于18位或有空格").append("\r\n");
+                    isExist = true;
+                    continue;
+                }
                 String phone = users.get(1).toString();
                 if (phone.length() > 18 || phone.length() < 3 || phone.contains(" ")) {
                     result.append("第" + (i + 3) + "条数据账号长度未在3~18位之间或有空格").append("\r\n");
@@ -1726,18 +1731,13 @@ public class ServerController extends BaseController {
                     isExist = true;
                     continue;
                 }
-                String petName = users.get(3).toString();
-                if (petName.length() > 18 || petName.contains(" ")) {
-                    result.append("第" + (i + 3) + "条数据姓名长度大于18位或有空格").append("\r\n");
-                    isExist = true;
-                    continue;
-                }
-                String gender = users.get(4).toString();
-/*                if (!"男".equals(gender) || !"女".equals(gender)) {
+
+                /*String gender = users.get(4).toString();
+*//*                if (!"男".equals(gender) || !"女".equals(gender)) {
                     result.append("第" + (i + 3) + "条数据性别长度应为1位或文本不正确").append("\r\n");
                     isExist = true;
                     continue;
-                }*/
+                }*//*
                 String age = users.get(5).toString();
                 try {
                     Integer.parseInt(age);
@@ -1747,7 +1747,7 @@ public class ServerController extends BaseController {
                 if (isExist) {
                     result.append("第" + (i + 3) + "条年龄应为数字").append("\r\n");
                     continue;
-                }
+                }*/
 
                 //插入数据库的信息
                 UserEntity tempUserDB = new UserEntity();
@@ -1787,15 +1787,15 @@ public class ServerController extends BaseController {
                 tempUserDB.setPetName(petName);
                 tempUserDB.setPhone(phone);
                 tempUserDB.setPassword(DigestUtils.md5DigestAsHex(password.getBytes(StandardCharsets.UTF_8)));
-                tempUserDB.setGender("男".equals(gender) ? Constant.DEFAULT_VALUE_ZERO : Constant.DEFAULT_VALUE_ONE);
+                tempUserDB.setGender(Constant.DEFAULT_VALUE_ZERO);
                 tempUserDB.setBirthday("2001-01-01");
                 tempUserDB.setInstitutionNo(institutionNo);
                 tempUserDB.setUserStatus(UserStatus.PERFECT.getType());
                 tempUserDB.setGId(defaultGroupId);
                 tempUserDB.setModelPhone(Constant.DEFAULT_VALUE_ZERO);
                 tempUserDB.setRoleType(UserRole.COMMON.getType());
-                tempUserDB.setMilitary(users.get(8).toString());
-                tempUserDB.setProfession(users.get(9).toString());
+                /*tempUserDB.setMilitary(users.get(8).toString());
+                tempUserDB.setProfession(users.get(9).toString());*/
                 //查看当前用户是否已经在数据库存在
                 UserEntity phoneAndInstitutionNo = userService.findPhoneAndInstitutionNoAndRoleType(tempUserDB.getPhone(), institutionNo, Constant.DEFAULT_VALUE_ONE);
                 if (phoneAndInstitutionNo != null) {
@@ -1812,7 +1812,7 @@ public class ServerController extends BaseController {
                     userAttributeEntity.setUpdateTime(cn.hutool.core.date.DateUtil.now());
                     this.userAttributeService.save(userAttributeEntity);
                 }*/
-                String brigade = users.get(6).toString();
+                /*String brigade = users.get(6).toString();
                 String detachment = users.get(7).toString();
                 String fightRegistration = users.get(10).toString();
                 String flightDuration = users.get(11).toString();
@@ -1827,7 +1827,7 @@ public class ServerController extends BaseController {
                 if (StringUtils.isNotEmpty(currentFlyingModels)) {
                     String[] currentFlyingModelss = currentFlyingModels.split("、");
                     currentFlyingModels = JSONArray.toJSONString(currentFlyingModelss);
-                }
+                }*/
 
                 /*UserAttributeEntity userAttributeEntity = new UserAttributeEntity();
                 userAttributeEntity.setUserId(tempUserDB.getId());

src/main/java/com/rf/psychological/scale/resultBusiness/cognitiveResult/GONOGO2Cognize.java

@@ -197,10 +197,10 @@ public class GONOGO2Cognize extends BaseScale {
         resultDBJson.put("Nogo刺激平均正确率", String.format("%.4f", nogoRightRate));
         resultMapList = new ArrayList<>();
         resultMapList.add(resultMap);
-        fileName = fileName + "-" + Constant.SHEET_NAME_GO_NO_GO + ".xlsx";
-        name = Constant.SHEET_NAME_GO_NO_GO;
+        fileName = fileName + "-" + Constant.SHEET_NAME_GO_NO_GO2 + ".xlsx";
+        name = Constant.SHEET_NAME_GO_NO_GO2;
         String datas = dataList.toString();
-        ExcelUtil.createExcelFile(GONOGO2Entity.class, dataList, resultMapList, new ExcelClass().contentExcel(Constant.QUEST_TYPE_GO_NO_GO2), fileName, Constant.SHEET_NAME_GO_NO_GO);
+        ExcelUtil.createExcelFile(GONOGO2Entity.class, dataList, resultMapList, new ExcelClass().contentExcel(Constant.QUEST_TYPE_GO_NO_GO2), fileName, Constant.SHEET_NAME_GO_NO_GO2);
 
         JSONObject returnJson = new JSONObject(true);
         returnJson.put("fileName", fileName);

src/main/java/com/rf/psychological/scale/resultBusiness/cognitiveResult/PMCognize.java

@@ -34,6 +34,36 @@ public class PMCognize extends BaseScale {
 
     public JSONObject scaleCalculate() throws Exception {
         List<Map<String, String>> resultMapList = new ArrayList<>();
+        JSONObject jsonObject = resultJson.getJSONObject("jsonObject");
+        String fileName = resultJson.getString("fileName");
+        String name;
+
+        JSONObject resultDBJson = new JSONObject(true);
+
+        /*JSONArray jsonArray = jsonObject.getJSONArray("userResponseRecords");
+        List<SOEntity> SOEntityList = jsonArray.toJavaList(SOEntity.class);*/
+
+        Map<String, String> resultMap = new LinkedHashMap<>();
+        resultMap.put("得分", jsonObject.getString("score"));
+        resultDBJson.put("得分", jsonObject.getString("score"));
+        resultMapList.add(resultMap);
+
+        fileName = fileName + "-" + Constant.SHEET_NAME_PM + ".xlsx";
+        name = Constant.SHEET_NAME_PM;
+        //String datas = jsonArray.toString();
+        ExcelUtil.createExcelFile(null, null, resultMapList, new ExcelClass().contentExcel(Constant.QUEST_TYPE_PM), fileName, name);
+
+        JSONObject returnJson = new JSONObject(true);
+        returnJson.put("fileName", fileName);
+        returnJson.put("name", name);
+        returnJson.put("resultJson", resultDBJson);
+        returnJson.put("datas", "");
+
+        return returnJson;
+    }
+
+/*    public JSONObject scaleCalculate() throws Exception {
+        List<Map<String, String>> resultMapList = new ArrayList<>();
 
         JSONObject jsonObject = resultJson.getJSONObject("jsonObject");
         String fileName = resultJson.getString("fileName");
@@ -154,12 +184,12 @@ public class PMCognize extends BaseScale {
 
 
         //表格数据
-/*        String prospectiveTaskScore = jsonObject.get("prospectiveTaskScore") + "";
+*//*        String prospectiveTaskScore = jsonObject.get("prospectiveTaskScore") + "";
         String prospectiveTaskAccuracy = jsonObject.get("prospectiveTaskAccuracy") + "";
         String mainTaskDirectionScore = jsonObject.get("mainTaskDirectionScore") + "";
         String mainTaskDirectionAccuracy = jsonObject.get("mainTaskDirectionAccuracy") + "";
         String mainTaskMissileScore = jsonObject.get("mainTaskMissileScore") + "";
-        String mainTaskMissileAccuracy = jsonObject.get("mainTaskMissileAccuracy") + "";*/
+        String mainTaskMissileAccuracy = jsonObject.get("mainTaskMissileAccuracy") + "";*//*
 
 
         if (mainCount != 0) {
@@ -267,5 +297,5 @@ public class PMCognize extends BaseScale {
         returnJson.put("resultJson", resultDBJson);
         returnJson.put("datas", datas);
         return returnJson;
-    }
+    }*/
 }

src/main/java/com/rf/psychological/user/dao/repository/UserRepository.java

@@ -58,11 +58,10 @@ public interface UserRepository extends BaseRepository<UserEntity, String> {
     @Query(value = "select tui.id,gender,password,pet_name,phone,birthday,profession,addition_info,institution_name,tui.age,tui.card_no,military" +
             ",tui.institution_no,user_status,tgi.group_name as g_id,model_phone,role_type " +
             "from t_user_info tui join t_group_info tgi ON tgi.id = tui.g_id " +
-            "JOIN (select user_id,min(create_time) create_time from t_user_attribute GROUP BY user_id) tua on tua.user_id=tui.id " +
             "where tui.institution_no = :institutionNo   and role_type ='1' and  " +
             " if(:searchKey is not null and :searchKey!='',(pet_name like %:searchKey% or phone like %:searchKey% ) , 1=1) " +
             "and if(:status is not null and :status!='',(tui.user_status = :status) , 1=1) " +
-            "and if(:groupId is not null and :groupId!='',(tui.g_id = :groupId) , 1=1) ORDER BY tua.create_time desc limit :pageNum ,:pageSize ", nativeQuery = true)
+            "and if(:groupId is not null and :groupId!='',(tui.g_id = :groupId) , 1=1)   limit :pageNum ,:pageSize ", nativeQuery = true)
     List<UserEntity> getUserListByInstitutionNo(@Param("pageNum") int pageNum, @Param("pageSize") int pageSize, @Param("searchKey") String searchKey
             , @Param("institutionNo") String institutionNo, @Param("status") String status, @Param("groupId") String groupId);
 

src/main/java/com/rf/psychological/user/rest/SystemController.java

@@ -168,14 +168,14 @@ public class SystemController extends BaseController {
                 temp.mkdirs();
             }
             filePath = sourceFile.getCanonicalPath() + "/DataBackup/data_" + new SimpleDateFormat("yyyyMMddHHmmss").format(new Date()) + ".txt";
-            command = dumpFilePath + "mysqldump -u root -pMysql@.2020 -h 127.0.0.1 -P 54044 " + dataBaseName + " > " + filePath;
+            command = dumpFilePath + "mysqldump -u root -pMysql@.2020 -h 127.0.0.1 -P 54051 " + dataBaseName + " > " + filePath;
             log.info("数据库备份====="+command);
             //command = "mysqldump -u root -pAa123456 " + dataBaseName + " > " + filePath;
             processBuilder.command("cmd.exe", "/c", command);
             Process process = processBuilder.start();
             return success("文件已备份至：" + filePath);
         } else {
-            command = dumpFilePath + "mysql -u root -pMysql@.2020 -h 127.0.0.1 -P 54044 " + dataBaseName + " < " + filePath;
+            command = dumpFilePath + "mysql -u root -pMysql@.2020 -h 127.0.0.1 -P 54051 " + dataBaseName + " < " + filePath;
             log.info("数据库恢复====="+command);
             //command = "mysql -u root -pAa123456 " + dataBaseName + " < " + filePath;
             processBuilder.command("cmd.exe", "/c", command);

src/main/java/com/rf/psychological/utils/ExcelUtil.java

@@ -1083,7 +1083,7 @@ public class ExcelUtil {
             int sheetSize = 0;
             //遍历当前sheet中的所有行
             //包涵头部，所以要小于等于最后一列数,这里也可以在初始值加上头部行数，以便跳过头部
-            for (int j = 2; j <= sheet.getLastRowNum(); j++) {
+            for (int j = 1; j <= sheet.getLastRowNum(); j++) {
                 //读取一行
                 row = sheet.getRow(j);
                 //去掉空行和表头