diff --git a/yqzjAdmin/src/main/java/com/iformall/controller/msg/WxMsgController.java b/yqzjAdmin/src/main/java/com/iformall/controller/msg/WxMsgController.java deleted file mode 100644 index 7d0ec1e..0000000 --- a/yqzjAdmin/src/main/java/com/iformall/controller/msg/WxMsgController.java +++ /dev/null @@ -1,174 +0,0 @@ -package com.iformall.controller.msg; - -import com.aliyun.openservices.shade.com.alibaba.fastjson.JSONObject; -import com.github.pagehelper.PageInfo; -import com.iformall.annotation.SystemControllerLog; -import com.iformall.common.ErrorCode; -import com.iformall.common.Result; -import com.iformall.common.ResultData; -import com.iformall.controller.base.BaseController; -import com.iformall.domain.po.WxTemplateMsg; -import com.iformall.domain.po.base.BaseEntity; -import com.iformall.domain.po.base.TenantEntity; -import com.iformall.domain.po.msg.WxMsg; -import com.iformall.enums.EnumSendWay; -import com.iformall.enums.EnumTemplateType; -import com.iformall.service.WxMsgService; -import com.iformall.service.WxTemplateMsgService; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; -import io.swagger.annotations.ApiOperation; -import org.apache.commons.io.IOUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; -import org.springframework.web.multipart.MultipartFile; - -import java.io.File; -import java.io.FileOutputStream; -import java.util.*; - -/** - * @author gongbiao - */ -@RestController -@RequestMapping("wxMsg") -public class WxMsgController extends BaseController { - private final Logger logger = LoggerFactory.getLogger(this.getClass()); - - @Autowired - private String fmUploadDir; - - @Autowired - private WxMsgService wxMsgService; - - @Autowired - WxTemplateMsgService wxTemplateMsgService; - - @ApiOperation("分页列表接口") - @GetMapping("list") - @ApiImplicitParams({ - @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), - @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) - @SystemControllerLog(description = "标签短信-列表") - public ResultData list(@ModelAttribute WxMsg wxMsg, Integer pageNum, Integer pageSize) { - logger.debug("[" + getIpAddr() + "] WxMsgController::list"); - if (null == wxMsg) wxMsg = new WxMsg(); - wxMsg.updateTenantInfo(getTenantInfo()); - //wxMsg.setWay(EnumSendWay.TAG.getCode()); - wxMsg.setSortColumns(BaseEntity.SortField.Createtime_DESC); - final PageInfo page = wxMsgService.listAsPage(wxMsg, pageNum, pageSize); - return new ResultData(page); - } - - @ApiOperation("模板分页列表接口") - @GetMapping("templateList") - @ApiImplicitParams({ - @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), - @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) - @SystemControllerLog(description = "moban-列表") - public ResultData templateList(@ModelAttribute WxTemplateMsg wxTemplateMsg, Integer pageNum, Integer pageSize) { - logger.debug("[" + getIpAddr() + "] WxMsgController::list"); - if (null == wxTemplateMsg) wxTemplateMsg = new WxTemplateMsg(); - wxTemplateMsg.updateTenantInfo(getTenantInfo()); - final PageInfo page = wxTemplateMsgService.listAsPageForMiniApp(wxTemplateMsg, pageNum, pageSize); - return new ResultData(page); - } - - @ApiOperation("模板分页列表接口") - @GetMapping("templateListV1") - @ApiImplicitParams({ - @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), - @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) - @SystemControllerLog(description = "moban-列表") - public ResultData templateListV1(@ModelAttribute WxTemplateMsg wxTemplateMsg, Integer pageNum, Integer pageSize) { - logger.debug("[" + getIpAddr() + "] WxMsgController::list"); - if (null == wxTemplateMsg) wxTemplateMsg = new WxTemplateMsg(); - wxTemplateMsg.updateTenantInfo(getTenantInfo()); - final PageInfo page = wxTemplateMsgService.listAsPageForMiniApp(wxTemplateMsg, pageNum, pageSize); - return new ResultData(page); - } - - @ApiOperation("修改模板接口") - @PostMapping("tempUpd") - @SystemControllerLog(description = "moban xiugai") - public ResultData tempUpd(@RequestBody WxTemplateMsg wxTemplateMsg) { - logger.debug("[" + getIpAddr() + "] WxMsgController::tempUpd"); - if(wxTemplateMsg.getId() == null){ - return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); - } - wxTemplateMsg.updateTenantInfo(getTenantInfo()); -// if(null == wxTemplateMsg.getOnOff()){ -// wxTemplateMsg.setOnOff(1); -// } - wxTemplateMsgService.saveOrUpdate(wxTemplateMsg); - return new ResultData(); - } - - @ApiOperation("新增接口") - @PostMapping("add") - @SystemControllerLog(description = "标签短信-新增") - public ResultData add(@RequestBody WxMsg wxMsg) { - logger.debug("[" + getIpAddr() + "] WxMsgController::add"); - wxMsg.updateTenantInfo(getTenantInfo()); - if(null == wxMsg.getWay()){ - wxMsg.setWay(EnumSendWay.TAG.getCode()); - } - if(wxMsg.getWay() == EnumSendWay.APPINFOR.getCode() && !JSONObject.isValidObject(wxMsg.getMsg())){ - return new ResultData(ErrorCode.TEMPLATE_DATA_ERROR); - } - return wxMsgService.add(wxMsg); - } - - - @ApiOperation("根据id删除接口") - @GetMapping("/del") - @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) - @SystemControllerLog(description = "标签短信-删除") - public ResultData delete(Long id) { - logger.debug("[" + getIpAddr() + "] WxMsgController::delete"); - if(id == null){ - return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); - } - wxMsgService.deleteById(id); - return new ResultData(Result.SUCCESS, "删除成功", null); - } - - @ApiOperation("根据id查询接口") - @GetMapping("/findById") - @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) - @SystemControllerLog(description = "标签短信-查询") - public ResultData findById(Long id) { - logger.debug("[" + getIpAddr() + "] WxMsgController::findById"); - WxMsg wxMsg = wxMsgService.getById(id); - return new ResultData(wxMsg); - } - - - @RequestMapping("/excleupload") - @SystemControllerLog(description = "标签短信-导出") - public ResultData excleupload(@RequestParam("file") MultipartFile file) { - logger.debug("[" + getIpAddr() + "] WxMsgController::excleupload"); - if (file.isEmpty()) { - return new ResultData(Result.SUCCESS, "上传文件不能为空"); - } - - String filename = UUID.randomUUID() + file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")); - File path = new File(fmUploadDir); - if (!path.exists()) { - path.mkdirs(); - } - String filepath = fmUploadDir + filename; - try { - FileOutputStream out = new FileOutputStream(new File(filepath)); - IOUtils.write(file.getBytes(), out); - IOUtils.closeQuietly(out); - } catch (Exception e) { - return new ResultData(Result.ERROR, "上传失败"); - } - - return new ResultData(Result.SUCCESS, "上传成功", filepath); - } - -} diff --git a/yqzjService/src/main/java/com/iformall/service/WxMsgService.java b/yqzjService/src/main/java/com/iformall/service/WxMsgService.java deleted file mode 100644 index d08605c..0000000 --- a/yqzjService/src/main/java/com/iformall/service/WxMsgService.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.iformall.service; - -import com.github.pagehelper.PageInfo; -import com.iformall.common.ResultData; -import com.iformall.domain.po.WxCouponInject; -import com.iformall.domain.po.msg.WxMsg; -import com.iformall.domain.po.WxMsgConfig; - -public interface WxMsgService { - - /** - * 根据实体查询分页列表 - * - * @param record - * @param offset - * @param limit - * @return - */ - PageInfo listAsPage(WxMsg record, Integer pageIndex, Integer pageSize); - - /** - * 根据Id获得实体 - * - * @param id - * @return - */ - WxMsg getById(Long id); - - - ResultData add(WxMsg wxmsg); - - /** - * 根据Id删除实体 - * - * @param id - */ - void deleteById(Long id); - - void sendMsgFromCouponInject(WxMsg wxmsg, WxMsgConfig wxMsgConfig, WxCouponInject record); - - void addMsgCallback(WxMsg wxmsg, String batchNo); - - void batchSendAppinfo(WxMsg wxMsg); -// void batchSendTtAppinfo(WxMsg msg); - - void batchSendMsg(WxMsg wxMsg, WxMsgConfig wxMsgConfig, WxCouponInject couponInject); - -}