Browse Source

1、修改订单同时提交锁单逻辑
2、修改重复支付删除账单逻辑
3、优化水费缴纳宿舍号截取判断

Bingo 3 years atrás
parent
commit
f5a60f0539

+ 2 - 0
src/main/java/com/chuanghai/smartschool/tuitionpayment/controller/DormRoomController.java

@@ -41,6 +41,7 @@ public class DormRoomController {
      */
     @GetMapping(value = "queryAllBuild")
     public CommonResult queryAllBuild(){
+
         List<DormBuild> buildList;
         try {
             buildList = dormBuildService.queryAllBuild();
@@ -56,6 +57,7 @@ public class DormRoomController {
      */
     @GetMapping(value = "queryAllFloor")
     public CommonResult queryAllFloorByBuildID(String buildId){
+
         List<DormFloor> floorList;
         try {
             floorList = dormFloorService.queryAllFloorByBuildID(buildId);

+ 17 - 3
src/main/java/com/chuanghai/smartschool/tuitionpayment/controller/FeedbackMsgController.java

@@ -63,10 +63,24 @@ public class FeedbackMsgController {
         feedbackMsgCreateTO.setFeedbackNoticeType("1");
         if (feedbackMsgCreateTO.getFeedbackRoom() != null) {
             String dorm = feedbackMsgCreateTO.getFeedbackRoom();
-            if (dorm.contains("层")) {
-                int indexD = dorm.indexOf("栋");
-                dorm = dorm.substring(0, indexD + 1) + dorm.split("层")[1];
+//            if (dorm.contains("层")) {
+//                int indexD = dorm.indexOf("栋");
+//                dorm = dorm.substring(0, indexD + 1) + dorm.split("层")[1];
+//                feedbackMsgCreateTO.setFeedbackRoom(dorm);
+//            }
+            //判断如果出现 22栋副2层2号  这个样式的寝室,直接不做宿舍号截取
+            if (!(dorm.contains("副"))) {
+                if ((dorm.contains("单元"))) {
+                    int indexD = dorm.indexOf("元");
+                    dorm = dorm.substring(0, indexD + 1) + dorm.split("层")[1];
+                } else {
+                    if (dorm.contains("层")) {
+                        int indexD = dorm.indexOf("栋");
+                        dorm = dorm.substring(0, indexD + 1) + dorm.split("层")[1];
+                    }
+                }
                 feedbackMsgCreateTO.setFeedbackRoom(dorm);
+
             }
         }
         //TODO 此处cardNumber应为身份证号

+ 17 - 13
src/main/java/com/chuanghai/smartschool/tuitionpayment/controller/PayController.java

@@ -63,35 +63,39 @@ public class PayController {
 
         WechatJsApiPayParamVO jsApiPayParam = payService.getCCBJsApiParam(openId, orderNo, secondOrderNo, payment);
         //判断该缴费名单是否正在支付
-
+        Boolean flag = Boolean.FALSE;
         if (payment.equals("2")) {
             Boolean aBoolean = payableInfoWaterService.queryWaterPay(payOrderService.queryPayInfoByOrderId(orderNo), cardNumber);
             if (aBoolean) {
                 StudentNameTeleVO studentNameTeleVO = wechatController.getUserNameTele(payableInfoWaterService.queryByPayInfoId(payOrderService.queryPayInfoByOrderId(orderNo))).getData();
+                flag = Boolean.TRUE;
                 throw new RRException(BizCodeEnume.ORDER_IS_PAYING, "订单已被" +studentNameTeleVO.getName() +"支付锁定,解除锁定请联系:"+studentNameTeleVO.getTelephone());
             }
-
         }else {
             Boolean bBoolean = payableInfoService.queryInforPay(payOrderService.queryPayInfoByOrderId(orderNo), cardNumber);
             if (bBoolean) {
                 StudentNameTeleVO studentNameTeleVO = wechatController.getUserNameTele(payableInfoWaterService.queryByPayInfoId(payOrderService.queryPayInfoByOrderId(orderNo))).getData();
+                flag = Boolean.TRUE;
                 throw new RRException(BizCodeEnume.ORDER_IS_PAYING, "订单已被" +studentNameTeleVO.getName() +"支付锁定,解除锁定请联系:"+studentNameTeleVO.getTelephone());
             }
         }
 
-        if (jsApiPayParam.getErrmsg().contains("支付不成功")) {
-
-            //订单支付失败则将缴费名单的订单支付中的状态修改为未支付状态
-            Boolean aaBoolean = payableInfoService.updatePayInfoStatu(payOrderService.queryPayInfoByOrderId(orderNo), "1", "null", "null");
-            if (!aaBoolean) {
-                Boolean aBoolean1 = payableInfoWaterService.updateWaterInfoStatu(payOrderService.queryPayInfoByOrderId(orderNo), "1", "null", "null");
-            }
-
-        }
+//        if (jsApiPayParam.getErrmsg().contains("支付不成功")) {
+//
+//            //订单支付失败则将缴费名单的订单支付中的状态修改为未支付状态
+//            Boolean aaBoolean = payableInfoService.updatePayInfoStatu(payOrderService.queryPayInfoByOrderId(orderNo), "1", "null", "null");
+//            if (!aaBoolean) {
+//                Boolean aBoolean1 = payableInfoWaterService.updateWaterInfoStatu(payOrderService.queryPayInfoByOrderId(orderNo), "1", "null", "null");
+//            }
+//
+//        }
 //        PayableInfoWaterEntity byId = payableInfoWaterService.getById(payOrderService.queryPayInfoByOrderId(orderNo));
 //        System.out.println(byId);
-
-        return CommonResult.ok().setResult(jsApiPayParam);
+        if (flag){
+            return CommonResult.fail();
+        }else {
+            return CommonResult.ok().setResult(jsApiPayParam);
+        }
     }
 
     /**

+ 63 - 46
src/main/java/com/chuanghai/smartschool/tuitionpayment/controller/PayableInfoWaterController.java

@@ -5,7 +5,7 @@ import com.chuanghai.smartschool.tuitionpayment.anno.AdminLoginCheck;
 import com.chuanghai.smartschool.tuitionpayment.common.exception.BizCodeEnume;
 import com.chuanghai.smartschool.tuitionpayment.common.exception.RRException;
 import com.chuanghai.smartschool.tuitionpayment.common.utils.CommonResult;
-import com.chuanghai.smartschool.tuitionpayment.entity.PayableInfoWaterDeleteEntity;
+import com.chuanghai.smartschool.tuitionpayment.entity.PayOrderEntity;
 import com.chuanghai.smartschool.tuitionpayment.entity.PayableInfoWaterEntity;
 import com.chuanghai.smartschool.tuitionpayment.service.PayOrderService;
 import com.chuanghai.smartschool.tuitionpayment.service.PayableInfoWaterDeleteService;
@@ -15,7 +15,6 @@ import com.chuanghai.smartschool.tuitionpayment.utils.RSAUtils;
 import com.chuanghai.smartschool.tuitionpayment.vo.DormVO;
 import com.chuanghai.smartschool.tuitionpayment.vo.YearVo;
 import org.apache.poi.ss.formula.functions.T;
-import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.*;
@@ -107,16 +106,25 @@ public class PayableInfoWaterController {
             e.printStackTrace();
             throw new RRException(BizCodeEnume.PARAMETER_ERROR, "密码解密失败");
         }
-
-        if (dorm.contains("层")) {
-            int indexD = dorm.indexOf("栋");
-            dorm = dorm.substring(0, indexD + 1) + dorm.split("层")[1];
+        //判断如果出现 22栋副2层2号  这个样式的寝室,直接不做宿舍号截取
+        if (!(dorm.contains("副"))) {
+            if ((dorm.contains("单元"))) {
+                int indexD = dorm.indexOf("元");
+                dorm = dorm.substring(0, indexD + 1) + dorm.split("层")[1];
+            } else {
+                if (dorm.contains("层")) {
+                    int indexD = dorm.indexOf("栋");
+                    dorm = dorm.substring(0, indexD + 1) + dorm.split("层")[1];
+                }
+            }
         }
         List<PayableInfoWaterEntity> payableInfoWaterList = payableInfoWaterService.queryWaterInfo(dorm, dormVO.getYear(), dormVO.getPayStatu());
         payableInfoWaterList.forEach(payableInfoWaterEntity -> {
             if (payableInfoWaterEntity.getPayItemType().equals("2")) {
-                String payerName = payOrderService.queryPayerName(payableInfoWaterEntity.getId());
-                payableInfoWaterEntity.setPayerName(payerName);
+                PayOrderEntity payOrderEntity = payOrderService.queryOrder(payableInfoWaterEntity.getId());
+                payableInfoWaterEntity.setPayerName(payOrderEntity.getPayerName());
+                payableInfoWaterEntity.setOrderNo(payOrderEntity.getOrderNo());
+                payableInfoWaterEntity.setPayerCardNumber(payOrderEntity.getPayerCardNumber());
             }
             payableInfoWaterService.updateById(payableInfoWaterEntity);
         });
@@ -145,10 +153,18 @@ public class PayableInfoWaterController {
     @GetMapping("queryAllYear")
     public CommonResult queryAllYear(String dorm, String payStatu) {
 
-            if (dorm.contains("层")) {
-                int indexD = dorm.indexOf("栋");
+        //判断如果出现 22栋副2层2号  这个样式的寝室,直接不做宿舍号截取
+        if (!(dorm.contains("副"))) {
+            if ((dorm.contains("单元"))) {
+                int indexD = dorm.indexOf("元");
                 dorm = dorm.substring(0, indexD + 1) + dorm.split("层")[1];
+            } else {
+                if (dorm.contains("层")) {
+                    int indexD = dorm.indexOf("栋");
+                    dorm = dorm.substring(0, indexD + 1) + dorm.split("层")[1];
+                }
             }
+        }
 
         List<YearVo> allYearlist = payableInfoWaterService.queryAllYear(dorm, payStatu);
         return CommonResult.ok().setResult(allYearlist);
@@ -164,38 +180,38 @@ public class PayableInfoWaterController {
     public CommonResult<T> updateDormById(@RequestParam("id") String id, @RequestParam("dorm") String dorm,
                                           @RequestParam("payMonth") String payMonth) {
 
-        PayableInfoWaterEntity waterEntity = new PayableInfoWaterEntity();
-        Long ID = Long.parseLong(id);
-        waterEntity.setId(ID);
-        waterEntity.setDorm(dorm);
-        if (!dorm.contains("栋")) {
-            throw new RRException(BizCodeEnume.VAILD_EXCEPTION, "宿舍信息填写异常");
-        }
-
-        QueryWrapper<PayableInfoWaterEntity> wrapper = new QueryWrapper<>();
-        wrapper.eq("dorm", dorm)
-                .eq("pay_month", payMonth)
-                .orderByDesc("pay_item_type");
-        List<PayableInfoWaterEntity> listWater = payableInfoWaterService.list(wrapper);
-        if (listWater.size() > 0) {
-            if (listWater.get(0).getPayItemType().equals("2")) {
-
-                PayableInfoWaterDeleteEntity payableInfoWaterDeleteEntity = new PayableInfoWaterDeleteEntity();
-                BeanUtils.copyProperties(listWater.get(0), payableInfoWaterDeleteEntity);
-                payableInfoWaterDeleteService.save(payableInfoWaterDeleteEntity);
-                payableInfoWaterService.removeById(waterEntity.getId());
-                return CommonResult.ok().setResult("该宿舍已经缴费,请与寝室长核对缴费信息");
-            } else {
-                waterEntity.setPayAmountDetail(listWater.get(0).getPayAmountDetail());
-                waterEntity.setOrderNotice(listWater.get(0).getOrderNotice());
-                waterEntity.setRealPayAmount(listWater.get(0).getRealPayAmount());
-                waterEntity.setPayMonth(listWater.get(0).getPayMonth());
-                payableInfoWaterService.updateById(waterEntity);
-            }
-
-        } else {
-            throw new RRException(BizCodeEnume.PARAMETER_ERROR, "该宿舍不存在" + payMonth + "缴费信息");
-        }
+//        PayableInfoWaterEntity waterEntity = new PayableInfoWaterEntity();
+//        Long ID = Long.parseLong(id);
+//        waterEntity.setId(ID);
+//        waterEntity.setDorm(dorm);
+//        if (!dorm.contains("栋")) {
+//            throw new RRException(BizCodeEnume.VAILD_EXCEPTION, "宿舍信息填写异常");
+//        }
+//
+//        QueryWrapper<PayableInfoWaterEntity> wrapper = new QueryWrapper<>();
+//        wrapper.eq("dorm", dorm)
+//                .eq("pay_month", payMonth)
+//                .orderByDesc("pay_item_type");
+//        List<PayableInfoWaterEntity> listWater = payableInfoWaterService.list(wrapper);
+//        if (listWater.size() > 0) {
+//            if (listWater.get(0).getPayItemType().equals("2")) {
+//
+//                PayableInfoWaterDeleteEntity payableInfoWaterDeleteEntity = new PayableInfoWaterDeleteEntity();
+//                BeanUtils.copyProperties(listWater.get(0), payableInfoWaterDeleteEntity);
+//                payableInfoWaterDeleteService.save(payableInfoWaterDeleteEntity);
+//                payableInfoWaterService.removeById(waterEntity.getId());
+//                return CommonResult.ok().setResult("该宿舍已经缴费,请与寝室长核对缴费信息");
+//            } else {
+//                waterEntity.setPayAmountDetail(listWater.get(0).getPayAmountDetail());
+//                waterEntity.setOrderNotice(listWater.get(0).getOrderNotice());
+//                waterEntity.setRealPayAmount(listWater.get(0).getRealPayAmount());
+//                waterEntity.setPayMonth(listWater.get(0).getPayMonth());
+//                payableInfoWaterService.updateById(waterEntity);
+//            }
+//
+//        } else {
+//            throw new RRException(BizCodeEnume.PARAMETER_ERROR, "该宿舍不存在" + payMonth + "缴费信息");
+//        }
         return CommonResult.ok().setResult(Boolean.TRUE);
     }
 
@@ -211,12 +227,12 @@ public class PayableInfoWaterController {
     /**
      * 更新缴费名单状态       正在支付时无法重复提交
      *
-     * @param payInfoId   缴费名单的id
-     * @param payStatu   0 代表正在支付的状态
+     * @param payInfoId 缴费名单的id
+     * @param payStatu  0 代表正在支付的状态
      * @return
      */
     @GetMapping("updateWaterStatu")
-    public CommonResult updateWaterStatu(Long payInfoId, String payStatu, String cardNumber,String orderNo) {
+    public CommonResult updateWaterStatu(Long payInfoId, String payStatu, String cardNumber, String orderNo) {
         PayableInfoWaterEntity waterInfo = new PayableInfoWaterEntity();
         waterInfo.setId(payInfoId);
         waterInfo.setPayItemType(payStatu);
@@ -240,11 +256,12 @@ public class PayableInfoWaterController {
 
     /**
      * 取消订单正在支付的锁定状态
+     *
      * @param payInfoId
      * @return
      */
     @GetMapping("unlock")
-    public CommonResult unlock(Long payInfoId){
+    public CommonResult unlock(Long payInfoId) {
         payableInfoWaterService.unlock(payInfoId);
         return CommonResult.ok();
     }

+ 4 - 0
src/main/java/com/chuanghai/smartschool/tuitionpayment/controller/WechatController.java

@@ -17,6 +17,7 @@ import com.chuanghai.smartschool.tuitionpayment.vo.WeixiaoVO;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.poi.ss.formula.functions.T;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpEntity;
@@ -42,6 +43,7 @@ import java.util.*;
  * @email codingliang@gmail.com
  * @date 2021-08-12 16:04
  */
+@Slf4j
 @Controller
 @RequestMapping("tuitionpayment/wechat")
 public class WechatController {
@@ -239,6 +241,8 @@ public class WechatController {
         tokenParams.put("grant_type", "authorization_code");
         tokenParams.put("redirect_uri", state); // 该地址需要与发起授权地址保持一直
 
+
+        log.info("微校授权参数=======>>>>wxcode: "+wxcode+"  app_key: "+weixiaoConfig.getAppKey()+"  app_secret: "+weixiaoConfig.getAppSecret());
         try {
             // wecode换取token
             RestTemplate client = new RestTemplate();

+ 1 - 1
src/main/java/com/chuanghai/smartschool/tuitionpayment/service/PayOrderService.java

@@ -65,7 +65,7 @@ public interface PayOrderService extends IService<PayOrderEntity> {
     Integer queryCurrentPayedRecordNum(PayOrderQueryTO queryTO);
 
     PageUtils queryAllOrder(String cardNumber, PageParam pageParam, String status, String itemName, String payYear, String selfCardNumber);
-    String queryPayerName(Long payinfoId);
+    PayOrderEntity queryOrder(Long payinfoId);
 
     List<PayOrderEntity> queryWaterOrder( String payYear, String payStatu, String itemName, String cardNumber);
 

+ 10 - 7
src/main/java/com/chuanghai/smartschool/tuitionpayment/service/impl/PayOrderServiceImpl.java

@@ -447,10 +447,13 @@ public class PayOrderServiceImpl extends ServiceImpl<PayOrderDao, PayOrderEntity
                             .eq("pay_item_type", "1");
                     //将删除的水费缴费信息记录到删除记录表中
                     PayableInfoWaterEntity payableInfoWaterEntity = payableInfoWaterService.getOne(wrapper);
-                    payableInfoWaterService.remove(wrapper);
-                    PayableInfoWaterDeleteEntity payableInfoWaterDeleteEntity = new PayableInfoWaterDeleteEntity();
-                    BeanUtils.copyProperties(payableInfoWaterEntity, payableInfoWaterDeleteEntity);
-                    payableInfoWaterDeleteService.save(payableInfoWaterDeleteEntity);
+                    payableInfoWaterEntity.setPayItemType("2");
+                    log.info("水费缴纳订单重复提交支付:=====>>【{}】",payableInfoWaterEntity);
+                    payableInfoWaterService.updateById(payableInfoWaterEntity);
+//                    PayableInfoWaterDeleteEntity payableInfoWaterDeleteEntity = new PayableInfoWaterDeleteEntity();
+//                    BeanUtils.copyProperties(payableInfoWaterEntity, payableInfoWaterDeleteEntity);
+//                    payableInfoWaterDeleteService.save(payableInfoWaterDeleteEntity);
+                   // payableInfoWaterService.remove(wrapper);
                     throw new RRException(BizCodeEnume.DORM_EXIST, "宿舍【" + dorm + " " + payYear + "】已缴费,请勿重复缴费");
 
                 }
@@ -468,10 +471,10 @@ public class PayOrderServiceImpl extends ServiceImpl<PayOrderDao, PayOrderEntity
 //                            .eq("status", "1");
                         //TODO 删除订单
                         PayOrderEntity one = payOrderService.getById(byIdInfo.getId());
-                        payOrderService.removeById(byIdInfo.getId());
                         PayOrderDeleteEntity payOrderDeleteEntity = new PayOrderDeleteEntity();
                         BeanUtils.copyProperties(one, payOrderDeleteEntity);
                         payOrderDeleteService.save(payOrderDeleteEntity);
+                        payOrderService.removeById(byIdInfo.getId());
                     }
                 });
                 // throw new RRException(BizCodeEnume.ORDER_IS_PAY, "该订单已完成缴费,请勿重复缴费");
@@ -1220,12 +1223,12 @@ public class PayOrderServiceImpl extends ServiceImpl<PayOrderDao, PayOrderEntity
     }
 
     @Override
-    public String queryPayerName(Long payinfoId) {
+    public PayOrderEntity queryOrder(Long payinfoId) {
         QueryWrapper<PayOrderEntity> wrapper = new QueryWrapper<>();
         wrapper.eq("payinfo_id", payinfoId)
                 .eq("pay_item", "水费缴纳")
                 .eq("status", "2");
-        return this.getOne(wrapper).getPayerName();
+        return this.getOne(wrapper);
     }
 
     @Override

+ 0 - 1
src/main/java/com/chuanghai/smartschool/tuitionpayment/service/impl/PayableInfoServiceImpl.java

@@ -302,7 +302,6 @@ public class PayableInfoServiceImpl extends ServiceImpl<PayableInfoDao, PayableI
 
     @Override
     public Boolean updatePayInfoStatu(Long payInfoId, String payStatu, String cardNumber, String orderNo) {
-
         PayableInfoEntity infoEntity = this.getById(payInfoId);
         infoEntity.setPayItemType(payStatu);
         infoEntity.setPayerCardNumber(cardNumber);

+ 15 - 4
src/main/java/com/chuanghai/smartschool/tuitionpayment/service/impl/PayableInfoWaterServiceImpl.java

@@ -16,6 +16,7 @@ import com.chuanghai.smartschool.tuitionpayment.service.PayableInfoWaterService;
 import com.chuanghai.smartschool.tuitionpayment.to.PayOrderQueryTO;
 import com.chuanghai.smartschool.tuitionpayment.utils.OutputTxt;
 import com.chuanghai.smartschool.tuitionpayment.vo.YearVo;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -29,7 +30,7 @@ import java.net.URLEncoder;
 import java.util.*;
 import java.util.stream.Collectors;
 
-
+@Slf4j
 @Service("payableInfoWaterService")
 public class PayableInfoWaterServiceImpl extends ServiceImpl<PayableInfoWaterDao, PayableInfoWaterEntity> implements PayableInfoWaterService {
 
@@ -68,7 +69,12 @@ public class PayableInfoWaterServiceImpl extends ServiceImpl<PayableInfoWaterDao
             wrapper.eq("check_info", queryTO.getCheckInfo());
         }
         if (StringUtils.hasText(queryTO.getPayStatus())) {
-            wrapper.eq("pay_item_type", queryTO.getPayStatus());
+            if (queryTO.getPayStatus().equals("1")) {
+                wrapper.in("pay_item_type", "0","1");
+            }else {
+
+                wrapper.eq("pay_item_type", queryTO.getPayStatus());
+            }
         }
         wrapper.eq(StringUtils.hasText(queryTO.getPayYear()), "pay_month", queryTO.getPayYear());
         wrapper.apply(StringUtils.hasText(queryTO.getCreateDateStr()), "date_format(pay_create_time, '%Y-%m-%d') = {0}", queryTO.getCreateDateStr());
@@ -128,7 +134,11 @@ public class PayableInfoWaterServiceImpl extends ServiceImpl<PayableInfoWaterDao
             wrapper.eq("check_info", queryTO.getCheckInfo());
         }
         if (StringUtils.hasText(queryTO.getPayStatus())) {
-            wrapper.eq("pay_item_type", queryTO.getPayStatus());
+            if (queryTO.getPayStatus().equals("1")) {
+                wrapper.in("pay_item_type", "0","1");
+            }else {
+                wrapper.eq("pay_item_type", queryTO.getPayStatus());
+            }
         }
         wrapper.eq(StringUtils.hasText(queryTO.getPayYear()), "pay_month", queryTO.getPayYear());
         wrapper.select("ifnull(sum(real_pay_amount), 0) as total,count(id) as count");
@@ -304,7 +314,7 @@ public class PayableInfoWaterServiceImpl extends ServiceImpl<PayableInfoWaterDao
         }else {
             wrapper.eq("pay_item_type", payStatu);
         }
-        wrapper.orderByAsc("pay_item_type").orderByDesc("pay_month");
+        wrapper.orderByAsc("pay_item_type").orderByDesc("pay_create_time").orderByDesc("pay_month");
         List<PayableInfoWaterEntity> list = payableInfoWaterService.list(wrapper);
         return list;
     }
@@ -368,6 +378,7 @@ public class PayableInfoWaterServiceImpl extends ServiceImpl<PayableInfoWaterDao
 
     @Override
     public void unlock(Long payInfoId) {
+        log.info("锁定缴费名单的ID=====>>【{}】,状态置为未支付,清除订单ID,支付人信息",payInfoId);
         PayableInfoWaterEntity waterEntity = this.getById(payInfoId);
         waterEntity.setPayItemType("1");
         waterEntity.setOrderNo("");

+ 1 - 1
src/main/java/com/chuanghai/smartschool/tuitionpayment/utils/RSAUtils.java

@@ -165,7 +165,7 @@ public class RSAUtils {
 //            System.out.println("公钥 =>" + publicKey + "\n");
 
             // RSA加密
-            String data = "2栋1层106";
+            String data = "29栋副1层2号";
             String encryptData = encrypt(data, getPublicKey(publicKey));
 //            String encryptData = "ugiYZKQ8lmjOLPlVhctIH8sgVvmoFun1Lxc8+Xzm49QDgUh1vhGSYf2uOS/1bCjX/5Ve7sU1S4exl25Ujyh3S7v+lpDqXCsTwhCgpldZOIr0f/BMRdnYdnHUp9beFZKlrDknOKnzF61wFK6096A/md/0vdIwHrCszo8F4Sj1hXs=";
             System.out.println("加密后内容 => " + encryptData + "\n");