指挥app接口

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/feign/EquipFeignClient.java

@@ -159,5 +159,12 @@ public interface EquipFeignClient {
     @RequestMapping(value = "/video/getByid", method = RequestMethod.GET)
     ResponseModel<Map<String, Object>> getByid( @RequestParam Long id);
 
-
+    /**
+     *
+     *获取车辆简要信息
+     * @param id 消防车id
+     * @return
+     */
+    @RequestMapping(value = "/car/simple/{id}", method = RequestMethod.GET)
+    ResponseModel<Map<String, Object>> queryCarSimpleInfoById(@PathVariable Long id);
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/service/IDutyCarService.java

 package com.yeejoin.amos.boot.module.common.api.service;
 
+import com.alibaba.fastjson.JSONObject;
 import com.yeejoin.amos.boot.module.common.api.dto.DutyCarDto;
 
 /**
@@ -21,4 +22,11 @@ public interface IDutyCarService extends IDutyCommonService {
      * @return List<DutyCarDto>
      */
     DutyCarDto update(Long instanceId, DutyCarDto dutyCarDto);
+
+    /**
+     * 判断当前登陆人是否是车辆驾驶员
+     *
+     * @return
+     */
+    JSONObject isFireCarDriver();
 }

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

+package com.yeejoin.amos.boot.module.jcs.api.dto;
+
+import com.yeejoin.amos.boot.module.common.api.dto.AttachmentDto;
+import com.yeejoin.amos.boot.module.common.api.entity.SourceFile;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 
+ *
+ * @author system_generator
+ * @date 2021-09-08
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value="AlertCalledFeedbackDto", description="")
+public class AlertCalledFeedbackDto  extends BaseDto {
+
+   private static final long serialVersionUID = 1L;
+
+
+    @ApiModelProperty(value = "警情id")
+    private Long alertCalledId;
+
+    @ApiModelProperty(value = "反馈警情任务状态")
+    private String status;
+
+    @ApiModelProperty(value = "备注")
+    private String remark;
+
+    @ApiModelProperty(value = "图片附件")
+    private Map<String, List<AttachmentDto>> attachments;
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/entity/AlertCalledFeedback.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 io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import java.util.Date;
+
+/**
+ * 
+ *
+ * @author system_generator
+ * @date 2021-09-08
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName("jc_alert_called_feedback")
+public class AlertCalledFeedback extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 警情id
+     */
+	@TableField("alert_called_id")
+    private Long alertCalledId;
+
+    /**
+     * 反馈警情状态
+     */
+    @TableField(value = "status")
+    private String status;
+
+    /**
+     * 备注
+     */
+	@TableField("remark")
+    private String remark;
+
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/enums/AlertFeedbackStatusEnum.java

+package com.yeejoin.amos.boot.module.jcs.api.enums;
+
+import com.google.common.collect.Lists;
+import com.google.common.collect.Maps;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 
+ * <pre>
+ * 警情反馈状态枚举
+ * </pre>
+ *
+ * @author tb
+ * @version $Id: AlertStatusEnum.java, v 0.1 2021年6月23日 下午5:11:18 gwb Exp $
+ */
+@Getter
+@AllArgsConstructor
+public enum AlertFeedbackStatusEnum {
+
+    /**
+     * 执行中
+     */
+	执行中("executing", "执行中"),
+    /**
+     * 已完成
+     */
+	已完成("finished", "已完成");
+
+    private String code;
+
+    private String name;
+
+    public String getCode() {
+        return code;
+    }
+
+    public void setCode(String code) {
+        this.code = code;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+    
+	public static AlertFeedbackStatusEnum getEnum(String code)
+	{
+		for (AlertFeedbackStatusEnum status : AlertFeedbackStatusEnum.values())
+		{
+			if (status.getCode().equals(code))
+			{
+				return status;
+			}
+		}
+		return null;
+	}
+
+    /**
+     * 枚举转列表
+     *
+     * @return
+     */
+	public static List<Map<String, String>> toList() {
+	    List<Map<String, String>> enumList = Lists.newArrayList();
+	    for (AlertFeedbackStatusEnum item : AlertFeedbackStatusEnum.values()) {
+	        Map<String, String> map = Maps.newHashMap();
+	        map.put("code", item.getCode());
+	        map.put("name", item.getName());
+	        enumList.add(map);
+        }
+        return enumList;
+    }
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/enums/FireCarStatusEnum.java

 package com.yeejoin.amos.boot.module.jcs.api.enums;
 
+import com.google.common.collect.Lists;
+import com.google.common.collect.Maps;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * @author DELL
  */
@@ -32,4 +37,21 @@ public enum FireCarStatusEnum {
         }
         return null;
     }
+
+    /**
+     * 枚举转列表
+     *
+     * @return
+     */
+    public static List<Map<String, String>> toList() {
+        List<Map<String, String>> enumList = Lists.newArrayList();
+        for (FireCarStatusEnum item : FireCarStatusEnum.values()) {
+            Map<String, String> map = Maps.newHashMap();
+            map.put("key", item.getKey());
+            map.put("code", item.getCode());
+            map.put("name", item.getName());
+            enumList.add(map);
+        }
+        return enumList;
+    }
 }

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

+package com.yeejoin.amos.boot.module.jcs.api.mapper;
+
+import com.yeejoin.amos.boot.module.jcs.api.entity.AlertCalledFeedback;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ *  Mapper 接口
+ *
+ * @author system_generator
+ * @date 2021-09-08
+ */
+public interface AlertCalledFeedbackMapper extends BaseMapper<AlertCalledFeedback> {
+
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/service/IAlertCalledFeedbackService.java

+package com.yeejoin.amos.boot.module.jcs.api.service;
+
+
+import com.yeejoin.amos.boot.module.jcs.api.dto.AlertCalledFeedbackDto;
+
+/**
+ * 接口类
+ *
+ * @author system_generator
+ * @date 2021-09-08
+ */
+public interface IAlertCalledFeedbackService {
+
+    /**
+     * app-警情反馈
+     *
+     * @param model
+     * @return true/false
+     */
+    boolean handleFeedback(AlertCalledFeedbackDto model);
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/service/IPowerTransferService.java

@@ -14,6 +14,7 @@ import com.yeejoin.amos.boot.module.jcs.api.dto.ResourceStatisticsDto;
 import com.yeejoin.amos.boot.module.jcs.api.entity.PowerTransfer;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 力量调派 服务类
@@ -62,4 +63,18 @@ public interface IPowerTransferService extends IService<PowerTransfer> {
      * @return
      */
     JSONObject getPowerTransferCarResourceStatistics(Long alertCalledId);
+
+    /**
+     * 获取车辆状态列表
+     *
+     * @return
+     */
+    List<Map<String, String>> getFireCarStatusList();
+
+    /**
+     * 获取调派任务状态列表
+     *
+     * @return
+     */
+    List<Map<String, String>> getDispatchTaskStatusList();
 }

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

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yeejoin.amos.boot.module.jcs.api.mapper.AlertCalledFeedbackMapper">
+
+</mapper>

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

@@ -39,7 +39,7 @@
         SELECT ptcr.resources_id carId
         FROM `jc_power_transfer` pt
                  LEFT JOIN jc_power_transfer_company ptc ON ptc.power_transfer_id = pt.sequence_nbr
-                 LEFT JOIN jc_power_transfer_company_resources ptcr ON ptcr.power_transfer_company_id = ptc.sequence_nbr
+                 RIGHT JOIN jc_power_transfer_company_resources ptcr ON ptcr.power_transfer_company_id = ptc.sequence_nbr
         WHERE pt.alert_called_id = #{alertCalledId}
     </select>
 

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

@@ -32,6 +32,7 @@ import com.yeejoin.amos.boot.module.common.api.dto.RequestData;
 import com.yeejoin.amos.boot.module.common.api.dto.WaterResourceZhDto;
 import com.yeejoin.amos.boot.module.common.api.entity.FireTeam;
 import com.yeejoin.amos.boot.module.common.api.feign.EquipFeignClient;
+import com.yeejoin.amos.boot.module.common.api.service.IDutyCarService;
 import com.yeejoin.amos.boot.module.common.api.service.IDutyPersonService;
 import com.yeejoin.amos.boot.module.common.api.service.IFireChemicalService;
 import com.yeejoin.amos.boot.module.common.api.service.IFireExpertsService;
@@ -153,7 +154,8 @@ public class CommandController extends BaseController {
     @Autowired
     IDutyPersonService iDutyPersonService;
 
-
+    @Autowired
+    IDutyCarService iDutyCarService;
 
     /**
      * 警情列表
@@ -1031,6 +1033,7 @@ public class CommandController extends BaseController {
     public ResponseModel<Object> selectByAlertCalledId(@PathVariable Long id) {
         return ResponseHelper.buildResponse(iAlertCalledService.queryAlertCalledById(id));
     }
+
     /**
      * app-根据id查询警情力量统计
      **/
@@ -1040,4 +1043,34 @@ public class CommandController extends BaseController {
     public ResponseModel<Object> statisticsByAlertCalledId(@PathVariable Long alertId) {
         return ResponseHelper.buildResponse(powerTransferService.getPowerTransferCarResourceStatistics(alertId));
     }
+
+    /**
+     * app-车辆状态列表
+     **/
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/app/carStatus/list")
+    @ApiOperation(httpMethod = "GET", value = "app-车辆状态列表", notes = "app-车辆状态列表")
+    public ResponseModel<Object> carStatusList() {
+        return ResponseHelper.buildResponse(powerTransferService.getFireCarStatusList());
+    }
+
+    /**
+     * app-调派任务状态列表
+     **/
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/app/dispatchTaskStatus/list")
+    @ApiOperation(httpMethod = "GET", value = "app-调派任务状态列表", notes = "app-调派任务状态列表")
+    public ResponseModel<Object> powerTransferResourceStatusList() {
+        return ResponseHelper.buildResponse(powerTransferService.getFireCarStatusList());
+    }
+
+    /**
+     * app-当前登陆人是否是驾驶员
+     **/
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/app/personPost")
+    @ApiOperation(httpMethod = "GET", value = "app-当前登陆人是否是驾驶员", notes = "app-当前登陆人是否是驾驶员")
+    public ResponseModel<Object> isFireCarDriver() {
+        return ResponseHelper.buildResponse(iDutyCarService.isFireCarDriver());
+    }
 }
\ No newline at end of file

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/DutyCarServiceImpl.java

 package com.yeejoin.amos.boot.module.common.biz.service.impl;
 
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.yeejoin.amos.boot.biz.common.utils.DateUtils;
 import com.yeejoin.amos.boot.module.common.api.dto.DutyCarDto;
 import com.yeejoin.amos.boot.module.common.api.entity.DutyPersonShift;
 import com.yeejoin.amos.boot.module.common.api.entity.DynamicFormColumn;
 import com.yeejoin.amos.boot.module.common.api.entity.DynamicFormInstance;
+import com.yeejoin.amos.boot.module.common.api.entity.Firefighters;
+import com.yeejoin.amos.boot.module.common.api.feign.EquipFeignClient;
+import com.yeejoin.amos.boot.module.common.api.mapper.FirefightersMapper;
 import com.yeejoin.amos.boot.module.common.api.service.IDutyCarService;
 
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.typroject.tyboot.core.foundation.context.RequestContext;
 import org.typroject.tyboot.core.foundation.utils.Bean;
+import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -23,6 +31,17 @@ import java.util.stream.Collectors;
 @Service
 public class DutyCarServiceImpl extends DutyCommonServiceImpl implements IDutyCarService {
 
+    @Autowired
+    DynamicFormInstanceServiceImpl dynamicFormInstanceService;
+
+    @Autowired
+    FirefightersMapper firefightersMapper;
+
+    @Autowired
+    EquipFeignClient equipFeignClient;
+
+    String driverPostTypeCode = "5";
+
     @Override
     public String getGroupCode() {
         return "dutyCar";
@@ -78,4 +97,49 @@ public class DutyCarServiceImpl extends DutyCommonServiceImpl implements IDutyCa
     private void buildFormInstanceData(Long instanceId, Map<String, Object> map, DynamicFormColumn column, DynamicFormInstance formInstance) {
         fillFormInstanceData(instanceId, map, column, formInstance, sequence.nextId());
     }
+
+    @Override
+    public JSONObject isFireCarDriver() {
+        JSONObject result = new JSONObject();
+        result.put("isDriver", false);
+        result.put("carStatus", "");
+        result.put("carId", "");
+
+        String loginUserId = RequestContext.getExeUserId();
+        // 根据登陆人id查询对应消防人员
+        Firefighters firefighters =
+                firefightersMapper.selectOne(new LambdaQueryWrapper<Firefighters>().eq(Firefighters::getSystemAccount,
+                loginUserId));
+        if (ValidationUtil.isEmpty(firefighters)) {
+            return result;
+        }
+        // 消防人员id
+        Long fighterId = firefighters.getSequenceNbr();
+
+        // 当前值班班次id
+        List<Long> shiftIdList = getDutyShiftIdList();
+        if (ValidationUtil.isEmpty(shiftIdList)) {
+            return result;
+        }
+        // 当前值班人员-车辆信息
+        List<Map<String, Object>> personList = dayDutyPersonList(DateUtils.getDateNowShortStr(), shiftIdList.get(0),
+                driverPostTypeCode);
+        if (ValidationUtil.isEmpty(personList)) {
+            return result;
+        }
+
+        personList = personList.stream().filter(m -> fighterId.equals(m.get("userId"))).collect(Collectors.toList());
+        if (ValidationUtil.isEmpty(personList)) {
+            return result;
+        }
+
+        result.put("isDriver", true);
+        result.put("carId", personList.get(0).get("carId"));
+
+        ResponseModel<Map<String, Object>> resultModel =
+                equipFeignClient.queryCarSimpleInfoById((Long) personList.get(0).get("carId"));
+        Map<String, Object> carInfo = resultModel.getResult();
+        result.put("carStatus", carInfo.get("carStatus"));
+        return result;
+    }
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/SourceFileServiceImpl.java

@@ -90,10 +90,7 @@ public class SourceFileServiceImpl extends BaseService<SourceFileDto, SourceFile
     public void saveAttachments(Long sequenceNbr, Map<String, List<AttachmentDto>> attachmentMap) {
         if (!ValidationUtil.isEmpty(attachmentMap)) {
             List<SourceFile> sourceFiles = Lists.newArrayList();
-            attachmentMap.entrySet().forEach(entry -> {
-                List<AttachmentDto> attachments = entry.getValue();
-                sourceFiles.addAll(attachment2SourceFile(entry.getKey(), attachments));
-            });
+            attachmentMap.forEach((key, attachments) -> sourceFiles.addAll(attachment2SourceFile(key, attachments)));
             saveSourceFile(sequenceNbr, sourceFiles);
         }
     }

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

+package com.yeejoin.amos.boot.module.jcs.biz.controller;
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.RestController;
+import com.yeejoin.amos.boot.biz.common.controller.BaseController;
+import java.util.List;
+import com.yeejoin.amos.boot.module.jcs.biz.service.impl.AlertCalledFeedbackServiceImpl;
+import org.typroject.tyboot.core.restful.utils.ResponseHelper;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
+import org.springframework.beans.factory.annotation.Autowired;
+import javax.servlet.http.HttpServletRequest;
+import org.springframework.web.bind.annotation.*;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.module.jcs.api.dto.AlertCalledFeedbackDto;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+
+/**
+ * 警情反馈
+ *
+ * @author system_generator
+ * @date 2021-09-08
+ */
+@RestController
+@Api(tags = "警情反馈Api")
+@RequestMapping(value = "/alert-called-feedback")
+public class AlertCalledFeedbackController extends BaseController {
+
+    @Autowired
+    AlertCalledFeedbackServiceImpl alertCalledFeedbackServiceImpl;
+
+    /**
+     * 新增
+     *
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PostMapping(value = "/save")
+	@ApiOperation(httpMethod = "POST", value = "新增", notes = "新增")
+	public ResponseModel<AlertCalledFeedbackDto> save(@RequestBody AlertCalledFeedbackDto model) {
+		alertCalledFeedbackServiceImpl.handleFeedback(model);
+	    return ResponseHelper.buildResponse(model);
+	}
+
+	/**
+     * 根据sequenceNbr更新
+     *
+     * @param sequenceNbr 主键
+     * @return
+     */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PutMapping(value = "/{sequenceNbr}")
+	@ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新", notes = "根据sequenceNbr更新")
+	public ResponseModel<AlertCalledFeedbackDto> updateBySequenceNbrAlertCalledFeedback(@RequestBody AlertCalledFeedbackDto model,@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
+	    model.setSequenceNbr(sequenceNbr);
+	    return ResponseHelper.buildResponse(alertCalledFeedbackServiceImpl.updateWithModel(model));
+	}
+
+	/**
+     * 根据sequenceNbr删除
+     *
+     * @param sequenceNbr 主键
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @DeleteMapping(value = "/{sequenceNbr}")
+    @ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除", notes = "根据sequenceNbr删除")
+    public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request, @PathVariable(value = "sequenceNbr") Long sequenceNbr){
+        return ResponseHelper.buildResponse(alertCalledFeedbackServiceImpl.removeById(sequenceNbr));
+    }
+
+    /**
+     * 根据sequenceNbr查询
+     *
+	 * @param sequenceNbr  主键
+     * @return
+     */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/{sequenceNbr}")
+	@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个",  notes = "根据sequenceNbr查询单个")
+	public ResponseModel<AlertCalledFeedbackDto> selectOne(@PathVariable Long sequenceNbr) {
+	    return ResponseHelper.buildResponse(alertCalledFeedbackServiceImpl.queryBySeq(sequenceNbr));
+	}
+
+	/**
+     * 列表分页查询
+     *
+     * @param current 当前页
+     * @param current 每页大小
+     * @return
+     */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/page")
+	@ApiOperation(httpMethod = "GET",value = "分页查询",  notes = "分页查询")
+	public ResponseModel<Page<AlertCalledFeedbackDto>> queryForPage(@RequestParam(value = "current") int current,@RequestParam
+                    (value = "size") int size) {
+	    Page<AlertCalledFeedbackDto> page = new Page<AlertCalledFeedbackDto>();
+	    page.setCurrent(current);
+	    page.setSize(size);
+	    return ResponseHelper.buildResponse(alertCalledFeedbackServiceImpl.queryForAlertCalledFeedbackPage(page));
+	}
+
+	/**
+	 * 列表全部数据查询
+     *
+	 * @return
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@ApiOperation(httpMethod = "GET",value = "列表全部数据查询",   notes = "列表全部数据查询")
+	@GetMapping(value = "/list")
+	public ResponseModel<List<AlertCalledFeedbackDto>> selectForList() {
+	    return ResponseHelper.buildResponse(alertCalledFeedbackServiceImpl.queryForAlertCalledFeedbackList());
+	}
+}

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

+package com.yeejoin.amos.boot.module.jcs.biz.service.impl;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.module.common.biz.service.impl.SourceFileServiceImpl;
+import com.yeejoin.amos.boot.module.jcs.api.dto.AlertCalledFeedbackDto;
+import com.yeejoin.amos.boot.module.jcs.api.entity.AlertCalledFeedback;
+import com.yeejoin.amos.boot.module.jcs.api.mapper.AlertCalledFeedbackMapper;
+import com.yeejoin.amos.boot.module.jcs.api.mapper.PowerTransferMapper;
+import com.yeejoin.amos.boot.module.jcs.api.service.IAlertCalledFeedbackService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.typroject.tyboot.core.rdbms.service.BaseService;
+
+import java.util.List;
+
+/**
+ * 服务实现类
+ *
+ * @author system_generator
+ * @date 2021-09-08
+ */
+@Service
+public class AlertCalledFeedbackServiceImpl extends BaseService<AlertCalledFeedbackDto, AlertCalledFeedback, AlertCalledFeedbackMapper> implements IAlertCalledFeedbackService {
+
+    @Autowired
+    SourceFileServiceImpl sourceFileService;
+
+    @Autowired
+    PowerTransferMapper powerTransferMapper;
+
+    /**
+     * 分页查询
+     */
+    public Page<AlertCalledFeedbackDto> queryForAlertCalledFeedbackPage(Page<AlertCalledFeedbackDto> page) {
+        return this.queryForPage(page, null, false);
+    }
+
+    /**
+     * 列表查询 示例
+     */
+    public List<AlertCalledFeedbackDto> queryForAlertCalledFeedbackList() {
+        return this.queryForList("", false);
+    }
+
+    @Override
+    public boolean handleFeedback(AlertCalledFeedbackDto model) {
+        Long alertCalledId = model.getAlertCalledId();
+        // 更新警情调派任务状态
+        List<String> carIdList = powerTransferMapper.queryTransferCarIdsByAlertCalledId(alertCalledId);
+
+        // 保存警情反馈
+        model = createWithModel(model);
+
+        // 保存警情反馈图片
+        sourceFileService.saveAttachments(model.getSequenceNbr(), model.getAttachments());
+        return true;
+    }
+}
\ No newline at end of file

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

@@ -26,6 +26,7 @@ import com.yeejoin.amos.boot.module.jcs.api.entity.PowerTransfer;
 import com.yeejoin.amos.boot.module.jcs.api.entity.PowerTransferCompany;
 import com.yeejoin.amos.boot.module.jcs.api.entity.PowerTransferCompanyResources;
 import com.yeejoin.amos.boot.module.jcs.api.entity.Template;
+import com.yeejoin.amos.boot.module.jcs.api.enums.AlertFeedbackStatusEnum;
 import com.yeejoin.amos.boot.module.jcs.api.enums.DutyInfoEnum;
 import com.yeejoin.amos.boot.module.jcs.api.enums.FireBrigadeTypeEnum;
 import com.yeejoin.amos.boot.module.jcs.api.enums.FireCarStatusEnum;
@@ -52,7 +53,6 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.function.Function;
 import java.util.stream.Collectors;
 
 /**
@@ -513,6 +513,7 @@ public class PowerTransferServiceImpl extends BaseService<PowerTransferDto, Powe
         List<Long> shiftIdList = dutyCarService.getDutyShiftIdList();
         List<Map<String, Object>> allDutyPersonList = Lists.newArrayList();
         if (!ValidationUtil.isEmpty(shiftIdList)) {
+            // 当前值班车辆-人
             allDutyPersonList = dutyCarService.dayDutyPersonList(DateUtils.getDateNowShortStr(),
                     shiftIdList.get(0), null);
         }
@@ -541,4 +542,14 @@ public class PowerTransferServiceImpl extends BaseService<PowerTransferDto, Powe
         jsonObject.put("count", agentCountArrived);
         resourceStatistics.put(jsonKey, jsonObject);
     }
+
+    @Override
+    public List<Map<String, String>> getFireCarStatusList() {
+        return FireCarStatusEnum.toList();
+    }
+
+    @Override
+    public List<Map<String, String>> getDispatchTaskStatusList() {
+        return AlertFeedbackStatusEnum.toList();
+    }
 }

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

@@ -279,4 +279,37 @@
 				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 ('1171', '1171', '不可用', 'SYZT', NULL, NULL, NULL, NULL, NULL, '\0', '1');
 		</sql> 
 	</changeSet>
+    <changeSet author="tb" id="2021-09-08-tb-1">
+        <preConditions onFail="MARK_RAN">
+            <not>
+                <tableExists tableName="jc_alert_called_feedback"/>
+            </not>
+        </preConditions>
+        <comment>create table jc_alert_called_feedback</comment>
+        <sql>
+            CREATE TABLE `jc_alert_called_feedback` (
+            `sequence_nbr` bigint(30) NOT NULL COMMENT '主键',
+            `alert_called_id` bigint(30) NOT NULL COMMENT '警情id',
+            `status` varchar(255) NOT NULL COMMENT '反馈警情任务状态（执行中：executing，已完成：finished）',
+            `remark` varchar(255) DEFAULT NULL COMMENT '备注',
+            `rec_user_id` bigint(30) NOT NULL COMMENT '更新人id',
+            `rec_user_name` varchar(50) NOT NULL COMMENT '更新人名称',
+            `rec_date` datetime NOT NULL COMMENT '更新时间',
+            `is_delete` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除（1：删除，0：未删除）',
+            PRIMARY KEY (`sequence_nbr`)
+            ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='警情反馈';
+        </sql>
+    </changeSet>
+    <changeSet author="tb" id="2021-09-08-tb-2">
+        <preConditions onFail="MARK_RAN">
+            <not>
+                <columnExists tableName="jc_power_transfer_company_resources" columnName="status"/>
+            </not>
+        </preConditions>
+        <comment>modify table jc_power_transfer_company_resources add status column</comment>
+        <sql>
+            ALTER TABLE `jc_power_transfer_company_resources` ADD status varchar(20) DEFAULT 'executing' COMMENT
+            '调派任务状态(执行中：executing，已完成：finished)';
+        </sql>
+    </changeSet>
 </databaseChangeLog>