diff --git a/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/ZhipingController.java b/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/ZhipingController.java index 75d8a84..e5ea548 100644 --- a/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/ZhipingController.java +++ b/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/ZhipingController.java @@ -3,10 +3,11 @@ package com.shxy.xymanager_admin.controller; import com.github.pagehelper.PageInfo; import com.shxy.xymanager_common.annotation.Log; 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.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.LeadPullsService; import com.shxy.xymanager_service.service.WeatherService; @@ -15,9 +16,11 @@ import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; +import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; +import javax.validation.constraints.NotNull; import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -39,6 +42,54 @@ public class ZhipingController extends BaseController { @Resource HenanService henanService; + @PostMapping("addWeather") + @ApiOperation("新增天气装置") + public ResponseReult addWeather(@RequestBody TerminalWeather item) throws Exception { + henanService.addWeather(item); + return ResponseReult.success("OK"); + } + + @PostMapping("addPoint") + @ApiOperation("新增拉力装置") + public ResponseReult addPoint(@RequestBody TerminalPoint item) throws Exception { + henanService.addPoint(item); + return ResponseReult.success("OK"); + } + + @PostMapping("delWeather") + @ApiOperation("删除天气装置") + public ResponseReult 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 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> getWeatherList() { + List result = henanService.getWeatherList(); + return ResponseReult.success(result); + } + + @GetMapping("getPointList") + @ApiOperation("查询拉力装置点表") + public ResponseReult> getPointList() { + List result = henanService.getPointList(); + return ResponseReult.success(result); + } + @GetMapping("query") @ApiOperation("查询") @Log(title = "微气象监测数据同步查询", type = "查询") diff --git a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/HenanServiceImpl.java b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/HenanServiceImpl.java index af55c10..080d2f5 100644 --- a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/HenanServiceImpl.java +++ b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/HenanServiceImpl.java @@ -3,6 +3,8 @@ package com.shxy.xymanager_service.impl; import com.github.pagehelper.PageInfo; 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.TerminalWeatherMapper; import com.shxy.xymanager_service.service.HenanService; @@ -83,7 +85,8 @@ public class HenanServiceImpl implements HenanService { return result; } - private List getWeatherList() { + @Override + public List getWeatherList() { TerminalWeatherExample example = new TerminalWeatherExample(); TerminalWeatherExample.Criteria criteria = example.createCriteria(); List list = terminalWeatherMapper.selectByExample(example); @@ -97,7 +100,8 @@ public class HenanServiceImpl implements HenanService { return list; } - private List getPointList() { + @Override + public List getPointList() { TerminalPointExample example = new TerminalPointExample(); TerminalPointExample.Criteria criteria = example.createCriteria(); example.setOrderByClause("term_id asc, point asc"); @@ -112,6 +116,51 @@ public class HenanServiceImpl implements HenanService { 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 pointList, LeadPulls item) { for (TerminalPoint point : pointList) { if (item.getTermId().equals(point.getTermId()) && diff --git a/xymanager_service/src/main/java/com/shxy/xymanager_service/service/HenanService.java b/xymanager_service/src/main/java/com/shxy/xymanager_service/service/HenanService.java index 53af5e5..1e0f2f2 100644 --- a/xymanager_service/src/main/java/com/shxy/xymanager_service/service/HenanService.java +++ b/xymanager_service/src/main/java/com/shxy/xymanager_service/service/HenanService.java @@ -2,6 +2,8 @@ package com.shxy.xymanager_service.service; 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 java.util.Date; @@ -12,4 +14,16 @@ public interface HenanService { List queryMicromes(Date start, Date end); List queryPullIces(Date start, Date end); + + List getWeatherList(); + + List getPointList(); + + void addWeather(TerminalWeather item); + + void delWeather(Integer id); + + void addPoint(TerminalPoint item); + + void delPoint(Integer id); }