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

@@ -1,14 +1,21 @@
 package com.ruoyi.demo.controller;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.pagehelper.PageInfo;
 
 import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.validate.EditGroup;
 import com.ruoyi.demo.entity.Brand;
+import com.ruoyi.demo.entity.Enterprise;
 import com.ruoyi.demo.entity.vo.BrandVo;
+import com.ruoyi.demo.mapper.BrandMapper;
 import com.ruoyi.demo.service.BrandRecycleService;
+import com.ruoyi.demo.service.BrandService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
+import javax.validation.constraints.NotNull;
 import java.util.HashMap;
 
 @RestController
@@ -17,20 +24,31 @@ public class BrandRecycleController {
     @Autowired
     BrandRecycleService brandRecycleService;
 
+    @Autowired
+    BrandService brandService;
+
     @GetMapping("/list")
     public R list(BrandVo brandVo){
-        PageInfo<Brand> list = brandRecycleService.list(brandVo);
+        Page<Brand> list = brandRecycleService.list(brandVo);
         return R.ok(list);
     }
 
-    //移除
+    /**
+     * 移除品牌
+     * @param brandId
+     * @return
+     */
     @DeleteMapping("/deleteBrand/{brandId}")
     public R deleteBrand(@PathVariable("brandId") String brandId){
         brandRecycleService.deleteBrand(brandId);
         return R.ok();
     }
 
-    //恢复
+    /**
+     * 恢复品牌
+     * @param hashMap
+     * @return
+     */
     @PutMapping("/recoverBrand")
     public R recoverBrand(@RequestBody HashMap<String,String> hashMap){
         if(hashMap.get("brandId") == null)
@@ -40,4 +58,39 @@ public class BrandRecycleController {
         return R.ok();
     }
 
+    /**
+     * 修改品牌
+     * @param brandVo
+     * @return
+     */
+    @PutMapping("/updateBrand")
+    public R updateBrand(@Validated(value = {EditGroup.class}) @RequestBody BrandVo brandVo){
+        brandService.updateBrand(brandVo);
+        return R.ok();
+    }
+
+    /**
+     * 简单品牌关联下拉框
+     * @param brandName
+     * @param size
+     * @return
+     */
+    @GetMapping("/selectBrand")
+    public R selectBrand(String brandName,int size){
+        Page<Brand> brandPage = brandService.selectBrand(brandName, size);
+        return R.ok(brandPage);
+    }
+
+    /**
+     * 简单企业关联下拉框
+     * @param enterpriseName
+     * @param size
+     * @return
+     */
+    @GetMapping("/selectEnterprise")
+    public R selectEnterprise(String enterpriseName,int size){
+        Page<Enterprise> enterprisePage = brandService.selectEnterprise(enterpriseName, size);
+        return R.ok(enterprisePage);
+    }
+
 }

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

@@ -3,9 +3,8 @@ 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.entity.vo.*;
+import com.ruoyi.demo.mapper.WdInfoDao;
 import com.ruoyi.demo.service.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
@@ -39,6 +38,9 @@ public class WdRecycleController {
     @Autowired
     EnterpriseWdService enterpriseWdService;
 
+    @Autowired
+    WdInfoService wdInfoService;
+
 
     /**
      * 获取网点回收站列表
@@ -51,132 +53,96 @@ public class WdRecycleController {
         return R.ok(list);
     }
 
+
     /**
-     * 获取门店网点类型明细
+     * 移除网点
      * @param wdId 网点Id
      * @return
      */
-    @GetMapping("/storeWdInfo")
-    public R storeWdInfo(String wdId){
-        StoreWd storeWd = storeWdService.storeWdInfo(wdId);
-        return R.ok(storeWd);
+    @DeleteMapping("/deleteWd/{wdId}")
+    public R deleteWd(@PathVariable("wdId") String wdId){
+        wdRecycleService.deleteWd(wdId);
+        return R.ok();
     }
 
     /**
-     * 获取小区网点类型明细
-     * @param wdId 网点Id
+     * 恢复网点
+     * @param wdInfoVo
      * @return
      */
-    @GetMapping("/houseWdInfo")
-    public R houseWddInfo(String wdId){
-        HouseWd houseWd = houseWdService.houseWddInfo(wdId);
-        return R.ok(houseWd);
+    @PutMapping("/recoverWd")
+    public R recoverWd(@RequestBody WdInfoVo wdInfoVo){
+        if (wdInfoVo.getWdId() == null)
+            return R.fail(400,"wdId不能为空");
+
+        wdRecycleService.recoverWd(wdInfoVo.getWdId());
+        return R.ok();
     }
 
     /**
-     * 获取楼宇网点类型明细
-     * @param wdId 网点Id
+     * 修改基础设施网点信息
+     * @param wdInfoVo
      * @return
      */
-    @GetMapping("/buildWdInfo")
-    public R buildWdInfo(String wdId){
-        BuildWd buildWd = buildWdService.buildWdInfo(wdId);
-        return R.ok(buildWd);
+    @PutMapping("/updateInfrastructureWd")
+    public R updateWdInfo(@Validated(value = {EditGroup.class}) @RequestBody WdInfoVo wdInfoVo){
+        wdInfoService.updateWdInfo(wdInfoVo);
+        return R.ok();
     }
 
     /**
-     * 获取交通设施网点类型明细
-     * @param wdId 网点Id
+     * 修改门店网点信息
+     * @param storeWdVo
      * @return
      */
-    @GetMapping("/trafficWdInfo")
-    public R trafficWdInfo(String wdId){
-        TrafficWd trafficWd = trafficWdService.trafficWdInfo(wdId);
-        return R.ok(trafficWd);
+    @PutMapping("/updateStoreWd")
+    public R updateStoreWd(@Validated(value = {EditGroup.class}) @RequestBody StoreWdVo storeWdVo){
+        storeWdService.updateStoreWd(storeWdVo);
+        return R.ok();
     }
 
+
     /**
-     * 获取公司网点类型明细
-     * @param wdId 网点Id
+     * 修改小区网点信息
+     * @param houseWdVo
      * @return
      */
-    @GetMapping("/enterpriseWdInfo")
-    public R enterpriseWdInfo(String wdId){
-        EnterpriseWd enterpriseWd = enterpriseWdService.enterpriseWdInfo(wdId);
-        return R.ok(enterpriseWd);
+    @PutMapping("/updateHouseWd")
+    public R updateHouseWd(@Validated(value = {EditGroup.class}) @RequestBody HouseWdVo houseWdVo){
+        houseWdService.updateHouseWd(houseWdVo);
+        return R.ok();
     }
 
     /**
-     * 移除网点
-     * @param wdId 网点Id
+     * 修改楼宇网点信息
+     * @param buildwdVo
      * @return
      */
-    @DeleteMapping("/deleteWd/{wdId}")
-    public R deleteWd(@PathVariable("wdId") String wdId){
-        wdRecycleService.deleteWd(wdId);
+    @PutMapping("/updateBuildWd")
+    public R updateBuildWd(@Validated(value = {EditGroup.class}) @RequestBody BuildwdVo buildwdVo){
+        buildWdService.updateBuildWd(buildwdVo);
         return R.ok();
     }
 
     /**
-     * 恢复网点
-     * @param wdInfoVo
+     * 修改交通设施网点信息
+     * @param trafficWd
      * @return
      */
-    @PutMapping("/recoverWd")
-    public R recoverWd(@RequestBody WdInfoVo wdInfoVo){
-        if (wdInfoVo.getWdId() == null)
-            return R.fail(400,"wdId不能为空");
-
-        wdRecycleService.recoverWd(wdInfoVo.getWdId());
+    @PutMapping("/updateTrafficWd")
+    public R updateTrafficWd(@Validated(value = {EditGroup.class}) @RequestBody TrafficWdVo trafficWd){
+        trafficWdService.updateTrafficWd(trafficWd);
         return R.ok();
     }
 
     /**
-     * 修改网点基本信息
+     * 修改企业网点信息
+     * @param enterpriseWdVo
+     * @return
      */
-    @PutMapping("/updateStoreWd")
-    public R updateStoreWd(@Validated(value = {EditGroup.class}) @RequestBody StoreWdVo storeWdVo){
-        wdRecycleService.updateStoreWd(storeWdVo);
+    @PutMapping("/updateEnterpriseWd")
+    public R updateEnterpriseWd(@Validated(value = {EditGroup.class}) @RequestBody EnterpriseWdVo enterpriseWdVo){
+        enterpriseWdService.updateEnterpriseWd(enterpriseWdVo);
         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/BrandVo.java

@@ -1,17 +1,20 @@
 package com.ruoyi.demo.entity.vo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.core.validate.EditGroup;
 import lombok.Data;
 
+import javax.validation.constraints.NotBlank;
 import java.io.Serializable;
 import java.util.Date;
 
 @Data
 public class BrandVo implements Serializable {
+    @NotBlank(message = "品牌Id不能为空",groups = {EditGroup.class})
     private String brandId;
 
     private String brandImg;
-
+    @NotBlank(message = "品牌名称不能为空",groups = {EditGroup.class})
     private String brandName;
 
     private String industryCode;

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

@@ -0,0 +1,30 @@
+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 com.ruoyi.demo.entity.BuildWd;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.math.BigDecimal;
+@Data
+public class BuildwdVo {
+    @NotBlank(message = "网点Id不能为空",groups = {EditGroup.class})
+    private String wdId;
+    private String wdImg;
+    @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;
+    @NotNull(message = "纬度不能为空",groups = {EditGroup.class})
+    private BigDecimal lat;
+    @NotNull(message = "经度不能为空",groups = {EditGroup.class})
+    private BigDecimal lng;
+    private String typeCodeBy;
+    private String typeNameBy;
+    private BuildWd buildWd;
+}

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

@@ -0,0 +1,30 @@
+package com.ruoyi.demo.entity.vo;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.ruoyi.common.core.validate.EditGroup;
+import com.ruoyi.demo.entity.EnterpriseWd;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.math.BigDecimal;
+
+@Data
+public class EnterpriseWdVo {
+    @NotBlank(message = "网点Id不能为空",groups = {EditGroup.class})
+    private String wdId;
+    private String wdImg;
+    @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;
+    @NotNull(message = "纬度不能为空",groups = {EditGroup.class})
+    private BigDecimal lat;
+    @NotNull(message = "经度不能为空",groups = {EditGroup.class})
+    private BigDecimal lng;
+    private String typeCodeBy;
+    private String typeNameBy;
+    private EnterpriseWd enterpriseWd;
+}

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

@@ -3,27 +3,30 @@ 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 com.ruoyi.demo.entity.HouseWd;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.math.BigDecimal;
 
 @Data
 public class HouseWdVo {
-    /**
-     * 网点基本信息_id（外键）
-     */
     @NotBlank(message = "网点Id不能为空",groups = {EditGroup.class})
     private String wdId;
-    /**
-     * 物业类型
-     */
-    private String propertyType;
-    /**
-     * 小区住户户数（户）
-     */
-    private int households;
-    /**
-     * 居住人口规模（人）
-     */
-    private int peopleCount;
+    private String wdImg;
+    @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;
+    @NotNull(message = "纬度不能为空",groups = {EditGroup.class})
+    private BigDecimal lat;
+    @NotNull(message = "经度不能为空",groups = {EditGroup.class})
+    private BigDecimal lng;
+    private String typeCodeBy;
+    private String typeNameBy;
+
+    private HouseWd houseWd;
 }

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

@@ -4,6 +4,7 @@ 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 com.ruoyi.demo.entity.StoreWd;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
@@ -15,98 +16,20 @@ import java.util.Date;
 public class StoreWdVo {
     @NotBlank(message = "网点Id不能为空",groups = {EditGroup.class})
     private String wdId;
+    private String wdImg;
     @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;
+    StoreWd storeWd;
 }

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

@@ -0,0 +1,31 @@
+package com.ruoyi.demo.entity.vo;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.ruoyi.common.core.validate.EditGroup;
+import com.ruoyi.demo.entity.TrafficWd;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.math.BigDecimal;
+
+@Data
+public class TrafficWdVo {
+    @NotBlank(message = "网点Id不能为空",groups = {EditGroup.class})
+    private String wdId;
+    private String wdImg;
+    @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;
+    @NotNull(message = "纬度不能为空",groups = {EditGroup.class})
+    private BigDecimal lat;
+    @NotNull(message = "经度不能为空",groups = {EditGroup.class})
+    private BigDecimal lng;
+    private String typeCodeBy;
+    private String typeNameBy;
+
+    private TrafficWd trafficWd;
+}

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

@@ -2,26 +2,34 @@ package com.ruoyi.demo.entity.vo;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.core.validate.EditGroup;
 import com.ruoyi.demo.entity.WdInfo;
 import lombok.Data;
 
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.Date;
 
 @Data
 public class WdInfoVo implements Serializable {
+    @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;
-
-    private String addrCodeInfo;
+//    @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;

ruoyi-demo/src/main/java/com/ruoyi/demo/mapper/BrandMapper.java

@@ -2,6 +2,7 @@ package com.ruoyi.demo.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ruoyi.demo.entity.Brand;
 import com.ruoyi.demo.entity.bo.BrandSearch;
 import com.ruoyi.demo.entity.vo.BrandVo;
@@ -17,7 +18,7 @@ public interface BrandMapper extends BaseMapper<Brand> {
     List<BrandSearch> searchSearchByMulti(@Param("text") String text, @Param("industryCode") List<String> industryCode, @Param("countUp") Integer countUp, @Param("countDown") Integer countDown, @Param("coverUp") Integer coverUp, @Param("coverDown") Integer coverDown);
 
     //管理中心：品牌回收站
-    List<Brand> list(BrandVo brandVo);
+    Page<Brand> list(Page<Brand> page,@Param("brand") BrandVo brandVo);
 
     void recoverBrand(String brandId);
 

ruoyi-demo/src/main/java/com/ruoyi/demo/mapper/WdInfoMapper.java

@@ -16,7 +16,7 @@ import java.util.List;
 
 @Mapper
 public interface WdInfoMapper extends BaseMapper<WdInfo> {
-    List<WdInfo> list(WdInfoVo wdInfoVo);
+    Page<WdInfo> list(Page<WdInfo> page,@Param("wd") WdInfoVo wdInfoVo);
 
     void recoverWd(String wdId);
 

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

@@ -1,12 +1,13 @@
 package com.ruoyi.demo.service;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.pagehelper.PageInfo;
 import com.ruoyi.demo.entity.Brand;
 import com.ruoyi.demo.entity.vo.BrandVo;
 
 
 public interface BrandRecycleService {
-    public PageInfo<Brand> list(BrandVo brandVo);
+    Page<Brand> list(BrandVo brandVo);
 
     void deleteBrand(String brandId);
 

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

@@ -1,14 +1,14 @@
 package com.ruoyi.demo.service;
 
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.pagehelper.PageInfo;
 
+import com.ruoyi.demo.entity.Brand;
 import com.ruoyi.demo.entity.BrandCityTier;
+import com.ruoyi.demo.entity.Enterprise;
 import com.ruoyi.demo.entity.bo.*;
-import com.ruoyi.demo.entity.vo.BrandEvolveVo;
-import com.ruoyi.demo.entity.vo.ListQueryBody;
-import com.ruoyi.demo.entity.vo.OpcloseTimeVo;
-import com.ruoyi.demo.entity.vo.TimeVo;
+import com.ruoyi.demo.entity.vo.*;
 
 import java.util.List;
 import java.util.Map;
@@ -49,4 +49,10 @@ public interface BrandService {
     List<TimeVo> searchNew(List<String> industryCodes);
 
     List<TimeVo> searchNewByYears(Integer years);
+
+    void updateBrand(BrandVo brandVo);
+
+    Page<Brand> selectBrand(String brandName, int size);
+
+    Page<Enterprise> selectEnterprise(String enterpriseName, int size);
 }

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

@@ -2,7 +2,9 @@ package com.ruoyi.demo.service;
 
 
 import com.ruoyi.demo.entity.BuildWd;
+import com.ruoyi.demo.entity.vo.BuildwdVo;
 
 public interface BuildWdService {
-    public BuildWd buildWdInfo(String wdId);
+
+    void updateBuildWd(BuildwdVo buildwdVo);
 }

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

@@ -2,7 +2,9 @@ package com.ruoyi.demo.service;
 
 
 import com.ruoyi.demo.entity.EnterpriseWd;
+import com.ruoyi.demo.entity.vo.EnterpriseWdVo;
 
 public interface EnterpriseWdService {
-    public EnterpriseWd enterpriseWdInfo(String wdId);
+
+    void updateEnterpriseWd(EnterpriseWdVo enterpriseWdVo);
 }

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

@@ -2,7 +2,9 @@ package com.ruoyi.demo.service;
 
 
 import com.ruoyi.demo.entity.HouseWd;
+import com.ruoyi.demo.entity.vo.HouseWdVo;
 
 public interface HouseWdService {
-    public HouseWd houseWddInfo(String wdId);
+
+    void updateHouseWd(HouseWdVo houseWdVo);
 }

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

@@ -2,7 +2,9 @@ package com.ruoyi.demo.service;
 
 
 import com.ruoyi.demo.entity.StoreWd;
+import com.ruoyi.demo.entity.vo.StoreWdVo;
 
 public interface StoreWdService {
-    public StoreWd storeWdInfo(String wdId);
+
+    void updateStoreWd(StoreWdVo storeWdVo);
 }

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

@@ -2,7 +2,9 @@ package com.ruoyi.demo.service;
 
 
 import com.ruoyi.demo.entity.TrafficWd;
+import com.ruoyi.demo.entity.vo.TrafficWdVo;
 
 public interface TrafficWdService {
-    public TrafficWd trafficWdInfo(String wdId);
+
+    void updateTrafficWd(TrafficWdVo trafficWd);
 }

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

@@ -5,6 +5,7 @@ import com.ruoyi.demo.entity.bo.ChannelBo;
 import com.ruoyi.demo.entity.vo.AddStatusVo;
 import com.ruoyi.demo.entity.vo.ChannelVo;
 import com.ruoyi.demo.entity.vo.TimeVo;
+import com.ruoyi.demo.entity.vo.WdInfoVo;
 
 import java.util.List;
 
@@ -16,4 +17,6 @@ public interface WdInfoService {
     List<TimeVo> searchCloseTimes(List<String> addrCodes, List<String> typeCodeBys);
 
     Page<ChannelVo> searchChannel(ChannelBo bo);
+
+    void updateWdInfo(WdInfoVo wdInfoVo);
 }

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

@@ -13,7 +13,4 @@ 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/BrandRecycleServiceImpl.java

@@ -1,5 +1,6 @@
 package com.ruoyi.demo.service.impl;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 
@@ -20,12 +21,10 @@ public class BrandRecycleServiceImpl implements BrandRecycleService {
     @Autowired
     BrandMapper brandMapper;
     @Override
-    public  PageInfo<Brand> list(BrandVo brandVo) {
-        PageHelper.startPage(brandVo.getPageNum(),brandVo.getPageSize());
-        PageHelper.orderBy(brandVo.getOrderBy()+" desc");
-        List<Brand> list = brandMapper.list(brandVo);
-        PageInfo<Brand> brandPageInfo = new PageInfo<>(list);
-        return brandPageInfo;
+    public  Page<Brand> list(BrandVo brandVo) {
+        Page<Brand> page = new Page<>(brandVo.getPageNum(),brandVo.getPageSize());
+        Page<Brand> list = brandMapper.list(page,brandVo);
+        return list;
     }
 
     @Override

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

@@ -3,6 +3,8 @@ package com.ruoyi.demo.service.impl;
 import cn.hutool.core.date.DateField;
 import cn.hutool.core.date.DateUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 
@@ -579,4 +581,46 @@ public class BrandServiceImpl implements BrandService {
         }
         return vos;
     }
+
+    @Override
+    public void updateBrand(BrandVo brandVo) {
+        UpdateWrapper<Brand> updateWrapper = new UpdateWrapper<>();
+        updateWrapper.eq("brand_id",brandVo.getBrandId())
+            .set("brand_img",brandVo.getBrandImg())
+            .set("brand_name",brandVo.getBrandName())
+            .set("industry_code",brandVo.getIndustryCode())
+            .set("enterprise_usci",brandVo.getEnterpriseUsci())
+            .set("per_capita_consumption",brandVo.getPerCapitaConsumption())
+            .set("comment_count",brandVo.getCommentCount())
+            .set("score",brandVo.getScore())
+            .set("menu_info",brandVo.getMenuInfo())
+            .set("index_score",brandVo.getIndexScore())
+            .set("contact",brandVo.getContact())
+            .set("telephone",brandVo.getTelephone())
+            .set("create_date",brandVo.getCreateDate());
+    }
+
+    @Override
+    public Page<Brand> selectBrand(String brandName, int size) {
+        QueryWrapper<Brand> queryWrapper = new QueryWrapper<>();
+        queryWrapper.select("brand_id","brand_name");
+        if (brandName != null && !brandName.equals("")){
+            queryWrapper.likeRight("brand_name",brandName);
+        }
+        Page<Brand> page = new Page<>(1,size == 0 ? 10:size);
+        Page<Brand> brandPage = brandMapper.selectPage(page, queryWrapper);
+        return brandPage;
+    }
+
+    @Override
+    public Page<Enterprise> selectEnterprise(String enterpriseName, int size) {
+        QueryWrapper<Enterprise> queryWrapper = new QueryWrapper<>();
+        queryWrapper.select("enterprise_name","enterprise_usci");
+        if (enterpriseName != null && !enterpriseName.equals("")){
+            queryWrapper.likeRight("enterprise_name",enterpriseName);
+        }
+        Page<Enterprise> page = new Page<>(1,size == 0 ? 10:size);
+        Page<Enterprise> enterprisePage = enterpriseMapper.selectPage(page, queryWrapper);
+        return enterprisePage;
+    }
 }

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

@@ -1,8 +1,14 @@
 package com.ruoyi.demo.service.impl;
 
 
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.demo.entity.BuildWd;
+import com.ruoyi.demo.entity.StoreWd;
+import com.ruoyi.demo.entity.WdInfo;
+import com.ruoyi.demo.entity.vo.BuildwdVo;
 import com.ruoyi.demo.mapper.BuildWdDao;
+import com.ruoyi.demo.mapper.WdInfoDao;
 import com.ruoyi.demo.service.BuildWdService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -13,8 +19,36 @@ import org.springframework.transaction.annotation.Transactional;
 public class BuildWdServiceeImpl implements BuildWdService {
     @Autowired
     BuildWdDao buildWdDao;
+    @Autowired
+    WdInfoDao wdInfoDao;
+
+
+    /**
+     * 修改楼宇网点
+     * @param buildwdVo
+     */
     @Override
-    public BuildWd buildWdInfo(String wdId) {
-        return buildWdDao.selectById(wdId);
+    public void updateBuildWd(BuildwdVo buildwdVo) {
+        //1.修改网点基本信息
+        UpdateWrapper<WdInfo> updateWrapper = new UpdateWrapper<>();
+        updateWrapper.eq("wd_id",buildwdVo.getWdId())
+            .set("wd_name",buildwdVo.getWdName())
+            .set("wd_img",buildwdVo.getWdImg())
+            .set("addrInfo",buildwdVo.getAddrInfo())
+            .set("addrCode",buildwdVo.getAddrCode())
+            .set("lat",buildwdVo.getLat())
+            .set("lng",buildwdVo.getLng())
+            .set("typeCodeBy",buildwdVo.getTypeCodeBy())
+            .set("typeNameBy",buildwdVo.getTypeNameBy())
+            .set("updateTime", DateUtils.getTime());
+        wdInfoDao.update(null,updateWrapper);
+
+        //2.修改楼宇信息
+        UpdateWrapper<BuildWd> updateWrapper1 = new UpdateWrapper<>();
+        updateWrapper1.eq("wd_id",buildwdVo.getWdId())
+            .set("property_type",buildwdVo.getBuildWd().getPropertyType())
+            .set("build_type",buildwdVo.getBuildWd().getBuildType())
+            .set("households",buildwdVo.getBuildWd().getHouseholds())
+            .set("people_count",buildwdVo.getBuildWd().getPeopleCount());
     }
 }

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

@@ -1,8 +1,14 @@
 package com.ruoyi.demo.service.impl;
 
 
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.demo.entity.EnterpriseWd;
+import com.ruoyi.demo.entity.TrafficWd;
+import com.ruoyi.demo.entity.WdInfo;
+import com.ruoyi.demo.entity.vo.EnterpriseWdVo;
 import com.ruoyi.demo.mapper.EnterpriseWdDao;
+import com.ruoyi.demo.mapper.WdInfoDao;
 import com.ruoyi.demo.service.EnterpriseWdService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -13,8 +19,34 @@ import org.springframework.transaction.annotation.Transactional;
 public class EnterpriseWdServiceImpl implements EnterpriseWdService {
     @Autowired
     EnterpriseWdDao enterpriseWdDao;
+    @Autowired
+    WdInfoDao wdInfoDao;
+
+
+    /**
+     * 修改企业网点
+     * @param enterpriseWdVo
+     */
     @Override
-    public EnterpriseWd enterpriseWdInfo(String wdId) {
-        return enterpriseWdDao.selectById(wdId);
+    public void updateEnterpriseWd(EnterpriseWdVo enterpriseWdVo) {
+        //1.修改网点基本信息
+        UpdateWrapper<WdInfo> updateWrapper = new UpdateWrapper<>();
+        updateWrapper.eq("wd_id",enterpriseWdVo.getWdId())
+            .set("wd_img",enterpriseWdVo.getWdImg())
+            .set("wd_name",enterpriseWdVo.getWdName())
+            .set("addr_info",enterpriseWdVo.getAddrInfo())
+            .set("addr_code",enterpriseWdVo.getAddrCode())
+            .set("lat",enterpriseWdVo.getLat())
+            .set("lng",enterpriseWdVo.getLng())
+            .set("type_code_by",enterpriseWdVo.getTypeCodeBy())
+            .set("type_name_by",enterpriseWdVo.getTypeNameBy())
+            .set("update_time", DateUtils.getTime());
+        wdInfoDao.update(null,updateWrapper);
+
+
+        //2.修改交通设施信息
+        UpdateWrapper<EnterpriseWd> updateWrapper1 = new UpdateWrapper<>();
+        updateWrapper1.eq("wd_id",enterpriseWdVo.getWdId())
+            .set("enterprise_usci",enterpriseWdVo.getEnterpriseWd().getEnterpriseUsci());
     }
 }

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

@@ -1,8 +1,14 @@
 package com.ruoyi.demo.service.impl;
 
 ;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.demo.entity.HouseWd;
+import com.ruoyi.demo.entity.StoreWd;
+import com.ruoyi.demo.entity.WdInfo;
+import com.ruoyi.demo.entity.vo.HouseWdVo;
 import com.ruoyi.demo.mapper.HouseWdDao;
+import com.ruoyi.demo.mapper.WdInfoDao;
 import com.ruoyi.demo.service.HouseWdService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -13,8 +19,37 @@ import org.springframework.transaction.annotation.Transactional;
 public class HouseWdServiceImpl implements HouseWdService {
     @Autowired
     HouseWdDao houseWdDao;
+
+    @Autowired
+    WdInfoDao wdInfoDao;
+
+
+    /**
+     * 修改小区网点
+     * @param houseWdVo
+     */
     @Override
-    public HouseWd houseWddInfo(String wdId) {
-        return houseWdDao.selectById(wdId);
+    public void updateHouseWd(HouseWdVo houseWdVo) {
+        //1.修改网点基本信息
+        UpdateWrapper<WdInfo> updateWrapper = new UpdateWrapper<>();
+        updateWrapper.eq("wd_id",houseWdVo.getWdId())
+            .set("wd_name",houseWdVo.getWdName())
+            .set("wd_img",houseWdVo.getWdImg())
+            .set("addr_info",houseWdVo.getAddrInfo())
+            .set("addr_code",houseWdVo.getAddrCode())
+            .set("lat",houseWdVo.getLat())
+            .set("lng",houseWdVo.getLng())
+            .set("type_code_by",houseWdVo.getTypeCodeBy())
+            .set("type_name_by",houseWdVo.getTypeNameBy())
+            .set("update_time", DateUtils.getTime());
+        wdInfoDao.update(null,updateWrapper);
+
+        //2.修改小区信息
+        UpdateWrapper<HouseWd> updateWrapper1 = new UpdateWrapper<>();
+        updateWrapper1.eq("wd_id",houseWdVo.getWdId())
+            .set("property_type",houseWdVo.getHouseWd().getPropertyType())
+            .set("households",houseWdVo.getHouseWd().getHouseholds())
+            .set("people_count",houseWdVo.getHouseWd().getPeopleCount());
+
     }
 }

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

@@ -1,8 +1,14 @@
 package com.ruoyi.demo.service.impl;
 
 
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.demo.entity.StoreWd;
+import com.ruoyi.demo.entity.WdInfo;
+import com.ruoyi.demo.entity.vo.StoreWdVo;
 import com.ruoyi.demo.mapper.StoreWdDao;
+import com.ruoyi.demo.mapper.WdInfoDao;
+import com.ruoyi.demo.mapper.WdInfoMapper;
 import com.ruoyi.demo.service.StoreWdService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -13,9 +19,50 @@ import org.springframework.transaction.annotation.Transactional;
 public class StoreWdServiceImpl implements StoreWdService {
     @Autowired
     StoreWdDao storeWdDao;
+
+    @Autowired
+    WdInfoDao wdInfoDao;
+
+
+    /**
+     * 修改门店网点
+     * @param storeWdVo
+     */
     @Override
-    public StoreWd storeWdInfo(String wdId) {
-        StoreWd storeWd = storeWdDao.selectById(wdId);
-        return storeWd;
+    public void updateStoreWd(StoreWdVo storeWdVo) {
+        //1.修改网点基本信息
+        UpdateWrapper<WdInfo> updateWrapper = new UpdateWrapper<>();
+        updateWrapper.eq("wd_id",storeWdVo.getWdId())
+            .set("wd_img",storeWdVo.getWdImg())
+            .set("wd_name",storeWdVo.getWdName())
+            .set("addr_info",storeWdVo.getAddrInfo())
+            .set("addr_code",storeWdVo.getAddrCode())
+            .set("lat",storeWdVo.getLat())
+            .set("lng",storeWdVo.getLng())
+            .set("type_code_by",storeWdVo.getTypeCodeBy())
+            .set("type_name_by",storeWdVo.getTypeNameBy())
+            .set("update_time", DateUtils.getTime());
+        wdInfoDao.update(null,updateWrapper);
+
+        //2.修改门店信息
+        UpdateWrapper<StoreWd> updateWrapper1 = new UpdateWrapper<>();
+        updateWrapper1.eq("wd_id",storeWdVo.getWdId())
+            .set("brand_id",storeWdVo.getStoreWd().getBrandId())
+            .set("brand_name",storeWdVo.getStoreWd().getBrandName())
+            .set("per_capita_consumption",storeWdVo.getStoreWd().getPerCapitaConsumption())
+            .set("manage_type_code",storeWdVo.getStoreWd().getManageTypeCode())
+            .set("industry_code",storeWdVo.getStoreWd().getIndustryCode())
+            .set("comment_count",storeWdVo.getStoreWd().getCommentCount())
+            .set("score",storeWdVo.getStoreWd().getScore())
+            .set("buy_info",storeWdVo.getStoreWd().getBuyInfo())
+            .set("index_score",storeWdVo.getStoreWd().getIndexScore())
+            .set("business_status",storeWdVo.getStoreWd().getBusinessStatus())
+            .set("business_time",storeWdVo.getStoreWd().getBusinessTime())
+            .set("telephone",storeWdVo.getStoreWd().getTelephone())
+            .set("contact",storeWdVo.getStoreWd().getContact())
+            .set("channel_type",storeWdVo.getStoreWd().getChannelType())
+            .set("opentime",storeWdVo.getStoreWd().getOpentime())
+            .set("closetime",storeWdVo.getStoreWd().getClosetime());
+        storeWdDao.update(null,updateWrapper1);
     }
 }

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

@@ -1,8 +1,14 @@
 package com.ruoyi.demo.service.impl;
 
 
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.demo.entity.BuildWd;
 import com.ruoyi.demo.entity.TrafficWd;
+import com.ruoyi.demo.entity.WdInfo;
+import com.ruoyi.demo.entity.vo.TrafficWdVo;
 import com.ruoyi.demo.mapper.TrafficWdDao;
+import com.ruoyi.demo.mapper.WdInfoDao;
 import com.ruoyi.demo.service.TrafficWdService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -13,8 +19,34 @@ import org.springframework.transaction.annotation.Transactional;
 public class TrafficWdServiceImpl implements TrafficWdService {
     @Autowired
     TrafficWdDao trafficWdDao;
+
+    @Autowired
+    WdInfoDao wdInfoDao;
+
+
+    /**
+     * 修改交通设施网点
+     * @param trafficWd
+     */
     @Override
-    public TrafficWd trafficWdInfo(String wdId) {
-        return trafficWdDao.selectById(wdId);
+    public void updateTrafficWd(TrafficWdVo trafficWd) {
+        //1.修改网点基本信息
+        UpdateWrapper<WdInfo> updateWrapper = new UpdateWrapper<>();
+        updateWrapper.eq("wd_id",trafficWd.getWdId())
+            .set("wd_img",trafficWd.getWdImg())
+            .set("wd_name",trafficWd.getWdName())
+            .set("addr_info",trafficWd.getAddrInfo())
+            .set("addr_code",trafficWd.getAddrCode())
+            .set("lat",trafficWd.getLat())
+            .set("lng",trafficWd.getLng())
+            .set("type_code_by",trafficWd.getTypeCodeBy())
+            .set("type_name_by",trafficWd.getTypeNameBy())
+            .set("update_time", DateUtils.getTime());
+        wdInfoDao.update(null,updateWrapper);
+
+        //2.修改交通设施信息
+        UpdateWrapper<TrafficWd> updateWrapper1 = new UpdateWrapper<>();
+        updateWrapper1.eq("wd_id",trafficWd.getWdId())
+            .set("cars",trafficWd.getTrafficWd().getCars());
     }
 }

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

@@ -2,12 +2,15 @@ package com.ruoyi.demo.service.impl;
 
 import cn.hutool.core.date.DateUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.demo.entity.WdInfo;
 import com.ruoyi.demo.entity.bo.ChannelBo;
 import com.ruoyi.demo.entity.vo.AddStatusVo;
 import com.ruoyi.demo.entity.vo.ChannelVo;
 import com.ruoyi.demo.entity.vo.TimeVo;
+import com.ruoyi.demo.entity.vo.WdInfoVo;
 import com.ruoyi.demo.mapper.StoreWdOpcloseDao;
 import com.ruoyi.demo.mapper.WdInfoMapper;
 import com.ruoyi.demo.mapper.WdOpcloseDao;
@@ -159,4 +162,25 @@ public class WdInfoServiceImpl implements WdInfoService {
         Page<WdInfo> page = new Page<>(bo.getPageNum(), bo.getPageSize());
         return wdInfoMapper.selectChannel(page, wdInfoQueryWrapper);
     }
+
+    /**
+     * 修改网点基本信息
+     * @param wdInfoVo
+     */
+    @Override
+    public void updateWdInfo(WdInfoVo wdInfoVo) {
+        //1.修改网点基本信息
+        UpdateWrapper<WdInfo> updateWrapper = new UpdateWrapper<>();
+        updateWrapper.eq("wd_id",wdInfoVo.getWdId())
+            .set("wd_name",wdInfoVo.getWdName())
+            .set("addr_info",wdInfoVo.getAddrInfo())
+            .set("addr_code",wdInfoVo.getAddrCode())
+            .set("lat",wdInfoVo.getLat())
+            .set("lng",wdInfoVo.getLng())
+            .set("type_code_by",wdInfoVo.getTypeCodeBy())
+            .set("type_name_by",wdInfoVo.getTypeNameBy())
+            .set("update_time", DateUtils.getTime());
+        wdInfoMapper.update(null,updateWrapper);
+
+    }
 }

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

@@ -1,12 +1,16 @@
 package com.ruoyi.demo.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.demo.entity.StoreWd;
 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.StoreWdDao;
 import com.ruoyi.demo.mapper.WdInfoMapper;
 import com.ruoyi.demo.service.WdRecycleService;
 import com.ruoyi.demo.utils.InitMapUtil;
@@ -36,32 +40,32 @@ public class WdRecycleServiceImpl implements WdRecycleService {
      */
     @Override
     public HashMap<String, Object> list(WdInfoVo wdInfoVo) {
-
-        PageHelper.startPage(wdInfoVo.getPageNum(), wdInfoVo.getPageSize());
-        PageHelper.orderBy(wdInfoVo.getOrderBy() + " desc");
-        List<WdInfo> wdInfos = wdInfoMapper.list(wdInfoVo);
-        PageInfo<WdInfo> pageInfo = new PageInfo<>(wdInfos);
-
-        List<WdInfoVo> collect = wdInfos.stream().map(wdInfo -> {
-            if (wdInfo.getTypeNameBy() != null) {
-                String[] split = wdInfo.getTypeNameBy().split(":");
-                if (split.length == 3)
-                    wdInfo.setTypeNameBy(split[2]);
-                else if (split.length == 2)
-                    wdInfo.setTypeNameBy(split[1]);
-                else
-                    wdInfo.setAddrInfo(wdInfo.getTypeNameBy().replace(":", ""));
-            }
-
-            WdInfoVo wdInfoVo1 = new WdInfoVo(wdInfo);
-            wdInfoVo1.setAddrCodeInfo(initMapUtil.getInitAddrCodeMap(wdInfoVo1.getAddrCode()));
-            return wdInfoVo1;
-        }).collect(Collectors.toList());
-
+        //1.查询符合条件的数据
+        Page<WdInfo> page = new Page<>(wdInfoVo.getPageNum(), wdInfoVo.getPageSize());
+        Page<WdInfo> page1 = wdInfoMapper.list(page, wdInfoVo);
+
+        //2.预处理
+//        List<WdInfoVo> collect = page1.getRecords().stream().map(wdInfo -> {
+//            if (wdInfo.getTypeNameBy() != null) {
+//                String[] split = wdInfo.getTypeNameBy().split(":");
+//                if (split.length == 3)
+//                    wdInfo.setTypeNameBy(split[2]);
+//                else if (split.length == 2)
+//                    wdInfo.setTypeNameBy(split[1]);
+//                else
+//                    wdInfo.setAddrInfo(wdInfo.getTypeNameBy().replace(":", ""));
+//            }
+//
+//            WdInfoVo wdInfoVo1 = new WdInfoVo(wdInfo);
+//            //wdInfoVo1.setAddrCodeInfo(initMapUtil.getInitAddrCodeMap(wdInfoVo1.getAddrCode()));
+//            return wdInfoVo1;
+//        }).collect(Collectors.toList());
+
+        //3.返回结果
         HashMap<String, Object> result = new HashMap<>();
-        pageInfo.setList(null);
-        result.put("page", pageInfo);
-        result.put("data", collect);
+        result.put("data", page1.getRecords());
+        page1.setRecords(null);
+        result.put("page", page1);
         return result;
     }
 
@@ -72,7 +76,6 @@ public class WdRecycleServiceImpl implements WdRecycleService {
     @Override
     public void deleteWd(String wdId) {
         wdInfoMapper.deleteById(wdId);
-        return;
     }
 
     /**
@@ -83,27 +86,4 @@ public class WdRecycleServiceImpl implements WdRecycleService {
     public void recoverWd(String wdId) {
         wdInfoMapper.recoverWd(wdId);
     }
-
-
-    @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",)
-    }
-
-
 }

ruoyi-demo/src/main/resources/mapper/demo/BrandMapper.xml

@@ -81,14 +81,14 @@
     <select id="list" parameterType="com.ruoyi.demo.entity.vo.BrandVo" resultType="com.ruoyi.demo.entity.Brand">
         select * from ddt_brand
         <where>
-            <if test="brandName != null and brandName != ''">
+            <if test="brand.brandName != null and brand.brandName != ''">
                 and brand_name like concat('%',#{brandName},'%')
             </if>
-            <if test="showDelete != -1">
+            <if test="brand.showDelete != -1">
                 and show_delete = #{showDelete}
             </if>
-            <if test="industryCode != null and industryCode != ''">
-                and industry_code = #{industryCode}
+            <if test="brand.industryCode != null and brand.industryCode != ''">
+                and industry_code = #{brand.industryCode}
             </if>
         </where>
     </select>

ruoyi-demo/src/main/resources/mapper/demo/WdInfoMapper.xml

@@ -8,21 +8,20 @@
         <result property="count" column="count"/>
         <result property="time" column="time"/>
     </resultMap>
-
     <select id="list" parameterType="com.ruoyi.demo.entity.vo.WdInfoVo" resultType="com.ruoyi.demo.entity.WdInfo">
         select * from ddt_wd_info
         <where>
-            <if test="wdName != null and wdName != ''">
-                and wd_name like concat("%",#{wdName},"%")
+            <if test="wd.wdName != null and wd.wdName != ''">
+                and wd_name like concat("%",#{wd.wdName},"%")
             </if>
-            <if test="typeCodeBy != null and typeCodeBy != ''">
-                and type_code_by = #{typeCodeBy}
+            <if test="wd.typeCodeBy != null and wd.typeCodeBy != ''">
+                and type_code_by = #{wd.typeCodeBy}
             </if>
-            <if test="addrCode != null and addrCode != ''">
-                and addr_code = #{addrCode}
+            <if test="wd.addrCode != null and wd.addrCode != ''">
+                and addr_code = #{wd.addrCode}
             </if>
-            <if test="showDelete != -1">
-                and show_delete = #{showDelete}
+            <if test="wd.showDelete != -1">
+                and show_delete = #{wd.showDelete}
             </if>
         </where>
     </select>

ruoyi-job/src/main/java/com/ruoyi/job/service/BenyunService.java

@@ -38,7 +38,7 @@ public class BenyunService {
      * */
     @XxlJob("WriteRedisJob")
     public void WriteRedisJob(){
-        Boolean aBoolean = redisTemplate.hasKey("4501");
+        Boolean aBoolean = redisTemplate.hasKey("isWriteRedis");
         if (aBoolean){
             //将当天新的网点信息加载redis
             XxlJobHelper.log("WriteRedisJob-day start");
@@ -59,7 +59,7 @@ public class BenyunService {
             } catch (Exception e) {
                 e.printStackTrace();
                 XxlJobHelper.log("WriteRedisJob-full ERROR："+e.getMessage());
-                redisTemplate.boundValueOps("4501").set(1);
+                redisTemplate.boundValueOps("isWriteRedis").set(1);
             }
             AnalyseJob();
         }