ObjectUtil替换成CollUtil

lift-business-service/src/main/java/cn/com/ty/lift/business/common/CommonController.java

@@ -3,7 +3,6 @@ package cn.com.ty.lift.business.common;
 import cn.com.ty.lift.business.framework.conf.SystemConfiguration;
 import cn.com.ty.lift.business.framework.util.MessageUtils;
 import cn.com.ty.lift.business.library.dao.entity.LiftBrand;
-import cn.com.ty.lift.common.constants.ApiConstants;
 import cn.com.ty.lift.common.constants.RedisConstants;
 import cn.com.ty.lift.common.model.AreaCode;
 import cn.com.ty.lift.common.utils.AliyunOSSUtil;
@@ -33,7 +32,7 @@ import java.util.List;
 public class CommonController {
 
     @Resource
-    private RedisTemplate redisTemplate;
+    private RedisTemplate<String, Object> redisTemplate;
 
     private AliyunOSSUtil aliyunOSSUtil;
 
@@ -48,12 +47,13 @@ public class CommonController {
      * @date 2019/12/4 10:23 AM
      */
     @PostMapping("area/list")
+    @SuppressWarnings("unchecked")
     public RestResponse areaList() {
-        List<AreaCode> areaCodeList = (List<AreaCode>) redisTemplate.opsForValue().get(RedisConstants.RK_AREA_LIST);
+        List<AreaCode> areaCodeList = (List<AreaCode>)redisTemplate.opsForValue().get(RedisConstants.RK_AREA_LIST);
         if (ObjectUtil.isEmpty(areaCodeList)) {
-            return RestResponse.success(null, ApiConstants.RESULT_NO_DATA, MessageUtils.get("msg.data.empty"));
+            return RestResponse.success();
         }
-        return RestResponse.success(areaCodeList, ApiConstants.RESULT_SUCCESS, MessageUtils.get("msg.query.success"));
+        return RestResponse.success(areaCodeList, MessageUtils.get("msg.query.success"));
     }
 
     /**
@@ -62,12 +62,13 @@ public class CommonController {
      * @date 2019/12/10 10:23 AM
      */
     @PostMapping("brand/list")
+    @SuppressWarnings(value = "unchecked")
     public RestResponse list(){
         List<LiftBrand> liftBrandList = (List<LiftBrand>) redisTemplate.opsForValue().get(RedisConstants.RK_LIFT_BRAND_LIST);
         if (ObjectUtil.isEmpty(liftBrandList)) {
-            return RestResponse.success(null, ApiConstants.RESULT_NO_DATA, MessageUtils.get("msg.data.empty"));
+            return RestResponse.success();
         }
-        return RestResponse.success(liftBrandList, ApiConstants.RESULT_SUCCESS, MessageUtils.get("msg.query.success"));
+        return RestResponse.success(liftBrandList, MessageUtils.get("msg.query.success"));
     }
 
     /**

lift-business-service/src/main/java/cn/com/ty/lift/business/library/controller/LiftController.java

@@ -11,6 +11,7 @@ import cn.com.ty.lift.business.project.dao.entity.ProjectLiftRelevance;
 import cn.com.ty.lift.business.project.service.ProjectLiftRelevanceService;
 import cn.com.ty.lift.common.base.ExportRequest;
 import cn.com.xwy.boot.web.dto.RestResponse;
+import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springframework.web.bind.annotation.*;
@@ -45,7 +46,7 @@ public class LiftController {
     @PostMapping("list")
     public RestResponse list(@RequestBody LiftRequest request) {
         IPage<LiftResponse> page = liftService.list(request);
-        if (ObjectUtil.isEmpty(page.getRecords())) {
+        if (CollUtil.isEmpty(page.getRecords())) {
             return RestResponse.success();
         }
         return RestResponse.success(page, MessageUtils.get("msg.query.success"));
@@ -60,7 +61,7 @@ public class LiftController {
     @PostMapping("project/list")
     public RestResponse liftProjectList(@Valid @RequestBody ProjectLiftRequest request) {
         IPage<LiftResponse> page = liftService.liftProjectList(request);
-        if (ObjectUtil.isEmpty(page.getRecords())) {
+        if (CollUtil.isEmpty(page.getRecords())) {
             return RestResponse.success();
         }
         return RestResponse.success(page, MessageUtils.get("msg.query.success"));
@@ -75,7 +76,7 @@ public class LiftController {
     @PostMapping("choose")
     public RestResponse choose(@Valid @RequestBody LiftChooseRequest request) {
         IPage<LiftResponse> page = liftService.choose(request);
-        if (ObjectUtil.isEmpty(page.getRecords())) {
+        if (CollUtil.isEmpty(page.getRecords())) {
             return RestResponse.success();
         }
         return RestResponse.success(page, MessageUtils.get("msg.query.success"));

lift-business-service/src/main/java/cn/com/ty/lift/business/library/service/PlatformCompanyLiftRelevanceService.java

@@ -11,7 +11,7 @@ import cn.com.ty.lift.business.project.dao.entity.Project;
 import cn.com.ty.lift.business.project.dao.mapper.ProjectMapper;
 import cn.com.ty.lift.common.constants.CommonEnum;
 import cn.com.xwy.boot.web.dto.RestResponse;
-import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.collection.CollUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -88,7 +88,7 @@ public class PlatformCompanyLiftRelevanceService extends ServiceImpl<PlatformCom
      */
     public RestResponse selectBatch(SelectBatchPlatformCompanyRequest request) {
         List<PlatformCompanyLiftRelevance> list = mapper.selectBatchIds(request.getLiftIdList());
-        if (ObjectUtil.isEmpty(list)) {
+        if (CollUtil.isEmpty(list)) {
             return RestResponse.success();
         }
         return RestResponse.success(list, MessageUtils.get("msg.query.success"));
@@ -178,7 +178,7 @@ public class PlatformCompanyLiftRelevanceService extends ServiceImpl<PlatformCom
         List<Long> companyIdList = request.getRelevanceIdList();
         //批量查询公司下电梯数据
         List<PlatformCompanyLiftRelevance> list = mapper.selectBatchIds(companyIdList);
-        if (ObjectUtil.isEmpty(list)) {
+        if (CollUtil.isEmpty(list)) {
             return RestResponse.success();
         }
         list.forEach(entry -> entry.setLiftCompanyStatus(CommonEnum.LiftStatus.STOP_INSURANCE.getCode()));

lift-business-service/src/main/java/cn/com/ty/lift/business/maintenance/controller/MaintenanceController.java

@@ -8,7 +8,7 @@ import cn.com.ty.lift.business.maintenance.service.MaintenancePlanService;
 import cn.com.ty.lift.common.base.ExportRequest;
 import cn.com.ty.lift.common.constants.ApiConstants;
 import cn.com.xwy.boot.web.dto.RestResponse;
-import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.collection.CollUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -40,7 +40,7 @@ public class MaintenanceController {
     @PostMapping("plan/list")
     public RestResponse list(@RequestBody MaintenancePlanRequest request) {
         IPage<MaintenancePlanResponse> page = maintenancePlanService.list(request);
-        if (ObjectUtil.isEmpty(page.getRecords())) {
+        if (CollUtil.isEmpty(page.getRecords())) {
             return RestResponse.success();
         }
         return RestResponse.success(page, MessageUtils.get("msg.query.success"));
@@ -55,7 +55,7 @@ public class MaintenanceController {
     @PostMapping("plan/detail")
     public RestResponse detailList(@Valid @RequestBody MaintenanceDetailRequest request) {
         List<MaintenancePlan> detailList = maintenancePlanService.detailList(request);
-        if (ObjectUtil.isEmpty(detailList)) {
+        if (CollUtil.isEmpty(detailList)) {
             return RestResponse.success();
         }
         return RestResponse.success(detailList, MessageUtils.get("msg.query.success"));

lift-business-service/src/main/java/cn/com/ty/lift/business/project/controller/ProjectController.java

@@ -16,6 +16,7 @@ import cn.com.ty.lift.business.project.service.ProjectUserService;
 import cn.com.ty.lift.common.base.ExportRequest;
 import cn.com.ty.lift.common.constants.ApiConstants;
 import cn.com.xwy.boot.web.dto.RestResponse;
+import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springframework.web.bind.annotation.*;
@@ -54,7 +55,7 @@ public class ProjectController {
     @PostMapping("list")
     public RestResponse list(@Valid @RequestBody ProjectRequest request) {
         IPage<ProjectResponse> page =  projectService.list(request);
-        if (ObjectUtil.isEmpty(page.getRecords())) {
+        if (CollUtil.isEmpty(page.getRecords())) {
             return RestResponse.success();
         }
         return RestResponse.success(page, ApiConstants.RESULT_SUCCESS, MessageUtils.get("msg.query.success"));
@@ -69,7 +70,7 @@ public class ProjectController {
     @PostMapping("companyList")
     public RestResponse companyList(@Valid @RequestBody ProjectCompanyRequest request) {
         IPage<ProjectResponse> page = projectService.companyList(request);
-        if (ObjectUtil.isEmpty(page.getRecords())) {
+        if (CollUtil.isEmpty(page.getRecords())) {
             return RestResponse.success();
         }
         return RestResponse.success(page, MessageUtils.get("msg.query.success"));
@@ -84,7 +85,7 @@ public class ProjectController {
     @PostMapping("history/list")
     public RestResponse historyList(@RequestBody ProjectRequest request) {
         IPage<ProjectHistory> page = projectService.historyList(request);
-        if (ObjectUtil.isEmpty(page.getRecords())) {
+        if (CollUtil.isEmpty(page.getRecords())) {
             return RestResponse.success();
         }
         return RestResponse.success(page, MessageUtils.get("msg.query.success"));
@@ -99,7 +100,7 @@ public class ProjectController {
     @PostMapping("userList")
     public RestResponse userList(@Valid @RequestBody ProjectDetailRequest request) {
         List<ProjectUser> userList = projectUserService.userList(request);
-        if (ObjectUtil.isEmpty(userList)) {
+        if (CollUtil.isEmpty(userList)) {
             return RestResponse.success();
         }
         return RestResponse.success(userList, MessageUtils.get("msg.query.success"));
@@ -114,7 +115,7 @@ public class ProjectController {
     @PostMapping("projectIDList")
     public RestResponse projectIDList(@RequestBody ProjectRegionRequest request) {
         List<ProjectIDResponse> projectIDList = projectService.projectIDList(request);
-        if (ObjectUtil.isEmpty(projectIDList)) {
+        if (CollUtil.isEmpty(projectIDList)) {
             return RestResponse.success();
         }
         return RestResponse.success(projectIDList, MessageUtils.get("msg.query.success"));
@@ -209,7 +210,7 @@ public class ProjectController {
     @PostMapping("relevance/list")
     public RestResponse relevanceList(@RequestBody ProjectLiftRelevanceRequest request) {
         IPage<ProjectRelevanceResponse> page = projectLiftRelevanceService.relevanceList(request);
-        if (ObjectUtil.isEmpty(page.getRecords())) {
+        if (CollUtil.isEmpty(page.getRecords())) {
             return RestResponse.success();
         }
         return RestResponse.success(page, ApiConstants.RESULT_SUCCESS, MessageUtils.get("msg.query.success"));

lift-system-service/src/main/java/cn/com/ty/lift/system/framework/runner/SystemServiceRunner.java

@@ -23,13 +23,13 @@ import java.util.List;
 public class SystemServiceRunner implements ApplicationRunner {
 
     @Resource
-    private RedisTemplate redisTemplate;
+    private RedisTemplate<String, Object> redisTemplate;
 
     @Resource
     private IAreaCodeService iAreaCodeService;
 
     @Override
-    public void run(ApplicationArguments args) throws Exception {
+    public void run(ApplicationArguments args) {
         //初始化省、市、区信息列表
         initAreaList();
     }