app端请求接口调试及接收参数方式修改

jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/controller/AlarmAnalysisLogController.java

@@ -24,7 +24,7 @@ public class AlarmAnalysisLogController extends JeecgController<AlarmAnalysisLog
 
 	@ApiOperation(value="报警日志分页查询", notes="报警日志分页查询")
 	@GetMapping(value = "findPageApp")
-	public Result<?> findPageApp(@RequestParam AnalysisLogVo analysisLogVo) {
+	public Result<?> findPageApp(@ModelAttribute("analysisLogVo") AnalysisLogVo analysisLogVo) {
 		return service.findPage(analysisLogVo);
 	}
 

jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/controller/SysDatabaseController.java

@@ -29,7 +29,7 @@ public class SysDatabaseController {
 
     @GetMapping("findPageApp")
     @ApiOperation(value = "分页查询数据库配置信息", notes = "分页查询数据库配置信息")
-    public Result<?> findPageApp(@RequestParam QueryRequest query){
+    public Result<?> findPageApp(@ModelAttribute("query") QueryRequest query){
         return sysDatabaseService.findPage(query);
     }
 

jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/controller/SysEmailController.java

@@ -29,7 +29,7 @@ public class SysEmailController {
 
     @GetMapping("findPageApp")
     @ApiOperation(value = "分页查询邮箱配置信息", notes = "分页查询邮箱配置信息")
-    public Result findPageApp(@RequestParam QueryRequest query){
+    public Result findPageApp(@ModelAttribute("query") QueryRequest query){
         return sysEmailService.findPage(query);
     }
 

jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/controller/SysServerController.java

@@ -30,7 +30,7 @@ public class SysServerController {
 
     @GetMapping("findPageApp")
     @ApiOperation(value = "分页查询服务器数据", notes = "分页查询服务器数据")
-    public Result findPageApp(@RequestParam QueryRequest query){
+    public Result findPageApp(@ModelAttribute("query") QueryRequest query){
         return sysServerService.findPage(query);
     }
 

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

@@ -21,30 +21,35 @@ public class AlarmController {
     @ApiOperation(value="报警日志分页查询", notes="报警日志分页查询")
     @GetMapping(value = "/alarmAnalysisLog/findPage")
     public Result analysisLogFindPage(AnalysisLogVo analysisLogVo) {
-        return alarmClient.analysisLogFindPage(analysisLogVo);
+        Result result = alarmClient.analysisLogFindPage(analysisLogVo);
+        return result;
     }
 
     @ApiOperation("分页查询报警日志信息")
     @PostMapping("/alarmLog/findPage")
     public Result alarmLogFindPage(@RequestBody AlarmVo alarmVo){
-        return alarmClient.alarmLogFindPage(alarmVo);
+        Result result = alarmClient.alarmLogFindPage(alarmVo);
+        return result;
     }
 
     @GetMapping("/sysServer/findPage")
     @ApiOperation(value = "分页查询服务器配置信息", notes = "分页查询服务器配置信息")
     public Result serverFindPage(QueryRequest query){
-        return alarmClient.serverFindPage(query);
+        Result result = alarmClient.serverFindPage(query);
+        return result;
     }
 
     @GetMapping("/sysDatabase/findPage")
     @ApiOperation(value = "分页查询数据库配置信息", notes = "分页查询数据库配置信息")
     public Result databaseFindPage(QueryRequest query){
-        return alarmClient.databaseFindPage(query);
+        Result result = alarmClient.databaseFindPage(query);
+        return result;
     }
 
     @GetMapping("/sysEmail/findPage")
     @ApiOperation(value = "分页查询邮箱配置信息", notes = "分页查询邮箱配置信息")
     public Result emailFindPage(QueryRequest query){
-        return alarmClient.emailFindPage(query);
+        Result result = alarmClient.emailFindPage(query);
+        return result;
     }
 }

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

@@ -17,7 +17,7 @@ public class AnalysisController {
     // /spectrumAnalysis/getDBSpectrumChart
     @GetMapping("/spectrumAnalysis/getDBSpectrumChart")
     @ApiOperation(value = "查询折线图相关信息接口", notes = "查询折线图相关信息接口")
-    public Result getDBSpectrumChart(@RequestParam String dbName,@RequestParam Integer sampleId,@RequestParam String analyst, HttpServletRequest request) {
+    public Result getDBSpectrumChart(String dbName,Integer sampleId,String analyst, HttpServletRequest request) {
         Result result = analysisService.getDBSpectrumChart(dbName, sampleId, analyst, request);
         return result;
     }
@@ -25,13 +25,13 @@ public class AnalysisController {
     // /spectrumAnalysis/deleteSpectrumCacheData
     @DeleteMapping("/spectrumAnalysis/deleteSpectrumCacheData")
     @ApiOperation(value = "删除缓存数据",notes = "删除缓存数据")
-    public void deleteSpectrumCacheData(@RequestParam String sampleFileName, HttpServletRequest request) {
+    public void deleteSpectrumCacheData(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){
+    public Result gammaByDB(Integer sampleId,String dbName,String analyst, HttpServletRequest request){
         Result result = analysisService.gammaByDB(sampleId, dbName, analyst, request);
         return result;
     }
@@ -46,7 +46,7 @@ public class AnalysisController {
     // /gamma/peakInformation
     @GetMapping("/gamma/peakInformation")
     @ApiOperation(value = "查看Peak Information页面数据", notes = "查看Peak Information页面数据")
-    public Result<?> peakInformation(@RequestParam Integer sampleId,@RequestParam String fileName, HttpServletRequest request){
+    public Result<?> peakInformation(Integer sampleId, String fileName, HttpServletRequest request){
         Result<?> result = analysisService.peakInformation(sampleId, fileName, request);
         return result;
     }
@@ -54,7 +54,7 @@ public class AnalysisController {
     // /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) {
+    public Result getGammaSelPosNuclide(Integer sampleId,String fileName,int channel,double energy, HttpServletRequest request) {
         Result result = analysisService.getGammaSelPosNuclide(sampleId, fileName, channel, energy, request);
         return result;
     }
@@ -62,7 +62,7 @@ public class AnalysisController {
     // /gamma/radionuclideActivity
     @GetMapping("/gamma/radionuclideActivity")
     @ApiOperation(value = "查看Radionuclide Activity页面数据", notes = "查看Radionuclide Activity页面数据")
-    public Result radionuclideActivity(@RequestParam Integer sampleId,@RequestParam String fileName, HttpServletRequest request) {
+    public Result radionuclideActivity(Integer sampleId,String fileName, HttpServletRequest request) {
         Result result = analysisService.radionuclideActivity(sampleId, fileName, request);
         return result;
     }

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

@@ -32,34 +32,39 @@ public class MessageController {
      * @return
      */
     @GetMapping(value = "/sys/sysAnnouncementSend/getMyAnnouncementSend")
-    public Result<IPage<AnnouncementSendModel>> getMyAnnouncementSend(@RequestParam AnnouncementSendModel announcementSendModel,
+    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);
+        Result result = messageService.getMyAnnouncementSend(announcementSendModel, pageNo, pageSize);
+        return result;
     }
 
     // /sys/sysAnnouncementSend/editByAnntIdAndUserId
     @PutMapping(value = "/sys/sysAnnouncementSend/editByAnntIdAndUserId")
     public Result<SysAnnouncementSend> editById(@RequestBody JSONObject json) {
-        return messageService.editById(json);
+        Result<SysAnnouncementSend> result = messageService.editById(json);
+        return result;
     }
 
     // /sys/sysAnnouncementSend/readAll
     @PutMapping(value = "/sys/sysAnnouncementSend/readAll")
     public Result<SysAnnouncementSend> readAll() {
-        return messageService.readAll();
+        Result<SysAnnouncementSend> result = messageService.readAll();
+        return result;
     }
 
     // /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);
+        Result<SysAnnouncement> result = messageService.syncNotic(anntId, request);
+        return result;
     }
 
     // /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);
+        Result<Map<String, Object>> result = messageService.listByUser(pageSize);
+        return result;
     }
 
 }

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

@@ -56,7 +56,8 @@ public class StationController {
     @GetMapping("/stationOperation/getDataProvisionEfficiency")
     @ApiOperation(value = "查询台站数据提供率及有效率", notes = "查询台站数据提供率及有效率")
     public Result getDataProvisionEfficiency(){
-        return stationService.getDataProvisionEfficiency();
+        Result result = stationService.getDataProvisionEfficiency();
+        return result;
     }
 
     // /armd-station-operation/stationOperation/findInfo
@@ -79,7 +80,8 @@ public class StationController {
     @GetMapping("/armd-station-operation/sysUserFocusStation/findUserFocusByUserId")
     @ApiOperation(value = "根据用户id查询用户的缓存配置信息及关注台站信息", notes = "根据用户id查询用户的缓存配置信息及关注台站信息")
     public Result findUserFocusByUserId(@RequestParam String userId){
-        return stationService.findUserFocusByUserId(userId);
+        Result result = stationService.findUserFocusByUserId(userId);
+        return result;
     }
 
 

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

@@ -43,9 +43,10 @@ public class SystemController {
      * @return
      */
     @RequestMapping(value = "/logout")
-    public Result<Object> logout(@RequestBody HttpServletRequest request) {
+    public Result<Object> logout(HttpServletRequest request) {
         //用户退出逻辑
-        return systemClient.logout(request);
+        Result<Object> result = systemClient.logout(request);
+        return result;
     }
 
     /**
@@ -55,6 +56,7 @@ public class SystemController {
     @ApiOperation("获取验证码")
     @GetMapping(value = "/randomImage/{key}")
     public Result<String> randomImage(@PathVariable("key") String key) {
-        return systemClient.randomImage(key);
+        Result<String> result = systemClient.randomImage(key);
+        return result;
     }
 }

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

@@ -25,6 +25,7 @@ public class WebStatisticsController {
     @GetMapping("/findStationList")
     @ApiOperation(value = "根据菜单名称查询对应的台站信息", notes = "根据菜单名称查询对应的台站信息")
     public Result findStationList(@RequestParam String menuName){
-        return webStatisticsClient.findStationList(menuName);
+        Result result = webStatisticsClient.findStationList(menuName);
+        return result;
     }
 }

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

@@ -14,24 +14,31 @@ import javax.servlet.http.HttpServletRequest;
 public interface AnalysisService {
 
     @GetMapping("/spectrumAnalysis/getDBSpectrumChartApp")
-    Result getDBSpectrumChart(@RequestParam("dbName") String dbName, @RequestParam("sampleId") Integer sampleId, @RequestParam("analyst") String analyst,@RequestParam("request") HttpServletRequest request);
+    Result getDBSpectrumChart(@RequestParam("dbName") String dbName, @RequestParam("sampleId") Integer sampleId,
+                              @RequestParam("analyst") String analyst,@RequestParam("request") HttpServletRequest request);
 
     @DeleteMapping("/spectrumAnalysis/deleteSpectrumCacheDataApp")
-    void deleteSpectrumCacheData(@RequestParam("sampleFileName") String sampleFileName,@RequestParam("request") HttpServletRequest request);
+    void deleteSpectrumCacheData(@RequestParam("sampleFileName") String sampleFileName,
+                                 @RequestParam("request") HttpServletRequest request);
 
     @GetMapping("/gamma/gammaByDBApp")
-    Result gammaByDB(@RequestParam("sampleId") Integer sampleId,@RequestParam("dbName") String dbName,@RequestParam("analyst") String analyst,@RequestParam("request") HttpServletRequest request);
+    Result gammaByDB(@RequestParam("sampleId") Integer sampleId,@RequestParam("dbName") String dbName,
+                     @RequestParam("analyst") String analyst,@RequestParam("request") HttpServletRequest request);
 
     @DeleteMapping("/gamma/delPHDCacheApp")
     void delPHDCache(@RequestParam("fileName") String fileName);
 
     @GetMapping("/gamma/peakInformationApp")
-    Result<?> peakInformation(@RequestParam("sampleId") Integer sampleId,@RequestParam("fileName") String fileName,@RequestParam("request") HttpServletRequest request);
+    Result<?> peakInformation(@RequestParam("sampleId") Integer sampleId,
+                              @RequestParam("fileName") String fileName,@RequestParam("request") HttpServletRequest request);
 
     @GetMapping("/gamma/getGammaSelPosNuclideApp")
-    Result getGammaSelPosNuclide(@RequestParam("sampleId") Integer sampleId,@RequestParam("fileName") String fileName,@RequestParam("channel") int channel,@RequestParam("energy") double energy,@RequestParam("request") HttpServletRequest request);
+    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")
+    @GetMapping("/gamma/radionuclideActivityApp")
-    Result radionuclideActivity(@RequestParam("sampleId") Integer sampleId,@RequestParam("fileName") String fileName,@RequestParam("request") HttpServletRequest request);
+    Result radionuclideActivity(@RequestParam("sampleId") Integer sampleId,
+                                @RequestParam("fileName") String fileName,@RequestParam("request") HttpServletRequest request);
 
 }

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

@@ -19,20 +19,20 @@ public interface MessageService {
 
 
     @GetMapping(value = "/sys/sysAnnouncementSend/getMyAnnouncementSendApp")
-    Result<IPage<AnnouncementSendModel>> getMyAnnouncementSend(@RequestParam AnnouncementSendModel announcementSendModel,
+    Result getMyAnnouncementSend(@RequestParam("announcementSendModel") 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);
+    Result editById(@RequestBody JSONObject json);
 
     @PutMapping(value = "/sys/sysAnnouncementSend/readAll")
-    Result<SysAnnouncementSend> readAll();
+    Result readAll();
 
     @RequestMapping(value = "/sys/annountCement/syncNotic", method = RequestMethod.GET)
-    Result<SysAnnouncement> syncNotic(@RequestParam(name="anntId",required=false) String anntId, HttpServletRequest request);
+    Result 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);
+    Result listByUser(@RequestParam(required = false, defaultValue = "5") Integer pageSize);
 
 }

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

@@ -25,7 +25,7 @@ public interface RadionuclideClient {
      * @param endTime
      * @return
      */
-    @GetMapping("/findReviewedPageApp")
+    @GetMapping("/findAutoPageApp")
     Result findAutoPage(@RequestParam("queryRequest") QueryRequest queryRequest,
                         @RequestParam("stationIds") Integer[] stationIds,
                         @RequestParam("qualifie") String qualifie,@RequestParam("sampleType") String sampleType,

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

@@ -34,7 +34,7 @@ public interface SystemClient {
      * @return
      */
     @RequestMapping("/mlogout")
-    Result<Object> logout(@RequestParam HttpServletRequest request);
+    Result<Object> logout(@RequestParam("request") HttpServletRequest request);
 
     /**
      * 图形验证码

jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/controller/GammaController.java

@@ -47,7 +47,8 @@ public class GammaController {
 
     @GetMapping("gammaByDBApp")
     @ApiOperation(value = "gamma页面loadFromDB加载数据", notes = "gamma页面loadFromDB加载数据")
-    public Result gammaByDBApp(@RequestParam Integer sampleId,@RequestParam String dbName,@RequestParam String analyst,@RequestParam HttpServletRequest request){
+    public Result gammaByDBApp(@RequestParam("sampleId") Integer sampleId,@RequestParam("dbName") String dbName,
+                               @RequestParam("analyst") String analyst, HttpServletRequest request){
         return gammaService.gammaByDB(dbName, sampleId, analyst, request);
     }
 
@@ -150,7 +151,9 @@ public class GammaController {
 
     @GetMapping("getGammaSelPosNuclideApp")
     @ApiOperation(value = "gamma主页面选择channel加载对应核素信息接口", notes = "gamma主页面选择channel加载对应核素信息接口")
-    public Result getGammaSelPosNuclideApp(@RequestParam Integer sampleId,@RequestParam String fileName,@RequestParam int channel,@RequestParam double energy,@RequestParam HttpServletRequest request) {
+    public Result getGammaSelPosNuclideApp(@RequestParam("sampleId") Integer sampleId,@RequestParam("fileName") String fileName,
+                                           @RequestParam("channel") int channel,@RequestParam("energy") double energy,
+                                            HttpServletRequest request) {
         return gammaService.getGammaSelPosNuclide(sampleId, fileName, channel, energy, request);
     }
 
@@ -422,7 +425,8 @@ public class GammaController {
 
     @GetMapping("peakInformationApp")
     @ApiOperation(value = "查看Peak Information页面数据", notes = "查看Peak Information页面数据")
-    public Result<?> peakInformationApp(@RequestParam Integer sampleId,@RequestParam String fileName,@RequestParam HttpServletRequest request){
+    public Result<?> peakInformationApp(@RequestParam("sampleId") Integer sampleId,@RequestParam("fileName") String fileName,
+                                         HttpServletRequest request){
         return gammaService.peakInformation(sampleId, fileName, request);
     }
 
@@ -461,7 +465,9 @@ public class GammaController {
 
     @GetMapping("radionuclideActivityApp")
     @ApiOperation(value = "查看Radionuclide Activity页面数据", notes = "查看Radionuclide Activity页面数据")
-    public Result radionuclideActivityApp(@RequestParam Integer sampleId,@RequestParam String fileName,@RequestParam HttpServletRequest request) {
+    public Result radionuclideActivityApp(@RequestParam("sampleId") Integer sampleId,
+                                          @RequestParam("fileName") String fileName,
+                                           HttpServletRequest request) {
         return gammaService.radionuclideActivity(sampleId, fileName, request);
     }
 

jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/controller/SpectrumAnalysesController.java

@@ -57,7 +57,8 @@ public class SpectrumAnalysesController {
 
     @GetMapping("getDBSpectrumChartApp")
     @ApiOperation(value = "查询折线图相关信息接口", notes = "查询折线图相关信息接口")
-    public Result getDBSpectrumChartApp(@RequestParam String dbName,@RequestParam Integer sampleId,@RequestParam String analyst,@RequestParam HttpServletRequest request) {
+    public Result getDBSpectrumChartApp(@RequestParam("dbName") String dbName,@RequestParam("sampleId") Integer sampleId,
+                                        @RequestParam("analyst") String analyst, HttpServletRequest request) {
         return spectrumAnalysisService.getDBSpectrumChart(dbName, sampleId, analyst, request);
     }
 
@@ -75,7 +76,7 @@ public class SpectrumAnalysesController {
 
     @DeleteMapping("deleteSpectrumCacheDataApp")
     @ApiOperation(value = "删除缓存数据",notes = "删除缓存数据")
-    public void deleteSpectrumCacheDataApp(@RequestParam String sampleFileName,@RequestParam HttpServletRequest request) {
+    public void deleteSpectrumCacheDataApp(@RequestParam("sampleFileName") String sampleFileName, HttpServletRequest request) {
         spectrumAnalysisService.deleteSpectrumCacheData(sampleFileName, request);
     }
 

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/LoginController.java

@@ -220,7 +220,7 @@ public class LoginController {
 	 * @return
 	 */
 	@RequestMapping(value = "/mlogout")
-	public Result<Object> mlogout(@RequestParam HttpServletRequest request) {
+	public Result<Object> mlogout(HttpServletRequest request) {
 		//用户退出逻辑
 		String token = request.getHeader(CommonConstant.X_ACCESS_TOKEN);
 		if(oConvertUtils.isEmpty(token)) {

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysAnnouncementController.java

@@ -332,8 +332,8 @@ public class SysAnnouncementController {
 	 * @return
 	 */
 	@RequestMapping(value = "/listByUser", method = RequestMethod.GET)
-	public Result<Map<String, Object>> listByUser(@RequestParam(required = false, defaultValue = "5") Integer pageSize) {
+	public Result listByUser(@RequestParam(required = false, defaultValue = "5") Integer pageSize) {
-		Result<Map<String,Object>> result = new Result<Map<String,Object>>();
+		Result result = new Result();
 		LoginUser sysUser = (LoginUser)SecurityUtils.getSubject().getPrincipal();
 		String userId = sysUser.getId();
 		// 1.将系统消息补充到用户通告阅读标记表中
@@ -456,8 +456,8 @@ public class SysAnnouncementController {
 	 * @return
 	 */
 	@RequestMapping(value = "/syncNotic", method = RequestMethod.GET)
-	public Result<SysAnnouncement> syncNotic(@RequestParam(name="anntId",required=false) String anntId, HttpServletRequest request) {
+	public Result syncNotic(@RequestParam(name="anntId",required=false) String anntId, HttpServletRequest request) {
-		Result<SysAnnouncement> result = new Result<SysAnnouncement>();
+		Result result = new Result();
 		JSONObject obj = new JSONObject();
 		if(StringUtils.isNotBlank(anntId)){
 			SysAnnouncement sysAnnouncement = sysAnnouncementService.getById(anntId);

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysAnnouncementSendController.java

@@ -185,8 +185,8 @@ public class SysAnnouncementSendController {
 	 * @return
 	 */
 	@PutMapping(value = "/editByAnntIdAndUserId")
-	public Result<SysAnnouncementSend> editById(@RequestBody JSONObject json) {
+	public Result editById(@RequestBody JSONObject json) {
-		Result<SysAnnouncementSend> result = new Result<SysAnnouncementSend>();
+		Result result = new Result();
 		String anntId = json.getString("anntId");
 		LoginUser sysUser = (LoginUser)SecurityUtils.getSubject().getPrincipal();
 		String userId = sysUser.getId();
@@ -226,10 +226,10 @@ public class SysAnnouncementSendController {
 	 * @return
 	 */
 	@GetMapping(value = "/getMyAnnouncementSendApp")
-	public Result<IPage<AnnouncementSendModel>> getMyAnnouncementSendApp(@RequestParam AnnouncementSendModel announcementSendModel,
+	public Result getMyAnnouncementSendApp(@ModelAttribute("announcementSendModel") AnnouncementSendModel announcementSendModel,
 			@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
 			@RequestParam(name="pageSize", defaultValue="10") Integer pageSize) {
-		Result<IPage<AnnouncementSendModel>> result = new Result<IPage<AnnouncementSendModel>>();
+		Result result = new Result();
 		LoginUser sysUser = (LoginUser)SecurityUtils.getSubject().getPrincipal();
 		String userId = sysUser.getId();
 		announcementSendModel.setUserId(userId);
@@ -247,8 +247,8 @@ public class SysAnnouncementSendController {
 	 * @return
 	 */
 	@PutMapping(value = "/readAll")
-	public Result<SysAnnouncementSend> readAll() {
+	public Result readAll() {
-		Result<SysAnnouncementSend> result = new Result<SysAnnouncementSend>();
+		Result result = new Result();
 		LoginUser sysUser = (LoginUser)SecurityUtils.getSubject().getPrincipal();
 		String userId = sysUser.getId();
 		LambdaUpdateWrapper<SysAnnouncementSend> updateWrapper = new UpdateWrapper().lambda();