修改地图显示隐患信息列表接口

gassafety-admin/src/main/java/com/zehong/web/controller/riskManagement/THiddenTroubleController.java

@@ -49,13 +49,13 @@ public class THiddenTroubleController extends BaseController
 
     /**
      * 地图初始化隐患
-     * @param tHiddenTrouble
+     * @param
      * @return
      */
     @GetMapping("/getMapHiddenTroublelist")
-    public AjaxResult getMapHiddenTroublelist(THiddenTrouble tHiddenTrouble)
+    public AjaxResult getMapHiddenTroublelist()
     {
-        List<HiddenTroubleVo> list = tHiddenTroubleService.selectTHiddenTroubleList(tHiddenTrouble);
+        List<THiddenTrouble> list = tHiddenTroubleService.getMapTHiddenTroubleList();
         return AjaxResult.success(list);
     }
 

gassafety-system/src/main/java/com/zehong/system/domain/vo/HiddenTroubleVo.java

 package com.zehong.system.domain.vo;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.zehong.common.annotation.Excel;
 import com.zehong.common.core.domain.BaseEntity;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
 import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
 
 /**
  * 隐患信息对象 t_hidden_trouble
@@ -34,6 +37,16 @@ public class HiddenTroubleVo extends BaseEntity
     @Excel(name = "工单id")
     private String orderId;
 
+    /** 指定执行人员姓名 */
+    private String appointInspectorName;
+
+    /** 下发时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date allotTime;
+
+    /** 反馈信息列表 */
+    private List<OrderFeedbackVo> feedbackList;
+
     /** 设备id */
     @Excel(name = "设备id")
     private Integer deviceId;
@@ -135,6 +148,31 @@ public class HiddenTroubleVo extends BaseEntity
     {
         return orderId;
     }
+
+    public String getAppointInspectorName() {
+        return appointInspectorName;
+    }
+
+    public void setAppointInspectorName(String appointInspectorName) {
+        this.appointInspectorName = appointInspectorName;
+    }
+
+    public Date getAllotTime() {
+        return allotTime;
+    }
+
+    public void setAllotTime(Date allotTime) {
+        this.allotTime = allotTime;
+    }
+
+    public List<OrderFeedbackVo> getFeedbackList() {
+        return feedbackList;
+    }
+
+    public void setFeedbackList(List<OrderFeedbackVo> feedbackList) {
+        this.feedbackList = feedbackList;
+    }
+
     public void setLongitude(BigDecimal longitude)
     {
         this.longitude = longitude;

gassafety-system/src/main/java/com/zehong/system/mapper/THiddenTroubleMapper.java

@@ -27,6 +27,14 @@ public interface THiddenTroubleMapper
      */
     public List<THiddenTrouble> selectTHiddenTroubleList(THiddenTrouble tHiddenTrouble);
 
+    /**
+     * 地图显示隐患信息列表
+     *
+     * @param
+     * @return 隐患信息集合
+     */
+    public List<THiddenTrouble> getMapTHiddenTroubleList();
+
     /**
      * 新增隐患信息
      * 

gassafety-system/src/main/java/com/zehong/system/service/ITHiddenTroubleService.java

@@ -28,6 +28,14 @@ public interface ITHiddenTroubleService
      */
     public List<HiddenTroubleVo> selectTHiddenTroubleList(THiddenTrouble tHiddenTrouble);
 
+    /**
+     * 地图显示隐患信息列表
+     *
+     * @param
+     * @return 隐患信息集合
+     */
+    public List<THiddenTrouble> getMapTHiddenTroubleList();
+
     /**
      * 新增隐患信息
      * 

gassafety-system/src/main/java/com/zehong/system/service/impl/THiddenTroubleServiceImpl.java

@@ -8,13 +8,10 @@ import com.zehong.common.utils.DateUtils;
 import com.zehong.system.domain.TDeviceInfo;
 import com.zehong.system.domain.TPipe;
 import com.zehong.system.domain.vo.HiddenTroubleVo;
-import com.zehong.system.mapper.SysUserMapper;
-import com.zehong.system.mapper.TDeviceInfoMapper;
-import com.zehong.system.mapper.TPipeMapper;
+import com.zehong.system.mapper.*;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import com.zehong.system.mapper.THiddenTroubleMapper;
 import com.zehong.system.domain.THiddenTrouble;
 import com.zehong.system.service.ITHiddenTroubleService;
 
@@ -35,6 +32,10 @@ public class THiddenTroubleServiceImpl implements ITHiddenTroubleService
     private TPipeMapper tPipeMapper;
     @Autowired
     private SysUserMapper sysUserMapper;
+    @Autowired
+    private TWorkOrderMapper tWorkOrderMapper;
+    @Autowired
+    private TOrderFeedbackMapper tOrderFeedbackMapper;
 
     /**
      * 查询隐患信息
@@ -87,6 +88,18 @@ public class THiddenTroubleServiceImpl implements ITHiddenTroubleService
         return list;
     }
 
+    /**
+     * 地图显示隐患信息列表
+     *
+     * @param
+     * @return 隐患信息集合
+     */
+    @Override
+    public List<THiddenTrouble> getMapTHiddenTroubleList()
+    {
+        return tHiddenTroubleMapper.getMapTHiddenTroubleList();
+    }
+
     /**
      * 新增隐患信息
      * 

gassafety-system/src/main/resources/mapper/system/THiddenTroubleMapper.xml

@@ -48,6 +48,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
     </select>
 
+    <select id="getMapTHiddenTroubleList" resultMap="THiddenTroubleResult">
+        <include refid="selectTHiddenTroubleVo"/>
+        where is_del = '0' and (deal_status is null or deal_status = '3')
+    </select>
+    
     <select id="selectTHiddenTroubleById" parameterType="int" resultMap="THiddenTroubleResult">
         <include refid="selectTHiddenTroubleVo"/>
         where trouble_id = #{troubleId}