1.增加空判断

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/controller/PlanTaskController.java

@@ -208,8 +208,8 @@ public class PlanTaskController extends AbstractBaseController {
     @RequestMapping(value = "/queryOmission", method = RequestMethod.GET, produces = "application/json;charset=UTF-8")
     public CommonResponse pushCarData() {
         try {
-        	RequestAttributes reqs = RequestContextHolder.getRequestAttributes();
-        	RequestContextHolder.setRequestAttributes(reqs, true);
+            RequestAttributes reqs = RequestContextHolder.getRequestAttributes();
+            RequestContextHolder.setRequestAttributes(reqs, true);
             planTaskService.taskExecution(null);
             return CommonResponseUtil.success();
         } catch (Exception e) {
@@ -250,19 +250,14 @@ public class PlanTaskController extends AbstractBaseController {
     @ApiOperation(value = "根据点查询用户权限所有巡检执行计划(<font color='blue'>手机app</font>)", notes = "根据点查询用户权限所有巡检执行计划(<font color='blue'>手机app</font>)")
     @RequestMapping(value = "/queryPlanTaskBySerial", produces = "application/json;charset=UTF-8", method = RequestMethod.GET)
     public CommonResponse qryPlanTaskByPoint(
-            @ApiParam(value = "数据类型", required = false) @RequestParam(required = true) int dataType,
-            @ApiParam(value = "巡检点编号", required = true) @RequestParam(required = true) String serial,
-            @ApiParam(value = "参数", required = false) @RequestParam(required = false) Long planTaskId) {
+            @ApiParam(value = "数据类型") @RequestParam int dataType,
+            @ApiParam(value = "巡检点编号", required = true) @RequestParam(value = "serial") String pointNo,
+            @ApiParam(value = "参数") @RequestParam(required = false) Long planTaskId) {
         try {
             HashMap<String, Object> params = new HashMap<String, Object>();
-            //LoginUserParam loginParam = CurUserCompanyCache.getInstance().getCurCompany(getUserId(), getToken());
             ReginParams reginParams = getSelectedOrgInfo();
             String loginOrgCode = getOrgCode(reginParams);
-           /* if (ObjectUtils.isEmpty(loginParam)) {
-                return CommonResponseUtil.failure("公司选择失效");
-            }*/
             params.put("orgCode", loginOrgCode);
-            String pointNo = serial;
             params.put("pointNo", pointNo);
             Point point = pointService.queryPointByPointNo(params);
             // 1.通用校验

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/service/impl/PointServiceImpl.java

@@ -971,22 +971,17 @@ public class PointServiceImpl implements IPointService {
 
     @Override
     public Point queryPointByPointNo(HashMap<String, Object> params) {
-
-        return iPointDao.findOne(new Specification<Point>() {
-
-            @Override
-            public Predicate toPredicate(Root<Point> root, CriteriaQuery<?> query, CriteriaBuilder cb) {
-                List<Predicate> predicate = new ArrayList<>();
-                if (!ObjectUtils.isEmpty(params.get("pointNo"))) {
-                    predicate.add(cb.equal(root.get("pointNo").as(String.class), params.get("pointNo")));
-                }
-                if (!ObjectUtils.isEmpty(params.get("orgCode"))) {
-                    predicate.add(cb.equal(root.get("orgCode").as(String.class), params.get("orgCode").toString()));
-                }
-                Predicate[] pre = new Predicate[predicate.size()];
-                return query.where(predicate.toArray(pre)).getRestriction();
+        return iPointDao.findOne((Specification<Point>) (root, query, cb) -> {
+            List<Predicate> predicate = new ArrayList<>();
+            if (!ObjectUtils.isEmpty(params.get("pointNo"))) {
+                predicate.add(cb.equal(root.get("pointNo").as(String.class), params.get("pointNo")));
+            }
+            if (!ObjectUtils.isEmpty(params.get("orgCode"))) {
+                predicate.add(cb.equal(root.get("orgCode").as(String.class), params.get("orgCode").toString()));
             }
-        }).get();
+            Predicate[] pre = new Predicate[predicate.size()];
+            return query.where(predicate.toArray(pre)).getRestriction();
+        }).orElse(null);
     }
 
     @Override