公寓

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

@@ -87,6 +87,19 @@ public class TpRentalHouseController extends BaseController {
 		return responseBean;
 	}
 	
+	@ApiOperation(value = "更新公寓", notes = "更新公寓")
+	@ApiImplicitParams({
+			@ApiImplicitParam(paramType = "body", dataType = "TpRentalHouse", name = "rentalHouse", value = "公寓"),
+			@ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token")
+	})
+	@RequestMapping(value = "/rental/update",method = RequestMethod.POST)
+	public ResponseBean updateRental(@RequestBody TpRentalHouse rentalHouse, HttpSession session){
+		ResponseBean responseBean = new ResponseBean();
+		UserElement userElement = getUserElement(session);
+		responseBean = tpRentalHouseService.updateRental(rentalHouse,userElement);
+		return responseBean;
+	}
+	
 	@ApiOperation(value = "获取公寓信息", notes = "获取公寓信息")
 	@ApiImplicitParams({
 			@ApiImplicitParam(paramType = "path", dataType = "Integer", name = "id", value = "公寓Id"),

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

@@ -45,4 +45,12 @@ public interface ITpRentalHouseService extends IService<TpRentalHouse> {
 	 * @return
 	 */
 	TpRentalHouse getRentalById(Integer id);
+	
+	/**
+	 * 更新公寓
+	 * @param rentalHouse
+	 * @param userElement
+	 * @return
+	 */
+	ResponseBean updateRental(TpRentalHouse rentalHouse, UserElement userElement);
 }

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

@@ -145,4 +145,48 @@ public class TpRentalHouseServiceImpl extends ServiceImpl<TpRentalHouseMapper, T
 		tpRentalHouse.setAppCarouselImg(imgList);
 		return tpRentalHouse;
 	}
+	
+	/**
+	 * 更新公寓
+	 *
+	 * @param rentalHouse
+	 * @param userElement
+	 * @return
+	 */
+	@Override
+	public ResponseBean updateRental(TpRentalHouse rentalHouse, UserElement userElement) {
+		ResponseBean responseBean = new ResponseBean();
+		rentalHouse.setUpdateDate(LocalDateTime.now());
+		rentalHouse.setUpdateUser(userElement.getId());
+		tpRentalHouseMapper.updateById(rentalHouse);
+		//更新首页图片
+		QueryWrapper<TpRentalHouseImg> tpRentalHouseImgQueryWrapper = new QueryWrapper<>();
+		tpRentalHouseImgQueryWrapper.eq("community_id", rentalHouse.getCommunityId());
+		tpRentalHouseImgQueryWrapper.eq("rental_house_id",rentalHouse.getId());
+		tpRentalHouseImgQueryWrapper.eq("img_type","1");
+		TpRentalHouseImg tpRentalHouseImg = new TpRentalHouseImg();
+		tpRentalHouseImg.setImgUrl(rentalHouse.getAppListImg());
+		tpRentalHouseImgMapper.update(tpRentalHouseImg,tpRentalHouseImgQueryWrapper);
+		//更新轮播图，先删除在添加
+		QueryWrapper<TpRentalHouseImg> deleteQueryWrapper = new QueryWrapper<>();
+		deleteQueryWrapper.eq("community_id", rentalHouse.getCommunityId());
+		deleteQueryWrapper.eq("rental_house_id",rentalHouse.getId());
+		deleteQueryWrapper.eq("img_type","2");
+		tpRentalHouseImgMapper.delete(deleteQueryWrapper);
+		//插入公寓轮播图信息
+		List<String> imgList = rentalHouse.getAppCarouselImg();
+		List<TpRentalHouseImg> rentalHouseImgList = new ArrayList<>();
+		imgList.stream().forEach(e -> {
+			TpRentalHouseImg rentalHouseImg = new TpRentalHouseImg();
+			rentalHouseImg.setCommunityId(rentalHouse.getCommunityId());
+			rentalHouseImg.setCreateDate(LocalDateTime.now());
+			rentalHouseImg.setRentalHouseId(rentalHouse.getId());
+			rentalHouseImg.setImgType("2");
+			rentalHouseImg.setImgUrl(e);
+			rentalHouseImgList.add(rentalHouseImg);
+		});
+		tpRentalHouseImgMapper.batchInsert(rentalHouseImgList);
+		responseBean.addSuccess("更新成功");
+		return responseBean;
+	}
 }

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

@@ -36,6 +36,14 @@ export function addRental(listQuery) {
   })
 }
 
+export function updateRental(listQuery) {
+  return request({
+    url: '/rental/update',
+    method: 'post',
+    data: listQuery
+  })
+}
+
 export function getRental(id) {
   return request({
     url: '/rental/get/' + id,

VUECODE/smart-property-manage/src/store/modules/rental.js

@@ -1,4 +1,4 @@
-import { fetchRentalList, shelfRental, obtainedRental, addRental, getRental } from '@/api/rental'
+import { fetchRentalList, shelfRental, obtainedRental, addRental, getRental, updateRental } from '@/api/rental'
 
 const transaction = {
   namespaced: true,
@@ -28,6 +28,15 @@ const transaction = {
         })
       })
     },
+    UpdateRental({ commit }, listQuery) {
+      return new Promise((resolve, reject) => {
+        updateRental(listQuery).then(response => {
+          resolve(response)
+        }).catch(error => {
+          reject(error)
+        })
+      })
+    },
     GetRental({ commit }, id) {
       return new Promise((resolve, reject) => {
         getRental(id).then(response => {

VUECODE/smart-property-manage/src/views/rental/rentalEdit.vue

@@ -81,12 +81,12 @@
         <el-checkbox v-model="listData.washingMachine" true-label="1" false-label="0">洗衣机</el-checkbox>
         <el-checkbox v-model="listData.airConditioning" true-label="1" false-label="0">空调</el-checkbox>
         <el-checkbox v-model="listData.fridge" true-label="1" false-label="0">冰箱</el-checkbox>
-        <el-checkbox v-model="listData.TV" true-label="1" false-label="0">电视</el-checkbox>
+        <el-checkbox v-model="listData.tv" true-label="1" false-label="0">电视</el-checkbox>
         <el-checkbox v-model="listData.smartLock" true-label="1" false-label="0">智能锁</el-checkbox>
         <el-checkbox v-model="listData.waterHeater" true-label="1" false-label="0">热水器</el-checkbox>
         <el-checkbox v-model="listData.desk" true-label="1" false-label="0">桌子</el-checkbox>
         <el-checkbox v-model="listData.chair" true-label="1" false-label="0">椅子</el-checkbox>
-        <el-checkbox v-model="listData.WiFi" true-label="1" false-label="0">网络</el-checkbox>
+        <el-checkbox v-model="listData.wiFi" true-label="1" false-label="0">网络</el-checkbox>
         <el-checkbox v-model="listData.kitchen" true-label="1" false-label="0">厨房</el-checkbox>
         <el-checkbox v-model="listData.bathroom" true-label="1" false-label="0">独卫</el-checkbox>
         <el-checkbox v-model="listData.balcony" true-label="1" false-label="0">阳台</el-checkbox>
@@ -156,12 +156,12 @@ export default {
         washingMachine: '',
         airConditioning: '',
         fridge: '',
-        TV: '',
+        tv: '',
         smartLock: '',
         waterHeater: '',
         desk: '',
         chair: '',
-        WiFi: '',
+        wiFi: '',
         kitchen: '',
         bathroom: '',
         balcony: ''
@@ -262,7 +262,7 @@ export default {
     submitForm(formName) { // 提交
       this.$refs[formName].validate((valid) => {
         if (valid) {
-          this.addRental()
+          this.updateRental()
         } else {
           console.log('error submit!!')
           return false
@@ -278,7 +278,7 @@ export default {
       console.log(this.isRegistered)
       this.$refs[formName].resetFields()
     },
-    addRental() {
+    updateRental() {
       // 加载框
       const loading = this.$loading({
         lock: true,
@@ -286,7 +286,7 @@ export default {
         spinner: 'el-icon-loading',
         background: 'rgba(0, 0, 0, 0.7)'
       })
-      this.$store.dispatch('rental/AddRental', this.listData).then((res) => {
+      this.$store.dispatch('rental/UpdateRental', this.listData).then((res) => {
         if (res.code === '0') {
           this.$message({
             message: res.message,