设备二维码

src/main/java/org/springblade/modules/api/controller/ApiFacilityController.java

@@ -11,7 +11,6 @@ import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
-import lombok.AllArgsConstructor;
 import org.springblade.common.constant.CommonConstant;
 import org.springblade.common.utils.DistanceUtils;
 import org.springblade.core.log.exception.ServiceException;
@@ -32,6 +31,8 @@ import org.springblade.modules.business.vo.FacilityVO;
 import org.springblade.modules.business.wrapper.FacilityModelWrapper;
 import org.springblade.modules.business.wrapper.FacilityWrapper;
 import org.springblade.modules.system.service.IUserMerchantService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
@@ -40,16 +41,23 @@ import java.util.Map;
 import java.util.stream.Collectors;
 
 @RestController
-@AllArgsConstructor
 @RequestMapping(CommonConstant.API_URL + "/facility")
 @Api(value = "设备管理接口", tags = "设备管理接口")
 public class ApiFacilityController extends BaseController {
 
-    private final IFacilityService iFacilityService;
-    private final IFacilityModelService iFacilityModelService;
-    private final IShopService iShopService;
-    private final IUserMerchantService iUserMerchantService;
-    private final IFacilityModelService facilityModelService;
+    @Autowired
+    private  IFacilityService iFacilityService;
+    @Autowired
+    private  IFacilityModelService iFacilityModelService;
+    @Autowired
+    private  IShopService iShopService;
+    @Autowired
+    private  IUserMerchantService iUserMerchantService;
+    @Autowired
+    private  IFacilityModelService facilityModelService;
+
+    @Value("${qrCode.domainUrl}")
+    private String domainUrl;
 
     @PostMapping("/save")
     @ApiOperationSupport(order = 1)
@@ -136,6 +144,10 @@ public class ApiFacilityController extends BaseController {
             pages.getRecords().forEach(facility -> {
                 facility.setFacilityImage(facilityModelMap.get(facility.getFacilityType()));
             });
+
+            pages.getRecords().forEach(facilityVO -> {
+                facilityVO.setQrCode(domainUrl + "?merchantCode=" + facilityVO.getId());
+            });
         }
 
         return R.data(FacilityWrapper.build().pageVO(pages));

src/main/java/org/springblade/modules/business/entity/Facility.java

@@ -94,4 +94,11 @@ public class Facility extends BaseEntity {
 	@ApiModelProperty(value = "设备图片")
 	private String facilityImage;
 
+	/**
+	 * 设备二维码
+	 */
+	@TableField(exist = false)
+	@ApiModelProperty(value = "设备二维码")
+	private String qrCode;
+
 }

src/main/java/org/springblade/modules/business/vo/FacilityVO.java

@@ -44,11 +44,6 @@ public class FacilityVO extends Facility {
      */
     private String facilityImage;
 
-    /**
-     * 设备二维码
-     */
-    private String qrCode;
-
     private String facilityStatusDesc;
 
     public String getFacilityStatusDesc() {