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

gassafety-admin/src/main/java/com/zehong/web/controller/device/TPipeController.java

@@ -78,7 +78,11 @@ public class TPipeController extends BaseController
     @PostMapping
     public AjaxResult add(@RequestBody TPipe tPipe)
     {
-        return toAjax(tPipeService.insertTPipe(tPipe));
+        int result = tPipeService.insertTPipe(tPipe);
+        if(result<=0){
+            new Exception("管道信息插入失败");
+        }
+        return AjaxResult.success(tPipe.getPipeId());
     }
 
     /**

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

@@ -30,6 +30,10 @@ public class THiddenTrouble extends BaseEntity
     @Excel(name = "工单id")
     private String orderId;
 
+    /** 地址 */
+    @Excel(name = "地址")
+    private String address;
+
     /** 经度 */
     @Excel(name = "经度")
     private BigDecimal longitude;
@@ -86,7 +90,16 @@ public class THiddenTrouble extends BaseEntity
     {
         return orderId;
     }
-    public void setLongitude(BigDecimal longitude) 
+
+    public String getAddress() {
+        return address;
+    }
+
+    public void setAddress(String address) {
+        this.address = address;
+    }
+
+    public void setLongitude(BigDecimal longitude)
     {
         this.longitude = longitude;
     }
@@ -139,6 +152,7 @@ public class THiddenTrouble extends BaseEntity
             .append("deviceCode", getDeviceCode())
             .append("deviceType", getDeviceType())
             .append("orderId", getOrderId())
+            .append("address", getAddress())
             .append("longitude", getLongitude())
             .append("latitude", getLatitude())
             .append("coordinates", getCoordinates())

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

@@ -56,6 +56,9 @@ public class WorkOrderVo extends BaseEntity
     /** 坐标 */
     private String coordinates;
 
+    /** 地址 */
+    private String address;
+
     /** 工单状态（0未接收，1已接收，2进行中，3已反馈，4已归档） */
     private String orderStatus;
 
@@ -193,6 +196,14 @@ public class WorkOrderVo extends BaseEntity
         this.coordinates = coordinates;
     }
 
+    public String getAddress() {
+        return address;
+    }
+
+    public void setAddress(String address) {
+        this.address = address;
+    }
+
     public void setOrderStatus(String orderStatus)
     {
         this.orderStatus = orderStatus;
@@ -302,6 +313,7 @@ public class WorkOrderVo extends BaseEntity
             .append("longitude", getLongitude())
             .append("latitude", getLatitude())
             .append("coordinates", getCoordinates())
+            .append("address", getAddress())
             .append("orderStatus", getOrderStatus())
             .append("createTime", getCreateTime())
             .append("appointInspector", getAppointInspector())

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

@@ -106,6 +106,7 @@ public class TWorkOrderServiceImpl implements ITWorkOrderService
             workOrderVo.setLatitude(trouble.getLatitude() != null ? trouble.getLatitude() : null);
             workOrderVo.setCoordinates(trouble.getCoordinates() != null ? trouble.getCoordinates() : null);
             workOrderVo.setDeviceType(trouble.getDeviceType());
+            workOrderVo.setAddress(trouble.getAddress());
 
         } else {
 
@@ -118,11 +119,13 @@ public class TWorkOrderServiceImpl implements ITWorkOrderService
                 TPipe pipe = tPipeMapper.selectTPipeByCode(deviceCode);
                 workOrderVo.setCoordinates(pipe.getCoordinates());
                 workOrderVo.setDeviceType("0");
+                workOrderVo.setAddress(pipe.getPipeAddr());
             } else {
                 TDeviceInfo device = tDeviceInfoMapper.selectTDeviceInfoByCode(deviceCode);
                 workOrderVo.setLongitude(device.getLongitude());
                 workOrderVo.setLatitude(device.getLatitude());
                 workOrderVo.setDeviceType(device.getDeviceType());
+                workOrderVo.setAddress(device.getDeviceAddr());
             }
         }
 

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

@@ -9,6 +9,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="deviceCode"    column="device_code"    />
         <result property="deviceType"    column="device_type"    />
         <result property="orderId"    column="order_id"    />
+        <result property="address"    column="address"    />
         <result property="longitude"    column="longitude"    />
         <result property="latitude"    column="latitude"    />
         <result property="coordinates"    column="coordinates"    />
@@ -19,7 +20,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectTHiddenTroubleVo">
-        select trouble_id, device_code, device_type, order_id, longitude, latitude, coordinates, deal_status, update_time, create_time, remarks from t_hidden_trouble
+        select trouble_id, device_code, 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">
@@ -47,6 +48,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="deviceCode != null">device_code,</if>
             <if test="deviceType != null">device_type,</if>
             <if test="orderId != null">order_id,</if>
+            <if test="address != null">address,</if>
             <if test="longitude != null">longitude,</if>
             <if test="latitude != null">latitude,</if>
             <if test="coordinates != null">coordinates,</if>
@@ -59,6 +61,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="deviceCode != null">#{deviceCode},</if>
             <if test="deviceType != null">#{deviceType},</if>
             <if test="orderId != null">#{orderId},</if>
+            <if test="address != null">#{address},</if>
             <if test="longitude != null">#{longitude},</if>
             <if test="latitude != null">#{latitude},</if>
             <if test="coordinates != null">#{coordinates},</if>
@@ -75,6 +78,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="deviceCode != null">device_code = #{deviceCode},</if>
             <if test="deviceType != null">device_code = #{deviceType},</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="latitude != null">latitude = #{latitude},</if>
             <if test="coordinates != null">coordinates = #{coordinates},</if>

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

@@ -31,7 +31,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectFinishTInspectionData" parameterType="int" resultType="int">
         select count(*) from t_inspection_data
         where plan_id = #{planId}
-        and deal_status != null
+        and deal_status is not null
     </select>
     
     <select id="selectTInspectionDataById" parameterType="int" resultMap="TInspectionDataResult">