修改密码无法使用

power-admin/src/main/java/com/manage/controller/UserController.java

@@ -30,6 +30,7 @@ import org.springframework.web.multipart.commons.CommonsMultipartResolver;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
 import java.nio.charset.Charset;
 import java.text.SimpleDateFormat;
 import java.util.Date;
@@ -160,17 +161,23 @@ public class UserController {
         }
     }
 
-    @OptionalLog(module = "重置密码",methods = "用户管理",fieldName = "userName",tableName = "power_user")
-    @RequiresPermissions(value="/user/resetPassword")
     @RequestMapping("/resetPassword")
     @ResponseBody
-    public Msg update(Integer userId) throws Exception{
+    public Msg update(String ids) throws Exception{
         ServletRequestAttributes attr=(ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
         HttpServletRequest request =attr.getRequest();
-        Power_UserVo powerUser = powerUserService.selectByPrimaryKey(userId);
+//        Power_UserVo powerUser = powerUserService.selectByPrimaryKey(userId);
-        powerUser.setUserPwd(Base64.encode(MD5.KL("000000")));
+//        powerUser.setUserPwd(Base64.encode(MD5.KL("000000")));
-        powerUserService.updateByPrimaryKeySelective(powerUser,request);
+//        powerUserService.updateByPrimaryKeySelective(powerUser,request);
-        CacheManager.addExcCount("noExc");
+//        CacheManager.addExcCount("noExc");
+        //取得当前登录账号
+        HttpSession session= request.getSession();
+        Power_User powerUser1 =(Power_User) session.getAttribute("CURRENT_USER");
+        SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd");//设置日期格式
+        String date = df.format(new Date());// new Date()为获取当前系统时间
+        String userName = powerUser1.getUserName();
+        String encode = Base64.encode(MD5.KL("000000"));
+        powerUserService.updateUserPass(ids,userName,encode,date);
         return Msg.success();
     }
     @RequestMapping("/selectUser")

power-admin/src/main/resources/config/config.properties

@@ -1,7 +1,7 @@
 # \u62E6\u622A\u83DC\u5355\u914D\u7F6E\u6587\u4EF6  ljx  2019-4-27
 #interceptRequest  \u672A\u767B\u5F55\u4E4B\u524D\u653E\u884C\u3002\u9ED8\u8BA4\u4E3Anone
 #ajaxRequest       ajax\u8BF7\u6C42\u6CA1\u6709\u5BF9\u5E94\u6A21\u5757\uFF0C\u9700\u8981\u653E\u884C\u3002 \u9ED8\u8BA4\u4E3Anone
-releaseRequest = /login,/logout,/services,/font,/refuse,/swagger-ui.html,/webjars,/swagger-resources,/v2
+releaseRequest = /login,/logout,/services,/font,/refuse,/swagger-ui.html,/webjars,/swagger-resources,/v2,/collector
 ajaxRequest = none
 
 #session\u8FC7\u671F\u65F6\u95F4,\u5355\u4F4D\u79D2

power-admin/src/main/resources/config/jdbc.properties

@@ -1,8 +1,8 @@
 #jdbc.url=jdbc\:mysql\://200.100.104.40\:3306/power?useUnicode\=true&characterEncoding\=utf-8
 #jdbc.password=AbcXyz123
 
-jdbc.url=jdbc\:mysql\://localhost\:3306/gmpower?useUnicode\=true&characterEncoding\=utf-8
+jdbc.url=jdbc\:mysql\://localhost\:3306/gm_power?useUnicode\=true&characterEncoding\=utf-8
-jdbc.password=docus702
+jdbc.password=root
 
 jdbc.driver=com.mysql.jdbc.Driver
 jdbc.username=root

power-admin/src/main/webapp/WEB-INF/jspf/webSocket.jspf

@@ -71,7 +71,6 @@
     }
 
     function narn (type,title,text,noticeId) {
-        debugger
         naranja()[type]({
             title: title,
             text: text,

power-admin/src/main/webapp/WEB-INF/views/gatewayDir/gatewayIndex.jsp

@@ -228,7 +228,7 @@
                                     </div>
                                     <div  class="rightTitleDiv">
                                         <div class="rightTitle" style="margin-top: 5px;">
-                                            <span>病案归档系统</span>
+                                            <span>病案无纸化归档系统</span>
                                         </div>
                                     </div>
                                 </div>
@@ -244,7 +244,7 @@
                                     </div>
                                     <div class="rightTitleDiv">
                                         <div class="rightTitle">
-                                            <span>档案管理系统</span>
+                                            <span>病案数码影像信息管理系统</span>
                                         </div>
                                     </div>
                                 </div>

power-admin/src/main/webapp/static/js/user.js

@@ -500,17 +500,17 @@ function resetPassword(){
     var userNames = $("#userNames").val();
     if(checks != ''){
         var ids = checks.split(",");
+        var s1 = ids.toString();
         var userName = userNames.split(",");
-        if(ids.length == 2){
             Common.confirm({
                 title: "提示",
-                message: '确定是否重置用户名'+userName[0]+'的密码为000000',
+                message: '确定是否重置用户名'+userName+'的密码为000000',
                 operate: function (reselt) {
                     if (reselt) {
                         $.ajax({
                             type: 'post',
                             url: path + '/user/resetPassword',
-                            data: {userId: ids[0]},
+                            data: {ids: s1},
                             dataType: 'json',
                             success: function (data) {
                                 if (data.code == 100) {
@@ -526,9 +526,6 @@ function resetPassword(){
                     }
                 }
             })
-        }else{
-            toastr.warning("以防重置密码误选择,只允许一次重置一个!")
-        }
     }else{
         toastr.warning("请至少选中一条记录!")
     }

power-dao/src/main/java/com/manage/dao/Power_UserMapper.java

@@ -48,6 +48,8 @@ public interface Power_UserMapper {
 
     List<User> selectUserIdAndUserNameList(@Param("userId") Integer userId);
 
+    int updateUserPass(@Param("ids") String ids,@Param("userName") String userName,@Param("encode") String encode,@Param("date") String date);
+
     Integer selectEffectiveCount();
 
     List<Power_UserVo> selectAllNotAdmin();
@@ -67,5 +69,7 @@ public interface Power_UserMapper {
 
     Power_UserVo selectByPrimaryKey1(Integer userId);
 
+    Power_UserVo selectByPrimaryUserId(String userId);
+
     void updatePersonal(Power_User user);
 }

power-dao/src/main/java/com/manage/vo/Power_UserVo.java

@@ -48,6 +48,16 @@ public class Power_UserVo extends Power_User {
 
     private String deptCode;
 
+    public String getIds() {
+        return ids;
+    }
+
+    public void setIds(String ids) {
+        this.ids = ids;
+    }
+
+    private String ids;
+
     public String getDeptCode() {
         return deptCode;
     }

power-dao/src/main/resources/mapper/Power_UserMapper.xml

@@ -737,5 +737,18 @@
       user_wechat = #{userWechat,jdbcType=VARCHAR}
     where user_id = #{userId,jdbcType=INTEGER}
   </update>
+    <update id="updateUserPass">
+        update  power_user
+        set
+        user_pwd=#{encode},
+        update_date=#{date},
+        updater=#{userName}
+        where
+        user_id IN
+        <foreach item="item" collection="ids.split(',')" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+
+    </update>
 
 </mapper>

power-service/src/main/java/com/manage/service/Power_UserService.java

@@ -26,6 +26,8 @@ public interface Power_UserService {
 
     int updateByPrimaryKey(Power_User record);
 
+    int updateUserPass(String ids,String userName,String encode,String date);
+
     /**
      * @Date 2019-07-31
      * @Author zengwenhe

power-service/src/main/java/com/manage/service/ipml/Power_UserServiceImpl.java

@@ -116,6 +116,11 @@ public class Power_UserServiceImpl implements Power_UserService {
         return powerUserMapper.updateByPrimaryKey(record);
     }
 
+    @Override
+    public int updateUserPass(String ids, String userName, String encode, String date) {
+        return powerUserMapper.updateUserPass(ids,userName,encode,date);
+    }
+
     @Override
     public Power_UserVo findPowerUserByUserNameAndUserPwd(Power_User powerUser) {
         if(powerUser.getUserPwd() != null && powerUser.getUserName() != null){