重新上传前端

ruoyi-demo/src/main/java/com/ruoyi/demo/controller/WdRecycleController.java

@@ -1,10 +1,14 @@
 package com.ruoyi.demo.controller;
 
 import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.validate.EditGroup;
 import com.ruoyi.demo.entity.*;
+import com.ruoyi.demo.entity.vo.HouseWdVo;
+import com.ruoyi.demo.entity.vo.StoreWdVo;
 import com.ruoyi.demo.entity.vo.WdInfoVo;
 import com.ruoyi.demo.service.*;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.HashMap;
@@ -127,4 +131,52 @@ public class WdRecycleController {
         return R.ok();
     }
 
+    /**
+     * 修改网点基本信息
+     */
+    @PutMapping("/updateStoreWd")
+    public R updateStoreWd(@Validated(value = {EditGroup.class}) @RequestBody StoreWdVo storeWdVo){
+        wdRecycleService.updateStoreWd(storeWdVo);
+        return R.ok();
+    }
+
+//    /**
+//     * 修改门店网点信息
+//     */
+//    @PutMapping("/updateStoreWd")
+//    public R updateStoreWd(@Validated(value = {EditGroup.class}) @RequestBody StoreWdVo wdInfo){
+//        wdRecycleService.updateStoreWd(wdInfo);
+//    }
+//
+//    /**
+//     * 修改小区网点信息
+//     */
+//    @PutMapping("/updateHouseWd")
+//    public R updateHouseWd(@Validated(value = {EditGroup.class}) @RequestBody HouseWdVo wdInfo){
+//        wdRecycleService.updateHouseWd(wdInfo);
+//    }
+//
+//    /**
+//     * 修改楼宇网点信息
+//     */
+//    @PutMapping("/updateBuildWd")
+//    public R updateBuildWd(@Validated(value = {EditGroup.class}) @RequestBody HouseWdVo wdInfo){
+//        wdRecycleService.updateBuildWd(wdInfo);
+//    }
+//
+//    /**
+//     * 修改交通设施网点信息
+//     */
+//    @PutMapping("/updateTrafficWd")
+//    public R updateTrafficWd(@Validated(value = {EditGroup.class}) @RequestBody HouseWdVo wdInfo){
+//        wdRecycleService.updateTrafficWd(wdInfo);
+//    }
+//
+//    /**
+//     * 修改企业网点信息
+//     */
+//    @PutMapping("/updateEnterpriseWd")
+//    public R updateEnterpriseWd(@Validated(value = {EditGroup.class}) @RequestBody HouseWdVo wdInfo){
+//        wdRecycleService.updateEnterpriseWd(wdInfo);
+//    }
 }

ruoyi-demo/src/main/java/com/ruoyi/demo/entity/vo/HouseWdVo.java

@@ -0,0 +1,29 @@
+package com.ruoyi.demo.entity.vo;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.ruoyi.common.core.validate.EditGroup;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+
+@Data
+public class HouseWdVo {
+    /**
+     * 网点基本信息_id（外键）
+     */
+    @NotBlank(message = "网点Id不能为空",groups = {EditGroup.class})
+    private String wdId;
+    /**
+     * 物业类型
+     */
+    private String propertyType;
+    /**
+     * 小区住户户数（户）
+     */
+    private int households;
+    /**
+     * 居住人口规模（人）
+     */
+    private int peopleCount;
+}

ruoyi-demo/src/main/java/com/ruoyi/demo/entity/vo/StoreWdVo.java

@@ -0,0 +1,112 @@
+package com.ruoyi.demo.entity.vo;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.core.validate.EditGroup;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.math.BigDecimal;
+import java.util.Date;
+
+@Data
+public class StoreWdVo {
+    @NotBlank(message = "网点Id不能为空",groups = {EditGroup.class})
+    private String wdId;
+    @NotBlank(message = "网点名称不能为空",groups = {EditGroup.class})
+    private String wdName;
+
+    @NotBlank(message = "地址信息不能为空",groups = {EditGroup.class})
+    private String addrInfo;
+    @NotBlank(message = "地区Code不能为空",groups = {EditGroup.class})
+    private String addrCode;
+    @NotBlank(message = "地址信息不能为空",groups = {EditGroup.class})
+    private String addrCodeInfo;
+    @NotNull(message = "纬度不能为空",groups = {EditGroup.class})
+    private BigDecimal lat;
+    @NotNull(message = "经度不能为空",groups = {EditGroup.class})
+    private BigDecimal lng;
+    private String typeCodeBy;
+    private String typeNameBy;
+    private String wdTypeCode;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date enterTime;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date updateTime;
+    private String collectUserId;
+    private String collectPerson;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date collectTime;
+
+    /**
+     * 品牌_id（外键）
+     */
+    private String brandId;
+    /**
+     * 品牌名字
+     */
+    private String brandName;
+    /**
+     * 人均消费
+     */
+    private Double perCapitaConsumption;
+    /**
+     * 经营类别
+     */
+    private String manageTypeCode;
+    /**
+     * 行业分类（关联行业分类表）
+     */
+    private String industryCode;
+    /**
+     * 门店规模（连锁）
+     */
+    private String organizationCode;
+    /**
+     * 网点评论数
+     */
+    private int commentCount;
+    /**
+     * 网点评分
+     */
+    private Double score;
+    /**
+     * 网点团购信息
+     */
+    private String buyInfo;
+    /**
+     * 旺店指数
+     */
+    private double indexScore;
+    /**
+     * 营业状态（正常、暂停、尚未营业）
+     */
+    private String businessStatus;
+    /**
+     * 营业时间
+     */
+    private String businessTime;
+    /**
+     * 联系电话
+     */
+    private String telephone;
+    /**
+     * 联系人
+     */
+    private String contact;
+    /**
+     * 渠道商类型
+     */
+    private String channelType;
+    /**
+     * 开店时间
+     */
+    private String opentime;
+    /**
+     * 关店时间
+     */
+    private String closetime;
+}

ruoyi-demo/src/main/java/com/ruoyi/demo/service/WdRecycleService.java

@@ -1,6 +1,7 @@
 package com.ruoyi.demo.service;
 
 
+import com.ruoyi.demo.entity.vo.StoreWdVo;
 import com.ruoyi.demo.entity.vo.WdInfoVo;
 
 import java.util.HashMap;
@@ -12,4 +13,7 @@ public interface WdRecycleService {
     void deleteWd(String wdId);
 
     void recoverWd(String wdId);
+
+
+    void updateStoreWd(StoreWdVo storeWdVo);
 }

ruoyi-demo/src/main/java/com/ruoyi/demo/service/impl/WdRecycleServiceImpl.java

@@ -1,8 +1,11 @@
 package com.ruoyi.demo.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
+import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.demo.entity.WdInfo;
+import com.ruoyi.demo.entity.vo.StoreWdVo;
 import com.ruoyi.demo.entity.vo.WdInfoVo;
 import com.ruoyi.demo.mapper.WdInfoMapper;
 import com.ruoyi.demo.service.WdRecycleService;
@@ -82,4 +85,25 @@ public class WdRecycleServiceImpl implements WdRecycleService {
     }
 
 
+    @Override
+    public void updateStoreWd(StoreWdVo storeWdVo) {
+//        UpdateWrapper<WdInfo> updateWrapper = new UpdateWrapper<>();
+//        updateWrapper.eq("wd_id",storeWdVo.getWdId())
+//            .set("wd_name",storeWdVo.getWdName())
+//            .set("addrInfo",storeWdVo.getAddrInfo())
+//            .set("addrCode",storeWdVo.getAddrCode())
+//            .set("addrCodeInfo",storeWdVo.getAddrCodeInfo())
+//            .set("lat",storeWdVo.getLat())
+//            .set("lng",storeWdVo.getLng())
+//            .set("typeCodeBy",storeWdVo.getTypeCodeBy())
+//            .set("typeNameBy",storeWdVo.getTypeNameBy())
+//            .set("updateTime", DateUtils.getTime())
+//            .set("brandId",storeWdVo.getBrandId())
+//            .set("brandName",storeWdVo.getBrandName())
+//            .set("perCapitaConsumption",)
+//            .set("manageTypeCode",)
+//            .set("industryCode",)
+    }
+
+
 }