From c75e5d7da00741d323e2a2427c60ac56636f7949 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Thu, 20 Dec 2018 14:08:14 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=AE=A3=E4=BC=A0=E9=A1=B5][=E4=BF=AE?= =?UTF-8?q?=E6=94=B9][=E5=AF=8C=E6=96=87=E6=9C=AC=E6=95=B0=E6=8D=AE]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/WxCampaignController.java | 7 ++++++ .../iformall/service/WxCampaignService.java | 5 +++++ .../service/impl/WxCampaignServiceImpl.java | 22 +++++++++++++++++++ .../resources/mapper/WxRentContractMapper.xml | 1 + 4 files changed, 35 insertions(+) diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxCampaignController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxCampaignController.java index fccbd1f77..6930a0970 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxCampaignController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxCampaignController.java @@ -23,6 +23,7 @@ import org.springframework.web.bind.annotation.ModelAttribute; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import javax.servlet.http.HttpServletResponse; import java.util.List; import static com.iformall.domain.po.WxCampaign.Field.SortNum_ASC; @@ -91,5 +92,11 @@ public class WxCampaignController extends BaseController { return new ResultData(Result.SUCCESS, "调整顺序成功", null); } + @ApiOperation("输出富文本内容") + @GetMapping("/printHtmlById") + @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) + public void printHtmlById(Long id,HttpServletResponse response){ + wxCampaignService.printHtmlById(id,response); + } } diff --git a/mallinkService/src/main/java/com/iformall/service/WxCampaignService.java b/mallinkService/src/main/java/com/iformall/service/WxCampaignService.java index 641131afb..3e03fcc45 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxCampaignService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxCampaignService.java @@ -4,6 +4,8 @@ import com.github.pagehelper.PageInfo; import com.iformall.common.ResultData; import com.iformall.domain.po.WxCampaign; +import javax.servlet.http.HttpServletResponse; + public interface WxCampaignService { /** @@ -41,4 +43,7 @@ public interface WxCampaignService { ResultData updateStatus(WxCampaign wxCampaign); + + void printHtmlById(Long id, HttpServletResponse response); + } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCampaignServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCampaignServiceImpl.java index ef036f284..f7ef391ea 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCampaignServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCampaignServiceImpl.java @@ -25,6 +25,9 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; +import javax.servlet.http.HttpServletResponse; +import java.io.ByteArrayInputStream; +import java.io.InputStream; import java.util.Date; import java.util.HashMap; import java.util.List; @@ -197,5 +200,24 @@ public class WxCampaignServiceImpl implements WxCampaignService { return new ResultData(Result.SUCCESS,"操作成功"); } + @Override + public void printHtmlById(Long id, HttpServletResponse response) { + try { + response.setHeader("Content-type","text/html;charset=utf-8"); + WxCampaign wxCampaign = wxCampaignMapper.selectByPrimaryKey(id); + // 循环取出流中的数据 + byte[] b = new byte[1024]; + int len; + InputStream inStream = new ByteArrayInputStream(wxCampaign.getHtml().getBytes()); + while ((len = inStream.read(b)) > 0){ + response.getOutputStream().write(b, 0, len); + } + inStream.close(); + } catch (Exception e) { + logger.info("输出富文本内容" + e.getMessage()); + e.printStackTrace(); + } + } + } diff --git a/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml b/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml index 65eee0676..5ff701dc1 100644 --- a/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml @@ -161,6 +161,7 @@ left join wx_mall_building b on s.building=b.id left join wx_mall_floor f on s.floor=f.id where rc.status not in(1,5,6,7) and rc.tenant_id=#{tenantId} + order by id desc