优化

src/main/java/com/template/MybatisPlusApplication.java

@@ -10,8 +10,6 @@ import springfox.documentation.swagger2.annotations.EnableSwagger2;
 @EnableCaching//开启缓存
 @SpringBootApplication
 @EnableTransactionManagement //开启事务回滚
-//@EnableScheduling // 开启定时任务
-//@EnableSwagger2
 public class MybatisPlusApplication {
 
     public static void main(String[] args) {

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

@@ -37,6 +37,11 @@ public interface LoginControllerAPI {
     CommonResult mobileLogin(@Validated @RequestBody mobileLoginRequest mlr, BindingResult bindingResult);
 
     @GetMapping(value = "/writeCarInfo")
-    @ApiOperation(value = "写入车闸", notes = "写入车闸", httpMethod = "GetMapping")
+    @ApiOperation(value = "写入车闸", notes = "写入车闸", httpMethod = "GET")
     CommonResult writeCarInfo();
+
+
+    @GetMapping(value = "/payResult")
+    @ApiOperation(value = "支付结果", notes = "支付结果", httpMethod = "GET")
+    CommonResult payResult(@RequestBody payResultRequest mlr);
 }

src/main/java/com/template/common/result/ResponseStatusEnum.java

@@ -9,7 +9,7 @@ public enum ResponseStatusEnum implements Code{
 
 
     SUCCESS(200, true, "操作成功！"),
-    NO_PERMISSION(401,false,"没有权限"),
+    NO_PERMISSION(500,false,"没有权限"),
     MISSING_REQUEST_HEADER(499,false,"缺少请求头"),
     FAILED(500, false, "操作失败！"),
     SEND_PARAMS(501,false,"传入参数数据结构错误"),
@@ -35,8 +35,8 @@ public enum ResponseStatusEnum implements Code{
     SYSTEM_MONGO_TIMEOUT_ERROR(555, false, "Mongo连接超时"),
     SYSTEM_PHONE_ERROR(556,false,"手机号格式错误"),
     SYSTEM_SEND_PHONE_ERROR(557,false,"发送验证码失败"),
-    SYSTEM_TOKEN_ERROR(401,false,"token为空"),
-    SYSTEM_LOGIN_ERROR(401,false,"无效token"),
+    SYSTEM_TOKEN_ERROR(500,false,"token为空"),
+    SYSTEM_LOGIN_ERROR(500,false,"无效token"),
     PARAM_ERROR(560, false, "参数不能为空！"),
     GZH_ERROR(561, false, "设置失败，请先关联公众号！"),
     THIRD_API_ERROR(997, false, "第三方api请求失败"),

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

@@ -1,5 +1,6 @@
 package com.template.controller;
 
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.google.gson.Gson;
 import com.google.gson.reflect.TypeToken;
@@ -21,6 +22,7 @@ import com.template.model.vo.*;
 import com.template.services.WelcomeAccountService;
 import com.template.services.WelcomeOrgService;
 import com.template.services.WelcomeStudentService;
+import io.swagger.annotations.ApiModelProperty;
 import org.apache.commons.io.IOUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -303,6 +305,20 @@ public class LoginController implements LoginControllerAPI {
         wlv.setSchool(campus);
         wlv.setSchoolId(campus == null ? 0 : eSchool.stringOf(campus));
 
+        //籍贯
+        wlv.setOprovinceId(student.getOprovinceId());
+        wlv.setOprovince(student.getOprovince());
+        wlv.setOcityId(student.getOcityId());
+        wlv.setOcity(student.getOcity());
+        wlv.setOdistrictId(student.getOdistrictId());
+        wlv.setOdistrict(student.getOdistrict());
+        wlv.setProvinceId(student.getProvinceId());
+        wlv.setProvince(student.getProvince());
+        wlv.setCityId(student.getCityId());
+        wlv.setCity(student.getCity());
+        wlv.setDistrictId(student.getDistrictId());
+        wlv.setDistrict(student.getDistrict());
+
         wlv.setPhone(student.getPhone().replace("(+86)", ""));
         wlv.setCollege(college == null ? "微校获取不到院校" : college);
         long expired = 1000 * 60 * 60 * 24 * 365;
@@ -354,4 +370,11 @@ public class LoginController implements LoginControllerAPI {
         String msg = HttpsClient.sendJson("http://istparking.sciseetech.com/public/visitor/do", json);
         return CommonResult.ok(msg);
     }
+
+    @Override
+    public CommonResult payResult(payResultRequest mlr) {
+        logger.info("支付回调信息，mlr参数：" + JSON.toJSON(mlr));
+
+        return CommonResult.ok();
+    }
 }

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

@@ -167,7 +167,7 @@ public class WelcomeDormitoryController implements WelcomeDormitoryControllerAPI
             return CommonResult.fail("编辑失败");
         }
 
-//        动态修改床位
+        //动态修改床位
         List<WelcomeBed> list = welcomeBedService.listWelcomeBed(welcomeDormitory.getId());
         if (list != null && list.size() > 0) {
             ArrayList<WelcomeBed> welcomeBeds = new ArrayList<>();

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

@@ -169,8 +169,8 @@ public class WelcomeStudentController implements WelcomeStudentControllerAPI {
         List<WelcomeFamily> wfs = new ArrayList<>();
         if (isr.getFvs() != null && isr.getFvs().size() > 0) {
             for (InsertFamilyRequest family : isr.getFvs()) {
-                if(!(StringUtils.hasText(family.getFamilyShip()) && StringUtils.hasText(family.getName())
-                && StringUtils.hasText(family.getWorkUnit()) && StringUtils.hasText(family.getPhone()))){
+                if (!(StringUtils.hasText(family.getFamilyShip()) && StringUtils.hasText(family.getName())
+                        && StringUtils.hasText(family.getWorkUnit()) && StringUtils.hasText(family.getPhone()))) {
                     return CommonResult.fail("家庭成员信息不能为空！");
                 }
                 WelcomeFamily wf = new WelcomeFamily();
@@ -188,7 +188,7 @@ public class WelcomeStudentController implements WelcomeStudentControllerAPI {
         List<WelcomeAccompany> was = new ArrayList<>();
         if (isr.getAvs() != null && isr.getAvs().size() > 0) {
             for (InsertAccompanyRequest accompany : isr.getAvs()) {
-                if(!(StringUtils.hasText(accompany.getName()) && StringUtils.hasText(accompany.getPhone()))){
+                if (!(StringUtils.hasText(accompany.getName()) && StringUtils.hasText(accompany.getPhone()))) {
                     return CommonResult.fail("陪同人员信息不能为空！");
                 }
                 WelcomeAccompany wa = new WelcomeAccompany();
@@ -204,7 +204,7 @@ public class WelcomeStudentController implements WelcomeStudentControllerAPI {
         //region 宿舍信息
         WelcomeBed bedData = welcomeBedService.queryBedData(isr.getSchool(), isr.getBuildId(), isr.getDormitoryId(), Integer.valueOf(isr.getBed()));
         if (bedData != null) {
-            if(StringUtils.hasText(bedData.getStudentCard())){
+            if (StringUtils.hasText(bedData.getStudentCard())) {
                 return CommonResult.fail("当前床位已被他人入住，无法入住");
             }
             bedData.setStudentCard(isr.getCardId());
@@ -324,8 +324,8 @@ public class WelcomeStudentController implements WelcomeStudentControllerAPI {
         List<WelcomeFamily> wfs = new ArrayList<>();
         if (usr.getFvs() != null && usr.getFvs().size() > 0) {
             for (InsertFamilyRequest family : usr.getFvs()) {
-                if(!(StringUtils.hasText(family.getFamilyShip()) && StringUtils.hasText(family.getName())
-                        && StringUtils.hasText(family.getWorkUnit()) && StringUtils.hasText(family.getPhone()))){
+                if (!(StringUtils.hasText(family.getFamilyShip()) && StringUtils.hasText(family.getName())
+                        && StringUtils.hasText(family.getWorkUnit()) && StringUtils.hasText(family.getPhone()))) {
                     return CommonResult.fail("家庭成员信息不能为空！");
                 }
                 WelcomeFamily wf = new WelcomeFamily();
@@ -343,7 +343,7 @@ public class WelcomeStudentController implements WelcomeStudentControllerAPI {
         List<WelcomeAccompany> was = new ArrayList<>();
         if (usr.getAvs() != null && usr.getAvs().size() > 0) {
             for (InsertAccompanyRequest accompany : usr.getAvs()) {
-                if(!(StringUtils.hasText(accompany.getName()) && StringUtils.hasText(accompany.getPhone()))){
+                if (!(StringUtils.hasText(accompany.getName()) && StringUtils.hasText(accompany.getPhone()))) {
                     return CommonResult.fail("陪同人员信息不能为空！");
                 }
                 WelcomeAccompany wa = new WelcomeAccompany();
@@ -360,7 +360,7 @@ public class WelcomeStudentController implements WelcomeStudentControllerAPI {
         List<WelcomeBed> bedDatas = new ArrayList<>();
         WelcomeBed bedData = welcomeBedService.queryBedData(usr.getSchool(), usr.getBuildId(), usr.getDormitoryId(), Integer.valueOf(usr.getBed()));
         if (bedData != null) {//新床位
-            if(StringUtils.hasText(bedData.getStudentCard()) && !bedData.getStudentCard().equals(student.getCardId())){
+            if (StringUtils.hasText(bedData.getStudentCard()) && !bedData.getStudentCard().equals(student.getCardId())) {
                 return CommonResult.fail("当前床位已被他人入住，无法入住");
             }
             if (!StringUtils.hasText(bedData.getStudentCard())) {
@@ -589,7 +589,7 @@ public class WelcomeStudentController implements WelcomeStudentControllerAPI {
         ws.setAdmissNum(icr.getAdmissNum());
         ws.setName(icr.getName());
         ws.setPicture(icr.getPicture());
-        ws.setCardId(icr.getCardId());
+        //ws.setCardId(icr.getCardId());
         ws.setSex(icr.getSex());
         ws.setBirthday(icr.getBirthday());
         ws.setCollegeId(icr.getCollegeId());
@@ -627,7 +627,7 @@ public class WelcomeStudentController implements WelcomeStudentControllerAPI {
         List<WelcomeFamily> wfs = new ArrayList<>();
         if (icr.getFvs() != null && icr.getFvs().size() > 0) {
             for (FamilyVo fv : icr.getFvs()) {
-                if(!(StringUtils.hasText(fv.getName()) && StringUtils.hasText(fv.getPhone()) && StringUtils.hasText(fv.getWorkUnit()) && StringUtils.hasText(fv.getFamilyShip()))){
+                if (!(StringUtils.hasText(fv.getName()) && StringUtils.hasText(fv.getPhone()) && StringUtils.hasText(fv.getWorkUnit()) && StringUtils.hasText(fv.getFamilyShip()))) {
                     return CommonResult.fail("家庭成员信息不能为空！");
                 }
 
@@ -645,7 +645,7 @@ public class WelcomeStudentController implements WelcomeStudentControllerAPI {
         List<WelcomeAccompany> was = new ArrayList<>();
         if (icr.getAvs() != null && icr.getAvs().size() > 0) {
             for (AccompanyVo av : icr.getAvs()) {
-                if(!(StringUtils.hasText(av.getName()) && StringUtils.hasText(av.getPhone()))){
+                if (!(StringUtils.hasText(av.getName()) && StringUtils.hasText(av.getPhone()))) {
                     return CommonResult.fail("家庭成员信息不能为空！");
                 }
 
@@ -659,33 +659,49 @@ public class WelcomeStudentController implements WelcomeStudentControllerAPI {
 
         try {
             System.out.println("信息采集1");
-            boolean resultWs = welcomeStudentService.saveOrUpdate(ws);
-            System.out.println("信息采集1.2");
-            if (!resultWs) {
-                System.out.println("信息采集1.1");
-                logger.error("采集学生信息失败，ws参数：" + JSON.toJSON(ws));
-                throw new Exception("采集学生信息失败！");
-                //return CommonResult.fail("采集学生信息失败1");
+
+            if (ws.getId() != null) {
+                int update = welcomeStudentService.updateWelcomeStudent(ws);
+                if (update < 0) {
+                    System.out.println("信息采集1.1");
+                    logger.error("采集学生信息失败，ws参数：" + JSON.toJSON(ws));
+                    throw new Exception("采集学生信息失败！");
+                    //return CommonResult.fail("采集学生信息失败1");
+                }
+            }else{
+                int insert = welcomeStudentService.insertWelcomeStudent(ws);
+                if (insert < 0) {
+                    System.out.println("信息采集1.2");
+                    logger.error("采集学生信息失败，ws参数：" + JSON.toJSON(ws));
+                    throw new Exception("采集学生信息失败！");
+                    //return CommonResult.fail("采集学生信息失败1");
+                }
             }
             System.out.println("信息采集2");
-            boolean resultWf = welcomeFamilyService.saveBatch(wfs);
-            System.out.println("信息采集1.3");
-            if (!resultWf) {
-                System.out.println("信息采集1.4");
-                logger.error("采集学生信息失败，wfs参数：" + JSON.toJSON(wfs));
-                throw new Exception("采集学生信息失败！");
-                //return CommonResult.fail("采集学生信息失败2");
+            if (wfs != null && wfs.size() > 0) {
+                boolean resultWf = welcomeFamilyService.saveBatch(wfs);
+                System.out.println("信息采集1.3");
+                if (!resultWf) {
+                    System.out.println("信息采集1.4");
+                    logger.error("采集学生信息失败，wfs参数：" + JSON.toJSON(wfs));
+                    throw new Exception("采集学生信息失败！");
+                    //return CommonResult.fail("采集学生信息失败2");
+                }
             }
+
             System.out.println("信息采集3");
-            boolean resultWa = welcomeAccompanyService.saveBatch(was);
-            System.out.println("信息采集1.5");
-            if (!resultWa) {
-                System.out.println("信息采集1.6");
-                logger.error("采集学生信息失败，was参数：" + JSON.toJSON(was));
-                throw new Exception("采集学生信息失败！");
-                //return CommonResult.fail("采集学生信息失败3");
+            if (was != null && was.size() > 0) {
+                boolean resultWa = welcomeAccompanyService.saveBatch(was);
+                System.out.println("信息采集1.5");
+                if (!resultWa) {
+                    System.out.println("信息采集1.6");
+                    logger.error("采集学生信息失败，was参数：" + JSON.toJSON(was));
+                    throw new Exception("采集学生信息失败！");
+                    //return CommonResult.fail("采集学生信息失败3");
+                }
             }
 
+
         } catch (Exception e) {
             logger.error(e.getMessage());
             throw new Exception("采集失败！");
@@ -939,7 +955,7 @@ public class WelcomeStudentController implements WelcomeStudentControllerAPI {
                         WelcomeStudent studentData = new WelcomeStudent();
 
                         String assNum = dataFormatter.formatCellValue(row.getCell(1));//录取号
-                        if(!StringUtils.hasText(assNum)){
+                        if (!StringUtils.hasText(assNum)) {
                             break;
                         }
                         studentData.setAdmissNum(assNum);
@@ -1201,7 +1217,7 @@ public class WelcomeStudentController implements WelcomeStudentControllerAPI {
 
                         String assNum = dataFormatter.formatCellValue(row.getCell(1));//录取号
 
-                        if(!StringUtils.hasText(assNum)){
+                        if (!StringUtils.hasText(assNum)) {
                             break;
                         }
                         studentData.setAdmissNum(assNum);
@@ -1403,25 +1419,25 @@ public class WelcomeStudentController implements WelcomeStudentControllerAPI {
     public CommonResult studentOverview() {
 
         QueryWrapper<WelcomeStudent> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("iden_type",1);
-        queryWrapper.eq("fill_status","已填报");
+        queryWrapper.eq("iden_type", 1);
+        queryWrapper.eq("fill_status", "已填报");
 //        报到总数
         int studentTotal = welcomeStudentService.count(queryWrapper);
 //        寝室总数
         int dormitoryTotal = welcomeDormitoryService.count(new QueryWrapper<>());
 
-        int payCount=welcomeStudentService.payCount();
+        int payCount = welcomeStudentService.payCount();
 //        已入住寝室数
-        LambdaQueryWrapper<WelcomeDormitory> wrapper=new LambdaQueryWrapper<>();
-        wrapper.ne(WelcomeDormitory::getStatus,2);
+        LambdaQueryWrapper<WelcomeDormitory> wrapper = new LambdaQueryWrapper<>();
+        wrapper.ne(WelcomeDormitory::getStatus, 2);
         int count = welcomeDormitoryService.count(wrapper);
 
         LocalDateTime start = LocalDateTime.now().withHour(0).withMinute(0).withSecond(0);
         LocalDateTime end = start.plusDays(1);
         DateTimeFormatter dateTimeFormatter1 = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
-        Integer visitorTotal=welcomeVisitorService.countTotal(start,end);
+        Integer visitorTotal = welcomeVisitorService.countTotal(start, end);
         List<WelcomeSetting> wss = welcomeSettingService.list(null);
-        Integer carTotal =wss !=null && wss.size() > 0 ? wss.get(0).getCarNum() : 0;
+        Integer carTotal = wss != null && wss.size() > 0 ? wss.get(0).getCarNum() : 0;
 
         StudentOverviewVo vo = new StudentOverviewVo();
         vo.setEnrollmentTotal(6532);
@@ -1477,10 +1493,10 @@ public class WelcomeStudentController implements WelcomeStudentControllerAPI {
         List<WelcomeSchool> list = welcomeSchoolService.list(new QueryWrapper<>());
         for (WelcomeSchool welcomeSchool : list) {
             Integer schoolId = welcomeSchool.getId();
-            List<WelcomeBuild> builds=welcomeBuildService.getBuild(schoolId);
+            List<WelcomeBuild> builds = welcomeBuildService.getBuild(schoolId);
             for (WelcomeBuild build : builds) {
                 Integer buildId = build.getId();
-                StudentStayVo vo =welcomeDormitoryService.getTotalCount(buildId);
+                StudentStayVo vo = welcomeDormitoryService.getTotalCount(buildId);
                 vo.setSchoolName(welcomeSchool.getSchool());
                 vo.setBuildName(build.getBuild());
                 vos.add(vo);
@@ -1491,7 +1507,7 @@ public class WelcomeStudentController implements WelcomeStudentControllerAPI {
     }
 
     @Override
-    public CommonResult queryStudentByToken( String userId) {
+    public CommonResult queryStudentByToken(String userId) {
         WelcomeStudent student = welcomeStudentService.getManageById(Integer.valueOf(userId));
         return CommonResult.ok(student);
     }

src/main/java/com/template/core/JwtAuthenticationInterceptor.java

@@ -58,7 +58,7 @@ public class JwtAuthenticationInterceptor implements HandlerInterceptor {
             //加上这个可以让浏览器那里得到浏览器的401：response.setStatus(HttpServletResponse.SC_UNAUTHORIZED);
             response.setCharacterEncoding("UTF-8");
             response.setContentType("application/json; charset=utf-8");
-            response.setStatus(401);
+            //response.setStatus(401);
             JSONObject res = new JSONObject();
             res.put("code", ResponseStatusEnum.SYSTEM_LOGIN_ERROR.getStatus());
             res.put("message",  ResponseStatusEnum.SYSTEM_LOGIN_ERROR.getMsg());
@@ -81,9 +81,9 @@ public class JwtAuthenticationInterceptor implements HandlerInterceptor {
                 //加上这个可以让浏览器那里得到浏览器的401：response.setStatus(HttpServletResponse.SC_UNAUTHORIZED);
                 response.setCharacterEncoding("UTF-8");
                 response.setContentType("application/json; charset=utf-8");
-                response.setStatus(401);
+                //response.setStatus(401);
                 JSONObject res = new JSONObject();
-                res.put("code", 401);
+                res.put("code", 500);
                 res.put("message",  "登录凭证已过期，请重新登录！");
                 res.put("success", false);
                 PrintWriter out = null;

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

@@ -0,0 +1,26 @@
+package com.template.model.request;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+
+/**
+ * 登录请求参数
+ */
+@Data
+public class payResultRequest {
+    /**
+     * 订单号
+     */
+    private String Ddh;
+
+    /**
+     * 支付结果
+     */
+    private String Res;
+
+    /**
+     * 加密串
+     */
+    private String Sign;
+}

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

@@ -81,19 +81,19 @@ public class wxLoginVo {
     @ApiModelProperty(value = "手机号码")
     private String phone;
 
-    @ApiModelProperty(value = "籍贯省")
+    @ApiModelProperty(value = "籍贯省ID")
     private Integer oprovinceId;
 
-    @ApiModelProperty(value = "籍贯区")
+    @ApiModelProperty(value = "籍贯省")
     private String oprovince;
 
-    @ApiModelProperty(value = "籍贯市")
+    @ApiModelProperty(value = "籍贯市ID")
     private Integer ocityId;
 
-    @ApiModelProperty(value = "籍贯区")
+    @ApiModelProperty(value = "籍贯市")
     private String ocity;
 
-    @ApiModelProperty(value = "籍贯区")
+    @ApiModelProperty(value = "籍贯区ID")
     private Integer odistrictId;
 
     @ApiModelProperty(value = "籍贯区")