员工端修改密码，用户登录更新登录时间

wisenergy-model/src/main/java/cn/wisenergy/model/app/User.java

@@ -114,4 +114,10 @@ public class User implements Serializable {
     @ApiModelProperty(name = "vipMobile", value = "vip电话号码")
     private String vipMobile;
 
+    /**
+     * 最新登录时间
+     */
+    @ApiModelProperty(name = "lastLoginTime", value = "最新登录时间")
+    private Date lastLoginTime;
+
 }

wisenergy-model/src/main/java/cn/wisenergy/model/dto/BannerDto.java

@@ -21,9 +21,9 @@ public class BannerDto {
 
 
     /**
-     * 广告类型： 1：顶部广告 2：底部广告 3：App
+     * 广告类型： 1：pc顶部广告 2：pc底部广告 3：App广告
      */
-    @ApiModelProperty(value = "广告类型： 1：顶部广告 2：底部广告 3：App",name = "type")
+    @ApiModelProperty(value = "广告类型： 1：pc顶部广告 2：pc底部广告 3：App广告",name = "type")
     private Integer type;
 
     /**

wisenergy-model/src/main/java/cn/wisenergy/model/dto/StaffDto.java

@@ -24,6 +24,12 @@ public class StaffDto implements Serializable {
     @ApiModelProperty(name = "staffName",value = "员工名字")
     private String staffName;
 
+    /**
+     * 员工登录名
+     */
+    @ApiModelProperty(name = "loginName",value = "员工登录名")
+    private String loginName;
+
     /**
      * 员工电话号码
      */

wisenergy-model/src/main/java/cn/wisenergy/model/vo/QueryVo.java

@@ -30,6 +30,12 @@ public class QueryVo implements Serializable {
     @ApiModelProperty(value= "员工名" ,name="staffName")
     private String staffName;
 
+    /**
+     * 员工登录名
+     */
+    @ApiModelProperty(name = "loginName",value = "员工登录名")
+    private String loginName;
+
     /**
      * 电话号码
      */

wisenergy-model/src/main/java/cn/wisenergy/model/vo/StaffChangPwdVo.java

+package cn.wisenergy.model.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel("staffChangPwdVo")
+public class StaffChangPwdVo {
+    /**
+     * 主键id
+     */
+    @ApiModelProperty(name = "id", value = "员工主键id")
+    private Integer id;
+    /**
+     * 原密码
+     */
+    @ApiModelProperty(name="password",value = "账号密码")
+    private String password;
+
+    /**
+     * 新密码
+     */
+    @ApiModelProperty(name="newPassword",value = "新密码")
+    private String newPassword;
+}

wisenergy-model/src/main/java/cn/wisenergy/model/vo/UserInfoVo.java

@@ -5,6 +5,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * @ Description: 用户信息Vo
@@ -52,4 +53,10 @@ public class UserInfoVo implements Serializable {
      */
     @ApiModelProperty(value = "sessionId", name = "sessionId")
     private String sessionId;
+
+    /**
+     * 最新登录时间
+     */
+    @ApiModelProperty(name = "lastLoginTime", value = "最新登录时间")
+    private Date lastLoginTime;
 }

wisenergy-service/src/main/java/cn/wisenergy/service/app/StaffService.java

@@ -4,6 +4,7 @@ import cn.wisenergy.common.utils.R;
 import cn.wisenergy.model.app.Staff;
 import cn.wisenergy.model.dto.StaffDto;
 import cn.wisenergy.model.vo.QueryVo;
+import cn.wisenergy.model.vo.StaffChangPwdVo;
 import cn.wisenergy.model.vo.StaffVo;
 import com.github.pagehelper.PageInfo;
 
@@ -47,4 +48,11 @@ public interface StaffService {
      * @return
      */
     R<Boolean> resetPassword(Integer staffId);
+
+    /***
+     * 员工端修改密码
+     * @param staffChangPwdVo
+     * @return true/false
+     */
+    R<Boolean> updatePassword(StaffChangPwdVo staffChangPwdVo);
 }

wisenergy-service/src/main/java/cn/wisenergy/service/app/UserLimitService.java

@@ -35,4 +35,11 @@ public interface UserLimitService {
      * @return true  or false
      */
     R<Boolean> minusLimit(Integer userId);
+
+    /**
+     * 减少用户查询次数（方案查询模块）
+     * @param userLimit
+     * @return  true  or false
+     */
+    R<Boolean> minusLimitUser(UserLimit userLimit);
 }

wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/StaffServiceImpl.java

@@ -9,6 +9,7 @@ import cn.wisenergy.model.app.User;
 import cn.wisenergy.model.dto.StaffDto;
 import cn.wisenergy.model.dto.UserInfoDto;
 import cn.wisenergy.model.vo.QueryVo;
+import cn.wisenergy.model.vo.StaffChangPwdVo;
 import cn.wisenergy.model.vo.StaffVo;
 import cn.wisenergy.service.app.StaffService;
 import cn.wisenergy.service.common.Common;
@@ -179,7 +180,7 @@ public class StaffServiceImpl implements StaffService {
         Staff staff = staffMapper.selectById(staffId);
 
         //加密重置密码
-        String password = Md5Util.digestMD5(Common.RESET_PASSWORD_VALUE + staff.getPhone());
+        String password = Md5Util.digestMD5(Common.RESET_PASSWORD_VALUE);
         staff.setPassword(password);
         staff.setId(staffId);
         int count = staffMapper.updateById(staff);
@@ -188,4 +189,30 @@ public class StaffServiceImpl implements StaffService {
         }
         return R.ok(0, true);
     }
+
+    @Override
+    public R<Boolean> updatePassword(StaffChangPwdVo staffChangPwdVo) {
+        log.info("volunteer-service[]UserLoginServiceImpl[]resetPassword[]input.param.staffId:" + staffChangPwdVo);
+        if (null == staffChangPwdVo) {
+            return R.error("入参为空!");
+        }
+        //获取用户信息
+        Staff staff = staffMapper.selectById(staffChangPwdVo.getId());
+        if(null ==staff){
+            return R.error("用户信息不存在!");
+        }
+        String password = Md5Util.digestMD5(staffChangPwdVo.getPassword());
+        if(!password.equals(staff.getPassword())){
+            return R.error("原密码不正确!");
+        }
+        String newPassword = Md5Util.digestMD5(staffChangPwdVo.getNewPassword());
+        Staff staffInfo = new Staff();
+        staffInfo.setId(staff.getId());
+        staffInfo.setPassword(newPassword);
+        int i = staffMapper.updateById(staffInfo);
+        if(i>0){
+            return R.ok("修改成功",true);
+        }
+        return R.error("修改失败！");
+    }
 }

wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/UserLimitServiceImpl.java

@@ -133,6 +133,29 @@ public class UserLimitServiceImpl extends ServiceImpl<UserLimitMapper, UserLimit
         }
     }
 
+    @Override
+    public R<Boolean> minusLimitUser(UserLimit userLimit) {
+        log.info("volunteer-service[]UserLimitServiceImpl[]minusLimit[]input.param.userLimit:" + userLimit);
+        if (null == userLimit) {
+            return R.error("入参不能为空!");
+        }
+
+        //扣减用户可用查询次数
+        int usableLimit = userLimit.getUsableLimit() - 1;
+
+        //增加用户已使次数
+        int useLimit = userLimit.getUseLimit() + 1;
+        userLimit.setUsableLimit(usableLimit);
+        userLimit.setUseLimit(useLimit);
+
+        //更新用户查询信息并保存扣减记录
+        boolean bool = volunteerManager.updateLimitSaveRecord(userLimit);
+        if (bool) {
+            return R.ok(0, true);
+        }
+        return R.ok(1, false);
+    }
+
     @Override
     public R<Boolean> minusLimit(Integer userId) {
         log.info("volunteer-service[]UserLimitServiceImpl[]minusLimit[]input.param.userId:" + userId);

wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/UserLoginServiceImpl.java

@@ -35,6 +35,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.servlet.http.HttpServletRequest;
+import java.util.Date;
 
 /**
  * @author 86187
@@ -169,7 +170,7 @@ public class UserLoginServiceImpl extends ServiceImpl<UsersMapper, User> impleme
             userInfoVo.setPhone(user.getPhone());
             userInfoVo.setSessionId(subject.getSession().getId().toString());
 
-            //3、保存操作记录
+           /* //3、保存操作记录
             LoginRecord loginRecord = new LoginRecord();
             loginRecord.setType(OperationTypeEnum.USER_LOGIN.getCode());
             loginRecord.setUserId(user.getId());
@@ -178,6 +179,13 @@ public class UserLoginServiceImpl extends ServiceImpl<UsersMapper, User> impleme
             int sum = loginRecordMapper.add(loginRecord);
             if (sum == 0) {
                 return R.error("保存操作记录失败!");
+            }*/
+            User userInfo= new User();
+            userInfo.setId(user.getId());
+            userInfo.setLastLoginTime(new Date());
+            int updateLoginTime = baseMapper.updateById(userInfo);
+            if (updateLoginTime == 0) {
+                return R.error("保存登录记录失败!");
             }
             return R.ok(userInfoVo);
         }catch (IncorrectCredentialsException e) {
@@ -216,7 +224,7 @@ public class UserLoginServiceImpl extends ServiceImpl<UsersMapper, User> impleme
             userInfoVo.setUserName(user.getUserName());
             userInfoVo.setPhone(user.getPhone());
             userInfoVo.setSessionId(subject.getSession().getId().toString());
-
+/*
             //3、保存操作记录
             LoginRecord loginRecord = new LoginRecord();
             loginRecord.setType(OperationTypeEnum.USER_LOGIN.getCode());
@@ -226,7 +234,15 @@ public class UserLoginServiceImpl extends ServiceImpl<UsersMapper, User> impleme
             int sum = loginRecordMapper.add(loginRecord);
             if (sum == 0) {
                 return R.error("保存操作记录失败!");
+            }*/
+            User userInfo= new User();
+            userInfo.setId(user.getId());
+            userInfo.setLastLoginTime(new Date());
+            int updateLoginTime = baseMapper.updateById(userInfo);
+            if (updateLoginTime == 0) {
+                return R.error("保存登录记录失败!");
             }
+
             return R.ok(userInfoVo);
         }catch (IncorrectCredentialsException e) {
             return R.error(1, "账户密码错误");

wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/UserServiceImpl.java

@@ -162,7 +162,7 @@ public class UserServiceImpl extends ServiceImpl<UsersMapper, User> implements U
         if (null == userInfo) {
             return R.error("入参为空!");
         }
-
+        userInfo.setUserName(userInfo.getUserName().replace(" ",""));
         //1、根据用户id,获取用户信息
         User user = usersMapper.selectById(userInfo.getUserId());
         if (null == user) {
@@ -220,7 +220,7 @@ public class UserServiceImpl extends ServiceImpl<UsersMapper, User> implements U
         if (null == userDto || StringUtils.isBlank(userDto.getUserName())) {
             return R.error("入参为空!");
         }
-
+        userDto.setUserName(userDto.getUserName().replace(" ",""));
         //1、根据用户id,获取用户信息
         User user = usersMapper.selectById(userDto.getUserId());
         if (null == user) {

wisenergy-service/src/main/java/cn/wisenergy/service/common/VolunteerManager.java

@@ -183,7 +183,7 @@ public class VolunteerManager {
      * @return true 成功  false 失败
      */
     @Transactional(rollbackFor = Exception.class)
-    public R<Integer> saveUserVolunteer(User user, List<Volunteer> list, ScoreInfo scoreInfo, String name) {
+    public R<Integer> saveUserVolunteer(User user, List<Volunteer> list, ScoreInfo scoreInfo, String name,UserLimit userLimit) {
         //1、保存方案查询记录
         SchemeQueryRecord schemeQueryRecord = new SchemeQueryRecord();
         schemeQueryRecord.setMajorName(name);
@@ -212,9 +212,7 @@ public class VolunteerManager {
             userVolunteer.setVolunteerId(id);
             volunteerList.add(userVolunteer);
         }
-
-        //调用扣减查询次数接口
-        R<Boolean> result = userLimitService.minusLimit(user.getId());
+        R<Boolean> result = userLimitService.minusLimitUser(userLimit);
         if (null != result && result.getCode() == ERROR_CODE) {
             return R.error("扣减查询次数失败!");
         }

wisenergy-web-admin/src/main/java/cn/wisenergy/web/admin/controller/app/BannerController.java

@@ -78,8 +78,8 @@ public class BannerController {
     }
 
 
-    @ApiOperation(value = "获取顶部/底部广告/app", notes = "获取顶部/底部广告/app", httpMethod = "GET")
-    @ApiImplicitParam(name = "type", value = "广告类型：1：顶部 2：底部 3:App", dataType = "int", required = true)
+    @ApiOperation(value = "获取pc顶部/pc底部广告/app广告", notes = "获取pc顶部/pc底部广告/app广告", httpMethod = "GET")
+    @ApiImplicitParam(name = "type", value = "广告类型：1：pc顶部 2：pc底部 3:App", dataType = "int", required = true)
     @GetMapping("/getBanners")
     public R<List<Banner>> getBanners(Integer type) {
         log.info("BannerController[]getBanners[]input.param.type:" + type);

wisenergy-web-admin/src/main/java/cn/wisenergy/web/admin/controller/app/StaffController.java

@@ -3,6 +3,7 @@ package cn.wisenergy.web.admin.controller.app;
 import cn.wisenergy.common.utils.R;
 import cn.wisenergy.model.dto.StaffDto;
 import cn.wisenergy.model.vo.QueryVo;
+import cn.wisenergy.model.vo.StaffChangPwdVo;
 import cn.wisenergy.model.vo.StaffVo;
 import cn.wisenergy.service.app.StaffService;
 import com.github.pagehelper.PageInfo;
@@ -67,4 +68,12 @@ public class StaffController {
         return staffService.resetPassword(staffId);
     }
 
+    @ApiOperation(value ="员工端修改密码",notes = "员工端修改密码",httpMethod = "POST")
+    @ApiImplicitParam(name = "staffChangPwdVo",value = "员工信息",dataType = "StaffChangPwdVo")
+    @PostMapping("/updatePassword")
+    public R<Boolean> updatePassword(@RequestBody StaffChangPwdVo staffChangPwdVo){
+        log.info("StaffController[].delete[].input.param:"+staffChangPwdVo);
+        return staffService.updatePassword(staffChangPwdVo);
+    }
+
 }