From cf093e9cbbbc620383f563bba1d70a650e97a012 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期二, 01 三月 2022 09:40:04 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/sc/manager/controller/AppController.java | 106 ++++++++++++++++++++++++++---------------------------
1 files changed, 52 insertions(+), 54 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 53ff9c4..c8fd7a6 100644
--- a/src/main/java/com/zy/sc/manager/controller/AppController.java
+++ b/src/main/java/com/zy/sc/manager/controller/AppController.java
@@ -12,6 +12,8 @@
import com.zy.sc.common.service.GeoService;
import com.zy.sc.common.web.BaseController;
import com.zy.sc.manager.controller.param.MobileIssueParam;
+import com.zy.sc.manager.controller.result.AppHostIssueVo;
+import com.zy.sc.manager.controller.result.AppIssueVo;
import com.zy.sc.manager.entity.Issue;
import com.zy.sc.manager.entity.IssueType;
import com.zy.sc.manager.service.IssueService;
@@ -21,10 +23,10 @@
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
/**
* Created by vincent on 2021/12/20
@@ -79,6 +81,9 @@
if (Cools.isEmpty(param.getTel())) {
return R.error("璇疯緭鍏ヨ仈绯绘柟寮�");
}
+ if (!param.getTel().matches(REGEX_MOBILE)) {
+ return R.error("璇疯緭鍏ユ纭殑鎵嬫満鍙�");
+ }
if (Cools.isEmpty(param.getTitle())) {
return R.error("璇疯緭鍏ラ棶棰樻杩�");
}
@@ -92,7 +97,7 @@
param.getTitle(), // 闂姒傝堪
null, // 鏁呴殰鍘熷洜
null, // 瑙ｅ喅鍔炴硶
- null, // 鏂囦欢鍒楄〃
+ JSONArray.toJSONString(param.getVideoSrc()), // 鏂囦欢鍒楄〃
JSONArray.toJSONString(param.getImgArr()), // 鍥剧墖
startTime, // 鍙戠敓鏃ユ湡
null, // 澶勭悊鏃ユ湡
@@ -100,7 +105,7 @@
param.getDiscoverer(), // 鍙戠幇浜�
param.getTel(), // 鑱旂郴鏂瑰紡
null, // 渚涘簲鍟�
- null, //
+ 2, //
1, // 鐘舵��
getUserId(), // 娣诲姞浜哄憳
now, // 娣诲姞鏃堕棿
@@ -113,57 +118,50 @@
}
return R.ok("闂涓婃姤鎴愬姛");
}
-//
-// @RequestMapping("/sensor/list/auth")
-// @ManagerAuth
-// public R sensorList(@RequestParam(required = false) String condition){
-// Wrapper<Sensor> wrapper = new EntityWrapper<Sensor>()
-// .like("uuid", condition)
-// .orderBy("sensor_type").orderBy("create_time");
-// Long hostId = getHostId();
-// if (hostId != null) {
-// wrapper.eq("host_id", hostId);
-// }
-// List<Sensor> sensors = sensorService.selectList(wrapper);
-// List<AppSensorTypeVo> result = new ArrayList<>();
-// Set<Long> sensorTypeSet = new HashSet<>();
-// for (Sensor sensor : sensors) {
-// AppSensorVo sensorVo = new AppSensorVo();
-// sensorVo.setSensorId(sensor.getId());
-// sensorVo.setUuid(sensor.getUuid());
-// String addr = sensor.getProvince()+sensor.getCity()+sensor.getDistrict();
-//// String addr = sensor.getProvince()+","+sensor.getCity()+","+sensor.getDistrict();
-// if (Cools.isEmpty(addr)) {
-// addr = "鏈煡瀹氫綅";
-// }
-// sensorVo.setAddr(addr);
-//
-// if (!sensorTypeSet.contains(sensor.getSensorType())) {
-// sensorTypeSet.add(sensor.getSensorType());
-// SensorType sensorType = sensorTypeService.selectById(sensor.getSensorType());
-// AppSensorTypeVo vo = new AppSensorTypeVo();
-// vo.setSensorTypeFlag(sensorType.getFlag());
-// vo.setSensorTypeId(sensor.getSensorType());
-// vo.setSensorTypeName(sensorType.getName());
-// result.add(vo);
-// vo.getSensors().add(sensorVo);
-// } else {
-// for (AppSensorTypeVo vo : result) {
-// if (vo.getSensorTypeId().equals(sensor.getSensorType())) {
-// vo.getSensors().add(sensorVo);
-// }
-// }
-// }
-// }
-// return R.ok().add(result);
-// }
-//
-// @RequestMapping("/sensor/detl/auth")
-// @ManagerAuth
-// public R sensorDetl(@RequestParam Long sensorId){
-// return R.ok().add(sensorService.selectById(sensorId));
-// }
+ @RequestMapping("/issue/list/auth")
+ @ManagerAuth
+ public R sensorList(@RequestParam(required = false) String condition){
+ Wrapper<Issue> wrapper = new EntityWrapper<Issue>()
+ .like("title", condition)
+ .orderBy("settle").orderBy("create_time", false);
+ Long hostId = getHostId();
+ if (hostId != null) {
+ wrapper.eq("host_id", hostId);
+ }
+ List<Issue> issues = issueService.selectList(wrapper);
+ List<AppHostIssueVo> result = new ArrayList<>();
+ Set<Long> hostSet = new HashSet<>();
+ for (Issue issue : issues) {
+ AppIssueVo vo = new AppIssueVo();
+ vo.setIssueId(issue.getId());
+ vo.setTitle(issue.getTitle().length()>12?issue.getTitle().substring(0, 12):issue.getTitle());
+ vo.setStartTime(issue.getStartTime$().length()>11?issue.getStartTime$().substring(0, 11):issue.getStartTime$());
+ vo.setSettle(issue.getSettle$());
+ if (!hostSet.contains(issue.getHostId())) {
+ hostSet.add(issue.getHostId());
+ Host host = hostService.selectById(issue.getHostId());
+ AppHostIssueVo hostVo = new AppHostIssueVo();
+ hostVo.setHostId(host.getId());
+ hostVo.setHostName(host.getName());
+ result.add(hostVo);
+ hostVo.getIssues().add(vo);
+ } else {
+ for (AppHostIssueVo hostVo : result) {
+ if (hostVo.getHostId().equals(issue.getHostId())) {
+ hostVo.getIssues().add(vo);
+ }
+ }
+ }
+ }
+ return R.ok().add(result);
+ }
+
+ @RequestMapping("/issue/detl/auth")
+ @ManagerAuth
+ public R issueDetl(@RequestParam Long issueId){
+ return R.ok().add(issueService.selectById(issueId));
+ }
}
--
Gitblit v1.9.1