From 5528d6812bbf8a7b8d8bc8f8031c889d81e1a1de Mon Sep 17 00:00:00 2001 From: chenglijuan Date: Thu, 30 Apr 2026 14:51:52 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E8=AE=BF=E5=AE=A2=E9=A2=84?= =?UTF-8?q?=E7=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/AppointmentController.java | 5 ++++- .../mini_program/entity/VisitApplication.java | 2 +- .../service/VisitorApprovalService.java | 2 +- src/main/resources/application.yml | 15 +++++++++++---- src/main/resources/bmser.com.pfx | Bin 0 -> 6713 bytes .../resources/mapper/VisitApplicationMapper.xml | 8 ++++---- 6 files changed, 21 insertions(+), 11 deletions(-) create mode 100644 src/main/resources/bmser.com.pfx diff --git a/src/main/java/com/example/mini_program/controller/AppointmentController.java b/src/main/java/com/example/mini_program/controller/AppointmentController.java index a79717c..8990aed 100644 --- a/src/main/java/com/example/mini_program/controller/AppointmentController.java +++ b/src/main/java/com/example/mini_program/controller/AppointmentController.java @@ -6,6 +6,8 @@ import com.example.mini_program.service.AppointmentService; import com.example.mini_program.vo.ReceptionPersonVo; import com.example.mini_program.vo.VisitApplicationVo; import lombok.RequiredArgsConstructor; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.web.bind.annotation.*; import java.util.List; @@ -14,6 +16,7 @@ import java.util.List; @RequestMapping("/api/wx-mini/appointment") @RequiredArgsConstructor public class AppointmentController { + private static final Logger log = LoggerFactory.getLogger(VisitorApprovalController.class); private final AppointmentService appointmentService; @@ -34,6 +37,7 @@ public class AppointmentController { */ @GetMapping("/detail") public Result getDetail(@RequestParam String id) { + log.info("获取预约记录详情, id={}", id); if (id == null || id.trim().isEmpty()) { return Result.error("id不能为空"); } @@ -107,7 +111,6 @@ public class AppointmentController { */ @GetMapping("/person/selector") public Result> personSelector(@RequestParam String department) { - System.out.println("----------------------------------"); // 异步处理,立即返回 List list = appointmentService.personSelector(department); return Result.success(list); diff --git a/src/main/java/com/example/mini_program/entity/VisitApplication.java b/src/main/java/com/example/mini_program/entity/VisitApplication.java index 5244783..033506c 100644 --- a/src/main/java/com/example/mini_program/entity/VisitApplication.java +++ b/src/main/java/com/example/mini_program/entity/VisitApplication.java @@ -19,7 +19,7 @@ public class VisitApplication { private String visitTime; private String hostName; - private String receptionPersonId; + private String personId; private String area; private String status; private String statusText; diff --git a/src/main/java/com/example/mini_program/service/VisitorApprovalService.java b/src/main/java/com/example/mini_program/service/VisitorApprovalService.java index 9b89e4e..5c289a0 100644 --- a/src/main/java/com/example/mini_program/service/VisitorApprovalService.java +++ b/src/main/java/com/example/mini_program/service/VisitorApprovalService.java @@ -129,7 +129,7 @@ public class VisitorApprovalService { } visitApplicationMapper.updateCheckStatusById(id, "1"); //受访者企微id - String receptionPersonId = record.getReceptionPersonId(); + String receptionPersonId = record.getPersonId(); if (receptionPersonId == null || receptionPersonId.isEmpty()) { log.warn("通知受访者访客已到达】受访者ID为空, id={}", id); return; diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index cda4c0a..2166c8e 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -1,13 +1,20 @@ server: - port: 8080 + port: 8091 + ssl: + enabled: true + key-store: classpath:bmser.com.pfx + key-store-type: PKCS12 + key-store-password: zl7cs0dp + protocol: TLS + enabled-protocols: TLSv1.2,TLSv1.3 spring: application: name: mini_program datasource: - url: jdbc:mysql://txy.588580.xyz:3306/mini?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true - username: root - password: 271922abF + url: jdbc:mysql://10.30.1.208:3306/mini?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true + username: chenglijuan + password: 271922abf driver-class-name: com.mysql.cj.jdbc.Driver # 微信小程序配置 diff --git a/src/main/resources/bmser.com.pfx b/src/main/resources/bmser.com.pfx new file mode 100644 index 0000000000000000000000000000000000000000..dd122a9123417893e0af88b1606c5b8b3eb455d6 GIT binary patch literal 6713 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 - + @@ -22,7 +22,7 @@ - id, name, phone, company, reason,reception_person_id,check_status, + id, name, phone, company, reason,person_id,check_status, DATE_FORMAT(visit_date, '%Y-%m-%d') AS visit_date, DATE_FORMAT(visit_time, '%H:%i') AS visit_time, host_name, area, status, status_text, openid, @@ -66,10 +66,10 @@ INSERT INTO visit_application (id, name, phone, company, reason, visit_date, visit_time, host_name, area, - status, status_text, openid, create_time, sp_no) + status, status_text, openid, create_time, sp_no,person_id) VALUES (#{id}, #{name}, #{phone}, #{company}, #{reason}, #{visitDate}, #{visitTime}, #{hostName}, #{area}, - #{status}, #{statusText}, #{openid}, NOW(), #{spNo}) + #{status}, #{statusText}, #{openid}, NOW(), #{spNo},#{personId})