四川三维接口调整

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/controller/View3dController.java

@@ -257,16 +257,25 @@ public class View3dController extends BaseController {
 		String token = this.getToken();
 		String appKey = this.getAppKey();
 		String product = this.getProduct();
-		
-    	return view3dService.retrieveAll(params.getType(),
-    			params.getRiskSourceId(),
-    			params.getInputText(),
-    			params.getCurrent(),
-    			params.getPageSize(),
-    			orgCode,
-    			params.getDataLevel(),
-    			params.getProtectObjName(),
-    			token,appKey,product);
+		return view3dService.retrieve3All(params.getType(),
+				params.getRiskSourceId(),
+				params.getAreaId(),
+				params.getEquipmentId(),
+				params.getInputText(),
+				params.getCurrent(),
+				params.getPageSize(),
+				orgCode,
+				params.getDataLevel(),
+				token,appKey,product);
+//    	return view3dService.retrieveAll(params.getType(),
+//    			params.getRiskSourceId(),
+//    			params.getInputText(),
+//    			params.getCurrent(),
+//    			params.getPageSize(),
+//    			orgCode,
+//    			params.getDataLevel(),
+//    			params.getProtectObjName(),
+//    			token,appKey,product);
     }
 
 	@Permission

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/dao/mapper/ImpEquipMapper.java

@@ -4,6 +4,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
+import com.yeejoin.amos.fas.business.bo.FireEquipmentBo;
 import com.yeejoin.amos.fas.dao.dto.EquipmentDTO;
 import org.apache.ibatis.annotations.Param;
 
@@ -24,4 +25,6 @@ public interface ImpEquipMapper extends BaseMapper {
     List<EquipmentDTO> reservePage(@Param("start") long start,@Param("length")  int length);
 
     Set<String> getAllCode();
+    
+    FireEquipmentBo findImpEquipById (@Param("id") Long id);
 }

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

@@ -171,6 +171,7 @@ public class FireEquipServiceImpl implements IFireEquipService {
                 break;
             case extinguisher:
             case hydrant:
+            case fireEquipment:
             case monitorEquipment:
                 FireEquipmentBo fireEquipment = fireEquipMapper.findFireEquipById(id);
                 fireEquipment.setEquipClassify(Integer.parseInt(EquipClassifyEnum.EQUIPMENT.getCode()));
@@ -189,6 +190,10 @@ public class FireEquipServiceImpl implements IFireEquipService {
 
                 returnEntity = fireDetection;
                 break;
+            case impEquipment:
+                FireEquipmentBo impEquipment = impEquipMapper.findImpEquipById(id);
+                returnEntity = impEquipment;
+                break;
             default:
                 throw new Exception("类型有误.");
 

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

@@ -420,6 +420,7 @@ public class PlanVisual3dServiceImpl implements IPlanVisual3dService {
                             }
                             x.setTime(DateFormatUtils.format(new Date(), "HH:mm:ss"));
                         }
+                        x.setStepStatus(x.getCheckYesOrNo());
                         x.setBatchNo(batchNo);
                         x.setCaseId(contingencyPlanId);
                         x.setButtonJson(buttonJson);

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/util/FireEquipmentType.java

@@ -9,5 +9,7 @@ public enum  FireEquipmentType {
     pool,//消防水池
     fireChamber,//消防小室
     fireFoamRoom,//消防泡沫间
-    fireDetection //火探
+    fireDetection, //火探
+    fireEquipment,
+    impEquipment
 }

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

@@ -93,4 +93,16 @@
 	<select id="getAllCode" resultType="string">
 		select distinct code from f_equipment
 	</select>
+	
+	<select id="findImpEquipById" resultType="com.yeejoin.amos.fas.business.bo.FireEquipmentBo">
+		SELECT
+			id,
+			`name`,
+			`code`,
+			IFNULL(address,'') as 'productionArea'
+		FROM
+			f_equipment
+		WHERE
+			id = ${id}
+	</select>
 </mapper>
\ No newline at end of file