添加相关ID

src/main/java/com/template/api/LoginControllerAPI.java

@@ -31,4 +31,8 @@ public interface LoginControllerAPI {
     @GetMapping(value = "/Openid")
     @ApiOperation(value = "微校授权", notes = "微校授权", httpMethod = "GET")
     CommonResult Openid(@RequestParam String wxcode) throws Exception;
+
+    @PostMapping(value = "/mobileLogin")
+    @ApiOperation(value = "移动端登录", notes = "移动端登录", httpMethod = "POST")
+    CommonResult mobileLogin(@Validated @RequestBody mobileLoginRequest mlr, BindingResult bindingResult);
 }

src/main/java/com/template/controller/LoginController.java

@@ -11,12 +11,14 @@ import com.template.config.WxOpenidConfig;
 import com.template.model.enumModel.eIdentityTypeStatu;
 import com.template.model.enumModel.eStatu;
 import com.template.model.pojo.WelcomeAccount;
+import com.template.model.pojo.WelcomeOrg;
 import com.template.model.pojo.WelcomeStudent;
 import com.template.model.request.*;
 import com.template.model.result.CommonResult;
 import com.template.model.result.Wx_user;
 import com.template.model.vo.*;
 import com.template.services.WelcomeAccountService;
+import com.template.services.WelcomeOrgService;
 import com.template.services.WelcomeStudentService;
 import org.apache.commons.io.IOUtils;
 import org.slf4j.Logger;
@@ -51,6 +53,8 @@ public class LoginController implements LoginControllerAPI {
     private WelcomeAccountService welcomeAccountService;
     @Resource
     private WelcomeStudentService welcomeStudentService;
+    @Resource
+    private WelcomeOrgService welcomeOrgService;
 
     private static Logger logger = LoggerFactory.getLogger(LoginController.class);
 
@@ -93,7 +97,7 @@ public class LoginController implements LoginControllerAPI {
             return CommonResult.fail("密码错误");
         }
 
-        TokenDateVo tokenDate = JWTUtil.getToken(result.getId(),null);
+        TokenDateVo tokenDate = JWTUtil.getToken(result.getId(), null);
         String token = tokenDate == null ? "" : tokenDate.getToken();
         Date expireTime = tokenDate == null ? new Date() : tokenDate.getExpireTime();
         LoginVO login = new LoginVO();
@@ -145,7 +149,7 @@ public class LoginController implements LoginControllerAPI {
     @PassToken
     @Transactional(rollbackFor = {Exception.class})
     public CommonResult Openid(String wxcode) throws Exception {
-        System.out.println("微校授权："+wxcode);
+        System.out.println("微校授权：" + wxcode);
         Gson gson = new Gson();
         String tokenUrl = "https://open.wecard.qq.com/connect/oauth2/token";
         Map<String, String> tokenParams = new HashMap<>();
@@ -174,22 +178,20 @@ public class LoginController implements LoginControllerAPI {
         String card_number = null;
         String user_name = null;
         String phone = null;
-        int identity_type = 0;
         String college = null;
         String grade = null;
         String profession = null;
         String campus = null;
         String id_card = null;
         String classStr = null;
-        System.out.println("微校授权获取用户信息："+userinfo);
+        System.out.println("微校授权获取用户信息：" + userinfo);
         Wx_user userinfos = gson.fromJson(userinfo, new TypeToken<Wx_user>() {
         }.getType());
-        System.out.println("微校授权获取用户信息类别："+userinfos.getIdentity_type());
+        System.out.println("微校授权获取用户信息类别：" + userinfos.getIdentity_type());
         try {
             card_number = userinfos.getCard_number();
             user_name = userinfos.getName();
             phone = userinfos.getTelephone();
-            identity_type = userinfos.getIdentity_type();
             college = userinfos.getCollege();
             classStr = userinfos.getClassStr();
             grade = userinfos.getGrade();
@@ -198,7 +200,7 @@ public class LoginController implements LoginControllerAPI {
             id_card = userinfos.getId_card();
 
         } catch (Exception e) {
-            System.out.println("微校授权异常信息："+e.getMessage());
+            System.out.println("微校授权异常信息：" + e.getMessage());
             return CommonResult.fail(e.getMessage());
         }
 
@@ -212,11 +214,11 @@ public class LoginController implements LoginControllerAPI {
         //   return CommonResult.fail("非法权限，授权失败");
         //}
 
-        System.out.println("微校授权校区："+campus);
+        System.out.println("微校授权校区：" + campus);
 
         Integer studentId = 0;
         if (student == null) {
-            try{
+            try {
                 student = new WelcomeStudent();
                 student.setAdmissNum(card_number);
                 student.setName(user_name);
@@ -227,15 +229,15 @@ public class LoginController implements LoginControllerAPI {
                 student.setCardId(id_card);//身份证号
                 int num = welcomeStudentService.insertWelcomeStudent(student);
                 if (num <= 0) {
-                    System.out.println("微校授权失败，学生信息新增异常："+user_name+""+card_number);
+                    System.out.println("微校授权失败，学生信息新增异常：" + user_name + "" + card_number);
                     throw new Exception("微校授权失败！");
                 }
                 studentId = num;
-            }catch (Exception e){
-                System.out.println("微校授权异常信息："+e.getMessage());
+            } catch (Exception e) {
+                System.out.println("微校授权异常信息：" + e.getMessage());
                 throw new Exception("微校授权失败！");
             }
-        }else{
+        } else {
             //更新微校获取的年纪信息
             student.setAdmissNum(card_number);
             student.setName(user_name);
@@ -247,22 +249,60 @@ public class LoginController implements LoginControllerAPI {
 
             int num = welcomeStudentService.updateWelcomeStudent(student);
             if (num <= 0) {
-                System.out.println("微校授权失败，用户信息新增异常："+user_name+""+card_number);
+                System.out.println("微校授权失败，用户信息新增异常：" + user_name + "" + card_number);
                 throw new Exception("微校授权失败！");
             }
             studentId = student.getId();
         }
-
         wxLoginVo wlv = new wxLoginVo();
+        List<WelcomeOrg> orgs = welcomeOrgService.queryDatas(college, profession, classStr);
+        if (orgs != null && orgs.size() > 0) {
+            for (WelcomeOrg org : orgs) {
+                if (org.getName().equals(college)) {
+                    wlv.setCollegeId(org.getId());
+                    wlv.setCollege(college);
+                }
+
+                if (org.getName().equals(profession)) {
+                    wlv.setMajorId(org.getId());
+                    wlv.setMajor(profession);
+                }
+                if (org.getName().equals(classStr)) {
+                    wlv.setClassstrId(org.getId());
+                    wlv.setClassstr(classStr);
+                }
+            }
+        }
+        wlv.setId(studentId);
+        wlv.setAdmissNum(card_number);
+        wlv.setName(user_name);
+        wlv.setPicture(student.getPicture());
+        wlv.setCardId(id_card);
+        wlv.setSex(student.getSex());
 
-        wlv.setUserId(studentId);
-        wlv.setUserName(student.getName());
-        wlv.setUserPhone(student.getPhone().replace("(+86)",""));
+        wlv.setPhone(student.getPhone().replace("(+86)", ""));
         wlv.setCollege(college == null ? "微校获取不到院校" : college);
         long expired = 1000 * 60 * 60 * 24 * 365;
         TokenDateVo token = JWTUtil.getToken(student.getId(), expired);
         wlv.setToken(token.getToken());
-        System.out.println("微校授权成功："+user_name+""+card_number);
+        System.out.println("微校授权成功：" + user_name + "" + card_number);
         return CommonResult.ok(wlv);
     }
+
+    @Override
+    public CommonResult mobileLogin(mobileLoginRequest mlr, BindingResult bindingResult) {
+        if (mlr == null) {
+            return CommonResult.fail("请传递参数");
+        }
+        if (bindingResult.hasErrors()) {
+            String st = paramUtils.getParamError(bindingResult);
+            return CommonResult.fail(st);
+        }
+
+        WelcomeStudent student = welcomeStudentService.getDataByIdcardOrNum(mlr.getAdmissNum(), mlr.getCardId());
+        if(student == null){
+            student = new WelcomeStudent();
+        }
+        return CommonResult.ok(student);
+    }
 }

src/main/java/com/template/model/pojo/WelcomeBed.java

@@ -34,15 +34,24 @@ public class WelcomeBed implements Serializable {
     @TableId(value = "id", type = IdType.AUTO)
     private Integer id;
 
+    @ApiModelProperty(value = "床位号")
+    private Integer number;
+
     @ApiModelProperty(value = "学生身份证号")
     private String studentCard;
 
     @ApiModelProperty(value = "校区名称")
     private String school;
 
+    @ApiModelProperty(value = "楼栋ID")
+    private Integer buildId;
+
     @ApiModelProperty(value = "楼栋名称")
     private String build;
 
+    @ApiModelProperty(value = "寝室ID")
+    private Integer dormitoryId;
+
     @ApiModelProperty(value = "寝室号")
     private String dormitory;
 

src/main/java/com/template/model/pojo/WelcomeStudentDormitory.java

@@ -46,6 +46,15 @@ public class WelcomeStudentDormitory implements Serializable {
     @ApiModelProperty(value = "床位号")
     private String bedNum;
 
+    @ApiModelProperty(value = "楼栋ID")
+    private Integer buildingId;
+
+    @ApiModelProperty(value = "寝室ID")
+    private Integer dormitoryId;
+
+    @ApiModelProperty(value = "床位ID")
+    private Integer bedId;
+
     @ApiModelProperty(value = "创建时间")
     @TableField(fill = FieldFill.INSERT)
     private Date createTime;

src/main/java/com/template/model/request/mobileLoginRequest.java

@@ -0,0 +1,23 @@
+package com.template.model.request;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+
+/**
+ * 登录请求参数
+ */
+@Data
+public class mobileLoginRequest {
+    /**
+     * 录取号
+     */
+    @NotBlank(message = "录取号不能为空")
+    private String admissNum;
+
+    /**
+     * 身份证号
+     */
+    @NotBlank(message = "身份证号不能为空")
+    private String cardId;
+}

src/main/java/com/template/model/vo/wxLoginVo.java

@@ -1,7 +1,10 @@
 package com.template.model.vo;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.math.BigDecimal;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -13,22 +16,140 @@ import java.util.List;
 @Data
 public class wxLoginVo {
 
-    /**
-     * 用户ID
-     */
-    private int userId;
-    /**
-     * 用户名称
-     */
-    private String userName;
-    /**
-     * 用户手机号
-     */
-    private String userPhone;
-    /**
-     * 学院
-     */
+    private Integer id;
+
+    @ApiModelProperty(value = "录取号")
+    private String admissNum;
+
+    @ApiModelProperty(value = "姓名")
+    private String name;
+
+    @ApiModelProperty(value = "照片")
+    private String picture;
+
+    @ApiModelProperty(value = "身份证号")
+    private String cardId;
+
+    @ApiModelProperty(value = "性别")
+    private String sex;
+
+    @ApiModelProperty(value = "出生年月")
+    private String birthday;
+
+    @ApiModelProperty(value = "院系")
     private String college;
+
+    @ApiModelProperty(value = "院系ID")
+    private Integer collegeId;
+
+    @ApiModelProperty(value = "专业")
+    private String major;
+
+    @ApiModelProperty(value = "专业ID")
+    private Integer majorId;
+
+    @ApiModelProperty(value = "班级")
+    private String classstr;
+
+    @ApiModelProperty(value = "班级ID")
+    private Integer classstrId;
+
+    @ApiModelProperty(value = "考生号")
+    private String examNum;
+
+    @ApiModelProperty(value = "学制")
+    private String eduSystem;
+
+    @ApiModelProperty(value = "毕业中学")
+    private String graduationSchool;
+
+    @ApiModelProperty(value = "批次")
+    private String batchValue;
+
+    @ApiModelProperty(value = "政治面貌")
+    private String politicalStatu;
+
+    @ApiModelProperty(value = "民族")
+    private String nationality;
+
+    @ApiModelProperty(value = "手机号码")
+    private String phone;
+
+    @ApiModelProperty(value = "籍贯省")
+    private Integer oprovinceId;
+
+    @ApiModelProperty(value = "籍贯区")
+    private String oprovince;
+
+    @ApiModelProperty(value = "籍贯市")
+    private Integer ocityId;
+
+    @ApiModelProperty(value = "籍贯区")
+    private String ocity;
+
+    @ApiModelProperty(value = "籍贯区")
+    private Integer odistrictId;
+
+    @ApiModelProperty(value = "籍贯区")
+    private String odistrict;
+
+    @ApiModelProperty(value = "省ID")
+    private Integer provinceId;
+
+    @ApiModelProperty(value = "省")
+    private String province;
+
+    @ApiModelProperty(value = "市ID")
+    private Integer cityId;
+
+    @ApiModelProperty(value = "市")
+    private String city;
+
+    @ApiModelProperty(value = "区ID")
+    private Integer districtId;
+
+    @ApiModelProperty(value = "区")
+    private String district;
+
+    @ApiModelProperty(value = "家庭住址")
+    private String address;
+
+    @ApiModelProperty(value = "交通方式")
+    private String trafficMethod;
+
+    @ApiModelProperty(value = "填报状态")
+    private String fillStatus;
+
+    @ApiModelProperty(value = "到站地点")
+    private String arrive;
+
+    @ApiModelProperty(value = "到站日期")
+    private Date arrvieDate;
+
+    @ApiModelProperty(value = "到站时间")
+    private String arriveTime;
+
+    @ApiModelProperty(value = "到站时间段")
+    private Integer arriveTimeId;
+
+    @ApiModelProperty(value = "应缴金额")
+    private BigDecimal amountPayable;
+
+    @ApiModelProperty(value = "实付金额")
+    private BigDecimal payAmount;
+
+    @ApiModelProperty(value = "是否自驾")
+    private Integer isDrive;
+
+    @ApiModelProperty(value = "是否按时报到")
+    private Integer registerOntime;
+
+    @ApiModelProperty(value = "邮编")
+    private String zipCode;
+
+    @ApiModelProperty(value = "车牌号")
+    private String carNumber;
+
     /**
      * 用户token
      * 移动端的token永久有效

src/main/java/com/template/services/WelcomeOrgService.java

@@ -7,7 +7,7 @@ import java.util.List;
 
 /**
  * <p>
- *  服务类
+ * 服务类
  * </p>
  *
  * @author ceshi
@@ -22,4 +22,6 @@ public interface WelcomeOrgService extends IService<WelcomeOrg> {
 
     //获取班级下拉数据
     List<WelcomeOrg> queryClasss(Integer majorId);
+
+    List<WelcomeOrg> queryDatas(String college, String major, String classstr);
 }

src/main/java/com/template/services/WelcomeStudentService.java

@@ -31,4 +31,5 @@ public interface WelcomeStudentService extends IService<WelcomeStudent> {
 
     PageUtils<StudentPageVo> queryStudentPageList(int currentPage, int pageCount, Integer collegeId, Integer majorId, Integer classstrId, String trafficMethod ,String name);
 
+    WelcomeStudent getDataByIdcardOrNum(String admissNum,String cardId);
 }

src/main/java/com/template/services/impl/WelcomeOrgServiceImpl.java

@@ -4,10 +4,12 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.template.mapper.WelcomePaySettingMapper;
 import com.template.model.pojo.WelcomeOrg;
 import com.template.mapper.WelcomeOrgMapper;
+import com.template.model.pojo.WelcomeStudent;
 import com.template.services.WelcomeOrgService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.util.StringUtils;
 
 import java.util.List;
 
@@ -50,4 +52,16 @@ public class WelcomeOrgServiceImpl extends ServiceImpl<WelcomeOrgMapper, Welcome
         List<WelcomeOrg> result = welcomeOrgMapper.selectList(queryWrapper);
         return result;
     }
+
+    @Override
+    public List<WelcomeOrg> queryDatas(String college, String major, String classstr) {
+        QueryWrapper<WelcomeOrg> queryWrapper = new QueryWrapper<>();
+        queryWrapper.and(e -> e.eq(StringUtils.hasText(college), "name", college)
+                .or()
+                .eq(StringUtils.hasText(major), "name", major)
+                .or()
+                .eq(StringUtils.hasText(classstr), "name", classstr));
+        List<WelcomeOrg> result = welcomeOrgMapper.selectList(queryWrapper);
+        return result;
+    }
 }

src/main/java/com/template/services/impl/WelcomeStudentServiceImpl.java

@@ -16,6 +16,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.StringUtils;
 
+import java.util.List;
+
 /**
  * <p>
  *  服务实现类
@@ -80,4 +82,14 @@ public class WelcomeStudentServiceImpl extends ServiceImpl<WelcomeStudentMapper,
         IPage<StudentPageVo> result = welcomeStudentMapper.queryStudentPageList(page, collegeId, majorId, classstrId, trafficMethod, name);
         return new PageUtils(result);
     }
+
+    @Override
+    public WelcomeStudent getDataByIdcardOrNum(String admissNum, String cardId) {
+        QueryWrapper<WelcomeStudent> queryWrapper = new QueryWrapper<>();
+        queryWrapper.and(e -> e.eq(StringUtils.hasText(admissNum), "admiss_num", admissNum)
+                .or()
+                .eq(StringUtils.hasText(cardId), "card_id", cardId));
+        List<WelcomeStudent> result = welcomeStudentMapper.selectList(queryWrapper);
+        return (result != null && result.size() > 0) ? result.get(0) : new WelcomeStudent();
+    }
 }