Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer

amos-boot-jcs-system/src/main/resources/application.properties

@@ -24,4 +24,7 @@ spring.datasource.hikari.connection-timeout=30000
 spring.datasource.hikari.connection-test-query=SELECT 1
 
 #mqtt-警情初报消息主题
-mqtt.topic.alert.reporting=alertReporting
\ No newline at end of file
+mqtt.topic.alert.reporting=alertReporting
+
+#实战指挥新警情通报主题
+mqtt.topic.command.alert.notice=alertNotice
\ No newline at end of file

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/resources/mapper/PowerTransferMapper.xml

@@ -44,35 +44,66 @@
     </select>
 
     <select id="getPowerTransferInfoCount" resultType="java.util.Map">
-        select count(distinct pt.sequence_nbr) transfer_count, count(distinct resources_id) car_count, 0 end_count, 0 no_return_car_count
+        select count(distinct pt.sequence_nbr) transfer_count, count(distinct ptcr.sequence_nbr) car_count, 0 end_count, 0
+        no_return_car_count
         from jc_power_transfer pt
-                 left join jc_power_transfer_company ptc on pt.sequence_nbr = ptc.power_transfer_id
-                 left join jc_power_transfer_company_resources ptcr on ptc.sequence_nbr = ptcr.power_transfer_company_id
-        where pt.rec_date BETWEEN #{beginDate} AND #{endDate}
+        left join jc_power_transfer_company ptc on pt.sequence_nbr = ptc.power_transfer_id
+        left join jc_power_transfer_company_resources ptcr on ptc.sequence_nbr = ptcr.power_transfer_company_id
+        <where>
+            <if test="beginDate != null and beginDate != ''">
+                AND pt.rec_date &gt;= #{beginDate}
+            </if>
+
+            <if test="endDate != null and endDate != ''">
+                AND pt.rec_date &lt;= #{endDate}
+            </if>
+        </where>
         order by pt.rec_date asc
     </select>
     <select id="getPowerTransferInfo" resultType="com.yeejoin.amos.boot.module.jcs.api.dto.PowerTransferDto">
         select sequence_nbr, rescue_grid
         from jc_power_transfer pt
-        where pt.rec_date BETWEEN #{beginDate} AND #{endDate}
+        <where>
+            <if test="beginDate != null and beginDate != ''">
+                AND pt.rec_date &gt;= #{beginDate}
+            </if>
+
+            <if test="endDate != null and endDate != ''">
+                AND pt.rec_date &lt;= #{endDate}
+            </if>
+        </where>
         order by pt.rec_date asc
     </select>
     <select id="getPowerTransferCompanyInfo"
             resultType="com.yeejoin.amos.boot.module.jcs.api.dto.PowerTransferCompanyDto">
         select ptc.sequence_nbr, ptc.company_name, ptc.is_distribution_agencies, ptc.power_transfer_id
         from jc_power_transfer pt
-                 left join jc_power_transfer_company ptc on pt.sequence_nbr = ptc.power_transfer_id
-        where pt.rec_date BETWEEN #{beginDate} AND #{endDate}
+        left join jc_power_transfer_company ptc on pt.sequence_nbr = ptc.power_transfer_id
+        <where>
+            <if test="beginDate != null and beginDate != ''">
+                AND pt.rec_date &gt;= #{beginDate}
+            </if>
+
+            <if test="endDate != null and endDate != ''">
+                AND pt.rec_date &lt;= #{endDate}
+            </if>
+        </where>
         order by pt.rec_date asc
     </select>
     <select id="getPowerTransferCompanyResourcesInfo"
             resultType="com.yeejoin.amos.boot.module.jcs.api.dto.PowerTransferCompanyResourcesDto">
         select ptcr.power_transfer_company_id, ptcr.type, ptcr.resources_num, ptcr.resources_id
         from jc_power_transfer pt
-                 left join jc_power_transfer_company ptc on pt.sequence_nbr = ptc.power_transfer_id
-                 left join jc_power_transfer_company_resources ptcr on ptc.sequence_nbr = ptcr.power_transfer_company_id
-        where pt.rec_date BETWEEN #{beginDate} AND #{endDate}
-          and ptc.is_distribution_agencies = 0
+        left join jc_power_transfer_company ptc on pt.sequence_nbr = ptc.power_transfer_id
+        left join jc_power_transfer_company_resources ptcr on ptc.sequence_nbr = ptcr.power_transfer_company_id
+        where ptc.is_distribution_agencies = 0
+        <if test="beginDate != null and beginDate != ''">
+            AND pt.rec_date &gt;= #{beginDate}
+        </if>
+
+        <if test="endDate != null and endDate != ''">
+            AND pt.rec_date &lt;= #{endDate}
+        </if>
         order by pt.rec_date asc
     </select>
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/controller/PowerTransferController.java

@@ -188,8 +188,8 @@ public class PowerTransferController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @GetMapping(value = "/power/list")
     @ApiOperation(value = "力量出动列表", notes = "力量调派资源树")
-    public ResponseModel<Object> getPowerTransferList(@ApiParam(value = "开始日期", required = true) @RequestParam String beginDate,
-                                                      @ApiParam(value = "结束日期", required = true) @RequestParam String endDate) {
+    public ResponseModel<Object> getPowerTransferList(@ApiParam(value = "开始日期") @RequestParam(defaultValue = "") String beginDate,
+                                                      @ApiParam(value = "结束日期") @RequestParam(defaultValue = "") String endDate) {
         return ResponseHelper.buildResponse(powerTransferService.getPowerTransferList(beginDate, endDate));
     }
 

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

@@ -17,10 +17,13 @@ import com.yeejoin.amos.boot.module.jcs.api.enums.DutyInfoEnum;
 import com.yeejoin.amos.boot.module.jcs.api.mapper.AlertCalledMapper;
 import com.yeejoin.amos.boot.module.jcs.api.mapper.TemplateMapper;
 import com.yeejoin.amos.boot.module.jcs.api.service.IAlertCalledService;
+import com.yeejoin.amos.component.rule.config.RuleConfig;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+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;
 import org.typroject.tyboot.core.foundation.utils.Bean;
 import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
@@ -56,7 +59,10 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto,AlertCall
     RuleAlertCalledService ruleAlertCalledService;
 
 	@Autowired
-	TemplateServiceImpl templateService;
+	private EmqKeeper emqKeeper;
+
+	@Value("${mqtt.topic.command.alert.notice}")
+	private String topic;
 
 	@Autowired
 	TemplateMapper templateMapper;
@@ -123,7 +129,10 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto,AlertCall
               alertCalledObjsDto.setAlertFormValue(alertFormValuelist);
               //调用规则          
               ruleAlertCalledService.fireAlertCalledRule(alertCalledObjsDto);
-         }
+              //通知实战指挥页面发送mqtt 默认发送 String 类型 0, 新警情 1 警情状态变化
+			 emqKeeper.getMqttClient().publish(topic, "0".getBytes(), RuleConfig.DEFAULT_QOS, true);
+
+		 }
         
          
          /**