版本信息新增字段device_model,区别安卓和苹果

lift-system-service/src/main/java/cn/com/ty/lift/system/version/controller/VersionController.java

@@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import lombok.AllArgsConstructor;
 import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletRequest;
@@ -27,25 +28,25 @@ public class VersionController {
      * @return 版本信息
      */
     @PostMapping("version")
-    public RestResponse<?> version(HttpServletRequest request) {
+    public RestResponse<?> version(HttpServletRequest request, @RequestBody Version version) {
         String mobileType = request.getHeader("mobileType");
-        if (mobileType == null) {
+        if (mobileType == null || version.getDeviceModel() == null) {
             return RestResponse.fail();
         }
         int type = Integer.parseInt(mobileType);
         QueryWrapper<Version> query = Wrappers.query();
         switch (type) {
             case ApiConstants.ACCESS_TYPE_PC:
-                query.eq("device", ApiConstants.ACCESS_TYPE_PC);
+                query.eq("device", ApiConstants.ACCESS_TYPE_PC).eq("device_model", version.getDeviceModel());
                 break;
             case ApiConstants.ACCESS_TYPE_APP:
-                query.eq("device", ApiConstants.ACCESS_TYPE_APP);
+                query.eq("device", ApiConstants.ACCESS_TYPE_APP).eq("device_model", version.getDeviceModel());
                 break;
             case ApiConstants.ACCESS_TYPE_PUBLIC:
-                query.eq("device", ApiConstants.ACCESS_TYPE_PUBLIC);
+                query.eq("device", ApiConstants.ACCESS_TYPE_PUBLIC).eq("device_model", version.getDeviceModel());
                 break;
             case ApiConstants.ACCESS_TYPE_APPLETS:
-                query.eq("device", ApiConstants.ACCESS_TYPE_APPLETS);
+                query.eq("device", ApiConstants.ACCESS_TYPE_APPLETS).eq("device_model", version.getDeviceModel());
                 break;
         }
         return RestResponse.success(versionMapper.selectOne(query));

lift-system-service/src/main/java/cn/com/ty/lift/system/version/dao/entity/Version.java

@@ -14,4 +14,5 @@ public class Version {
     private String url;
     private Integer code;
     private Integer forceUpdate;
+    private Integer deviceModel;
 }