修改冲突

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

@@ -11,15 +11,10 @@ import com.yeejoin.amos.boot.module.jcs.api.entity.*;
 import com.yeejoin.amos.boot.module.jcs.api.enums.SubmissionMethodEnum;
 import com.yeejoin.amos.boot.module.jcs.api.service.IAlertCalledService;
 import com.yeejoin.amos.boot.module.jcs.api.service.IAlertSubmittedService;
-<<<<<<< HEAD
 import com.yeejoin.amos.boot.module.jcs.api.vo.SchedulingReportingVo;
-
-=======
 import com.yeejoin.amos.boot.module.jcs.api.service.ITemplateService;
-import com.yeejoin.amos.boot.module.jcs.api.vo.AlertSubmittedObjectVo;
 import com.yeejoin.amos.boot.module.jcs.api.vo.FormValue;
 import com.yeejoin.amos.boot.module.jcs.api.vo.TemplateVo;
->>>>>>> ad772958ff1a7568d7147e882efbf5e837d62d2d
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang3.StringUtils;
@@ -68,14 +63,10 @@ public class AlertSubmittedController extends BaseController {
     @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/save", method = RequestMethod.POST)
     @ApiOperation(httpMethod = "POST", value = "新增警情报送记录", notes = "新增警情报送记录")
-<<<<<<< HEAD
+
     public ResponseModel<Object> saveAlertSubmitted(HttpServletRequest request, @RequestBody AlertSubmittedDto alertSubmittedDto) {
         return ResponseHelper.buildResponse(iAlertSubmittedService.save(alertSubmittedDto));
-=======
-    public ResponseModel saveAlertSubmitted(HttpServletRequest request,
-                                            @RequestBody AlertSubmittedDto alertSubmittedDto) {
-        return CommonResponseUtil.success(iAlertSubmittedService.save(alertSubmittedDto));
->>>>>>> ad772958ff1a7568d7147e882efbf5e837d62d2d
+
     }
 
     /**
@@ -87,13 +78,11 @@ public class AlertSubmittedController extends BaseController {
     @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/{id}", method = RequestMethod.DELETE)
     @ApiOperation(httpMethod = "DELETE", value = "根据id删除", notes = "根据id删除")
-<<<<<<< HEAD
+
     public ResponseModel<Boolean> deleteById(HttpServletRequest request, @PathVariable Long id){
         return ResponseHelper.buildResponse(iAlertSubmittedService.removeById(id));
-=======
-    public ResponseModel deleteById(HttpServletRequest request, @PathVariable Long id) {
-        return CommonResponseUtil.success(iAlertSubmittedService.removeById(id));
->>>>>>> ad772958ff1a7568d7147e882efbf5e837d62d2d
+
+   
     }
 
     /**
@@ -104,14 +93,11 @@ public class AlertSubmittedController extends BaseController {
     @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/updateById", method = RequestMethod.PUT)
     @ApiOperation(httpMethod = "PUT", value = "修改警情报送记录", notes = "修改警情报送记录")
-<<<<<<< HEAD
+
     public ResponseModel<Boolean> updateByIdAlertSubmitted(HttpServletRequest request, @RequestBody AlertSubmitted alertSubmitted){
         return ResponseHelper.buildResponse(iAlertSubmittedService.updateById(alertSubmitted));
-=======
-    public ResponseModel updateByIdAlertSubmitted(HttpServletRequest request,
-                                                  @RequestBody AlertSubmitted alertSubmitted) {
-        return CommonResponseUtil.success(iAlertSubmittedService.updateById(alertSubmitted));
->>>>>>> ad772958ff1a7568d7147e882efbf5e837d62d2d
+
+   
     }
 
     /**
@@ -123,13 +109,9 @@ public class AlertSubmittedController extends BaseController {
     @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/{id}", method = RequestMethod.GET)
     @ApiOperation(httpMethod = "GET", value = "根据id查询", notes = "根据id查询")
-<<<<<<< HEAD
     public ResponseModel<AlertSubmitted> selectById(HttpServletRequest request, @PathVariable Long id){
         return ResponseHelper.buildResponse(iAlertSubmittedService.getById(id));
-=======
-    public ResponseModel selectById(HttpServletRequest request, @PathVariable Long id) {
-        return CommonResponseUtil.success(iAlertSubmittedService.getById(id));
->>>>>>> ad772958ff1a7568d7147e882efbf5e837d62d2d
+
     }
 
     @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
@@ -143,15 +125,11 @@ public class AlertSubmittedController extends BaseController {
     @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/reporting/list", method = RequestMethod.POST)
     @ApiOperation(httpMethod = "POST", value = "根据警情id查询警情报送列表", notes = "根据警情id查询警情报送列表")
-<<<<<<< HEAD
+
     public ResponseModel<SchedulingReportingVo> listReportingByParam(@RequestBody AlertSubmittedDto queryParam) {
         queryParam.setSubmissionMethodCode(SubmissionMethodEnum.SMS.getCode());
         return ResponseHelper.buildResponse(iAlertSubmittedService.listReportingByParam(queryParam));
-=======
-    public ResponseModel listReportingByParam(@RequestBody AlertSubmittedDto queryParam) {
-        queryParam.setSubmissionMethodCode(SubmissionMethodEnum.PHONE.getCode());
-        return CommonResponseUtil.success(iAlertSubmittedService.listReportingByParam(queryParam));
->>>>>>> ad772958ff1a7568d7147e882efbf5e837d62d2d
+
     }
 
     /**