提交分支

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

@@ -1,14 +1,16 @@
 package com.community.huiju.controller;
 
-import com.aliyun.oss.OSSClient;
-import io.swagger.annotations.*;
+import com.community.huiju.service.ImageServiceI;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cloud.context.config.annotation.RefreshScope;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
 
-import java.io.ByteArrayInputStream;
-import java.util.Date;
-
 /**
  * @author weichaochao
  * @Title: ImageController
@@ -21,27 +23,16 @@ import java.util.Date;
 @Api(value = "图片操作API", description = "图片操作API")
 public class ImageController {
 
-    private static String endpoint = "http://oss-cn-hangzhou.aliyuncs.com";
-    private static String accessKeyId = "LTAIiG6xeHbVzTXC";
-    private static String accessKeySecret = "YUci8oBtm5WzobH6SP2eyZUbjCBKBo";
-    private static String bucketName = "imgurlspace";
+
+
+    @Autowired
+    private ImageServiceI imageService;
 
     @ApiOperation(value = "图片上传以及获取url", notes = "图片上传以及获取url")
     @PostMapping(value = "/getUrl", consumes = "multipart/*", headers = "content-type=multipart/form-data")
     public String uploadImgAndGetUrl(@ApiParam(value = "file" ,required = true) MultipartFile uploadFile) throws Exception {
 
-        String imgName = System.currentTimeMillis() + ".png";
-        // 创建OSSClient实例
-        OSSClient ossClient = new OSSClient(endpoint, accessKeyId, accessKeySecret);
-        // 上传
-        long time = System.currentTimeMillis();
-
-        ossClient.putObject(bucketName, imgName, new ByteArrayInputStream(uploadFile.getBytes()));
-
-        // 关闭client
-        ossClient.shutdown();
-        Date expiration = new Date(time + 3600 * 1000 * 24 * 365 * 10);
-        String url = ossClient.generatePresignedUrl(bucketName, imgName, expiration).toString();
+        String url = imageService.getImageUrl(uploadFile);
         return url;
     }
 }

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

@@ -8,15 +8,14 @@ import com.community.huiju.model.TpAnnouncement;
 import com.community.huiju.model.TpTicket;
 import com.community.huiju.model.TpTransaction;
 import com.community.huiju.service.SocialServiceI;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cloud.context.config.annotation.RefreshScope;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpSession;
+import java.io.IOException;
 import java.util.List;
 
 /**
@@ -163,13 +162,13 @@ public class SocialController {
                     "title:小区标题，content：小区类容, type"),
             @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token")
     })
-    @RequestMapping(value = "/addTransaction", method = RequestMethod.POST)
+    @PostMapping(value = "/addTransaction", consumes = "multipart/*", headers = "content-type=multipart/form-data")
     @ResponseBody
-    public ResponseBean addTransaction(@RequestBody String paramets, HttpSession session) {
+    public ResponseBean addTransaction(@RequestBody String paramets, @ApiParam(value = "file" ,required = true) MultipartFile uploadFile, HttpSession session) throws IOException {
         ResponseBean responseBean = new ResponseBean();
         UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
         Integer userId = userElement.getId();
-        ResponseBean response = socialServiceI.addAllTransaction(userId, paramets);
+        ResponseBean response = socialServiceI.addAllTransaction(userId, paramets, uploadFile);
         return response;
     }
 

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

@@ -0,0 +1,19 @@
+package com.community.huiju.dao;
+
+import com.community.huiju.model.TdImages;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface TdImagesMapper {
+    int deleteByPrimaryKey(Integer id);
+
+    int insert(TdImages record);
+
+    int insertSelective(TdImages record);
+
+    TdImages selectByPrimaryKey(Integer id);
+
+    int updateByPrimaryKeySelective(TdImages record);
+
+    int updateByPrimaryKey(TdImages record);
+}

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

@@ -0,0 +1,65 @@
+package com.community.huiju.model;
+
+import java.util.Date;
+
+public class TdImages {
+    private Integer id;
+
+    private String imageUrl;
+
+    private Integer uuid;
+
+    private String type;
+
+    private Integer createUser;
+
+    private Date createTime;
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public String getImageUrl() {
+        return imageUrl;
+    }
+
+    public void setImageUrl(String imageUrl) {
+        this.imageUrl = imageUrl == null ? null : imageUrl.trim();
+    }
+
+    public Integer getUuid() {
+        return uuid;
+    }
+
+    public void setUuid(Integer uuid) {
+        this.uuid = uuid;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type == null ? null : type.trim();
+    }
+
+    public Integer getCreateUser() {
+        return createUser;
+    }
+
+    public void setCreateUser(Integer createUser) {
+        this.createUser = createUser;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+}

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

@@ -0,0 +1,15 @@
+package com.community.huiju.service;
+
+import org.springframework.web.multipart.MultipartFile;
+
+import java.io.IOException;
+
+/**
+ * @author admin
+ * @Title: ImageServiceI
+ * @Description: TODO
+ * @date 2018/11/5
+ */
+public interface ImageServiceI {
+    String getImageUrl(MultipartFile uploadFile) throws IOException;
+}

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

@@ -2,7 +2,9 @@ package com.community.huiju.service;
 
 import com.community.commom.mode.ResponseBean;
 import com.community.huiju.model.*;
+import org.springframework.web.multipart.MultipartFile;
 
+import java.io.IOException;
 import java.util.List;
 
 /**
@@ -69,7 +71,7 @@ public interface SocialServiceI {
 	/**
 	 * 添加二手租赁帖子
 	 */
-    ResponseBean addAllTransaction(Integer userId, String paramets);
+    ResponseBean addAllTransaction(Integer userId, String paramets, MultipartFile uploadFile) throws IOException;
 
 	/**
 	 * 获取当前用户所有的帖子

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

@@ -0,0 +1,43 @@
+package com.community.huiju.service.impl;
+
+import com.aliyun.oss.OSSClient;
+import com.community.huiju.service.ImageServiceI;
+import org.springframework.stereotype.Service;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.util.Date;
+
+/**
+ * @author weichaochao
+ * @Title: ImageServiceimpl
+ * @Description: 获取图片地址实现类
+ * @date 2018/11/5
+ */
+@Service("ImageService")
+public class ImageServiceimpl implements ImageServiceI {
+
+    private static String endpoint = "http://oss-cn-hangzhou.aliyuncs.com";
+    private static String accessKeyId = "LTAIiG6xeHbVzTXC";
+    private static String accessKeySecret = "YUci8oBtm5WzobH6SP2eyZUbjCBKBo";
+    private static String bucketName = "imgurlspace";
+
+    @Override
+    public String getImageUrl(MultipartFile uploadFile) throws IOException {
+
+        String imgName = System.currentTimeMillis() + ".png";
+        // 创建OSSClient实例
+        OSSClient ossClient = new OSSClient(endpoint, accessKeyId, accessKeySecret);
+        // 上传
+        long time = System.currentTimeMillis();
+
+        ossClient.putObject(bucketName, imgName, new ByteArrayInputStream(uploadFile.getBytes()));
+
+        // 关闭client
+        ossClient.shutdown();
+        Date expiration = new Date(time + 3600 * 1000 * 24 * 365 * 10);
+        String url = ossClient.generatePresignedUrl(bucketName, imgName, expiration).toString();
+        return url;
+    }
+}

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

@@ -5,14 +5,15 @@ import com.community.commom.constant.Constant;
 import com.community.commom.mode.ResponseBean;
 import com.community.huiju.dao.*;
 import com.community.huiju.model.*;
+import com.community.huiju.service.ImageServiceI;
 import com.community.huiju.service.SocialServiceI;
 import com.github.pagehelper.PageHelper;
-import com.netflix.discovery.converters.Auto;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.multipart.MultipartFile;
 
-import java.text.SimpleDateFormat;
+import java.io.IOException;
 import java.util.Date;
 import java.util.List;
 
@@ -57,6 +58,12 @@ public class SocialServiceImpl implements SocialServiceI {
     @Autowired
     private TpTicketMapper tpTicketMapper;
 
+    @Autowired
+    private TdImagesMapper tdImagesMapper;
+
+    @Autowired
+    private ImageServiceI imageServiceI;
+
     @Override
     @Transactional
     public TpAnnouncement findAnnouncementDetail(Integer id, Integer communityId, Integer userId) {
@@ -221,7 +228,7 @@ public class SocialServiceImpl implements SocialServiceI {
 
     @Transactional
     @Override
-    public ResponseBean addAllTransaction(Integer userId, String paramets) {
+    public ResponseBean addAllTransaction(Integer userId, String paramets, MultipartFile uploadFile) throws IOException {
 
         ResponseBean response = new ResponseBean();
 
@@ -231,7 +238,7 @@ public class SocialServiceImpl implements SocialServiceI {
         String  type= (String) jsonObject.get("type");
 
         TaUser user=taUserMapper.selectByPrimaryKey(userId);
-        TpTransaction tpTransaction=new TpTransaction();
+        TpTransaction tpTransaction = new TpTransaction();
         tpTransaction.setTransactionTitle(transactionTitle);
         tpTransaction.setTransactionContent(transactionContent);
         tpTransaction.setType(type);
@@ -266,6 +273,8 @@ public class SocialServiceImpl implements SocialServiceI {
                 || Constant.TENANT.equals(sysRole.getRoleName())
                 || Constant.OWNER.equals(sysRole.getRoleName())){
             tpTransactionMapper.insertSelective(tpTransaction);
+            insertTdImage(tpTransaction, uploadFile, type, userId);
+
             TpTransaction tpTransaction1=tpTransactionMapper.getById(tpTransaction.getId());
             response.addSuccess(tpTransaction1);
         }
@@ -274,6 +283,17 @@ public class SocialServiceImpl implements SocialServiceI {
 
     }
 
+    private void insertTdImage(TpTransaction tpTransaction, MultipartFile uploadFile, String type, Integer userId) throws IOException {
+        TdImages tdImages = new TdImages();
+        Integer uuId = tpTransaction.getId();
+        String imageUrl = imageServiceI.getImageUrl(uploadFile);
+        tdImages.setImageUrl(imageUrl);
+        tdImages.setType(type);
+        tdImages.setUuid(uuId);
+        tdImages.setCreateUser(userId);
+        tdImages.setCreateTime(new Date());
+        tdImagesMapper.insertSelective(tdImages);
+    }
     @Override
     public ResponseBean selectAllTransaction(Integer userId,Integer pageNum,Integer paeSize) {
         ResponseBean responseBean = new ResponseBean();

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

@@ -56,12 +56,12 @@ public class TaVistorServiceImpl implements TaVistorServiceI {
             taVisitorMapper.insertSelective(taVisitor);
         }
 
-
     }
 
     @Override
     public List<TaVisitor> invateHis(Integer communityId, Integer userId) {
         List<TaVisitor> taVisitors = taVisitorMapper.findAllVistors(communityId, userId);
+
         for (TaVisitor taVisitor : taVisitors){
             if (Constant.EFFECTIVE.equals(taVisitor.getDrivingStatus())){
                 List<Integer> taVisitorLicenses = taVisitorLicenseMapper.findTaVistorLicenseById(taVisitor.getId());

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

@@ -0,0 +1,106 @@
+<?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.TdImagesMapper" >
+  <resultMap id="BaseResultMap" type="com.community.huiju.model.TdImages" >
+    <id column="id" property="id" jdbcType="INTEGER" />
+    <result column="image_url" property="imageUrl" jdbcType="VARCHAR" />
+    <result column="uuid" property="uuid" jdbcType="INTEGER" />
+    <result column="type" property="type" jdbcType="CHAR" />
+    <result column="create_user" property="createUser" jdbcType="INTEGER" />
+    <result column="create_time" property="createTime" jdbcType="TIMESTAMP" />
+  </resultMap>
+  <sql id="Base_Column_List" >
+    id, image_url, uuid, type, create_user, create_time
+  </sql>
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
+    select 
+    <include refid="Base_Column_List" />
+    from td_images
+    where id = #{id,jdbcType=INTEGER}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
+    delete from td_images
+    where id = #{id,jdbcType=INTEGER}
+  </delete>
+  <insert id="insert" parameterType="com.community.huiju.model.TdImages" >
+    insert into td_images (id, image_url, uuid, 
+      type, create_user, create_time
+      )
+    values (#{id,jdbcType=INTEGER}, #{imageUrl,jdbcType=VARCHAR}, #{uuid,jdbcType=INTEGER}, 
+      #{type,jdbcType=CHAR}, #{createUser,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}
+      )
+  </insert>
+  <insert id="insertSelective" parameterType="com.community.huiju.model.TdImages" >
+    insert into td_images
+    <trim prefix="(" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        id,
+      </if>
+      <if test="imageUrl != null" >
+        image_url,
+      </if>
+      <if test="uuid != null" >
+        uuid,
+      </if>
+      <if test="type != null" >
+        type,
+      </if>
+      <if test="createUser != null" >
+        create_user,
+      </if>
+      <if test="createTime != null" >
+        create_time,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        #{id,jdbcType=INTEGER},
+      </if>
+      <if test="imageUrl != null" >
+        #{imageUrl,jdbcType=VARCHAR},
+      </if>
+      <if test="uuid != null" >
+        #{uuid,jdbcType=INTEGER},
+      </if>
+      <if test="type != null" >
+        #{type,jdbcType=CHAR},
+      </if>
+      <if test="createUser != null" >
+        #{createUser,jdbcType=INTEGER},
+      </if>
+      <if test="createTime != null" >
+        #{createTime,jdbcType=TIMESTAMP},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKeySelective" parameterType="com.community.huiju.model.TdImages" >
+    update td_images
+    <set >
+      <if test="imageUrl != null" >
+        image_url = #{imageUrl,jdbcType=VARCHAR},
+      </if>
+      <if test="uuid != null" >
+        uuid = #{uuid,jdbcType=INTEGER},
+      </if>
+      <if test="type != null" >
+        type = #{type,jdbcType=CHAR},
+      </if>
+      <if test="createUser != null" >
+        create_user = #{createUser,jdbcType=INTEGER},
+      </if>
+      <if test="createTime != null" >
+        create_time = #{createTime,jdbcType=TIMESTAMP},
+      </if>
+    </set>
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.community.huiju.model.TdImages" >
+    update td_images
+    set image_url = #{imageUrl,jdbcType=VARCHAR},
+      uuid = #{uuid,jdbcType=INTEGER},
+      type = #{type,jdbcType=CHAR},
+      create_user = #{createUser,jdbcType=INTEGER},
+      create_time = #{createTime,jdbcType=TIMESTAMP}
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+</mapper>