Merge branch '2.0.0' of http://git.ycjcjy.com/fuxingfan/smartCommunity into 2.0.0

CODE/smart-community/app-api/src/main/java/com/community/huiju/controller/TaVersionController.java

@@ -0,0 +1,46 @@
+package com.community.huiju.controller;
+
+import com.community.commom.mode.ResponseBean;
+import com.community.huiju.service.TaVersionServicel;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cloud.context.config.annotation.RefreshScope;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpSession;
+
+/**
+ * version V1.0
+ * class_name: $METHOD_NAME$
+ * param: $METHOD_PARAM$
+ * describe: TODO
+ * creat_user:fuxingfan
+ * creat_time: 2019/5/9
+ **/
+@RestController
+@RefreshScope
+@RequestMapping("/")
+@Api(value = "版本相关的API", description = "版本相关的API")
+public class TaVersionController extends BaseController {
+
+
+    @Autowired
+    private TaVersionServicel taVersionService;
+
+
+    @ApiOperation(value = "获取APP版本号并对比", notes = "获取APP版本号并对比")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "path",dataType = "String",name = "type",value = "ios/android"),
+    })
+    @RequestMapping(value = "/version/{type}",method = RequestMethod.GET)
+    public ResponseBean getVersion(@PathVariable String type, HttpSession session){
+        ResponseBean responseBean = taVersionService.getVersion(type);
+        return responseBean;
+    }
+}

CODE/smart-community/app-api/src/main/java/com/community/huiju/dao/TaVersionMapper.java

@@ -0,0 +1,11 @@
+package com.community.huiju.dao;
+
+import com.community.huiju.model.TaVersion;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+
+@Mapper
+public interface TaVersionMapper {
+    TaVersion getVersion(@Param("type") String type);
+}

CODE/smart-community/app-api/src/main/java/com/community/huiju/model/TaVersion.java

@@ -0,0 +1,68 @@
+package com.community.huiju.model;
+
+import java.util.Date;
+import java.util.List;
+
+public class TaVersion {
+    private Integer id;
+    
+    /**
+     * 客户端版本号
+     */
+    private String clientVersion;
+    
+    /**
+     *  服务端版本号
+     */
+    private String serviceVersion;
+    
+    /**
+     * 类型
+     */
+    private String type;
+    
+    /**
+     * 升级地址
+     */
+    private String updateAddress;
+    
+    public Integer getId() {
+        return id;
+    }
+    
+    public void setId(Integer id) {
+        this.id = id;
+    }
+    
+    public String getClientVersion() {
+        return clientVersion;
+    }
+    
+    public void setClientVersion(String clientVersion) {
+        this.clientVersion = clientVersion;
+    }
+    
+    public String getServiceVersion() {
+        return serviceVersion;
+    }
+    
+    public void setServiceVersion(String serviceVersion) {
+        this.serviceVersion = serviceVersion;
+    }
+    
+    public String getType() {
+        return type;
+    }
+    
+    public void setType(String type) {
+        this.type = type;
+    }
+    
+    public String getUpdateAddress() {
+        return updateAddress;
+    }
+    
+    public void setUpdateAddress(String updateAddress) {
+        this.updateAddress = updateAddress;
+    }
+}

CODE/smart-community/app-api/src/main/java/com/community/huiju/service/TaVersionServicel.java

@@ -0,0 +1,21 @@
+package com.community.huiju.service;
+
+import com.community.commom.mode.ResponseBean;
+import com.community.commom.session.UserElement;
+
+/**
+ * version V1.0
+ * class_name: $METHOD_NAME$
+ * param: $METHOD_PARAM$
+ * describe: TODO
+ * creat_user:fuxingfan
+ * creat_time: 2019/5/9
+ **/
+public interface TaVersionServicel {
+    /**
+     * 获取版本号
+     * @param type
+     * @return
+     */
+    ResponseBean getVersion(String type);
+}

CODE/smart-community/app-api/src/main/java/com/community/huiju/service/impl/TaVersionServiceimpl.java

@@ -0,0 +1,48 @@
+package com.community.huiju.service.impl;
+
+import com.community.commom.mode.ResponseBean;
+import com.community.commom.session.UserElement;
+import com.community.huiju.dao.TaVersionMapper;
+import com.community.huiju.dao.TpHotelImgMapper;
+import com.community.huiju.dao.TpHotelMapper;
+import com.community.huiju.dao.TpHotelRoomMapper;
+import com.community.huiju.model.TaVersion;
+import com.community.huiju.model.TpHotel;
+import com.community.huiju.model.TpHotelRoom;
+import com.community.huiju.service.TaVersionServicel;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * version V1.0
+ * class_name: $METHOD_NAME$
+ * param: $METHOD_PARAM$
+ * describe: TODO
+ * creat_user:fuxingfan
+ * creat_time: 2019/5/9
+ **/
+@Service("taVersionService")
+@Transactional
+public class TaVersionServiceimpl implements TaVersionServicel {
+    
+    @Autowired
+    private TaVersionMapper taVersionMapper;
+    /**
+     * 获取版本号
+     *
+     * @param type
+     * @return
+     */
+    @Override
+    public ResponseBean getVersion(String type) {
+        ResponseBean responseBean = new ResponseBean();
+        TaVersion taVersion = taVersionMapper.getVersion(type);
+        responseBean.addSuccess(taVersion);
+        return responseBean;
+    }
+}

CODE/smart-community/app-api/src/main/resources/mapper/TaVersionMapper.xml

@@ -0,0 +1,15 @@
+<?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.community.huiju.dao.TaVersionMapper" >
+  <resultMap id="BaseResultMap" type="com.community.huiju.model.TaVersion" >
+    <id column="id" property="id" jdbcType="INTEGER" />
+    <result column="client_version" property="clientVersion" jdbcType="VARCHAR" />
+    <result column="service_version" property="serviceVersion" jdbcType="VARCHAR" />
+    <result column="type" property="type" jdbcType="VARCHAR" />
+    <result column="update_address" property="updateAddress" jdbcType="VARCHAR" />
+  </resultMap>
+
+  <select id="getVersion" resultMap="BaseResultMap">
+    select id,client_version,service_version,update_address FROM ta_version  where `type` = #{type,jdbcType=VARCHAR}
+  </select>
+</mapper>