Merge remote-tracking branch 'origin/tb-开放平台接入' into test

device-api-service/src/main/java/com/xy/open/DeviceOpenApiService.java

@@ -15,9 +15,11 @@ import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 
 import javax.servlet.http.HttpServletRequest;
+import javax.validation.Valid;
 
 import static com.xy.utils.PlusBeans.toIPage;
 import static com.xy.utils.PlusBeans.toPageBean;
@@ -38,7 +40,7 @@ public class DeviceOpenApiService {
     @ApiOperation(value = "获取商户设备列表", notes = "获取商户设备列表")
     @Open(value = "device.page.get", version = "1.0", permission = true)
     @RequestMapping("/device/page/get")
-    public PageBean<DeviceOpenApiVO.DeviceList> devicePageGet(DeviceOpenApiDTO.DeviceListGet dto, HttpServletRequest request) {
+    public PageBean<DeviceOpenApiVO.DeviceList> devicePageGet(@RequestBody @Valid DeviceOpenApiDTO.DeviceListGet dto, HttpServletRequest request) {
         PageBean pageBean = dto.getPage();
         LambdaQueryWrapper<DeviceInfo> lqw = Wrappers.<DeviceInfo>lambdaQuery()
                 .in(DeviceInfo::getMercCode, dto.getMercCodes()

device-api-service/src/main/java/com/xy/open/dto/DeviceOpenApiDTO.java

@@ -20,10 +20,10 @@ public class DeviceOpenApiDTO {
         @ApiModelProperty(value = "分页对象", required = true)
         private PageBean page;
 
-        @NotEmpty(message = "deviceId不能为空")
+        @NotEmpty(message = "商户编码不可为空")
         @ApiModelProperty(value = "商户编码不可为空", required = true)
         private List<String> mercCodes;
- 
+
     }
 
 

device-start/src/main/resources/i18n/isp/bizerror_en.properties

@@ -0,0 +1,10 @@
+# 错误配置
+
+# 系统配置
+isp.error_isv.common-error=The system is busy.
+isp.error_isv.invalid-parameter=Invalid parameter, {0}
+
+# ==== 参数配置 ====
+
+goods.remark.notNull=The goods_remark can not be null
+goods.comment.length=The goods_comment length must >= {0} and <= {1}

device-start/src/main/resources/i18n/isp/bizerror_zh_CN.properties

@@ -0,0 +1,14 @@
+# 错误配置
+
+# 系统繁忙
+isp.error_isv.common-error=\u7cfb\u7edf\u7e41\u5fd9
+# 参数无效
+isp.error_isv.invalid-parameter=\u53c2\u6570\u65e0\u6548, {0}
+
+# ==== 参数配置 ====
+
+# 商品备注不能为空
+goods.remark.notNull=\u5546\u54c1\u5907\u6ce8\u4e0d\u80fd\u4e3a\u7a7a
+# 商品评论长度必须在{0}和{1}之间
+goods.comment.length=\u5546\u54c1\u8bc4\u8bba\u957f\u5ea6\u5fc5\u987b\u5728{0}\u548c{1}\u4e4b\u95f4
+

device-start/src/main/resources/i18n/isp/goods_error_en.properties

@@ -0,0 +1,2 @@
+isp.goods_error_100=the goods_name can NOT be null
+isp.goods_error_101=the goods_name must bigger than {0}

device-start/src/main/resources/i18n/isp/goods_error_zh_CN.properties

@@ -0,0 +1,5 @@
+# 商品名字不能为空
+isp.goods_error_100=\u5546\u54C1\u540D\u79F0\u4E0D\u80FD\u4E3A\u7A7A
+
+# 商品名称太短，不能小于{0}个字
+isp.goods_error_101=\u5546\u54C1\u540D\u79F0\u592A\u77ED\uFF0C\u4E0D\u80FD\u5C0F\u4E8E{0}\u4E2A\u5B57