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/SocialController.java

@@ -299,7 +299,7 @@ public class SocialController extends BaseController {
 
     @ApiOperation(value = "获取所有的二手租赁帖子", notes = "获取所有的二手租赁帖子")
     @ApiImplicitParams({@ApiImplicitParam(paramType = "path", dataType = "integer", name = "communityId", value = "小区Id"),
-            @ApiImplicitParam(paramType = "query", dataType = "String", name = "type", value = "帖子类型"),
+            @ApiImplicitParam(paramType = "query", dataType = "String", name = "type", value = "帖子类型0 代表 议事大厅 1 是邻里互助 2 是二手/租赁 3 是其他话题"),
             @ApiImplicitParam(paramType = "query", dataType = "String", name = "transactionTitle", value = "帖子标题"),
             @ApiImplicitParam(paramType = "query", dataType = "integer", name = "pageNum", value = "分页第几页"),
             @ApiImplicitParam(paramType = "query", dataType = "integer", name = "pageSize", value = "分页每页长度")}
@@ -369,7 +369,7 @@ public class SocialController extends BaseController {
         ResponseBean responseBean = new ResponseBean();
         UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
         Integer userId = userElement.getId();
-        ResponseBean response = socialServiceI.selectAllTransaction(userId, pageNum, pageSize,type);
+        ResponseBean response = socialServiceI.selectAllTransaction(userId, pageNum, pageSize,type,userElement.getCommunityId());
         return response;
     }
 

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

@@ -23,7 +23,7 @@ public interface TpTransactionMapper {
 
     List<TpTransaction> findAllTransaction(@Param("communityId") Integer communityId, @Param("transactionTitle") String transactionTitle, @Param("type") String type);
 
-    List<TpTransaction> selectTransaction(@Param("userId")Integer userId, @Param("communityId")Integer communityId,@Param("type") Integer type);
+    List<TpTransaction> selectTransaction(@Param("id")Integer userId, @Param("communityId")Integer communityId,@Param("type") Integer type);
 
     void updateTransaction(@Param("id")Integer id, @Param("transactionTitle")String transactionTitle, @Param("transactionContent")String transactionContent, @Param("userId")Integer userId);
 

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

@@ -116,7 +116,7 @@ public interface SocialServiceI {
 	 * @param userId
 	 * @return
 	 */
-	ResponseBean selectAllTransaction(Integer userId,Integer pageNum,Integer pageSize,Integer type);
+	ResponseBean selectAllTransaction(Integer userId,Integer pageNum,Integer pageSize,Integer type,Integer communityId);
 
 	/**
 	 * 修改当前帖子

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

@@ -406,10 +406,9 @@ public class SocialServiceImpl implements SocialServiceI {
         }
     }
     @Override
-    public ResponseBean selectAllTransaction(Integer userId,Integer pageNum,Integer paeSize,Integer type) {
+    public ResponseBean selectAllTransaction(Integer userId,Integer pageNum,Integer paeSize,Integer type,Integer communityId) {
         ResponseBean responseBean = new ResponseBean();
         TaUser user=taUserMapper.selectByPrimaryKey(userId);
-         Integer communityId=user.getCommunityId();
 
         //判断身份是否为业主且状态为已停用
         TaSysRole sysRole = taSysRoleMapper.findRoleByUserId(userId);
@@ -605,8 +604,10 @@ public class SocialServiceImpl implements SocialServiceI {
         ResponseBean response= new ResponseBean();
         JSONObject object= JSONObject.parseObject(paramets);
         JSONArray array= object.getJSONArray("imgArr");
-        String[]	reply= array.toArray(new String[]{});
-
+        String[] reply = null;
+        if (null!=array) {
+            reply= array.toArray(new String[]{});
+        }
         TpTransactionReply tpTransactionReply= JSONObject.parseObject(paramets,TpTransactionReply.class);
         tpTransactionReply.setCommunityId(userElement.getCommunityId());
         tpTransactionReply.setTaUserId(userElement.getId());
@@ -622,14 +623,16 @@ public class SocialServiceImpl implements SocialServiceI {
         tpTransactionReply.setCreateDate(new Date());
         tpTransactionReplyMapper.insert(tpTransactionReply);
 
-        for (String img:reply){
-            TdImages tdImages= new TdImages();
-            tdImages.setImageUrl(img);
-            tdImages.setType("reply");
-            tdImages.setUuid(tpTransactionReply.getId());
-            tdImages.setCreateTime(new Date());
-            tdImages.setCreateUser(userElement.getId());
-            tdImagesMapper.insert(tdImages);
+        if (null!=array) {
+            for (String img : reply) {
+                TdImages tdImages = new TdImages();
+                tdImages.setImageUrl(img);
+                tdImages.setType("reply");
+                tdImages.setUuid(tpTransactionReply.getId());
+                tdImages.setCreateTime(new Date());
+                tdImages.setCreateUser(userElement.getId());
+                tdImagesMapper.insert(tdImages);
+            }
         }
         response.addSuccess("成功");
         return response;

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

@@ -218,16 +218,32 @@ LEFT JOIN ta_sys_role sr ON sr.id = tsur.role_id
   </select>
 
   <select id="selectTransaction" resultMap="BaseResultMap">
-    select
+    SELECT
     <include refid="Base_Column_List" />
-    from tp_transaction
-    where community_id = #{communityId,jdbcType=INTEGER}
-    and ta_user_id = #{userId,jdbcType=INTEGER}
+    FROM
+    tp_transaction t
+    WHERE t.create_user=#{id,jdbcType=INTEGER}
+    AND t.community_id=#{communityId,jdbcType=INTEGER}
+    UNION ALL
+    SELECT
+    <include refid="Base_Column_List" />
+    FROM
+    tp_transaction t
+    INNER JOIN(SELECT
+    y.transaction_id
+    FROM
+    tp_transaction_reply y
+    LEFT JOIN tp_transaction t ON y.transaction_id = t.id
+    WHERE
+    y.ta_user_id = #{id,jdbcType=INTEGER}
     <if test="type != null and type != ''">
-      and type = #{type,jdbcType=INTEGER}
+      and  t.type = #{type,jdbcType=INTEGER}
     </if>
-    and status = 1
-    order by update_date DESC, create_date DESC
+    AND y.community_id = #{communityId,jdbcType=INTEGER}
+    AND y.transaction_id NOT IN ( SELECT t.id FROM tp_transaction t WHERE t.create_user = #{id,jdbcType=INTEGER} AND t.community_id = #{communityId,jdbcType=INTEGER}  )
+    GROUP BY
+    y.transaction_id) a ON a.transaction_id = t.id
+    order by create_date DESC
   </select>
 
   <update id="updateTransaction" parameterType="com.community.huiju.model.TpTransaction" >

CODE/smart-community/property-api/src/main/java/com/community/huiju/common/base/QRCode.java

@@ -36,14 +36,9 @@ public class QRCode {
      * @throws WriterException
      * @throws IOException
      */
-    public static InputStream encode(String tpActivityId) throws WriterException, IOException {
-        JSONObject json = new JSONObject();
-//        json.put(
-//                "zxing",
-//                "https://github.com/zxing/zxing/tree/zxing-3.0.0/javase/src/main/java/com/google/zxing");
-        json.put("activityId", tpActivityId);
+    public static InputStream encode(String url, String tpActivityId) throws WriterException, IOException {
         // 内容
-        String content = json.toJSONString();
+        String content = url + tpActivityId;
         // 图像宽度
         int width = 200;
         // 图像高度

CODE/smart-community/property-api/src/main/java/com/community/huiju/common/perproties/QRCodePerproties.java

@@ -0,0 +1,26 @@
+package com.community.huiju.common.perproties;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+/**
+ * version V1.0
+ * class_name: $METHOD_NAME$
+ * param: $METHOD_PARAM$
+ * describe: TODO
+ * creat_user:fannaixi
+ * creat_time: 2019/4/12
+ **/
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@ConfigurationProperties(prefix = "qr-code")
+@Component
+public class QRCodePerproties {
+
+    private String url;
+
+}

CODE/smart-community/property-api/src/main/java/com/community/huiju/controller/ActivityController.java

@@ -11,10 +11,12 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
+import org.apache.catalina.servlet4preview.http.HttpServletRequest;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cloud.context.config.annotation.RefreshScope;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
 import java.util.List;
 
@@ -166,5 +168,19 @@ public class ActivityController extends BaseController {
         return responseBean;
     }
 
+    @ApiOperation(value = "获取活动二维码图片", notes = "获取活动二维码图片")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "path", dataTypeClass = Integer.class, name = "id", value = "活动id"),
+    })
+    @RequestMapping(value = "/activity/code/{id}", method = RequestMethod.GET)
+    public void getActivityCode(@PathVariable("id") Integer activityId, HttpServletRequest request, HttpServletResponse response,
+                                        @RequestParam("filename") String filename, @RequestParam("imgName") String imgName) {
+
+
+
+    }
+
+
+
 
 }

CODE/smart-community/property-api/src/main/java/com/community/huiju/service/ITpActivitySignInService.java

@@ -3,6 +3,9 @@ package com.community.huiju.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.community.commom.mode.ResponseBean;
 import com.community.huiju.model.TpActivitySignIn;
+import org.apache.catalina.servlet4preview.http.HttpServletRequest;
+
+import javax.servlet.http.HttpServletResponse;
 
 /**
  * <p>

CODE/smart-community/property-api/src/main/java/com/community/huiju/service/impl/TpActivityServiceImpl.java

@@ -11,6 +11,7 @@ import com.community.commom.mode.ResponseBean;
 import com.community.commom.session.UserElement;
 import com.community.commom.utils.BeanTools;
 import com.community.huiju.common.base.QRCode;
+import com.community.huiju.common.perproties.QRCodePerproties;
 import com.community.huiju.dao.MessageMapper;
 import com.community.huiju.dao.TaUserMapper;
 import com.community.huiju.dao.TdImagesMapper;
@@ -70,6 +71,10 @@ public class TpActivityServiceImpl extends ServiceImpl<TpActivityMapper, TpActiv
 
     @Autowired
     private ImageServiceI imageServiceI;
+
+    @Autowired
+    private QRCodePerproties qrCodePerproties;
+
     @Override
     public ResponseBean listQuery(String parameter, UserElement userElement) {
         ResponseBean responseBean = new ResponseBean();
@@ -340,7 +345,7 @@ public class TpActivityServiceImpl extends ServiceImpl<TpActivityMapper, TpActiv
 
         if (radio==1){
             try {
-                InputStream inputStream= QRCode.encode(tpActivity.getId()+"");
+                InputStream inputStream= QRCode.encode(qrCodePerproties.getUrl(), tpActivity.getId()+"");
                 String codeUrl= imageServiceI.getImageUrl(inputStream);
                 TdImages tdImages= new TdImages();
                 tdImages.setImageUrl(codeUrl);

CODE/smart-community/property-api/src/main/resources/application.yml

@@ -11,3 +11,7 @@ mybatis-plus:
   configuration:
     log-impl: org.apache.ibatis.logging.stdout.StdOutImpl #打印sql语句,调试用
   mapper-locations: classpath:mapper/*.xml
+
+# 二维码生成地址
+qr-code:
+  url: http://jhhhhh?activeId=

VUECODE/smart-property-manage/package.json

@@ -14,9 +14,11 @@
     "svgo": "svgo -f src/icons/svg --config=src/icons/svgo.yml"
   },
   "dependencies": {
+    "add": "^2.0.6",
     "axios": "0.18.0",
     "element-ui": "2.4.6",
     "file-saver": "^2.0.0-rc.4",
+    "html2canvas": "^1.0.0-rc.1",
     "jquery": "^2.2.3",
     "js-cookie": "2.2.0",
     "normalize.css": "7.0.0",

VUECODE/smart-property-manage/src/views/social/activity/info/index.vue

@@ -16,7 +16,13 @@
     </div>
       <div style="padding-left:30%;">
         <div><img :src="ruleForm.activityCode" width="200" height="200" ></div>
-        <div><el-button type="primary" style="float:left;" @click=" downloadCodeImg()">查看签到名单</el-button> </div>
+        
+        <a :href="ruleForm.activityCode" download="图片">
+　　    <img :src="ruleForm.activityCode" alt="图片">
+        </a>
+
+        <!-- <a download="图片" :href="ruleForm.activityCode + 'admin/miniProgram.jpg'">点击下载</a>
+        <div><el-button type="primary" style="float:left;" @click=" downloadCodeImg()">查看签到名单</el-button> </div> -->
       </div>
     <div class="progress">
       <div class="text-progress">
@@ -26,7 +32,7 @@
       </div>
       <div class="circular"/>
       <div class="people-limit">限制{{ ruleForm.signUpMax }}人</div>
-      <el-button type="primary" style="float: left;" @click="lockSignUp">查看报名名单</el-button>
+      <a type="primary" style="float: left;" @click="lockSignUp">查看报名名单</a>
     </div>
     <span>报名截止时间：{{ formatDate(ruleForm.registrationEndTime) }}</span>
     <div class="bom-button">
@@ -103,14 +109,20 @@ export default {
       this.$router.push({ name: 'activity-signIn-index', query: { id: this.ruleForm.id }})
     },
     // 下载图片
-     downloadCodeImg(){
-      console.log('下载图片')
-      var a = document.createElement('a')
-      a.download = this.ruleForm.activityCode
-       // 设置图片地址
-      a.href = this.ruleForm.activityCode
-      a.click();
-            }
+//      downloadCodeImg(){
+//       var a = document.createElement('a')
+//       a.download = this.ruleForm.activityCode
+//        // 设置图片地址
+//       a.href = this.ruleForm.activityCode
+//       a.click();
+//     }
+   downloadCodeImg(){
+  var alink = document.createElement("a");
+  alink.href = this.ruleForm.activityCode;
+  alink.download = "pic"; //图片名
+  alink.click();
+  }
+  
 }
   }
 </script>