feat: 河南覆冰增加天气和拉力对应装置的增删查接口

dev
huangfeng 6 months ago
parent e80cff32bb
commit 0fc4a7e365

@ -3,10 +3,11 @@ package com.shxy.xymanager_admin.controller;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import com.shxy.xymanager_common.annotation.Log; import com.shxy.xymanager_common.annotation.Log;
import com.shxy.xymanager_common.base.BaseController; import com.shxy.xymanager_common.base.BaseController;
import com.shxy.xymanager_common.base.ResponseReult;
import com.shxy.xymanager_common.entity.*;
import com.shxy.xymanager_common.exception.ApiException;
import com.shxy.xymanager_common.util.*; import com.shxy.xymanager_common.util.*;
import com.shxy.xymanager_common.zhiping.*; import com.shxy.xymanager_common.zhiping.*;
import com.shxy.xymanager_common.entity.LeadPulls;
import com.shxy.xymanager_common.entity.Weathers;
import com.shxy.xymanager_service.service.HenanService; import com.shxy.xymanager_service.service.HenanService;
import com.shxy.xymanager_service.service.LeadPullsService; import com.shxy.xymanager_service.service.LeadPullsService;
import com.shxy.xymanager_service.service.WeatherService; import com.shxy.xymanager_service.service.WeatherService;
@ -15,9 +16,11 @@ import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.CollectionUtils; import org.springframework.util.CollectionUtils;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource; import javax.annotation.Resource;
import javax.validation.constraints.NotNull;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
@ -39,6 +42,54 @@ public class ZhipingController extends BaseController {
@Resource @Resource
HenanService henanService; HenanService henanService;
@PostMapping("addWeather")
@ApiOperation("新增天气装置")
public ResponseReult<String> addWeather(@RequestBody TerminalWeather item) throws Exception {
henanService.addWeather(item);
return ResponseReult.success("OK");
}
@PostMapping("addPoint")
@ApiOperation("新增拉力装置")
public ResponseReult<String> addPoint(@RequestBody TerminalPoint item) throws Exception {
henanService.addPoint(item);
return ResponseReult.success("OK");
}
@PostMapping("delWeather")
@ApiOperation("删除天气装置")
public ResponseReult<String> delWeather(@Validated @NotNull(message = "id不能为空!") Integer id) throws Exception {
if (id == null) {
throw new ApiException("id不能为空!");
}
henanService.delWeather(id);
return ResponseReult.success("OK");
}
@PostMapping("delPoint")
@ApiOperation("删除拉力装置")
public ResponseReult<String> delPoint(@Validated @NotNull(message = "id不能为空!") Integer id) throws Exception {
if (id == null) {
throw new ApiException("id不能为空!");
}
henanService.delPoint(id);
return ResponseReult.success("OK");
}
@GetMapping("getWeatherList")
@ApiOperation("查询天气装置列表")
public ResponseReult<List<TerminalWeather>> getWeatherList() {
List<TerminalWeather> result = henanService.getWeatherList();
return ResponseReult.success(result);
}
@GetMapping("getPointList")
@ApiOperation("查询拉力装置点表")
public ResponseReult<List<TerminalPoint>> getPointList() {
List<TerminalPoint> result = henanService.getPointList();
return ResponseReult.success(result);
}
@GetMapping("query") @GetMapping("query")
@ApiOperation("查询") @ApiOperation("查询")
@Log(title = "微气象监测数据同步查询", type = "查询") @Log(title = "微气象监测数据同步查询", type = "查询")

@ -3,6 +3,8 @@ package com.shxy.xymanager_service.impl;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import com.shxy.xymanager_common.entity.*; import com.shxy.xymanager_common.entity.*;
import com.shxy.xymanager_common.exception.ApiException;
import com.shxy.xymanager_common.util.StringUtils;
import com.shxy.xymanager_dao.dao.TerminalPointMapper; import com.shxy.xymanager_dao.dao.TerminalPointMapper;
import com.shxy.xymanager_dao.dao.TerminalWeatherMapper; import com.shxy.xymanager_dao.dao.TerminalWeatherMapper;
import com.shxy.xymanager_service.service.HenanService; import com.shxy.xymanager_service.service.HenanService;
@ -83,7 +85,8 @@ public class HenanServiceImpl implements HenanService {
return result; return result;
} }
private List<TerminalWeather> getWeatherList() { @Override
public List<TerminalWeather> getWeatherList() {
TerminalWeatherExample example = new TerminalWeatherExample(); TerminalWeatherExample example = new TerminalWeatherExample();
TerminalWeatherExample.Criteria criteria = example.createCriteria(); TerminalWeatherExample.Criteria criteria = example.createCriteria();
List<TerminalWeather> list = terminalWeatherMapper.selectByExample(example); List<TerminalWeather> list = terminalWeatherMapper.selectByExample(example);
@ -97,7 +100,8 @@ public class HenanServiceImpl implements HenanService {
return list; return list;
} }
private List<TerminalPoint> getPointList() { @Override
public List<TerminalPoint> getPointList() {
TerminalPointExample example = new TerminalPointExample(); TerminalPointExample example = new TerminalPointExample();
TerminalPointExample.Criteria criteria = example.createCriteria(); TerminalPointExample.Criteria criteria = example.createCriteria();
example.setOrderByClause("term_id asc, point asc"); example.setOrderByClause("term_id asc, point asc");
@ -112,6 +116,51 @@ public class HenanServiceImpl implements HenanService {
return list; return list;
} }
@Override
public void addWeather(TerminalWeather item) {
if (item.getTermId() == null) {
throw new ApiException("termId不能为空");
}
Terminals term = newCacheService.getTerminal(item.getTermId());
if (term == null) {
throw new ApiException("未找到该装置");
}
item.setId(null);
terminalWeatherMapper.insert(item);
}
@Override
public void delWeather(Integer id) {
terminalWeatherMapper.deleteByPrimaryKey(id);
}
@Override
public void addPoint(TerminalPoint item) {
if (item.getTermId() == null) {
throw new ApiException("termId不能为空");
}
Terminals term = newCacheService.getTerminal(item.getTermId());
if (term == null) {
throw new ApiException("未找到该装置");
}
if (StringUtils.isBlank(item.getFuncCode())) {
throw new ApiException("funcCode不能为空");
}
if (StringUtils.isBlank(item.getPoint())) {
throw new ApiException("point不能为空");
}
if (item.getCcll() == null) {
throw new ApiException("ccll不能为空");
}
item.setId(null);
terminalPointMapper.insert(item);
}
@Override
public void delPoint(Integer id) {
terminalPointMapper.deleteByPrimaryKey(id);
}
private String getKey(List<TerminalPoint> pointList, LeadPulls item) { private String getKey(List<TerminalPoint> pointList, LeadPulls item) {
for (TerminalPoint point : pointList) { for (TerminalPoint point : pointList) {
if (item.getTermId().equals(point.getTermId()) && if (item.getTermId().equals(point.getTermId()) &&

@ -2,6 +2,8 @@ package com.shxy.xymanager_service.service;
import com.shxy.xymanager_common.entity.LeadPulls; import com.shxy.xymanager_common.entity.LeadPulls;
import com.shxy.xymanager_common.entity.TerminalPoint;
import com.shxy.xymanager_common.entity.TerminalWeather;
import com.shxy.xymanager_common.entity.Weathers; import com.shxy.xymanager_common.entity.Weathers;
import java.util.Date; import java.util.Date;
@ -12,4 +14,16 @@ public interface HenanService {
List<Weathers> queryMicromes(Date start, Date end); List<Weathers> queryMicromes(Date start, Date end);
List<LeadPulls> queryPullIces(Date start, Date end); List<LeadPulls> queryPullIces(Date start, Date end);
List<TerminalWeather> getWeatherList();
List<TerminalPoint> getPointList();
void addWeather(TerminalWeather item);
void delWeather(Integer id);
void addPoint(TerminalPoint item);
void delPoint(Integer id);
} }

Loading…
Cancel
Save