From a6d2a0ebcb6d9cc8c3c2cbd274e4b942830ee767 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期三, 11 二月 2026 20:37:14 +0800
Subject: [PATCH] update
---
admin-server/src/main/java/com/estate/expert/admin/controller/admin/ProjectController.java | 1 +
admin-server/src/main/java/com/estate/expert/admin/domain/project/SetProjectStatusDto.java | 9 +++++----
admin-server/src/main/java/com/estate/expert/admin/component/fuzzy/FuzzyApiComponent.java | 2 +-
admin-server/src/main/resources/mapper/CheckMapper.xml | 2 +-
admin-server/src/main/java/com/estate/expert/admin/domain/business/check/CheckVo.java | 5 +++++
admin-server/src/main/java/com/estate/expert/admin/utils/MD5Utils.java | 27 +++++++++++++++++++++++++++
6 files changed, 40 insertions(+), 6 deletions(-)
diff --git a/admin-server/src/main/java/com/estate/expert/admin/component/fuzzy/FuzzyApiComponent.java b/admin-server/src/main/java/com/estate/expert/admin/component/fuzzy/FuzzyApiComponent.java
index c521ad6..e9ebe98 100644
--- a/admin-server/src/main/java/com/estate/expert/admin/component/fuzzy/FuzzyApiComponent.java
+++ b/admin-server/src/main/java/com/estate/expert/admin/component/fuzzy/FuzzyApiComponent.java
@@ -47,7 +47,7 @@
*/
// private static final String FUZZY_EVALUATION_API_URL = "http://47.93.28.249:8081/api/Fuzzy_evaluation";
@Value("${fuzzy.api.url}")
- private static final String FUZZY_EVALUATION_API_URL = "http://localhost:5000/api/Fuzzy_evaluation";
+ private static final String FUZZY_EVALUATION_API_URL = "http://192.168.110.188:8081/api/Fuzzy_evaluation";
/**
* HTTP客户端模板
diff --git a/admin-server/src/main/java/com/estate/expert/admin/controller/admin/ProjectController.java b/admin-server/src/main/java/com/estate/expert/admin/controller/admin/ProjectController.java
index a5f4bab..601e253 100644
--- a/admin-server/src/main/java/com/estate/expert/admin/controller/admin/ProjectController.java
+++ b/admin-server/src/main/java/com/estate/expert/admin/controller/admin/ProjectController.java
@@ -45,6 +45,7 @@
@ApiOperation("添加项目")
@PostMapping("/add")
public Result add(Session session, @Validated @RequestBody ProjectDto projectDto) {
+ projectDto.setStatus(1);
projectService.add((User)session.getUser(), projectDto);
return Result.success();
}
diff --git a/admin-server/src/main/java/com/estate/expert/admin/domain/business/check/CheckVo.java b/admin-server/src/main/java/com/estate/expert/admin/domain/business/check/CheckVo.java
index 22a39a0..c0c6ddc 100644
--- a/admin-server/src/main/java/com/estate/expert/admin/domain/business/check/CheckVo.java
+++ b/admin-server/src/main/java/com/estate/expert/admin/domain/business/check/CheckVo.java
@@ -36,6 +36,7 @@
private Integer planId;
+
@ApiModelProperty("计划名称")
@Excel(name = "计划名称")
private String planName;
@@ -74,4 +75,8 @@
private Date createTime;
+ @ApiModelProperty("检查标题")
+ private String title;
+
+
}
diff --git a/admin-server/src/main/java/com/estate/expert/admin/domain/project/SetProjectStatusDto.java b/admin-server/src/main/java/com/estate/expert/admin/domain/project/SetProjectStatusDto.java
index 20c2939..6905a52 100644
--- a/admin-server/src/main/java/com/estate/expert/admin/domain/project/SetProjectStatusDto.java
+++ b/admin-server/src/main/java/com/estate/expert/admin/domain/project/SetProjectStatusDto.java
@@ -1,5 +1,6 @@
package com.estate.expert.admin.domain.project;
+import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -8,11 +9,11 @@
@Data
@ApiModel("设置项目状态")
-public class SetProjectStatusDto {
+public class SetProjectStatusDto implements java.io.Serializable{
@ApiModelProperty("项目ID")
- Integer projectId;
+ private Integer projectId;
@ApiModelProperty("项目状态 1在建 2完成")
- Integer status;
+ private Integer status;
@ApiModelProperty("完成时间")
- LocalDateTime successTime;
+ private String successTime;
}
diff --git a/admin-server/src/main/java/com/estate/expert/admin/utils/MD5Utils.java b/admin-server/src/main/java/com/estate/expert/admin/utils/MD5Utils.java
index b8ce549..ed30938 100644
--- a/admin-server/src/main/java/com/estate/expert/admin/utils/MD5Utils.java
+++ b/admin-server/src/main/java/com/estate/expert/admin/utils/MD5Utils.java
@@ -3,6 +3,7 @@
import java.nio.charset.StandardCharsets;
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
+import java.time.LocalTime;
/**
* MD5加密工具类
@@ -40,4 +41,30 @@
String inputHash = encrypt(inputPassword);
return inputHash.equals(storedHash);
}
+
+ /**
+ * 判断当前时间是否在指定时间段内（字符串参数）
+ * @param startTimeStr 开始时间，格式："HH:mm" 或 "HH:mm:ss"
+ * @param endTimeStr 结束时间，格式："HH:mm" 或 "HH:mm:ss"
+ * @return 如果在时间段内返回true，否则返回false
+ */
+ public static boolean isCurrentTimeInRange(String startTimeStr, String endTimeStr) {
+ LocalTime now = LocalTime.now();
+ LocalTime startTime = LocalTime.parse(fixTimeFormat(startTimeStr));
+ LocalTime endTime = LocalTime.parse(fixTimeFormat(endTimeStr));
+
+ return !now.isBefore(startTime) && now.isBefore(endTime);
+ }
+ private static String fixTimeFormat(String timeStr) {
+ // 如果只有小时和分钟，添加秒部分
+ if (timeStr.length() == 5 && timeStr.contains(":")) {
+ return timeStr + ":00";
+ }
+ return timeStr;
+ }
+
+ public static void main(String[] args) {
+ boolean currentTimeInRange = isCurrentTimeInRange("09:00", "16:50");
+ System.out.println("Current time is in range: " + currentTimeInRange);
+ }
}
diff --git a/admin-server/src/main/resources/mapper/CheckMapper.xml b/admin-server/src/main/resources/mapper/CheckMapper.xml
index 6983a5e..b5a7b74 100644
--- a/admin-server/src/main/resources/mapper/CheckMapper.xml
+++ b/admin-server/src/main/resources/mapper/CheckMapper.xml
@@ -4,7 +4,7 @@
<select id="pageList" resultType="com.estate.expert.admin.domain.business.check.CheckVo">
- select t1.id,t1.plan_id,t1.project_id,t1.client_id,t1.safety_slip,t1.check_user_img,t1.integrity_notification,t1.time,t1.create_time,
+ select t1.id,t1.title,t1.plan_id,t1.project_id,t1.client_id,t1.safety_slip,t1.check_user_img,t1.integrity_notification,t1.time,t1.create_time,
t2.name as plan_name,
t3.name as project_name,
t4.name as client_name
--
Gitblit v1.7.1