修改二维码接口

wisenergy-service/src/main/java/cn/wisenergy/service/app/AntiFakeService.java

@@ -9,6 +9,7 @@ import cn.wisenergy.model.dto.ProductDto;
 import com.github.pagehelper.PageInfo;
 import org.springframework.web.multipart.MultipartFile;
 
+import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.text.ParseException;
 import java.util.List;
@@ -52,10 +53,11 @@ public interface AntiFakeService {
      * 导出生成二维码的字符串
      *
      * @param batchNumber 批次号
+     * @param request 请求
      * @param response 响应
      * @return true or false
      */
-    R<Boolean> report(String batchNumber, HttpServletResponse response);
+    R<Boolean> report(String batchNumber, HttpServletRequest request,HttpServletResponse response);
 
 
     /**
@@ -64,4 +66,6 @@ public interface AntiFakeService {
      * @return 产品信息
      */
     R<ProductDto> getProductInfo(String shaValue);
+
+    R<Boolean> ceishi(String shaValue,HttpServletRequest request) throws Exception;
 }

wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/AntiFakeServiceImpl.java

@@ -15,6 +15,7 @@ import cn.wisenergy.model.vo.ReportCodeVo;
 import cn.wisenergy.service.Manager.AntiFakeManger;
 import cn.wisenergy.service.app.AntiFakeService;
 import cn.wisenergy.service.util.CodeUtils;
+import cn.wisenergy.service.util.QRCodeUtils;
 import com.alibaba.excel.EasyExcel;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.pagehelper.PageInfo;
@@ -25,6 +26,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 
+import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.text.ParseException;
 import java.util.*;
@@ -190,7 +192,7 @@ public class AntiFakeServiceImpl extends ServiceImpl<AntiFakeMapper, AntiFake> i
     }
 
     @Override
-    public R<Boolean> report(String batchNumber, HttpServletResponse response) {
+    public R<Boolean> report(String batchNumber, HttpServletRequest request, HttpServletResponse response) {
         log.info("AntiFakeServiceImpl[]report[]input.param.batchNumber:" + batchNumber);
         if (StringUtils.isBlank(batchNumber)) {
             return R.error("入参不能为空!");
@@ -202,9 +204,11 @@ public class AntiFakeServiceImpl extends ServiceImpl<AntiFakeMapper, AntiFake> i
             return R.ok(0, true);
         }
 
+        String regFullUrl = request.getScheme() + "://" + request.getServerName() + ":" + request.getServerPort()
+                + "/front/blockChain?shaValue=";
         List<ReportCodeVo> resultBo = new ArrayList<>();
         for (AntiFake anti : result) {
-            String url = REQUEST_URL + anti.getShaValue();
+            String url = regFullUrl + anti.getShaValue();
             ReportCodeVo reportCodeVo = new ReportCodeVo();
             reportCodeVo.setShaValue(url);
             resultBo.add(reportCodeVo);
@@ -267,6 +271,17 @@ public class AntiFakeServiceImpl extends ServiceImpl<AntiFakeMapper, AntiFake> i
         return R.ok(productDto);
     }
 
+    @Override
+    public R<Boolean> ceishi(String shaValue, HttpServletRequest request) throws Exception {
+//        String regFullUrl = request.getScheme() + "://" + request.getServerName() + ":" + request.getServerPort()
+//                + "/front/blockChain?shaValue=" + shaValue;
+
+        String url = "http://8.131.244.76:81/front/blockChain?shaValue=" + shaValue;
+        String destPath = "C:\\home\\image";
+        QRCodeUtils.encode(url, destPath);
+        return null;
+    }
+
 
     /**
      * 分页处理方法

wisenergy-service/src/main/java/cn/wisenergy/service/util/CodeUtils.java

 package cn.wisenergy.service.util;
 
-import cn.wisenergy.common.utils.DateUtil;
 import org.apache.commons.lang.RandomStringUtils;
 
 import java.text.ParseException;

wisenergy-service/src/main/java/cn/wisenergy/service/util/QRCodeUtils.java

@@ -247,7 +247,7 @@ public class QRCodeUtils {
     public static void main(String[] args) throws Exception {
         String text = "http://app.xitiansen.com/shop-mall/account/download";  //这里设置自定义网站url
         String logoPath = "C:\\home\\image\\test.jpg";
-        String destPath = "opt\\upload\\image";
+        String destPath = "C:\\home\\image";
         System.out.println(QRCodeUtils.encode(text, logoPath, destPath, true));
     }
 }

wisenergy-web-admin/src/main/java/cn/wisenergy/web/admin/controller/app/AntiFakeController.java

@@ -17,6 +17,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.text.ParseException;
 
@@ -70,13 +71,13 @@ public class AntiFakeController {
     @ApiOperation(value = "导出二维码", notes = "获取防伪二维码分页列表", httpMethod = "GET")
     @ApiImplicitParam(name = "batchNumber", value = "批次号", dataType = "String")
     @GetMapping("admin/report")
-    public R<Boolean> report(String batchNumber, HttpServletResponse response) {
+    public R<Boolean> report(String batchNumber,HttpServletRequest request, HttpServletResponse response) {
         log.info("shop-mall[]AntiFakeController[]report[]input.param.batchNumber:" + batchNumber);
         if (StringUtils.isBlank(batchNumber)) {
             return R.error("入参为空!");
         }
 
-        return antiFakeService.report(batchNumber, response);
+        return antiFakeService.report(batchNumber,request, response);
     }
 
     @ApiOperation(value = "获取产品信息", notes = "获取产品信息", httpMethod = "GET")
@@ -91,4 +92,16 @@ public class AntiFakeController {
         return antiFakeService.getProductInfo(shaValue);
     }
 
+    @ApiOperation(value = "测试生成二维码图片", notes = "测试生成二维码图片", httpMethod = "GET")
+    @ApiImplicitParam(name = "shaValue", value = "防伪码", dataType = "String", required = true)
+    @GetMapping("admin/ceshi")
+    public R<Boolean> ceshi(String shaValue, HttpServletRequest request) throws Exception {
+        log.info("shop-mall[]AntiFakeController[]ceshi[]input.param.shaValue:" + shaValue);
+        if (StringUtils.isBlank(shaValue)) {
+            return R.error("入参为空!");
+        }
+
+        return antiFakeService.ceishi(shaValue,request);
+    }
+
 }

wisenergy-web-admin/src/main/java/cn/wisenergy/web/admin/controller/app/LoginController.java

@@ -170,9 +170,6 @@ public class LoginController {
             config.setHeight(height);
             BufferedImage waterImage = QrCodeUtil.generate(regFullUrl, config);
             byte[] bytes = ImageUtil.watermarkImageSimple1(srcImage, waterImage);
-//            ByteArrayOutputStream out = new ByteArrayOutputStream();
-//            ImageIO.write(waterImage, "jpg", out);
-//            byte[] bytes = out.toByteArray();
 
             HttpHeaders headers = new HttpHeaders();
             headers.setContentType(MediaType.IMAGE_JPEG);