解决冲突

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

@@ -25,7 +25,6 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
->>>>>>> upgrade
 import com.alibaba.fastjson.JSONObject;
 import com.yeejoin.amos.fas.business.action.model.FireEquimentDataRo;
 import com.yeejoin.amos.fas.business.action.model.ProtalDataRo;

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

@@ -4,8 +4,6 @@ import java.util.List;
 import java.util.Map;
 
 import com.yeejoin.amos.fas.dao.dto.EquipmentDTO;
-import com.yeejoin.amos.fas.dao.entity.Equipment;
-import com.yeejoin.amos.fas.dao.entity.FireEquipment;
 import org.apache.ibatis.annotations.Param;
 
 public interface ImpEquipMapper extends BaseMapper {

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

@@ -6,7 +6,6 @@ import com.google.common.collect.Lists;
 import com.google.common.collect.Sets;
 import com.yeejoin.amos.component.rule.RuleTrigger;
 import com.yeejoin.amos.fas.business.action.model.ContingencyRo;
-import com.yeejoin.amos.fas.business.action.model.FireEquimentDataRo;
 import com.yeejoin.amos.fas.business.action.model.SetpEnum;
 import com.yeejoin.amos.fas.business.action.mq.WebMqttComponent;
 import com.yeejoin.amos.fas.business.action.mq.WebMqttSubscribe;

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

@@ -36,7 +36,6 @@ import com.yeejoin.amos.fas.client.invoke.RsDataQueue;
 import com.yeejoin.amos.fas.common.enums.CheckStatusEnum;
 import com.yeejoin.amos.fas.common.enums.DataRefreshTypeEum;
 import com.yeejoin.amos.fas.common.enums.RiskSourceRegionEum;
-import com.yeejoin.amos.fas.common.enums.View3dRefreshAreaEum;
 import com.yeejoin.amos.fas.core.common.request.CommonPageable;
 import com.yeejoin.amos.fas.core.common.response.RegionTreeResponse;
 import com.yeejoin.amos.fas.core.common.response.RiskSourceTreeResponse;

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

@@ -567,9 +567,9 @@
         </preConditions>
         <comment>修改f_equipment表结构</comment>
         <sql>
-            ALTER TABLE `f_equipment` ADD COLUMN `status` tinyint(4) NULL DEFAULT 0 COMMENT '预案状态：1-启动，0-未启动',
-            ALTER TABLE `f_equipment` ADD COLUMN `start_time` datetime(0) NULL DEFAULT NULL COMMENT '预案开始时间',
-            ALTER TABLE `f_equipment` ADD COLUMN `end_time` datetime(0) NULL DEFAULT NULL COMMENT '预案结束时间',
+            ALTER TABLE `f_equipment` ADD COLUMN `status` tinyint(4) NULL DEFAULT 0 COMMENT '预案状态：1-启动，0-未启动';
+            ALTER TABLE `f_equipment` ADD COLUMN `start_time` datetime(0) NULL DEFAULT NULL COMMENT '预案开始时间';
+            ALTER TABLE `f_equipment` ADD COLUMN `end_time` datetime(0) NULL DEFAULT NULL COMMENT '预案结束时间';
             ALTER TABLE `f_equipment` ADD COLUMN `reserve_source` tinyint(4) NULL DEFAULT 0 COMMENT '预案来源：1-手动触发，0-自动触发（默认）';
         </sql>
     </changeSet>