客户端登录功能实现

wisenergy-common/pom.xml

@@ -75,7 +75,7 @@
         <dependency>
             <groupId>com.alibaba</groupId>
             <artifactId>druid-spring-boot-starter</artifactId>
-            <version>1.2.1</version>
+            <version>1.1.22</version>
         </dependency>
         <!-- Redis -->
         <dependency>

wisenergy-mapper/src/main/java/cn/wisenergy/mapper/AccountMapper.java

@@ -11,6 +11,6 @@ public interface AccountMapper extends BaseMapper<AccountInfo> {
      * @param map 查询参数
      * @return
      */
-    AccountInfo getAccountInfo(Map<String,Object> map);
+    AccountInfo getAccountInfo(Map<String, Object> map);
 
 }

wisenergy-mapper/src/main/java/cn/wisenergy/mapper/SchemeRecordMapper.java

@@ -38,7 +38,7 @@ public interface SchemeRecordMapper extends BaseMapper<SchemeQueryRecord> {
      * @param map 统计条件
      * @return 记录条数
      */
-    int count(@Param("map") Map<String,Object> map);
+    int count(@Param("map") Map<String, Object> map);
 
-    List<SchemeQueryRecord> getList(@Param("map") Map<String,Object> map);
+    List<SchemeQueryRecord> getList(@Param("map") Map<String, Object> map);
 }

wisenergy-mapper/src/main/java/cn/wisenergy/mapper/UsersMapper.java

 package cn.wisenergy.mapper;
 
 import cn.wisenergy.model.app.UserInfo;
-import cn.wisenergy.model.vo.UserQueryVo;
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
-import java.util.List;
-import java.util.Map;
-
 /**
  *@ Description:
  *@ Author     : 86187
@@ -38,12 +33,5 @@ public interface UsersMapper extends BaseMapper<UserInfo> {
      */
     int delById(@Param("id") Integer id);
 
-    int countByPhoneAnsUserId(@Param("phone") String phone,@Param("userId") Integer userId);
-
-    /**
-     * 查询用户信息
-     * @param map 查询参数
-     * @return
-     */
-    List<UserInfo> getList(Map<String,Object> map);
+    int countByPhoneAnsUserId(@Param("phone") String phone, @Param("userId") Integer userId);
 }

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

@@ -10,7 +10,6 @@ import java.util.Date;
 @Data
 @ApiModel(value = "CardInfo")
 public class CardInfo implements Serializable {
-    private static final long serialVersionUID = -5934833963262442092L;
     /**
      * 子卡id
      */

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

@@ -7,42 +7,48 @@ import lombok.Data;
 import java.io.Serializable;
 import java.util.Date;
 
+/**
+*@ Description: 充值记录实体类
+*@ Author     : 86187
+*@ Date       : 2021/1/8 14:48
+*/
 @Data
 @ApiModel(value = "PayRecord")
 public class PayRecord implements Serializable {
-    private static final long serialVersionUID = -1133836167538757507L;
+    private static final long serialVersionUID = -7865361068703566832L;
+
     /**
-     * 充值记录id
+     * 充值记录
      */
-    @ApiModelProperty(value = "充值记录id",name = "id")
+    @ApiModelProperty(value = "",name = "")
     private Integer id;
 
     /**
-     * 充值类型
+     * 充值类型 1：支付宝 2：微信 3：充值卡
      */
-    @ApiModelProperty(value = "充值类型 1：支付宝 2：微信 3：充值卡",name = "type")
+    @ApiModelProperty(value = "",name = "")
     private Integer type;
 
     /**
-     * 充值卡卡号
+     * 充值卡id
      */
-    @ApiModelProperty(value = "充值卡卡号",name = "cardCode")
-    private String cardCode;
+    @ApiModelProperty(value = "充值卡id",name = "cardId")
+    private String cardId;
 
     /**
-     * 充值用户
+     * 充值用户id
      */
-    @ApiModelProperty(value = "充值用户",name = "userId")
-    private Integer userId  ;
+    @ApiModelProperty(value = "充值用户id",name = "userId")
+    private Integer userId;
 
     /**
-     * 充值金额
+     * 充值所花金额
      */
-    @ApiModelProperty(value = "充值金额 ",name = "money")
+    @ApiModelProperty(value = "充值所花金额",name = "money")
     private String money;
 
     /**
-     * 充值结果
+     * 充值结果 0：成功 1：失败
      */
     @ApiModelProperty(value = "充值结果 0：成功 1：失败",name = "result")
     private Integer result;

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

@@ -4,13 +4,11 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.io.Serializable;
 import java.util.Date;
 
 @Data
 @ApiModel(value = "RefillCard")
-public class RefillCard implements Serializable {
-    private static final long serialVersionUID = 4018232893584885138L;
+public class RefillCard {
     /**
      * 充值卡id
      */

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

@@ -4,13 +4,11 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.io.Serializable;
 import java.util.Date;
 
 @Data
 @ApiModel(value = "SchemeInnfo")
-public class SchemeInnfo implements Serializable {
-    private static final long serialVersionUID = 7020644673356401949L;
+public class SchemeInnfo {
     /**
      * 方案id
      */

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

@@ -4,13 +4,11 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.io.Serializable;
 import java.util.Date;
 
 @Data
 @ApiModel(value = "UserLimit")
-public class UserLimit implements Serializable {
-    private static final long serialVersionUID = 3956830394491346594L;
+public class UserLimit {
     /**
      * 用户卡点id
      */

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

@@ -4,12 +4,9 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.io.Serializable;
-
 @Data
 @ApiModel(value = "UserVolunteer")
-public class UserVolunteer implements Serializable {
-    private static final long serialVersionUID = 8617194272686159825L;
+public class UserVolunteer {
     /**
      * 用户方案id
      */

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

@@ -3,8 +3,6 @@ package cn.wisenergy.service.app;
 import cn.wisenergy.common.utils.R;
 import cn.wisenergy.model.dto.AccountDto;
 
-import java.util.Map;
-
 public interface AccountSerivce {
     /**
      * 查询管理员信息

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

@@ -69,5 +69,5 @@ public interface UserLoginService {
      * @param phone    手机号
      * @return true 成功 false 失败
      */
-    R<Boolean> notePassword(Integer code,String phone);
+    R<Boolean> notePassword(Integer code, String phone);
 }

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

 package cn.wisenergy.service.app.impl;
 
-import cn.hutool.crypto.digest.MD5;
 import cn.wisenergy.common.utils.Md5Util;
 import cn.wisenergy.common.utils.R;
 import cn.wisenergy.mapper.AccountMapper;
@@ -8,13 +7,12 @@ import cn.wisenergy.model.app.AccountInfo;
 import cn.wisenergy.model.dto.AccountDto;
 import cn.wisenergy.service.app.AccountSerivce;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.tomcat.util.codec.binary.Base64;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.HashMap;
-import java.util.Map;
+
 @Slf4j
 @Service
 public class AccountSerivceImpl implements AccountSerivce {