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/service/impl/MessageServiceImpl.java

@@ -80,7 +80,7 @@ public class MessageServiceImpl implements MessageServiceI {
 			// 查询工单是否待评价，如果为待评价把Content改为工单的标题
 			TpTicket tpTicket= tpTicketMapper.selectByPrimaryKey(tpMessage.getTicketId());
 			if (null != tpTicket) {
-				if (!"".equals(tpMessage.getTicketId()) && "5".equals(tpTicket.getStatus())) {
+				if (!"".equals(tpMessage.getTicketId())) {
 					tpMessage.setContent(tpTicket.getTicketTitle());
 				}
 			}

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

@@ -40,7 +40,9 @@ public class TpRentalHouseServicelImpl implements TpRentalHouseServicel {
         List<TpRentalHouse> tpRentalHouseList= tpRentalHouseMapper.getRentalHouse(houseName,rentalType,houseType,rentalPrice,priceFluctuate,userElement.getCommunityId());
             // 把字符串转数组
         for (TpRentalHouse tpRentalHouse:tpRentalHouseList){
-            String [] result = tpRentalHouse.getHouseLabel().split(",");
+            String houseLabel= tpRentalHouse.getHouseLabel();
+            String houseLabelarr= houseLabel.replace("，", ",");
+            String [] result = houseLabelarr.split(",");
             tpRentalHouse.setHouseLabelArr(Arrays.asList(result));
             // 根据 tpRentalHouse.getId()和img_type为2查询列表图
             List<TpRentalHouseImg> tpRentalHouseImgList= tpRentalHouseImgMapper.selectRentalHouseImg(tpRentalHouse.getId(),1);

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

@@ -191,7 +191,7 @@
     where community_id = #{communityId,jdbcType=INTEGER}
   </select>
   
-  <select id="hotelSetting" resultType="integer">
+  <select id="hotelSetting" resultType="string">
     select id from tp_hotel_setting where  community_id = #{communityId};
   </select>
 

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

@@ -537,31 +537,31 @@
       </if>
 
       <if test="rentalPrice == 1" >
-        and  '1000' >= rh.rental_price
+        and rh.rental_price <![CDATA[<= ]]> 1000
       </if>
 
       <if test="rentalPrice == 2" >
-        and  '1500' >= rh.rental_type
-        and  rh.rental_price >= '1000'
+        and  rh.rental_price <![CDATA[>= ]]> 1000
+        and  rh.rental_price <![CDATA[<= ]]> 1500
       </if>
 
       <if test="rentalPrice == 3" >
-        and  '2000' >= rh.rental_type
-        and  rh.rental_price >= '1500'
+        and  rh.rental_price <![CDATA[>= ]]> 1500
+        and  rh.rental_price <![CDATA[<= ]]> 2000
       </if>
 
       <if test="rentalPrice == 4" >
-        and  '3000' >= rh.rental_type
-        and  rh.rental_price >= '2000'
+        and  rh.rental_price <![CDATA[>= ]]> 2000
+        and  rh.rental_price <![CDATA[<= ]]> 3000
       </if>
 
       <if test="rentalPrice == 5" >
-        and  '4000' >= rh.rental_type
-        and  rh.rental_price >= '3000'
+        and  rh.rental_price <![CDATA[>= ]]> 3000
+        and  rh.rental_price<![CDATA[ <= ]]> 4000
       </if>
 
       <if test="rentalPrice == 6" >
-        and  rh.rental_price >= '4000'
+        and  rh.rental_price >= 4000
       </if>
 
       <if test="priceFluctuate == 1" >

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

@@ -112,7 +112,7 @@ public class HotelController extends BaseController {
 
     @ApiOperation(value = "修改当前房间上架或下架状态", notes = "修改当前房间上架或下架状态")
     @ApiImplicitParams({
-            @ApiImplicitParam(paramType = "body",dataType = "String",name = "parameter",value = "id:房间ID，roomStatus:(1:是已上架 2:是已下架)"
+            @ApiImplicitParam(paramType = "body",dataType = "String",name = "parameter",value = "id:[]房间ID，roomStatus:(1:是已上架 2:是已下架)"
             )})
     @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "token")
     @RequestMapping(value = "/hotelRoomRoomStatus", method = RequestMethod.POST)
@@ -135,7 +135,7 @@ public class HotelController extends BaseController {
         return responseBean;
     }
     
-    @ApiOperation(value = "添加房间", notes = "添加房间")
+    @ApiOperation(value = "添加酒店", notes = "添加酒店")
     @ApiImplicitParams({
             @ApiImplicitParam(paramType = "body", dataType = "Hotel", name = "hotel", value = "酒店"),
             @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token")

CODE/smart-community/property-api/src/main/java/com/community/huiju/model/Hotel.java

@@ -97,4 +97,9 @@ public class Hotel implements Serializable {
     @TableField(exist = false)
     private Boolean hotelSettingValue;
 
+    /**
+     * 酒店名称
+     */
+    private String hotelName;
+
 }

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

@@ -1,5 +1,6 @@
 package com.community.huiju.service.impl;
 
+import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -149,14 +150,18 @@ public class HotelServiceImpl extends ServiceImpl<HotelMapper, Hotel> implements
     public ResponseBean hotelRoomRoomStatus(String parameter, UserElement userElement) {
         ResponseBean responseBean= new ResponseBean<>();
         JSONObject object= JSONObject.parseObject(parameter);
-        Integer id= object.getInteger("id");
-        String roomStatus= object.getString("roomStatus");
-        HotelRoom hotelRoom= tpHotelRoomMapper.selectById(id);
-        hotelRoom.setRoomStatus(roomStatus);
-        hotelRoom.setUpdateDate(LocalDateTime.now());
-        hotelRoom.setUpdateUser(userElement.getId());
-        tpHotelRoomMapper.updateById(hotelRoom);
-        responseBean.addSuccess("成功");
+        JSONArray arr= object.getJSONArray("id");
+        Integer[] arrId= arr.toArray(new Integer[]{});
+        for (Integer id:arrId){
+            String roomStatus= object.getString("roomStatus");
+            HotelRoom hotelRoom= tpHotelRoomMapper.selectById(id);
+            hotelRoom.setRoomStatus(roomStatus);
+            hotelRoom.setUpdateDate(LocalDateTime.now());
+            hotelRoom.setUpdateUser(userElement.getId());
+            tpHotelRoomMapper.updateById(hotelRoom);
+            responseBean.addSuccess("成功");
+        }
+
         return responseBean;
     }
     
@@ -208,11 +213,17 @@ public class HotelServiceImpl extends ServiceImpl<HotelMapper, Hotel> implements
     @Override
     public ResponseBean addHotel(Hotel hotel, UserElement userElement) {
         if (hotel.getHotelSettingValue()){
-            HotelSetting hotelSetting = new HotelSetting();
-            hotelSetting.setCommunityId(userElement.getCommunityId());
-            hotelSetting.setCreateDate(LocalDateTime.now());
-            hotelSetting.setCreateUser(userElement.getId());
-            hotelSettingMapper.insert(hotelSetting);
+            // 为true时判断tp_hotel_setting是否存在当前小区
+            QueryWrapper<HotelSetting> hotelSettingQuery = new QueryWrapper<>();
+            hotelSettingQuery.eq("community_id",userElement.getCommunityId());
+            HotelSetting communitySetting= hotelSettingMapper.selectOne(hotelSettingQuery);
+            if (null == communitySetting) {
+                HotelSetting hotelSetting = new HotelSetting();
+                hotelSetting.setCommunityId(userElement.getCommunityId());
+                hotelSetting.setCreateDate(LocalDateTime.now());
+                hotelSetting.setCreateUser(userElement.getId());
+                hotelSettingMapper.insert(hotelSetting);
+            }
         }else {
             QueryWrapper<HotelSetting> queryWrapper = new QueryWrapper<>();
             queryWrapper.eq("community_id",userElement.getCommunityId());

VUECODE/smart-property-manage/src/api/grogshop.js

@@ -60,7 +60,7 @@ export function hotelRoomRoomStatus(data) {
     url: '/hotelRoomRoomStatus',
     method: 'post',
     data: {
-      id: data.id,
+      roomStatusIds: data.roomStatusIds,
       roomStatus: data.roomStatus
     }
   })

VUECODE/smart-property-manage/src/views/grogshop/configindex.vue

@@ -37,6 +37,9 @@
           <img width="100%" :src="dialogImageUrl" alt="">
         </el-dialog>
       </el-form-item>
+      <el-form-item label="酒店名称" prop="hotelName">
+        <el-input v-model="listData.hotelName"/>
+      </el-form-item>
       <el-form-item label="联系电话" prop="hotelTel">
         <el-input v-model="listData.hotelTel"/>
       </el-form-item>
@@ -93,7 +96,8 @@ export default {
         hotelAddress: '',
         hotelLongitude: '',
         hotelLatitude: '',
-        hotelIntroduction: ''
+        hotelIntroduction: '',
+        hotelName: ''
       },
       dialogImageUrl: '',
       dialogVisible: false,
@@ -120,6 +124,9 @@ export default {
         appCarouselImg: [
           { required: true, message: '轮播图', trigger: 'blur' }
         ],
+        hotelName: [
+          { required: true, message: '酒店名称', trigger: 'blur' }
+        ],
       }
     }
   },

VUECODE/smart-property-manage/src/views/grogshop/grogshopRoom.vue

@@ -37,8 +37,8 @@
       <el-row>
       <el-button type="success" @click="addHotelRoom()">新增</el-button>
       <el-button type="info" @click="addHotelEndit()">编辑</el-button>
-       <el-button type="primary" @click="addHotelEnditRoom(1)">上架房间</el-button>
-      <el-button type="danger" @click="addHotelEnditRoom(2)">下架房间</el-button>
+       <el-button type="primary" @click="enditRoom(1)">上架房间</el-button>
+      <el-button type="danger" @click="enditRoom(2)">下架房间</el-button>
       </el-row>
 
     </el-form>
@@ -102,7 +102,8 @@ export default {
             beginTime: '',
             endTime: '',
             roomStatus: '',
-            editUser: ''      
+            editUser: '',
+            roomStatusIds: []       
           },
            deleteIds: [], // 选择的id集合
            total: 0,
@@ -195,16 +196,9 @@ export default {
     clickTitle(ids){
     this.$router.push({ name: 'grogshop-grogshopRoomEdit', query: { id: ids}})
     },
-    addHotelEnditRoom(ides){
-       const SID = this.deleteIds
-      if (SID.length > 1) {
-        this.$message.error('只能选择一行数据进行修改!')
-        return
-      }
-      console.log('ides',ides)
-        const ids = this.deleteIds[0]
-         this.listQuery.id = ids
-         this.listQuery.roomStatus = ides
+    enditRoom(){
+         const ids = this.deleteIds
+         this.listQuery.roomStatusIds = ids
          this.$store.dispatch('HotelRoomRoomStatus', this.listQuery).then((res) => {
          this.$message({
           message: '成功',

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

@@ -14,7 +14,7 @@
           :before-upload="beforeAvatarUpload"
           class="avatar-uploader"
           name="uploadFiles"
-          action="http://106.14.20.193:8086/property-api/uploadimage">
+          :action="uploadImgUrl">
           <img v-if="imageUrl" :src="imageUrl" class="avatar">
           <i v-else  class="el-icon-plus avatar-uploader-icon"/>
         </el-upload>
@@ -33,7 +33,7 @@
           :on-remove="handleRemove"
           :on-success="handleSuccessContentImg"
           name="uploadFiles"
-          action="http://106.14.20.193:8086/property-api/uploadimage"
+          :action="uploadImgUrl"
           list-type="picture-card">
           <i class="el-icon-plus"/>
         </el-upload>
@@ -116,7 +116,8 @@ export default {
         sort: [
           { required: true, message: '请输入权重值', trigger: 'change' }
         ]
-      }
+      },
+      uploadImgUrl: process.env.BASE_API + '/uploadimage',
     }
   },
   methods: {

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

@@ -13,8 +13,8 @@
           :on-success="handleAvatarSuccess"
           :before-upload="beforeAvatarUpload"
           class="avatar-uploader"
-          name="uploadFiles"
-          action="http://106.14.20.193:8086/property-api/uploadimage">
+          :name="uploadFiles"
+          :action="uploadImgUrl">
           <img v-if="imageUrl" :src="imageUrl" class="avatar">
           <i v-else class="el-icon-plus avatar-uploader-icon"/>
         </el-upload>
@@ -34,7 +34,7 @@
           :on-success="handleSuccessContentImg"
           :file-list="activityContentList"
           name="uploadFiles"
-          action="http://106.14.20.193:8086/property-api/uploadimage"
+          :action="uploadImgUrl"
           list-type="picture-card">
           <i class="el-icon-plus"/>
         </el-upload>
@@ -120,7 +120,8 @@ export default {
         sort: [
           { required: true, message: '请输入权重值', trigger: 'change' }
         ]
-      }
+      },
+      uploadImgUrl: process.env.BASE_API + '/uploadimage',
     }
   },
   mounted() {

VUECODE/smart-property-manage/src/views/social/announcement/add.vue

@@ -15,7 +15,7 @@
           :before-upload="beforeAvatarUpload"
           class="avatar-uploader"
           name="uploadFiles"
-          action="http://106.14.20.193:8086/property-api/uploadimage">
+          :action="uploadImgUrl">
           <img v-if="imageUrl" :src="imageUrl" class="avatar">
           <i v-else class="el-icon-plus avatar-uploader-icon"/>
         </el-upload>
@@ -35,7 +35,7 @@
           :on-remove="handleRemove"
           :on-success="handleSuccessContentImg"
           name="uploadFiles"
-          action="http://106.14.20.193:8086/property-api/uploadimage"
+          :action="uploadImgUrl"
           list-type="picture-card">
           <i class="el-icon-plus"/>
         </el-upload>
@@ -84,7 +84,8 @@ export default {
         sort: [
           { required: true, message: '请输入权重值', trigger: 'change' }
         ]
-      }
+      },
+      uploadImgUrl: process.env.BASE_API + '/uploadimage',
     }
   },
   methods: {

VUECODE/smart-property-manage/src/views/social/announcement/edit.vue

@@ -14,7 +14,7 @@
           :before-upload="beforeAvatarUpload"
           class="avatar-uploader"
           name="uploadFiles"
-          action="http://106.14.20.193:8086/property-api/uploadimage">
+          :action="uploadImgUrl">
           <img v-if="Urlimage" :src="Urlimage" class="avatar">
           <i v-else class="el-icon-plus avatar-uploader-icon"/>
         </el-upload>
@@ -34,7 +34,7 @@
           :on-success="handleSuccessContentImg"
           :file-list="contentImgList"
           name="uploadFiles"
-          action="http://106.14.20.193:8086/property-api/uploadimage"
+          :action="uploadImgUrl"
           list-type="picture-card">
           <i class="el-icon-plus"/>
         </el-upload>
@@ -83,7 +83,8 @@ export default {
         sort: [
           { required: true, message: '请输入权重值', trigger: 'change' }
         ]
-      }
+      },
+      uploadImgUrl: process.env.BASE_API + '/uploadimage',
     }
   },
   mounted() {

VUECODE/smart-property-manage/src/views/social/transaction/transactionAdd.vue

@@ -27,7 +27,7 @@
           :on-remove="handleRemove"
           :on-success="handleSuccessContentImg"
           name="uploadFiles"
-          action="http://106.14.20.193:8086/property-api/uploadimage"
+          :action="uploadImgUrl"
           list-type="picture-card">
           <i class="el-icon-plus"/>
         </el-upload>
@@ -92,7 +92,8 @@ export default {
           { required: true, message: '请输入权重值', trigger: 'change' }
         ]
       },
-      lock: false
+      lock: false,
+      uploadImgUrl: process.env.BASE_API + '/uploadimage',
     }
   },
   methods: {

VUECODE/smart-property-manage/src/views/social/transaction/transactionEdit.vue

@@ -29,7 +29,7 @@
           :on-success="handleSuccessContentImg"
           :file-list="contentImgList"
           name="uploadFiles"
-          action="http://106.14.20.193:8086/property-api/uploadimage"
+          :action="uploadImgUrl"
           list-type="picture-card">
           <i class="el-icon-plus"/>
         </el-upload>
@@ -96,7 +96,8 @@ export default {
         sort: [
           { required: true, message: '请输入权重值', trigger: 'change' }
         ]
-      }
+      },
+      uploadImgUrl: process.env.BASE_API + '/uploadimage',
     }
   },
   mounted() {