校验参数修改

application/src/main/java/org/thingsboard/server/config/RabbitmqConfig.java

@@ -1,7 +1,7 @@
 package org.thingsboard.server.config;
 
-import org.springframework.amqp.core.*;
-import org.springframework.amqp.rabbit.core.RabbitTemplate;
+//import org.springframework.amqp.core.*;
+//import org.springframework.amqp.rabbit.core.RabbitTemplate;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.context.annotation.Bean;
@@ -17,6 +17,7 @@ import org.thingsboard.server.service.nanxi.ScadaMonitorService;
  */
 @Configuration
 public class RabbitmqConfig {
+/*
 
 
     public static final String QUEUE_INFORM_SCADA = "queue_inform_nx_scada";
@@ -47,5 +48,6 @@ public class RabbitmqConfig {
         return BindingBuilder.bind(queue).to(exchange).with(ROUTINGKEY_SCADA).noargs();
     }
 
+*/
 
 }

application/src/main/java/org/thingsboard/server/config/ReceiveHandler.java

@@ -5,11 +5,11 @@ import cn.hutool.core.date.DateUtil;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.rabbitmq.client.Channel;
+//import com.rabbitmq.client.Channel;
 import lombok.extern.slf4j.Slf4j;
 import org.jetbrains.annotations.NotNull;
-import org.springframework.amqp.core.Message;
-import org.springframework.amqp.rabbit.annotation.RabbitListener;
+//import org.springframework.amqp.core.Message;
+//import org.springframework.amqp.rabbit.annotation.RabbitListener;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
@@ -33,6 +33,7 @@ import java.util.*;
 @Component
 @Slf4j
 public class ReceiveHandler {
+/*
 
     public static final String YYYY_MM_DD_HH_MM_SS = "yyyy-MM-dd HH:mm:ss";
     @Autowired
@@ -159,12 +160,14 @@ public class ReceiveHandler {
     }
 
 
-    /**
+    */
+/**
      * 正则匹配数据值
      *
      * @param val
      * @return
-     */
+     *//*
+
     private String matcherVal(String val) {
         String regex = "[0-9].*";
         if (!val.matches(regex)) {
@@ -173,5 +176,6 @@ public class ReceiveHandler {
         return val;
     }
 
+*/
 
 }

application/src/main/java/org/thingsboard/server/config/ThingsboardSecurityConfiguration.java

@@ -76,7 +76,7 @@ public class ThingsboardSecurityConfiguration extends WebSecurityConfigurerAdapt
     public static final String CODE_BASED_LOGIN_ENTRY_POINT = "/api/yt/auth/code/login";
     public static final String[] YT_NOT_AUTH_API = new String[]{"/api/yt/auth/code/login","/api/yt/third/bind","/api/yt/third/login/*"
             ,"/api/yt/third/login/id/*", "/api/yt/third/authorize","/api/yt/platform/get","/api/yt/app_design/get", "/api/yt/noauth/**"
-            , "/api/yt/device/list", "/api/test/**", "/api/yt/nxEventManagement/**"};
+            , "/api/yt/device/list", "/api/test/**", "/api/yt/nxRescueCar/**"};
 
     public static final String PUBLIC_LOGIN_ENTRY_POINT = "/api/auth/login/public";
     public static final String TOKEN_REFRESH_ENTRY_POINT = "/api/auth/token";

application/src/main/java/org/thingsboard/server/controller/nanxi/NxDangerousSourceController.java

@@ -11,9 +11,7 @@ import org.springframework.web.bind.annotation.*;
 import org.thingsboard.server.common.data.yunteng.utils.ExcelUtil;
 import org.thingsboard.server.domain.BaseOutput;
 import org.thingsboard.server.domain.NxDangerousSource;
-import org.thingsboard.server.domain.NxKnowledgeDatabase;
 import org.thingsboard.server.domain.export.NxDangerousSourceExport;
-import org.thingsboard.server.domain.export.NxKnowledgeDatabaseExport;
 import org.thingsboard.server.service.nanxi.INxDangerousSourceService;
 
 import javax.annotation.Resource;
@@ -120,15 +118,11 @@ public class NxDangerousSourceController {
 
     private void validIsNull(NxDangerousSource nxDangerousSource){
         Assert.notNull(nxDangerousSource.getName(), "危险源名称不能为空");
-        Assert.notNull(nxDangerousSource.getAreaName(), "所属区域不能为空");
-        Assert.notNull(nxDangerousSource.getTypeName(), "危险源类型不能为空");
-        Assert.notNull(nxDangerousSource.getLiableCompanyName(), "责任单位不能为空");
-        Assert.notNull(nxDangerousSource.getLiableName(), "责任人不能为空");
-        Assert.notNull(nxDangerousSource.getLiablePosition(), "责任人职位不能为空");
-        Assert.notNull(nxDangerousSource.getLiablePhone(), "责任人电话不能为空");
-        Assert.notNull(nxDangerousSource.getContactName(), "联系人不能为空");
-        Assert.notNull(nxDangerousSource.getContactPosition(), "联系人职位不能为空");
-        Assert.notNull(nxDangerousSource.getContactPhone(), "联系人电话不能为空");
+        Assert.notNull(nxDangerousSource.getAreaCode(), "所属区域不能为空");
+        Assert.notNull(nxDangerousSource.getTypeCode(), "危险源类型不能为空");
+        Assert.notNull(nxDangerousSource.getLiableCompanyId(), "责任单位不能为空");
+        Assert.notNull(nxDangerousSource.getLiableId(), "责任人不能为空");
+        Assert.notNull(nxDangerousSource.getContactId(), "联系人不能为空");
         Assert.notNull(nxDangerousSource.getLongitude(), "经度不能为空");
         Assert.notNull(nxDangerousSource.getLatitude(), "纬度不能为空");
     }

application/src/main/java/org/thingsboard/server/controller/nanxi/NxEmergencyHospitalController.java

@@ -109,11 +109,10 @@ public class NxEmergencyHospitalController {
 
     private void validIsNull(NxEmergencyHospital nxEmergencyHospital){
         Assert.notNull(nxEmergencyHospital.getName(), "应急医院名称不能为空");
-        Assert.notNull(nxEmergencyHospital.getAreaName(), "所属区域不能为空");
-        Assert.notNull(nxEmergencyHospital.getContactName(), "联系人不能为空");
+        Assert.notNull(nxEmergencyHospital.getAreaCode(), "所属区域不能为空");
+        Assert.notNull(nxEmergencyHospital.getContactId(), "联系人不能为空");
         Assert.notNull(nxEmergencyHospital.getLongitude(), "经度不能为空");
         Assert.notNull(nxEmergencyHospital.getLatitude(), "纬度不能为空");
-        Assert.notNull(nxEmergencyHospital.getContactPhone(), "联系电话不能为空");
     }
 }
 

application/src/main/java/org/thingsboard/server/controller/nanxi/NxEventContactConfigController.java

@@ -103,11 +103,11 @@ public class NxEventContactConfigController {
     }
 
     private void validIsNull(NxEventContactConfig nxEventContactConfig){
-        Assert.notNull(nxEventContactConfig.getDomainName(), "所属领域不能为空");
-        Assert.notNull(nxEventContactConfig.getIndustryName(), "所属行业不能为空");
-        Assert.notNull(nxEventContactConfig.getEventType(), "关联事件类型不能为空");
-        Assert.notNull(nxEventContactConfig.getEventLevelName(), "关联事件级别不能为空");
-        Assert.notNull(nxEventContactConfig.getAreaName(), "事件所属区域不能为空");
+        Assert.notNull(nxEventContactConfig.getDomainId(), "所属领域不能为空");
+        Assert.notNull(nxEventContactConfig.getIndustryId(), "所属行业不能为空");
+        Assert.notNull(nxEventContactConfig.getEventTypeId(), "关联事件类型不能为空");
+        Assert.notNull(nxEventContactConfig.getEventLevelCode(), "关联事件级别不能为空");
+        Assert.notNull(nxEventContactConfig.getAreaCode(), "事件所属区域不能为空");
     }
 }
 

application/src/main/java/org/thingsboard/server/controller/nanxi/NxEventManagementController.java

@@ -111,15 +111,14 @@ public class NxEventManagementController {
 
 
     private void validIsNull(NxEventManagement nxEventManagement){
-        Assert.notNull(nxEventManagement.getAreaName(), "所属区域不能为空");
-        Assert.notNull(nxEventManagement.getEventTypeName(), "预警类型不能为空");
-        Assert.notNull(nxEventManagement.getEventLevelName(), "预警级别不能为空");
-        Assert.notNull(nxEventManagement.getDomainName(), "所属领域不能为空");
-        Assert.notNull(nxEventManagement.getIndustryName(), "所属行业不能为空");
-        Assert.notNull(nxEventManagement.getEventName(), "预警地址不能为空");
+        Assert.notNull(nxEventManagement.getAreaCode(), "所属区域不能为空");
+        Assert.notNull(nxEventManagement.getEventTypeId(), "预警类型不能为空");
+        Assert.notNull(nxEventManagement.getEventLevelCode(), "预警级别不能为空");
+        Assert.notNull(nxEventManagement.getDomainId(), "所属领域不能为空");
+        Assert.notNull(nxEventManagement.getIndustryId(), "所属行业不能为空");
+        Assert.notNull(nxEventManagement.getEventAddress(), "预警地址不能为空");
         Assert.notNull(nxEventManagement.getLongitude(), "经度不能为空");
         Assert.notNull(nxEventManagement.getLatitude(), "纬度不能为空");
-        Assert.notNull(nxEventManagement.getEventAddress(), "预警内容不能为空");
     }
 }
 

application/src/main/java/org/thingsboard/server/controller/nanxi/NxEventTypeManagementController.java

@@ -91,8 +91,8 @@ public class NxEventTypeManagementController {
     }
 
     private void validIsNull(NxEventTypeManagement nxEventTypeManagement){
-        Assert.notNull(nxEventTypeManagement.getDomainName(), "所属领域不能为空");
-        Assert.notNull(nxEventTypeManagement.getIndustryName(), "所属行业不能为空");
+        Assert.notNull(nxEventTypeManagement.getDomainId(), "所属领域不能为空");
+        Assert.notNull(nxEventTypeManagement.getIndustryId(), "所属行业不能为空");
         Assert.notNull(nxEventTypeManagement.getEventType(), "事件类型不能为空");
     }
 }

application/src/main/java/org/thingsboard/server/controller/nanxi/NxExpertDatabaseController.java

@@ -110,11 +110,10 @@ public class NxExpertDatabaseController {
     }
 
     private void validIsNull(NxExpertDatabase nxExpertDatabase){
-        Assert.notNull(nxExpertDatabase.getDomainName(), "所属领域不能为空");
-        Assert.notNull(nxExpertDatabase.getIndustryName(), "所属行业不能为空");
+        Assert.notNull(nxExpertDatabase.getDomainId(), "所属领域不能为空");
+        Assert.notNull(nxExpertDatabase.getIndustryId(), "所属行业不能为空");
         Assert.notNull(nxExpertDatabase.getExpertName(), "专家姓名不能为空");
-        Assert.notNull(nxExpertDatabase.getCompanyName(), "所属单位不能为空");
-        Assert.notNull(nxExpertDatabase.getContactPhone(), "联系电话不能为空");
+        Assert.notNull(nxExpertDatabase.getCompanyId(), "所属单位不能为空");
     }
 }
 

application/src/main/java/org/thingsboard/server/controller/nanxi/NxKnowledgeDatabaseController.java

@@ -106,8 +106,8 @@ public class NxKnowledgeDatabaseController {
     }
 
     private void validIsNull(NxKnowledgeDatabase nxKnowledgeDatabase){
-        Assert.notNull(nxKnowledgeDatabase.getDomainName(), "所属领域不能为空");
-        Assert.notNull(nxKnowledgeDatabase.getIndustryName(), "所属行业不能为空");
+        Assert.notNull(nxKnowledgeDatabase.getDomainId(), "所属领域不能为空");
+        Assert.notNull(nxKnowledgeDatabase.getIndustryId(), "所属行业不能为空");
         Assert.notNull(nxKnowledgeDatabase.getKnowledgeBaseName(), "知识库名称不能为空");
     }
 }

application/src/main/java/org/thingsboard/server/controller/nanxi/NxMaterialsManagementController.java

@@ -113,10 +113,10 @@ public class NxMaterialsManagementController {
         Assert.notNull(nxMaterialsManagement.getName(), "物资名称不能为空");
         Assert.notNull(nxMaterialsManagement.getStoreAmount(), "库存数量不能为空");
         Assert.notNull(nxMaterialsManagement.getUnit(), "单位不能为空");
-        Assert.notNull(nxMaterialsManagement.getCompanyName(), "所属单位不能为空");
-        Assert.notNull(nxMaterialsManagement.getStorehouseName(), "所属仓库不能为空");
-        Assert.notNull(nxMaterialsManagement.getAreaName(), "物资所属区域不能为空");
-        Assert.notNull(nxMaterialsManagement.getProductName(), "物资品类不能为空");
+        Assert.notNull(nxMaterialsManagement.getCompanyId(), "所属单位不能为空");
+        Assert.notNull(nxMaterialsManagement.getStorehouseId(), "所属仓库不能为空");
+        Assert.notNull(nxMaterialsManagement.getAreaCode(), "物资所属区域不能为空");
+        Assert.notNull(nxMaterialsManagement.getProductId(), "物资品类不能为空");
     }
 }
 

application/src/main/java/org/thingsboard/server/controller/nanxi/NxProtectiveTargetsController.java

@@ -109,10 +109,10 @@ public class NxProtectiveTargetsController {
 
     private void validIsNull(NxProtectiveTargets nxProtectiveTargets){
         Assert.notNull(nxProtectiveTargets.getName(), "防护目标名称不能为空");
-        Assert.notNull(nxProtectiveTargets.getTypeName(), "性质不能为空");
-        Assert.notNull(nxProtectiveTargets.getAreaName(), "所属区域不能为空");
-        Assert.notNull(nxProtectiveTargets.getCompanyName(), "所属单位不能为空");
-        Assert.notNull(nxProtectiveTargets.getContactName(), "联系人姓名不能为空");
+        Assert.notNull(nxProtectiveTargets.getTypeCode(), "性质不能为空");
+        Assert.notNull(nxProtectiveTargets.getAreaCode(), "所属区域不能为空");
+        Assert.notNull(nxProtectiveTargets.getCompanyId(), "所属单位不能为空");
+        Assert.notNull(nxProtectiveTargets.getContactId(), "联系人姓名不能为空");
         Assert.notNull(nxProtectiveTargets.getLongitude(), "经度不能为空");
         Assert.notNull(nxProtectiveTargets.getLatitude(), "纬度不能为空");
     }

application/src/main/java/org/thingsboard/server/controller/nanxi/NxRescueCarController.java

@@ -5,9 +5,11 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.util.Assert;
 import org.springframework.web.bind.annotation.*;
 import org.thingsboard.server.common.data.yunteng.utils.ExcelUtil;
+import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
 import org.thingsboard.server.domain.BaseOutput;
 import org.thingsboard.server.domain.NxKnowledgeDatabase;
 import org.thingsboard.server.domain.NxRescueCar;
@@ -18,6 +20,8 @@ import org.thingsboard.server.service.nanxi.INxRescueCarService;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
+import java.util.Arrays;
+import java.util.List;
 
 /**
  * @author LF
@@ -41,8 +45,8 @@ public class NxRescueCarController {
      */
     @ApiOperation(value = "分页查询", notes = "分页查询")
     @PostMapping("/page")
-    public BaseOutput<IPage> getNxRescueCarPage(@RequestBody NxRescueCar nxRescueCar) {
-        return BaseOutput.success(nxRescueCarService.page(nxRescueCar));
+    public TkPageData<NxRescueCar> getNxRescueCarPage(@RequestBody NxRescueCar nxRescueCar) {
+        return nxRescueCarService.page(nxRescueCar);
     }
 
     /**
@@ -86,14 +90,18 @@ public class NxRescueCarController {
 
     /**
      * 通过id删除
-     * @param id id
+     * @param ids id
      * @return Result
      */
     @ApiOperation(value = "通过id删除", notes = "通过id删除")
-    @DeleteMapping("/{id}")
-    public BaseOutput removeById(@PathVariable Integer id) {
-        log.info("删除救援车辆参数：{}", id);
-        return nxRescueCarService.removeById(id) ? BaseOutput.successMsg("删除成功") : BaseOutput.failure("删除失败");
+    @DeleteMapping("/{ids}")
+    public BaseOutput removeById(@PathVariable String ids) {
+        log.info("删除救援车辆参数：{}", ids);
+        List<String> list = Arrays.asList(ids.split(","));
+        if (validDeleteParams(list)) {
+            return BaseOutput.failure("参数有误");
+        }
+        return nxRescueCarService.removeByIds(list) ? BaseOutput.successMsg("删除成功") : BaseOutput.failure("删除失败");
     }
 
     /**
@@ -107,11 +115,14 @@ public class NxRescueCarController {
         ExcelUtil.exportExcel(response, "用户信息", "user info", nxRescueCarService.listByExport(nxRescueCar), NxRescueCarExport.class);
     }
 
+    private boolean validDeleteParams(List<String> list) {
+        return list.stream().anyMatch(item -> !StringUtils.isNumeric(item));
+    }
 
     private void validIsNull(NxRescueCar nxRescueCar){
         Assert.notNull(nxRescueCar.getCompanyId(), "所属单位不能为空");
         Assert.notNull(nxRescueCar.getAreaCode(), "所属区域不能为空");
-        Assert.notNull(nxRescueCar.getCarId(), "车辆名称不能为空");
+        Assert.notNull(nxRescueCar.getCarName(), "车辆名称不能为空");
         Assert.notNull(nxRescueCar.getCarTypeCode(), "车辆类型不能为空");
         Assert.notNull(nxRescueCar.getLiableId(), "责任人不能为空");
         Assert.notNull(nxRescueCar.getContactId(), "联系人不能为空");

application/src/main/java/org/thingsboard/server/controller/nanxi/NxRescueTeamController.java

@@ -108,10 +108,10 @@ public class NxRescueTeamController {
     }
 
     private void validIsNull(NxRescueTeam nxRescueTeam){
-        Assert.notNull(nxRescueTeam.getCompanyName(), "所属单位不能为空");
-        Assert.notNull(nxRescueTeam.getAreaName(), "所属区域不能为空");
-        Assert.notNull(nxRescueTeam.getLiableName(), "责任人不能为空");
-        Assert.notNull(nxRescueTeam.getContactName(), "联系人不能为空");
+        Assert.notNull(nxRescueTeam.getCompanyId(), "所属单位不能为空");
+        Assert.notNull(nxRescueTeam.getAreaCode(), "所属区域不能为空");
+        Assert.notNull(nxRescueTeam.getLiableId(), "责任人不能为空");
+        Assert.notNull(nxRescueTeam.getContactId(), "联系人不能为空");
         Assert.notNull(nxRescueTeam.getLongitude(), "经度不能为空");
         Assert.notNull(nxRescueTeam.getLatitude(), "纬度不能为空");
     }

application/src/main/java/org/thingsboard/server/controller/nanxi/NxReservePlanController.java

@@ -109,8 +109,8 @@ public class NxReservePlanController {
     }
 
     private void validIsNull(NxReservePlanVO nxReservePlanVO){
-        Assert.notNull(nxReservePlanVO.getDomainName(), "所属领域不能为空");
-        Assert.notNull(nxReservePlanVO.getIndustryName(), "所属行业不能为空");
+        Assert.notNull(nxReservePlanVO.getDomainId(), "所属领域不能为空");
+        Assert.notNull(nxReservePlanVO.getIndustryId(), "所属行业不能为空");
         Assert.notNull(nxReservePlanVO.getName(), "预案名称不能为空");
         Assert.notEmpty(nxReservePlanVO.getResponses(), "响应级别不能为空");
     }

application/src/main/java/org/thingsboard/server/controller/nanxi/NxStorehouseManagementController.java

@@ -92,10 +92,10 @@ public class NxStorehouseManagementController {
 
     private void validIsNull(NxStorehouseManagement nxStorehouseManagement){
         Assert.notNull(nxStorehouseManagement.getName(), "仓库名称不能为空");
-        Assert.notNull(nxStorehouseManagement.getAreaName(), "所属区域不能为空");
-        Assert.notNull(nxStorehouseManagement.getLeaderName(), "分管领导不能为空");
-        Assert.notNull(nxStorehouseManagement.getCompanyName(), "所属单位不能为空");
-        Assert.notNull(nxStorehouseManagement.getLiableName(), "责任人不能为空");
+        Assert.notNull(nxStorehouseManagement.getAreaCode(), "所属区域不能为空");
+        Assert.notNull(nxStorehouseManagement.getLeaderId(), "分管领导不能为空");
+        Assert.notNull(nxStorehouseManagement.getCompanyId(), "所属单位不能为空");
+        Assert.notNull(nxStorehouseManagement.getLiableId(), "责任人不能为空");
         Assert.notNull(nxStorehouseManagement.getLongitude(), "经度不能为空");
         Assert.notNull(nxStorehouseManagement.getLatitude(), "纬度不能为空");
     }

application/src/main/java/org/thingsboard/server/controller/nanxi/NxWarningManagementController.java

@@ -127,11 +127,11 @@ public class NxWarningManagementController {
     }
 
     private void validIsNull(NxWarningManagement nxWarningManagement){
-        Assert.notNull(nxWarningManagement.getAreaName(), "所属区域不能为空");
-        Assert.notNull(nxWarningManagement.getWarningTypeName(), "预警类型不能为空");
-        Assert.notNull(nxWarningManagement.getWarningLevelName(), "预警级别不能为空");
-        Assert.notNull(nxWarningManagement.getDomainName(), "所属领域不能为空");
-        Assert.notNull(nxWarningManagement.getIndustryName(), "所属行业不能为空");
+        Assert.notNull(nxWarningManagement.getAreaCode(), "所属区域不能为空");
+        Assert.notNull(nxWarningManagement.getWarningTypeId(), "预警类型不能为空");
+        Assert.notNull(nxWarningManagement.getWarningLevelCode(), "预警级别不能为空");
+        Assert.notNull(nxWarningManagement.getDomainId(), "所属领域不能为空");
+        Assert.notNull(nxWarningManagement.getIndustryId(), "所属行业不能为空");
         Assert.notNull(nxWarningManagement.getWarningAddress(), "预警地址不能为空");
         Assert.notNull(nxWarningManagement.getLongitude(), "经度不能为空");
         Assert.notNull(nxWarningManagement.getLatitude(), "纬度不能为空");

application/src/main/java/org/thingsboard/server/controller/nanxi/NxWarningTypeManagementController.java

@@ -91,8 +91,8 @@ public class NxWarningTypeManagementController {
     }
 
     private void validIsNull(NxWarningTypeManagement nxWarningTypeManagement){
-        Assert.notNull(nxWarningTypeManagement.getDomainName(), "所属领域不能为空");
-        Assert.notNull(nxWarningTypeManagement.getIndustryName(), "所属行业不能为空");
+        Assert.notNull(nxWarningTypeManagement.getDomainId(), "所属领域不能为空");
+        Assert.notNull(nxWarningTypeManagement.getIndustryId(), "所属行业不能为空");
         Assert.notNull(nxWarningTypeManagement.getWarningType(), "预警类型不能为空");
     }
 }

application/src/main/java/org/thingsboard/server/domain/NxDisposeFeedback.java

@@ -32,22 +32,10 @@ public class NxDisposeFeedback extends BaseEntity{
      */
     private String departmentId;
         /**
-     * 部门名称
-     */
-    private String departmentName;
-        /**
      * 处置人id
      */
     private String disposeId;
         /**
-     * 处置人姓名
-     */
-    private String disposeName;
-        /**
-     * 处置人联系方式
-     */
-    private String disposePhone;
-        /**
      * 处置结果
      */
     private String result;

application/src/main/java/org/thingsboard/server/domain/NxEventEmergency.java

@@ -16,7 +16,7 @@ import com.baomidou.mybatisplus.annotation.TableName;
 @Data
 @TableName("nx_event_emergency")
 @ApiModel(value = "", description = "对象 nxEventEmergency")
-public class NxEventEmergency extends BaseEntityAdaptiveIsDelete{
+public class NxEventEmergency extends BaseEntity{
 
         /**
      * 主键

application/src/main/java/org/thingsboard/server/domain/NxEventMaterials.java

@@ -16,7 +16,7 @@ import com.baomidou.mybatisplus.annotation.TableName;
 @Data
 @TableName("nx_event_materials")
 @ApiModel(value = "", description = "对象 nxEventMaterials")
-public class NxEventMaterials extends BaseEntityAdaptiveIsDelete{
+public class NxEventMaterials extends BaseEntity{
 
         /**
      * 主键

application/src/main/java/org/thingsboard/server/domain/NxEventPush.java

@@ -17,7 +17,7 @@ import com.baomidou.mybatisplus.annotation.TableName;
 @Data
 @TableName("nx_event_push")
 @ApiModel(value = "", description = "对象 nxEventPush")
-public class NxEventPush extends BaseEntityAdaptiveIsDelete{
+public class NxEventPush extends BaseEntity{
 
         /**
      * 主键

application/src/main/java/org/thingsboard/server/domain/NxEventRescue.java

@@ -16,7 +16,7 @@ import com.baomidou.mybatisplus.annotation.TableName;
 @Data
 @TableName("nx_event_rescue")
 @ApiModel(value = "", description = "对象 nxEventRescue")
-public class NxEventRescue extends BaseEntityAdaptiveIsDelete{
+public class NxEventRescue extends BaseEntity{
 
         /**
      * 主键

application/src/main/java/org/thingsboard/server/domain/NxWarningContact.java

@@ -16,7 +16,7 @@ import com.baomidou.mybatisplus.annotation.TableName;
 @Data
 @TableName("nx_warning_contact")
 @ApiModel(value = "", description = "对象 nxWarningContact")
-public class NxWarningContact extends BaseEntityAdaptiveIsDelete{
+public class NxWarningContact extends BaseEntity{
 
         /**
      * 主键

application/src/main/java/org/thingsboard/server/domain/export/NxDangerousSourceExport.java

@@ -1,14 +1,11 @@
 package org.thingsboard.server.domain.export;
 
 import com.alibaba.excel.annotation.ExcelProperty;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
-import org.thingsboard.server.domain.BaseEntity;
 
 /**
  * @author LF

application/src/main/java/org/thingsboard/server/domain/export/NxEmergencyHospitalExport.java

@@ -1,14 +1,11 @@
 package org.thingsboard.server.domain.export;
 
 import com.alibaba.excel.annotation.ExcelProperty;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
-import org.thingsboard.server.domain.BaseEntity;
 
 /**
  * @author LF

application/src/main/java/org/thingsboard/server/domain/export/NxExpertDatabaseExport.java

@@ -1,14 +1,11 @@
 package org.thingsboard.server.domain.export;
 
 import com.alibaba.excel.annotation.ExcelProperty;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
-import org.thingsboard.server.domain.BaseEntity;
 
 /**
  * @author LF

application/src/main/java/org/thingsboard/server/domain/export/NxKnowledgeDatabaseExport.java

@@ -1,14 +1,11 @@
 package org.thingsboard.server.domain.export;
 
 import com.alibaba.excel.annotation.ExcelProperty;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
-import org.thingsboard.server.domain.BaseEntity;
 
 /**
  * @author LF

application/src/main/java/org/thingsboard/server/domain/export/NxProtectiveTargetsExport.java

@@ -1,14 +1,11 @@
 package org.thingsboard.server.domain.export;
 
 import com.alibaba.excel.annotation.ExcelProperty;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
-import org.thingsboard.server.domain.BaseEntity;
 
 /**
  * @author LF

application/src/main/java/org/thingsboard/server/domain/export/NxRescueCarExport.java

@@ -1,17 +1,11 @@
 package org.thingsboard.server.domain.export;
 
 import com.alibaba.excel.annotation.ExcelProperty;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
-import org.thingsboard.server.domain.BaseEntity;
-
-import java.util.List;
 
 /**
  * @author LF

application/src/main/java/org/thingsboard/server/domain/export/NxRescueTeamExport.java

@@ -1,17 +1,11 @@
 package org.thingsboard.server.domain.export;
 
 import com.alibaba.excel.annotation.ExcelProperty;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
-import org.thingsboard.server.domain.BaseEntity;
-
-import java.util.List;
 
 /**
  * @author LF

application/src/main/java/org/thingsboard/server/domain/export/NxReservePlanExport.java

@@ -1,14 +1,11 @@
 package org.thingsboard.server.domain.export;
 
 import com.alibaba.excel.annotation.ExcelProperty;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
-import org.thingsboard.server.domain.BaseEntity;
 
 /**
  * @author LF

application/src/main/java/org/thingsboard/server/domain/vo/NxWarningContactVO.java

@@ -1,9 +1,7 @@
 package org.thingsboard.server.domain.vo;
 
-import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import lombok.Data;
-import org.thingsboard.server.domain.BaseEntity;
 
 /**
  * @author LF

application/src/main/java/org/thingsboard/server/service/nanxi/INxRescueCarService.java

@@ -2,6 +2,7 @@ package org.thingsboard.server.service.nanxi;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
+import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
 import org.thingsboard.server.domain.NxRescueCar;
 
 import java.util.List;
@@ -19,7 +20,7 @@ public interface INxRescueCarService extends IService<NxRescueCar> {
     * @param nxRescueCar
     * @return
     */
-    IPage<NxRescueCar> page(NxRescueCar nxRescueCar);
+    TkPageData<NxRescueCar> page(NxRescueCar nxRescueCar);
 
     /**
      * 导出

application/src/main/java/org/thingsboard/server/service/nanxi/impl/NxDangerousSourceServiceImpl.java

@@ -8,9 +8,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.thingsboard.server.domain.NxDangerousSource;
-import org.thingsboard.server.domain.NxKnowledgeDatabase;
 import org.thingsboard.server.domain.export.NxDangerousSourceExport;
-import org.thingsboard.server.domain.export.NxKnowledgeDatabaseExport;
 import org.thingsboard.server.mapper.NxDangerousSourceMapper;
 import org.thingsboard.server.service.nanxi.INxDangerousSourceService;
 

application/src/main/java/org/thingsboard/server/service/nanxi/impl/NxRescueCarServiceImpl.java

@@ -8,6 +8,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
+import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
 import org.thingsboard.server.domain.NxKnowledgeDatabase;
 import org.thingsboard.server.domain.NxRescueCar;
 import org.thingsboard.server.domain.export.NxKnowledgeDatabaseExport;
@@ -18,6 +19,8 @@ import org.thingsboard.server.service.nanxi.INxRescueCarService;
 import java.util.List;
 import java.util.stream.Collectors;
 
+import static org.thingsboard.server.utils.PageConvert.getPageData;
+
 /**
  * @author LF
  * @date 2023-05-08
@@ -32,7 +35,7 @@ public class NxRescueCarServiceImpl extends ServiceImpl<NxRescueCarMapper, NxRes
     private NxRescueCarMapper nxRescueCarMapper;
 
     @Override
-    public IPage<NxRescueCar> page(NxRescueCar nxRescueCar) {
+    public TkPageData<NxRescueCar> page(NxRescueCar nxRescueCar) {
         // 创建分页对象，设置当前页和每页记录数
         Page<NxRescueCar> page = new Page<>(nxRescueCar.getCurrent(), nxRescueCar.getSize());
 
@@ -45,7 +48,7 @@ public class NxRescueCarServiceImpl extends ServiceImpl<NxRescueCarMapper, NxRes
         ;
 
         // 执行分页查询
-        return nxRescueCarMapper.selectPage(page, wrapper);
+        return getPageData(nxRescueCarMapper.selectPage(page, wrapper), NxRescueCar.class);
     }
 
     @Override