大屏电梯报警数据展示异常问题解决

application/pom.xml

@@ -306,6 +306,7 @@
             <plugin>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
+                <version>2.7.13</version>
             </plugin>
         </plugins>
     </build>

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

@@ -0,0 +1,88 @@
+package org.thingsboard.server.controller.nanxi;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.springframework.util.Assert;
+import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
+import org.thingsboard.server.domain.BaseOutput;
+import org.thingsboard.server.domain.FormVisibleConfig;
+import org.thingsboard.server.service.nanxi.IFormVisibleConfigService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+import javax.annotation.Resource;
+
+/**
+ * @author Mu
+ * @date 2023-07-12
+ *
+ * @description
+ */
+@Slf4j
+@RestController
+@RequestMapping("/api/yt/formVisibleConfig")
+@Api(value = "formVisibleConfig", tags = "管理模块")
+public class FormVisibleConfigController {
+
+    @Resource
+    private IFormVisibleConfigService formVisibleConfigService;
+
+    /**
+     * 分页查询
+     * @param formVisibleConfig 分页对象
+     * @return IPage
+     */
+    @ApiOperation(value = "分页查询", notes = "分页查询")
+    @PostMapping("/page")
+    public TkPageData<FormVisibleConfig> getFormVisibleConfigPage(@RequestBody FormVisibleConfig formVisibleConfig) {
+        return formVisibleConfigService.page(formVisibleConfig);
+    }
+
+    /**
+     * 通过id查询
+     * @param id id
+     * @return Result
+     */
+    @ApiOperation(value = "通过id获取", notes = "通过id获取")
+    @GetMapping("/{id}")
+    public BaseOutput<FormVisibleConfig> getById(@PathVariable Integer id) {
+        return BaseOutput.success(formVisibleConfigService.getById(id));
+    }
+
+    /**
+     * 新增
+     * @param formVisibleConfig
+     * @return Result
+     */
+    @ApiOperation(value = "新增", notes = "新增")
+    @PostMapping
+    public BaseOutput save(@RequestBody FormVisibleConfig formVisibleConfig) {
+        return formVisibleConfigService.save(formVisibleConfig) ? BaseOutput.successMsg("添加成功") : BaseOutput.failure("添加失败");
+
+    }
+
+    /**
+     * 修改
+     * @param formVisibleConfig
+     * @return Result
+     */
+    @ApiOperation(value = "修改", notes = "修改")
+    @PutMapping
+    public BaseOutput updateById(@RequestBody FormVisibleConfig formVisibleConfig) {
+        return formVisibleConfigService.updateById(formVisibleConfig) ? BaseOutput.successMsg("修改成功") : BaseOutput.failure("修改失败");
+
+    }
+
+    /**
+     * 通过id删除
+     * @param id id
+     * @return Result
+     */
+    @ApiOperation(value = "通过id删除", notes = "通过id删除")
+    @DeleteMapping("/{id}")
+    public BaseOutput removeById(@PathVariable Integer id) {
+        return formVisibleConfigService.removeById(id) ? BaseOutput.successMsg("删除成功") : BaseOutput.failure("删除失败");
+    }
+}
+
+

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

@@ -3,20 +3,28 @@ package org.thingsboard.server.controller.nanxi;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springframework.util.Assert;
 import org.springframework.web.multipart.MultipartFile;
+import org.thingsboard.server.anno.SortOrder;
 import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
 import org.thingsboard.server.domain.BaseOutput;
+import org.thingsboard.server.domain.NxDangerousSource;
 import org.thingsboard.server.domain.NxDeviceScreenDto;
 import org.thingsboard.server.domain.NxDeviceW;
+import org.thingsboard.server.domain.export.NxDangerousSourceExport;
+import org.thingsboard.server.domain.export.NxDeviceWExport;
 import org.thingsboard.server.domain.query.NxDeviceScreenQuery;
 import org.thingsboard.server.domain.query.NxDeviceWQuery;
+import org.thingsboard.server.glossary.constants.ExportConstant;
 import org.thingsboard.server.service.nanxi.INxDeviceWService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;
+import org.thingsboard.server.utils.ExcelUtil;
 
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
+import java.io.IOException;
 import java.util.Arrays;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -127,6 +135,17 @@ public class NxDeviceWController {
     public BaseOutput<List<NxDeviceScreenDto>> getNxDeciceScreen(@RequestBody NxDeviceScreenQuery query) {
         return BaseOutput.success(nxDeviceWService.getNxDeviceScreen(query));
     }
+
+    /**
+     * 导出
+     * @param
+     * @return Result
+     */
+    @ApiOperation(value = "导出", notes = "导出")
+    @GetMapping("/export")
+    public void export(NxDeviceScreenQuery query, HttpServletResponse response) throws IOException {
+        ExcelUtil.exportExcel(response, ExcelUtil.exportFilename(ExportConstant.DEVICE_W_EXPORT_NAME), ExportConstant.EXPORT_SHEET_NAME, nxDeviceWService.listByExport(query), NxDeviceWExport.class);
+    }
 }
 
 

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

@@ -14,6 +14,7 @@ import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import org.springframework.web.bind.annotation.ModelAttribute;
+import org.thingsboard.server.anno.SortOrder;
 import org.thingsboard.server.common.data.yunteng.constant.FastIotConstants;
 import org.thingsboard.server.common.data.yunteng.dto.SysNoticeDTO;
 import org.thingsboard.server.common.data.yunteng.enums.SysNoticeTypeEnum;
@@ -72,6 +73,7 @@ public class NxMonitorWarnDataController {
      */
     @PostMapping("/page")
     @ApiOperation(value = "分页查询")
+    @SortOrder
     public BaseOutput getPage(Page page, @RequestBody WarnDataQuery query) {
         return BaseOutput.success(nxMonitorWarnDataService.getWarnDataPage(page,query));
     }

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

@@ -7,6 +7,7 @@ import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
+import org.thingsboard.server.anno.SortOrder;
 import org.thingsboard.server.domain.BaseOutput;
 import org.thingsboard.server.domain.ScadaMonitor;
 import org.thingsboard.server.domain.query.MonitorDataQuery;
@@ -89,6 +90,7 @@ public class QueryStatisticsController {
 
     @ApiOperation(value = "指标监测查询", notes = "指标监测查询")
     @PostMapping("/getIndexMonitorData")
+    @SortOrder
     public BaseOutput<Page<MonitorDataVo>> getIndexMonitorData(Page page,@RequestBody MonitorDataQuery monitorDataQuery) {
         return  BaseOutput.success(scadaHistoryService.getHistoryDataPage(page, monitorDataQuery));
     }

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

@@ -107,7 +107,7 @@ public class YunTiController {
         monitorWarnData.setWarnHandleStatus(liftWarningDataDto.getAlarmStatus() + "");
         monitorWarnData.setDataCollectTime(new Date());
         monitorWarnData.setWarnTime(new Date(liftWarningDataDto.getAlarmTime()));
-        monitorWarnData.setMonitorIndex(liftWarningDataDto.getAlarmType() + "");
+        monitorWarnData.setMonitorIndex(liftWarningDataDto.getRegisterCode() + "." + liftWarningDataDto.getAlarmType());
         monitorWarnData.setCauseExplan(liftWarningDataDto.getYtStatus());
         monitorWarnData.setWarnContent(liftWarningDataDto.getAlarmCode());
 

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

@@ -0,0 +1,45 @@
+package org.thingsboard.server.domain;
+import lombok.Data;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+
+/**
+ * @author Mu
+ * @date 2023-07-12
+ *
+ * @description (FormVisibleConfig实体类)
+ */
+@Data
+@TableName("form_visible_config")
+@ApiModel(value = "", description = "对象 formVisibleConfig")
+public class FormVisibleConfig extends BaseEntity{
+
+        /**
+     * 主键
+     */
+    private Long id;
+        /**
+     * 业务编码
+     */
+    private String businessCode;
+        /**
+     * 业务类型 0 列表   1 详情
+     */
+    private String businessType;
+        /**
+     * 字段
+     */
+    private String propField;
+        /**
+     * 是否可见 0 可见   1 隐藏
+     */
+    private String isVisible;
+        /**
+     * 是否删除 0 否   1 是
+     */
+    private String isDeleted;
+}

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

@@ -0,0 +1,13 @@
+package org.thingsboard.server.domain;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class IndexDto implements Serializable {
+    private String code;
+    private String name;
+    private String unit;
+    private String indexGroup;
+}

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

@@ -11,6 +11,7 @@ import lombok.Data;
 
 import java.io.Serializable;
 import java.util.List;
+import java.util.Map;
 
 @Data
 public class NxDeviceScreenDto implements Serializable {
@@ -67,4 +68,11 @@ public class NxDeviceScreenDto implements Serializable {
     @TableField(exist = false)
     @ApiModelProperty(value = "附件列表")
     List<NxAnnex> annexList;
+
+    /**
+     * 设备指标
+     */
+    @ApiModelProperty(value = "设备指标")
+    List<IndexDto> indexDto;
 }
+

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

@@ -0,0 +1,39 @@
+package org.thingsboard.server.domain.export;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @author LF
+ * @date 2023-05-06
+ *
+ * @description (NxDeviceW)
+ */
+@Data
+@TableName("nx_device_w")
+@ApiModel(value = "", description = "对象 nxDeviceW")
+@NoArgsConstructor
+@AllArgsConstructor
+public class NxDeviceWExport {
+    @ExcelProperty("设备名称")
+    private String deviceName;
+    @ExcelProperty("设备编码")
+    private Long no;
+    @ExcelProperty("设备类型")
+    private String typeName;
+    @ExcelProperty("设备型号")
+    private String model;
+    @ExcelProperty("设备状态")
+    private String statusName;
+    @ExcelProperty("监测类型")
+    private String monitorTypeName;
+    @ExcelProperty("所属类型")
+    private String categoryName;
+    @ExcelProperty("所属对象")
+    private String belongPumpidName;
+    
+}

application/src/main/java/org/thingsboard/server/domain/query/MonitorDataQuery.java

@@ -6,6 +6,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.springframework.format.annotation.DateTimeFormat;
+import org.thingsboard.server.domain.BaseEntity;
 
 import java.io.Serializable;
 import java.util.Date;
@@ -14,7 +15,7 @@ import java.util.List;
 @Data
 @EqualsAndHashCode
 @ApiModel(value = "实时数据查询类", description = "实时数据查询类")
-public class MonitorDataQuery implements Serializable {
+public class MonitorDataQuery extends BaseEntity implements Serializable {
 
     private static final long serialVersionUID = 1L;
 

application/src/main/java/org/thingsboard/server/domain/query/NxDeviceScreenQuery.java

@@ -9,4 +9,7 @@ public class NxDeviceScreenQuery implements Serializable {
 
     @ApiModelProperty("行业id")
     private String  industry;
+
+    @ApiModelProperty("状态")
+    private String  status;
 }

application/src/main/java/org/thingsboard/server/domain/query/WarnDataQuery.java

@@ -6,6 +6,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.springframework.format.annotation.DateTimeFormat;
+import org.thingsboard.server.domain.BaseEntity;
 
 import java.io.Serializable;
 import java.util.Date;
@@ -14,7 +15,7 @@ import java.util.List;
 @Data
 @EqualsAndHashCode
 @ApiModel(value = "报警数据查询类", description = "报警数据查询类")
-public class WarnDataQuery implements Serializable {
+public class WarnDataQuery extends BaseEntity implements Serializable {
 
     private static final long serialVersionUID = 1L;
 

application/src/main/java/org/thingsboard/server/glossary/constants/ExportConstant.java

@@ -29,6 +29,8 @@ public class ExportConstant {
 
     public static final String MONITOR_WARN_QUERY_EXPORT_NAME = "监测报警查询";
 
+    public  static final String DEVICE_W_EXPORT_NAME="设备档案管理";
+
 
     public static final String EXPORT_SHEET_NAME = "sheet1";
 }

application/src/main/java/org/thingsboard/server/mapper/FormVisibleConfigMapper.java

@@ -0,0 +1,16 @@
+package org.thingsboard.server.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.thingsboard.server.domain.FormVisibleConfig;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * @author Mu
+ * @date 2023-07-12
+ *
+ * @description
+ */
+@Mapper
+public interface FormVisibleConfigMapper extends BaseMapper<FormVisibleConfig> {
+
+}

application/src/main/java/org/thingsboard/server/mapper/NxDeviceWMapper.java

@@ -7,6 +7,7 @@ import org.apache.ibatis.annotations.Param;
 import org.thingsboard.server.domain.NxDeviceScreenDto;
 import org.thingsboard.server.domain.NxDeviceW;
 import org.apache.ibatis.annotations.Mapper;
+import org.thingsboard.server.domain.export.NxDeviceWExport;
 import org.thingsboard.server.domain.query.NxDeviceScreenQuery;
 import org.thingsboard.server.domain.query.NxDeviceWQuery;
 import org.thingsboard.server.domain.vo.NxDeviceFromIndustryVo;
@@ -38,4 +39,6 @@ public interface NxDeviceWMapper extends BaseMapper<NxDeviceW> {
     List<NxDeviceFromIndustryVo> getIndustryDeviceList();
 
     List<NxDeviceScreenDto> getNxDeviceScreen(@Param("query") NxDeviceScreenQuery query);
+
+    List<NxDeviceWExport> listByExport(NxDeviceScreenQuery query);
 }

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

@@ -0,0 +1,23 @@
+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.FormVisibleConfig;
+
+/**
+ * @author Mu
+ * @date 2023-07-12
+ *
+ * @description
+ */
+public interface IFormVisibleConfigService extends IService<FormVisibleConfig> {
+
+    /**
+    * 分页查询
+    * @param formVisibleConfig
+    * @return
+    */
+    TkPageData<FormVisibleConfig> page(FormVisibleConfig formVisibleConfig);
+
+}

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

@@ -6,6 +6,7 @@ import org.springframework.web.multipart.MultipartFile;
 import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
 import org.thingsboard.server.domain.NxDeviceScreenDto;
 import org.thingsboard.server.domain.NxDeviceW;
+import org.thingsboard.server.domain.export.NxDeviceWExport;
 import org.thingsboard.server.domain.query.NxDeviceScreenQuery;
 import org.thingsboard.server.domain.query.NxDeviceWQuery;
 import org.thingsboard.server.domain.vo.NxDeviceFromIndustryVo;
@@ -37,4 +38,6 @@ public interface INxDeviceWService extends IService<NxDeviceW> {
     NxDeviceW getDeviceById(Long id);
 
     List<NxDeviceScreenDto> getNxDeviceScreen(NxDeviceScreenQuery query);
+
+    List<NxDeviceWExport> listByExport(NxDeviceScreenQuery query);
 }

application/src/main/java/org/thingsboard/server/service/nanxi/generate/FastAutoGeneratorTest.java

@@ -29,7 +29,7 @@ public class FastAutoGeneratorTest {
 
     private static final String packageName = "org.thingsboard.server";
     private static final String moduleName = "application";
-    private static final String tableName = "nx_monitor_site_operate_log";
+    private static final String tableName = "form_visible_config111";
 
     public static void main(String[] args) {
         AutoGenerator generator = new AutoGenerator(DATA_SOURCE_CONFIG);
@@ -87,7 +87,7 @@ public class FastAutoGeneratorTest {
                 .service("service.nanxi")
                 .serviceImpl("service.nanxi.impl")
                 .controller("controller.nanxi")
-                .pathInfo(Collections.singletonMap(OutputFile.mapperXml, "E:\\com_java\\project\\nx_Link\\application\\src\\main\\resources\\mapper"));
+                .pathInfo(Collections.singletonMap(OutputFile.mapperXml, "D:\\toFly\\projects\\nanxi\\application\\src\\main\\resources\\mapper"));
     }
 
 

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

@@ -0,0 +1,43 @@
+package org.thingsboard.server.service.nanxi.impl;
+
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.thingsboard.server.domain.FormVisibleConfig;
+import org.thingsboard.server.mapper.FormVisibleConfigMapper;
+import org.thingsboard.server.service.nanxi.IFormVisibleConfigService;
+import org.springframework.stereotype.Service;
+import org.springframework.beans.factory.annotation.Autowired;
+import static org.thingsboard.server.utils.PageConvert.getPageData;
+/**
+ * @author Mu
+ * @date 2023-07-12
+ *
+ * @description
+ */
+@Service
+public class FormVisibleConfigServiceImpl extends ServiceImpl<FormVisibleConfigMapper, FormVisibleConfig> implements IFormVisibleConfigService {
+
+
+        @Autowired
+        private FormVisibleConfigMapper formVisibleConfigMapper;
+
+        @Override
+        public TkPageData<FormVisibleConfig> page(FormVisibleConfig formVisibleConfig) {
+            // 创建分页对象，设置当前页和每页记录数
+            Page<FormVisibleConfig> page = new Page<>(formVisibleConfig.getPage(), formVisibleConfig.getPageSize());
+
+            // 构造查询条件
+            QueryWrapper<FormVisibleConfig> wrapper = new QueryWrapper<FormVisibleConfig>();
+            wrapper.lambda().eq(FormVisibleConfig::getBusinessCode, formVisibleConfig.getBusinessCode())
+                    .eq(FormVisibleConfig::getBusinessType, formVisibleConfig.getBusinessType())
+            ;
+
+            // 执行分页查询
+            return getPageData(formVisibleConfigMapper.selectPage(page, wrapper),FormVisibleConfig.class);
+        }
+}
+
+

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

@@ -16,6 +16,7 @@ import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
 import org.thingsboard.server.domain.NxAnnex;
 import org.thingsboard.server.domain.NxDeviceScreenDto;
 import org.thingsboard.server.domain.NxDeviceW;
+import org.thingsboard.server.domain.export.NxDeviceWExport;
 import org.thingsboard.server.domain.query.NxDeviceScreenQuery;
 import org.thingsboard.server.domain.query.NxDeviceWQuery;
 import org.thingsboard.server.domain.vo.NxDeviceFromIndustryVo;
@@ -124,6 +125,12 @@ public class NxDeviceWServiceImpl extends ServiceImpl<NxDeviceWMapper, NxDeviceW
          nxDeviceScreenDto.stream().forEach(item->item.setAnnexList(annexService.queryAnnexByContactId(item.getId())));
          return nxDeviceScreenDto;
     }
+
+    @Override
+    public List<NxDeviceWExport> listByExport(NxDeviceScreenQuery query) {
+        List<NxDeviceWExport> nxDeviceWExports = baseMapper.listByExport(query);
+        return nxDeviceWExports;
+    }
 }
 
 

application/src/main/resources/bootstrap.yml

@@ -22,6 +22,7 @@ spring:
     open-in-view: "false"
     hibernate:
       ddl-auto: "none"
+
     show-sql: "false"
     database-platform: "${SPRING_JPA_DATABASE_PLATFORM:org.hibernate.dialect.PostgreSQLDialect}"
   rabbitmq:

application/src/main/resources/mapper/FormVisibleConfigMapper.xml

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="org.thingsboard.server.mapper.FormVisibleConfigMapper">
+
+    <resultMap id="formVisibleConfigMap" type="org.thingsboard.server.domain.FormVisibleConfig">
+            <result column="id" property="id"/>
+            <result column="business_code" property="businessCode"/>
+            <result column="business_type" property="businessType"/>
+            <result column="prop_field" property="propField"/>
+            <result column="is_visible" property="isVisible"/>
+            <result column="is_deleted" property="isDeleted"/>
+    </resultMap>
+
+    <sql id="Base_Column_List">
+            id,
+            business_code,
+            business_type,
+            prop_field,
+            is_visible,
+            is_deleted
+    </sql>
+
+</mapper>
+

application/src/main/resources/mapper/NxDangerousSourceMapper.xml

@@ -37,10 +37,10 @@
             </where>
         <choose>
             <when test="sort != null and sort != '' and sortDirections != null and sortDirections != ''">
-                order by ${sort} ${sortDirections}
+                order by ds.${sort} ${sortDirections}
             </when>
             <otherwise>
-                order by update_time
+                order by ds.update_time
             </otherwise>
         </choose>
     </select>

application/src/main/resources/mapper/NxDeviceWMapper.xml

@@ -171,7 +171,7 @@
         GROUP BY it.id, it.item_text, it.sort
         order by it.sort asc
     </select>
-    <select id="getNxDeviceScreen" resultType="org.thingsboard.server.domain.NxDeviceScreenDto">
+    <select id="getNxDeviceScreen" resultMap="DeviceScreenMap">
         SELECT w.id,
         w.device_name,
         w.longitude,
@@ -182,16 +182,61 @@
         when status = '0' then '离线'
         when status = '1' then '在线'
         when status = '2' then '报警' end as statusName,
-        ms.industry,ms.address
+        ms.industry,ms.address,
+        mi.code,mi.name,mi.unit,mi.index_group
         from nx_device_w w left JOIN nx_device_type dt on w.type_id=dt.id and dt.is_deleted='0'
         left join nx_monitor_site_device sd on w.id = sd.device_id and sd.is_deleted = '0'
-        LEFT JOIN
-        nx_monitor_site ms on sd.site_id = ms.id where 1=1
+        LEFT JOIN nx_monitor_site ms on sd.site_id = ms.id
+        left join nx_monitor_index mi on w.id = mi.device_id
+        where 1=1 and w.is_deleted = '0'
         <if test="query.industry!=null and query.industry!=''">
             and ms.industry=#{query.industry}
         </if>
+        <choose>
+            <when test="query.status == '0'">
+                and w.status=#{query.status}
+            </when>
+            <when test="query.status == '1'">
+                and w.status in ('1', '2')
+            </when>
+        </choose>
     </select>
 
+    <resultMap id="DeviceScreenMap" type="org.thingsboard.server.domain.NxDeviceScreenDto">
+        <result column="id" property="id"/>
+        <result column="device_name" property="deviceName"/>
+        <result column="longitude" property="longitude"/>
+        <result column="latitude" property="latitude"/>
+        <result column="type_id" property="typeId"/>
+        <result column="type_name" property="typeName"/>
+        <result column="statusName" property="statusName"/>
+        <result column="industry" property="industry"/>
+        <result column="address" property="address"/>
+        <collection property="indexDto" ofType="org.thingsboard.server.domain.IndexDto">
+            <result column="code" property="code"/>
+            <result column="name" property="name"/>
+            <result column="unit" property="unit"/>
+            <result column="index_group" property="indexGroup"/>
+        </collection>
+    </resultMap>
+
+    <select id="listByExport" resultType="org.thingsboard.server.domain.export.NxDeviceWExport">
+        select dw.device_name,dw.no,dt.type_name,di.item_text category_name,dw.model,
+        case
+        when dw.status = '0' then '离线'
+        when dw.status = '1' then '在线'
+        when dw.status = '2' then '报警' end as status_name,
+        di2.item_text monitor_type_name,di3.item_text belong_pumpid_name
+        from nx_device_w dw
+        left join sys_dict_item di on dw.category = di.id
+        left join sys_dict_item di2 on dw.monitor_type = di2.id
+        left join sys_dict_item di3 on dw.belong_pumpid = di3.id
+        left join nx_device_type dt on dw.type_id = dt.id
+        WHERE dw.is_deleted = '0'
+        <if test="status != null and status != ''">
+            and dw.status = #{status}
+        </if>
+    </select>
 
 </mapper>
 

application/src/main/resources/mapper/NxMonitorWarnDataMapper.xml

@@ -174,7 +174,14 @@
         <if test="query.keyword!=null and query.keyword!=''">
             and (a.warn_type like CONCAT('%',#{query.keyword},'%') or c.device_name like CONCAT('%',#{query.keyword},'%'))
         </if>
-        ORDER BY a.warn_time DESC
+        <choose>
+            <when test="query.sort != null and query.sort != '' and query.sortDirections != null and query.sortDirections != ''">
+                order by ${query.sort} ${query.sortDirections}
+            </when>
+            <otherwise>
+                ORDER BY a.warn_time DESC
+            </otherwise>
+        </choose>
     </select>
 
     <select id="getWarnDataList" resultMap="nxMonitorWarnDataMap">

application/src/main/resources/mapper/ScadaHistoryMapper.xml

@@ -134,6 +134,14 @@
         <if test="query.typeName!=null and query.typeName!=''">
             and f.type_name like CONCAT('%',#{query.typeName},'%')
         </if>
+        <choose>
+            <when test="query.sort != null and query.sort != '' and query.sortDirections != null and query.sortDirections != ''">
+                order by ${query.sort} ${query.sortDirections}
+            </when>
+            <otherwise>
+                order by a.update_time
+            </otherwise>
+        </choose>
     </select>
 
     <select id="getDataByCountMethod" resultType="org.thingsboard.server.domain.vo.MonitorDataVo">

dao/src/main/resources/mapper/UserMapper.xml

@@ -129,6 +129,14 @@
                 AND cast(su.area_code as varchar) like #{queryMap.areaCodeQuery} || '%'
             </if>
         </where>
+        <choose>
+            <when test="queryMap.orderFiled != null and queryMap.orderFiled != '' and queryMap.orderType != null and queryMap.orderType != ''">
+                order by ${queryMap.orderFiled} ${queryMap.orderType}
+            </when>
+            <otherwise>
+                order by su.create_time
+            </otherwise>
+        </choose>
     </select>
 
     <select id="getTenantAdminPage" resultMap="userDTOMap">

pom.xml

@@ -149,7 +149,6 @@
         <module>common</module>
         <module>dao</module>
         <module>application</module>
-		<module>yx-base-service</module>
     </modules>
 
     <profiles>

yx-base-service/.gitignore

@@ -1 +0,0 @@
-/target/

yx-base-service/pom.xml

@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <!--<parent>
-        <groupId>com.tofly</groupId>
-        <artifactId>tofly-webParent</artifactId>
-        <version>1.0.0</version>
-    </parent>-->
-    <artifactId>yx-base-service</artifactId>
-    <version>1.0.0</version>
-    <packaging>pom</packaging>
-    <dependencies>
-        <dependency>
-            <groupId>cn.hutool</groupId>
-            <artifactId>hutool-all</artifactId>
-            <version>5.5.7</version>
-        </dependency>        
-		<dependency>
-        	<groupId>com.dm</groupId>
-  			<artifactId>DmJdbcDriver18</artifactId>
-  			<version>18</version>
-        </dependency>
-    </dependencies>
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>repackage</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-</project>

yx-base-service/src/main/java/com/tofly/yxBase/YxBaseApplication.java

@@ -1,10 +0,0 @@
-package com.tofly.yxBase;
-
-import org.springframework.boot.SpringApplication;
-
-
-public class YxBaseApplication {
-    public static void main(String[] args) {
-        SpringApplication.run(YxBaseApplication.class,args);
-    }
-}

yx-base-service/src/main/resources/bootstrap-dev.yml

@@ -1,22 +0,0 @@
-spring:
-  cloud:
-    nacos:
-      config:
-        namespace: yx-pro
-        server-addr: http://182.139.38.101:20032
-        file-extension: yaml
-        shared-configs[0]:
-          dataId: public_config_redis.yaml
-        shared-configs[1]:
-          dataId: public_config_dm.yaml  
-      discovery:
-        namespace: yx-pro
-        server-addr: http://182.139.38.101:20032
-  application:
-    name: yx-base-service
-
-    
-    
-logging:
-  level:
-    com.alibaba.nacos.client.config.impl: WARN

yx-base-service/src/main/resources/bootstrap.yml

@@ -1,3 +0,0 @@
-spring:
-   profiles:
-      active: dev

yx-base-service/src/main/resources/log4j.properties

@@ -1,13 +0,0 @@
-# Global logging configuration
-log4j.rootLogger=ERROR, stdout
-
-
-# Console output...
-log4j.appender.stdout=org.apache.log4j.ConsoleAppender
-log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-log4j.appender.stdout.layout.ConversionPattern=%d{ABSOLUTE} [%5p] %c{1}:%L - %m%n
-
-
-# MyBatis logging configuration...
-log4j.logger.ga.rugal=TRACE
-log4j.logger.org.apache.ibatis=TRACE