【fix sonar】JoaDemoController文件

jero-boot/jero-boot-module-demo/src/main/java/com/jero/modules/demo/test/controller/JoaDemoController.java

@@ -11,6 +11,8 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import com.jero.common.api.vo.Result;
+import com.jero.common.api.vo.ResultConstant;
+import com.jero.common.system.base.controller.JeroController;
 import com.jero.common.system.query.QueryGenerator;
 import com.jero.common.util.oConvertUtils;
 import com.jero.modules.demo.test.entity.JoaDemo;
@@ -53,7 +55,7 @@ import lombok.extern.slf4j.Slf4j;
 public class JoaDemoController {
 	@Autowired
 	private IJoaDemoService joaDemoService;
-	
+
 	/**
 	  * 分页列表查询
 	 * @param joaDemo
@@ -67,15 +69,15 @@ public class JoaDemoController {
 									  @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
 									  @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
 									  HttpServletRequest req) {
-		Result<IPage<JoaDemo>> result = new Result<IPage<JoaDemo>>();
+		Result<IPage<JoaDemo>> result = new Result<>();
 		QueryWrapper<JoaDemo> queryWrapper = QueryGenerator.initQueryWrapper(joaDemo, req.getParameterMap());
-		Page<JoaDemo> page = new Page<JoaDemo>(pageNo, pageSize);
+		Page<JoaDemo> page = new Page<>(pageNo, pageSize);
 		IPage<JoaDemo> pageList = joaDemoService.page(page, queryWrapper);
 		result.setSuccess(true);
 		result.setResult(pageList);
 		return result;
 	}
-	
+
 	/**
 	  *   添加
 	 * @param joaDemo
@@ -91,7 +93,7 @@ public class JoaDemoController {
 			return Result.error("操作失败");
 		}
 	}
-	
+
 	/**
 	  *  编辑
 	 * @param joaDemo
@@ -101,7 +103,7 @@ public class JoaDemoController {
 	public Result<Object> edit(@RequestBody JoaDemo joaDemo) {
 		JoaDemo joaDemoEntity = joaDemoService.getById(joaDemo.getId());
 		if(joaDemoEntity==null) {
-			return Result.error("未找到对应实体");
+			return Result.error(ResultConstant.EN_WAS_NOT_FOUND);
 		}else {
 			boolean ok = joaDemoService.updateById(joaDemo);
 			if(ok) {
@@ -111,7 +113,7 @@ public class JoaDemoController {
 
 		return Result.OK();
 	}
-	
+
 	/**
 	  *   通过id删除
 	 * @param id
@@ -121,7 +123,7 @@ public class JoaDemoController {
 	public Result<Object> delete(@RequestParam(name="id",required=true) String id) {
 		JoaDemo joaDemo = joaDemoService.getById(id);
 		if(joaDemo==null) {
-			return Result.error("未找到对应实体");
+			return Result.error(ResultConstant.EN_WAS_NOT_FOUND);
 		}else {
 			boolean ok = joaDemoService.removeById(id);
 			if(ok) {
@@ -130,7 +132,7 @@ public class JoaDemoController {
 		}
 		return Result.OK();
 	}
-	
+
 	/**
 	  *  批量删除
 	 * @param ids
@@ -145,7 +147,7 @@ public class JoaDemoController {
 			return Result.OK("删除成功!");
 		}
 	}
-	
+
 	/**
 	  * 通过id查询
 	 * @param id
@@ -155,7 +157,7 @@ public class JoaDemoController {
 	public Result<JoaDemo> queryById(@RequestParam(name="id",required=true) String id) {
 		JoaDemo joaDemo = joaDemoService.getById(id);
 		if(joaDemo==null) {
-			return Result.error("未找到对应实体");
+			return Result.error(ResultConstant.EN_WAS_NOT_FOUND);
 		}else {
 			return Result.OK(joaDemo);
 		}
@@ -186,9 +188,9 @@ public class JoaDemoController {
       ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
       List<JoaDemo> pageList = joaDemoService.list(queryWrapper);
       //导出文件名称
-      mv.addObject(NormalExcelConstants.FILE_NAME, "流程测试列表");
-      mv.addObject(NormalExcelConstants.CLASS, JoaDemo.class);
-      mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("流程测试列表数据", "导出人:Jero", "导出信息"));
+      mv.addObject(JeroController.FILE_NAME, "流程测试列表");
+      mv.addObject(JeroController.CLASS, JoaDemo.class);
+      mv.addObject(JeroController.PARAMS, new ExportParams("流程测试列表数据", "导出人:Jero", "导出信息"));
       mv.addObject(NormalExcelConstants.DATA_LIST, pageList);
       return mv;
   }
@@ -201,7 +203,7 @@ public class JoaDemoController {
    * @return
    */
   @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
-  public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+  public Result importExcel(HttpServletRequest request, HttpServletResponse response) {
       MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
       Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
       for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {