域名更换

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

@@ -0,0 +1,33 @@
+package com.template.api;
+
+import com.template.model.query.WelcomeVisitorQuery;
+import com.template.model.request.WelcomeVisitorRequest;
+import com.template.model.result.CommonResult;
+import com.template.model.result.PageUtils;
+import com.template.model.vo.WelcomeVisitorVO;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 访客相关接口
+ * @author codingliang
+ * @date 2025-06-16
+ */
+@RequestMapping("api/pay")
+@Api(tags = {"pay"}, value = "支付")
+public interface WelcomePayControllerAPI {
+
+    @GetMapping(value = "/getDatas")
+    @ApiOperation(value = "查询欠费记录")
+    CommonResult getDatas();
+
+    @GetMapping(value = "/getDataOnes")
+    @ApiOperation(value = "查询欠费记录")
+    CommonResult getDataOnes(String cardNo);
+
+
+}

src/main/java/com/template/common/utils/DictionaryCompare.java

@@ -5,7 +5,7 @@ import java.util.Comparator;
 /**
  * @Author: binguo
  * @Date: 2023/8/21 星期一 14:51
- * @Description: com.repair.common.utils
+ * @Description: com.template.common.utils
  * @Version: 1.0
  */
 public class DictionaryCompare implements Comparator<String> {

src/main/java/com/template/common/utils/ExcelUtils.java

@@ -12,7 +12,7 @@ import java.net.URLEncoder;
 /**
  * @Author: binguo
  * @Date: 2023/7/10 星期一 14:21
- * @Description: com.repair.common.utils
+ * @Description: com.template.common.utils
  * @Version: 1.0
  */
 @Slf4j

src/main/java/com/template/common/utils/HttpUtils.java

@@ -21,7 +21,7 @@ import java.util.Map;
 /**
  * @Author: binguo
  * @Date: 2023/8/21 星期一 14:58
- * @Description: com.repair.common.utils
+ * @Description: com.template.common.utils
  * @Version: 1.0
  */
 public class HttpUtils {

src/main/java/com/template/common/utils/StrUtils.java

@@ -1,4 +1,4 @@
-package com.repair.common.utils;
+package com.template.common.utils;
 
 import java.text.ParseException;
 import java.util.ArrayList;
@@ -9,7 +9,7 @@ import java.util.UUID;
 /**
  * @Author: binguo
  * @Date: 2023/7/25 星期二 14:20
- * @Description: com.repair.common.utils
+ * @Description: com.template.common.utils
  * @Version: 1.0
  */
 public class StrUtils {
@@ -102,4 +102,18 @@ public class StrUtils {
         String sss ="";
 
     }
+
+    public static String getGender(String idCard) {
+        if (!isValidIdCard(idCard)) {
+            return "身份证号码无效"; // 如果不合法，返回提示
+        }
+
+        char genderChar = idCard.charAt(16); // 获取性别位
+        return (genderChar % 2 == 0) ? "女" : "男"; // 通过判断奇偶性返回性别
+    }
+
+    public static boolean isValidIdCard(String idCard) {
+        // 使用正则表达式检查身份证号码格式
+        return idCard.matches("\\d{17}[\\d|X|x]"); // X 代表最后一位可能是字母X
+    }
 }

src/main/java/com/template/config/WxOpenidConfig.java

@@ -7,7 +7,7 @@ import org.springframework.stereotype.Component;
 /**
  * @Author: binguo
  * @Date: 2023/7/11 星期二 11:36
- * @Description: com.repair.config
+ * @Description: com.template.config
  * @Version: 1.0
  */
 @Component

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

@@ -12,16 +12,12 @@ import com.template.config.WxOpenidConfig;
 import com.template.model.enumModel.eIdentityTypeStatu;
 import com.template.model.enumModel.eSchool;
 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.pojo.*;
 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 com.template.services.*;
 import io.swagger.annotations.ApiModelProperty;
 import org.apache.commons.io.IOUtils;
 import org.slf4j.Logger;
@@ -60,6 +56,12 @@ public class LoginController implements LoginControllerAPI {
     private WelcomeStudentService welcomeStudentService;
     @Resource
     private WelcomeOrgService welcomeOrgService;
+    @Resource
+    private WelcomeFamilyService welcomeFamilyService;
+    @Resource
+    private WelcomeAccompanyService welcomeAccompanyService;
+    @Resource
+    private WelcomeArriveSettingService welcomeArriveSettingService;
 
     private static Logger logger = LoggerFactory.getLogger(LoginController.class);
 
@@ -300,8 +302,64 @@ public class LoginController implements LoginControllerAPI {
         wlv.setAdmissNum(card_number);
         wlv.setName(user_name);
         wlv.setPicture(student.getPicture());
+
         wlv.setCardId(id_card);
-        wlv.setSex(student.getSex());
+        if(StringUtils.hasText(id_card)){
+            if(StringUtils.hasText(student.getSex())){
+                wlv.setSex(student.getSex());
+            }else{
+                String sex = StrUtils.getGender(id_card);
+                wlv.setSex(sex);
+            }
+
+            //家庭成员
+            List<FamilyVo> fvs = new ArrayList<>();
+            List<WelcomeFamily> familys = welcomeFamilyService.getManageByCardId(student.getCardId());
+            if (familys != null && familys.size() > 0) {
+                for (WelcomeFamily wf : familys) {
+                    FamilyVo fv = new FamilyVo();
+                    fv.setId(wf.getId());
+                    fv.setFamilyShip(wf.getFamilyShip());
+                    fv.setName(wf.getName());
+                    fv.setPhone(wf.getPhone());
+                    fv.setWorkUnit(wf.getWorkUnit());
+                    fvs.add(fv);
+                }
+
+            }
+            wlv.setFvs(fvs);
+
+            //陪同人员
+            List<AccompanyVo> avs = new ArrayList<>();
+            List<WelcomeAccompany> accompanys = welcomeAccompanyService.getManageByCardId(student.getCardId());
+            if (accompanys != null && accompanys.size() > 0) {
+                for (WelcomeAccompany ac : accompanys) {
+                    AccompanyVo av = new AccompanyVo();
+                    av.setId(ac.getId());
+                    av.setName(ac.getName());
+                    av.setPhone(ac.getPhone());
+                    avs.add(av);
+                }
+            }
+            wlv.setAvs(avs);
+
+            //时间段
+            List<ArriveTimeVo> atvs = new ArrayList<>();
+            List<WelcomeArriveSetting> wass = welcomeArriveSettingService.queryCheckDatas();
+            if (wass != null && wass.size() > 0) {
+                for (WelcomeArriveSetting was : wass) {
+                    ArriveTimeVo atv = new ArriveTimeVo();
+                    atv.setId(was.getId());
+                    atv.setStartTime(was.getStartTime());
+                    atv.setEndTime(was.getEndTime());
+                    atv.setTimeStr(was.getStartTime() + "-" + was.getEndTime());
+                    atv.setIsCheck((student.getArriveTimeId() != null && was.getId().equals(student.getArriveTimeId())) ? 1 : 0);
+                    atvs.add(atv);
+                }
+            }
+            wlv.setAtvs(atvs);
+        }
+
         wlv.setSchool(campus);
         wlv.setSchoolId(campus == null ? 0 : eSchool.stringOf(campus));
 
@@ -344,6 +402,64 @@ public class LoginController implements LoginControllerAPI {
         if (student == null) {
             return CommonResult.fail("录取号或身份证错误，登录失败！");
         }
+        if(StringUtils.hasText(student.getCardId())){
+            if(StringUtils.hasText(student.getSex())){
+                student.setSex(student.getSex());
+            }else{
+                String sex =StrUtils.getGender(student.getCardId());
+                student.setSex(sex);
+            }
+        }
+
+        //家庭成员
+        List<FamilyVo> fvs = new ArrayList<>();
+        List<WelcomeFamily> familys = welcomeFamilyService.getManageByCardId(student.getCardId());
+        if (familys != null && familys.size() > 0) {
+            for (WelcomeFamily wf : familys) {
+                FamilyVo fv = new FamilyVo();
+                fv.setId(wf.getId());
+                fv.setFamilyShip(wf.getFamilyShip());
+                fv.setName(wf.getName());
+                fv.setPhone(wf.getPhone());
+                fv.setWorkUnit(wf.getWorkUnit());
+                fvs.add(fv);
+            }
+
+        }
+        student.setFvs(fvs);
+
+        //陪同人员
+        List<AccompanyVo> avs = new ArrayList<>();
+        List<WelcomeAccompany> accompanys = welcomeAccompanyService.getManageByCardId(student.getCardId());
+        if (accompanys != null && accompanys.size() > 0) {
+            for (WelcomeAccompany ac : accompanys) {
+                AccompanyVo av = new AccompanyVo();
+                av.setId(ac.getId());
+                av.setName(ac.getName());
+                av.setPhone(ac.getPhone());
+                avs.add(av);
+            }
+        }
+        student.setAvs(avs);
+
+
+
+        //时间段
+        List<ArriveTimeVo> atvs = new ArrayList<>();
+        List<WelcomeArriveSetting> wass = welcomeArriveSettingService.queryCheckDatas();
+        if (wass != null && wass.size() > 0) {
+            for (WelcomeArriveSetting was : wass) {
+                ArriveTimeVo atv = new ArriveTimeVo();
+                atv.setId(was.getId());
+                atv.setStartTime(was.getStartTime());
+                atv.setEndTime(was.getEndTime());
+                atv.setTimeStr(was.getStartTime() + "-" + was.getEndTime());
+                atv.setIsCheck((student.getArriveTimeId() != null && was.getId().equals(student.getArriveTimeId())) ? 1 : 0);
+                atvs.add(atv);
+            }
+        }
+        student.setAtvs(atvs);
+
         long expired = 1000 * 60 * 60 * 24 * 365;
         TokenDateVo token = JWTUtil.getToken(student.getCardId(), student.getId(), expired);
         student.setToken(token.getToken());

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

@@ -564,7 +564,7 @@ public class WelcomeBedController implements WelcomeBedControllerAPI {
 
     @Override
     public CommonResult downloadBedExcel() {
-        return CommonResult.ok("200", "操作成功", "https://chtech.ncjti.edu.cn/alumnus/homeimage/床位信息管理.xlsx");
+        return CommonResult.ok("200", "操作成功", "https://chtech.ncjti.edu.cn/welcome/homeimage/床位信息管理.xlsx");
     }
 
     @Override

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

@@ -343,7 +343,7 @@ public class WelcomeBuildController implements WelcomeBuildControllerAPI {
 
     @Override
     public CommonResult downloadBuildExcel() {
-        return CommonResult.ok("200", "操作成功", "https://chtech.ncjti.edu.cn/alumnus/homeimage/学生信息管理.xlsx");
+        return CommonResult.ok("200", "操作成功", "https://chtech.ncjti.edu.cn/welcome/homeimage/学生信息管理.xlsx");
     }
 
     @Override

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

@@ -589,7 +589,7 @@ public class WelcomeDormitoryController implements WelcomeDormitoryControllerAPI
 
     @Override
     public CommonResult downloadDormitoryExcel() {
-        return CommonResult.ok("200", "操作成功", "https://chtech.ncjti.edu.cn/alumnus/homeimage/寝室信息管理.xlsx");
+        return CommonResult.ok("200", "操作成功", "https://chtech.ncjti.edu.cn/welcome/homeimage/寝室信息管理.xlsx");
     }
 
     @Override

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

@@ -33,11 +33,11 @@ public class WelcomeFileController implements WelcomeFileControllerAPI {
 
         UploadFileVo result = new UploadFileVo();
 
-        String name = com.repair.common.utils.StrUtils.getRandomName(file.getOriginalFilename());
+        String name = com.template.common.utils.StrUtils.getRandomName(file.getOriginalFilename());
 
         String user = "root"; //SFTP服务器用户名
         String password = "Waimai2024#"; // SFTP服务器密码
-        String host = "172.16.40.122";  //  SFTP服务器地址
+        String host = "172.16.40.126";  //  SFTP服务器地址
         int port = 22; // SFTP 服务器端口
         String remoteDirPath = "/home/image"; // 远程目录路径
         //从MultipartFile对象中获取流
@@ -81,7 +81,7 @@ public class WelcomeFileController implements WelcomeFileControllerAPI {
             if (session != null) {
                 session.disconnect();
             }
-            result.setUrl("https://chtech.ncjti.edu.cn/alumnus/homeimage/" + name);
+            result.setUrl("https://chtech.ncjti.edu.cn/welcome/homeimage/" + name);
         }
         return CommonResult.ok(result);
     }

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

@@ -0,0 +1,79 @@
+package com.template.controller;
+
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import com.template.annotation.PassToken;
+import com.template.api.WelcomePayControllerAPI;
+import com.template.api.WelcomeVisitorControllerAPI;
+import com.template.common.exception.MyCustomException;
+import com.template.common.result.ResponseStatusEnum;
+import com.template.common.utils.HttpsClient;
+import com.template.model.query.WelcomeVisitorQuery;
+import com.template.model.request.WelcomeVisitorRequest;
+import com.template.model.result.CommonResult;
+import com.template.model.result.PageUtils;
+import com.template.model.vo.WelcomeVisitorVO;
+import com.template.services.WelcomeVisitorService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 访客相关接口
+ * @author codingliang
+ * @date 2025-06-16
+ */
+@RestController
+@RequiredArgsConstructor
+public class WelcomePayController implements WelcomePayControllerAPI {
+
+    @Override
+    @PassToken
+    public CommonResult getDatas() {
+        String timeStr = String.valueOf(System.currentTimeMillis());
+        String sds = querySign(timeStr);
+
+        Map<String, String> tokenParams = new HashMap<>();
+        tokenParams.put("sign", sds);
+        tokenParams.put("timestamp", timeStr);
+
+        // wecode换取token
+        String respon = HttpsClient.post("http://pay.ncjti.edu.cn:8068/api/getXsffDataAll", tokenParams);
+
+        return CommonResult.ok(respon);
+    }
+
+    @Override
+    @PassToken
+    public CommonResult getDataOnes(String cardNo) {
+        String timeStr = String.valueOf(System.currentTimeMillis());
+        String sds = querySign(timeStr);
+
+        Map<String, String> tokenParams = new HashMap<>();
+        tokenParams.put("sign", sds);
+        tokenParams.put("timestamp", timeStr);
+        tokenParams.put("xh", cardNo);
+        tokenParams.put("sfqjdm", "2024");
+
+        // wecode换取token
+        String respon = HttpsClient.post("http://pay.ncjti.edu.cn:8068/api/getXsffDataOne", tokenParams);
+
+        return CommonResult.ok(respon);
+    }
+
+    private String querySign(String timestr){
+        String devId = "ncjt00001";
+
+        Map<String, String> tokenParams = new HashMap<>();
+        tokenParams.put("devId", devId);
+        tokenParams.put("timestamp", timestr);
+
+        // wecode换取token
+        String sign = HttpsClient.post("http://pay.ncjti.edu.cn:8068/api/getSign", tokenParams);
+
+        return sign;
+    }
+}

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

@@ -1368,7 +1368,7 @@ public class WelcomeStudentController implements WelcomeStudentControllerAPI {
 
     @Override
     public CommonResult downloadStudentExcel() {
-        return CommonResult.ok("200", "操作成功", "https://chtech.ncjti.edu.cn/alumnus/homeimage/学生信息管理.xlsx");
+        return CommonResult.ok("200", "操作成功", "https://chtech.ncjti.edu.cn/welcome/homeimage/学生信息管理.xlsx");
     }
 
     @Override

src/main/java/com/template/model/enumModel/eFileType.java

@@ -3,7 +3,7 @@ package com.template.model.enumModel;
 /**
  * @Author: binguo
  * @Date: 2023/7/17 星期一 9:50
- * @Description: com.repair.model.enumModel
+ * @Description: com.template.model.enumModel
  * @Version: 1.0
  */
 public enum eFileType {

src/main/java/com/template/model/enumModel/eIdentityTypeStatu.java

@@ -3,7 +3,7 @@ package com.template.model.enumModel;
 /**
  * @Author: binguo
  * @Date: 2023/7/26 星期三 14:55
- * @Description: com.repair.model.enumModel
+ * @Description: com.template.model.enumModel
  * @Version: 1.0
  */
 public enum eIdentityTypeStatu {

src/main/java/com/template/model/enumModel/eIsSuper.java

@@ -3,7 +3,7 @@ package com.template.model.enumModel;
 /**
  * @Author: binguo
  * @Date: 2023/7/7 星期五 15:14
- * @Description: com.repair.model.enumModel
+ * @Description: com.template.model.enumModel
  * @Version: 1.0
  */
 public enum eIsSuper {

src/main/java/com/template/model/enumModel/eSchool.java

@@ -3,7 +3,7 @@ package com.template.model.enumModel;
 /**
  * @Author: binguo
  * @Date: 2023/7/26 星期三 14:55
- * @Description: com.repair.model.enumModel
+ * @Description: com.template.model.enumModel
  * @Version: 1.0
  */
 public enum eSchool {

src/main/java/com/template/model/enumModel/eWeekStatu.java

@@ -3,7 +3,7 @@ package com.template.model.enumModel;
 /**
  * @Author: binguo
  * @Date: 2023/7/26 星期三 14:55
- * @Description: com.repair.model.enumModel
+ * @Description: com.template.model.enumModel
  * @Version: 1.0
  */
 public enum eWeekStatu {

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

@@ -9,6 +9,11 @@ import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableField;
 import java.io.Serializable;
+import java.util.List;
+
+import com.template.model.vo.AccompanyVo;
+import com.template.model.vo.ArriveTimeVo;
+import com.template.model.vo.FamilyVo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -180,6 +185,20 @@ public class WelcomeStudent implements Serializable {
     @TableField(exist = false)
     private String token;
 
+
+    @ApiModelProperty(value = "家庭成员集合")
+    @TableField(exist = false)
+    private List<FamilyVo> fvs;
+
+    @ApiModelProperty(value = "陪同人员集合")
+    @TableField(exist = false)
+    private List<AccompanyVo> avs;
+
+    @ApiModelProperty(value = "时间段集合")
+    @TableField(exist = false)
+    private List<ArriveTimeVo> atvs;
+
+
     @ApiModelProperty(value = "创建时间")
     @TableField(fill = FieldFill.INSERT)
     private Date createTime;

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

@@ -9,7 +9,7 @@ import java.math.BigDecimal;
 /**
  * @Author: binguo
  * @Date: 2023/8/10 星期四 8:35
- * @Description: com.repair.model.request
+ * @Description: com.template.model.request
  * @Version: 1.0
  */
 @Data

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

@@ -9,7 +9,7 @@ import javax.validation.constraints.NotNull;
 /**
  * @Author: binguo
  * @Date: 2023/7/7 星期五 10:17
- * @Description: com.repair.model.request
+ * @Description: com.template.model.request
  * @Version: 1.0
  */
 @Data

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

@@ -9,7 +9,7 @@ import java.math.BigDecimal;
 /**
  * @Author: binguo
  * @Date: 2023/8/10 星期四 8:35
- * @Description: com.repair.model.request
+ * @Description: com.template.model.request
  * @Version: 1.0
  */
 @Data

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

@@ -7,7 +7,7 @@ import javax.validation.constraints.NotBlank;
 /**
  * @Author: binguo
  * @Date: 2023/7/6 星期四 17:17
- * @Description: com.repair.model.request
+ * @Description: com.template.model.request
  * @Version: 1.0
  */
 @Data

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

@@ -7,7 +7,7 @@ import javax.validation.constraints.NotBlank;
 /**
  * @Author: binguo
  * @Date: 2023/7/7 星期五 14:27
- * @Description: com.repair.model.request
+ * @Description: com.template.model.request
  * @Version: 1.0
  */
 @Data

src/main/java/com/template/model/result/UnitTimeHelpModel.java

@@ -5,7 +5,7 @@ import java.util.Date;
 /**
  * @Author: binguo
  * @Date: 2023/7/28 星期五 15:09
- * @Description: com.repair.model.pojo
+ * @Description: com.template.model.pojo
  * @Version: 1.0
  */
 public class UnitTimeHelpModel {

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

@@ -6,7 +6,7 @@ import lombok.Data;
 /**
  * @Author: binguo
  * @Date: 2023/7/28 星期五 15:03
- * @Description: com.repair.model.vo
+ * @Description: com.template.model.vo
  * @Version: 1.0
  */
 @Data

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

@@ -8,7 +8,7 @@ import java.util.Date;
 /**
  * @Author: binguo
  * @Date: 2023/7/28 星期五 15:03
- * @Description: com.repair.model.vo
+ * @Description: com.template.model.vo
  * @Version: 1.0
  */
 @Data

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

@@ -1,5 +1,6 @@
 package com.template.model.vo;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -10,7 +11,7 @@ import java.util.List;
 /**
  * @Author: binguo
  * @Date: 2023/7/24 星期一 11:22
- * @Description: com.repair.model.vo
+ * @Description: com.template.model.vo
  * @Version: 1.0
  */
 @Data
@@ -156,6 +157,15 @@ public class wxLoginVo {
     @ApiModelProperty(value = "车牌号")
     private String carNumber;
 
+    @ApiModelProperty(value = "家庭成员集合")
+    private List<FamilyVo> fvs;
+
+    @ApiModelProperty(value = "陪同人员集合")
+    private List<AccompanyVo> avs;
+
+    @ApiModelProperty(value = "时间段集合")
+    private List<ArriveTimeVo> atvs;
+
     /**
      * 用户token
      * 移动端的token永久有效