隐患信息

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

 package com.zehong.web.controller.riskManagement;
 
 import java.util.List;
+
+import com.zehong.system.domain.vo.HiddenTroubleVo;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -41,7 +43,7 @@ public class THiddenTroubleController extends BaseController
     public TableDataInfo list(THiddenTrouble tHiddenTrouble)
     {
         startPage();
-        List<THiddenTrouble> list = tHiddenTroubleService.selectTHiddenTroubleList(tHiddenTrouble);
+        List<HiddenTroubleVo> list = tHiddenTroubleService.selectTHiddenTroubleList(tHiddenTrouble);
         return getDataTable(list);
     }
 
@@ -53,7 +55,7 @@ public class THiddenTroubleController extends BaseController
     @GetMapping("/getMapHiddenTroublelist")
     public AjaxResult getMapHiddenTroublelist(THiddenTrouble tHiddenTrouble)
     {
-        List<THiddenTrouble> list = tHiddenTroubleService.selectTHiddenTroubleList(tHiddenTrouble);
+        List<HiddenTroubleVo> list = tHiddenTroubleService.selectTHiddenTroubleList(tHiddenTrouble);
         return AjaxResult.success(list);
     }
 
@@ -66,8 +68,8 @@ public class THiddenTroubleController extends BaseController
     public AjaxResult export(THiddenTrouble tHiddenTrouble)
     {
         tHiddenTrouble.setDealStatus("3");
-        List<THiddenTrouble> list = tHiddenTroubleService.selectTHiddenTroubleList(tHiddenTrouble);
-        ExcelUtil<THiddenTrouble> util = new ExcelUtil<THiddenTrouble>(THiddenTrouble.class);
+        List<HiddenTroubleVo> list = tHiddenTroubleService.selectTHiddenTroubleList(tHiddenTrouble);
+        ExcelUtil<HiddenTroubleVo> util = new ExcelUtil<HiddenTroubleVo>(HiddenTroubleVo.class);
         return util.exportExcel(list, "隐患信息数据");
     }
 
@@ -76,9 +78,16 @@ public class THiddenTroubleController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('riskManagement:hiddenTrouble:query')")
     @GetMapping(value = "/{troubleId}")
-    public AjaxResult getInfo(@PathVariable("troubleId") int troubleId)
+    public AjaxResult getInfo(@PathVariable("troubleId") int troubleId) throws Exception
     {
-        return AjaxResult.success(tHiddenTroubleService.selectTHiddenTroubleById(troubleId));
+        HiddenTroubleVo hiddenTroubleVo = null;
+        try {
+            hiddenTroubleVo = tHiddenTroubleService.selectTHiddenTroubleById(troubleId);
+        } catch (Exception e) {
+            e.printStackTrace();
+            throw new Exception("获取隐患信息详情失败");
+        }
+        return AjaxResult.success(hiddenTroubleVo);
     }
 
     /**

gassafety-admin/src/main/java/com/zehong/web/controller/system/SysUserController.java

@@ -67,6 +67,18 @@ public class SysUserController extends BaseController
         return getDataTable(list);
     }
 
+    /**
+     * 获取用户列表不分页
+     */
+    @PreAuthorize("@ss.hasPermi('system:user:allList')")
+    @GetMapping("/allList")
+    public AjaxResult allList()
+    {
+        SysUser user = new SysUser();
+        List<SysUser> list = userService.selectUserList(user);
+        return AjaxResult.success(list);
+    }
+
     /**
      * 获取巡检员列表
      */

gassafety-system/src/main/java/com/zehong/system/domain/THiddenTrouble.java

@@ -10,7 +10,7 @@ import com.zehong.common.core.domain.BaseEntity;
  * 隐患信息对象 t_hidden_trouble
  * 
  * @author zehong
- * @date 2021-07-21
+ * @date 2021-08-20
  */
 public class THiddenTrouble extends BaseEntity
 {
@@ -19,20 +19,29 @@ public class THiddenTrouble extends BaseEntity
     /** 隐患信息id */
     private Integer troubleId;
 
-    /** 设备id */
-    @Excel(name = "设备id")
-    private Integer deviceId;
+    /** 隐患类型 */
+    @Excel(name = "隐患类型")
+    private String troubleType;
 
-    /** 设备类型（0管道，1调压阀，2阀门井，3流量计，4压力表） */
-    private String deviceType;
+    /** 隐患名称 */
+    @Excel(name = "隐患名称")
+    private String troubleName;
+
+    /** 隐患级别 */
+    @Excel(name = "隐患级别")
+    private String troubleLevel;
 
     /** 工单id */
     @Excel(name = "工单id")
     private String orderId;
 
-    /** 地址 */
-    @Excel(name = "地址")
-    private String address;
+    /** 设备id */
+    @Excel(name = "设备id")
+    private Integer deviceId;
+
+    /** 设备类型（0管道，1调压阀，2阀门井，3流量计，4压力表） */
+    @Excel(name = "设备类型", readConverterExp = "0=管道，1调压阀，2阀门井，3流量计，4压力表")
+    private String deviceType;
 
     /** 经度 */
     @Excel(name = "经度")
@@ -42,14 +51,30 @@ public class THiddenTrouble extends BaseEntity
     @Excel(name = "纬度")
     private BigDecimal latitude;
 
+    /** 是否作废（0正常，1作废） */
+    @Excel(name = "是否作废（0正常，1作废）")
+    private String isDel;
+
     /** 处理状态（1不需处理，2已处理完成，3未处理完成） */
     @Excel(name = "处理状态", readConverterExp = "1不需处理，2已处理完成，3未处理完成")
     private String dealStatus;
 
+    /** 地址 */
+    @Excel(name = "地址")
+    private String address;
+
     /** 备注 */
     @Excel(name = "备注")
     private String remarks;
 
+    /** 图片地址 */
+    @Excel(name = "图片地址")
+    private String pictureUrl;
+
+    /** 上报人（用户id） */
+    @Excel(name = "上报人", readConverterExp = "用户id")
+    private Long reportMan;
+
     public void setTroubleId(Integer troubleId)
     {
         this.troubleId = troubleId;
@@ -59,6 +84,24 @@ public class THiddenTrouble extends BaseEntity
     {
         return troubleId;
     }
+
+    public String getTroubleName() {
+        return troubleName;
+    }
+
+    public void setTroubleName(String troubleName) {
+        this.troubleName = troubleName;
+    }
+
+    public void setTroubleType(String troubleType)
+    {
+        this.troubleType = troubleType;
+    }
+
+    public String getTroubleType() 
+    {
+        return troubleType;
+    }
     public void setDeviceId(Integer deviceId)
     {
         this.deviceId = deviceId;
@@ -68,15 +111,15 @@ public class THiddenTrouble extends BaseEntity
     {
         return deviceId;
     }
-
-    public String getDeviceType() {
-        return deviceType;
+    public void setTroubleLevel(String troubleLevel) 
+    {
+        this.troubleLevel = troubleLevel;
     }
 
-    public void setDeviceType(String deviceType) {
-        this.deviceType = deviceType;
+    public String getTroubleLevel() 
+    {
+        return troubleLevel;
     }
-
     public void setOrderId(String orderId) 
     {
         this.orderId = orderId;
@@ -86,15 +129,6 @@ public class THiddenTrouble extends BaseEntity
     {
         return orderId;
     }
-
-    public String getAddress() {
-        return address;
-    }
-
-    public void setAddress(String address) {
-        this.address = address;
-    }
-
     public void setLongitude(BigDecimal longitude) 
     {
         this.longitude = longitude;
@@ -104,6 +138,15 @@ public class THiddenTrouble extends BaseEntity
     {
         return longitude;
     }
+    public void setDeviceType(String deviceType) 
+    {
+        this.deviceType = deviceType;
+    }
+
+    public String getDeviceType() 
+    {
+        return deviceType;
+    }
     public void setLatitude(BigDecimal latitude) 
     {
         this.latitude = latitude;
@@ -114,6 +157,14 @@ public class THiddenTrouble extends BaseEntity
         return latitude;
     }
 
+    public String getIsDel() {
+        return isDel;
+    }
+
+    public void setIsDel(String isDel) {
+        this.isDel = isDel;
+    }
+
     public void setDealStatus(String dealStatus)
     {
         this.dealStatus = dealStatus;
@@ -123,6 +174,15 @@ public class THiddenTrouble extends BaseEntity
     {
         return dealStatus;
     }
+    public void setAddress(String address) 
+    {
+        this.address = address;
+    }
+
+    public String getAddress() 
+    {
+        return address;
+    }
     public void setRemarks(String remarks) 
     {
         this.remarks = remarks;
@@ -132,21 +192,43 @@ public class THiddenTrouble extends BaseEntity
     {
         return remarks;
     }
+    public void setPictureUrl(String pictureUrl) 
+    {
+        this.pictureUrl = pictureUrl;
+    }
+
+    public String getPictureUrl() 
+    {
+        return pictureUrl;
+    }
+    public void setReportMan(Long reportMan) 
+    {
+        this.reportMan = reportMan;
+    }
+
+    public Long getReportMan() 
+    {
+        return reportMan;
+    }
 
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
             .append("troubleId", getTroubleId())
+            .append("troubleType", getTroubleType())
             .append("deviceId", getDeviceId())
-            .append("deviceType", getDeviceType())
+            .append("troubleLevel", getTroubleLevel())
             .append("orderId", getOrderId())
-            .append("address", getAddress())
             .append("longitude", getLongitude())
+            .append("deviceType", getDeviceType())
             .append("latitude", getLatitude())
             .append("dealStatus", getDealStatus())
             .append("updateTime", getUpdateTime())
+            .append("address", getAddress())
             .append("createTime", getCreateTime())
             .append("remarks", getRemarks())
+            .append("pictureUrl", getPictureUrl())
+            .append("reportMan", getReportMan())
             .toString();
     }
 }

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

+package com.zehong.system.domain.vo;
+
+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;
+
+/**
+ * 隐患信息对象 t_hidden_trouble
+ * 
+ * @author zehong
+ * @date 2021-08-20
+ */
+public class HiddenTroubleVo extends BaseEntity
+{
+    /** 隐患信息id */
+    private Integer troubleId;
+
+    /** 隐患类型 */
+    @Excel(name = "隐患类型")
+    private String troubleType;
+
+    /** 隐患名称 */
+    @Excel(name = "隐患名称")
+    private String troubleName;
+
+    /** 隐患级别 */
+    @Excel(name = "隐患级别")
+    private String troubleLevel;
+
+    /** 工单id */
+    @Excel(name = "工单id")
+    private String orderId;
+
+    /** 设备id */
+    @Excel(name = "设备id")
+    private Integer deviceId;
+
+    /** 设备类型（0管道，1调压阀，2阀门井，3流量计，4压力表） */
+    @Excel(name = "设备类型", readConverterExp = "0=管道，1调压阀，2阀门井，3流量计，4压力表")
+    private String deviceType;
+
+    /** 设备名称 */
+    @Excel(name = "设备名称")
+    private String deviceName;
+
+    /** 经度 */
+    @Excel(name = "经度")
+    private BigDecimal longitude;
+
+    /** 纬度 */
+    @Excel(name = "纬度")
+    private BigDecimal latitude;
+
+    /** 是否作废（0正常，1作废） */
+    @Excel(name = "是否作废（0正常，1作废）")
+    private String isDel;
+
+    /** 处理状态（1不需处理，2已处理完成，3未处理完成） */
+    @Excel(name = "处理状态", readConverterExp = "1不需处理，2已处理完成，3未处理完成")
+    private String dealStatus;
+
+    /** 地址 */
+    @Excel(name = "地址")
+    private String address;
+
+    /** 备注 */
+    @Excel(name = "备注")
+    private String remarks;
+
+    /** 图片地址 */
+    @Excel(name = "图片地址")
+    private String pictureUrl;
+
+    /** 上报人（用户id） */
+    private Long reportMan;
+
+    /** 上报人姓名 */
+    @Excel(name = "上报人姓名", readConverterExp = "上报人姓名")
+    private String reportManName;
+
+    public void setTroubleId(Integer troubleId)
+    {
+        this.troubleId = troubleId;
+    }
+
+    public Integer getTroubleId()
+    {
+        return troubleId;
+    }
+
+    public String getTroubleName() {
+        return troubleName;
+    }
+
+    public void setTroubleName(String troubleName) {
+        this.troubleName = troubleName;
+    }
+
+    public void setTroubleType(String troubleType)
+    {
+        this.troubleType = troubleType;
+    }
+
+    public String getTroubleType() 
+    {
+        return troubleType;
+    }
+    public void setDeviceId(Integer deviceId)
+    {
+        this.deviceId = deviceId;
+    }
+
+    public Integer getDeviceId()
+    {
+        return deviceId;
+    }
+    public void setTroubleLevel(String troubleLevel) 
+    {
+        this.troubleLevel = troubleLevel;
+    }
+
+    public String getTroubleLevel() 
+    {
+        return troubleLevel;
+    }
+    public void setOrderId(String orderId) 
+    {
+        this.orderId = orderId;
+    }
+
+    public String getOrderId() 
+    {
+        return orderId;
+    }
+    public void setLongitude(BigDecimal longitude) 
+    {
+        this.longitude = longitude;
+    }
+
+    public BigDecimal getLongitude() 
+    {
+        return longitude;
+    }
+    public void setDeviceType(String deviceType) 
+    {
+        this.deviceType = deviceType;
+    }
+
+    public String getDeviceType() 
+    {
+        return deviceType;
+    }
+
+    public String getDeviceName() {
+        return deviceName;
+    }
+
+    public void setDeviceName(String deviceName) {
+        this.deviceName = deviceName;
+    }
+
+    public void setLatitude(BigDecimal latitude)
+    {
+        this.latitude = latitude;
+    }
+
+    public BigDecimal getLatitude() 
+    {
+        return latitude;
+    }
+
+    public String getIsDel() {
+        return isDel;
+    }
+
+    public void setIsDel(String isDel) {
+        this.isDel = isDel;
+    }
+
+    public void setDealStatus(String dealStatus)
+    {
+        this.dealStatus = dealStatus;
+    }
+
+    public String getDealStatus() 
+    {
+        return dealStatus;
+    }
+    public void setAddress(String address) 
+    {
+        this.address = address;
+    }
+
+    public String getAddress() 
+    {
+        return address;
+    }
+    public void setRemarks(String remarks) 
+    {
+        this.remarks = remarks;
+    }
+
+    public String getRemarks() 
+    {
+        return remarks;
+    }
+    public void setPictureUrl(String pictureUrl) 
+    {
+        this.pictureUrl = pictureUrl;
+    }
+
+    public String getPictureUrl() 
+    {
+        return pictureUrl;
+    }
+    public void setReportMan(Long reportMan) 
+    {
+        this.reportMan = reportMan;
+    }
+
+    public Long getReportMan() 
+    {
+        return reportMan;
+    }
+
+    public String getReportManName() {
+        return reportManName;
+    }
+
+    public void setReportManName(String reportManName) {
+        this.reportManName = reportManName;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("troubleId", getTroubleId())
+            .append("troubleType", getTroubleType())
+            .append("deviceId", getDeviceId())
+            .append("troubleLevel", getTroubleLevel())
+            .append("orderId", getOrderId())
+            .append("longitude", getLongitude())
+            .append("deviceType", getDeviceType())
+            .append("latitude", getLatitude())
+            .append("dealStatus", getDealStatus())
+            .append("updateTime", getUpdateTime())
+            .append("address", getAddress())
+            .append("createTime", getCreateTime())
+            .append("remarks", getRemarks())
+            .append("pictureUrl", getPictureUrl())
+            .append("reportMan", getReportMan())
+            .toString();
+    }
+}

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

@@ -2,6 +2,7 @@ package com.zehong.system.service;
 
 import java.util.List;
 import com.zehong.system.domain.THiddenTrouble;
+import com.zehong.system.domain.vo.HiddenTroubleVo;
 
 /**
  * 隐患信息Service接口
@@ -17,7 +18,7 @@ public interface ITHiddenTroubleService
      * @param troubleId 隐患信息ID
      * @return 隐患信息
      */
-    public THiddenTrouble selectTHiddenTroubleById(int troubleId);
+    public HiddenTroubleVo selectTHiddenTroubleById(int troubleId) throws Exception;
 
     /**
      * 查询隐患信息列表
@@ -25,7 +26,7 @@ public interface ITHiddenTroubleService
      * @param tHiddenTrouble 隐患信息
      * @return 隐患信息集合
      */
-    public List<THiddenTrouble> selectTHiddenTroubleList(THiddenTrouble tHiddenTrouble);
+    public List<HiddenTroubleVo> selectTHiddenTroubleList(THiddenTrouble tHiddenTrouble);
 
     /**
      * 新增隐患信息

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

 package com.zehong.system.service.impl;
 
+import java.util.ArrayList;
 import java.util.List;
+
+import com.zehong.common.core.domain.entity.SysUser;
 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 org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.zehong.system.mapper.THiddenTroubleMapper;
@@ -19,6 +29,12 @@ public class THiddenTroubleServiceImpl implements ITHiddenTroubleService
 {
     @Autowired
     private THiddenTroubleMapper tHiddenTroubleMapper;
+    @Autowired
+    private TDeviceInfoMapper tDeviceInfoMapper;
+    @Autowired
+    private TPipeMapper tPipeMapper;
+    @Autowired
+    private SysUserMapper sysUserMapper;
 
     /**
      * 查询隐患信息
@@ -27,9 +43,22 @@ public class THiddenTroubleServiceImpl implements ITHiddenTroubleService
      * @return 隐患信息
      */
     @Override
-    public THiddenTrouble selectTHiddenTroubleById(int troubleId)
+    public HiddenTroubleVo selectTHiddenTroubleById(int troubleId)
     {
-        return tHiddenTroubleMapper.selectTHiddenTroubleById(troubleId);
+        HiddenTroubleVo hiddenTroubleVo = new HiddenTroubleVo();
+        THiddenTrouble tHiddenTrouble = tHiddenTroubleMapper.selectTHiddenTroubleById(troubleId);
+        BeanUtils.copyProperties(tHiddenTrouble, hiddenTroubleVo);
+
+        if(tHiddenTrouble.getDeviceId() != null){
+            if("0".equals(tHiddenTrouble.getDeviceType())){
+                TPipe pipe = tPipeMapper.selectTPipeById(tHiddenTrouble.getDeviceId());
+                hiddenTroubleVo.setDeviceName(pipe.getPipeName());
+            } else {
+                TDeviceInfo device = tDeviceInfoMapper.selectTDeviceInfoById(tHiddenTrouble.getDeviceId());
+                hiddenTroubleVo.setDeviceName(device.getDeviceName());
+            }
+        }
+        return hiddenTroubleVo;
     }
 
     /**
@@ -39,9 +68,23 @@ public class THiddenTroubleServiceImpl implements ITHiddenTroubleService
      * @return 隐患信息
      */
     @Override
-    public List<THiddenTrouble> selectTHiddenTroubleList(THiddenTrouble tHiddenTrouble)
+    public List<HiddenTroubleVo> selectTHiddenTroubleList(THiddenTrouble tHiddenTrouble)
     {
-        return tHiddenTroubleMapper.selectTHiddenTroubleList(tHiddenTrouble);
+        List<HiddenTroubleVo> list = new ArrayList<>();
+        List<THiddenTrouble> tHiddenTroubleList = tHiddenTroubleMapper.selectTHiddenTroubleList(tHiddenTrouble);
+
+        if(tHiddenTroubleList.size() != 0) {
+            for (THiddenTrouble trouble : tHiddenTroubleList) {
+                HiddenTroubleVo hiddenTroubleVo = new HiddenTroubleVo();
+                BeanUtils.copyProperties(trouble, hiddenTroubleVo);
+
+                SysUser sysUser = sysUserMapper.selectUserById(trouble.getReportMan());
+                hiddenTroubleVo.setReportManName(sysUser.getNickName());
+
+                list.add(hiddenTroubleVo);
+            }
+        }
+        return list;
     }
 
     /**

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

@@ -6,32 +6,45 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     
     <resultMap type="THiddenTrouble" id="THiddenTroubleResult">
         <result property="troubleId"    column="trouble_id"    />
+        <result property="troubleName"    column="trouble_name"    />
+        <result property="troubleType"    column="trouble_type"    />
         <result property="deviceId"    column="device_id"    />
-        <result property="deviceType"    column="device_type"    />
+        <result property="troubleLevel"    column="trouble_level"    />
         <result property="orderId"    column="order_id"    />
-        <result property="address"    column="address"    />
         <result property="longitude"    column="longitude"    />
+        <result property="deviceType"    column="device_type"    />
         <result property="latitude"    column="latitude"    />
+        <result property="isDel"    column="is_del"    />
         <result property="dealStatus"    column="deal_status"    />
         <result property="updateTime"    column="update_time"    />
+        <result property="address"    column="address"    />
         <result property="createTime"    column="create_time"    />
         <result property="remarks"    column="remarks"    />
+        <result property="pictureUrl"    column="picture_url"    />
+        <result property="reportMan"    column="report_man"    />
     </resultMap>
 
     <sql id="selectTHiddenTroubleVo">
-        select trouble_id, device_id, device_type, order_id, address, longitude, latitude, deal_status, update_time, create_time, remarks from t_hidden_trouble
+        select trouble_id, trouble_name, trouble_type, device_id, trouble_level, order_id, longitude, device_type, latitude, is_del, deal_status, update_time, address, create_time, remarks, picture_url, report_man from t_hidden_trouble
     </sql>
 
     <select id="selectTHiddenTroubleList" parameterType="THiddenTrouble" resultMap="THiddenTroubleResult">
         <include refid="selectTHiddenTroubleVo"/>
         <where>
+            and is_del = '0'
+            <if test="troubleName != null  and troubleName != ''"> and trouble_name like concat('%', #{troubleName}, '%')</if>
+            <if test="troubleType != null  and troubleType != ''"> and trouble_type = #{troubleType}</if>
             <if test="deviceId != null "> and device_id = #{deviceId}</if>
-            <if test="deviceType != null "> and device_type = #{deviceType}</if>
+            <if test="troubleLevel != null  and troubleLevel != ''"> and trouble_level = #{troubleLevel}</if>
             <if test="orderId != null  and orderId != ''"> and order_id = #{orderId}</if>
             <if test="longitude != null "> and longitude = #{longitude}</if>
+            <if test="deviceType != null  and deviceType != ''"> and device_type = #{deviceType}</if>
             <if test="latitude != null "> and latitude = #{latitude}</if>
             <if test="dealStatus != null  and dealStatus != ''"> and deal_status = #{dealStatus}</if>
+            <if test="address != null  and address != ''"> and address = #{address}</if>
             <if test="remarks != null  and remarks != ''"> and remarks = #{remarks}</if>
+            <if test="pictureUrl != null  and pictureUrl != ''"> and picture_url = #{pictureUrl}</if>
+            <if test="reportMan != null "> and report_man = #{reportMan}</if>
         </where>
     </select>
     
@@ -43,44 +56,60 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <insert id="insertTHiddenTrouble" parameterType="THiddenTrouble" useGeneratedKeys="true" keyProperty="troubleId">
         insert into t_hidden_trouble
         <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="troubleName != null">trouble_name,</if>
+            <if test="troubleType != null">trouble_type,</if>
             <if test="deviceId != null">device_id,</if>
-            <if test="deviceType != null">device_type,</if>
+            <if test="troubleLevel != null">trouble_level,</if>
             <if test="orderId != null">order_id,</if>
-            <if test="address != null">address,</if>
             <if test="longitude != null">longitude,</if>
+            <if test="deviceType != null">device_type,</if>
             <if test="latitude != null">latitude,</if>
             <if test="dealStatus != null">deal_status,</if>
             <if test="updateTime != null">update_time,</if>
+            <if test="address != null">address,</if>
             <if test="createTime != null">create_time,</if>
             <if test="remarks != null">remarks,</if>
+            <if test="pictureUrl != null">picture_url,</if>
+            <if test="reportMan != null">report_man,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="troubleName != null">#{troubleName},</if>
+            <if test="troubleType != null">#{troubleType},</if>
             <if test="deviceId != null">#{deviceId},</if>
-            <if test="deviceType != null">#{deviceType},</if>
+            <if test="troubleLevel != null">#{troubleLevel},</if>
             <if test="orderId != null">#{orderId},</if>
-            <if test="address != null">#{address},</if>
             <if test="longitude != null">#{longitude},</if>
+            <if test="deviceType != null">#{deviceType},</if>
             <if test="latitude != null">#{latitude},</if>
             <if test="dealStatus != null">#{dealStatus},</if>
             <if test="updateTime != null">#{updateTime},</if>
+            <if test="address != null">#{address},</if>
             <if test="createTime != null">#{createTime},</if>
             <if test="remarks != null">#{remarks},</if>
+            <if test="pictureUrl != null">#{pictureUrl},</if>
+            <if test="reportMan != null">#{reportMan},</if>
          </trim>
     </insert>
 
     <update id="updateTHiddenTrouble" parameterType="THiddenTrouble">
         update t_hidden_trouble
         <trim prefix="SET" suffixOverrides=",">
+            <if test="troubleName != null">trouble_name = #{troubleName},</if>
+            <if test="troubleType != null">trouble_type = #{troubleType},</if>
             <if test="deviceId != null">device_id = #{deviceId},</if>
-            <if test="deviceType != null">device_id = #{deviceType},</if>
+            <if test="troubleLevel != null">trouble_level = #{troubleLevel},</if>
             <if test="orderId != null">order_id = #{orderId},</if>
-            <if test="address != null">address = #{address},</if>
             <if test="longitude != null">longitude = #{longitude},</if>
+            <if test="deviceType != null">device_type = #{deviceType},</if>
             <if test="latitude != null">latitude = #{latitude},</if>
+            <if test="isDel != null">is_del = #{isDel},</if>
             <if test="dealStatus != null">deal_status = #{dealStatus},</if>
             <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="address != null">address = #{address},</if>
             <if test="createTime != null">create_time = #{createTime},</if>
             <if test="remarks != null">remarks = #{remarks},</if>
+            <if test="pictureUrl != null">picture_url = #{pictureUrl},</if>
+            <if test="reportMan != null">report_man = #{reportMan},</if>
         </trim>
         where trouble_id = #{troubleId}
     </update>

gassafety-web/src/api/system/user.js

@@ -10,6 +10,14 @@ export function listUser(query) {
   })
 }
 
+// 查询用户列表
+export function allListUser() {
+  return request({
+    url: '/system/user/allList',
+    method: 'get',
+  })
+}
+
 // 查询巡检员列表
 export function inspectorList(query) {
   return request({

gassafety-web/src/views/deviceInspection/inspectionPlan/index.vue

@@ -61,7 +61,7 @@
           <span v-if="scope.row.planStatus == 3">已完成</span>
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="280">
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="280px">
         <template slot-scope="scope">
           <el-button
             size="normal"
@@ -170,7 +170,7 @@
             <el-input v-model="form2.orderName" placeholder="请输入工单名称" />
           </el-form-item>
           <el-form-item label="指定执行人员" prop="appointInspector">
-            <el-select v-model="form2.appointInspector" placeholder="请选择执行人员" clearable size="small" @change="setUserId">
+            <el-select v-model="form2.appointInspector" placeholder="请选择执行人员" clearable size="small" >
               <el-option
                 v-for="item in inspector"
                 :key="item.userId"
@@ -230,7 +230,6 @@
           level: "level",
           children: "childList",
         },
-        devices: null,
         // 巡检员列表
         inspector: [],
         // 弹出层标题
@@ -259,10 +258,10 @@
         // 表单校验
         rules: {
           planName: [
-            { required: true, message: " 计划名称不能为空", trigger: "blur" }
+            { required: true, message: "请输入计划名称", trigger: "blur" }
           ],
           orderName: [
-            { required: true, message: "工单名称不能为空", trigger: "blur" }
+            { required: true, message: "请输入工单名称", trigger: "blur" }
           ],
           devices: [
             { required: true, message: "请选择巡检设备", trigger: "blur" }
@@ -287,8 +286,7 @@
     },
     methods: {
       handleChange(value) {
-        // this.devices = value;
-        console.log(this.form.devices);
+        console.log(this.form1.devices);
       },
       /** 查询巡检计划列表 */
       getList() {
@@ -315,9 +313,6 @@
           this.loading = false;
         });
       },
-      setUserId(val){
-        this.form.appointInspector = val;
-      },
       // 取消按钮
       cancel() {
         this.open1 = false;
@@ -337,7 +332,6 @@
           createTime: null,
           remarks: null
         };
-        this.devices = null;
         this.resetForm("form1");
         this.form2 = {
           planId: null,
@@ -376,7 +370,7 @@
         deviceNodeTree().then(response => {
           this.options = response.data;
           this.open1 = true;
-          this.title1 = "添加巡检计划";
+          this.title1 = "新增巡检计划";
         });
       },
       /** 下发按钮操作 */
@@ -386,8 +380,6 @@
         const planId = row.planId || this.ids
         getInspectionPlan(planId).then(response => {
           this.form2 = response.data;
-          this.plansName = this.form2.planName;
-          this.form2.remarks = "";
           this.open2 = true;
           this.title2 = "填写工单信息";
         });