diff --git a/src/main/java/com/xkrs/straw/controller/DispatchFirePointController.java b/src/main/java/com/xkrs/straw/controller/DispatchFirePointController.java index d7d57e7..964474b 100644 --- a/src/main/java/com/xkrs/straw/controller/DispatchFirePointController.java +++ b/src/main/java/com/xkrs/straw/controller/DispatchFirePointController.java @@ -5,30 +5,25 @@ import com.xkrs.straw.model.qo.AllFirePointQo; import com.xkrs.straw.service.DispatchFirePointService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.context.i18n.LocaleContextHolder; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; -import java.util.Locale; @RestController -@RequestMapping(value = "/dispatch") public class DispatchFirePointController { public static Logger log = LoggerFactory.getLogger(FirePointServiceImpl.class); - private final Locale locale = LocaleContextHolder.getLocale(); - @Resource private DispatchFirePointService firePointService; /** * 普通渠道推送火点到秸秆系统 */ - @PostMapping("/insertFirePointChannelOrdinary") +// @PostMapping("/insertFirePointChannelOrdinary") + @PostMapping("/insertFirePoint") public String insertFirePointChannelOrdinary(@RequestBody AllFirePointQo firePointQo) { return firePointService.insertFirePointChannelOrdinary(firePointQo); } diff --git a/src/main/java/com/xkrs/straw/controller/FirePointController.java b/src/main/java/com/xkrs/straw/controller/FirePointController.java index 60e15ae..0f3eb51 100644 --- a/src/main/java/com/xkrs/straw/controller/FirePointController.java +++ b/src/main/java/com/xkrs/straw/controller/FirePointController.java @@ -2,7 +2,6 @@ package com.xkrs.straw.controller; import com.xkrs.common.encapsulation.PromptMessageEnum; import com.xkrs.dao.FirePointDao; -import com.xkrs.model.qo.FirePointQo; import com.xkrs.service.FirePointService; import com.xkrs.service.StreetService; import com.xkrs.service.impl.FirePointServiceImpl; @@ -70,20 +69,6 @@ public class FirePointController { // return outputEncapsulationObject(PromptMessageEnum.SUCCESS, firePointList, locale); // } - /** - * 添加火点数据(Complete) - */ - @PostMapping("/insertFirePoint") - public String insertFirePoint(@RequestBody FirePointQo firePointQo) { -// log.info("insertFirePoint 接收到火点信息:" + firePointQo.toString()); -// boolean success = firePointService.insertFirePoint(firePointQo); -// if (success) { - return outputEncapsulationObject(PromptMessageEnum.SUCCESS, "添加成功", locale); -// } else { -// return outputEncapsulationObject(PromptMessageEnum.PROCESS_FAIL, "添加失败", locale); -// } - } - /** * (Complete) */