Merge branch 'master' of D:\Git\volunteer_service with conflicts.

wisenergy-common/wisenergy-common.iml

 <?xml version="1.0" encoding="UTF-8"?>
 <module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+  <component name="FacetManager">
+    <facet type="Spring" name="Spring">
+      <configuration />
+    </facet>
+    <facet type="web" name="Web">
+      <configuration>
+        <webroots />
+      </configuration>
+    </facet>
+  </component>
   <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
     <output url="file://$MODULE_DIR$/target/classes" />
     <output-test url="file://$MODULE_DIR$/target/test-classes" />
@@ -68,8 +78,6 @@
     <orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.1.7.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-test:5.1.7.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.xmlunit:xmlunit-core:2.6.2" level="project" />
-    <orderEntry type="library" name="Maven: javax.xml.bind:jaxb-api:2.3.1" level="project" />
-    <orderEntry type="library" name="Maven: javax.activation:javax.activation-api:1.2.0" level="project" />
     <orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-starter:2.1.2" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-jdbc:2.1.5.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: com.zaxxer:HikariCP:3.2.0" level="project" />

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

+package cn.wisenergy.mapper;
+
+import cn.wisenergy.model.app.CardInfo;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+public interface CardMapper extends BaseMapper<CardInfo> {
+    /**
+     * 添加充值卡子卡
+     * @param Card
+     * @return
+     */
+    int add(CardInfo Card);
+}

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

@@ -26,4 +26,7 @@ public interface LoginRecordMapper extends BaseMapper<LoginRecord> {
      * @return 结果
      */
     int delById(@Param("id") Integer id);
+
+    LoginRecord getById(@Param("userId") Integer userId);
+
 }

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

 package cn.wisenergy.mapper;
 
+import cn.wisenergy.model.app.LoginRecord;
 import cn.wisenergy.model.app.PayRecord;
 import cn.wisenergy.model.vo.PayRecordShowVo;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 import java.util.Map;
@@ -13,4 +15,6 @@ public interface PayRecordMapper extends BaseMapper<PayRecord> {
     List<PayRecordShowVo> getList(Map<String,Object> map);
 
     int count(Map<String,Object> map);
+
+    PayRecord getById(@Param("userId") Integer userId);
 }

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

+package cn.wisenergy.mapper;
+
+import cn.wisenergy.model.app.PayRecord;
+import cn.wisenergy.model.app.RefillCard;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+public interface RefillCardMapper extends BaseMapper<RefillCardMapper> {
+
+    /**
+     * 添加充值卡
+     * @param refillCard
+     * @return
+     */
+    int add(RefillCard refillCard);
+
+    /**
+     * 改变激活状态
+     * @param batchNumber
+     * @return
+     */
+    int update(@Param("batchNumber") String batchNumber);
+}

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

 package cn.wisenergy.mapper;
 
+import cn.wisenergy.model.app.LoginRecord;
 import cn.wisenergy.model.app.UserLimit;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
 
 public interface UserLimitMapper extends BaseMapper<UserLimit> {
     UserLimit add(UserLimit userLimit);
 
     int edit(UserLimit userLimit);
+
+    UserLimit getById(@Param("userId") Integer userId);
 }

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

@@ -40,4 +40,6 @@ public interface UsersMapper extends BaseMapper<UserInfo> {
     int countByPhoneAnsUserId(@Param("phone") String phone, @Param("userId") Integer userId);
 
     List<UserInfo> getList(Map<String,Object> map);
+
+    Integer getUserNumbers();
 }

wisenergy-mapper/src/main/resources/mapper/LoginRecordMapper.xml

@@ -70,4 +70,16 @@
         where id = #{id}
     </delete>
 
+    <select id="getById" resultMap="advertisingMap">
+        select <include refid="cols_all"/>
+        from <include refid="table"/>
+        <where>
+            user_id=#{userId}
+            and
+            type=1
+          order by update_time desc
+          limit 0,1
+        </where>
+    </select>
+
 </mapper>

wisenergy-mapper/src/main/resources/mapper/PayRecordMapper.xml

@@ -24,7 +24,7 @@
     </sql>
 
     <sql id="cols_exclude_id">
-        user_id,type, card_number,money,result,limit, create_time,update_time
+        user_id,type, card_id,money,result,limit, create_time,update_time
     </sql>
 
     <sql id="vals">
@@ -87,5 +87,14 @@
 
     </select>
 
+    <select id="getById" resultMap="advertisingMap">
+        select money
+        from <include refid="table"/>
+        <where>
+            user_id=#{userId}
+            and
+            result=0
+        </where>
+    </select>
 
 </mapper>

wisenergy-mapper/src/main/resources/mapper/UserLimitMapper.xml

@@ -13,7 +13,7 @@
     </resultMap>
 
     <sql id="table">
-        user
+        user_limit
     </sql>
 
     <sql id="cols_all">
@@ -67,4 +67,12 @@
         </where>
     </update>
 
+    <select id="getById" resultMap="userMap">
+        select <include refid="cols_all"/>
+        from <include refid="table"/>
+        <where>
+            user_id=#{userId}
+        </where>
+    </select>
+
 </mapper>

wisenergy-mapper/src/main/resources/mapper/UsersMapper.xml

@@ -10,7 +10,7 @@
         <result column="head_image" property="headImage"/>
         <result column="sex" property="sex"/>
         <result column="school" property="school"/>
-        <result column="exam_type" property="examType"/>
+        <result column="student_type" property="studentType"/>
         <result column="source" property="source"/>
         <result column="is_delete" property="isDelete"/>
         <result column="create_time" property="createTime"/>
@@ -27,11 +27,11 @@
     </sql>
 
     <sql id="cols_exclude_id">
-        user_name,password, phone,head_image,sex,school, exam_type,is_delete,create_time,update_time
+        user_name,password, phone,head_image,sex,school, student_type,is_delete,create_time,update_time
     </sql>
 
     <sql id="vals">
-        #{userName},#{password},#{phone},#{headImage},#{sex},#{school},#{examType}, #{source},
+        #{userName},#{password},#{phone},#{headImage},#{sex},#{school},#{studentType}, #{source},
         #{isDelete},now(),now()
     </sql>
 
@@ -42,7 +42,7 @@
         <if test="headImage != null">head_image =#{headImage},</if>
         <if test="sex != null">sex =#{sex},</if>
         <if test="school != null">school =#{school},</if>
-        <if test="examType != null">exam_type = #{examType},</if>
+        <if test="studentType != null">inspector_name = #{studentType},</if>
         <if test="source != null">source = #{source},</if>
         <if test="isDelete != null">is_delete = #{isDelete},</if>
         update_time =now()

wisenergy-mapper/wisenergy-mapper.iml

 <?xml version="1.0" encoding="UTF-8"?>
 <module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+  <component name="FacetManager">
+    <facet type="Spring" name="Spring">
+      <configuration />
+    </facet>
+    <facet type="web" name="Web">
+      <configuration>
+        <webroots />
+      </configuration>
+    </facet>
+  </component>
   <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
     <output url="file://$MODULE_DIR$/target/classes" />
     <output-test url="file://$MODULE_DIR$/target/test-classes" />
@@ -72,8 +82,6 @@
     <orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.1.7.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-test:5.1.7.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.xmlunit:xmlunit-core:2.6.2" level="project" />
-    <orderEntry type="library" name="Maven: javax.xml.bind:jaxb-api:2.3.1" level="project" />
-    <orderEntry type="library" name="Maven: javax.activation:javax.activation-api:1.2.0" level="project" />
     <orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-starter:2.1.2" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-jdbc:2.1.5.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: com.zaxxer:HikariCP:3.2.0" level="project" />
@@ -112,7 +120,6 @@
     <orderEntry type="library" name="Maven: org.reactivestreams:reactive-streams:1.0.2" level="project" />
     <orderEntry type="library" name="Maven: org.bouncycastle:bcprov-jdk15on:1.54" level="project" />
     <orderEntry type="library" name="Maven: io.springfox:springfox-swagger2:2.9.2" level="project" />
-    <orderEntry type="library" name="Maven: io.swagger:swagger-annotations:1.5.20" level="project" />
     <orderEntry type="library" name="Maven: io.swagger:swagger-models:1.5.20" level="project" />
     <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.9.0" level="project" />
     <orderEntry type="library" name="Maven: io.springfox:springfox-spi:2.9.2" level="project" />
@@ -143,6 +150,7 @@
     <orderEntry type="library" name="Maven: org.apache.shiro:shiro-spring:1.4.0" level="project" />
     <orderEntry type="library" name="Maven: org.apache.shiro:shiro-web:1.4.0" level="project" />
     <orderEntry type="library" name="Maven: cn.hutool:hutool-all:4.6.7" level="project" />
+    <orderEntry type="library" name="Maven: io.swagger:swagger-annotations:1.5.23" level="project" />
     <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.8.1" level="project" />
     <orderEntry type="library" name="Maven: commons-lang:commons-lang:2.6" level="project" />
     <orderEntry type="library" name="Maven: commons-pool:commons-pool:1.6" level="project" />

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

@@ -32,8 +32,8 @@ public class PayRecord implements Serializable {
     /**
      * 充值卡编号
      */
-    @ApiModelProperty(value = "充值卡编号",name = "cardNumber")
-    private String cardNumber;
+    @ApiModelProperty(value = "充值卡编号",name = "cardId")
+    private String cardId;
 
     /**
      * 充值用户id

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

 package cn.wisenergy.model.app;
 
 import cn.wisenergy.model.common.BaseEntity;
-import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -17,7 +16,6 @@ import java.util.Date;
  */
 @Data
 @ApiModel(value = "AccountUsers")
-@TableName("user")
 public class UserInfo extends BaseEntity implements Serializable {
     private static final long serialVersionUID = 2525339404301884673L;
 
@@ -39,12 +37,6 @@ public class UserInfo extends BaseEntity implements Serializable {
     @ApiModelProperty(name="password",value = "用户密码")
     private String password;
 
-    /**
-     * 来源 1：pc 2:移动端
-     */
-    @ApiModelProperty(name = "来源 1：pc 2:移动端",value = "source")
-    private Integer source;
-
     /**
      * 电话号码
      */
@@ -73,8 +65,19 @@ public class UserInfo extends BaseEntity implements Serializable {
      * 学生类型
      */
     @ApiModelProperty(name = "examType",value = "考生类型 1：文化课考生 2：美术生 3：体育生 4：文学编导考生")
-    private Integer examType;
+    private Integer studentType;
+
+    /**
+     * 用户剩余查询次数
+     */
+    @ApiModelProperty(name = "queryLimit",value = "用户剩余查询次数")
+    private Integer queryLimit;
 
+    /**
+     * 用户充值总额
+     */
+    @ApiModelProperty(name = "moneyAmount",value = "充值总额")
+    private String moneyAmount;
     /**
      * 是否删除
      */

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

@@ -40,8 +40,14 @@ public class UserInfoDto implements Serializable {
     /**
      * 考生类型 1：文化课考生 2：美术生 3：体育生 4：文学编导考生
      */
-    @ApiModelProperty(value = "考生类型 1：文化课考生 2：美术生 3：体育生 4：文学编导考生", name = "studentType")
-    private Integer studentType;
+    @ApiModelProperty(value = "考生类型 1：文化课考生 2：美术生 3：体育生 4：文学编导考生", name = "examType")
+    private Integer examType;
+
+    /**
+     * 登录来源
+     */
+    @ApiModelProperty(name ="source",value = "登录来源：1 PC,2 WAP")
+    private Integer source;
 
     /**
      * 手机

wisenergy-model/wisenergy-model.iml

 <?xml version="1.0" encoding="UTF-8"?>
 <module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+  <component name="FacetManager">
+    <facet type="Spring" name="Spring">
+      <configuration />
+    </facet>
+    <facet type="web" name="Web">
+      <configuration>
+        <webroots />
+      </configuration>
+    </facet>
+  </component>
   <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
     <output url="file://$MODULE_DIR$/target/classes" />
     <output-test url="file://$MODULE_DIR$/target/test-classes" />
@@ -70,8 +80,6 @@
     <orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.1.7.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-test:5.1.7.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.xmlunit:xmlunit-core:2.6.2" level="project" />
-    <orderEntry type="library" name="Maven: javax.xml.bind:jaxb-api:2.3.1" level="project" />
-    <orderEntry type="library" name="Maven: javax.activation:javax.activation-api:1.2.0" level="project" />
     <orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-starter:2.1.2" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-jdbc:2.1.5.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: com.zaxxer:HikariCP:3.2.0" level="project" />
@@ -110,7 +118,6 @@
     <orderEntry type="library" name="Maven: org.reactivestreams:reactive-streams:1.0.2" level="project" />
     <orderEntry type="library" name="Maven: org.bouncycastle:bcprov-jdk15on:1.54" level="project" />
     <orderEntry type="library" name="Maven: io.springfox:springfox-swagger2:2.9.2" level="project" />
-    <orderEntry type="library" name="Maven: io.swagger:swagger-annotations:1.5.20" level="project" />
     <orderEntry type="library" name="Maven: io.swagger:swagger-models:1.5.20" level="project" />
     <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.9.0" level="project" />
     <orderEntry type="library" name="Maven: io.springfox:springfox-spi:2.9.2" level="project" />
@@ -148,6 +155,7 @@
     <orderEntry type="library" name="Maven: org.apache.xmlbeans:xmlbeans:2.3.0" level="project" />
     <orderEntry type="library" name="Maven: stax:stax-api:1.0.1" level="project" />
     <orderEntry type="library" name="Maven: cn.hutool:hutool-all:4.6.7" level="project" />
+    <orderEntry type="library" name="Maven: io.swagger:swagger-annotations:1.5.23" level="project" />
     <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.8.1" level="project" />
     <orderEntry type="library" name="Maven: commons-lang:commons-lang:2.6" level="project" />
     <orderEntry type="library" name="Maven: commons-pool:commons-pool:1.6" level="project" />

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

 package cn.wisenergy.service.app.impl;
 
 import cn.wisenergy.common.constant.CommonAttributes;
+import cn.wisenergy.common.utils.Md5Util;
 import cn.wisenergy.common.utils.R;
 import cn.wisenergy.mapper.ScoreInfoMapper;
 import cn.wisenergy.mapper.UsersMapper;
@@ -16,6 +17,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.pagehelper.PageInfo;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -49,8 +51,8 @@ public class UserServiceImpl extends ServiceImpl<UsersMapper, UserInfo> implemen
         pageHandle(queryVo);
         //创建参数容器
         HashMap<String, Object> map = new HashMap<>(4);
+        //将参数放入容器中
         map.put("userQueryVo",queryVo);
-
         //查询用户数据
         List<UserInfo> list1 = usersMapper.getList(map);
         int total = 0;
@@ -59,17 +61,15 @@ public class UserServiceImpl extends ServiceImpl<UsersMapper, UserInfo> implemen
         for (UserInfo userInfo : list1) {
             //创建UserInfoDto返回对象
             UserInfoDto userInfoDto = new UserInfoDto();
-
             //查询成绩信息
             ScoreInfo scoreInfo = scoreInfoMapper.getById(userInfo.getId());
-
             //将消息进行同步
             BeanUtils.copyProperties(userInfo,userInfoDto);
             userInfoDto.setCultureGrade(scoreInfo.getCultureGrade());
             userInfoDto.setMajorGrade(scoreInfo.getMajorGrade());
             userInfoDto.setRegisterTime(userInfo.getCreateTime());
+            //将userInfoDto装入集合中
             list.add(userInfoDto);
-
             //统计数据总量
             total+=1;
         }
@@ -98,7 +98,7 @@ public class UserServiceImpl extends ServiceImpl<UsersMapper, UserInfo> implemen
         //2、要提交的用户信息
         user.setSchool(userInfo.getSchool());
         user.setSex(userInfo.getSex());
-        user.setExamType(userInfo.getStudentType());
+        user.setStudentType(userInfo.getStudentType());
         user.setUserName(userInfo.getUserName());
         user.setIsDelete(0);
 
@@ -149,7 +149,7 @@ public class UserServiceImpl extends ServiceImpl<UsersMapper, UserInfo> implemen
         userShowVo.setId(userInfo.getId());
         userShowVo.setSchool(userInfo.getSchool());
         userShowVo.setSex(userInfo.getSex());
-        userShowVo.setStudentType(userInfo.getExamType());
+        userShowVo.setStudentType(userInfo.getStudentType());
         userShowVo.setUserName(userInfo.getUserName());
 
         //获取成绩信息

wisenergy-service/wisenergy-service.iml

 <?xml version="1.0" encoding="UTF-8"?>
 <module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+  <component name="FacetManager">
+    <facet type="Spring" name="Spring">
+      <configuration />
+    </facet>
+    <facet type="web" name="Web">
+      <configuration>
+        <webroots />
+      </configuration>
+    </facet>
+  </component>
   <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
     <output url="file://$MODULE_DIR$/target/classes" />
     <output-test url="file://$MODULE_DIR$/target/test-classes" />
@@ -70,8 +80,6 @@
     <orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.1.7.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-test:5.1.7.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.xmlunit:xmlunit-core:2.6.2" level="project" />
-    <orderEntry type="library" name="Maven: javax.xml.bind:jaxb-api:2.3.1" level="project" />
-    <orderEntry type="library" name="Maven: javax.activation:javax.activation-api:1.2.0" level="project" />
     <orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-starter:2.1.2" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-jdbc:2.1.5.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: com.zaxxer:HikariCP:3.2.0" level="project" />
@@ -110,7 +118,6 @@
     <orderEntry type="library" name="Maven: org.reactivestreams:reactive-streams:1.0.2" level="project" />
     <orderEntry type="library" name="Maven: org.bouncycastle:bcprov-jdk15on:1.54" level="project" />
     <orderEntry type="library" name="Maven: io.springfox:springfox-swagger2:2.9.2" level="project" />
-    <orderEntry type="library" name="Maven: io.swagger:swagger-annotations:1.5.20" level="project" />
     <orderEntry type="library" name="Maven: io.swagger:swagger-models:1.5.20" level="project" />
     <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.9.0" level="project" />
     <orderEntry type="library" name="Maven: io.springfox:springfox-spi:2.9.2" level="project" />
@@ -141,9 +148,11 @@
     <orderEntry type="library" name="Maven: org.apache.shiro:shiro-spring:1.4.0" level="project" />
     <orderEntry type="library" name="Maven: org.apache.shiro:shiro-web:1.4.0" level="project" />
     <orderEntry type="library" name="Maven: cn.hutool:hutool-all:4.6.7" level="project" />
+    <orderEntry type="library" name="Maven: io.swagger:swagger-annotations:1.5.23" level="project" />
     <orderEntry type="library" name="Maven: com.hikvision.ga:artemis-http-client:1.1.3" level="project" />
     <orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.2.3" level="project" />
     <orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.2.3" level="project" />
+    <orderEntry type="library" name="Maven: org.jetbrains:annotations:20.1.0" level="project" />
     <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.8.1" level="project" />
     <orderEntry type="library" name="Maven: commons-lang:commons-lang:2.6" level="project" />
     <orderEntry type="library" name="Maven: commons-pool:commons-pool:1.6" level="project" />

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

@@ -11,7 +11,6 @@ import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -33,10 +32,14 @@ public class UserController {
       @ApiOperation(value = "用户管理",notes = "用户管理",httpMethod = "POST")
       @ApiImplicitParam(name ="queryVo" )
       @PostMapping("/manage")
-      public R manageUser(@RequestBody UserQueryVo queryVo){
-          log.info("UserController[].manageUser[].input.param:queryV0:"+queryVo);
+      public R manageUser(UserQueryVo queryVo){
+          log.info("UserController[].manageUser[].input.param:queryV0:{}"+queryVo);
           //查询用户信息
           R<PageInfo<UserInfoDto>> userList = userService.getUserList(queryVo);
+          System.out.println(userList);
+          if (null==userList||userList.getData().getList().size()==0) {
+              return R.error("展时还没有用户");
+          }
           //返回数据
           return R.ok(userList);
       }

wisenergy-web-admin/src/main/resources/application-dev.yml

@@ -5,7 +5,7 @@ spring:
       driver-class-name: com.mysql.cj.jdbc.Driver
       url: jdbc:mysql://localhost:3306/exam?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&serverTimezone=GMT%2B8
       username: root
-      password: root
+      password:
       initial-size: 10
       max-active: 100
       min-idle: 10

wisenergy-web-admin/wisenergy-web-admin.iml

 <?xml version="1.0" encoding="UTF-8"?>
 <module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+  <component name="FacetManager">
+    <facet type="Spring" name="Spring">
+      <configuration />
+    </facet>
+    <facet type="web" name="Web">
+      <configuration>
+        <webroots />
+      </configuration>
+    </facet>
+  </component>
   <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
     <output url="file://$MODULE_DIR$/target/classes" />
     <output-test url="file://$MODULE_DIR$/target/test-classes" />
@@ -72,8 +82,6 @@
     <orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.1.7.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-test:5.1.7.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.xmlunit:xmlunit-core:2.6.2" level="project" />
-    <orderEntry type="library" name="Maven: javax.xml.bind:jaxb-api:2.3.1" level="project" />
-    <orderEntry type="library" name="Maven: javax.activation:javax.activation-api:1.2.0" level="project" />
     <orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-starter:2.1.2" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-jdbc:2.1.5.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: com.zaxxer:HikariCP:3.2.0" level="project" />
@@ -112,7 +120,6 @@
     <orderEntry type="library" name="Maven: org.reactivestreams:reactive-streams:1.0.2" level="project" />
     <orderEntry type="library" name="Maven: org.bouncycastle:bcprov-jdk15on:1.54" level="project" />
     <orderEntry type="library" name="Maven: io.springfox:springfox-swagger2:2.9.2" level="project" />
-    <orderEntry type="library" name="Maven: io.swagger:swagger-annotations:1.5.20" level="project" />
     <orderEntry type="library" name="Maven: io.swagger:swagger-models:1.5.20" level="project" />
     <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.9.0" level="project" />
     <orderEntry type="library" name="Maven: io.springfox:springfox-spi:2.9.2" level="project" />
@@ -130,9 +137,11 @@
     <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.9.8" level="project" />
     <orderEntry type="library" name="Maven: joda-time:joda-time:2.10.2" level="project" />
     <orderEntry type="library" name="Maven: cn.hutool:hutool-all:4.6.7" level="project" />
+    <orderEntry type="library" name="Maven: io.swagger:swagger-annotations:1.5.23" level="project" />
     <orderEntry type="library" name="Maven: com.hikvision.ga:artemis-http-client:1.1.3" level="project" />
     <orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.2.3" level="project" />
     <orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.2.3" level="project" />
+    <orderEntry type="library" name="Maven: org.jetbrains:annotations:20.1.0" level="project" />
     <orderEntry type="library" name="Maven: org.apache.shiro:shiro-spring:1.4.0" level="project" />
     <orderEntry type="library" name="Maven: org.apache.shiro:shiro-core:1.4.0" level="project" />
     <orderEntry type="library" name="Maven: org.apache.shiro:shiro-lang:1.4.0" level="project" />