Merge branch 'master' of http://47.100.37.243:10080/ZHOU/yunsu

# Conflicts:
#	cloud-model/src/main/java/com/hssx/cloudmodel/service/impl/MouldFileServiceImpl.java

cloud-model/src/main/java/com/hssx/cloudmodel/controller/AppVersionController.java

@@ -0,0 +1,54 @@
+package com.hssx.cloudmodel.controller;
+
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.hssx.cloudmodel.entity.AppVersion;
+import com.hssx.cloudmodel.entity.vo.CompanyVO;
+import com.hssx.cloudmodel.service.AppVersionService;
+import com.hssx.cloudmodel.util.HttpRespMsg;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author 吴涛涛
+ * @since 2019-09-05
+ */
+@Controller
+public class AppVersionController {
+
+    @Autowired
+    private AppVersionService appVersionService;
+    @ApiOperation("比对版本")
+    @RequestMapping("/checkVersion")
+    @ResponseBody
+    public HttpRespMsg addAndUpdateRole(AppVersion appVersion) {
+        HttpRespMsg msg = new HttpRespMsg();
+        AppVersion platform = appVersionService.getOne(new QueryWrapper<AppVersion>().eq("platform", appVersion.getPlatform()));
+        if(platform == null){
+            msg.setError("数据不存在");
+        }else{
+            int i = appVersion.getVersion().compareTo(platform.getVersion());
+            if(i<0){
+                msg.data = platform;
+            }else{
+                msg.setError("版本过低");
+            }
+        }
+        return msg;
+    }
+
+}
+

cloud-model/src/main/java/com/hssx/cloudmodel/entity/AppVersion.java

@@ -0,0 +1,93 @@
+package com.hssx.cloudmodel.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import com.baomidou.mybatisplus.annotation.TableField;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author 吴涛涛
+ * @since 2019-09-05
+ */
+public class AppVersion extends Model<AppVersion> {
+
+    private static final long serialVersionUID=1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    @TableField("platform")
+    private String platform;
+
+    @TableField("version")
+    private String version;
+
+    @TableField("update_time")
+    private LocalDateTime updateTime;
+
+    @TableField("url")
+    private String url;
+
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public String getPlatform() {
+        return platform;
+    }
+
+    public void setPlatform(String platform) {
+        this.platform = platform;
+    }
+
+    public String getVersion() {
+        return version;
+    }
+
+    public void setVersion(String version) {
+        this.version = version;
+    }
+
+    public LocalDateTime getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(LocalDateTime updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public String getUrl() {
+        return url;
+    }
+
+    public void setUrl(String url) {
+        this.url = url;
+    }
+
+    @Override
+    protected Serializable pkVal() {
+        return this.id;
+    }
+
+    @Override
+    public String toString() {
+        return "AppVersion{" +
+        "id=" + id +
+        ", platform=" + platform +
+        ", version=" + version +
+        ", updateTime=" + updateTime +
+        ", url=" + url +
+        "}";
+    }
+}

cloud-model/src/main/java/com/hssx/cloudmodel/mapper/AppVersionMapper.java

@@ -0,0 +1,16 @@
+package com.hssx.cloudmodel.mapper;
+
+import com.hssx.cloudmodel.entity.AppVersion;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author 吴涛涛
+ * @since 2019-09-05
+ */
+public interface AppVersionMapper extends BaseMapper<AppVersion> {
+
+}

cloud-model/src/main/java/com/hssx/cloudmodel/service/AppVersionService.java

@@ -0,0 +1,16 @@
+package com.hssx.cloudmodel.service;
+
+import com.hssx.cloudmodel.entity.AppVersion;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author 吴涛涛
+ * @since 2019-09-05
+ */
+public interface AppVersionService extends IService<AppVersion> {
+
+}

cloud-model/src/main/java/com/hssx/cloudmodel/service/impl/AppVersionServiceImpl.java

@@ -0,0 +1,20 @@
+package com.hssx.cloudmodel.service.impl;
+
+import com.hssx.cloudmodel.entity.AppVersion;
+import com.hssx.cloudmodel.mapper.AppVersionMapper;
+import com.hssx.cloudmodel.service.AppVersionService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author 吴涛涛
+ * @since 2019-09-05
+ */
+@Service
+public class AppVersionServiceImpl extends ServiceImpl<AppVersionMapper, AppVersion> implements AppVersionService {
+
+}

cloud-model/src/main/resources/mapper/AppVersionMapper.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.hssx.cloudmodel.mapper.AppVersionMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.hssx.cloudmodel.entity.AppVersion">
+        <id column="id" property="id" />
+        <result column="platform" property="platform" />
+        <result column="version" property="version" />
+        <result column="update_time" property="updateTime" />
+        <result column="url" property="url" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, platform, version, update_time, url
+    </sql>
+
+</mapper>