修改接口

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/dto/AlertCalledDto.java

@@ -108,4 +108,9 @@ public class AlertCalledDto extends BaseDto{
 
     @ApiModelProperty(value = "警情状态str")
     private String alertStatusStr;
+
+    @ApiModelProperty(value = "来源系统")
+    private String systemSource;
+    @ApiModelProperty(value = "系统来源code")
+    private String systemSourceCode;
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/entity/AlertCalled.java

@@ -127,4 +127,11 @@ public class AlertCalled extends BaseEntity {
     @TableField(exist=false)
     @ApiModelProperty(value = "警情状态str")
     private String alertStatusStr;
+
+
+
+    @ApiModelProperty(value = "来源系统")
+    private String systemSource;
+    @ApiModelProperty(value = "系统来源code")
+    private String systemSourceCode;
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/ESAlertCalledService.java

@@ -10,6 +10,7 @@ import org.elasticsearch.index.query.BoolQueryBuilder;
 import org.elasticsearch.index.query.QueryBuilders;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.DependsOn;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.elasticsearch.core.ElasticsearchRestTemplate;
 import org.springframework.data.elasticsearch.core.SearchHit;
@@ -37,6 +38,7 @@ import com.yeejoin.amos.boot.module.jcs.biz.dao.ESAlertCalledRepository;
  * @version $Id: ESAlertCalledService.java, v 0.1 2021年6月19日 下午5:12:01 gwb Exp $
  */
 @Service
+@DependsOn("liquibase")
 public class ESAlertCalledService {
 
     @Autowired
@@ -73,7 +75,7 @@ public class ESAlertCalledService {
         if (ValidationUtil.isEmpty(time)) //默认为同步48小时
 		{
         	currentTime = currentTime - 48*60*60*1000;
-		}else 
+		}else
 		{
 			currentTime = currentTime - time*60*60*1000;
 		}

amos-boot-system-jcs/src/main/resources/db/changelog/jcs-1.0.0.0.xml

@@ -1481,6 +1481,30 @@
 		</sql>
 	</changeSet>
 
+   <changeSet author="tw" id="2021-09-24-0001">
+        <preConditions onFail="MARK_RAN">
+            <tableExists tableName="jc_alert_called"/>
+        </preConditions>
+        <comment>警情来源系统</comment>
+        <sql>
+            ALTER TABLE `jc_alert_called` add system_source varchar(255)  COMMENT '来源系统';
+            ALTER TABLE `jc_alert_called` add system_source_code varchar(255)  COMMENT '系统来源code';
+        </sql>
+    </changeSet>
+
+
 
+    <changeSet author="tw" id="2021-09-24-0002">
+        <preConditions onFail="MARK_RAN">
 
+            <tableExists tableName="cb_data_dictionary" />
+            <primaryKeyExists primaryKeyName="sequence_nbr" tableName="cb_data_dictionary"/>
+        </preConditions>
+        <comment>add data jc_alert_form</comment>
+        <sql>
+            INSERT INTO `cb_data_dictionary`(`sequence_nbr`, `code`, `name`, `type`, `type_desc`, `parent`, `rec_user_name`, `rec_user_id`, `rec_date`, `is_delete`, `sort_num`) VALUES (1242, '1242', '融合调度系统', 'SOURCE', NULL, NULL, NULL, NULL, NULL, b'0', 1);
+            INSERT INTO `cb_data_dictionary`(`sequence_nbr`, `code`, `name`, `type`, `type_desc`, `parent`, `rec_user_name`, `rec_user_id`, `rec_date`, `is_delete`, `sort_num`) VALUES (1243, '1243', '消防物联系统', 'SOURCE', NULL, NULL, NULL, NULL, NULL, b'0', 1);
+            INSERT INTO `cb_data_dictionary`(`sequence_nbr`, `code`, `name`, `type`, `type_desc`, `parent`, `rec_user_name`, `rec_user_id`, `rec_date`, `is_delete`, `sort_num`) VALUES (1244, '1244', '119接处警系统', 'SOURCE', NULL, NULL, NULL, NULL, NULL, b'0', 1);
+        </sql>
+    </changeSet>
 </databaseChangeLog>