Merge branch 'master' of https://git.czcyedu.com/huoran/msdw_tms

src/main/java/com/msdw/tms/config/EmailUtils.java

@@ -30,6 +30,8 @@ public class EmailUtils {
         try {
             HtmlEmail email = new HtmlEmail();
             email.setHostName(SERVER_ADDRESS);
+            email.setSSLOnConnect(true);   //使用ssl加密true
+            email.setSslSmtpPort("465");   //使用465端口
             email.setCharset("UTF-8");
             email.addTo(emailaddress);
 

src/main/java/com/msdw/tms/controller/UserInfoController.java

@@ -182,6 +182,12 @@ public class UserInfoController implements UserInfoControllerApi {
         UserInfoEntity userInfo = vo.getUserInfoEntity();
         Integer userId = userInfo.getUserId();
         String password = userInfo.getPassword();
+
+        //验证账号是否存在
+        int num = userInfoService.queryAccountExist(userInfo.getAccount());
+        if (num >= 1){
+            return R.error(500,"更新失败，账号不能重复");
+        }
         String userPassword = userInfoService.queryPasword(userId);
         if (userPassword.equals(password)==true){
             return R.error(400,"false,the password is the same!!!");

src/main/java/com/msdw/tms/dao/UserInfoDao.java

@@ -66,4 +66,6 @@ public interface UserInfoDao extends BaseMapper<UserInfoEntity> {
     List<String> queryStudentName(Integer userId);
 
     Integer getUserId(String token);
+
+    Integer queryAccountExist(String account);
 }

src/main/java/com/msdw/tms/entity/vo/ProjectRecordVo.java

@@ -98,7 +98,10 @@ public class ProjectRecordVo extends ProjectRecordEntity implements Serializable
      * 实验班级名
      */
     private String experimentalClassName;
-
+    /**
+     * 实验名称
+     */
+    private String experimentalName;
     /**
      * 封装多个项目id
      */

src/main/java/com/msdw/tms/service/UserInfoService.java

@@ -50,4 +50,5 @@ public interface UserInfoService extends IService<UserInfoEntity> {
 
     R getUserId(String token);
 
+    Integer queryAccountExist(String account);
 }

src/main/java/com/msdw/tms/service/impl/ProjectRecordServiceImpl.java

@@ -178,13 +178,13 @@ public class ProjectRecordServiceImpl extends ServiceImpl<ProjectRecordDao, Proj
         //2.加载模板流数据
 //        org.springframework.core.io.Resource resource = new ClassPathResource("excel-template/虚拟仿真实验报告导出模板.xlsx");
 //        FileInputStream fis = new FileInputStream(resource.getFile());
-        ClassPathResource resource = new ClassPathResource("excel-template/虚拟仿真实验报告导出模板.xlsx");
+        ClassPathResource resource = new ClassPathResource("excel-template/练习记录模板.xlsx");
         InputStream inputStream = resource.getInputStream();
 
 
         //3、通过工具类下载文件
         new ExcelExportUtil(ProjectRecordImportRequest.class, Constant.ROW_INDEX, Constant.STYLE_INDEX).
-                export(response, inputStream, importRequests, "虚拟仿真实验报告.xlsx");
+                export(response, inputStream, importRequests, "练习记录.xlsx");
 //        new ExcelExportUtil(ProjectRecordImportRequest.class, Constant.ROW_INDEX, Constant.STYLE_INDEX).
 //                export(response, fis, importRequests, "实验报告导出.xlsx");
     }
@@ -206,13 +206,13 @@ public class ProjectRecordServiceImpl extends ServiceImpl<ProjectRecordDao, Proj
         }).collect(Collectors.toList());
 
         //2.加载模板流数据
-        ClassPathResource resource = new ClassPathResource("excel-template/教学实验报告导出模板.xlsx");
+        ClassPathResource resource = new ClassPathResource("excel-template/考核记录模板.xlsx");
         InputStream inputStream = resource.getInputStream();
 
 
         //3、通过工具类下载文件
         new ExcelExportUtil(ExperimentProjectRecordImportRequest.class, Constant.ROW_INDEX, Constant.STYLE_INDEX).
-                export(response, inputStream, importRequests, "教学实验报告.xlsx");
+                export(response, inputStream, importRequests, "考核记录.xlsx");
     }
 
     @Override

src/main/java/com/msdw/tms/service/impl/UserInfoServiceImpl.java

@@ -227,4 +227,9 @@ public class UserInfoServiceImpl extends ServiceImpl<UserInfoDao, UserInfoEntity
         Integer userId = userInfoDao.getUserId(token);
         return R.ok().put("userId", userId);
     }
+
+    @Override
+    public Integer queryAccountExist(String account) {
+        return userInfoDao.queryAccountExist(account);
+    }
 }

src/main/resources/mapper/tms/ProjectRecordDao.xml

@@ -80,6 +80,7 @@
         endTime,
         recordState,
         tet.experimental_class_name as experimentalClassName,
+        tet.experimental_name as experimentalName,
         systemId
         FROM tms_project_record tpr
         LEFT JOIN hr_project_management tp ON tpr.projectId = tp.projectId

src/main/resources/mapper/tms/UserInfoDao.xml

@@ -291,4 +291,8 @@
         SELECT userId FROM hr_user_info where token = #{token} and isdel = 0
     </select>
 
+    <select id="queryAccountExist" resultType="java.lang.Integer">
+        SELECT count(*) FROM hr_user_info where account = #{account}  and isdel = 0
+    </select>
+
 </mapper>