feats

pom.xml

@@ -10,7 +10,7 @@
 	</parent>
 	<groupId>com.shigongli</groupId>
 	<artifactId>shigongli</artifactId>
-	<version>1.0.8</version>
+	<version>1.0.9</version>
 	<name>shigongli</name>
 	<description>ShiGongli Service</description>
 

src/main/java/com/shigongli/controller/TaHousePersonController.java

@@ -72,12 +72,8 @@ public class TaHousePersonController extends BaseController {
                                           @ApiParam("房源ID") @RequestParam(value = "houseId", required = false) String houseId) throws Exception{
 
 		    IPage<TaHousePerson> pg = new Page<>(pageNum, pageSize);
-            QueryWrapper<TaHousePerson> queryWrapper = new QueryWrapper<>();
-            queryWrapper.eq(!StringUtils.isEmpty(houseId), "house_id", houseId);
-            queryWrapper.eq("status", StatusConstant.NORMAL);
-            queryWrapper.orderByDesc("create_date");
 
-            IPage<TaHousePerson> result = iTaHousePersonService.page(pg, queryWrapper);
+            IPage<TaHousePerson> result = iTaHousePersonService.getWithSetting(pg, houseId);
             return ResponseBean.success(result);
     }
 

src/main/java/com/shigongli/controller/TaHouseSettingController.java

@@ -128,11 +128,18 @@ public class TaHouseSettingController extends BaseController {
      * @param taHouseSetting 实体对象
      * @return
      */
-    @RequestMapping(value="/taHouseSetting/{id}",method= RequestMethod.PUT)
+    @RequestMapping(value="/ma/taHouseSetting/{id}",method= RequestMethod.PUT)
     @ApiOperation(value="更新", notes = "更新", httpMethod = "PUT", response = ResponseBean.class)
     public ResponseBean taHouseSettingUpdate(@ApiParam("对象ID") @PathVariable String id,
                                              @ApiParam("更新内容") @RequestBody TaHouseSetting taHouseSetting) throws Exception{
 
+        TaHouseSetting origin = iTaHouseSettingService.getById(id);
+        if (null == origin || !StatusConstant.NORMAL.equals(origin.getStatus())) {
+            return ResponseBean.error("修改失败, 数据异常", ResponseBean.ERROR_UNAVAILABLE);
+        }
+
+        taHouseSetting.setSettingId(id);
+
         if (iTaHouseSettingService.updateById(taHouseSetting)){
             return ResponseBean.success(iTaHouseSettingService.getById(id));
         }else {

src/main/java/com/shigongli/entity/TaHousePerson.java

@@ -1,6 +1,7 @@
 package com.shigongli.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.time.LocalDateTime;
 import java.io.Serializable;
@@ -51,5 +52,12 @@ public class TaHousePerson implements Serializable {
     @ApiModelProperty(value = "创建时间")
     private LocalDateTime createDate;
 
+    @TableField(exist = false)
+    private String settingId;
 
+    @TableField(exist = false)
+    private String startDate;
+
+    @TableField(exist = false)
+    private String endDate;
 }

src/main/java/com/shigongli/entity/TaHouseSurround.java

@@ -49,4 +49,13 @@ public class TaHouseSurround implements Serializable {
 
     @TableField(exist = false)
     private String image;
+
+    @TableField(exist = false)
+    private String tagId;
+
+    @TableField(exist = false)
+    private String groupId;
+
+    @TableField(exist = false)
+    private String groupName;
 }

src/main/java/com/shigongli/mapper/TaHousePersonMapper.java

@@ -1,8 +1,10 @@
 package com.shigongli.mapper;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.shigongli.entity.TaHousePerson;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * <p>
@@ -15,4 +17,5 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface TaHousePersonMapper extends BaseMapper<TaHousePerson> {
 
+    IPage<TaHousePerson> getWithSetting(IPage<TaHousePerson> pg, @Param("houseId") String houseId);
 }

src/main/java/com/shigongli/service/ITaHousePersonService.java

@@ -1,5 +1,6 @@
 package com.shigongli.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.shigongli.entity.TaHouse;
 import com.shigongli.entity.TaHousePerson;
 import com.baomidou.mybatisplus.extension.service.IService;
@@ -15,4 +16,6 @@ import com.baomidou.mybatisplus.extension.service.IService;
 public interface ITaHousePersonService extends IService<TaHousePerson> {
 
     void sendMessageToManager(TaHouse taHouse, String dateStr);
+
+    IPage<TaHousePerson> getWithSetting(IPage<TaHousePerson> pg, String houseId);
 }

src/main/java/com/shigongli/service/impl/TaHousePersonServiceImpl.java

@@ -2,6 +2,7 @@ package com.shigongli.service.impl;
 
 import cn.binarywang.wx.miniapp.api.WxMaService;
 import cn.binarywang.wx.miniapp.bean.WxMaSubscribeMessage;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.shigongli.common.WxUtils;
 import com.shigongli.config.WeixinConfig;
 import com.shigongli.entity.TaHouse;
@@ -31,6 +32,9 @@ import java.util.List;
 @Slf4j
 @Service
 public class TaHousePersonServiceImpl extends ServiceImpl<TaHousePersonMapper, TaHousePerson> implements ITaHousePersonService {
+    @Autowired
+    TaHousePersonMapper taHousePersonMapper;
+
     @Autowired
     ITaShopKeeperService iTaShopKeeperService;
 
@@ -95,6 +99,11 @@ public class TaHousePersonServiceImpl extends ServiceImpl<TaHousePersonMapper, T
         }
     }
 
+    @Override
+    public IPage<TaHousePerson> getWithSetting(IPage<TaHousePerson> pg, String houseId) {
+        return taHousePersonMapper.getWithSetting(pg, houseId);
+    }
+
     private void sendMaSubscribeMessage(String toUser, List<WxMaSubscribeMessage.Data> message, String page, String templateId) throws WxErrorException {
         WxMaService maService = wxUtils.getMaService();
         WxMaSubscribeMessage wxMaSubscribeMessage = WxMaSubscribeMessage

src/main/resources/mapper/TaHousePersonMapper.xml

@@ -2,4 +2,22 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.shigongli.mapper.TaHousePersonMapper">
 
+    <select id="getWithSetting" resultType="com.shigongli.entity.TaHousePerson">
+        SELECT
+            t.*,
+            m.setting_id,
+            m.start_date,
+            m.end_date
+        FROM
+            ta_house_person t
+            INNER JOIN ta_house_order s ON t.order_id = s.order_id
+            INNER JOIN ta_house_setting m ON s.setting_id = m.setting_id
+        WHERE
+            t.`status` = 1
+        <if test="null != houseId and '' != houseId">
+            AND t.house_id = #{houseId}
+        </if>
+        ORDER BY
+            s.create_date DESC
+    </select>
 </mapper>

src/main/resources/mapper/TaHouseSettingMapper.xml

@@ -10,7 +10,7 @@
         WHERE
             t.house_id = #{houseId}
             AND t.`status` = 1
-            AND t.start_date <= DATE_FORMAT( now( ), '%Y-%m-%d' ) AND t.end_date >= DATE_FORMAT( now( ), '%Y-%m-%d' )
+            AND t.start_date >= DATE_FORMAT( now( ), '%Y-%m-%d' ) AND t.end_date >= DATE_FORMAT( now( ), '%Y-%m-%d' )
         ORDER BY t.create_date DESC
         LIMIT 1
     </select>

src/main/resources/mapper/TaHouseSurroundMapper.xml

@@ -20,15 +20,32 @@
     <select id="getListByHouseOrNot" resultType="com.shigongli.entity.TaHouseSurround">
         SELECT
             t.*,
-            s.image
+            s.image,
+            q.tag_id,
+            q.group_id,
+            q.group_name
         FROM
             ta_house_surround t
-        INNER JOIN ta_meta_image s ON t.image_id = s.image_id
+            INNER JOIN ta_meta_image s ON t.image_id = s.image_id
+            INNER JOIN (
+                SELECT
+                    m.image_id,
+                    m.tag_id,
+                    n.group_id,
+                    h.`name` as group_name
+                FROM
+                    ta_meta_image_tag m
+                    INNER JOIN ta_mate_tag n ON m.tag_id = n.tag_id
+                    INNER JOIN ta_mate_tag_group h on n.group_id = h.group_id
+                HAVING 1
+            ) q ON q.image_id = t.image_id
         WHERE
             t.`status` = 1
         <if test="null != houseId and '' != houseId">
             AND t.house_id = #{houseId}
         </if>
+        GROUP BY
+            q.image_id
         ORDER BY
             t.create_date DESC
     </select>