增加语音融合日志

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

+package com.yeejoin.amos.boot.module.jcs.api.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.util.Date;
+
+
+/**
+ * @description:
+ * @author: tw
+ * @createDate: 2022/8/31
+ */
+@Data
+@Accessors(chain = true)
+@TableName("jc_voice_fusion_log")
+public class VoiceFusionLog extends BaseEntity{
+    private static final long serialVersionUID = 1L;
+
+    @TableField("url")
+    private String url;
+    @TableField("user_name")
+    private String username;
+    @TableField("msg_time")
+    private Date msgTime;
+    @TableField("msg_type")
+    private String msgType;
+    @TableField("state")
+    private String state;
+    @TableField("description")
+    private String description;
+
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/mapper/VoiceFusionLogMapper.java

+package com.yeejoin.amos.boot.module.jcs.api.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.amos.boot.module.jcs.api.dto.AircraftListTreeDto;
+import com.yeejoin.amos.boot.module.jcs.api.entity.Aircraft;
+import com.yeejoin.amos.boot.module.jcs.api.entity.VoiceFusionLog;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+* 航空器信息 Mapper 接口
+*
+* @author system_generator
+* @date 2021-06-29
+*/
+public interface VoiceFusionLogMapper extends BaseMapper<VoiceFusionLog> {
+
+}

amos-boot-module/amos-boot-module-biz/amos-boot-module-command-biz/src/main/java/com/yeejoin/amos/boot/module/command/biz/controller/CommandController.java

@@ -1777,7 +1777,7 @@ public class CommandController extends BaseController {
             QueryWrapper<PowerTransferCompanyResources> queryWrapper = new QueryWrapper<>();
             queryWrapper.eq("status", FireCarStatusEnum.执行中.getCode());
             List<PowerTransferCompanyResources> alertFormValue = powerTransferCompanyResourcesMapper.selectList(queryWrapper);
-            if(result!=null){
+            if(result!=null&&result.size()>0){
                 result.stream().forEach(e -> {
                     if (e.get("carState").equals("在位")) {
                         e.put("carState", FireCarStatusEnum.执勤.getName());

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

@@ -2,11 +2,15 @@ package com.yeejoin.amos.boot.module.jcs.biz.controller;
 
 import java.lang.reflect.Field;
 import java.util.Arrays;
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
+import com.yeejoin.amos.boot.module.jcs.api.entity.VoiceFusionLog;
+import com.yeejoin.amos.boot.module.jcs.api.mapper.VoiceFusionLogMapper;
+import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
@@ -105,11 +109,39 @@ public class AlertCalledController extends BaseController {
 	
 	@Value("${mqtt.topic.command.knowledgebase.alert.match}")
 	private String topicMatch;
-    /**
-     * 新增警情接警记录
-     *
-     * @return
-     */
+
+    @Autowired
+    private VoiceFusionLogMapper voiceFusionLogMapper;
+
+    @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
+    @PostMapping(value = "/addVoiceFusionLog")
+    @ApiOperation(httpMethod = "POST", value = "新增", notes = "新增警情接警记录")
+    @Transactional
+    public ResponseModel<String> addVoiceFusionLog(@RequestBody VoiceFusionLog voiceFusionLog)  {
+
+
+      try {
+          AgencyUserModel agencyUserMode=getUserInfo();
+          voiceFusionLog.setMsgTime(new Date());
+          voiceFusionLog.setUsername(agencyUserMode.getUserName());
+          voiceFusionLog.setIsDelete(false);
+          voiceFusionLogMapper.insert(voiceFusionLog);
+
+        } catch (Exception e) {
+            e.printStackTrace();
+            throw new RuntimeException("新增失敗");
+        }
+        return ResponseHelper.buildResponse("新增成功！");
+    };
+
+
+
+
+        /**
+         * 新增警情接警记录
+         *
+         * @return
+         */
     @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
     @PostMapping(value = "/save")
     @ApiOperation(httpMethod = "POST", value = "新增警情接警记录", notes = "新增警情接警记录")

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

@@ -3424,5 +3424,33 @@
             REPLACE 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 (1385,1385, '班长', 'XZZW', NULL, '1375', NULL, NULL, NULL, b'0', 1);
         </sql>
     </changeSet>
+
+
+
+    <changeSet author="tw" id="20220831-1">
+        <preConditions onFail="MARK_RAN">
+            <not>
+                <tableExists tableName="jc_voice_fusion_log"/>
+            </not>
+        </preConditions>
+        <comment>create table jc_voice_fusion_log</comment>
+        <sql>
+            CREATE TABLE `jc_voice_fusion_log`  (
+            `sequence_nbr` bigint(0) NOT NULL COMMENT 'id',
+            `url` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL,
+            `user_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL,
+            `msg_time` datetime(0) NULL DEFAULT NULL,
+            `msg_type` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL,
+            `state` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL,
+            `description` varchar(2000) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL,
+            `rec_user_name` varchar(15) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '操作人名称',
+            `rec_user_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '操作人员',
+            `rec_date` datetime(0) NULL DEFAULT NULL COMMENT '创建时间',
+            `is_delete` bit(1) NULL DEFAULT b'0' COMMENT '是否删除',
+            PRIMARY KEY (`sequence_nbr`) USING BTREE
+            ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci ROW_FORMAT = Dynamic;
+
+        </sql>
+    </changeSet>
 </databaseChangeLog>