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

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

@@ -59,5 +59,5 @@ public interface BannerMapper extends BaseMapper<Banner> {
      * @param status
      * @return
      */
-    int putIn(@Param("id") Integer id, @Param("status") Integer status);
+    int aditStatus(@Param("id") Integer id, @Param("status") Integer status);
 }

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

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

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

@@ -100,7 +100,7 @@
         where id=#{id}
     </select>
 
-    <update id="putIn">
+    <update id="aditStatus">
         UPDATE
         <include refid="table"/>
         <set>

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

@@ -27,6 +27,11 @@
         banth_number,`limit`, secret_key,money,`status`,is_delete,create_time,update_time
     </sql>
 
+    <sql id="createsVal">
+        #{i.banthNumber},#{i.limit},#{i.secretKey},#{i.money},#{i.status},
+        #{i.isDelete},now(),now()
+    </sql>
+
     <sql id="vals">
         #{banthNumber},#{limit},#{secretKey},#{money},#{status},
         #{isDelete},now(),now()
@@ -57,9 +62,10 @@
         insert into
         <include refid="table"/>
         (<include refid="cols_exclude_id"/>)
-        value(
-        <include refid="vals"/>
-        )
+        values
+        <foreach collection="list" item="i" index="index" separator=",">
+        (<include refid="createsVal"/>)
+    </foreach>
     </insert>
 
 </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="student_type" property="studentType"/>
+        <result column="exam_type" property="examType"/>
         <result column="source" property="source"/>
         <result column="is_delete" property="isDelete"/>
         <result column="create_time" property="createTime"/>
@@ -31,7 +31,7 @@
     </sql>
 
     <sql id="vals">
-        #{userName},#{password},#{phone},#{headImage},#{sex},#{school},#{studentType}, #{source},
+        #{userName},#{password},#{phone},#{headImage},#{sex},#{school},#{examType}, #{source},
         #{isDelete},now(),now()
     </sql>
 
@@ -110,11 +110,8 @@
 
             <if test="endTime != null">and #{endTime}</if>
             order by create_time desc
+            limit #{pageNo},#{pageSize}
         </where>
-
-        <if test="pageNo!= null">limit #{pageNo}  ,</if>
-
-        <if test="pageSize!=null">#{pageSize}</if>
     </select>
 
     <select id="getUserNumbers" resultType="java.lang.Integer">

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

@@ -37,6 +37,12 @@ public class UserInfo extends BaseEntity implements Serializable {
     @ApiModelProperty(name="password",value = "用户密码")
     private String password;
 
+    /**
+     * 登录来源
+     */
+    @ApiModelProperty(name ="source",value = "登录来源：1 PC,2 WAP")
+    private Integer source;
+
     /**
      * 电话号码
      */
@@ -65,7 +71,7 @@ public class UserInfo extends BaseEntity implements Serializable {
      * 学生类型
      */
     @ApiModelProperty(name = "examType",value = "考生类型 1：文化课考生 2：美术生 3：体育生 4：文学编导考生")
-    private Integer studentType;
+    private Integer examType;
 
     /**
      * 来源 1：电脑端 2: 手机端

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

 package cn.wisenergy.model.vo;
 
+import com.alibaba.fastjson.annotation.JSONField;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.io.Serializable;
 import java.util.Date;
@@ -27,12 +30,14 @@ public class UserQueryVo implements Serializable {
      * 开始时间
      */
     @ApiModelProperty(value = "开始时间", name = "startTime")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date startTime;
 
     /**
      * 结束时间
      */
     @ApiModelProperty(value = "结束时间", name = "endTime")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date endTime;
 
     /**

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

@@ -51,6 +51,6 @@ public interface BannerService {
      * @param status 1 ：投放 2：暂停投放
      * @return true 成功 false 失败
      */
-    R<Boolean> putIn(Integer id, Integer status);
+    R<Boolean> aditStatus(Integer id, Integer status);
 
 }

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

@@ -10,6 +10,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.util.StringUtils;
 
 import java.util.HashMap;
 
@@ -23,6 +24,12 @@ public class AccountSerivceImpl implements AccountSerivce {
     @Override
     public R<AccountDto> getAccountInfo(String userName, String password) {
         log.info("AccountSerivceImpl[].getAccountInfo[].input.param:userName,password"+userName,password);
+
+        //判断参数是否为空
+        if (StringUtils.isEmpty(userName)||StringUtils.isEmpty(password)) {
+            return R.error("账号或密码为空");
+        }
+
         //创建参数容器map
         HashMap<String, Object> map = new HashMap<>(4);
         map.put("userName",userName);

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

@@ -77,6 +77,7 @@ public class BannerServiceImpl extends ServiceImpl<BannerMapper, Banner> impleme
             return R.error("传入参数无效");
         }
         Banner banner = bannerMapper.getById(id);
+
         if (null == banner) {
             return R.error("数据获取失败");
         }
@@ -126,7 +127,13 @@ public class BannerServiceImpl extends ServiceImpl<BannerMapper, Banner> impleme
     public R<Boolean> putIn(Integer id, Integer status) {
         log.info("BannerServiceImpl[].putIn[].input.param,status:{},id" + status, id);
         //判断数据是否正确
-        if (null == id || status == null) {
+        if (null == id) {
+            return R.error("缺少重要数据");
+        }
+        if (status == null) {
+            return R.error("缺少重要数据");
+        }
+        if (status < 0 || status > 1) {
             return R.error("缺少重要数据");
         }
 

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

@@ -37,9 +37,12 @@ public class RefillCardServiceImpl implements RefillCardService {
 
     @Override
     @Transactional
-    public R add(RefillCard refillCard) {
+    public R<Boolean> add(RefillCard refillCard) {
         log.info("RefillCardServiceImpl[].add[].input.param:refillCard:{}"+refillCard);
 
+        if (refillCard.getCardNumber()==0||null==refillCard.getCardNumber()) {
+            return R.error("输入的卡数无效是无效值");
+        }
         //设置初始状态
         String time = DateUtil.getTime(new Date(), "yyyy.MM.dd.HH.mm.sss");
         refillCard.setBatchNumber(time);
@@ -53,7 +56,9 @@ public class RefillCardServiceImpl implements RefillCardService {
             return R.error("数据添加失败");
         }
 
-        //字卡添加
+        ArrayList<CardInfo> cardInfos = new ArrayList<>();
+
+        //子卡添加
         for (int i = 0; i < refillCard.getCardNumber(); i++) {
             CardInfo cardInfo = new CardInfo();
             cardInfo.setBanthNumber(time);
@@ -62,16 +67,18 @@ public class RefillCardServiceImpl implements RefillCardService {
             cardInfo.setStatus(0);
             cardInfo.setLimit(0);
             cardInfo.setSecretKey(SecretkeyUtil.getSecretkey());
-            int add1 = cardMapper.add(cardInfo);
-            if (add1==0) {
-                return R.error("数据添加失败");
-            }
+            cardInfos.add(cardInfo);
+        }
+        int add1 = cardMapper.add(cardInfos);
+
+        if (add1==0) {
+            R.error("数据添加失败");
         }
-        return R.ok();
+        return R.ok(0,true);
     }
 
     @Override
-    public R update(String batchNumber) {
+    public R<Boolean> update(String batchNumber) {
         log.info("RefillCardServiceImpl[].update[].input.param:batchNumber:{}"+batchNumber);
         if (StringUtils.isEmpty(batchNumber)) {
             return R.error("传入参数为空");
@@ -80,11 +87,11 @@ public class RefillCardServiceImpl implements RefillCardService {
         if (update==0) {
             return R.error("数据修改失败");
         }
-        return R.ok();
+        return R.ok(0,true);
     }
 
     @Override
-    public R getList(Integer pageNum, Integer pageSize) {
+    public R<PageInfo<RefillCardDto>> getList(Integer pageNum, Integer pageSize) {
         log.info("RefillCardServiceImpl[].getList[].input.param:pageNum,pageSize"+pageNum,pageSize);
         if (null == pageSize || pageSize == 0) {
             pageSize = 10;

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

@@ -68,7 +68,7 @@ public class SchemeServiceImpl extends ServiceImpl<SchemeMapper, SchemeInfo> imp
         //3、保存方案查询记录
         SchemeQueryRecord schemeQueryRecord = new SchemeQueryRecord();
         schemeQueryRecord.setMajorName("");
-        schemeQueryRecord.setStudentType(userInfo.getStudentType());
+        schemeQueryRecord.setStudentType(userInfo.getExamType());
         schemeQueryRecord.setUserId(userInfo.getId());
         schemeQueryRecord.setIsDelete(0);
         double score = Double.parseDouble(queryVo.getCultureGrade()) + Double.parseDouble(queryVo.getMajorGrade());

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

@@ -57,7 +57,7 @@ public class UserServiceImpl extends ServiceImpl<UsersMapper, UserInfo> implemen
         HashMap<String, Object> map = new HashMap<>(4);
 
         //将参数放入容器中
-        map.put("pageNo",queryVo.getPageNo());
+        map.put("pageNo",queryVo.getPageNo()-1);
         map.put("pageSize",queryVo.getPageSize());
         map.put("startTime",queryVo.getStartTime());
         map.put("endTime",queryVo.getEndTime());
@@ -78,12 +78,14 @@ public class UserServiceImpl extends ServiceImpl<UsersMapper, UserInfo> implemen
 
             //将消息进行同步
             BeanUtils.copyProperties(userInfo,userInfoDto);
+            userInfoDto.setUserId(userInfo.getId());
             userInfoDto.setCultureGrade(scoreInfo.getCultureGrade());
             userInfoDto.setMajorGrade(scoreInfo.getMajorGrade());
             userInfoDto.setRegisterTime(userInfo.getCreateTime());
             userInfoDto.setLastLoginTime(loginRecord.getUpdateTime());
             userInfoDto.setQueryLimit(userLimit.getUsableLimit());
             userInfoDto.setMoneyAmount(byId.getMoney());
+            userInfoDto.setIp(loginRecord.getIp());
             list.add(userInfoDto);
         }
 
@@ -92,6 +94,9 @@ public class UserServiceImpl extends ServiceImpl<UsersMapper, UserInfo> implemen
         info.setPageNum(queryVo.getPageNo());
         info.setTotal(usersMapper.getUserNumbers());
         info.setList(list);
+        if (info.getList().size()==0) {
+            return R.error("占时还没有用户");
+        }
         return R.ok(info);
     }
 
@@ -111,7 +116,7 @@ public class UserServiceImpl extends ServiceImpl<UsersMapper, UserInfo> implemen
         //2、要提交的用户信息
         user.setSchool(userInfo.getSchool());
         user.setSex(userInfo.getSex());
-        user.setStudentType(userInfo.getStudentType());
+        user.setExamType(userInfo.getStudentType());
         user.setUserName(userInfo.getUserName());
         user.setIsDelete(0);
 
@@ -162,7 +167,7 @@ public class UserServiceImpl extends ServiceImpl<UsersMapper, UserInfo> implemen
         userShowVo.setId(userInfo.getId());
         userShowVo.setSchool(userInfo.getSchool());
         userShowVo.setSex(userInfo.getSex());
-        userShowVo.setStudentType(userInfo.getStudentType());
+        userShowVo.setStudentType(userInfo.getExamType());
         userShowVo.setUserName(userInfo.getUserName());
 
         //获取成绩信息

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

@@ -33,11 +33,6 @@ public class AccountController {
     @PostMapping("/login")
     public R<AccountDto> getAccountInfo(String userName, String password){
         log.info("AccountController[].getAccountInfo[].input.param:userName,password"+userName,password);
-        //判断参数是否为空
-        if (StringUtils.isEmpty(userName)||StringUtils.isEmpty(password)) {
-            return R.error("账号或密码为空");
-        }
-        //查询管理员信息
         //返回数据
         return accountSerivce.getAccountInfo(userName, password);
     }

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

@@ -33,10 +33,6 @@ public class BannerController {
     @PostMapping("/add")
     public R<Boolean> add(@RequestBody Banner advertising) {
         log.info("BannerController[].add[].input.param:advertising:" + advertising);
-        if (StringUtils.isEmpty(advertising)) {
-            return R.error("输入参数无效");
-        }
-
         return bannerService.add(advertising);
     }
 
@@ -64,15 +60,10 @@ public class BannerController {
             @ApiImplicitParam(name = "status", value = "广告状态:0：暂停中 1：投放中", dataType = "int", required = true)
     })
     @GetMapping("/putIn")
-    public R putIn(Integer id, Integer status) {
+    public R<Boolean> putIn(Integer id, Integer status) {
         log.info("BannerController[].putIn[].input.param:id,status" + id, status);
-        R booleanR = bannerService.putIn(id, status);
-
-        //判断数据是否修改成功
-        if (booleanR.getCode() == 0) {
-            return booleanR;
-        }
-        return R.error("数据修改失败");
+        R<Boolean> booleanR = bannerService.putIn(id, status);
+        return booleanR;
     }
 
     @ApiOperation(value = "广告编辑", notes = "广告编辑", httpMethod = "POST")
@@ -80,14 +71,9 @@ public class BannerController {
             @ApiImplicitParam(name = "advertising", value = "广告修改数据", dataType = "Banner"),
     })
     @PostMapping("/edit")
-    public R edit(@RequestBody Banner advertising) {
+    public R<Boolean> edit(@RequestBody Banner advertising) {
         log.info("BannerController[].edit[].input.param:advertising:{}" + advertising);
-        R booleanR = bannerService.edit(advertising);
-
-        //判断数据是否修改成功
-        if (booleanR.getCode() == 0) {
-            return booleanR;
-        }
-        return R.error("数据修改失败");
+        R<Boolean> booleanR = bannerService.edit(advertising);
+        return booleanR;
     }
 }

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

@@ -29,22 +29,19 @@ public class RefillCardController {
     @ApiOperation(value = "充值卡管理",notes = "充值卡管理",httpMethod = "POST")
     @ApiImplicitParam(name = "numbers",value = "卡的数量",dataType="int",required = true)
     @PostMapping("/manage")
-    public R manage(Integer numbers){
+    public R<Boolean> manage(Integer numbers){
         log.info("RefillCardController[].manage[].input.param,numbers"+numbers);
-        if (numbers==0||null==numbers) {
-            return R.error("输入的卡数无效是无效值");
-        }
 
         //创建对象参数
         RefillCard refillCard = new RefillCard();
         refillCard.setCardNumber(numbers);
-        return refillCardService.add(refillCard);
+        return  refillCardService.add(refillCard);
     }
 
     @ApiOperation(value = "激活充值卡",notes = "激活充值卡",httpMethod = "POST")
     @ApiImplicitParam(name = "batchNumber",value = "批次号",dataType = "string",required = true)
     @PostMapping("/update")
-    public R update(String batchNumber){
+    public R<Boolean> update(String batchNumber){
         log.info("RefillCardController[].manage[].input.param,batchNumber"+batchNumber);
         return refillCardService.update(batchNumber);
     }

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

@@ -35,14 +35,9 @@ public class UserController {
       @PostMapping("/manage")
       public R manageUser(@RequestBody 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);
+          return userService.getUserList(queryVo);
       }