From 7ec116123ba7124c1a9ca60c73643f0725d010d1 Mon Sep 17 00:00:00 2001
From: zhangyeguang <zhangyeguang@xckj.com>
Date: Fri, 25 Oct 2024 10:13:48 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=87=E6=BB=A4=E4=BD=9C=E5=BA=9F=E7=9A=84?=
 =?UTF-8?q?=E4=BB=BB=E5=8A=A1=EF=BC=8C=E6=8E=A5=E5=85=A5prometheus?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jiagutech/ams/service/JobServiceImpl.java   |  2 ++
 web/pom.xml                                     |  9 +++++++++
 web/src/main/resources/application.yml          | 17 +++++++++++++++++
 3 files changed, 28 insertions(+)

diff --git a/social/src/main/java/com/jiagutech/ams/service/JobServiceImpl.java b/social/src/main/java/com/jiagutech/ams/service/JobServiceImpl.java
index 0ef464a..26aa3ee 100644
--- a/social/src/main/java/com/jiagutech/ams/service/JobServiceImpl.java
+++ b/social/src/main/java/com/jiagutech/ams/service/JobServiceImpl.java
@@ -188,6 +188,8 @@ public class JobServiceImpl implements JobService {
             }
             if (requestParam.getStatus() != 0) {
                 queryWrapper.eq("j.status", requestParam.getStatus());
+            } else {
+                queryWrapper.ne("j.status", 3);
             }
             if (requestParam.getOperatorId() != 0l) {
                 queryWrapper.eq("j.operator_id", requestParam.getOperatorId());
diff --git a/web/pom.xml b/web/pom.xml
index 2bc9869..6f0a9c4 100644
--- a/web/pom.xml
+++ b/web/pom.xml
@@ -102,6 +102,15 @@
       <groupId>org.springframework.amqp</groupId>
       <artifactId>spring-amqp</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-starter-actuator</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>io.micrometer</groupId>
+      <artifactId>micrometer-registry-prometheus</artifactId>
+    </dependency>
   </dependencies>
   <build>
     <finalName>${project.parent.artifactId}</finalName>
diff --git a/web/src/main/resources/application.yml b/web/src/main/resources/application.yml
index 2961fc7..ef6bbf2 100644
--- a/web/src/main/resources/application.yml
+++ b/web/src/main/resources/application.yml
@@ -90,3 +90,20 @@ springdoc:
     enabled: true
 
 
+management:
+  endpoints:
+    web:
+      exposure:
+        include: '*'
+  endpoint:
+    shutdown:
+      enabled: false
+    health:
+      show-details: always
+
+info:
+  app: ams-social
+  version: 1.0.0
+  java: 17
+  author: zhangyeguang
+  description: 贵州农机监管平台-合作社模块
\ No newline at end of file