feat：完善app服务接口
This commit is contained in:
nieziyan
parent
373b8a2b5b
commit
e3a18644b5
|
|
@ -11,8 +11,8 @@ import org.springframework.beans.factory.annotation.Autowired;
|
|||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
@RestController
|
||||
@RequestMapping()
|
||||
@Api(value = "报警日志服务", tags = "报警日志服务")
|
||||
@RequestMapping
|
||||
@Api(value = "报警模块相关服务", tags = "报警模块相关服务")
|
||||
public class AlarmController {
|
||||
|
||||
@Autowired
|
||||
|
|
@ -26,25 +26,25 @@ public class AlarmController {
|
|||
|
||||
@ApiOperation("分页查询报警日志信息")
|
||||
@PostMapping("/alarmLog/findPage")
|
||||
public Result alarmLogFindPage(@RequestBody AlarmVo alarmVo){
|
||||
public Result<?> alarmLogFindPage(@RequestBody AlarmVo alarmVo){
|
||||
return alarmClient.alarmLogFindPage(alarmVo);
|
||||
}
|
||||
|
||||
@GetMapping("/sysServer/findPage")
|
||||
@ApiOperation(value = "分页查询服务器配置信息", notes = "分页查询服务器配置信息")
|
||||
public Result serverFindPage(QueryRequest query){
|
||||
public Result<?> serverFindPage(QueryRequest query){
|
||||
return alarmClient.serverFindPage(query);
|
||||
}
|
||||
|
||||
@GetMapping("/sysDatabase/findPage")
|
||||
@ApiOperation(value = "分页查询数据库配置信息", notes = "分页查询数据库配置信息")
|
||||
public Result databaseFindPage(QueryRequest query){
|
||||
public Result<?> databaseFindPage(QueryRequest query){
|
||||
return alarmClient.databaseFindPage(query);
|
||||
}
|
||||
|
||||
@GetMapping("/sysEmail/findPage")
|
||||
@ApiOperation(value = "分页查询邮箱配置信息", notes = "分页查询邮箱配置信息")
|
||||
public Result emailFindPage(QueryRequest query){
|
||||
public Result<?> emailFindPage(QueryRequest query){
|
||||
return alarmClient.emailFindPage(query);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,66 @@
|
|||
package org.jeecg.modules.controller;
|
||||
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiOperation;
|
||||
import org.jeecg.common.api.vo.Result;
|
||||
import org.jeecg.modules.feignclient.AnalysisService;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
|
||||
@RestController
|
||||
@RequestMapping
|
||||
@Api(value = "交互分析相关服务", tags = "交互分析相关服务")
|
||||
public class AnalysisController {
|
||||
|
||||
@Autowired
|
||||
private AnalysisService analysisService;
|
||||
|
||||
@GetMapping("/spectrumAnalysis/getDBSpectrumChart")
|
||||
@ApiOperation(value = "查询折线图相关信息接口", notes = "查询折线图相关信息接口")
|
||||
public Result<?> getDBSpectrumChart(String dbName, Integer sampleId, String analyst, HttpServletRequest request) {
|
||||
return analysisService.getDBSpectrumChart(dbName, sampleId, analyst, request);
|
||||
}
|
||||
|
||||
@DeleteMapping("/spectrumAnalysis/deleteSpectrumCacheData")
|
||||
@ApiOperation(value = "删除缓存数据",notes = "删除缓存数据")
|
||||
public void deleteSpectrumCacheData(String sampleFileName, HttpServletRequest request) {
|
||||
analysisService.deleteSpectrumCacheData(sampleFileName, request);
|
||||
}
|
||||
|
||||
@GetMapping("/gamma/gammaByDB")
|
||||
public Result<?> gammaByDB(Integer sampleId, String dbName, String analyst, HttpServletRequest request){
|
||||
return analysisService.gammaByDB(sampleId ,dbName, analyst, request);
|
||||
}
|
||||
|
||||
@GetMapping("/gamma/clickPeakInformation")
|
||||
@ApiOperation(value = "gamma主页面点击peakInformation返回信息接口", notes = "gamma主页面点击peakInformation返回信息接口")
|
||||
public Result<?> clickPeakInformation(String fileName, int index, HttpServletRequest request) {
|
||||
return analysisService.clickPeakInformation(fileName, index, request);
|
||||
}
|
||||
|
||||
@GetMapping("/gamma/radionuclideActivity")
|
||||
@ApiOperation(value = "查看Radionuclide Activity页面数据", notes = "查看Radionuclide Activity页面数据")
|
||||
public Result<?> radionuclideActivity(Integer sampleId, String fileName, HttpServletRequest request) {
|
||||
return analysisService.radionuclideActivity(sampleId, fileName, request);
|
||||
}
|
||||
|
||||
@GetMapping("/gamma/getGammaSelPosNuclide")
|
||||
@ApiOperation(value = "gamma主页面选择channel加载对应核素信息接口", notes = "gamma主页面选择channel加载对应核素信息接口")
|
||||
public Result<?> getGammaSelPosNuclide(Integer sampleId, String fileName, int channel, double energy, HttpServletRequest request) {
|
||||
return analysisService.getGammaSelPosNuclide(sampleId, fileName, channel, energy, request);
|
||||
}
|
||||
|
||||
@GetMapping("/gamma/peakInformation")
|
||||
@ApiOperation(value = "查看Peak Information页面数据", notes = "查看Peak Information页面数据")
|
||||
public Result<?> peakInformation(Integer sampleId, String fileName, HttpServletRequest request){
|
||||
return analysisService.peakInformation(sampleId, fileName, request);
|
||||
}
|
||||
|
||||
@DeleteMapping("delPHDCache")
|
||||
@ApiOperation(value = "删除PHD文件缓存", notes = "删除PHD文件缓存")
|
||||
public void delPHDCache(@RequestParam String fileName) {
|
||||
analysisService.delPHDCache(fileName);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,30 @@
|
|||
package org.jeecg.modules.controller;
|
||||
|
||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||
import io.swagger.annotations.Api;
|
||||
import org.jeecg.common.api.vo.Result;
|
||||
import org.jeecg.modules.model.AnnouncementSendModel;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RequestParam;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
import org.jeecg.modules.feignclient.MessageService;
|
||||
|
||||
@RestController
|
||||
@RequestMapping("/sys")
|
||||
@Api(value = "系统消息相关服务", tags = "系统消息相关服务")
|
||||
public class MessageController {
|
||||
|
||||
@Autowired
|
||||
private MessageService messageService;
|
||||
|
||||
@GetMapping(value = "/getMyAnnouncementSend")
|
||||
public Result<?> getMyAnnouncementSend(AnnouncementSendModel announcementSendModel,
|
||||
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
|
||||
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize) {
|
||||
return messageService.getMyAnnouncementSend(announcementSendModel, pageNo, pageSize);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -7,23 +7,26 @@ import org.jeecg.modules.base.bizVo.AnalysisLogVo;
|
|||
import org.springframework.cloud.openfeign.FeignClient;
|
||||
import org.springframework.stereotype.Component;
|
||||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
import org.springframework.web.bind.annotation.PostMapping;
|
||||
import org.springframework.web.bind.annotation.RequestBody;
|
||||
import org.springframework.web.bind.annotation.RequestParam;
|
||||
|
||||
@Component
|
||||
@FeignClient(value = "")
|
||||
@FeignClient("armd-abnormal-alarm")
|
||||
public interface AlarmClient {
|
||||
|
||||
@GetMapping(value = "/alarmAnalysisLog/findPage")
|
||||
Result<?> analysisLogFindPage(AnalysisLogVo analysisLogVo);
|
||||
Result<?> analysisLogFindPage(@RequestParam AnalysisLogVo analysisLogVo);
|
||||
|
||||
@GetMapping(value = "/alarmLog/findPage")
|
||||
Result<?> alarmLogFindPage(AlarmVo alarmVo);
|
||||
@PostMapping(value = "/alarmLog/findPage")
|
||||
Result<?> alarmLogFindPage(@RequestBody AlarmVo alarmVo);
|
||||
|
||||
@GetMapping(value = "/sysEmail/findPage")
|
||||
Result<?> emailFindPage(QueryRequest query);
|
||||
Result<?> emailFindPage(@RequestParam QueryRequest query);
|
||||
|
||||
@GetMapping(value = "/sysServer/findPage")
|
||||
Result<?> serverFindPage(QueryRequest query);
|
||||
Result<?> serverFindPage(@RequestParam QueryRequest query);
|
||||
|
||||
@GetMapping(value = "/sysDatabase/findPage")
|
||||
Result<?> databaseFindPage(QueryRequest query);
|
||||
Result<?> databaseFindPage(@RequestParam QueryRequest query);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,56 @@
|
|||
package org.jeecg.modules.feignclient;
|
||||
|
||||
import io.swagger.annotations.ApiOperation;
|
||||
import org.jeecg.common.api.vo.Result;
|
||||
import org.springframework.cloud.openfeign.FeignClient;
|
||||
import org.springframework.stereotype.Component;
|
||||
import org.springframework.web.bind.annotation.DeleteMapping;
|
||||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
import org.springframework.web.bind.annotation.RequestParam;
|
||||
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
|
||||
@Component
|
||||
@FeignClient("armd-spectrum-analysis")
|
||||
public interface AnalysisService {
|
||||
|
||||
@GetMapping("/spectrumAnalysis/getDBSpectrumChart")
|
||||
Result<?> getDBSpectrumChart(@RequestParam String dbName,
|
||||
@RequestParam Integer sampleId,
|
||||
@RequestParam String analyst,
|
||||
HttpServletRequest request);
|
||||
|
||||
@DeleteMapping("/spectrumAnalysis/deleteSpectrumCacheData")
|
||||
void deleteSpectrumCacheData(@RequestParam String sampleFileName,
|
||||
HttpServletRequest request);
|
||||
|
||||
@GetMapping("/gamma/gammaByDB")
|
||||
Result<?> gammaByDB(@RequestParam Integer sampleId,
|
||||
@RequestParam String dbName,
|
||||
@RequestParam String analyst,
|
||||
HttpServletRequest request);
|
||||
|
||||
@GetMapping("/gamma/clickPeakInformation")
|
||||
Result<?> clickPeakInformation(@RequestParam String fileName,
|
||||
@RequestParam int index,
|
||||
HttpServletRequest request);
|
||||
|
||||
@GetMapping("/gamma/radionuclideActivity")
|
||||
Result<?> radionuclideActivity(@RequestParam Integer sampleId,
|
||||
@RequestParam String fileName,
|
||||
HttpServletRequest request);
|
||||
|
||||
@GetMapping("/gamma/getGammaSelPosNuclide")
|
||||
Result<?> getGammaSelPosNuclide(@RequestParam Integer sampleId,
|
||||
@RequestParam String fileName,
|
||||
@RequestParam int channel,
|
||||
@RequestParam double energy,
|
||||
HttpServletRequest request);
|
||||
@GetMapping("/gamma/peakInformation")
|
||||
Result<?> peakInformation(@RequestParam Integer sampleId,
|
||||
@RequestParam String fileName,
|
||||
HttpServletRequest request);
|
||||
|
||||
@DeleteMapping("delPHDCache")
|
||||
void delPHDCache(@RequestParam String fileName);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,18 @@
|
|||
package org.jeecg.modules.feignclient;
|
||||
|
||||
import org.jeecg.common.api.vo.Result;
|
||||
import org.jeecg.modules.model.AnnouncementSendModel;
|
||||
import org.springframework.cloud.openfeign.FeignClient;
|
||||
import org.springframework.stereotype.Component;
|
||||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
import org.springframework.web.bind.annotation.RequestParam;
|
||||
|
||||
@Component
|
||||
@FeignClient(value = "armd-system", path = "/sys")
|
||||
public interface MessageService {
|
||||
|
||||
@GetMapping(value = "/getMyAnnouncementSend")
|
||||
Result<?> getMyAnnouncementSend(@RequestParam AnnouncementSendModel announcementSendModel,
|
||||
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
|
||||
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,77 @@
|
|||
package org.jeecg.modules.model;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.IdType;
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import lombok.Data;
|
||||
import org.springframework.format.annotation.DateTimeFormat;
|
||||
|
||||
import java.io.Serializable;
|
||||
|
||||
/**
|
||||
* @Description: 用户通告阅读标记表
|
||||
* @Author: jeecg-boot
|
||||
* @Date: 2019-02-21
|
||||
* @Version: V1.0
|
||||
*/
|
||||
@Data
|
||||
public class AnnouncementSendModel implements Serializable {
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/**id*/
|
||||
@TableId(type = IdType.ASSIGN_ID)
|
||||
private String id;
|
||||
/**通告id*/
|
||||
private String anntId;
|
||||
/**用户id*/
|
||||
private String userId;
|
||||
/**标题*/
|
||||
private String titile;
|
||||
/**内容*/
|
||||
private String msgContent;
|
||||
/**发布人*/
|
||||
private String sender;
|
||||
/**优先级（L低，M中，H高）*/
|
||||
private String priority;
|
||||
/**阅读状态*/
|
||||
private String readFlag;
|
||||
/**发布时间*/
|
||||
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
|
||||
private java.util.Date sendTime;
|
||||
/**页数*/
|
||||
private Integer pageNo;
|
||||
/**大小*/
|
||||
private Integer pageSize;
|
||||
/**
|
||||
* 消息类型1:通知公告2:系统消息
|
||||
*/
|
||||
private String msgCategory;
|
||||
/**
|
||||
* 业务id
|
||||
*/
|
||||
private String busId;
|
||||
/**
|
||||
* 业务类型
|
||||
*/
|
||||
private String busType;
|
||||
/**
|
||||
* 打开方式 组件：component 路由：url
|
||||
*/
|
||||
private String openType;
|
||||
/**
|
||||
* 组件/路由 地址
|
||||
*/
|
||||
private String openPage;
|
||||
|
||||
/**
|
||||
* 业务类型查询（0.非bpm业务）
|
||||
*/
|
||||
private String bizSource;
|
||||
|
||||
/**
|
||||
* 摘要
|
||||
*/
|
||||
private String msgAbstract;
|
||||
|
||||
}
|
||||
Loading…
Reference in New Issue
Block a user