Merge branch 'master' of http://111.61.77.35:9999/gengdidi/gassafety into master

gassafety-admin/src/main/java/com/zehong/web/controller/deviceInspection/TInspectionPlanController.java

 package com.zehong.web.controller.deviceInspection;
 
 import java.util.List;
+
+import com.zehong.system.domain.form.InspectionPlanForm;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -38,10 +40,10 @@ public class TInspectionPlanController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('deviceInspection:inspectionPlan:list')")
     @GetMapping("/list")
-    public TableDataInfo list(TInspectionPlan tInspectionPlan)
+    public TableDataInfo list(InspectionPlanForm inspectionPlanForm)
     {
         startPage();
-        List<TInspectionPlan> list = tInspectionPlanService.selectTInspectionPlanList(tInspectionPlan);
+        List<TInspectionPlan> list = tInspectionPlanService.selectTInspectionPlanList(inspectionPlanForm);
         return getDataTable(list);
     }
 
@@ -51,9 +53,9 @@ public class TInspectionPlanController extends BaseController
     @PreAuthorize("@ss.hasPermi('deviceInspection:inspectionPlan:export')")
     @Log(title = "巡检计划", businessType = BusinessType.EXPORT)
     @GetMapping("/export")
-    public AjaxResult export(TInspectionPlan tInspectionPlan)
+    public AjaxResult export(InspectionPlanForm inspectionPlanForm)
     {
-        List<TInspectionPlan> list = tInspectionPlanService.selectTInspectionPlanList(tInspectionPlan);
+        List<TInspectionPlan> list = tInspectionPlanService.selectTInspectionPlanList(inspectionPlanForm);
         ExcelUtil<TInspectionPlan> util = new ExcelUtil<TInspectionPlan>(TInspectionPlan.class);
         return util.exportExcel(list, "巡检计划数据");
     }

gassafety-admin/src/main/java/com/zehong/web/controller/inspectorLocation/TUserLocationController.java

+package com.zehong.web.controller.inspectorLocation;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import com.zehong.common.core.domain.entity.SysUser;
+import com.zehong.system.domain.vo.TUserLocationVo;
+import com.zehong.system.service.ISysUserService;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.zehong.common.annotation.Log;
+import com.zehong.common.core.controller.BaseController;
+import com.zehong.common.core.domain.AjaxResult;
+import com.zehong.common.enums.BusinessType;
+import com.zehong.system.domain.TUserLocation;
+import com.zehong.system.service.ITUserLocationService;
+import com.zehong.common.utils.poi.ExcelUtil;
+import com.zehong.common.core.page.TableDataInfo;
+
+/**
+ * 巡检员定位Controller
+ * 
+ * @author zehong
+ * @date 2021-07-31
+ */
+@RestController
+@RequestMapping("/system/location")
+public class TUserLocationController extends BaseController
+{
+    @Autowired
+    private ITUserLocationService tUserLocationService;
+
+    @Autowired
+    private ISysUserService userService;
+
+    /**
+     * 查询巡检员定位列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:location:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(TUserLocation tUserLocation)
+    {
+        startPage();
+        List<TUserLocation> list = tUserLocationService.selectTUserLocationList(tUserLocation);
+        return getDataTable(list);
+    }
+
+    /**
+     * 初始化巡检员位置及巡检员路线
+     * @param tUserLocationVo
+     * @return
+     */
+    @GetMapping("/getInspectorLocations")
+    public AjaxResult getInspectorLocations(TUserLocationVo tUserLocationVo){
+        if(null == tUserLocationVo.getUserId()){
+            List<SysUser> inspectors = userService.selectInspectorList();
+            List<TUserLocation> inspectorLocations = new ArrayList<>();
+            Map<String,Object> map = new HashMap<>(16);
+            for(SysUser sysUser : inspectors){
+                map.put("userId",sysUser.getUserId());
+                map.put("initInspectors","initInspectors");
+                inspectorLocations.addAll(tUserLocationService.selectTUserLocationListByMap(map));
+            }
+            return AjaxResult.success(inspectorLocations);
+        }
+
+        Map<String,Object> map = new HashMap<>(16);
+        map.put("userId",tUserLocationVo.getUserId());
+        map.put("beginTime",tUserLocationVo.getBeginTime());
+        map.put("endTime",tUserLocationVo.getEndTime());
+        return AjaxResult.success(tUserLocationService.selectTUserLocationListByMap(map));
+    }
+
+    /**
+     * 导出巡检员定位列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:location:export')")
+    @Log(title = "巡检员定位", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(TUserLocation tUserLocation)
+    {
+        List<TUserLocation> list = tUserLocationService.selectTUserLocationList(tUserLocation);
+        ExcelUtil<TUserLocation> util = new ExcelUtil<TUserLocation>(TUserLocation.class);
+        return util.exportExcel(list, "巡检员定位数据");
+    }
+
+    /**
+     * 获取巡检员定位详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:location:query')")
+    @GetMapping(value = "/{locationId}")
+    public AjaxResult getInfo(@PathVariable("locationId") Long locationId)
+    {
+        return AjaxResult.success(tUserLocationService.selectTUserLocationById(locationId));
+    }
+
+    /**
+     * 新增巡检员定位
+     */
+    @PreAuthorize("@ss.hasPermi('system:location:add')")
+    @Log(title = "巡检员定位", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody TUserLocation tUserLocation)
+    {
+        return toAjax(tUserLocationService.insertTUserLocation(tUserLocation));
+    }
+
+    /**
+     * 修改巡检员定位
+     */
+    @PreAuthorize("@ss.hasPermi('system:location:edit')")
+    @Log(title = "巡检员定位", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody TUserLocation tUserLocation)
+    {
+        return toAjax(tUserLocationService.updateTUserLocation(tUserLocation));
+    }
+
+    /**
+     * 删除巡检员定位
+     */
+    @PreAuthorize("@ss.hasPermi('system:location:remove')")
+    @Log(title = "巡检员定位", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{locationIds}")
+    public AjaxResult remove(@PathVariable Long[] locationIds)
+    {
+        return toAjax(tUserLocationService.deleteTUserLocationByIds(locationIds));
+    }
+}

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

@@ -18,14 +18,14 @@ public class TDeviceAlarm extends BaseEntity
     private static final long serialVersionUID = 1L;
 
     /** $column.columnComment */
-    private int alarmId;
+    private Integer alarmId;
 
     /** 设备id */
     @Excel(name = "设备id")
-    private String deviceCode;
+    private Integer deviceId;
 
-    /** 是否是管道信息（0是，1否） */
-    private String isPipe;
+    /** 设备类型（0管道，1调压阀，2阀门井，3流量计，4压力表） */
+    private String deviceType;
 
     /** 工单id */
     @Excel(name = "工单id")
@@ -57,31 +57,31 @@ public class TDeviceAlarm extends BaseEntity
     @Excel(name = "备注")
     private String remarks;
 
-    public void setAlarmId(int alarmId)
+    public void setAlarmId(Integer alarmId)
     {
         this.alarmId = alarmId;
     }
 
-    public int getAlarmId()
+    public Integer getAlarmId()
     {
         return alarmId;
     }
-    public void setDeviceCode(String deviceCode)
+    public void setDeviceId(Integer deviceId)
     {
-        this.deviceCode = deviceCode;
+        this.deviceId = deviceId;
     }
 
-    public String getDeviceCode()
+    public Integer getDeviceId()
     {
-        return deviceCode;
+        return deviceId;
     }
 
-    public String getIsPipe() {
-        return isPipe;
+    public String getDeviceType() {
+        return deviceType;
     }
 
-    public void setIsPipe(String isPipe) {
-        this.isPipe = isPipe;
+    public void setDeviceType(String deviceType) {
+        this.deviceType = deviceType;
     }
 
     public void setOrderId(String orderId)
@@ -152,8 +152,8 @@ public class TDeviceAlarm extends BaseEntity
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
             .append("alarmId", getAlarmId())
-            .append("deviceCode", getDeviceCode())
-            .append("isPipe", getIsPipe())
+            .append("deviceId", getDeviceId())
+            .append("isPipe", getDeviceType())
             .append("orderId", getOrderId())
             .append("alarmType", getAlarmType())
             .append("alarmValue", getAlarmValue())

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

@@ -19,11 +19,11 @@ public class TDeviceInfo extends BaseEntity
     private static final long serialVersionUID = 1L;
 
     /** 设备id */
-    private int deviceId;
+    private Integer deviceId;
 
     /** 企业id */
     @Excel(name = "企业id")
-    private int enterpriseId;
+    private Integer enterpriseId;
 
     /** 所属管道编号 */
     @Excel(name = "所属管道编号")
@@ -87,21 +87,21 @@ public class TDeviceInfo extends BaseEntity
     @Excel(name = "备注")
     private String remarks;
 
-    public void setDeviceId(int deviceId)
+    public void setDeviceId(Integer deviceId)
     {
         this.deviceId = deviceId;
     }
 
-    public int getDeviceId()
+    public Integer getDeviceId()
     {
         return deviceId;
     }
-    public void setEnterpriseId(int enterpriseId)
+    public void setEnterpriseId(Integer enterpriseId)
     {
         this.enterpriseId = enterpriseId;
     }
 
-    public int getEnterpriseId()
+    public Integer getEnterpriseId()
     {
         return enterpriseId;
     }

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

@@ -17,7 +17,7 @@ public class TEnterpriseInfo extends BaseEntity
     private static final long serialVersionUID = 1L;
 
     /** $column.columnComment */
-    private int infoId;
+    private Integer infoId;
 
     /** 单位名称 */
     @Excel(name = "企业名称")
@@ -75,12 +75,12 @@ public class TEnterpriseInfo extends BaseEntity
     @Excel(name = "备注")
     private String remarks;
 
-    public void setInfoId(int infoId)
+    public void setInfoId(Integer infoId)
     {
         this.infoId = infoId;
     }
 
-    public int getInfoId()
+    public Integer getInfoId()
     {
         return infoId;
     }

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

@@ -17,11 +17,11 @@ public class THiddenTrouble extends BaseEntity
     private static final long serialVersionUID = 1L;
 
     /** 隐患信息id */
-    private int troubleId;
+    private Integer troubleId;
 
-    /** 设备编号 */
-    @Excel(name = "设备编号")
-    private String deviceCode;
+    /** 设备id */
+    @Excel(name = "设备id")
+    private Integer deviceId;
 
     /** 设备类型（0管道，1调压阀，2阀门井，3流量计，4压力表） */
     private String deviceType;
@@ -47,30 +47,30 @@ public class THiddenTrouble extends BaseEntity
     private String coordinates;
 
     /** 处理状态（1不需处理，2已处理完成，3未处理完成） */
-    @Excel(name = "处理状态", readConverterExp = "1=不需处理，2已处理完成，3未处理完成")
+    @Excel(name = "处理状态", readConverterExp = "1不需处理，2已处理完成，3未处理完成")
     private String dealStatus;
 
     /** 备注 */
     @Excel(name = "备注")
     private String remarks;
 
-    public void setTroubleId(int troubleId)
+    public void setTroubleId(Integer troubleId)
     {
         this.troubleId = troubleId;
     }
 
-    public int getTroubleId()
+    public Integer getTroubleId()
     {
         return troubleId;
     }
-    public void setDeviceCode(String deviceCode)
+    public void setDeviceId(Integer deviceId)
     {
-        this.deviceCode = deviceCode;
+        this.deviceId = deviceId;
     }
 
-    public String getDeviceCode()
+    public Integer getDeviceId()
     {
-        return deviceCode;
+        return deviceId;
     }
 
     public String getDeviceType() {
@@ -149,7 +149,7 @@ public class THiddenTrouble extends BaseEntity
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
             .append("troubleId", getTroubleId())
-            .append("deviceCode", getDeviceCode())
+            .append("deviceId", getDeviceId())
             .append("deviceType", getDeviceType())
             .append("orderId", getOrderId())
             .append("address", getAddress())

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

@@ -16,22 +16,22 @@ public class TInspectionData extends BaseEntity
     private static final long serialVersionUID = 1L;
 
     /** 巡检记录id */
-    private int dataId;
+    private Integer dataId;
 
     /** 巡检计划id */
     @Excel(name = "巡检计划id")
-    private int planId;
+    private Integer planId;
 
-    /** 设备编号 */
-    @Excel(name = "设备编号")
-    private String deviceCode;
+    /** 设备id */
+    @Excel(name = "设备id")
+    private Integer deviceId;
 
-    /** 设备类型 */
-    @Excel(name = "设备类型")
+    /** 设备类型（0管道，1调压阀，2阀门井，3流量计，4压力表） */
+    @Excel(name = "设备类型（0管道，1调压阀，2阀门井，3流量计，4压力表）")
     private String deviceType;
 
     /** 处理状态（1不需处理，2已处理完成，3未处理完成） */
-    @Excel(name = "处理状态", readConverterExp = "1=不需处理，2已处理完成，3未处理完成")
+    @Excel(name = "处理状态", readConverterExp = "1不需处理，2已处理完成，3未处理完成")
     private String dealStatus;
 
     /** 是否存在隐患 */
@@ -42,34 +42,34 @@ public class TInspectionData extends BaseEntity
     @Excel(name = "备注")
     private String remarks;
 
-    public void setDataId(int dataId)
+    public void setDataId(Integer dataId)
     {
         this.dataId = dataId;
     }
 
-    public int getDataId()
+    public Integer getDataId()
     {
         return dataId;
     }
 
-    public void setPlanId(int planId)
+    public void setPlanId(Integer planId)
     {
         this.planId = planId;
     }
 
-    public int getPlanId()
+    public Integer getPlanId()
     {
         return planId;
     }
 
-    public void setDeviceCode(String deviceCode)
+    public void setDeviceId(Integer deviceId)
     {
-        this.deviceCode = deviceCode;
+        this.deviceId = deviceId;
     }
 
-    public String getDeviceCode()
+    public Integer getDeviceId()
     {
-        return deviceCode;
+        return deviceId;
     }
 
     public String getDeviceType() {
@@ -113,7 +113,7 @@ public class TInspectionData extends BaseEntity
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
             .append("dataId", getDataId())
             .append("planId", getPlanId())
-            .append("deviceCode", getDeviceCode())
+            .append("deviceId", getDeviceId())
             .append("deviceType", getDeviceType())
             .append("dealStatus", getDealStatus())
             .append("isHiddenDanger", getIsHiddenDanger())

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

@@ -18,7 +18,7 @@ public class TInspectionPlan extends BaseEntity
     private static final long serialVersionUID = 1L;
 
     /** 巡检计划id */
-    private int planId;
+    private Integer planId;
 
     /** 巡检计划名称 */
     @Excel(name = "巡检计划名称")
@@ -28,10 +28,6 @@ public class TInspectionPlan extends BaseEntity
     @Excel(name = "工单id")
     private String orderId;
 
-    /** 设备编号（多个编号用逗号分隔） */
-    @Excel(name = "设备号")
-    private String deviceCodes;
-
     /** 开始时间 */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @Excel(name = "开始时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
@@ -42,23 +38,32 @@ public class TInspectionPlan extends BaseEntity
     @Excel(name = "结束时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date endTime;
 
+    /** 地址 */
+    @Excel(name = "地址")
+    private String address;
+
     /** 计划状态（0未下发，1已下发，2进行中，3已完成） */
     @Excel(name = "计划状态（0未下发，1已下发，2进行中，3已完成）")
     private String planStatus;
 
+    /** 是否作废（0正常，1作废） */
+    @Excel(name = "是否作废（0正常，1作废）")
+    private String isDel;
+
     /** 计划描述 */
     @Excel(name = "计划描述")
     private String remarks;
 
-    public void setPlanId(int planId)
+    public void setPlanId(Integer planId)
     {
         this.planId = planId;
     }
 
-    public int getPlanId()
+    public Integer getPlanId()
     {
         return planId;
     }
+
     public void setPlanName(String planName) 
     {
         this.planName = planName;
@@ -69,14 +74,6 @@ public class TInspectionPlan extends BaseEntity
         return planName;
     }
 
-    public String getDeviceCodes() {
-        return deviceCodes;
-    }
-
-    public void setDeviceCodes(String deviceCodes) {
-        this.deviceCodes = deviceCodes;
-    }
-
     public void setOrderId(String orderId)
     {
         this.orderId = orderId;
@@ -86,6 +83,7 @@ public class TInspectionPlan extends BaseEntity
     {
         return orderId;
     }
+
     public void setStartTime(Date startTime) 
     {
         this.startTime = startTime;
@@ -95,6 +93,7 @@ public class TInspectionPlan extends BaseEntity
     {
         return startTime;
     }
+
     public void setEndTime(Date endTime) 
     {
         this.endTime = endTime;
@@ -104,7 +103,16 @@ public class TInspectionPlan extends BaseEntity
     {
         return endTime;
     }
-    public void setPlanStatus(String planStatus) 
+
+    public String getAddress() {
+        return address;
+    }
+
+    public void setAddress(String address) {
+        this.address = address;
+    }
+
+    public void setPlanStatus(String planStatus)
     {
         this.planStatus = planStatus;
     }
@@ -113,7 +121,16 @@ public class TInspectionPlan extends BaseEntity
     {
         return planStatus;
     }
-    public void setRemarks(String remarks) 
+
+    public String getIsDel() {
+        return isDel;
+    }
+
+    public void setIsDel(String isDel) {
+        this.isDel = isDel;
+    }
+
+    public void setRemarks(String remarks)
     {
         this.remarks = remarks;
     }
@@ -128,7 +145,6 @@ public class TInspectionPlan extends BaseEntity
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
             .append("planId", getPlanId())
             .append("planName", getPlanName())
-            .append("deviceCodes", getDeviceCodes())
             .append("orderId", getOrderId())
             .append("startTime", getStartTime())
             .append("endTime", getEndTime())

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

@@ -18,15 +18,15 @@ public class TOrderFeedback extends BaseEntity
     private static final long serialVersionUID = 1L;
 
     /** 工单反馈id */
-    private int feedbackId;
+    private Integer feedbackId;
 
     /** 工单id */
     @Excel(name = "工单id")
     private String orderId;
 
-    /** 设备编号 */
-    @Excel(name = "设备编号")
-    private String deviceCode;
+    /** 设备id */
+    @Excel(name = "设备id")
+    private Integer deviceId;
 
     /** 反馈内容 */
     @Excel(name = "反馈内容")
@@ -57,12 +57,12 @@ public class TOrderFeedback extends BaseEntity
     @Excel(name = "图片地址3")
     private String pictureUrl3;
 
-    public void setFeedbackId(int feedbackId)
+    public void setFeedbackId(Integer feedbackId)
     {
         this.feedbackId = feedbackId;
     }
 
-    public int getFeedbackId()
+    public Integer getFeedbackId()
     {
         return feedbackId;
     }
@@ -75,14 +75,14 @@ public class TOrderFeedback extends BaseEntity
     {
         return orderId;
     }
-    public void setDeviceCode(String deviceCode)
+    public void setDeviceId(Integer deviceId)
     {
-        this.deviceCode = deviceCode;
+        this.deviceId = deviceId;
     }
 
-    public String getDeviceCode()
+    public Integer getDeviceId()
     {
-        return deviceCode;
+        return deviceId;
     }
     public void setContents(String contents) 
     {
@@ -153,7 +153,7 @@ public class TOrderFeedback extends BaseEntity
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
             .append("feedbackId", getFeedbackId())
             .append("orderId", getOrderId())
-            .append("deviceId", getDeviceCode())
+            .append("deviceId", getDeviceId())
             .append("contents", getContents())
             .append("feedbackTime", getFeedbackTime())
             .append("isHiddenDanger", getIsHiddenDanger())

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

@@ -18,11 +18,11 @@ public class TPipe extends BaseEntity
     private static final long serialVersionUID = 1L;
 
     /** 管道id */
-    private int pipeId;
+    private Integer pipeId;
 
     /** 企业id */
     @Excel(name = "企业id")
-    private int enterpriseId;
+    private Integer enterpriseId;
 
     /** 管道名称 */
     @Excel(name = "管道名称")
@@ -70,21 +70,21 @@ public class TPipe extends BaseEntity
     @Excel(name = "备注")
     private String remarks;
 
-    public void setPipeId(int pipeId)
+    public void setPipeId(Integer pipeId)
     {
         this.pipeId = pipeId;
     }
 
-    public int getPipeId()
+    public Integer getPipeId()
     {
         return pipeId;
     }
-    public void setEnterpriseId(int enterpriseId)
+    public void setEnterpriseId(Integer enterpriseId)
     {
         this.enterpriseId = enterpriseId;
     }
 
-    public int getEnterpriseId()
+    public Integer getEnterpriseId()
     {
         return enterpriseId;
     }

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

+package com.zehong.system.domain;
+
+import java.math.BigDecimal;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.zehong.common.annotation.Excel;
+import com.zehong.common.core.domain.BaseEntity;
+
+/**
+ * 巡检员定位对象 t_user_location
+ * 
+ * @author zehong
+ * @date 2021-07-31
+ */
+public class TUserLocation extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 巡检定位表id */
+    private Long locationId;
+
+    /** 人员id */
+    @Excel(name = "人员id")
+    private Long userId;
+
+    /** 经度 */
+    @Excel(name = "经度")
+    private BigDecimal longitude;
+
+    /** 纬度 */
+    @Excel(name = "纬度")
+    private BigDecimal latitude;
+
+    public void setLocationId(Long locationId) 
+    {
+        this.locationId = locationId;
+    }
+
+    public Long getLocationId() 
+    {
+        return locationId;
+    }
+    public void setUserId(Long userId) 
+    {
+        this.userId = userId;
+    }
+
+    public Long getUserId() 
+    {
+        return userId;
+    }
+    public void setLongitude(BigDecimal longitude) 
+    {
+        this.longitude = longitude;
+    }
+
+    public BigDecimal getLongitude() 
+    {
+        return longitude;
+    }
+    public void setLatitude(BigDecimal latitude) 
+    {
+        this.latitude = latitude;
+    }
+
+    public BigDecimal getLatitude() 
+    {
+        return latitude;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("locationId", getLocationId())
+            .append("userId", getUserId())
+            .append("longitude", getLongitude())
+            .append("latitude", getLatitude())
+            .append("createTime", getCreateTime())
+            .toString();
+    }
+}

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

@@ -26,7 +26,7 @@ public class TWorkOrder extends BaseEntity
 
     /** 源id */
     @Excel(name = "源id")
-    private int resourceId;
+    private Integer resourceId;
 
     /** 工单名称 */
     @Excel(name = "工单名称")
@@ -77,11 +77,11 @@ public class TWorkOrder extends BaseEntity
         return orderType;
     }
 
-    public int getResourceId() {
+    public Integer getResourceId() {
         return resourceId;
     }
 
-    public void setResourceId(int resourceId) {
+    public void setResourceId(Integer resourceId) {
         this.resourceId = resourceId;
     }
 

gassafety-system/src/main/java/com/zehong/system/domain/form/InspectionPlanForm.java

+package com.zehong.system.domain.form;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.zehong.common.core.domain.BaseEntity;
+
+import java.util.Date;
+
+/**
+ * 巡检计划对象 t_inspection_plan
+ * 
+ * @author zehong
+ * @date 2021-07-21
+ */
+public class InspectionPlanForm extends BaseEntity
+{
+    /** 巡检计划名称 */
+    private String planName;
+
+    /** 工单id */
+    private String orderId;
+
+    /** 起始开始时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date startTime1;
+
+    /** 起始结束时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date endTime1;
+
+    /** 截止开始时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date startTime2;
+
+    /** 截止结束时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date endTime2;
+
+    /** 计划状态（0未下发，1已下发，2进行中，3已完成） */
+    private String planStatus;
+
+    /** 计划描述 */
+    private String remarks;
+
+    public void setPlanName(String planName) 
+    {
+        this.planName = planName;
+    }
+
+    public String getPlanName() 
+    {
+        return planName;
+    }
+
+    public void setOrderId(String orderId)
+    {
+        this.orderId = orderId;
+    }
+
+    public String getOrderId() 
+    {
+        return orderId;
+    }
+
+    public void setStartTime1(Date startTime1)
+    {
+        this.startTime1 = startTime1;
+    }
+
+    public Date getStartTime1()
+    {
+        return startTime1;
+    }
+
+    public void setEndTime1(Date endTime1)
+    {
+        this.endTime1 = endTime1;
+    }
+
+    public Date getEndTime1()
+    {
+        return endTime1;
+    }
+
+    public void setPlanStatus(String planStatus) 
+    {
+        this.planStatus = planStatus;
+    }
+
+    public String getPlanStatus() 
+    {
+        return planStatus;
+    }
+
+    public void setRemarks(String remarks) 
+    {
+        this.remarks = remarks;
+    }
+
+    public String getRemarks() 
+    {
+        return remarks;
+    }
+
+}

gassafety-system/src/main/java/com/zehong/system/domain/vo/OrderFeedbackVo.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;
@@ -19,13 +18,13 @@ public class OrderFeedbackVo extends BaseEntity
     private static final long serialVersionUID = 1L;
 
     /** 工单反馈id */
-    private int feedbackId;
+    private Integer feedbackId;
 
     /** 工单id */
     private String orderId;
 
-    /** 设备编号 */
-    private String deviceCode;
+    /** 设备id */
+    private Integer deviceId;
 
     /** 设备名称 */
     private String deviceName;
@@ -55,12 +54,12 @@ public class OrderFeedbackVo extends BaseEntity
     /** 图片地址3 */
     private String pictureUrl3;
 
-    public void setFeedbackId(int feedbackId)
+    public void setFeedbackId(Integer feedbackId)
     {
         this.feedbackId = feedbackId;
     }
 
-    public int getFeedbackId()
+    public Integer getFeedbackId()
     {
         return feedbackId;
     }
@@ -75,14 +74,14 @@ public class OrderFeedbackVo extends BaseEntity
         return orderId;
     }
 
-    public void setDeviceCode(String deviceCode)
+    public void setDeviceId(Integer deviceId)
     {
-        this.deviceCode = deviceCode;
+        this.deviceId = deviceId;
     }
 
-    public String getDeviceCode()
+    public Integer getDeviceId()
     {
-        return deviceCode;
+        return deviceId;
     }
 
     public String getDeviceName() {
@@ -176,7 +175,7 @@ public class OrderFeedbackVo extends BaseEntity
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
             .append("feedbackId", getFeedbackId())
             .append("orderId", getOrderId())
-            .append("deviceId", getDeviceCode())
+            .append("deviceId", getDeviceId())
             .append("contents", getContents())
             .append("feedbackTime", getFeedbackTime())
             .append("isHiddenDanger", getIsHiddenDanger())

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

+package com.zehong.system.domain.vo;
+
+import java.util.Date;
+
+public class TUserLocationVo {
+
+    /**
+     *巡检人员id
+     */
+    private Long userId;
+
+    /**
+     * 巡检开始时间
+     */
+    private Date beginTime;
+
+    /**
+     * 巡检结束时间
+     */
+    private Date endTime;
+
+    public Long getUserId() {
+        return userId;
+    }
+
+    public void setUserId(Long userId) {
+        this.userId = userId;
+    }
+
+    public Date getBeginTime() {
+        return beginTime;
+    }
+
+    public void setBeginTime(Date beginTime) {
+        this.beginTime = beginTime;
+    }
+
+    public Date getEndTime() {
+        return endTime;
+    }
+
+    public void setEndTime(Date endTime) {
+        this.endTime = endTime;
+    }
+}

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

@@ -33,8 +33,8 @@ public class WorkOrderVo extends BaseEntity
     /** 工单名称 */
     private String orderName;
 
-    /** 设备编号 */
-    private String deviceCodes;
+    /** 设备id */
+    private Integer deviceId;
 
     /** 设备名称 */
     private String deviceName;
@@ -132,12 +132,12 @@ public class WorkOrderVo extends BaseEntity
         return orderName;
     }
 
-    public String getDeviceCodes() {
-        return deviceCodes;
+    public Integer getDeviceId() {
+        return deviceId;
     }
 
-    public void setDeviceCodes(String deviceCodes) {
-        this.deviceCodes = deviceCodes;
+    public void setDeviceId(Integer deviceId) {
+        this.deviceId = deviceId;
     }
 
     public String getDeviceName() {
@@ -311,7 +311,6 @@ public class WorkOrderVo extends BaseEntity
             .append("orderType", getOrderType())
             .append("resourceId", getResourceId())
             .append("orderName", getOrderName())
-            .append("deviceCodes", getDeviceCodes())
             .append("deviceNum", getDeviceNum())
             .append("finishNum", getFinishNum())
             .append("deviceType", getDeviceType())

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

@@ -22,10 +22,10 @@ public interface TInspectionDataMapper
     /**
      * 查询巡检记录
      *
-     * @param deviceCode 设备编号
+     * @param deviceId 设备id
      * @return 巡检记录
      */
-    public TInspectionData selectTInspectionDataByCode(String deviceCode);
+    public TInspectionData selectTInspectionDataByDeviceId(int deviceId);
 
     /**
      * 查询巡检记录

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

@@ -2,6 +2,7 @@ package com.zehong.system.mapper;
 
 import java.util.List;
 import com.zehong.system.domain.TInspectionPlan;
+import com.zehong.system.domain.form.InspectionPlanForm;
 
 /**
  * 巡检计划Mapper接口
@@ -22,10 +23,10 @@ public interface TInspectionPlanMapper
     /**
      * 查询巡检计划列表
      * 
-     * @param tInspectionPlan 巡检计划
+     * @param inspectionPlanForm 巡检计划
      * @return 巡检计划集合
      */
-    public List<TInspectionPlan> selectTInspectionPlanList(TInspectionPlan tInspectionPlan);
+    public List<TInspectionPlan> selectTInspectionPlanList(InspectionPlanForm inspectionPlanForm);
 
     /**
      * 新增巡检计划

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

+package com.zehong.system.mapper;
+
+import com.zehong.system.domain.TUserLocation;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 巡检员定位Mapper接口
+ * 
+ * @author zehong
+ * @date 2021-07-31
+ */
+public interface TUserLocationMapper 
+{
+    /**
+     * 查询巡检员定位
+     * 
+     * @param locationId 巡检员定位ID
+     * @return 巡检员定位
+     */
+    public TUserLocation selectTUserLocationById(Long locationId);
+
+    /**
+     * 查询巡检员定位列表
+     * 
+     * @param tUserLocation 巡检员定位
+     * @return 巡检员定位集合
+     */
+    public List<TUserLocation> selectTUserLocationList(TUserLocation tUserLocation);
+
+    /**
+     * 查询巡检员定位byMap
+     * @param map
+     * @return
+     */
+    List<TUserLocation> selectTUserLocationListByMap(Map<String,Object> map);
+
+    /**
+     * 新增巡检员定位
+     * 
+     * @param tUserLocation 巡检员定位
+     * @return 结果
+     */
+    public int insertTUserLocation(TUserLocation tUserLocation);
+
+    /**
+     * 修改巡检员定位
+     * 
+     * @param tUserLocation 巡检员定位
+     * @return 结果
+     */
+    public int updateTUserLocation(TUserLocation tUserLocation);
+
+    /**
+     * 删除巡检员定位
+     * 
+     * @param locationId 巡检员定位ID
+     * @return 结果
+     */
+    public int deleteTUserLocationById(Long locationId);
+
+    /**
+     * 批量删除巡检员定位
+     * 
+     * @param locationIds 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteTUserLocationByIds(Long[] locationIds);
+}

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

@@ -2,6 +2,7 @@ package com.zehong.system.service;
 
 import java.util.List;
 import com.zehong.system.domain.TInspectionPlan;
+import com.zehong.system.domain.form.InspectionPlanForm;
 
 /**
  * 巡检计划Service接口
@@ -22,10 +23,10 @@ public interface ITInspectionPlanService
     /**
      * 查询巡检计划列表
      * 
-     * @param tInspectionPlan 巡检计划
+     * @param inspectionPlanForm 巡检计划
      * @return 巡检计划集合
      */
-    public List<TInspectionPlan> selectTInspectionPlanList(TInspectionPlan tInspectionPlan);
+    public List<TInspectionPlan> selectTInspectionPlanList(InspectionPlanForm inspectionPlanForm);
 
     /**
      * 新增巡检计划

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

+package com.zehong.system.service;
+
+import java.util.List;
+import java.util.Map;
+
+import com.zehong.system.domain.TUserLocation;
+
+/**
+ * 巡检员定位Service接口
+ * 
+ * @author zehong
+ * @date 2021-07-31
+ */
+public interface ITUserLocationService 
+{
+    /**
+     * 查询巡检员定位
+     * 
+     * @param locationId 巡检员定位ID
+     * @return 巡检员定位
+     */
+    public TUserLocation selectTUserLocationById(Long locationId);
+
+    /**
+     * 查询巡检员定位列表
+     * 
+     * @param tUserLocation 巡检员定位
+     * @return 巡检员定位集合
+     */
+    public List<TUserLocation> selectTUserLocationList(TUserLocation tUserLocation);
+
+    /**
+     * 查询巡检员定位列表ByMap
+     * @param map
+     * @return
+     */
+    List<TUserLocation> selectTUserLocationListByMap(Map<String,Object> map);
+
+    /**
+     * 新增巡检员定位
+     * 
+     * @param tUserLocation 巡检员定位
+     * @return 结果
+     */
+    public int insertTUserLocation(TUserLocation tUserLocation);
+
+    /**
+     * 修改巡检员定位
+     * 
+     * @param tUserLocation 巡检员定位
+     * @return 结果
+     */
+    public int updateTUserLocation(TUserLocation tUserLocation);
+
+    /**
+     * 批量删除巡检员定位
+     * 
+     * @param locationIds 需要删除的巡检员定位ID
+     * @return 结果
+     */
+    public int deleteTUserLocationByIds(Long[] locationIds);
+
+    /**
+     * 删除巡检员定位信息
+     * 
+     * @param locationId 巡检员定位ID
+     * @return 结果
+     */
+    public int deleteTUserLocationById(Long locationId);
+}

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

@@ -2,6 +2,7 @@ package com.zehong.system.service.impl;
 
 import java.util.List;
 import com.zehong.common.utils.DateUtils;
+import com.zehong.system.domain.form.InspectionPlanForm;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.zehong.system.mapper.TInspectionPlanMapper;
@@ -35,13 +36,13 @@ public class TInspectionPlanServiceImpl implements ITInspectionPlanService
     /**
      * 查询巡检计划列表
      * 
-     * @param tInspectionPlan 巡检计划
+     * @param inspectionPlanForm 巡检计划
      * @return 巡检计划
      */
     @Override
-    public List<TInspectionPlan> selectTInspectionPlanList(TInspectionPlan tInspectionPlan)
+    public List<TInspectionPlan> selectTInspectionPlanList(InspectionPlanForm inspectionPlanForm)
     {
-        return tInspectionPlanMapper.selectTInspectionPlanList(tInspectionPlan);
+        return tInspectionPlanMapper.selectTInspectionPlanList(inspectionPlanForm);
     }
 
     /**

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

@@ -25,6 +25,8 @@ public class TOrderFeedbackServiceImpl implements ITOrderFeedbackService
     @Autowired
     private TInspectionDataMapper tInspectionDataMapper;
     @Autowired
+    private TInspectionPlanMapper tInspectionPlanMapper;
+    @Autowired
     private THiddenTroubleMapper tHiddenTroubleMapper;
     @Autowired
     private TDeviceAlarmMapper tDeviceAlarmMapper;
@@ -71,7 +73,7 @@ public class TOrderFeedbackServiceImpl implements ITOrderFeedbackService
         }
         tOrderFeedback.setFeedbackTime(DateUtils.getNowDate());
 
-        String deviceCode = tOrderFeedback.getDeviceCode();
+        Integer deviceId = tOrderFeedback.getDeviceId();
         String dealStatus = tOrderFeedback.getDealStatus();
         String isHiddenDanger = tOrderFeedback.getIsHiddenDanger();
 
@@ -80,18 +82,18 @@ public class TOrderFeedbackServiceImpl implements ITOrderFeedbackService
         String orderType = order.getOrderType();
 
         if("1".equals(orderType)){
-            TInspectionData data = tInspectionDataMapper.selectTInspectionDataByCode(deviceCode);
+            TInspectionData data = tInspectionDataMapper.selectTInspectionDataByDeviceId(deviceId);
             data.setDealStatus(dealStatus);
             data.setIsHiddenDanger(isHiddenDanger);
             data.setUpdateTime(DateUtils.getNowDate());
             tInspectionDataMapper.updateTInspectionData(data);
 
             if("0".equals(data.getDeviceType())){
-                TPipe pipe = tPipeMapper.selectTPipeByCode(deviceCode);
+                TPipe pipe = tPipeMapper.selectTPipeById(deviceId);
                 pipe.setInspectionTime(DateUtils.getNowDate());
                 tPipeMapper.updateTPipe(pipe);
             } else {
-                TDeviceInfo device = tDeviceInfoMapper.selectTDeviceInfoByCode(deviceCode);
+                TDeviceInfo device = tDeviceInfoMapper.selectTDeviceInfoById(deviceId);
                 device.setInspectionTime(DateUtils.getNowDate());
                 tDeviceInfoMapper.updateTDeviceInfo(device);
             }

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

+package com.zehong.system.service.impl;
+
+import java.util.List;
+import java.util.Map;
+
+import com.zehong.common.utils.DateUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.zehong.system.mapper.TUserLocationMapper;
+import com.zehong.system.domain.TUserLocation;
+import com.zehong.system.service.ITUserLocationService;
+
+/**
+ * 巡检员定位Service业务层处理
+ * 
+ * @author zehong
+ * @date 2021-07-31
+ */
+@Service
+public class TUserLocationServiceImpl implements ITUserLocationService 
+{
+    @Autowired
+    private TUserLocationMapper tUserLocationMapper;
+
+    /**
+     * 查询巡检员定位
+     * 
+     * @param locationId 巡检员定位ID
+     * @return 巡检员定位
+     */
+    @Override
+    public TUserLocation selectTUserLocationById(Long locationId)
+    {
+        return tUserLocationMapper.selectTUserLocationById(locationId);
+    }
+
+    /**
+     * 查询巡检员定位列表
+     * 
+     * @param tUserLocation 巡检员定位
+     * @return 巡检员定位
+     */
+    @Override
+    public List<TUserLocation> selectTUserLocationList(TUserLocation tUserLocation)
+    {
+        return tUserLocationMapper.selectTUserLocationList(tUserLocation);
+    }
+
+    @Override
+    public List<TUserLocation> selectTUserLocationListByMap(Map<String,Object> map){
+        return tUserLocationMapper.selectTUserLocationListByMap(map);
+    }
+
+    /**
+     * 新增巡检员定位
+     * 
+     * @param tUserLocation 巡检员定位
+     * @return 结果
+     */
+    @Override
+    public int insertTUserLocation(TUserLocation tUserLocation)
+    {
+        tUserLocation.setCreateTime(DateUtils.getNowDate());
+        return tUserLocationMapper.insertTUserLocation(tUserLocation);
+    }
+
+    /**
+     * 修改巡检员定位
+     * 
+     * @param tUserLocation 巡检员定位
+     * @return 结果
+     */
+    @Override
+    public int updateTUserLocation(TUserLocation tUserLocation)
+    {
+        return tUserLocationMapper.updateTUserLocation(tUserLocation);
+    }
+
+    /**
+     * 批量删除巡检员定位
+     * 
+     * @param locationIds 需要删除的巡检员定位ID
+     * @return 结果
+     */
+    @Override
+    public int deleteTUserLocationByIds(Long[] locationIds)
+    {
+        return tUserLocationMapper.deleteTUserLocationByIds(locationIds);
+    }
+
+    /**
+     * 删除巡检员定位信息
+     * 
+     * @param locationId 巡检员定位ID
+     * @return 结果
+     */
+    @Override
+    public int deleteTUserLocationById(Long locationId)
+    {
+        return tUserLocationMapper.deleteTUserLocationById(locationId);
+    }
+}

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

@@ -76,9 +76,6 @@ public class TWorkOrderServiceImpl implements ITWorkOrderService
 
         if("1".equals(orderType)){
 
-            TInspectionPlan plan = tInspectionPlanMapper.selectTInspectionPlanById(resourceId);
-            workOrderVo.setDeviceCodes(plan.getDeviceCodes());
-
             TInspectionData data = new TInspectionData();
             data.setPlanId(resourceId);
 
@@ -87,7 +84,7 @@ public class TWorkOrderServiceImpl implements ITWorkOrderService
 
             TDeviceInfo deviceInfo = null;
             for(TInspectionData temp : totalList){
-                deviceInfo = tDeviceInfoMapper.selectTDeviceInfoByCode(temp.getDeviceCode());
+                deviceInfo = tDeviceInfoMapper.selectTDeviceInfoById(temp.getDeviceId());
                 if(deviceInfo != null){
                     deviceInfoList.add(deviceInfo);
                 }
@@ -99,15 +96,16 @@ public class TWorkOrderServiceImpl implements ITWorkOrderService
         } else if("2".equals(orderType)) {
 
             THiddenTrouble trouble = tHiddenTroubleMapper.selectTHiddenTroubleById(resourceId);
-            workOrderVo.setDeviceCodes((trouble.getDeviceCode() != null ? trouble.getDeviceCode() : null).toString());
+            Integer deviceId = trouble.getDeviceId();
+
+            workOrderVo.setDeviceId(deviceId);
             workOrderVo.setLongitude(trouble.getLongitude() != null ? trouble.getLongitude() : null);
             workOrderVo.setLatitude(trouble.getLatitude() != null ? trouble.getLatitude() : null);
             workOrderVo.setCoordinates(trouble.getCoordinates() != null ? trouble.getCoordinates() : null);
             workOrderVo.setDeviceType(trouble.getDeviceType());
             workOrderVo.setAddress(trouble.getAddress());
 
-            String deviceCode = trouble.getDeviceCode();
-            TDeviceInfo device = tDeviceInfoMapper.selectTDeviceInfoByCode(deviceCode);
+            TDeviceInfo device = tDeviceInfoMapper.selectTDeviceInfoById(deviceId);
             if(device != null){
                 workOrderVo.setDeviceName(device.getDeviceName());
                 deviceInfoList.add(device);
@@ -116,17 +114,17 @@ public class TWorkOrderServiceImpl implements ITWorkOrderService
         } else if("3".equals(orderType)) {
 
             TDeviceAlarm alarm = tDeviceAlarmMapper.selectTDeviceAlarmById(resourceId);
-            String deviceCode = alarm.getDeviceCode();
-            workOrderVo.setDeviceCodes(String.valueOf(deviceCode));
+            Integer deviceId = alarm.getDeviceId();
+            workOrderVo.setDeviceId(deviceId);
 
-            String isPipe = alarm.getIsPipe();
-            if("0".equals(isPipe)){
-                TPipe pipe = tPipeMapper.selectTPipeByCode(deviceCode);
+            String deviceType = alarm.getDeviceType();
+            if("0".equals(deviceType)){
+                TPipe pipe = tPipeMapper.selectTPipeById(deviceId);
                 workOrderVo.setCoordinates(pipe.getCoordinates());
                 workOrderVo.setDeviceType("0");
                 workOrderVo.setAddress(pipe.getPipeAddr());
             } else {
-                TDeviceInfo device = tDeviceInfoMapper.selectTDeviceInfoByCode(deviceCode);
+                TDeviceInfo device = tDeviceInfoMapper.selectTDeviceInfoById(deviceId);
                 if(device != null){
                     workOrderVo.setLongitude(device.getLongitude());
                     workOrderVo.setLatitude(device.getLatitude());
@@ -151,7 +149,7 @@ public class TWorkOrderServiceImpl implements ITWorkOrderService
                     BeanUtils.copyProperties(feedback, feedbackVo);
                 }
 
-                device = tDeviceInfoMapper.selectTDeviceInfoByCode(feedback.getDeviceCode());
+                device = tDeviceInfoMapper.selectTDeviceInfoById(feedback.getDeviceId());
                 if (device != null) {
                     feedbackVo.setDeviceName(device.getDeviceName());
                     feedbackVo.setDeviceType(device.getDeviceType());

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

@@ -6,8 +6,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     
     <resultMap type="TDeviceAlarm" id="TDeviceAlarmResult">
         <result property="alarmId"    column="alarm_id"    />
-        <result property="deviceCode"    column="device_code"    />
-        <result property="isPipe"    column="is_pipe"    />
+        <result property="deviceId"    column="device_id"    />
+        <result property="deviceType"    column="device_type"    />
         <result property="orderId"    column="order_id"    />
         <result property="alarmType"    column="alarm_type"    />
         <result property="alarmValue"    column="alarm_value"    />
@@ -20,14 +20,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectTDeviceAlarmVo">
-        select alarm_id, device_code, is_pipe, order_id, alarm_type, alarm_value, start_time, end_time, deal_status, update_time, create_time, remarks from t_device_alarm
+        select alarm_id, device_id, device_type, order_id, alarm_type, alarm_value, start_time, end_time, deal_status, update_time, create_time, remarks from t_device_alarm
     </sql>
 
     <select id="selectTDeviceAlarmList" parameterType="TDeviceAlarm" resultMap="TDeviceAlarmResult">
         <include refid="selectTDeviceAlarmVo"/>
         <where>  
-            <if test="deviceCode != null "> and device_code = #{deviceCode}</if>
-            <if test="isPipe != null "> and is_pipe = #{isPipe}</if>
+            <if test="deviceId != null "> and device_id = #{deviceId}</if>
+            <if test="deviceType != null "> and device_type = #{deviceType}</if>
             <if test="orderId != null  and orderId != ''"> and order_id = #{orderId}</if>
             <if test="alarmType != null  and alarmType != ''"> and alarm_type = #{alarmType}</if>
             <if test="alarmValue != null  and alarmValue != ''"> and alarm_value = #{alarmValue}</if>
@@ -46,8 +46,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <insert id="insertTDeviceAlarm" parameterType="TDeviceAlarm" useGeneratedKeys="true" keyProperty="alarmId">
         insert into t_device_alarm
         <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="deviceCode != null">device_code,</if>
-            <if test="isPipe != null">is_pipe,</if>
+            <if test="deviceId != null">device_id,</if>
+            <if test="deviceType != null">device_type,</if>
             <if test="orderId != null">order_id,</if>
             <if test="alarmType != null">alarm_type,</if>
             <if test="alarmValue != null">alarm_value,</if>
@@ -59,8 +59,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="remarks != null">remarks,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="deviceCode != null">#{deviceCode},</if>
-            <if test="isPipe != null">#{isPipe},</if>
+            <if test="deviceId != null">#{deviceId},</if>
+            <if test="deviceType != null">#{deviceType},</if>
             <if test="orderId != null">#{orderId},</if>
             <if test="alarmType != null">#{alarmType},</if>
             <if test="alarmValue != null">#{alarmValue},</if>
@@ -76,8 +76,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <update id="updateTDeviceAlarm" parameterType="TDeviceAlarm">
         update t_device_alarm
         <trim prefix="SET" suffixOverrides=",">
-            <if test="deviceCode != null">device_code = #{deviceCode},</if>
-            <if test="isPipe != null">is_pipe = #{isPipe},</if>
+            <if test="deviceId != null">device_id = #{deviceId},</if>
+            <if test="deviceType != null">device_type = #{deviceType},</if>
             <if test="orderId != null">order_id = #{orderId},</if>
             <if test="alarmType != null">alarm_type = #{alarmType},</if>
             <if test="alarmValue != null">alarm_value = #{alarmValue},</if>

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

@@ -6,7 +6,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     
     <resultMap type="THiddenTrouble" id="THiddenTroubleResult">
         <result property="troubleId"    column="trouble_id"    />
-        <result property="deviceCode"    column="device_code"    />
+        <result property="deviceId"    column="device_id"    />
         <result property="deviceType"    column="device_type"    />
         <result property="orderId"    column="order_id"    />
         <result property="address"    column="address"    />
@@ -20,13 +20,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectTHiddenTroubleVo">
-        select trouble_id, device_code, device_type, order_id, address, longitude, latitude, coordinates, deal_status, update_time, create_time, remarks from t_hidden_trouble
+        select trouble_id, device_id, device_type, order_id, address, longitude, latitude, coordinates, deal_status, update_time, create_time, remarks from t_hidden_trouble
     </sql>
 
     <select id="selectTHiddenTroubleList" parameterType="THiddenTrouble" resultMap="THiddenTroubleResult">
         <include refid="selectTHiddenTroubleVo"/>
         <where>  
-            <if test="deviceCode != null "> and device_code = #{deviceCode}</if>
+            <if test="deviceId != null "> and device_id = #{deviceId}</if>
             <if test="deviceType != null "> and device_type = #{deviceType}</if>
             <if test="orderId != null  and orderId != ''"> and order_id = #{orderId}</if>
             <if test="longitude != null "> and longitude = #{longitude}</if>
@@ -45,7 +45,7 @@ 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="deviceCode != null">device_code,</if>
+            <if test="deviceId != null">device_id,</if>
             <if test="deviceType != null">device_type,</if>
             <if test="orderId != null">order_id,</if>
             <if test="address != null">address,</if>
@@ -58,7 +58,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="remarks != null">remarks,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="deviceCode != null">#{deviceCode},</if>
+            <if test="deviceId != null">#{deviceId},</if>
             <if test="deviceType != null">#{deviceType},</if>
             <if test="orderId != null">#{orderId},</if>
             <if test="address != null">#{address},</if>
@@ -75,8 +75,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <update id="updateTHiddenTrouble" parameterType="THiddenTrouble">
         update t_hidden_trouble
         <trim prefix="SET" suffixOverrides=",">
-            <if test="deviceCode != null">device_code = #{deviceCode},</if>
-            <if test="deviceType != null">device_code = #{deviceType},</if>
+            <if test="deviceId != null">device_id = #{deviceId},</if>
+            <if test="deviceType != null">device_id = #{deviceType},</if>
             <if test="orderId != null">order_id = #{orderId},</if>
             <if test="address != null">address = #{address},</if>
             <if test="longitude != null">longitude = #{longitude},</if>

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

@@ -7,7 +7,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <resultMap type="TInspectionData" id="TInspectionDataResult">
         <result property="dataId"    column="data_id"    />
         <result property="planId"    column="plan_id"    />
-        <result property="deviceCode"    column="device_code"    />
+        <result property="deviceId"    column="device_id"    />
         <result property="deviceType"    column="device_type"    />
         <result property="isHiddenDanger"    column="is_hidden_danger"    />
         <result property="dealStatus"    column="deal_status"    />
@@ -17,14 +17,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectTInspectionDataVo">
-        select data_id, plan_id, device_code, device_type, is_hidden_danger, deal_status, update_time, create_time, remarks from t_inspection_data
+        select data_id, plan_id, device_id, device_type, is_hidden_danger, deal_status, update_time, create_time, remarks from t_inspection_data
     </sql>
 
     <select id="selectTInspectionDataList" parameterType="TInspectionData" resultMap="TInspectionDataResult">
         <include refid="selectTInspectionDataVo"/>
         <where>  
             <if test="planId != null "> and plan_id = #{planId}</if>
-            <if test="deviceCode != null "> and device_code = #{deviceCode}</if>
+            <if test="deviceId != null "> and device_id = #{deviceId}</if>
             <if test="deviceType != null "> and device_type = #{deviceType}</if>
             <if test="dealStatus != null  and dealStatus != ''"> and deal_status = #{dealStatus}</if>
             <if test="isHiddenDanger != null  and isHiddenDanger != ''"> and is_hidden_danger = #{isHiddenDanger}</if>
@@ -43,9 +43,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where data_id = #{dataId}
     </select>
 
-    <select id="selectTInspectionDataByCode" parameterType="String" resultMap="TInspectionDataResult">
+    <select id="selectTInspectionDataByDeviceId" parameterType="int" resultMap="TInspectionDataResult">
         <include refid="selectTInspectionDataVo"/>
-        where device_code = #{deviceCode}
+        where device_id = #{deviceId}
     </select>
 
     <insert id="insertTInspectionData" parameterType="TInspectionData">
@@ -53,7 +53,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="dataId != null">data_id,</if>
             <if test="planId != null">plan_id,</if>
-            <if test="deviceCode != null">device_code,</if>
+            <if test="deviceId != null">device_id,</if>
             <if test="deviceType != null">device_type,</if>
             <if test="isHiddenDanger != null">is_hidden_danger,</if>
             <if test="dealStatus != null">deal_status,</if>
@@ -64,7 +64,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="dataId != null">#{dataId},</if>
             <if test="planId != null">#{planId},</if>
-            <if test="deviceCode != null">#{deviceCode},</if>
+            <if test="deviceId != null">#{deviceId},</if>
             <if test="deviceType != null">#{deviceType},</if>
             <if test="isHiddenDanger != null">#{isHiddenDanger},</if>
             <if test="dealStatus != null">#{dealStatus},</if>
@@ -78,7 +78,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         update t_inspection_data
         <trim prefix="SET" suffixOverrides=",">
             <if test="planId != null">plan_id = #{planId},</if>
-            <if test="deviceCode != null">device_code = #{deviceCode},</if>
+            <if test="deviceId != null">device_id = #{deviceId},</if>
             <if test="deviceType != null">device_type = #{deviceType},</if>
             <if test="isHiddenDanger != null">is_hidden_danger = #{isHiddenDanger},</if>
             <if test="dealStatus != null">deal_status = #{dealStatus},</if>

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

@@ -7,29 +7,33 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <resultMap type="TInspectionPlan" id="TInspectionPlanResult">
         <result property="planId"    column="plan_id"    />
         <result property="planName"    column="plan_name"    />
-        <result property="deviceCodes"    column="device_codes"    />
         <result property="orderId"    column="order_id"    />
         <result property="startTime"    column="start_time"    />
         <result property="endTime"    column="end_time"    />
+        <result property="address"    column="address"    />
         <result property="planStatus"    column="plan_status"    />
+        <result property="isDel"    column="is_del"    />
         <result property="updateTime"    column="update_time"    />
         <result property="createTime"    column="create_time"    />
         <result property="remarks"    column="remarks"    />
     </resultMap>
 
     <sql id="selectTInspectionPlanVo">
-        select plan_id, plan_name, device_codes, order_id, start_time, end_time, plan_status, update_time, create_time, remarks from t_inspection_plan
+        select plan_id, plan_name, order_id, start_time, end_time, address, plan_status, is_del, update_time, create_time, remarks from t_inspection_plan
     </sql>
 
-    <select id="selectTInspectionPlanList" parameterType="TInspectionPlan" resultMap="TInspectionPlanResult">
+    <select id="selectTInspectionPlanList" parameterType="InspectionPlanForm" resultMap="TInspectionPlanResult">
         <include refid="selectTInspectionPlanVo"/>
-        <where>  
+        <where>
+            and is_del = '0'
             <if test="planName != null  and planName != ''"> and plan_name like concat('%', #{planName}, '%')</if>
-            <if test="orderId != null  and orderId != ''"> and order_id = #{orderId}</if>
-            <if test="startTime != null "> and start_time = #{startTime}</if>
-            <if test="endTime != null "> and end_time = #{endTime}</if>
+            <if test="orderId != null  and orderId != ''"> and order_id like concat('%', #{orderId}, '%')</if>
+            <if test="startTime1 != null "> and start_time &gt;= #{startTime1}</if>
+            <if test="endTime1 != null "> and start_time &lt;= #{endTime1}</if>
+            <if test="startTime2 != null "> and end_time &gt;= #{startTime2}</if>
+            <if test="endTime2 != null "> and end_time &lt;= #{endTime2}</if>
             <if test="planStatus != null  and planStatus != ''"> and plan_status = #{planStatus}</if>
-            <if test="remarks != null  and remarks != ''"> and remarks = #{remarks}</if>
+            <if test="remarks != null "> and remarks &lt;= #{remarks}</if>
         </where>
     </select>
     
@@ -42,22 +46,24 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         insert into t_inspection_plan
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="planName != null">plan_name,</if>
-            <if test="deviceCodes != null">device_codes,</if>
             <if test="orderId != null">order_id,</if>
             <if test="startTime != null">start_time,</if>
             <if test="endTime != null">end_time,</if>
+            <if test="address != null">address,</if>
             <if test="planStatus != null">plan_status,</if>
+            <if test="isDel != null">is_del,</if>
             <if test="updateTime != null">update_time,</if>
             <if test="createTime != null">create_time,</if>
             <if test="remarks != null">remarks,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="planName != null">#{planName},</if>
-            <if test="deviceCodes != null">#{deviceCodes},</if>
             <if test="orderId != null">#{orderId},</if>
             <if test="startTime != null">#{startTime},</if>
             <if test="endTime != null">#{endTime},</if>
+            <if test="address != null">#{address},</if>
             <if test="planStatus != null">#{planStatus},</if>
+            <if test="isDel != null">#{isDel},</if>
             <if test="updateTime != null">#{updateTime},</if>
             <if test="createTime != null">#{createTime},</if>
             <if test="remarks != null">#{remarks},</if>
@@ -68,11 +74,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         update t_inspection_plan
         <trim prefix="SET" suffixOverrides=",">
             <if test="planName != null">plan_name = #{planName},</if>
-            <if test="deviceCodes != null">device_codes = #{deviceCodes},</if>
             <if test="orderId != null">order_id = #{orderId},</if>
             <if test="startTime != null">start_time = #{startTime},</if>
             <if test="endTime != null">end_time = #{endTime},</if>
+            <if test="address != null">address = #{address},</if>
             <if test="planStatus != null">plan_status = #{planStatus},</if>
+            <if test="isDel != null">is_del = #{isDel},</if>
             <if test="updateTime != null">update_time = #{updateTime},</if>
             <if test="createTime != null">create_time = #{createTime},</if>
             <if test="remarks != null">remarks = #{remarks},</if>

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

@@ -7,7 +7,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <resultMap type="TOrderFeedback" id="TOrderFeedbackResult">
         <result property="feedbackId"    column="feedback_id"    />
         <result property="orderId"    column="order_id"    />
-        <result property="deviceCode"    column="device_code"    />
+        <result property="deviceId"    column="device_id"    />
         <result property="contents"    column="contents"    />
         <result property="feedbackTime"    column="feedback_time"    />
         <result property="isHiddenDanger"    column="is_hidden_danger"    />
@@ -18,14 +18,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectTOrderFeedbackVo">
-        select feedback_id, order_id, device_code, contents, feedback_time, is_hidden_danger, deal_status, picture_url_1, picture_url_2, picture_url_3 from t_order_feedback
+        select feedback_id, order_id, device_id, contents, feedback_time, is_hidden_danger, deal_status, picture_url_1, picture_url_2, picture_url_3 from t_order_feedback
     </sql>
 
     <select id="selectTOrderFeedbackList" parameterType="TOrderFeedback" resultMap="TOrderFeedbackResult">
         <include refid="selectTOrderFeedbackVo"/>
         <where>  
             <if test="orderId != null  and orderId != ''"> and order_id = #{orderId}</if>
-            <if test="deviceCode != null "> and device_code = #{deviceCode}</if>
+            <if test="deviceId != null "> and device_id = #{deviceId}</if>
             <if test="contents != null  and contents != ''"> and contents = #{contents}</if>
             <if test="feedbackTime != null "> and feedback_time = #{feedbackTime}</if>
             <if test="isHiddenDanger != null  and isHiddenDanger != ''"> and is_hidden_danger = #{isHiddenDanger}</if>
@@ -51,7 +51,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         insert into t_order_feedback
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="orderId != null">order_id,</if>
-            <if test="deviceCode != null">device_code,</if>
+            <if test="deviceId != null">device_id,</if>
             <if test="contents != null">contents,</if>
             <if test="feedbackTime != null">feedback_time,</if>
             <if test="isHiddenDanger != null">is_hidden_danger,</if>
@@ -62,7 +62,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="orderId != null">#{orderId},</if>
-            <if test="deviceCode != null">#{deviceCode},</if>
+            <if test="deviceId != null">#{deviceId},</if>
             <if test="contents != null">#{contents},</if>
             <if test="feedbackTime != null">#{feedbackTime},</if>
             <if test="isHiddenDanger != null">#{isHiddenDanger},</if>
@@ -77,7 +77,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         update t_order_feedback
         <trim prefix="SET" suffixOverrides=",">
             <if test="orderId != null">order_id = #{orderId},</if>
-            <if test="deviceCode != null">device_code = #{deviceCode},</if>
+            <if test="deviceId != null">device_id = #{deviceId},</if>
             <if test="contents != null">contents = #{contents},</if>
             <if test="feedbackTime != null">feedback_time = #{feedbackTime},</if>
             <if test="isHiddenDanger != null">is_hidden_danger = #{isHiddenDanger},</if>

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

+<?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="com.zehong.system.mapper.TUserLocationMapper">
+    
+    <resultMap type="TUserLocation" id="TUserLocationResult">
+        <result property="locationId"    column="location_id"    />
+        <result property="userId"    column="user_id"    />
+        <result property="longitude"    column="longitude"    />
+        <result property="latitude"    column="latitude"    />
+        <result property="createTime"    column="create_time"    />
+    </resultMap>
+
+    <sql id="selectTUserLocationVo">
+        select location_id, user_id, longitude, latitude, create_time from t_user_location
+    </sql>
+
+    <select id="selectTUserLocationList" parameterType="TUserLocation" resultMap="TUserLocationResult">
+        <include refid="selectTUserLocationVo"/>
+        <where>  
+            <if test="userId != null "> and user_id = #{userId}</if>
+            <if test="longitude != null "> and longitude = #{longitude}</if>
+            <if test="latitude != null "> and latitude = #{latitude}</if>
+        </where>
+    </select>
+
+    <select id="selectTUserLocationListByMap" parameterType="java.util.Map" resultMap="TUserLocationResult">
+        <include refid="selectTUserLocationVo"/>
+        <where>
+            <if test="userId != null "> and user_id = #{userId}</if>
+            <if test="longitude != null "> and longitude = #{longitude}</if>
+            <if test="latitude != null "> and latitude = #{latitude}</if>
+            <if test="beginTime != null and endTime != null"> and create_time BETWEEN #{beginTime} AND #{endTime}</if>
+        </where>
+        ORDER BY create_time DESC
+        <if test="initInspectors == 'initInspectors'">
+            LIMIT 1
+        </if>
+
+    </select>
+    
+    <select id="selectTUserLocationById" parameterType="Long" resultMap="TUserLocationResult">
+        <include refid="selectTUserLocationVo"/>
+        where location_id = #{locationId}
+    </select>
+        
+    <insert id="insertTUserLocation" parameterType="TUserLocation" useGeneratedKeys="true" keyProperty="locationId">
+        insert into t_user_location
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="userId != null">user_id,</if>
+            <if test="longitude != null">longitude,</if>
+            <if test="latitude != null">latitude,</if>
+            <if test="createTime != null">create_time,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="userId != null">#{userId},</if>
+            <if test="longitude != null">#{longitude},</if>
+            <if test="latitude != null">#{latitude},</if>
+            <if test="createTime != null">#{createTime},</if>
+         </trim>
+    </insert>
+
+    <update id="updateTUserLocation" parameterType="TUserLocation">
+        update t_user_location
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="userId != null">user_id = #{userId},</if>
+            <if test="longitude != null">longitude = #{longitude},</if>
+            <if test="latitude != null">latitude = #{latitude},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+        </trim>
+        where location_id = #{locationId}
+    </update>
+
+    <delete id="deleteTUserLocationById" parameterType="Long">
+        delete from t_user_location where location_id = #{locationId}
+    </delete>
+
+    <delete id="deleteTUserLocationByIds" parameterType="String">
+        delete from t_user_location where location_id in 
+        <foreach item="locationId" collection="array" open="(" separator="," close=")">
+            #{locationId}
+        </foreach>
+    </delete>
+</mapper>
\ No newline at end of file

gassafety-web/src/api/inspectorLocation/location.js

+import request from '@/utils/request'
+
+// 查询巡检员定位列表
+export function listLocation(query) {
+  return request({
+    url: '/system/location/list',
+    method: 'get',
+    params: query
+  })
+}
+
+//初始化巡检员位置及路线
+export function getInspectorLocations(query){
+  return request({
+    url: '/system/location/getInspectorLocations',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询巡检员定位详细
+export function getLocation(locationId) {
+  return request({
+    url: '/system/location/' + locationId,
+    method: 'get'
+  })
+}
+
+// 新增巡检员定位
+export function addLocation(data) {
+  return request({
+    url: '/system/location',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改巡检员定位
+export function updateLocation(data) {
+  return request({
+    url: '/system/location',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除巡检员定位
+export function delLocation(locationId) {
+  return request({
+    url: '/system/location/' + locationId,
+    method: 'delete'
+  })
+}
+
+// 导出巡检员定位
+export function exportLocation(query) {
+  return request({
+    url: '/system/location/export',
+    method: 'get',
+    params: query
+  })
+}

gassafety-web/src/utils/gaodeMap.js

@@ -18,7 +18,8 @@ export const DEVICE_TYPE = {
   FLOWMETER: "4",
   DUTYPERSON: "5",
   WORKORDER: "6",
-  PRESSUREGAGE: "7"
+  PRESSUREGAGE: "7",
+  INSPECTOR: "8"
 };
 class gaodeMap {
   // 所有线的数组
@@ -158,7 +159,7 @@ class gaodeMap {
       offset: new AMap.Pixel(0, 5)
     });
     this.setMarkerIcon(marker);
-    if (DEVICE_TYPE.WORKORDER != markerType) {
+    if (DEVICE_TYPE.WORKORDER != markerType && DEVICE_TYPE.INSPECTOR != markerType) {
       marker.content = this.getMarketContent(data);
       marker.on("mouseover", infoOpen);
       marker.on("mouseout", infoClose);
@@ -365,7 +366,7 @@ class gaodeMap {
       case DEVICE_TYPE.DUTYPERSON: {
         let icon = new AMap.Icon({
           //size: new AMap.Size(51, 23),
-          image: require("../assets/images/zhibaorenyuan.png")
+          image: require("../assets/images/zhibanrenyuan.png")
         });
         marker.setIcon(icon);
         break;
@@ -373,7 +374,7 @@ class gaodeMap {
       case DEVICE_TYPE.WORKORDER: {
         let icon = new AMap.Icon({
           //size: new AMap.Size(51, 23),
-          image: require("../assets/images/zhibaorenyuan.png")
+          image: require("../assets/images/zhibanrenyuan.png")
         });
         marker.setIcon(icon);
         break;
@@ -386,6 +387,14 @@ class gaodeMap {
         marker.setIcon(icon);
         break;
       }
+      case DEVICE_TYPE.INSPECTOR: {
+        let icon = new AMap.Icon({
+          //size: new AMap.Size(51, 23),
+          image: require("../assets/images/zhibanrenyuan.png")
+        });
+        marker.setIcon(icon);
+        break;
+      }
     }
   }
 

gassafety-web/src/utils/gaodeMapView.js

@@ -18,7 +18,8 @@ export const DEVICE_TYPE = {
   FLOWMETER: "4",
   DUTYPERSON: "5",
   WORKORDER: "6",
-  PRESSUREGAGE: "7"
+  PRESSUREGAGE: "7",
+  INSPECTOR: "8"
 };
 class gaodeMap {
   // 所有线的数组
@@ -158,7 +159,7 @@ class gaodeMap {
       offset: new AMap.Pixel(0, 5)
     });
     this.setMarkerIcon(marker);
-    if (DEVICE_TYPE.WORKORDER != markerType) {
+    if (DEVICE_TYPE.WORKORDER != markerType && DEVICE_TYPE.INSPECTOR != markerType) {
       marker.content = this.getMarketContent(data);
       marker.on("mouseover", infoOpen);
       marker.on("mouseout", infoClose);
@@ -368,7 +369,7 @@ class gaodeMap {
       case DEVICE_TYPE.DUTYPERSON: {
         let icon = new AMap.Icon({
           //size: new AMap.Size(51, 23),
-          image: require("../assets/images/zhibaorenyuan.png")
+          image: require("../assets/images/zhibanrenyuan.png")
         });
         marker.setIcon(icon);
         break;
@@ -376,7 +377,7 @@ class gaodeMap {
       case DEVICE_TYPE.WORKORDER: {
         let icon = new AMap.Icon({
           //size: new AMap.Size(51, 23),
-          image: require("../assets/images/zhibaorenyuan.png")
+          image: require("../assets/images/zhibanrenyuan.png")
         });
         marker.setIcon(icon);
         break;
@@ -389,6 +390,14 @@ class gaodeMap {
         marker.setIcon(icon);
         break;
       }
+      case DEVICE_TYPE.INSPECTOR: {
+        let icon = new AMap.Icon({
+          //size: new AMap.Size(51, 23),
+          image: require("../assets/images/zhibanrenyuan.png")
+        });
+        marker.setIcon(icon);
+        break;
+      }
     }
   }
 

gassafety-web/src/views/enterprise/mapView/index.vue

@@ -105,6 +105,8 @@ import { pipeAllInfoList, countPipeLength } from "@/api/device/pipe.js";
 import gaodeMap, { map, DEVICE_TYPE, mapOperateType } from "utils/gaodeMapView.js";
 import { getAllDeviceInfo, countDeviceByType } from "@/api/device/deviceInfo";
 import RightBototmData from "./components/RightBototmData.vue";
+import { getInspectorLocations } from "@/api/inspectorLocation/location"
+
 export default {
   components: {
     RightBototmData,
@@ -181,6 +183,7 @@ export default {
       gaoMap.searchTips("tipinput");
       this.getDeviceInfo();
       this.getPipeList();
+      this.getInspectorLocations();
     },
     // 左边的Bar修改值
     leftBarChange(item) {
@@ -371,6 +374,18 @@ export default {
         }
       });
     },
+    getInspectorLocations(){
+      getInspectorLocations().then((res) =>{
+        if(res.code == 200){
+          for(var i =0; i<res.data.length; i++){
+            this.gaoMap.addMarker(
+              DEVICE_TYPE.INSPECTOR,
+              res.data[i]
+            );
+          }
+        }
+      });
+    },
     searchClear() {
       this.iconClass = "icon-create";
       this.createValue = 0;

gassafety-web/src/views/workOrder/feedback/index.vue

@@ -136,12 +136,12 @@
           <font>{{form.orderId}}</font>
         </el-form-item>
         <el-form-item label="设备列表" prop="deviceCode" v-if="form.orderType == '1'">
-          <el-select v-model="form.deviceCode" placeholder="请选择设备" clearable size="small" filterable >
+          <el-select v-model="form.deviceId" placeholder="请选择设备" clearable size="small" filterable >
             <el-option
               v-for="device in form.deviceInfoList"
-              :key="device.deviceCode"
+              :key="device.deviceId"
               :label="device.deviceName"
-              :value="device.deviceCode"
+              :value="device.deviceId"
             ></el-option>
           </el-select>
         </el-form-item>

yarn.lock

+# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
+# yarn lockfile v1
+
+