*)警情报送添加调度类型字段

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

@@ -32,12 +32,18 @@ public class AlertSubmitted extends BaseEntity {
     @ApiModelProperty(value = "警情id")
     private Long alertCalledId;
 
-    @ApiModelProperty(value = "业务类型")
+    @ApiModelProperty(value = "业务类型(警情续报、非警情确认、警情结案)")
     private String businessType;
 
     @ApiModelProperty(value = "业务类型code")
     private String businessTypeCode;
 
+    @ApiModelProperty(value = "调度类型(融合调度、外部协调)")
+    private String schedulingType;
+
+    @ApiModelProperty(value = "调度类型code")
+    private String schedulingTypeCode;
+
     @ApiModelProperty(value = "报送时间")
     private Date submissionTime;
 
@@ -47,7 +53,7 @@ public class AlertSubmitted extends BaseEntity {
     @ApiModelProperty(value = "发送人")
     private String sender;
 
-    @ApiModelProperty(value = "报送方式")
+    @ApiModelProperty(value = "报送方式(电话、短信)")
     private String submissionMethod;
 
     @ApiModelProperty(value = "报送方式code")

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/vo/AlertSubmittedVo.java

@@ -31,12 +31,18 @@ public class AlertSubmittedVo{
     @ApiModelProperty(value = "警情id")
     private Long alertCalledId;
 
-    @ApiModelProperty(value = "业务类型")
+    @ApiModelProperty(value = "业务类型(警情续报、非警情确认、警情结案)")
     private String businessType;
 
     @ApiModelProperty(value = "业务类型code")
     private String businessTypeCode;
 
+    @ApiModelProperty(value = "调度类型(融合调度、外部协调)")
+    private String schedulingType;
+
+    @ApiModelProperty(value = "调度类型code")
+    private String schedulingTypeCode;
+
     @ApiModelProperty(value = "报送时间")
     private Date submissionTime;
 
@@ -46,7 +52,7 @@ public class AlertSubmittedVo{
     @ApiModelProperty(value = "发送人")
     private String sender;
 
-    @ApiModelProperty(value = "报送方式")
+    @ApiModelProperty(value = "报送方式(电话、短信)")
     private String submissionMethod;
 
     @ApiModelProperty(value = "报送方式code")

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/vo/SchedulingReportingVo.java

+package com.yeejoin.amos.boot.module.jcs.api.vo;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * 警情报送和融合调度vo
+ * @author DELL
+ */
+@Data
+public class SchedulingReportingVo {
+    /**
+     * 额外信息（统计）
+     */
+    private String extraInfo;
+
+    /**
+     * 警情报送/融合调度列表
+     */
+    List<AlertSubmittedVo> schedulingReportingList;
+}

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/controller/AlertSubmittedController.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.apache.commons.lang3.StringUtils;
-import org.springframework.web.bind.annotation.RestController;
-import com.yeejoin.amos.boot.biz.common.controller.BaseController;
-
-import com.yeejoin.amos.boot.module.jcs.api.service.IAlertSubmittedService;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import org.springframework.beans.factory.annotation.Autowired;
-import javax.servlet.http.HttpServletRequest;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import org.springframework.web.bind.annotation.*;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.yeejoin.amos.boot.module.jcs.api.entity.AlertSubmitted;
+import com.yeejoin.amos.boot.biz.common.controller.BaseController;
+import com.yeejoin.amos.boot.biz.common.utils.CommonResponseUtil;
 import com.yeejoin.amos.boot.biz.common.utils.NameUtils;
-import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import com.yeejoin.amos.boot.module.jcs.api.entity.AlertSubmitted;
+import com.yeejoin.amos.boot.module.jcs.api.service.IAlertSubmittedService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
+
+import javax.servlet.http.HttpServletRequest;
 import java.util.Arrays;
 
 
@@ -42,8 +46,8 @@ public class AlertSubmittedController extends BaseController {
     @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/save", method = RequestMethod.POST)
     @ApiOperation(httpMethod = "POST", value = "新增警情报送记录", notes = "新增警情报送记录")
-    public boolean saveAlertSubmitted(HttpServletRequest request, @RequestBody AlertSubmitted alertSubmitted){
-        return iAlertSubmittedService.save(alertSubmitted);
+    public ResponseModel saveAlertSubmitted(HttpServletRequest request, @RequestBody AlertSubmitted alertSubmitted){
+        return CommonResponseUtil.success(iAlertSubmittedService.save(alertSubmitted));
     }
 
     /**
@@ -54,8 +58,8 @@ public class AlertSubmittedController extends BaseController {
     @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/{id}", method = RequestMethod.DELETE)
     @ApiOperation(httpMethod = "DELETE", value = "根据id删除", notes = "根据id删除")
-    public boolean deleteById(HttpServletRequest request, @PathVariable Long id){
-        return iAlertSubmittedService.removeById(id);
+    public ResponseModel deleteById(HttpServletRequest request, @PathVariable Long id){
+        return CommonResponseUtil.success(iAlertSubmittedService.removeById(id));
     }
 
 
@@ -68,8 +72,8 @@ public class AlertSubmittedController extends BaseController {
     @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/updateById", method = RequestMethod.PUT)
     @ApiOperation(httpMethod = "PUT", value = "修改警情报送记录", notes = "修改警情报送记录")
-    public boolean updateByIdAlertSubmitted(HttpServletRequest request, @RequestBody AlertSubmitted alertSubmitted){
-        return iAlertSubmittedService.updateById(alertSubmitted);
+    public ResponseModel updateByIdAlertSubmitted(HttpServletRequest request, @RequestBody AlertSubmitted alertSubmitted){
+        return CommonResponseUtil.success(iAlertSubmittedService.updateById(alertSubmitted));
     }
 
 
@@ -82,11 +86,16 @@ public class AlertSubmittedController extends BaseController {
     @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/{id}", method = RequestMethod.GET)
     @ApiOperation(httpMethod = "GET", value = "根据id查询", notes = "根据id查询")
-    public AlertSubmitted selectById(HttpServletRequest request, @PathVariable Long id){
-        return iAlertSubmittedService.getById(id);
+    public ResponseModel selectById(HttpServletRequest request, @PathVariable Long id){
+        return CommonResponseUtil.success(iAlertSubmittedService.getById(id));
     }
 
-
+    @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
+    @RequestMapping(value = "/schedulingReporting/list", method = RequestMethod.GET)
+    @ApiOperation(httpMethod = "GET", value = "根据警情id查询融合调度、警情报送列表", notes = "根据警情id查询融合调度、警情报送列表")
+    public ResponseModel listByAlertCallIdAndType() {
+        return CommonResponseUtil.success();
+    }
 
     /**
     * 列表分页查询
@@ -95,7 +104,7 @@ public class AlertSubmittedController extends BaseController {
     @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/list", method = RequestMethod.GET)
     @ApiOperation(httpMethod = "GET", value = "列表分页查询", notes = "列表分页查询")
-    public IPage<AlertSubmitted> listPage(String pageNum,String pageSize, AlertSubmitted alertSubmitted){
+    public IPage<AlertSubmitted> listPage(String pageNum, String pageSize, AlertSubmitted alertSubmitted) {
 
         Page<AlertSubmitted> pageBean;
         QueryWrapper<AlertSubmitted> alertSubmittedQueryWrapper = new QueryWrapper<>();