Merge branch 'refs/heads/develop_dl' into develop_dl_4.0

YeeAmosFireAutoSysCommon/src/main/java/com/yeejoin/amos/fas/dao/entity/Equipment.java

@@ -63,6 +63,11 @@ public class Equipment extends BasicEntity  {
 	@Column(name="drain_duration")
 	private String drainDuration;
 
+	/**
+	 * 分类
+	 */
+	@Column(name="category")
+	private String category;
 
 	public String getFireTruckRoute() {
 		return fireTruckRoute;

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

@@ -40,6 +40,7 @@ import org.springframework.transaction.support.TransactionSynchronization;
 import org.springframework.transaction.support.TransactionSynchronizationManager;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.ObjectUtils;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.typroject.tyboot.component.emq.EmqKeeper;
 import org.typroject.tyboot.component.emq.EmqxListener;
 import org.typroject.tyboot.core.foundation.utils.Bean;
@@ -693,6 +694,8 @@ public class ContingencyPlanServiceImpl implements IContingencyPlanService {
     public Page<PlanDetailVo> pageFilter(Page page, String planName, Long
             classifyId, List<String> planRange, String editOrgName, Date implementationTimeLeft, Date
                                                  implementationTimeRight, String equipmentId, String category) {
+                                                 implementationTimeRight,
+                                         String equipmentId, String category) {
         List<Long> classifyIdList = new ArrayList<>();
         if (classifyId != null) {
             Collection<PlanClassifyTreeVo> classifyTreeList = planClassifyTreeService.getAllChildIncludeMe(classifyId);

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/service/intfc/IContingencyPlanService.java

@@ -7,6 +7,7 @@ import com.yeejoin.amos.fas.dao.entity.PlanOperationRecord;
 import com.yeejoin.amos.fas.exception.YeeException;
 import com.yeejoin.amos.feign.privilege.model.RoleModel;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.RequestParam;
 
 import java.util.Date;
 import java.util.HashMap;

YeeAmosFireAutoSysStart/src/main/resources/db/changelog/fas-2.0.1.xml

@@ -495,7 +495,7 @@
     <changeSet author="shg" id="1609226808867-2">
         <preConditions onFail="MARK_RAN">
         	<not>
-                <indexExists indexName="unique_idx_source_id" /> 
+                <indexExists indexName="unique_idx_source_id" />
             </not>
         </preConditions>
         <comment>f_risk_source add UNIQUE source_id</comment>
@@ -636,7 +636,7 @@
             ) ENGINE=InnoDB AUTO_INCREMENT=114 DEFAULT CHARSET=utf8mb4 COMMENT='预案运行记录表';
         </sql>
     </changeSet>
-   
+
     <changeSet author="wujunkai" id="1612272587000-6">
         <preConditions onFail="MARK_RAN">
             <not>
@@ -843,7 +843,7 @@
                 ADD INDEX `INDEX_BATCH_NO`(`batch_No`) USING BTREE;
         </sql>
     </changeSet>
-    
+
      <changeSet author="maoy" id="1682216014-001">
         <preConditions onFail="MARK_RAN">
             <not>
@@ -856,7 +856,7 @@
 		ADD COLUMN `fire_equipment_code`  varchar(255) NULL DEFAULT '' COMMENT '消防设备编码';
         </sql>
     </changeSet>
-    
+
      <changeSet author="maoy" id="1682216014-002">
         <preConditions onFail="MARK_RAN">
             <not>
@@ -871,7 +871,7 @@
     </changeSet>
 
 
-    
+
 
     <changeSet author="keyong" id="1682647357">
         <preConditions onFail="MARK_RAN">

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

@@ -187,20 +187,20 @@
       </if>
     </where>
   </select>
-  
+
   <select id="queryBatchNoByFireEquipmentId" resultType="String" >
 	  SELECT
 		p.batch_no
 	FROM
 		f_equipment_fire_equipment fe
 		RIGHT JOIN f_equipment e ON fe.equipment_id = e.id
-		RIGHT JOIN c_plan_operation_record p ON e.id = p.fire_equipment_id 
+		RIGHT JOIN c_plan_operation_record p ON e.id = p.fire_equipment_id
 	WHERE
 		fe.fire_equipment_id = #{fireEquipmentId}
 		AND p.end_time is null
 		AND p.`status` = 0
 		ORDER BY p.start_time desc
 		limit 0, 1
-  
+
   </select>
 </mapper>
\ No newline at end of file