KH/kh-device-admin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

【fix sonar】JeroController.java SysMessageController.java SysMessageTemplateController.java文件

Browse Source
This commit is contained in:
tianwenbo
2023-03-03 10:52:35 +08:00
parent 20438a03a2
commit e2e50bbbc7
3 changed files with 31 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/system/base/controller/JeroController.java
+1 -1
View File
@@ -158,7 +158,7 @@ public class JeroController<T, S extends IService<T>> {
* @param response * @param response
* @return * @return
*/ */
protected Result<?> importExcel(HttpServletRequest request, HttpServletResponse response, Class<T> clazz) { protected Result<T> importExcel(HttpServletRequest request, HttpServletResponse response, Class<T> clazz) {
MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request; MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
Map<String, MultipartFile> fileMap = multipartRequest.getFileMap(); Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) { for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/message/controller/SysMessageController.java
+9 -8
View File
@@ -10,6 +10,7 @@ import com.jero.common.system.base.controller.JeroController;
import com.jero.common.system.query.QueryGenerator; import com.jero.common.system.query.QueryGenerator;
import com.jero.modules.message.entity.SysMessage; import com.jero.modules.message.entity.SysMessage;
import com.jero.modules.message.service.ISysMessageService; import com.jero.modules.message.service.ISysMessageService;
import org.apache.poi.ss.formula.functions.T;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
@@ -50,8 +51,8 @@ public class SysMessageController extends JeroController<SysMessage, ISysMessage
* @return * @return
*/ */
@GetMapping(value = "/page") @GetMapping(value = "/page")
public Result<?> queryPageList(SysMessage sysMessage, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, public Result<IPage<SysMessage>> queryPageList(SysMessage sysMessage, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) { @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) {
QueryWrapper<SysMessage> queryWrapper = QueryGenerator.initQueryWrapper(sysMessage, req.getParameterMap()); QueryWrapper<SysMessage> queryWrapper = QueryGenerator.initQueryWrapper(sysMessage, req.getParameterMap());
Page<SysMessage> page = new Page<SysMessage>(pageNo, pageSize); Page<SysMessage> page = new Page<SysMessage>(pageNo, pageSize);
IPage<SysMessage> pageList = sysMessageService.page(page, queryWrapper); IPage<SysMessage> pageList = sysMessageService.page(page, queryWrapper);
@@ -65,7 +66,7 @@ public class SysMessageController extends JeroController<SysMessage, ISysMessage
* @return * @return
*/ */
@PostMapping(value = "/add") @PostMapping(value = "/add")
public Result<?> add(@RequestBody SysMessage sysMessage) { public Result<T> add(@RequestBody SysMessage sysMessage) {
sysMessageService.save(sysMessage); sysMessageService.save(sysMessage);
return Result.OK("操作成功!"); return Result.OK("操作成功!");
} }
@@ -77,7 +78,7 @@ public class SysMessageController extends JeroController<SysMessage, ISysMessage
* @return * @return
*/ */
@PutMapping(value = "/edit") @PutMapping(value = "/edit")
public Result<?> edit(@RequestBody SysMessage sysMessage) { public Result<T> edit(@RequestBody SysMessage sysMessage) {
sysMessageService.updateById(sysMessage); sysMessageService.updateById(sysMessage);
return Result.OK("操作成功!"); return Result.OK("操作成功!");
@@ -90,7 +91,7 @@ public class SysMessageController extends JeroController<SysMessage, ISysMessage
* @return * @return
*/ */
@DeleteMapping(value = "/delete") @DeleteMapping(value = "/delete")
public Result<?> delete(@RequestParam(name = "id", required = true) String id) { public Result<T> delete(@RequestParam(name = "id", required = true) String id) {
sysMessageService.removeById(id); sysMessageService.removeById(id);
return Result.OK("删除成功!"); return Result.OK("删除成功!");
} }
@@ -102,7 +103,7 @@ public class SysMessageController extends JeroController<SysMessage, ISysMessage
* @return * @return
*/ */
@DeleteMapping(value = "/deleteBatch") @DeleteMapping(value = "/deleteBatch")
public Result<?> deleteBatch(@RequestParam(name = "ids", required = true) String ids) { public Result<T> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
this.sysMessageService.removeByIds(Arrays.asList(ids.split(","))); this.sysMessageService.removeByIds(Arrays.asList(ids.split(",")));
return Result.OK("批量删除成功！"); return Result.OK("批量删除成功！");
@@ -115,7 +116,7 @@ public class SysMessageController extends JeroController<SysMessage, ISysMessage
* @return * @return
*/ */
@GetMapping(value = "/queryById") @GetMapping(value = "/queryById")
public Result<?> queryById(@RequestParam(name = "id", required = true) String id) { public Result<SysMessage> queryById(@RequestParam(name = "id", required = true) String id) {
SysMessage sysMessage = sysMessageService.getById(id); SysMessage sysMessage = sysMessageService.getById(id);
return Result.OK(sysMessage); return Result.OK(sysMessage);
} }
@@ -138,7 +139,7 @@ public class SysMessageController extends JeroController<SysMessage, ISysMessage
* @return * @return
*/ */
@PostMapping(value = "/importExcel") @PostMapping(value = "/importExcel")
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) { public Result<SysMessage> importExcel(HttpServletRequest request, HttpServletResponse response) {
return super.importExcel(request, response, SysMessage.class); return super.importExcel(request, response, SysMessage.class);
} }
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/message/controller/SysMessageTemplateController.java
+9 -8
View File
@@ -13,6 +13,7 @@ import com.jero.modules.message.entity.MsgParams;
import com.jero.modules.message.entity.SysMessageTemplate; import com.jero.modules.message.entity.SysMessageTemplate;
import com.jero.modules.message.service.ISysMessageTemplateService; import com.jero.modules.message.service.ISysMessageTemplateService;
import com.jero.modules.message.util.PushMsgUtil; import com.jero.modules.message.util.PushMsgUtil;
import org.apache.poi.ss.formula.functions.T;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
@@ -56,8 +57,8 @@ public class SysMessageTemplateController extends JeroController<SysMessageTempl
* @return * @return
*/ */
@GetMapping(value = "/page") @GetMapping(value = "/page")
public Result<?> queryPageList(SysMessageTemplate sysMessageTemplate, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, public Result<IPage<SysMessageTemplate>> queryPageList(SysMessageTemplate sysMessageTemplate, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) { @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) {
QueryWrapper<SysMessageTemplate> queryWrapper = QueryGenerator.initQueryWrapper(sysMessageTemplate, req.getParameterMap()); QueryWrapper<SysMessageTemplate> queryWrapper = QueryGenerator.initQueryWrapper(sysMessageTemplate, req.getParameterMap());
Page<SysMessageTemplate> page = new Page<SysMessageTemplate>(pageNo, pageSize); Page<SysMessageTemplate> page = new Page<SysMessageTemplate>(pageNo, pageSize);
IPage<SysMessageTemplate> pageList = sysMessageTemplateService.page(page, queryWrapper); IPage<SysMessageTemplate> pageList = sysMessageTemplateService.page(page, queryWrapper);
@@ -71,7 +72,7 @@ public class SysMessageTemplateController extends JeroController<SysMessageTempl
* @return * @return
*/ */
@PostMapping(value = "/add") @PostMapping(value = "/add")
public Result<?> add(@RequestBody SysMessageTemplate sysMessageTemplate) { public Result<T> add(@RequestBody SysMessageTemplate sysMessageTemplate) {
sysMessageTemplateService.save(sysMessageTemplate); sysMessageTemplateService.save(sysMessageTemplate);
return Result.OK("操作成功!"); return Result.OK("操作成功!");
} }
@@ -83,7 +84,7 @@ public class SysMessageTemplateController extends JeroController<SysMessageTempl
* @return * @return
*/ */
@PutMapping(value = "/edit") @PutMapping(value = "/edit")
public Result<?> edit(@RequestBody SysMessageTemplate sysMessageTemplate) { public Result<T> edit(@RequestBody SysMessageTemplate sysMessageTemplate) {
sysMessageTemplateService.updateById(sysMessageTemplate); sysMessageTemplateService.updateById(sysMessageTemplate);
return Result.OK("更新成功！"); return Result.OK("更新成功！");
} }
@@ -95,7 +96,7 @@ public class SysMessageTemplateController extends JeroController<SysMessageTempl
* @return * @return
*/ */
@DeleteMapping(value = "/delete") @DeleteMapping(value = "/delete")
public Result<?> delete(@RequestParam(name = "id", required = true) String id) { public Result<T> delete(@RequestParam(name = "id", required = true) String id) {
sysMessageTemplateService.removeById(id); sysMessageTemplateService.removeById(id);
return Result.OK("删除成功!"); return Result.OK("删除成功!");
} }
@@ -107,7 +108,7 @@ public class SysMessageTemplateController extends JeroController<SysMessageTempl
* @return * @return
*/ */
@DeleteMapping(value = "/deleteBatch") @DeleteMapping(value = "/deleteBatch")
public Result<?> deleteBatch(@RequestParam(name = "ids", required = true) String ids) { public Result<T> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
this.sysMessageTemplateService.removeByIds(Arrays.asList(ids.split(","))); this.sysMessageTemplateService.removeByIds(Arrays.asList(ids.split(",")));
return Result.OK("批量删除成功！"); return Result.OK("批量删除成功！");
} }
@@ -119,7 +120,7 @@ public class SysMessageTemplateController extends JeroController<SysMessageTempl
* @return * @return
*/ */
@GetMapping(value = "/queryById") @GetMapping(value = "/queryById")
public Result<?> queryById(@RequestParam(name = "id", required = true) String id) { public Result<SysMessageTemplate> queryById(@RequestParam(name = "id", required = true) String id) {
SysMessageTemplate sysMessageTemplate = sysMessageTemplateService.getById(id); SysMessageTemplate sysMessageTemplate = sysMessageTemplateService.getById(id);
return Result.OK(sysMessageTemplate); return Result.OK(sysMessageTemplate);
} }
@@ -142,7 +143,7 @@ public class SysMessageTemplateController extends JeroController<SysMessageTempl
* @return * @return
*/ */
@PostMapping(value = "/importExcel") @PostMapping(value = "/importExcel")
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) { public Result<SysMessageTemplate> importExcel(HttpServletRequest request, HttpServletResponse response) {
return super.importExcel(request, response, SysMessageTemplate.class); return super.importExcel(request, response, SysMessageTemplate.class);
} }