| @@ -11,7 +11,6 @@ import io.swagger.annotations.ApiOperation; | |||||
| import org.apache.log4j.Logger; | import org.apache.log4j.Logger; | ||||
| import org.springframework.beans.factory.annotation.Autowired; | import org.springframework.beans.factory.annotation.Autowired; | ||||
| import org.springframework.web.bind.annotation.*; | import org.springframework.web.bind.annotation.*; | ||||
| import org.springframework.web.multipart.MultipartFile; | |||||
| @RestController | @RestController | ||||
| @RequestMapping("wxMsg") | @RequestMapping("wxMsg") | ||||
| @@ -63,23 +62,5 @@ public class WxMsgController extends BaseController | |||||
| public ResultData findById(Long id) { | public ResultData findById(Long id) { | ||||
| return new ResultData(Result.SUCCESS,"查询成功",wxMsgService.getById(id)); | return new ResultData(Result.SUCCESS,"查询成功",wxMsgService.getById(id)); | ||||
| } | } | ||||
| @GetMapping("/sendmsgbyexcel") | |||||
| public ResultData sendmsgbyexcel(@RequestParam("file") MultipartFile file,@ModelAttribute WxMsg wxMsg) throws Exception { | |||||
| if (file.isEmpty()) { | |||||
| return new ResultData(Result.SUCCESS,"上传文件不能为空"); | |||||
| } | |||||
| return wxMsgService.sendmsgbyexcel(file,wxMsg); | |||||
| } | |||||
| @GetMapping("/sendmsgbylabel") | |||||
| public ResultData sendmsgbylabel(@ModelAttribute WxMsg wxMsg) throws Exception { | |||||
| return wxMsgService.sendmsgbylabel(wxMsg); | |||||
| } | |||||
| } | } | ||||