Merge branch 'master' of http://git.ycjcjy.com/xiangsong/xs-service

# Conflicts:
#	src/main/java/com/huiju/estateagents/controller/ExtendContentController.java

pom.xml

 	</parent>
 	<groupId>com.huiju</groupId>
 	<artifactId>zcloud</artifactId>
-	<version>v1.0.7</version>
-	<name>zhiyun</name>
-	<description>致云</description>
+	<version>1.0.0</version>
+	<name>香颂</name>
+	<description>香颂</description>
 
 	<properties>
 		<java.version>1.8</java.version>

src/main/java/com/huiju/estateagents/controller/ExtendContentController.java

      * @return
      */
     @GetMapping("/wx/extendContent")
-    public ResponseBean extendContentListOfWX(@RequestParam(value = "cityId", required = false) Integer cityId, HttpServletRequest request) {
-        return iExtendContentService.selectExtendContentListShowType(null, null, null,null, null, null, cityId,getOrgId(request));
+    public ResponseBean extendContentListOfWX(@RequestParam(value = "cityId", required = false) Integer cityId,
+                                              @RequestParam(value = "showType", required = false) String showType,
+                                              @RequestParam(value = "showPosition", required = false) String showPosition,
+                                              HttpServletRequest request) {
+        return iExtendContentService.selectExtendContentListShowType(showType, showPosition, null,null, null, null, cityId,getOrgId(request));
     }
 
 

src/main/java/com/huiju/estateagents/controller/TaPointsRecordsController.java

     })
     @RequestMapping(value="/wx/taPointsRecords",method= RequestMethod.GET)
     public ResponseBean taWxPointsRecordsList(@RequestParam(value ="pageNumber",defaultValue = "1") Integer pageNumber,
-                                            @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                              @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                              @RequestParam(value = "inout", required = false) Integer inOut,
                                               HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         try {
             IPage<TaPointsRecords> pg = new Page<>(pageNumber, pageSize);
             QueryWrapper<TaPointsRecords> queryWrapper = new QueryWrapper<>();
             queryWrapper.eq("person_id",person.getPersonId());
+            queryWrapper.gt(inOut != null && inOut == 1, "points_amount", 0);
+            queryWrapper.lt(inOut != null && inOut == -1, "points_amount", 0);
             queryWrapper.orderByDesc("create_date");
 
             IPage<TaPointsRecords> result = iTaPointsRecordsService.page(pg, queryWrapper);

src/main/java/com/huiju/estateagents/property/service/impl/TpAnnouncementServiceImpl.java

 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.center.taUser.entity.TaUser;
+import com.huiju.estateagents.common.StringUtils;
 import com.huiju.estateagents.property.dao.*;
 import com.huiju.estateagents.property.model.*;
 import com.huiju.estateagents.property.service.TpAnnouncementService;
         Integer pageNum = jsonobject.getInteger("pageNum");
         Integer announcementNumber = jsonobject.getInteger("announcementNumber");
         Integer pageSize = jsonobject.getInteger("pageSize");
+        String announcementTitle = jsonobject.getString("announcementTitle");
         tpAnnouncement.setId(announcementNumber);
+        if (!StringUtils.isEmpty(announcementTitle)) {
+            tpAnnouncement.setAnnouncementTitle(announcementTitle);
+        }
+
         // 分页
         Page<TpBuildingOwnerInfo> page = new Page<>();
         page.setSize(pageSize == null ? 10 : pageSize);

src/main/java/com/huiju/estateagents/service/impl/ExtendContentServiceImpl.java

         //一个城市、项目只能有一个开屏广告
         if (extendContent.getStatus() == 1 && CommConstant.OPEN_SCREEN.equals(extendContent.getShowType())){
             QueryWrapper<ExtendContent> taExtendContentQueryWrapper = new QueryWrapper<>();
-            if (extendContent.getCityId() == null){
-                TaBuilding taBuilding = taBuildingMapper.selectBuilding(extendContent.getBuildingId());
-                taExtendContentQueryWrapper.eq("city_id", taBuilding.getCityId());
-            }else{
-                taExtendContentQueryWrapper.eq("city_id", extendContent.getCityId());
-            }
+//            if (extendContent.getCityId() == null){
+//                TaBuilding taBuilding = taBuildingMapper.selectBuilding(extendContent.getBuildingId());
+//                taExtendContentQueryWrapper.eq("city_id", taBuilding.getCityId());
+//            }else{
+//                taExtendContentQueryWrapper.eq("city_id", extendContent.getCityId());
+//            }
 
             taExtendContentQueryWrapper.eq("org_id", orgId);
             taExtendContentQueryWrapper.eq("status", 1);
                 taExtendContentQueryWrapper.ne("content_id", extendContent.getContentId());
             }
 //            taExtendContentQueryWrapper.eq(StringUtils.isNotBlank(String.valueOf(extendContent.getIsHaveActive())), "is_have_active", extendContent.getIsHaveActive());
-            if (null != extendContent.getIsHaveActive() && CommConstant.BANNER_BUILDING.equals(extendContent.getShowPosition())){
-                taExtendContentQueryWrapper.eq(StringUtils.isNotBlank(extendContent.getBuildingId()), "building_id", extendContent.getBuildingId());
-            }
+//            if (null != extendContent.getIsHaveActive() && CommConstant.BANNER_BUILDING.equals(extendContent.getShowPosition())){
+//                taExtendContentQueryWrapper.eq(StringUtils.isNotBlank(extendContent.getBuildingId()), "building_id", extendContent.getBuildingId());
+//            }
             List<ExtendContent> extContentInfo = extendContentMapper.selectList(taExtendContentQueryWrapper);
             if (!Collections.isEmpty(extContentInfo)){
                 return false;

src/main/resources/application-dev.yml

   application:
     name: zhiyun
   datasource:
-    username: root
-    password: DQ@0lW##kBb2+-jPZC1s$Ma0h5$9W((q
+    username: xiangsong
+    password: xiangsong@123
     url: jdbc:mysql://rm-uf6z3z6jq11x653d77o.mysql.rds.aliyuncs.com:3306/xiangsong?useUnicode=true&serverTimezone=CTT&characterEncoding=utf8&allowMultiQueries=true&autoReconnect=true&zeroDateTimeBehavior=convertToNull
     driver-class-name: com.mysql.cj.jdbc.Driver
     initial-size: 10 # 初始化连接数

src/main/resources/application-prod.yml

 server:
-  port: 8567
+  port: 80
 spring:
   application:
     name: zhiyun
   datasource:
-    username: zhiyun
-    password: Hf93UeZ4v44BBQTc
-    url: jdbc:mysql://rm-uf6z3z6jq11x653d77o.mysql.rds.aliyuncs.com:3306/zhiyun?useUnicode=true&serverTimezone=CTT&characterEncoding=utf8&allowMultiQueries=true&autoReconnect=true&zeroDateTimeBehavior=convertToNull
+    username: xiangsong
+    password: xiangsong@123
+    url: jdbc:mysql://rm-uf6z3z6jq11x653d77o.mysql.rds.aliyuncs.com:3306/xiangsong?useUnicode=true&serverTimezone=CTT&characterEncoding=utf8&allowMultiQueries=true&autoReconnect=true&zeroDateTimeBehavior=convertToNull
     driver-class-name: com.mysql.cj.jdbc.Driver
     initial-size: 10 # 初始化连接数
     max-active: 20 # 最大连接数