feats

pom.xml

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

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

@@ -621,13 +621,14 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
             tdCityMapper.updateById(city);
         }
 
+        // 新联康不需要这个逻辑了
         //新建项目以后自动授权给当前用户
-        TaUser taUser = taUserMapper.selectById(userId);
-        TaPersonBuilding taPersonBuilding = new TaPersonBuilding();
-        taPersonBuilding.setBuildingId(building.getBuildingId());
-        taPersonBuilding.setUserId(taUser.getUserId());
-        taPersonBuilding.setCreateDate(LocalDateTime.now());
-        taPersonBuildingMapper.insert(taPersonBuilding);
+//        TaUser taUser = taUserMapper.selectById(userId);
+//        TaPersonBuilding taPersonBuilding = new TaPersonBuilding();
+//        taPersonBuilding.setBuildingId(building.getBuildingId());
+//        taPersonBuilding.setUserId(taUser.getUserId());
+//        taPersonBuilding.setCreateDate(LocalDateTime.now());
+//        taPersonBuildingMapper.insert(taPersonBuilding);
 
         // 项目主图
         String imgStr = object.getString("img");

src/main/java/com/yunzhi/marketing/xlk/controller/BrandController.java

@@ -29,7 +29,9 @@ import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletRequest;
 import java.time.LocalDateTime;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -93,7 +95,12 @@ public class BrandController extends BaseController {
     public ResponseBean wxBrandList(@RequestParam(value ="brandName",required = false) String brandName,
                                   @RequestParam(value ="cityId",required = false) Integer cityId,
                                   @RequestHeader("authorization") String token,HttpServletRequest request){
-        return iBrandService.getWxBrandList(cityId,brandName,getOrgId(request));
+        List<Brand> brandList = iBrandService.getWxBrandList(cityId, brandName, getOrgId(request));
+
+        Map<String, Object> result = new HashMap<>();
+        result.put("records", brandList);
+
+        return ResponseBean.success(result);
     }
 
     /**

src/main/java/com/yunzhi/marketing/xlk/mapper/BrandMapper.java

@@ -6,6 +6,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /**
  * <p>
  * 品牌开发商表  Mapper 接口
@@ -23,5 +25,5 @@ public interface BrandMapper extends BaseMapper<Brand> {
      * @param brandName
      * @return
      */
-    ResponseBean getWxBrandList(Integer cityId, String brandName,Integer orgId);
+    List<Brand> getWxBrandList(Integer cityId, String brandName, Integer orgId);
 }

src/main/java/com/yunzhi/marketing/xlk/service/IBrandService.java

@@ -4,6 +4,8 @@ import com.yunzhi.marketing.base.ResponseBean;
 import com.yunzhi.marketing.xlk.entity.Brand;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.util.List;
+
 /**
  * <p>
  * 品牌开发商表  服务类
@@ -20,5 +22,5 @@ public interface IBrandService extends IService<Brand> {
      * @param brandName
      * @return
      */
-    ResponseBean getWxBrandList(Integer cityId, String brandName, Integer orgId);
+    List<Brand> getWxBrandList(Integer cityId, String brandName, Integer orgId);
 }

src/main/java/com/yunzhi/marketing/xlk/service/impl/BrandServiceImpl.java

@@ -7,6 +7,8 @@ import com.yunzhi.marketing.xlk.service.IBrandService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * <p>
  * 品牌开发商表  服务实现类
@@ -26,7 +28,7 @@ public class BrandServiceImpl extends ServiceImpl<BrandMapper, Brand> implements
      * @return
      */
     @Override
-    public ResponseBean getWxBrandList(Integer cityId, String brandName,Integer orgId) {
-        return this.baseMapper.getWxBrandList(cityId, brandName,orgId);
+    public List<Brand> getWxBrandList(Integer cityId, String brandName,Integer orgId) {
+        return this.baseMapper.getWxBrandList(cityId, brandName, orgId);
     }
 }

src/main/resources/application-prod.yml

@@ -6,7 +6,7 @@ spring:
   datasource:
     username: marketing
     password: u@cSFJ5*kS9hGP7a
-    url: jdbc:mysql://localhost:3306/marketing-cloud?useUnicode=true&serverTimezone=Asia/Shanghai&characterEncoding=utf8&allowMultiQueries=true&autoReconnect=true&zeroDateTimeBehavior=convertToNull
+    url: jdbc:mysql://210.13.107.60:3306/marketing-cloud?useUnicode=true&serverTimezone=Asia/Shanghai&characterEncoding=utf8&allowMultiQueries=true&autoReconnect=true&zeroDateTimeBehavior=convertToNull
     driver-class-name: com.mysql.cj.jdbc.Driver
     initial-size: 10 # 初始化连接数
     max-active: 20 # 最大连接数

src/main/resources/application.yml

@@ -28,7 +28,7 @@ ali:
   oss:
     endpoint: oss-cn-shanghai.aliyuncs.com
     bucketName: xlk-assets
-    bucketURL: https://xlk-assets.oss-accelerate.aliyuncs.com
+    bucketURL: https://xlk-assets.oss-cn-shanghai.aliyuncs.com
 
 # file path
 file:

src/main/resources/mapper/xlk/BrandMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yunzhi.marketing.xlk.mapper.BrandMapper">
 
-    <select id="getWxBrandList" resultType="com.yunzhi.marketing.base.ResponseBean">
+    <select id="getWxBrandList" resultType="com.yunzhi.marketing.xlk.entity.Brand">
         SELECT
             b.*
         FROM
@@ -15,7 +15,7 @@
                 ta_building t
             WHERE
                 t.org_id = #{orgId}
-            <if test="cityId != null and cityId != ''">
+            <if test="cityId != null">
                 AND t.city_id = #{cityId}
             </if>
             GROUP BY