|
@@ -2,8 +2,10 @@ package com.welampiot.controller;
|
|
|
|
|
|
import com.welampiot.common.BaseResult;
|
|
|
import com.welampiot.common.InterfaceResultEnum;
|
|
|
+import com.welampiot.dto.LampPoleDTO;
|
|
|
import com.welampiot.dto.NoiseDevInfoDTO;
|
|
|
import com.welampiot.dto.NoiseDevInfoLogDTO;
|
|
|
+import com.welampiot.service.LampPoleService;
|
|
|
import com.welampiot.service.NoiseDevInfoLogService;
|
|
|
import com.welampiot.service.NoiseDevInfoService;
|
|
|
import com.welampiot.utils.ToolUtils;
|
|
@@ -18,10 +20,7 @@ import org.springframework.web.bind.annotation.RestController;
|
|
|
import javax.servlet.http.HttpServletRequest;
|
|
|
import java.text.ParseException;
|
|
|
import java.text.SimpleDateFormat;
|
|
|
-import java.util.ArrayList;
|
|
|
-import java.util.Date;
|
|
|
-import java.util.HashMap;
|
|
|
-import java.util.List;
|
|
|
+import java.util.*;
|
|
|
|
|
|
/**
|
|
|
* ClassName: NoiseDevInfoController
|
|
@@ -42,6 +41,9 @@ public class NoiseDevInfoController {
|
|
|
@Autowired
|
|
|
private NoiseDevInfoLogService noiseDevInfoLogService;
|
|
|
|
|
|
+ @Autowired
|
|
|
+ private LampPoleService lampPoleService;
|
|
|
+
|
|
|
@Autowired
|
|
|
private ToolUtils toolUtils;
|
|
|
|
|
@@ -52,7 +54,7 @@ public class NoiseDevInfoController {
|
|
|
* @return
|
|
|
*/
|
|
|
@RequestMapping(value = "/devList", method = RequestMethod.POST)
|
|
|
- public BaseResult<NoiseDevInfoDTO> devList(HttpServletRequest request) {
|
|
|
+ public BaseResult<?> devList(HttpServletRequest request) {
|
|
|
int page = request.getParameter("page") == null ? 1 : Integer.parseInt(request.getParameter("page"));
|
|
|
int count = request.getParameter("count") == null ? 16 : Integer.parseInt(request.getParameter("count"));
|
|
|
int online = request.getParameter("online") == null ? 0 : Integer.parseInt(request.getParameter("online"));
|
|
@@ -76,7 +78,7 @@ public class NoiseDevInfoController {
|
|
|
* @return
|
|
|
*/
|
|
|
@RequestMapping(value = "/devInfo", method = RequestMethod.POST)
|
|
|
- public BaseResult<NoiseDevInfoDTO> devInfo(HttpServletRequest request) {
|
|
|
+ public BaseResult<?> devInfo(HttpServletRequest request) {
|
|
|
int id = request.getParameter("id") == null || request.getParameter("id").length() == 0 ? 0 : Integer.parseInt(request.getParameter("id"));
|
|
|
int version = request.getParameter("version") == null ? 0 : Integer.parseInt(request.getParameter("version"));
|
|
|
if (id == 0) return toolUtils.response(InterfaceResultEnum.PARAM_FAIL, version);
|
|
@@ -90,12 +92,11 @@ public class NoiseDevInfoController {
|
|
|
|
|
|
/**
|
|
|
* 获取噪声监控设备统计信息
|
|
|
- *
|
|
|
* @param request
|
|
|
* @return
|
|
|
*/
|
|
|
@RequestMapping(value = "/devStatistics", method = RequestMethod.POST)
|
|
|
- public BaseResult devStatistics(HttpServletRequest request) throws ParseException {
|
|
|
+ public BaseResult<?> devStatistics(HttpServletRequest request) throws ParseException {
|
|
|
Integer version = (Integer) toolUtils.getRequestContent(request, "version", 1);
|
|
|
Integer id = (Integer) toolUtils.getRequestContent(request, "id", 1);
|
|
|
if (id == 0) return toolUtils.response(InterfaceResultEnum.LACK_PARAM_ERROR, version);
|
|
@@ -173,4 +174,69 @@ public class NoiseDevInfoController {
|
|
|
noiseDevInfoLogVO.setDateList(dateList);
|
|
|
return toolUtils.response(InterfaceResultEnum.OPERATION_SUCCESS, version, noiseDevInfoLogVO);
|
|
|
}
|
|
|
+
|
|
|
+ /**
|
|
|
+ * 编辑噪声监控设备
|
|
|
+ * @param request 噪声监控设备属性
|
|
|
+ * @return 编辑噪声监控设备
|
|
|
+ */
|
|
|
+ @RequestMapping(value = "/devUpdate", method = RequestMethod.POST)
|
|
|
+ public BaseResult<?> devUpdate(HttpServletRequest request) {
|
|
|
+ Integer version = (Integer) toolUtils.getRequestContent(request, "version", 1);
|
|
|
+ Integer id = (Integer) toolUtils.getRequestContent(request, "id", 1);
|
|
|
+ String name = (String) toolUtils.getRequestContent(request, "name", 2);
|
|
|
+ String address = (String) toolUtils.getRequestContent(request, "address", 2);
|
|
|
+ Integer serialPort = (Integer) toolUtils.getRequestContent(request, "serialPort", 1);
|
|
|
+ String warringValue1 = (String) toolUtils.getRequestContent(request, "warringValue1", 2);
|
|
|
+ String warringValue2 = (String) toolUtils.getRequestContent(request, "warringValue2", 2);
|
|
|
+ if (id == 0) return toolUtils.response(InterfaceResultEnum.LACK_PARAM_ERROR,version);
|
|
|
+ if (name.length() == 0 || address.length() == 0 || warringValue1.length() == 0 || warringValue2.length() == 0)
|
|
|
+ return toolUtils.response(InterfaceResultEnum.LACK_NEED_PARAM,version);
|
|
|
+ NoiseDevInfoDTO noiseDevInfoDTO = new NoiseDevInfoDTO();
|
|
|
+ noiseDevInfoDTO.setId(id);
|
|
|
+ noiseDevInfoDTO.setName(name);
|
|
|
+ NoiseDevInfoDTO dto = noiseDevInfoService.getNoiseLampPole(id);
|
|
|
+ noiseDevInfoDTO.setSectionId(dto.getSectionId());
|
|
|
+ if (noiseDevInfoService.checkNoiseName(noiseDevInfoDTO) > 0)
|
|
|
+ return toolUtils.response(InterfaceResultEnum.NOISE_NAME_UNIQUE_ERROR,version);
|
|
|
+ noiseDevInfoDTO.setAddress(address);
|
|
|
+ noiseDevInfoDTO.setSerialPort(serialPort);
|
|
|
+ noiseDevInfoDTO.setWarringValue1(Float.valueOf(warringValue1));
|
|
|
+ noiseDevInfoDTO.setWarringValue2(Float.valueOf(warringValue2));
|
|
|
+ long l = System.currentTimeMillis();
|
|
|
+ SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
|
|
|
+ String format = simpleDateFormat.format(l);
|
|
|
+ noiseDevInfoDTO.setUpdateTime(format);
|
|
|
+ noiseDevInfoService.updateNoiseDevData(noiseDevInfoDTO);
|
|
|
+ return toolUtils.response(InterfaceResultEnum.OPERATION_SUCCESS,version);
|
|
|
+ }
|
|
|
+
|
|
|
+ /**
|
|
|
+ * 删除噪声监控设备
|
|
|
+ * @param request 噪声监控设备id
|
|
|
+ * @return 删除噪声监控设备
|
|
|
+ */
|
|
|
+ @RequestMapping(value = "/devDel", method = RequestMethod.POST)
|
|
|
+ public BaseResult<?> devDel(HttpServletRequest request) {
|
|
|
+ Integer version = (Integer) toolUtils.getRequestContent(request, "version", 1);
|
|
|
+ Integer id = (Integer) toolUtils.getRequestContent(request, "id", 1);
|
|
|
+ if (id == 0) return toolUtils.response(InterfaceResultEnum.LACK_PARAM_ERROR,version);
|
|
|
+ noiseDevInfoService.deleteNoiseData(id);
|
|
|
+ noiseDevInfoLogService.deleteNoiseLogData(id);
|
|
|
+ NoiseDevInfoDTO dto = noiseDevInfoService.getNoiseLampPole(id);
|
|
|
+ String devType = dto.getDevType();
|
|
|
+ String[] split = devType.split(",");
|
|
|
+ StringJoiner joiner = new StringJoiner(",");
|
|
|
+ for (String s : split) {
|
|
|
+ if (!s.equals("17")) {
|
|
|
+ joiner.add(s);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ String newDevType = joiner.toString();
|
|
|
+ LampPoleDTO lampPoleDTO = new LampPoleDTO();
|
|
|
+ lampPoleDTO.setId(dto.getId());
|
|
|
+ lampPoleDTO.setDevType(newDevType);
|
|
|
+ lampPoleService.updateLampPoleDevType(lampPoleDTO);
|
|
|
+ return toolUtils.response(InterfaceResultEnum.OPERATION_SUCCESS,version);
|
|
|
+ }
|
|
|
}
|