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

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

@@ -36,6 +36,7 @@ import com.yeejoin.amos.boot.module.common.api.service.ISourceFileService;
 import com.yeejoin.amos.boot.module.jcs.api.entity.*;
 import com.yeejoin.amos.boot.module.jcs.api.mapper.JcSituationDetailMapper;
 import com.yeejoin.amos.boot.module.jcs.api.mapper.UserCarMapper;
+import com.yeejoin.amos.feign.systemctl.model.MessageModel;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.poi.xwpf.usermodel.XWPFTable;
@@ -356,8 +357,16 @@ public class AlertSubmittedServiceImpl extends BaseService<AlertSubmittedDto, Al
                 List<String> list = powerTransferMapper.selectFlightNumber(AlertStageEnums.HKJY.getCode());
                 emqKeeper.getMqttClient().publish(noticeAviation, JSONObject.toJSONString(list).getBytes(), RuleConfig.DEFAULT_QOS, false);
             }
+            // 警情结案时，修改该警情关联待办任务状态
+            if(AlertBusinessTypeEnum.警情结案.getCode().equals(alertSubmittedDto.getBusinessTypeCode())) {
+                MessageModel model = new MessageModel();
+                model.setRelationId(String.valueOf(alertCalled.getSequenceNbr()));
+                model.setIsRead(true);
+                model.setMsgType("jcs119");
+                Systemctl.messageClient.update(model);
+            }
 
-        } catch (MqttException e) {
+            } catch (MqttException e) {
             throw new RuntimeException();
         }
         return true;

amos-boot-system-equip/pom.xml

@@ -15,10 +15,6 @@
 			<artifactId>amos-boot-module-equip-biz</artifactId>
 			<version>${amos-biz-boot.version}</version>
 		</dependency>
-      <dependency>
-          <groupId>org.springframework.boot</groupId>
-          <artifactId>spring-boot-starter-security</artifactId>
-      </dependency>
   </dependencies>
    <build>
         <plugins>