From 039ca26b5311753223c4a81997ecc5cad6125d62 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期六, 26 二月 2022 09:20:49 +0800
Subject: [PATCH] #
---
/dev/null | 17 -----------------
src/main/java/com/zy/sc/manager/controller/result/AppIssueVo.java | 1 +
src/main/webapp/views/issue/issue.html | 4 ++--
src/main/java/com/zy/sc/manager/entity/Issue.java | 25 ++++++++++++++++++++++++-
src/main/java/com/zy/sc/manager/controller/AppController.java | 8 ++++----
5 files changed, 31 insertions(+), 24 deletions(-)
diff --git a/src/main/java/com/zy/sc/manager/controller/AppController.java b/src/main/java/com/zy/sc/manager/controller/AppController.java
index c1f1f4f..d893968 100644
--- a/src/main/java/com/zy/sc/manager/controller/AppController.java
+++ b/src/main/java/com/zy/sc/manager/controller/AppController.java
@@ -105,7 +105,7 @@
param.getDiscoverer(), // 鍙戠幇浜�
param.getTel(), // 鑱旂郴鏂瑰紡
null, // 渚涘簲鍟�
- null, //
+ 2, //
1, // 鐘舵��
getUserId(), // 娣诲姞浜哄憳
now, // 娣诲姞鏃堕棿
@@ -135,7 +135,9 @@
for (Issue issue : issues) {
AppIssueVo vo = new AppIssueVo();
vo.setIssueId(issue.getId());
- vo.setTitle(issue.getTitle());
+ vo.setTitle(issue.getTitle().length()>12?issue.getTitle().substring(0, 12):issue.getTitle());
+ vo.setStartTime(issue.getStartTime$().substring(0, 11));
+ vo.setSettle(issue.getSettle$());
if (!hostSet.contains(issue.getHostId())) {
hostSet.add(issue.getHostId());
@@ -161,7 +163,5 @@
public R issueDetl(@RequestParam Long issueId){
return R.ok().add(issueService.selectById(issueId));
}
-
-
}
diff --git a/src/main/java/com/zy/sc/manager/controller/result/AppIssueVo.java b/src/main/java/com/zy/sc/manager/controller/result/AppIssueVo.java
index 61dc263..3af9487 100644
--- a/src/main/java/com/zy/sc/manager/controller/result/AppIssueVo.java
+++ b/src/main/java/com/zy/sc/manager/controller/result/AppIssueVo.java
@@ -14,5 +14,6 @@
private String startTime;
+ private String settle;
}
diff --git a/src/main/java/com/zy/sc/manager/controller/result/AppSensorTypeVo.java b/src/main/java/com/zy/sc/manager/controller/result/AppSensorTypeVo.java
deleted file mode 100644
index 9494dbf..0000000
--- a/src/main/java/com/zy/sc/manager/controller/result/AppSensorTypeVo.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.zy.sc.manager.controller.result;
-
-import lombok.Data;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Created by vincent on 2022/1/3
- */
-@Data
-public class AppSensorTypeVo {
-
- private Long sensorTypeId;
-
- private String sensorTypeFlag;
-
- private String sensorTypeName;
-
- private List<AppSensorVo> sensors = new ArrayList<>();
-
-
-}
diff --git a/src/main/java/com/zy/sc/manager/controller/result/AppSensorVo.java b/src/main/java/com/zy/sc/manager/controller/result/AppSensorVo.java
deleted file mode 100644
index 6714165..0000000
--- a/src/main/java/com/zy/sc/manager/controller/result/AppSensorVo.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.zy.sc.manager.controller.result;
-
-import lombok.Data;
-
-/**
- * Created by vincent on 2022/1/3
- */
-@Data
-public class AppSensorVo {
-
- private Long sensorId;
-
- private String uuid;
-
- private String addr;
-
-}
diff --git a/src/main/java/com/zy/sc/manager/entity/Issue.java b/src/main/java/com/zy/sc/manager/entity/Issue.java
index 70d3272..fcdb544 100644
--- a/src/main/java/com/zy/sc/manager/entity/Issue.java
+++ b/src/main/java/com/zy/sc/manager/entity/Issue.java
@@ -122,7 +122,10 @@
@ApiModelProperty(value= "渚涘簲鍟�")
private String dealer;
- @ApiModelProperty(value= "")
+ /**
+ * 娴佺▼ 1: 鑽夌 2: 鎻愪氦 3: 宸茶 4: 浣滀笟 5: 瀹屾垚 6: 鍙栨秷
+ */
+ @ApiModelProperty(value= "娴佺▼ 1: 鑽夌 2: 鎻愪氦 3: 宸茶 4: 浣滀笟 5: 瀹屾垚 6: 鍙栨秷")
private Integer settle;
/**
@@ -384,6 +387,26 @@
this.settle = settle;
}
+ public String getSettle$(){
+ if (null == this.settle){ return null; }
+ switch (this.settle){
+ case 1:
+ return "鑽夌";
+ case 2:
+ return "鎻愪氦";
+ case 3:
+ return "宸茶";
+ case 4:
+ return "浣滀笟";
+ case 5:
+ return "瀹屾垚";
+ case 6:
+ return "鍙栨秷";
+ default:
+ return String.valueOf(this.status);
+ }
+ }
+
public Integer getStatus() {
return status;
}
diff --git a/src/main/webapp/views/issue/issue.html b/src/main/webapp/views/issue/issue.html
index bc0ac8c..9281275 100644
--- a/src/main/webapp/views/issue/issue.html
+++ b/src/main/webapp/views/issue/issue.html
@@ -160,9 +160,9 @@
<option value="1">鑽夌</option>
<option value="2">鎻愪氦</option>
<option value="3">宸茶</option>
- <option value="4">澶勭悊涓�</option>
+ <option value="4">浣滀笟</option>
<option value="5">瀹屾垚</option>
- <option value="0">鍙栨秷</option>
+ <option value="6">鍙栨秷</option>
</select>
</div>
</div>
--
Gitblit v1.9.1