bug

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/service/impl/ContingencyPlanServiceImpl.java

@@ -25,6 +25,7 @@ import org.eclipse.paho.client.mqttv3.MqttException;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.typroject.tyboot.component.emq.EmqKeeper;
@@ -64,6 +65,8 @@ public class ContingencyPlanServiceImpl implements IContingencyPlanService {
     @Qualifier("contingencyAction")
     @Autowired
     private CustomerAction customerAction;
+    @Value("${now.gateway.address}")
+    private String gateWayAddress;
 //    @Value("${number.plan.projectName}")
 //    private String projectName;
     private final PlanOperationRecordMapper planOperationRecordMapper;
@@ -539,6 +542,13 @@ public class ContingencyPlanServiceImpl implements IContingencyPlanService {
         if (ValidationUtil.isEmpty(planList)) {
             return;
         }
+        planList.forEach(x->{
+            String picture = x.getPicture();
+            if (StringUtils.isNotEmpty(picture)) {
+                x.setPicture(gateWayAddress+picture);
+            }
+
+        });
         List<Long> idList = new ArrayList<>();
         planList.forEach(e -> idList.add(e.getId()));
         Map<Object, List<PlanDoc>> docMapList = null;

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/vo/PlanDetailVo.java

@@ -33,4 +33,6 @@ public class PlanDetailVo extends PlanDetail {
      * 执行次数
      */
     private int executionTimes;
+
+    private String picture;
 }

YeeAmosFireAutoSysStart/src/main/resources/application-dev.properties

@@ -32,9 +32,9 @@ spring.redis.jedis.pool.max-idle=10
 spring.redis.jedis.pool.min-idle=0
 spring.redis.timeout=1000
 #picture upload
-windows.img.path = E:\\
+windows.img.path = G:\\
 linux.img.path = /
-file.uploadUrl=E:\\upload\\files\\
+file.uploadUrl=G:\\upload\\files\\
 #picture read
 file.readUrl=http://172.16.3.89:8083/file/getFile?in=
 params.isPush=true

YeeAmosFireAutoSysStart/src/main/resources/application.properties

@@ -103,6 +103,9 @@ outSystem.fegin.name=unKnow
 outSystem.user.password=a1234560
 privilege.fegin.name=AMOS-API-PRIVILEGE
 
+#当前gateway的IP地址
+now.gateway.address=http://172.16.3.32:10055/
+
 
 
 

YeeAmosFireAutoSysStart/src/main/resources/db/mapper/PlanDetailMapper.xml

@@ -52,55 +52,58 @@
 
   <select id="filterList" parameterType="string" resultType="com.yeejoin.amos.fas.business.vo.PlanDetailVo">
     SELECT
-      id
-      , create_date createDate
-      , plan_name planName
-      , code
-      , classify_id classifyId
-      , plan_range planRange
-      , edit_org_name editOrgName
-      , edition
-      , implementation_time implementationTime
-      , remark
-      , status
-      , creator
-      , reviser
-      , update_time updateTime
-      , org_code orgCode
-      , is_delete isDelete
-      , input_time inputTime
-      , (SELECT classify_name FROM c_plan_classify_tree cpct WHERE id = cpd.classify_id) classifyName
-      , (SELECT count(1) FROM c_plan_operation_record cpor WHERE plan_id = cpd.id) executionTimes
+    cpd.id
+    , cpd.create_date createDate
+    , plan_name planName
+    , code
+    , classify_id classifyId
+    , plan_range planRange
+    , edit_org_name editOrgName
+    , edition
+    , implementation_time implementationTime
+    , cpd.remark
+    , status
+    , creator
+    , reviser
+    , update_time updateTime
+    , org_code orgCode
+    , cpd.is_delete isDelete
+    , input_time inputTime
+    , (SELECT classify_name FROM c_plan_classify_tree cpct WHERE id = cpd.classify_id) classifyName
+    , (SELECT count(1) FROM c_plan_operation_record cpor WHERE plan_id = cpd.id) executionTimes
+    ,fpp.picture
     FROM
-      c_plan_detail cpd
+    c_plan_detail cpd
+    left join c_plan_equipment as cpe on cpd.id = cpe.plan_id and cpe.is_delete = 0
+    left join f_preplan_picture as fpp on fpp.equipment_id  = cpe.fire_equipment_id and fpp.`type` =5
     <where>
       <if test="planName != null and planName.length > 0">
-        AND plan_name LIKE concat('%', #{planName}, '%')
+        AND cpd.plan_name LIKE concat('%', #{cpd.planName}, '%')
       </if>
       <if test="classifyId != null and classifyId.size > 0">
-        AND classify_id IN
+        AND cpd.classify_id IN
         <foreach collection="classifyId" separator="," item="cid" open="(" close=")">
           #{cid}
         </foreach>
       </if>
       <if test="planRange != null and planRange.size > 0">
-        AND plan_range IN
+        AND cpd.plan_range IN
         <foreach collection="planRange" separator="," item="pr" open="(" close=")">
           #{pr}
         </foreach>
       </if>
       <if test="editOrgName != null and editOrgName.length > 0">
-        AND edit_org_name LIKE concat('%', #{editOrgName}, '%')
+        AND cpd.edit_org_name LIKE concat('%', #{editOrgName}, '%')
       </if>
       <if test="implementationTimeLeft != null">
-        AND implementation_time <![CDATA[ >= ]]> #{implementationTimeLeft}
+        AND cpd.implementation_time <![CDATA[ >= ]]> #{implementationTimeLeft}
       </if>
       <if test="implementationTimeRight != null">
-        AND implementation_time <![CDATA[ < ]]> #{implementationTimeRight}
+        AND cpd.implementation_time <![CDATA[ < ]]> #{implementationTimeRight}
       </if>
-      AND is_delete = 0
+      AND cpd.is_delete = 0
     </where>
-    ORDER BY create_date ASC
+    ORDER BY cpd.create_date ASC
     LIMIT #{start}, #{size}
   </select>