featrs

pom.xml

@@ -10,7 +10,7 @@
 	</parent>
 	<groupId>com.yunzhi</groupId>
 	<artifactId>marketing</artifactId>
-	<version>v1.0.13</version>
+	<version>v1.0.15</version>
 	<name>marketing-cloud</name>
 	<description>新联康营销云</description>
 

src/main/java/com/yunzhi/marketing/common/AliOSSUtils.java

@@ -57,6 +57,9 @@ public class AliOSSUtils {
             preURL += "/";
         }
 
+        // 转换空格与单引号
+        fname = fname.replaceAll("\\+", "20%").replaceAll(" ", "%20").replaceAll("'", "%27");
+
         return preURL + fname;
     }
 }

src/main/java/com/yunzhi/marketing/controller/TaBuildingDynamicController.java

@@ -589,7 +589,7 @@ public class TaBuildingDynamicController extends BaseController {
             LambdaQueryWrapper<TaBuildingDynamic> lambdaQueryWrapper = new LambdaQueryWrapper<>();
             lambdaQueryWrapper.eq(TaBuildingDynamic::getStatus,1);
             lambdaQueryWrapper.eq(TaBuildingDynamic::getType,"look");
-            lambdaQueryWrapper.eq(TaBuildingDynamic::getBuilding,dynamic.getBuildingId());
+            lambdaQueryWrapper.eq(TaBuildingDynamic::getBuildingId,dynamic.getBuildingId());
             List<TaBuildingDynamic> list = iBuildingDynamicService.list(lambdaQueryWrapper);
             if (list.size() > 0){
                 responseBean.addError("相同的项目看房团只能发布一个");

src/main/java/com/yunzhi/marketing/controller/TaMiniappMessagePersonController.java

@@ -0,0 +1,157 @@
+package com.yunzhi.marketing.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yunzhi.marketing.base.BaseController;
+import com.yunzhi.marketing.base.ResponseBean;
+import com.yunzhi.marketing.common.StringUtils;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import com.yunzhi.marketing.service.ITaMiniappMessagePersonService;
+import com.yunzhi.marketing.entity.TaMiniappMessagePerson;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletRequest;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+    * 消息订阅人员 前端控制器
+    * </p>
+ *
+ * @author yansen
+ * @since 2021-08-13
+ */
+
+@Api(tags = "消息订阅人员")
+@RestController
+@RequestMapping("/api")
+public class TaMiniappMessagePersonController extends BaseController {
+
+    private final Logger logger = LoggerFactory.getLogger(TaMiniappMessagePersonController.class);
+
+    @Autowired
+    public ITaMiniappMessagePersonService iTaMiniappMessagePersonService;
+
+
+    /**
+     * 分页查询列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/wx/miniapp-message",method= RequestMethod.GET)
+    @ApiOperation(value="列表", notes = "列表", httpMethod = "GET", response = ResponseBean.class)
+    public ResponseBean taMiniappMessagePersonList(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                                   @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                                   @ApiParam("人员") @RequestParam(value ="personId", required = false) String personId,
+                                                   @ApiParam("楼盘") @RequestParam(value ="buildingId", required = false) String buildingId,
+                                                   @ApiParam("消息类型") @RequestParam(value ="messageType", required = false) String messageType,
+                                                   HttpServletRequest request) throws Exception{
+        Integer orgId = getOrgId(request);
+
+        IPage<TaMiniappMessagePerson> pg = new Page<>(pageNum, pageSize);
+        QueryWrapper<TaMiniappMessagePerson> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("org_id", orgId);
+        queryWrapper.eq(!StringUtils.isEmpty(personId), "person_id", personId);
+        queryWrapper.eq(!StringUtils.isEmpty(buildingId), "building_id", buildingId);
+        queryWrapper.eq(!StringUtils.isEmpty(messageType), "message_type", messageType);
+        queryWrapper.orderByDesc("create_date");
+
+        IPage<TaMiniappMessagePerson> result = iTaMiniappMessagePersonService.page(pg, queryWrapper);
+        return ResponseBean.success(result);
+    }
+
+    /**
+     * 保存对象
+     * @param taMiniappMessagePerson 实体对象
+     * @return
+     */
+    @RequestMapping(value="/wx/miniapp-message",method= RequestMethod.POST)
+    @ApiOperation(value="保存", notes = "保存", httpMethod = "POST", response = ResponseBean.class)
+    public ResponseBean taMiniappMessagePersonAdd(@ApiParam("保存内容") @RequestBody TaMiniappMessagePerson taMiniappMessagePerson,
+                                                  HttpServletRequest request) throws Exception {
+        Integer orgId = getOrgId(request);
+        String personId = getPersonId(request);
+        String buildingId = taMiniappMessagePerson.getBuildingId();
+        String messageType = taMiniappMessagePerson.getMessageType();
+
+        if (StringUtils.isEmpty(messageType)) {
+            return ResponseBean.error("请设置订阅消息类型", ResponseBean.ERROR_UNAVAILABLE);
+        }
+
+        QueryWrapper<TaMiniappMessagePerson> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("org_id", orgId);
+        queryWrapper.eq("person_id", personId);
+        queryWrapper.eq(StringUtils.isEmpty(buildingId),"building_id", buildingId);
+        queryWrapper.eq("message_type", messageType);
+
+        int count = iTaMiniappMessagePersonService.count(queryWrapper);
+        if (count > 0) {
+            // 如果已经订阅过改消息类型, 则不处理
+            return ResponseBean.success("");
+        }
+
+        taMiniappMessagePerson.setOrgId(orgId);
+        taMiniappMessagePerson.setPersonId(personId);
+        taMiniappMessagePerson.setCreateDate(LocalDateTime.now());
+
+        if (iTaMiniappMessagePersonService.save(taMiniappMessagePerson)){
+            return ResponseBean.success("");
+        }else {
+            return ResponseBean.error("订阅失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
+        }
+    }
+
+//    /**
+//     * 根据id删除对象
+//     * @param id  实体ID
+//     */
+//    @RequestMapping(value="/taMiniappMessagePerson/{id}", method= RequestMethod.DELETE)
+//    @ApiOperation(value="删除", notes = "删除", httpMethod = "DELETE", response = ResponseBean.class)
+//    public ResponseBean taMiniappMessagePersonDelete(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
+//        if(iTaMiniappMessagePersonService.removeById(id)){
+//            return ResponseBean.success("success");
+//        }else {
+//            return ResponseBean.error("删除失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
+//        }
+//    }
+//
+//    /**
+//     * 修改对象
+//     * @param id  实体ID
+//     * @param taMiniappMessagePerson 实体对象
+//     * @return
+//     */
+//    @RequestMapping(value="/taMiniappMessagePerson/{id}",method= RequestMethod.PUT)
+//    @ApiOperation(value="更新", notes = "更新", httpMethod = "PUT", response = ResponseBean.class)
+//    public ResponseBean taMiniappMessagePersonUpdate(@ApiParam("对象ID") @PathVariable Integer id,
+//                                        @ApiParam("更新内容") @RequestBody TaMiniappMessagePerson taMiniappMessagePerson) throws Exception{
+//
+//        if (iTaMiniappMessagePersonService.updateById(taMiniappMessagePerson)){
+//            return ResponseBean.success(iTaMiniappMessagePersonService.getById(id));
+//        }else {
+//            return ResponseBean.error("修改失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
+//        }
+//    }
+//
+//    /**
+//     * 根据id查询对象
+//     * @param id  实体ID
+//     */
+//    @RequestMapping(value="/taMiniappMessagePerson/{id}",method= RequestMethod.GET)
+//    @ApiOperation(value="详情", notes = "详情", httpMethod = "GET", response = ResponseBean.class)
+//    public ResponseBean taMiniappMessagePersonGet(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
+//        return ResponseBean.success(iTaMiniappMessagePersonService.getById(id));
+//    }
+}

src/main/java/com/yunzhi/marketing/entity/TaMiniappMessagePerson.java

@@ -0,0 +1,49 @@
+package com.yunzhi.marketing.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 消息订阅人员
+ * </p>
+ *
+ * @author yansen
+ * @since 2021-08-13
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value="TaMiniappMessagePerson对象", description="消息订阅人员")
+public class TaMiniappMessagePerson implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "序号")
+    @TableId(value = "serial_no", type = IdType.AUTO)
+    private Integer serialNo;
+
+    @ApiModelProperty(value = "人员ID")
+    private String personId;
+
+    @ApiModelProperty(value = "消息类型")
+    private String messageType;
+
+    @ApiModelProperty(value = "关联楼盘")
+    private String buildingId;
+
+    @ApiModelProperty(value = "组织ID")
+    private Integer orgId;
+
+    @ApiModelProperty(value = "创建时间")
+    private LocalDateTime createDate;
+
+
+}

src/main/java/com/yunzhi/marketing/mapper/TaMiniappMessagePersonMapper.java

@@ -0,0 +1,18 @@
+package com.yunzhi.marketing.mapper;
+
+import com.yunzhi.marketing.entity.TaMiniappMessagePerson;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 消息订阅人员 Mapper 接口
+ * </p>
+ *
+ * @author yansen
+ * @since 2021-08-13
+ */
+@Mapper
+public interface TaMiniappMessagePersonMapper extends BaseMapper<TaMiniappMessagePerson> {
+
+}

src/main/java/com/yunzhi/marketing/service/ITaMiniappMessagePersonService.java

@@ -0,0 +1,16 @@
+package com.yunzhi.marketing.service;
+
+import com.yunzhi.marketing.entity.TaMiniappMessagePerson;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 消息订阅人员 服务类
+ * </p>
+ *
+ * @author yansen
+ * @since 2021-08-13
+ */
+public interface ITaMiniappMessagePersonService extends IService<TaMiniappMessagePerson> {
+
+}

src/main/java/com/yunzhi/marketing/service/impl/TaMiniappMessagePersonServiceImpl.java

@@ -0,0 +1,20 @@
+package com.yunzhi.marketing.service.impl;
+
+import com.yunzhi.marketing.entity.TaMiniappMessagePerson;
+import com.yunzhi.marketing.mapper.TaMiniappMessagePersonMapper;
+import com.yunzhi.marketing.service.ITaMiniappMessagePersonService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 消息订阅人员 服务实现类
+ * </p>
+ *
+ * @author yansen
+ * @since 2021-08-13
+ */
+@Service
+public class TaMiniappMessagePersonServiceImpl extends ServiceImpl<TaMiniappMessagePersonMapper, TaMiniappMessagePerson> implements ITaMiniappMessagePersonService {
+
+}

src/main/resources/mapper/TaLiveActivityMapper.xml

@@ -83,7 +83,7 @@
             t.live_activity_title AS title,
             t.live_start_date AS start_time,
             t.live_end_date AS end_time,
-            t.detail_img as images,
+            IFNULL(t.list_img, t.detail_img) as images,
             a.building_name,
             b.NAME AS city_name,
             "live" as type

src/main/resources/mapper/TaMiniappMessagePersonMapper.xml

@@ -0,0 +1,5 @@
+<?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.yunzhi.marketing.mapper.TaMiniappMessagePersonMapper">
+
+</mapper>