Browse Source

邮件发送

LIVE_YE 2 năm trước cách đây
mục cha
commit
b96f6d2bdb

+ 12 - 0
ruoyi-admin/pom.xml

@@ -73,6 +73,18 @@
             <artifactId>ruoyi-generator</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>cn.hutool</groupId>
+            <artifactId>hutool-all</artifactId>
+            <version>5.8.7</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.sun.mail</groupId>
+            <artifactId>javax.mail</artifactId>
+            <version>1.6.2</version>
+        </dependency>
+
     </dependencies>
 
     <build>

+ 18 - 0
ruoyi-admin/src/main/java/com/ruoyi/web/controller/info/UserInfoController.java

@@ -5,6 +5,7 @@ import javax.servlet.http.HttpServletResponse;
 
 import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.system.domain.UserInfo;
 import com.ruoyi.system.domain.UserInfoOne;
 import com.ruoyi.system.service.IUserInfoService;
@@ -105,6 +106,23 @@ public class UserInfoController extends BaseController {
         SysUser user = SecurityUtils.getLoginUser().getUser();
         //String operName = getUsername();
         userInfoService.importUser(userList, jobStyle, focusCrowdStyle, detectionNumber, detectionScope, startTime, endTime, user);
+
+        if (userList == null) {
+            AjaxResult.error("表格格式错误,请按照表格模板格式上传人员名单");
+        }
+        StringBuilder sb = new StringBuilder();
+        for (UserInfo userInfo : userList) {
+            if (userInfo == null) {
+                AjaxResult.error("表格格式错误,请按照表格模板格式上传人员名单");
+            }
+            if (userInfo.getIdCard().length() != 18) {
+                sb.append(userInfo.getName()).append(",");
+            }
+        }
+        if (StringUtils.isNotEmpty(sb.toString())) {
+            AjaxResult.error("操作失败,以下人员身份证格式错误【" + sb.toString() + "】");
+        }
+
         return AjaxResult.success("正在处理中,请稍后刷新页面");
     }
 

+ 3 - 1
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/UserInfoServiceImpl.java

@@ -272,11 +272,13 @@ public class UserInfoServiceImpl implements IUserInfoService {
                     }
                     index = odsQssHsjcxxes.size();
                 }
+
+
             }
             if (index < Integer.parseInt(detectionNumber)) {
                 bl = false;
             }
-            userInfo.setPhoneNum(OdsQssHsjcxxList.get(0).getSjhm());
+            userInfo.setPhoneNum(PhoneNum);
             userInfo.setCollectPlace(collectPlace.toString());
             userInfo.setNucleicCollectTime(nucleicCollectTime.toString());
             userInfo.setNucleicResultsTime(nucleicResultsTime.toString());