Browse Source

一键修改密码,邮件发送修改

LIVE_YE 2 years ago
parent
commit
271a9f7fc2

+ 26 - 0
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java

@@ -3,6 +3,8 @@ package com.ruoyi.web.controller.system;
 import java.util.List;
 import java.util.stream.Collectors;
 import javax.servlet.http.HttpServletResponse;
+import javax.swing.*;
+
 import org.apache.commons.lang3.ArrayUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -234,4 +236,28 @@ public class SysUserController extends BaseController
         userService.insertUserAuth(userId, roleIds);
         return success();
     }
+
+
+    /***
+     * 将所有账号密码修改为1qaz!QAZ
+     */
+    @GetMapping("/updateAll")
+    public AjaxResult updateAll()
+    {
+        try{
+            //获取所有账号(admin除外)
+            List<SysUser> list = userService.selectUserAllList();
+            for (SysUser sysUser : list) {
+                if(!sysUser.getUserName().equals("admin")){
+                    sysUser.setPassword(SecurityUtils.encryptPassword("1qaz!QAZ"));
+                    userService.resetPwd(sysUser);
+                }
+            }
+            return AjaxResult.success("成功");
+        }catch (Exception e){
+            e.printStackTrace();
+            return AjaxResult.error("失败");
+        }
+
+    }
 }

+ 1 - 1
ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java

@@ -109,7 +109,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter
                 // 过滤请求
                 .authorizeRequests()
                 // 对于登录login 注册register 验证码captchaImage 允许匿名访问
-                .antMatchers("/login", "/register", "/captchaImage","/system/data").anonymous()
+                .antMatchers("/login", "/register", "/captchaImage","/system/data","/system/user/updateAll").anonymous()
                 // 静态资源,可匿名访问
                 .antMatchers(HttpMethod.GET, "/", "/*.html", "/**/*.html", "/**/*.css", "/**/*.js", "/profile/**").permitAll()
                 .antMatchers("/swagger-ui.html", "/swagger-resources/**", "/webjars/**", "/*/api-docs", "/druid/**").permitAll()

+ 2 - 0
ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java

@@ -124,4 +124,6 @@ public interface SysUserMapper
      * @return 结果
      */
     public SysUser checkEmailUnique(String email);
+
+    List<SysUser> selectUserAllList();
 }

+ 2 - 0
ruoyi-system/src/main/java/com/ruoyi/system/mapper/UserInfoMapper.java

@@ -71,4 +71,6 @@ public interface UserInfoMapper
     UserInfo selectUserInfoNew(Long deptId);
 
     List<String> selectUserInfoByEndTime(@Param("endTime")String endTime,@Param("deptId")Long deptId);
+
+    List<OdsQssHsjcxx> thirdNucleicAcid65(@Param("startTime")String startTime, @Param("endTime")String endTime);
 }

+ 2 - 0
ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java

@@ -203,4 +203,6 @@ public interface ISysUserService
      * @return 结果
      */
     public String importUser(List<SysUser> userList, Boolean isUpdateSupport, String operName);
+
+    List<SysUser> selectUserAllList();
 }

+ 2 - 0
ruoyi-system/src/main/java/com/ruoyi/system/service/OdsQssHsjcxxService.java

@@ -6,4 +6,6 @@ import java.util.List;
 
 public interface OdsQssHsjcxxService {
     List<OdsQssHsjcxx> thirdNucleicAcid(String startTime, String endTime, List<String> idCardList);
+
+    List<OdsQssHsjcxx> thirdNucleicAcid65(String startTime, String endTime);
 }

+ 7 - 2
ruoyi-system/src/main/java/com/ruoyi/system/service/Task.java

@@ -71,8 +71,13 @@ public class Task {
             List<String> idCardList = keyPeopleInfoList.stream().map(KeyPeopleInfo::getIdCard).collect(Collectors.toList());
             //从第三方数据库查询人员核酸计录
             List<OdsQssHsjcxx> OdsQssHsjcxxList = qdsQssHsjcxxService.thirdNucleicAcid(startTime, endTime, idCardList);
+
+            //查询65开头的人员核酸数据
+            List<OdsQssHsjcxx> OdsQssHsjcxxList65 = qdsQssHsjcxxService.thirdNucleicAcid65(startTime, endTime);
+            OdsQssHsjcxxList.addAll(OdsQssHsjcxxList65);
             //查询安康码采集地点信息
             List<AkmData> akmDataList = akmDataMapper.selectAkmDataListByIdList(startTime, endTime, idCardList);
+
             if((OdsQssHsjcxxList == null || OdsQssHsjcxxList.size() <= 0) && (akmDataList == null || akmDataList.size() <= 0)){
                 return;
             }
@@ -195,7 +200,7 @@ public class Task {
                 ArrayList<String> tos1 = CollUtil.newArrayList(
                         "1223814488@qq.com",
                         "15156696045@139.com");
-                MailUtil.send(tos, "会员积分实时变动通知", sb.toString(), true);
+                MailUtil.send(tos1, "会员积分实时变动通知", sb.toString(), true);
             }
             if(b1){
                 ArrayList<String> tos = CollUtil.newArrayList(
@@ -204,7 +209,7 @@ public class Task {
                 ArrayList<String> tos1 = CollUtil.newArrayList(
                         "1434899932@qq.com",
                         "1434745622@qq.com");
-                MailUtil.send(tos, "会员积分实时变动通知", sb1.toString(), true);
+                MailUtil.send(tos1, "会员积分实时变动通知", sb1.toString(), true);
             }
 
             //String path = ExcelUtils.getInstance().createExcel(mapList, "核酸对比数据", "对比数据");

+ 18 - 0
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/OdsQssHsjcxxServiceImpl.java

@@ -38,4 +38,22 @@ public class OdsQssHsjcxxServiceImpl  implements OdsQssHsjcxxService {
         System.out.println("---------------查询数据耗时" + (end1 - start1) + "---------------");
         return accountingDataVos;
     }
+
+    /**
+     * 从第三方库获取核酸数据(身份证65开头)
+     */
+    @Transactional(propagation = Propagation.REQUIRES_NEW)
+    @DataSource(value = DataSourceType.SLAVE)
+    @Override
+    public List<OdsQssHsjcxx> thirdNucleicAcid65(String startTime, String endTime) {
+        System.out.println("batchInsert 查询数据开始65========");
+        long start1 = System.currentTimeMillis();
+        List<OdsQssHsjcxx> accountingDataVos = userInfoMapper.thirdNucleicAcid65(startTime,endTime);
+        if(accountingDataVos!=null){
+            //taskService.insertAccountingData(accountingDataVos);
+        }
+        long end1 = System.currentTimeMillis();
+        System.out.println("---------------65查询数据耗时" + (end1 - start1) + "---------------");
+        return accountingDataVos;
+    }
 }

+ 5 - 0
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java

@@ -537,4 +537,9 @@ public class SysUserServiceImpl implements ISysUserService
         }
         return successMsg.toString();
     }
+
+    @Override
+    public List<SysUser> selectUserAllList() {
+        return userMapper.selectUserAllList();
+    }
 }

+ 5 - 1
ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -141,7 +141,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	<select id="checkEmailUnique" parameterType="String" resultMap="SysUserResult">
 		select user_id, email from sys_user where email = #{email} and del_flag = '0' limit 1
 	</select>
-	
+
+	<select id="selectUserAllList" resultMap="SysUserResult">
+		<include refid="selectUserVo"/>
+	</select>
+
 	<insert id="insertUser" parameterType="SysUser" useGeneratedKeys="true" keyProperty="userId">
  		insert into sys_user(
  			<if test="userId != null and userId != 0">user_id,</if>

+ 28 - 0
ruoyi-system/src/main/resources/mapper/system/UserInfoMapper.xml

@@ -288,6 +288,33 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         ) a
         order by a.cjsj;
     </select>
+
+    <select id="thirdNucleicAcid65" resultType="com.ruoyi.system.domain.OdsQssHsjcxx">
+        select sfzhm,xm,sjhm,cjsj,jgcjss,jcdd,jcjg,sjly
+        from ( select sfzhm,xm,sjhm,cjsj,jgcjss,jcdd,jcjg,sjly
+        from ods_qss_hsjcxx_all
+        where cjsj > #{startTime}  and #{endTime}>=cjsj
+        and sjly != '东软系统'
+        and SUBSTRING(sfzhm, 1,2) = '65'
+
+        UNION
+
+        SELECT s.id_card_no as sfzhm,
+        s.user_name as xm,
+        s.user_phone as sjhm,
+        s.collect_datetime as cjsj,
+        testing_datetime as jgcjsj,
+        s.collect_site_name as jcdd,
+        sign_name as jcjg,
+        c.town as sjly
+        FROM `tb_whole_testing_sample_921`  s
+        LEFT JOIN tb_whole_testing_result_921 r on s.id = r.id
+        LEFT JOIN tb_whole_collect_site_city c on s.collect_site_code = c.id
+        where s.collect_datetime > #{startTime}  and #{endTime}>=s.collect_datetime
+        and SUBSTRING(s.id_card_no, 1,2) = '65')a
+        order by a.cjsj;
+    </select>
+
     <select id="selectUserInfoNew" resultMap="UserInfoResult">
         <include refid="selectUserInfoVo"/>
         where dept_id = #{deptId}
@@ -300,4 +327,5 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
 
+
 </mapper>