xiaoguangbin/AnalysisSystemForRadionuclide
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

app微服务模块调用接口修改

Browse Source
This commit is contained in:
qiaoqinzheng 2024-02-20 15:40:13 +08:00
parent 0a26492926
commit 071991aaa8
18 changed files with 539 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
jeecg-module-app/pom.xml
View File

@ -18,10 +18,10 @@
</properties>
<dependencies>
<!-- 引入jeecg-boot-starter-cloud依赖 -->
<!-- jeecg-system-cloud-api -->
<dependency>
<groupId>org.jeecgframework.boot</groupId>
<artifactId>jeecg-boot-starter-cloud</artifactId>
<artifactId>jeecg-system-cloud-api</artifactId>
</dependency>
<dependency>

2
jeecg-module-app/src/main/java/org/jeecg/modules/controller/AlarmController.java
View File

@ -20,7 +20,7 @@ public class AlarmController {
@ApiOperation(value="报警日志分页查询", notes="报警日志分页查询")
@GetMapping(value = "/alarmAnalysisLog/findPage")
public Result<?> analysisLogFindPage(AnalysisLogVo analysisLogVo) {
public Result analysisLogFindPage(AnalysisLogVo analysisLogVo) {
return alarmClient.analysisLogFindPage(analysisLogVo);
}

66
jeecg-module-app/src/main/java/org/jeecg/modules/controller/AnalysisController.java
View File

@ -1,4 +1,70 @@
package org.jeecg.modules.controller;
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
public class AnalysisController {
@Autowired
private AnalysisService analysisService;
// /spectrumAnalysis/getDBSpectrumChart
@GetMapping("/spectrumAnalysis/getDBSpectrumChart")
@ApiOperation(value = "查询折线图相关信息接口", notes = "查询折线图相关信息接口")
public Result getDBSpectrumChart(@RequestParam String dbName,@RequestParam Integer sampleId,@RequestParam String analyst, HttpServletRequest request) {
Result result = analysisService.getDBSpectrumChart(dbName, sampleId, analyst, request);
return result;
}
// /spectrumAnalysis/deleteSpectrumCacheData
@DeleteMapping("/spectrumAnalysis/deleteSpectrumCacheData")
@ApiOperation(value = "删除缓存数据",notes = "删除缓存数据")
public void deleteSpectrumCacheData(@RequestParam String sampleFileName, HttpServletRequest request) {
analysisService.deleteSpectrumCacheData(sampleFileName, request);
}
// /gamma/gammaByDB
@GetMapping("/gamma/gammaByDB")
public Result gammaByDB(@RequestParam Integer sampleId,@RequestParam String dbName,@RequestParam String analyst, HttpServletRequest request){
Result result = analysisService.gammaByDB(sampleId, dbName, analyst, request);
return result;
}
// /gamma/delPHDCache
@DeleteMapping("/gamma/delPHDCache")
@ApiOperation(value = "删除PHD文件缓存", notes = "删除PHD文件缓存")
public void delPHDCache(@RequestParam String fileName) {
analysisService.delPHDCache(fileName);
}
// /gamma/peakInformation
@GetMapping("/gamma/peakInformation")
@ApiOperation(value = "查看Peak Information页面数据", notes = "查看Peak Information页面数据")
public Result<?> peakInformation(@RequestParam Integer sampleId,@RequestParam String fileName, HttpServletRequest request){
Result<?> result = analysisService.peakInformation(sampleId, fileName, request);
return result;
}
// /gamma/getGammaSelPosNuclide
@GetMapping("/gamma/getGammaSelPosNuclide")
@ApiOperation(value = "gamma主页面选择channel加载对应核素信息接口", notes = "gamma主页面选择channel加载对应核素信息接口")
public Result getGammaSelPosNuclide(@RequestParam Integer sampleId,@RequestParam String fileName,@RequestParam int channel,@RequestParam double energy, HttpServletRequest request) {
Result result = analysisService.getGammaSelPosNuclide(sampleId, fileName, channel, energy, request);
return result;
}
// /gamma/radionuclideActivity
@GetMapping("/gamma/radionuclideActivity")
@ApiOperation(value = "查看Radionuclide Activity页面数据", notes = "查看Radionuclide Activity页面数据")
public Result radionuclideActivity(@RequestParam Integer sampleId,@RequestParam String fileName, HttpServletRequest request) {
Result result = analysisService.radionuclideActivity(sampleId, fileName, request);
return result;
}
}

61
jeecg-module-app/src/main/java/org/jeecg/modules/controller/MessageController.java
View File

@ -1,4 +1,65 @@
package org.jeecg.modules.controller;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.apache.shiro.SecurityUtils;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.constant.CommonConstant;
import org.jeecg.common.system.vo.LoginUser;
import org.jeecg.modules.base.entity.postgre.SysAnnouncement;
import org.jeecg.modules.base.entity.postgre.SysAnnouncementSend;
import org.jeecg.modules.entity.AnnouncementSendModel;
import org.jeecg.modules.feignclient.MessageService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@RestController
public class MessageController {
@Autowired
private MessageService messageService;
// /sys/sysAnnouncementSend/getMyAnnouncementSend
/**
* @功能：获取我的消息
* @return
*/
@GetMapping(value = "/sys/sysAnnouncementSend/getMyAnnouncementSend")
public Result<IPage<AnnouncementSendModel>> getMyAnnouncementSend(@RequestParam AnnouncementSendModel announcementSendModel,
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize) {
return messageService.getMyAnnouncementSend(announcementSendModel, pageNo, pageSize);
}
// /sys/sysAnnouncementSend/editByAnntIdAndUserId
@PutMapping(value = "/sys/sysAnnouncementSend/editByAnntIdAndUserId")
public Result<SysAnnouncementSend> editById(@RequestBody JSONObject json) {
return messageService.editById(json);
}
// /sys/sysAnnouncementSend/readAll
@PutMapping(value = "/sys/sysAnnouncementSend/readAll")
public Result<SysAnnouncementSend> readAll() {
return messageService.readAll();
}
// /sys/annountCement/syncNotic
@RequestMapping(value = "/sys/annountCement/syncNotic", method = RequestMethod.GET)
public Result<SysAnnouncement> syncNotic(@RequestParam(name="anntId",required=false) String anntId,@RequestBody HttpServletRequest request) {
return messageService.syncNotic(anntId, request);
}
// /sys/annountCement/listByUser
@RequestMapping(value = "/sys/annountCement/listByUser", method = RequestMethod.GET)
public Result<Map<String, Object>> listByUser(@RequestParam(required = false, defaultValue = "5") Integer pageSize) {
return messageService.listByUser(pageSize);
}
}

27
jeecg-module-app/src/main/java/org/jeecg/modules/controller/RadionuclideController.java
View File

@ -6,11 +6,10 @@ import org.jeecg.common.api.vo.Result;
import org.jeecg.modules.feignclient.RadionuclideClient;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.format.annotation.DateTimeFormat;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;
import java.util.Date;
import java.util.Objects;
@RestController
@RequestMapping("radionuclide")
@ -20,18 +19,22 @@ public class RadionuclideController {
private RadionuclideClient radionuclideClient;
@GetMapping("findAutoPage")
@ApiOperation(value = "分页查询自动处理结果", notes = "分页查询自动处理结果")
public Result findAutoPage(QueryRequest queryRequest, Integer[] stationIds,
String qualifie, String sampleType,
@DateTimeFormat(pattern = "yyyy-MM-dd")Date startTime,
@DateTimeFormat(pattern = "yyyy-MM-dd") Date endTime){
return radionuclideClient.findAutoPage(queryRequest, stationIds, qualifie, sampleType,startTime, endTime);
public Result findAutoPage(QueryRequest queryRequest,
@RequestParam Integer[] stationIds,
@RequestParam String qualifie, @RequestParam String sampleType,
@RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd")Date startTime,
@RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date endTime){
Result result = radionuclideClient.findAutoPage(queryRequest, stationIds, qualifie, sampleType, startTime, endTime);
return result;
}
@GetMapping("findReviewedPage")
@ApiOperation(value = "分页查询人工交互结果", notes = "分页查询人工交互结果")
public Result findReviewedPage(QueryRequest queryRequest, Integer[] stationIds, String qualifie,
@DateTimeFormat(pattern = "yyyy-MM-dd")Date startTime,
@DateTimeFormat(pattern = "yyyy-MM-dd") Date endTime){
return radionuclideClient.findReviewedPage(queryRequest, stationIds, qualifie,startTime, endTime);
public Result findReviewedPage(QueryRequest queryRequest,
@RequestParam Integer[] stationIds,@RequestParam String qualifie,
@RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd")Date startTime,
@RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date endTime){
Result result = radionuclideClient.findReviewedPage(queryRequest, stationIds, qualifie, startTime, endTime);
return result;
}
}

83
jeecg-module-app/src/main/java/org/jeecg/modules/controller/StationController.java
View File

@ -1,4 +1,87 @@
package org.jeecg.modules.controller;
import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import io.swagger.annotations.ApiOperation;
import org.jeecg.common.api.vo.Result;
import org.jeecg.modules.entity.StationOperation;
import org.jeecg.modules.entity.SysUserFocusStationStation;
import org.jeecg.modules.feignclient.StationService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import java.util.List;
@RestController
public class StationController {
@Autowired
private StationService stationService;
// /armd-station-operation/stationOperation/findStationType
@GetMapping("/armd-station-operation/stationOperation/findStationType")
@ApiOperation(value = "查询台站/核设施类型", notes = "查询台站/核设施类型")
public List<String> findStationType(){
List<String> result = stationService.findStationType();
return result;
}
// /armd-station-operation/stationOperation/getDataReceivingStatus
@GetMapping("/armd-station-operation/stationOperation/getDataReceivingStatus")
@ApiOperation(value = "查询台站监测数据信息", notes = "查询台站监测数据信息")
public Result getDataReceivingStatus(@RequestParam(required = false) String userId,@RequestParam(required = false) String oneStationId){
if (StringUtils.isBlank(userId) && StringUtils.isBlank(oneStationId)) {
return new Result();
} else {
return stationService.getDataReceivingStatus(userId, oneStationId);
}
}
// /armd-station-operation/stationOperation/findList
@GetMapping("/armd-station-operation/stationOperation/findList")
@ApiOperation(value = "查询台站/核设施信息", notes = "查询台站/核设施信息")
public List<StationOperation> findStationOperationList(@RequestParam(required = false) String status,@RequestParam(required = false) String stationType){
if (StringUtils.isBlank(status)) {
status = "";
}
if (StringUtils.isBlank(stationType)) {
stationType = "";
}
List<StationOperation> result = stationService.findStationOperationList(status, stationType);
return result;
}
// /stationOperation/getDataProvisionEfficiency
@GetMapping("/stationOperation/getDataProvisionEfficiency")
@ApiOperation(value = "查询台站数据提供率及有效率", notes = "查询台站数据提供率及有效率")
public Result getDataProvisionEfficiency(){
return stationService.getDataProvisionEfficiency();
}
// /armd-station-operation/stationOperation/findInfo
@GetMapping("/armd-station-operation/stationOperation/findInfo")
@ApiOperation(value = "查询台站/核设施详情信息", notes = "查询台站/核设施详情信息")
public Result findInfo(@RequestParam String stationId,@RequestParam String type){
Result result = stationService.findInfo(stationId, type);
return result;
}
// /armd-station-operation/sysUserFocusStation/findList
@GetMapping("/armd-station-operation/sysUserFocusStation/findList")
@ApiOperation(value = "查询关注台站列表", notes = "查询关注台站列表")
public List<SysUserFocusStationStation> findUserFocusStationList(){
List<SysUserFocusStationStation> result = stationService.findUserFocusStationList();
return result;
}
// /armd-station-operation/sysUserFocusStation/findUserFocusByUserId
@GetMapping("/armd-station-operation/sysUserFocusStation/findUserFocusByUserId")
@ApiOperation(value = "根据用户id查询用户的缓存配置信息及关注台站信息", notes = "根据用户id查询用户的缓存配置信息及关注台站信息")
public Result findUserFocusByUserId(@RequestParam String userId){
return stationService.findUserFocusByUserId(userId);
}
}

14
jeecg-module-app/src/main/java/org/jeecg/modules/controller/SystemController.java
View File

@ -25,9 +25,11 @@ public class SystemController {
* @return
* @throws Exception
*/
@ApiOperation("移动端登陆")
@RequestMapping(value = "/mLogin", method = RequestMethod.POST)
public Result<JSONObject> mLogin(@RequestBody SysLoginModel sysLoginModel) {
return systemClient.mLogin(sysLoginModel);
Result<JSONObject> result = systemClient.mLogin(sysLoginModel);
return result;
}
@PostMapping("/userClient/saveOrUpdateClient")
@ -38,23 +40,21 @@ public class SystemController {
/**
* 退出登录
* @param request
* @param response
* @return
*/
@RequestMapping(value = "/logout")
public Result<Object> logout(HttpServletRequest request, HttpServletResponse response) {
public Result<Object> logout(@RequestBody HttpServletRequest request) {
//用户退出逻辑
return systemClient.logout(request, response);
return systemClient.logout(request);
}
/**
* 后台生成图形验证码 ：有效
* @param response
* @param key
*/
@ApiOperation("获取验证码")
@GetMapping(value = "/randomImage/{key}")
public Result<String> randomImage(HttpServletResponse response,@PathVariable("key") String key) {
return systemClient.randomImage(response, key);
public Result<String> randomImage(@PathVariable("key") String key) {
return systemClient.randomImage(key);
}
}

3
jeecg-module-app/src/main/java/org/jeecg/modules/controller/WebStatisticsController.java
View File

@ -9,6 +9,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.format.annotation.DateTimeFormat;
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 java.util.Date;
@ -23,7 +24,7 @@ public class WebStatisticsController {
@GetMapping("/findStationList")
@ApiOperation(value = "根据菜单名称查询对应的台站信息", notes = "根据菜单名称查询对应的台站信息")
public Result findStationList(String menuName){
public Result findStationList(@RequestParam String menuName){
return webStatisticsClient.findStationList(menuName);
}
}

77
jeecg-module-app/src/main/java/org/jeecg/modules/entity/AnnouncementSendModel.java Normal file
View File

@ -0,0 +1,77 @@
package org.jeecg.modules.entity;
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;
}

50
jeecg-module-app/src/main/java/org/jeecg/modules/entity/StationOperation.java Normal file
View File

@ -0,0 +1,50 @@
package org.jeecg.modules.entity;
import lombok.Data;
import java.io.Serializable;
@Data
public class StationOperation implements Serializable {
/**
* 台站/核设施id
*/
private Integer stationId;
/**
* 台站/核设施名称
*/
private String stationName;
/**
* 台站/核设施类型
*/
private String stationType;
/**
* 海拔
*/
private String altitude;
/**
* 经度
*/
private String lon;
/**
* 纬度
*/
private String lat;
/**
* 状态
*/
private String status;
/**
* 标记
*/
private String signal;
}

42
jeecg-module-app/src/main/java/org/jeecg/modules/entity/SysUserFocusStationStation.java Normal file
View File

@ -0,0 +1,42 @@
package org.jeecg.modules.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import org.jeecg.modules.base.entity.postgre.SysUserFocusStation;
@Data
@TableName("sys_user_focus_station")
public class SysUserFocusStationStation extends SysUserFocusStation {
/**
* 经度
*/
@TableField(exist = false)
private Double lon;
/**
* 纬度
*/
@TableField(exist = false)
private Double lat;
/**
* 海拔
*/
@TableField(exist = false)
private String altitude;
/**
* 状态
*/
@TableField(exist = false)
private String status;
/**
* 台站编码
*/
@TableField(exist = false)
private String stationCode;
}

17
jeecg-module-app/src/main/java/org/jeecg/modules/feignclient/AlarmClient.java
View File

@ -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(value = "armd-abnormal-alarm")
public interface AlarmClient {
@GetMapping(value = "/alarmAnalysisLog/findPage")
Result<?> analysisLogFindPage(AnalysisLogVo analysisLogVo);
Result analysisLogFindPage(@RequestParam("analysisLogVo") 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("query") QueryRequest query);
@GetMapping(value = "/sysServer/findPage")
Result<?> serverFindPage(QueryRequest query);
Result serverFindPage(@RequestParam("query") QueryRequest query);
@GetMapping(value = "/sysDatabase/findPage")
Result<?> databaseFindPage(QueryRequest query);
Result databaseFindPage(@RequestParam("query") QueryRequest query);
}

33
jeecg-module-app/src/main/java/org/jeecg/modules/feignclient/AnalysisService.java
View File

@ -1,4 +1,37 @@
package org.jeecg.modules.feignclient;
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(value = "armd-spectrum-analysis")
public interface AnalysisService {
@GetMapping("/spectrumAnalysis/getDBSpectrumChart")
Result getDBSpectrumChart(@RequestParam("dbName") String dbName, @RequestParam("sampleId") Integer sampleId, @RequestParam("analyst") String analyst,@RequestParam("request") HttpServletRequest request);
@DeleteMapping("/spectrumAnalysis/deleteSpectrumCacheData")
void deleteSpectrumCacheData(@RequestParam("sampleFileName") String sampleFileName,@RequestParam("request") HttpServletRequest request);
@GetMapping("/gamma/gammaByDB")
Result gammaByDB(@RequestParam("sampleId") Integer sampleId,@RequestParam("dbName") String dbName,@RequestParam("analyst") String analyst,@RequestParam("request") HttpServletRequest request);
@DeleteMapping("/gamma/delPHDCache")
void delPHDCache(@RequestParam("fileName") String fileName);
@GetMapping("/gamma/peakInformation")
Result<?> peakInformation(@RequestParam("sampleId") Integer sampleId,@RequestParam("fileName") String fileName,@RequestParam("request") HttpServletRequest request);
@GetMapping("/gamma/getGammaSelPosNuclide")
Result getGammaSelPosNuclide(@RequestParam("sampleId") Integer sampleId,@RequestParam("fileName") String fileName,@RequestParam("channel") int channel,@RequestParam("energy") double energy,@RequestParam("request") HttpServletRequest request);
@GetMapping("/gamma/radionuclideActivity")
Result radionuclideActivity(@RequestParam("sampleId") Integer sampleId,@RequestParam("fileName") String fileName,@RequestParam("request") HttpServletRequest request);
}

34
jeecg-module-app/src/main/java/org/jeecg/modules/feignclient/MessageService.java
View File

@ -1,4 +1,38 @@
package org.jeecg.modules.feignclient;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.jeecg.common.api.vo.Result;
import org.jeecg.modules.base.entity.postgre.SysAnnouncement;
import org.jeecg.modules.base.entity.postgre.SysAnnouncementSend;
import org.jeecg.modules.entity.AnnouncementSendModel;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.stereotype.Component;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
import java.util.Map;
@Component
@FeignClient(value = "armd-system")
public interface MessageService {
@GetMapping(value = "/sys/sysAnnouncementSend/getMyAnnouncementSend")
Result<IPage<AnnouncementSendModel>> getMyAnnouncementSend(@RequestParam AnnouncementSendModel announcementSendModel,
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize);
@PutMapping(value = "/sys/sysAnnouncementSend/editByAnntIdAndUserId")
Result<SysAnnouncementSend> editById(@RequestBody JSONObject json);
@PutMapping(value = "/sys/sysAnnouncementSend/readAll")
Result<SysAnnouncementSend> readAll();
@RequestMapping(value = "/sys/annountCement/syncNotic", method = RequestMethod.GET)
Result<SysAnnouncement> syncNotic(@RequestParam(name="anntId",required=false) String anntId, HttpServletRequest request);
@RequestMapping(value = "/sys/annountCement/listByUser", method = RequestMethod.GET)
Result<Map<String, Object>> listByUser(@RequestParam(required = false, defaultValue = "5") Integer pageSize);
}

22
jeecg-module-app/src/main/java/org/jeecg/modules/feignclient/RadionuclideClient.java
View File

@ -6,6 +6,8 @@ import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.format.annotation.DateTimeFormat;
import org.springframework.stereotype.Component;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestParam;
import java.util.Date;
@ -23,11 +25,12 @@ public interface RadionuclideClient {
* @param endTime
* @return
*/
@GetMapping("/findStationList")
Result findAutoPage(QueryRequest queryRequest, Integer[] stationIds,
String qualifie, String sampleType,
@DateTimeFormat(pattern = "yyyy-MM-dd") Date startTime,
@DateTimeFormat(pattern = "yyyy-MM-dd") Date endTime);
@GetMapping("/findAutoPage")
Result findAutoPage(@RequestParam("queryRequest") QueryRequest queryRequest,
@RequestParam("stationIds") Integer[] stationIds,
@RequestParam("qualifie") String qualifie,@RequestParam("sampleType") String sampleType,
@RequestParam("startTime") @DateTimeFormat(pattern = "yyyy-MM-dd") Date startTime,
@RequestParam("endTime") @DateTimeFormat(pattern = "yyyy-MM-dd") Date endTime);
/**
* 分页查询人工交互结果
@ -38,10 +41,11 @@ public interface RadionuclideClient {
* @param endTime
* @return
*/
@GetMapping("findReviewedPage")
Result findReviewedPage(QueryRequest queryRequest, Integer[] stationIds, String qualifie,
@DateTimeFormat(pattern = "yyyy-MM-dd")Date startTime,
@DateTimeFormat(pattern = "yyyy-MM-dd") Date endTime);
@GetMapping("/findReviewedPage")
Result findReviewedPage(@RequestParam("queryRequest") QueryRequest queryRequest,
@RequestParam("stationIds") Integer[] stationIds, @RequestParam("qualifie") String qualifie,
@RequestParam("startTime") @DateTimeFormat(pattern = "yyyy-MM-dd")Date startTime,
@RequestParam("endTime") @DateTimeFormat(pattern = "yyyy-MM-dd") Date endTime);
}

34
jeecg-module-app/src/main/java/org/jeecg/modules/feignclient/StationService.java
View File

@ -1,4 +1,38 @@
package org.jeecg.modules.feignclient;
import org.jeecg.common.api.vo.Result;
import org.jeecg.modules.entity.StationOperation;
import org.jeecg.modules.entity.SysUserFocusStationStation;
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;
import java.util.List;
@Component
@FeignClient(value = "armd-station-operation")
public interface StationService {
@GetMapping("/stationOperation/findStationType")
List<String> findStationType();
@GetMapping("/stationOperation/getDataReceivingStatus")
Result getDataReceivingStatus(@RequestParam String userId, @RequestParam String oneStationId);
@GetMapping("/stationOperation/findList")
List<StationOperation> findStationOperationList(@RequestParam String status, @RequestParam String stationType);
@GetMapping("/stationOperation/getDataProvisionEfficiency")
Result getDataProvisionEfficiency();
@GetMapping("/stationOperation/findInfo")
Result findInfo(@RequestParam String stationId,@RequestParam String type);
@GetMapping("/sysUserFocusStation/findList")
List<SysUserFocusStationStation> findUserFocusStationList();
@GetMapping("/sysUserFocusStation/findUserFocusByUserId")
Result findUserFocusByUserId(@RequestParam String userId);
}

17
jeecg-module-app/src/main/java/org/jeecg/modules/feignclient/SystemClient.java
View File

@ -6,10 +6,7 @@ import org.jeecg.modules.base.entity.postgre.SysUserClient;
import org.jeecg.modules.model.SysLoginModel;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.stereotype.Component;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@ -23,27 +20,27 @@ public interface SystemClient {
* @return
*/
@GetMapping("/mLogin")
Result<JSONObject> mLogin(SysLoginModel sysLoginModel);
Result<JSONObject> mLogin(@RequestBody SysLoginModel sysLoginModel);
/**
* 图形验证码
* @return
*/
@PostMapping("/checkCaptcha")
void saveOrUpdateClient(SysUserClient sysUserClient);
@PostMapping("/userClient/saveOrUpdateClient")
void saveOrUpdateClient(@RequestBody SysUserClient sysUserClient);
/**
* 登出
* @return
*/
@GetMapping("/logout")
Result<Object> logout(HttpServletRequest request, HttpServletResponse response);
@RequestMapping("/logout")
Result<Object> logout(@RequestBody HttpServletRequest request);
/**
* 图形验证码
*/
@GetMapping("/randomImage/{key}")
Result<String> randomImage(HttpServletResponse response,@PathVariable("key") String key);
Result<String> randomImage(@PathVariable("key") String key);
/**
* 图形验证码

3
jeecg-module-app/src/main/java/org/jeecg/modules/feignclient/WebStatisticsClient.java
View File

@ -8,6 +8,7 @@ import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.format.annotation.DateTimeFormat;
import org.springframework.stereotype.Component;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestParam;
import java.util.Date;
@ -16,5 +17,5 @@ import java.util.Date;
public interface WebStatisticsClient {
@GetMapping("/findStationList")
Result<JSONObject> findStationList(String menuName);
Result findStationList(@RequestParam String menuName);
}