Merge branch 'master' into lcy

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

@@ -2,10 +2,12 @@ package com.ruoyi.demo.controller;
 
 import com.github.pagehelper.PageInfo;
 import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.validate.AddGroup;
 import com.ruoyi.demo.entity.App;
 import com.ruoyi.demo.entity.vo.AppVo;
 import com.ruoyi.demo.service.AppService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 @RestController
@@ -15,7 +17,7 @@ public class AppController {
     AppService appService;
 
     @PostMapping("/addApp")
-    public R addApp(AppVo appVo){
+    public R addApp(@Validated(value={AddGroup.class}) AppVo appVo){
         appService.addApp(appVo);
         return R.ok();
     }
@@ -28,12 +30,12 @@ public class AppController {
 
     @GetMapping("/getAppListByCommercialId")
     public R getAppListByCommercialId(AppVo appVo){
-        PageInfo<App> appListByCommercialId = appService.getAppListByCommercialId(appVo);
+        PageInfo<App> appListByCommercialId = appService.getAppList(appVo);
         return R.ok(appListByCommercialId);
     }
 
     @GetMapping("/getApp")
-    public R getApp(AppVo appVo){
+    public R getApp(@Validated(value={AddGroup.class})AppVo appVo){
         App app = appService.getApp(appVo);
         return R.ok(app);
     }
@@ -43,4 +45,10 @@ public class AppController {
         appService.updateApp(appVo);
         return R.ok();
     }
+
+    @GetMapping("/testCallBack")
+    public R testCallBack(String callBack){
+        appService.testCallBack(callBack);
+        return R.ok();
+    }
 }

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

@@ -8,6 +8,7 @@ import com.ruoyi.demo.service.CommericalService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.HashMap;
 import java.util.List;
 
 @RestController
@@ -36,7 +37,13 @@ public class CommercialController {
 
     @GetMapping("/getCommercialList")
     public R getCommercialList(CommercialVo commercialVo){
-        PageInfo<Commercial> commercialList = commericalService.getCommercialList(commercialVo);
+        HashMap commercialList = commericalService.getCommercialList(commercialVo);
         return R.ok(commercialList);
     }
+
+    @GetMapping("/getCommercialName")
+    public R getCommercialName(){
+        List<Commercial> commercialName = commericalService.getCommercialName();
+        return R.ok(commercialName);
+    }
 }

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

@@ -1,25 +1,30 @@
 package com.ruoyi.demo.controller;
 
+import com.github.pagehelper.PageInfo;
 import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.validate.AddGroup;
 import com.ruoyi.demo.entity.Equipment;
 import com.ruoyi.demo.entity.vo.EquipmentVo;
 import com.ruoyi.demo.service.EquipmentService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
+
 @RequestMapping("/equimpent")
 @RestController
 public class EquipmentController {
     @Autowired
     EquipmentService equipmentService;
     @PostMapping("/addEquipment")
-    public R addEquipment(EquipmentVo equipmentVo){
+    public R addEquipment(@Validated(value = {AddGroup.class}) EquipmentVo equipmentVo){
         equipmentService.addEquipment(equipmentVo);
         return R.ok();
     }
 
     @PutMapping("/updateEquipment")
-    public R updateEquipment(EquipmentVo equipmentVo){
+    public R updateEquipment(@Validated(value = {AddGroup.class})EquipmentVo equipmentVo){
         equipmentService.updateEquipment(equipmentVo);
         return R.ok();
     }
@@ -35,4 +40,32 @@ public class EquipmentController {
         equipmentService.deleteEquipment(equipmentIds);
         return R.ok();
     }
+
+    /*获得该设备的广告计划*/
+    @GetMapping("/getEquipmentBySelect")
+    public R getEuipmentPlanList(EquipmentVo equipmentVo){
+        PageInfo<Equipment> equipments = equipmentService.getEquipmentBySelect(equipmentVo);
+        return R.ok(equipments);
+    }
+
+    /*找到未分组的设备*/
+    @GetMapping("/getEquipmentBySelect")
+    public R getEquipmentBySelect(EquipmentVo equipmentVo){
+        PageInfo<Equipment> equipments = equipmentService.getEquipmentBySelect(equipmentVo);
+        return R.ok(equipments);
+    }
+
+    /*确认添加*/
+    @PostMapping("/addStoreEquipment")
+    public R addStoreEquipment(EquipmentVo equipmentVo){
+        equipmentService.addStoreEquipment(equipmentVo);
+        return R.ok();
+    }
+
+    /*查看store下已有的设备*/
+    @GetMapping("/getEquipmentByStoreId")
+    public R getEquipmentByStoreId(EquipmentVo equipmentVo){
+        PageInfo<Equipment> equipments = equipmentService.getEquipmentByStoreId(equipmentVo);
+        return R.ok(equipments);
+    }
 }

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

@@ -1,25 +1,30 @@
 package com.ruoyi.demo.controller;
 
 import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.validate.AddGroup;
+import com.ruoyi.demo.entity.Store;
 import com.ruoyi.demo.entity.bo.StoreBo;
 import com.ruoyi.demo.entity.vo.StoreVo;
 import com.ruoyi.demo.service.StoreService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.HashMap;
+
 @RestController
 @RequestMapping("/store")
 public class StoreController {
     @Autowired
     StoreService storeService;
     @PostMapping("/addStore")
-    public R addStore(StoreVo storeVo){
+    public R addStore(@Validated(value = {AddGroup.class})StoreVo storeVo){
         storeService.addStore(storeVo);
         return R.ok();
     }
 
     @PutMapping("/updateStore")
-    public R updateStore(StoreVo storeVo){
+    public R updateStore(@Validated(value = {AddGroup.class})StoreVo storeVo){
         storeService.updateStore(storeVo);
         return R.ok();
     }
@@ -32,14 +37,15 @@ public class StoreController {
 
     @GetMapping("/getStoreTree")
     public R getStoreTree(StoreVo storeVo){
-        storeService.getStoreTree(storeVo);
-        return R.ok();
+        HashMap storeList = storeService.getStoreList(storeVo);
+        return R.ok(storeList);
     }
 
     @GetMapping("/getStore")
     public R getStore(String storeId){
-        StoreBo storeBo = storeService.getStore(storeId);
-        return R.ok(storeBo);
+        Store store = storeService.getStore(storeId);
+        return R.ok(store);
     }
 
+
 }

ruoyi-demo/src/main/java/com/ruoyi/demo/entity/Commercial.java

@@ -36,6 +36,12 @@ public class Commercial {
     private String prove4;
     @TableField("prove_5")
     private String prove5;
+    @TableField("addr_code")
+    private String addrCode;
+    @TableField("addr_code_info")
+    private String addrCodeInfo;
+    @TableField("addr_info")
+    private String addrInfo;
     @TableField("create_time")
     private LocalDateTime createTime;
     @TableField("show_detele")
@@ -52,5 +58,7 @@ public class Commercial {
         this.prove3 = commercialVo.getProve3();
         this.prove4 = commercialVo.getProve4();
         this.prove5 = commercialVo.getProve5();
+        this.addrCode = commercialVo.getAddrCode();
+        this.addrInfo = commercialVo.getAddrInfo();
     }
 }

ruoyi-demo/src/main/java/com/ruoyi/demo/entity/Equipment.java

@@ -8,6 +8,7 @@ import com.ruoyi.demo.entity.vo.EquipmentVo;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.math.BigDecimal;
 import java.time.LocalDateTime;
 
 @Data
@@ -25,11 +26,13 @@ public class Equipment {
     @TableField("addr_code_info")
     private String addrCodeInfo;
     @TableField("lat")
-    private String lat;
+    private BigDecimal lat;
     @TableField("lng")
-    private String lng;
+    private BigDecimal lng;
     @TableField("state")
     private int state;
+    @TableField("on_state")
+    private int onState;
     @TableField("store_id")
     private String storeId;
     @TableField("manufacturers")
@@ -38,8 +41,12 @@ public class Equipment {
     private String maintainName;
     @TableField("maintain_telephone")
     private String maintainTelephone;
+    @TableField("annotation")
+    private String annotation;
     @TableField("enter_time")
     private LocalDateTime enterTime;
+    @TableField("update_time")
+    private LocalDateTime updateTime;
     @TableField("show_detele")
     private int showDetele;
 
@@ -54,5 +61,6 @@ public class Equipment {
         this.manufacturers = equipmentVo.getManufacturers();
         this.maintainName = equipmentVo.getMaintainName();
         this.maintainTelephone = equipmentVo.getMaintainTelephone();
+        this.annotation = equipmentVo.getAnnotation();
     }
 }

ruoyi-demo/src/main/java/com/ruoyi/demo/entity/Store.java

@@ -8,6 +8,9 @@ import com.ruoyi.demo.entity.vo.StoreVo;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
 @Data
 @TableName("store")
 @NoArgsConstructor
@@ -22,6 +25,14 @@ public class Store {
     private String addrCode;
     @TableField("addr_code_info")
     private String addrCodeInfo;
+    @TableField("lat")
+    private BigDecimal lat;
+    @TableField("lng")
+    private BigDecimal lng;
+    @TableField("point")
+    private String point;
+    @TableField("create_time")
+    private LocalDateTime createTime;
     @TableField("principal_name")
     private String principalName;
     @TableField("principal_telephone")
@@ -32,6 +43,9 @@ public class Store {
         this.addrInfo = storeVo.getAddrInfo();
         this.addrCode = storeVo.getAddrCode();
         this.addrCodeInfo = storeVo.getAddrCodeInfo();
+        this.lat = storeVo.getLat();
+        this.lng = storeVo.getLng();
+        this.point = storeVo.getPoint();
         this.principalName = storeVo.getPrincipalName();
         this.principalTelephone = storeVo.getPrincipalTelephone();
     }

ruoyi-demo/src/main/java/com/ruoyi/demo/entity/bo/CommercialBo.java

@@ -0,0 +1,47 @@
+package com.ruoyi.demo.entity.bo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.ruoyi.demo.entity.Commercial;
+import com.ruoyi.demo.entity.vo.CommercialVo;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+import java.util.List;
+
+@Data
+public class CommercialBo {
+    private String commercialId;
+    private String commercialName;
+    private String code;
+    private String commercialType;
+    private String principalName;
+    private String principalTelephone;
+    private String prove1;
+    private String prove2;
+    private String prove3;
+    private String prove4;
+    private String prove5;
+    private String addrCode;
+    private String addrCodeInfo;
+    private String addrInfo;
+    private LocalDateTime createTime;
+    private int showDetele;
+    private List<String> apps;
+
+    public CommercialBo(Commercial commercial) {
+        this.commercialName = commercial.getCommercialName();
+        this.code = commercial.getCode();
+        this.commercialType = commercial.getCommercialType();
+        this.principalName = commercial.getPrincipalName();
+        this.principalTelephone = commercial.getPrincipalTelephone();
+        this.prove1 = commercial.getProve1();
+        this.prove2 = commercial.getProve2();
+        this.prove3 = commercial.getProve3();
+        this.prove4 = commercial.getProve4();
+        this.prove5 = commercial.getProve5();
+        this.addrCode = commercial.getAddrCode();
+        this.addrInfo = commercial.getAddrInfo();
+    }
+}

ruoyi-demo/src/main/java/com/ruoyi/demo/entity/bo/StoreBo.java

@@ -21,6 +21,8 @@ public class StoreBo{
     private String addrCodeInfo;
     private String principalName;
     private String principalTelephone;
+
+    private int count;
     List<Equipment> equipmentList;
 
     public StoreBo(Store store) {

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

@@ -1,29 +1,31 @@
 package com.ruoyi.demo.entity.vo;
 
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.ruoyi.common.core.validate.AddGroup;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
 import java.time.LocalDateTime;
 
 @Data
 public class AppVo {
     private String appkey;
 
-    @NotBlank
+    @NotBlank(groups = {AddGroup.class})
     private String appLogo;
-    @NotBlank
+    @NotBlank(groups = {AddGroup.class})
     private String appName;
     private String appIntroduce;
 
-    @NotBlank
+    @NotBlank(groups = {AddGroup.class})
     private String commercialId;
 
-    @NotBlank
+    @NotBlank(groups = {AddGroup.class})
     private String commercialName;
 
     private int state;
-    @NotBlank
+    @NotBlank(groups = {AddGroup.class})
     private String callBack;
     private String appSecret;
     private String prove1;
@@ -35,6 +37,8 @@ public class AppVo {
     private String annotation;
     private int show_detele;
 
+    private String searchText;
+
     private int pageNum = 1;
     private int pageSize = 10;
 }

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

@@ -1,6 +1,7 @@
 package com.ruoyi.demo.entity.vo;
 
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.ruoyi.common.core.validate.AddGroup;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
@@ -10,24 +11,30 @@ import java.time.LocalDateTime;
 public class CommercialVo {
     private String commercialId;
 
-    @NotBlank
+    @NotBlank(groups = {AddGroup.class})
     private String commercialName;
-    @NotBlank
+    @NotBlank(groups = {AddGroup.class})
     private String code;
-    @NotBlank
+
+    @NotBlank(groups = {AddGroup.class})
     private String commercialType;
-    @NotBlank
+    @NotBlank(groups = {AddGroup.class})
     private String principalName;
-    @NotBlank
+    @NotBlank(groups = {AddGroup.class})
     private String principalTelephone;
     private String prove1;
     private String prove2;
     private String prove3;
     private String prove4;
     private String prove5;
+    private String addrCode;
+    private String addrCodeInfo;
+    private String addrInfo;
     private LocalDateTime createTime;
     private int showDetele;
 
+    private String searchText;
+
     private int pageNum = 1;
 
     private int pageSize = 10;

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

@@ -1,24 +1,41 @@
 package com.ruoyi.demo.entity.vo;
 
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.ruoyi.common.core.validate.AddGroup;
 import lombok.Data;
 
+import javax.validation.constraints.NotBlank;
+import java.math.BigDecimal;
 import java.time.LocalDateTime;
 
 @Data
 public class EquipmentVo {
     private String equipmentId;
+    @NotBlank(groups = {AddGroup.class})
     private String equipmentName;
+    @NotBlank(groups = {AddGroup.class})
     private String addrInfo;
+    @NotBlank(groups = {AddGroup.class})
     private String addrCode;
     private String addrCodeInfo;
-    private String lat;
-    private String lng;
+
+    private BigDecimal lat;
+    private BigDecimal lng;
     private int state;
+    private int onState;
     private String storeId;
     private String manufacturers;
+    private String searchText;
+    private String annotation;
+
+    private int pageNum;
+    private int pageSize;
+
+    @NotBlank(groups = {AddGroup.class})
     private String maintainName;
+    @NotBlank(groups = {AddGroup.class})
     private String maintainTelephone;
     private LocalDateTime enterTime;
+    private LocalDateTime updateTime;
     private int showDetele;
 }

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

@@ -1,24 +1,38 @@
 package com.ruoyi.demo.entity.vo;
 
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.ruoyi.common.core.validate.AddGroup;
 import com.ruoyi.demo.entity.Store;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
 
 @Data
 public class StoreVo {
     private String storeId;
-    @NotBlank
+    @NotBlank(groups={AddGroup.class})
     private String storeName;
-    @NotBlank
+    @NotBlank(groups={AddGroup.class})
     private String addrInfo;
-    @NotBlank
+    @NotBlank(groups={AddGroup.class})
     private String addrCode;
     private String addrCodeInfo;
-    @NotBlank
+
+    private BigDecimal lat;
+    private BigDecimal lng;
+    private String point;
+    private LocalDateTime createTime;
+
+    private String searchText;
+
+    private int pageNum;
+    private int pageSize;
+
+    @NotBlank(groups={AddGroup.class})
     private String principalName;
-    @NotBlank
+    @NotBlank(groups={AddGroup.class})
     private String principalTelephone;
 
 

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

@@ -10,4 +10,7 @@ import org.apache.ibatis.annotations.Update;
 public interface EquipmentMapper extends BaseMapper<Equipment> {
     @Update("update dl_equipment set equipment_name=#{equipmentName},addr_info=#{addrInfo},addr_code=#{addrCode},lat=#{lat},lng=#{lng},store_id=#{storeId},manufacturers=#{manufacturers},maintain_name=#{maintainName},maintain_telephone=#{maintainTelephone} where equipmentId = #{equipmentId}")
     void updateEquipment(EquipmentVo equipmentVo);
+
+    @Update("update dl_equipment set store_id=#{storeId} where equipmentId = #{equipmentId}")
+    void addStoreEquipment(EquipmentVo equipmentVo);
 }

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

@@ -9,9 +9,11 @@ public interface AppService {
 
     void deleteApp(String[] appKeys);
 
-    PageInfo<App> getAppListByCommercialId(AppVo appVo);
+    PageInfo<App> getAppList(AppVo appVo);
 
     App getApp(AppVo appVo);
 
     void updateApp(AppVo appVo);
+
+    void testCallBack(String callBack);
 }

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

@@ -4,6 +4,7 @@ import com.github.pagehelper.PageInfo;
 import com.ruoyi.demo.entity.Commercial;
 import com.ruoyi.demo.entity.vo.CommercialVo;
 
+import java.util.HashMap;
 import java.util.List;
 
 public interface CommericalService {
@@ -13,5 +14,7 @@ public interface CommericalService {
 
     Commercial getCommercial(String commercialId);
 
-    PageInfo<Commercial> getCommercialList(CommercialVo commercialVo);
+    HashMap getCommercialList(CommercialVo commercialVo);
+
+    List<Commercial>  getCommercialName();
 }

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

@@ -1,8 +1,11 @@
 package com.ruoyi.demo.service;
 
+import com.github.pagehelper.PageInfo;
 import com.ruoyi.demo.entity.Equipment;
 import com.ruoyi.demo.entity.vo.EquipmentVo;
 
+import java.util.List;
+
 public interface EquipmentService {
     void addEquipment(EquipmentVo equipmentVo);
 
@@ -11,4 +14,10 @@ public interface EquipmentService {
     Equipment getEquipment(String equipmentId);
 
     void deleteEquipment(String[] equipmentIds);
+
+    PageInfo<Equipment> getEquipmentBySelect(EquipmentVo equipmentVo);
+
+    void addStoreEquipment(EquipmentVo equipmentVo);
+
+    PageInfo<Equipment> getEquipmentByStoreId(EquipmentVo equipmentVo);
 }

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

@@ -1,8 +1,10 @@
 package com.ruoyi.demo.service;
 
+import com.ruoyi.demo.entity.Store;
 import com.ruoyi.demo.entity.bo.StoreBo;
 import com.ruoyi.demo.entity.vo.StoreVo;
 
+import java.util.HashMap;
 import java.util.List;
 
 public interface StoreService {
@@ -12,7 +14,7 @@ public interface StoreService {
 
     void deleteStore(String[] storeIds);
 
-    List<StoreBo> getStoreTree(StoreVo storeVo);
+    HashMap getStoreList(StoreVo storeVo);
 
-    StoreBo getStore(String storeId);
+    Store getStore(String storeId);
 }

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

@@ -37,9 +37,13 @@ public class AppServiceImpl implements AppService {
     }
 
     @Override
-    public PageInfo<App> getAppListByCommercialId(AppVo appVo) {
+    public PageInfo<App> getAppList(AppVo appVo) {
         QueryWrapper<App> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("commercialId",appVo.getCommercialId());
+        if (appVo.getSearchText() != null && !appVo.getSearchText().equals("")){
+            queryWrapper.likeRight("app_key",appVo.getSearchText());
+            queryWrapper.or().like("app_name",appVo.getSearchText());
+            queryWrapper.or().likeRight("commercial_name",appVo.getSearchText());
+        }
 
         PageHelper.startPage(appVo.getPageNum(),appVo.getPageSize());
         List<App> apps = appMapper.selectList(queryWrapper);
@@ -59,4 +63,9 @@ public class AppServiceImpl implements AppService {
         app.setAppkey(appVo.getAppkey());
         appMapper.updateApp(app);
     }
+
+    @Override
+    public void testCallBack(String callBack) {
+        //TODO 发送请求
+    }
 }

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

@@ -2,27 +2,41 @@ package com.ruoyi.demo.service.impl;
 
 import cn.dev33.satoken.annotation.SaIgnore;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.github.pagehelper.Page;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
+import com.ruoyi.demo.entity.App;
 import com.ruoyi.demo.entity.Commercial;
+import com.ruoyi.demo.entity.bo.CommercialBo;
 import com.ruoyi.demo.entity.vo.CommercialVo;
+import com.ruoyi.demo.mapper.AppMapper;
 import com.ruoyi.demo.mapper.CommercialMapper;
 import com.ruoyi.demo.service.CommericalService;
+import com.ruoyi.demo.utils.InitMapUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.time.LocalDateTime;
+import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.HashMap;
 import java.util.List;
+import java.util.stream.Collectors;
 
 @Service
 public class CommercialServiceImpl implements CommericalService {
     @Autowired
     CommercialMapper commercialMapper;
+    @Autowired
+    InitMapUtil initMapUtil;
+
+    @Autowired
+    AppMapper appMapper;
     @Override
     public void addCommercial(CommercialVo commercialVo) {
         Commercial commercial = new Commercial(commercialVo);
         commercial.setCreateTime(LocalDateTime.now());
+        commercial.setAddrCodeInfo(initMapUtil.getInitAddrCodeMap(commercial.getAddrCode()));
         commercialMapper.insert(commercial);
     }
 
@@ -37,18 +51,54 @@ public class CommercialServiceImpl implements CommericalService {
     }
 
     @Override
-    public PageInfo<Commercial> getCommercialList(CommercialVo commercialVo) {
+    public HashMap getCommercialList(CommercialVo commercialVo) {
         QueryWrapper<Commercial> queryWrapper = new QueryWrapper<>();
-        if (commercialVo.getCommercialName() != null && !commercialVo.getCommercialName().equals("")){
-            queryWrapper.like("commercial_name",commercialVo.getCommercialName());
-        }
-        if (commercialVo.getCommercialType() != null && !commercialVo.getCommercialType().equals("")){
-            queryWrapper.eq("commercial_type",commercialVo.getCommercialType());
+        if(commercialVo.getSearchText() != null && !commercialVo.getSearchText().equals("")){
+            queryWrapper.likeRight("commercial_id",commercialVo.getSearchText());
+            queryWrapper.or().like("commercial_name",commercialVo.getSearchText());
+            queryWrapper.or().like("principal_name",commercialVo.getSearchText());
+            queryWrapper.or().likeRight("principal_telephone",commercialVo.getSearchText());
         }
 
         PageHelper.startPage(commercialVo.getPageNum(), commercialVo.getPageSize());
         List<Commercial> commercials = commercialMapper.selectList(queryWrapper);
         PageInfo<Commercial> pageInfo = new PageInfo<>(commercials);
-        return pageInfo;
+
+        //1.找到需要关联的小程序
+        ArrayList<String> commercialIds = new ArrayList<>();
+        List<CommercialBo> result = new ArrayList<>();
+        for (Commercial commercial : pageInfo.getList()) {
+            commercialIds.add(commercial.getCommercialId());
+            CommercialBo commercialBo = new CommercialBo(commercial);
+            commercialBo.setApps(new ArrayList<>());
+        }
+
+        QueryWrapper<App> queryWrapper1 = new QueryWrapper<>();
+        queryWrapper1.select("commercial_id","name");
+        queryWrapper1.in("commercial_id",commercialIds);
+        List<App> apps = appMapper.selectList(queryWrapper1);
+        //2.组装Bo
+        for (CommercialBo commercialBo : result) {
+            ArrayList<String> list = new ArrayList<>();
+            apps.stream().forEach(item -> {
+                if(item.getCommercialId().equals(commercialBo.getCommercialId()))
+                    list.add(item.getAppName());
+            });
+            commercialBo.setApps(list);
+        }
+
+        pageInfo.setList(null);
+        HashMap<String, Object> objectObjectHashMap = new HashMap<>();
+        objectObjectHashMap.put("page",pageInfo);
+        objectObjectHashMap.put("data",result);
+        return objectObjectHashMap;
+    }
+
+    @Override
+    public List<Commercial>  getCommercialName() {
+        QueryWrapper<Commercial> queryWrapper = new QueryWrapper<>();
+        queryWrapper.select("commercial_name","commercial_id");
+        List<Commercial> commercials = commercialMapper.selectList(queryWrapper);
+        return commercials;
     }
 }

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

@@ -1,5 +1,8 @@
 package com.ruoyi.demo.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
 import com.ruoyi.demo.entity.Equipment;
 import com.ruoyi.demo.entity.vo.EquipmentVo;
 import com.ruoyi.demo.mapper.EquipmentMapper;
@@ -10,6 +13,7 @@ import org.springframework.stereotype.Service;
 
 import java.time.LocalDateTime;
 import java.util.Arrays;
+import java.util.List;
 
 @Service
 public class EquipmentServiceImpl implements EquipmentService {
@@ -42,4 +46,37 @@ public class EquipmentServiceImpl implements EquipmentService {
     public void deleteEquipment(String[] equipmentIds) {
         equipmentMapper.deleteBatchIds(Arrays.asList(equipmentIds));
     }
+
+
+
+    @Override
+    public PageInfo<Equipment> getEquipmentBySelect(EquipmentVo equipmentVo) {
+        QueryWrapper<Equipment> queryWrapper = new QueryWrapper<>();
+        queryWrapper.isNull("store_id");
+        if (equipmentVo.getSearchText() != null && !equipmentVo.getSearchText().equals("")){
+            queryWrapper.and(queryWrapper1 -> {
+                queryWrapper1.likeRight("equipment_id",equipmentVo.getSearchText());
+                queryWrapper1.or().like("equipment_name",equipmentVo.getSearchText());
+            });
+        }
+        PageHelper.startPage(equipmentVo.getPageNum(),equipmentVo.getPageSize());
+        List<Equipment> equipment = equipmentMapper.selectList(queryWrapper);
+        PageInfo<Equipment> pageInfo = new PageInfo<>(equipment);
+        return pageInfo;
+    }
+
+    @Override
+    public void addStoreEquipment(EquipmentVo equipmentVo) {
+        equipmentMapper.addStoreEquipment(equipmentVo);
+    }
+
+    @Override
+    public PageInfo<Equipment> getEquipmentByStoreId(EquipmentVo equipmentVo) {
+        QueryWrapper<Equipment> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("store",equipmentVo.getStoreId());
+        PageHelper.startPage(equipmentVo.getPageNum(),equipmentVo.getPageSize());
+        List<Equipment> equipment = equipmentMapper.selectList(queryWrapper);
+        PageInfo<Equipment> pageInfo = new PageInfo<>(equipment);
+        return pageInfo;
+    }
 }

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

@@ -1,6 +1,9 @@
 package com.ruoyi.demo.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.github.pagehelper.Page;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
 import com.ruoyi.demo.entity.Equipment;
 import com.ruoyi.demo.entity.Store;
 import com.ruoyi.demo.entity.bo.StoreBo;
@@ -12,8 +15,10 @@ import com.ruoyi.demo.utils.InitMapUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.HashMap;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -32,6 +37,7 @@ public class StoreServiceImpl implements StoreService {
     public void addStore(StoreVo storeVo) {
         Store store = new Store(storeVo);
         store.setAddrCodeInfo(initMapUtil.getInitAddrCodeMap(store.getAddrCode()));
+        store.setCreateTime(LocalDateTime.now());
         storeMapper.insert(store);
     }
 
@@ -50,62 +56,52 @@ public class StoreServiceImpl implements StoreService {
     * 店铺管理设备（不支持设备上层没有店铺）
     * */
     @Override
-    public List<StoreBo> getStoreTree(StoreVo storeVo) {
+    public HashMap getStoreList(StoreVo storeVo) {
         //1.找到所有店铺列表
         QueryWrapper<Store> queryWrapper = new QueryWrapper<>();
-        if (storeVo.getStoreName() != null && !storeVo.getStoreName().equals("")){
-            queryWrapper.like("store_name",storeVo.getStoreName());
-        }
-        if(storeVo.getAddrCode() != null && !storeVo.getAddrCode().equals("")){
-            queryWrapper.and(storeQueryWrapper -> {
-                storeQueryWrapper.eq("addr_code",storeVo.getAddrCode());
-            });
-        }
-        if(storeVo.getPrincipalName() != null && !storeVo.getPrincipalName().equals("")){
-            queryWrapper.and(storeQueryWrapper -> {
-                storeQueryWrapper.like("principal_name",storeVo.getPrincipalName());
-            });
+        if(storeVo.getSearchText() != null && !storeVo.getStoreName().equals("")){
+            queryWrapper.like("store_name",storeVo.getSearchText());
         }
+        PageHelper.startPage(storeVo.getPageNum(),storeVo.getPageSize());
         List<Store> stores = storeMapper.selectList(queryWrapper);
+        PageInfo<Store> pageInfo = new PageInfo<>(stores);
 
         //2.找到子设备
-        List<String> collect = stores.stream().map(item -> {
+        List<String> collect = pageInfo.getList().stream().map(item -> {
             return item.getStoreId();
         }).collect(Collectors.toList());
         QueryWrapper<Equipment> queryWrapper1 = new QueryWrapper<>();
-        queryWrapper1.select("equipment_id","equipment_name","addr_info","lat","lng","state");
+        queryWrapper1.select("store_id","count(*) as state");
         queryWrapper1.in("store_id",collect);
+        queryWrapper1.groupBy("store_id");
         List<Equipment> equipments = equipmentMapper.selectList(queryWrapper1);
 
         List<StoreBo> storeBos = new ArrayList<>();
         //组装
-        for (Store store : stores) {
+        for (Store store : pageInfo.getList()) {
             StoreBo storeBo = new StoreBo(store);
-            storeBo.setEquipmentList(findEquipmentList(store.getStoreId(),equipments));
+            storeBo.setCount(findEquipmentCount(store.getStoreId(),equipments));
             storeBos.add(storeBo);
         }
-        return storeBos;
+
+        pageInfo.setList(null);
+        HashMap<String, Object> objectObjectHashMap = new HashMap<>();
+        objectObjectHashMap.put("page",pageInfo);
+        objectObjectHashMap.put("data",stores);
+        return objectObjectHashMap;
     }
 
-    private List<Equipment> findEquipmentList(String storeId,List<Equipment> equipments){
-        List<Equipment> collect = equipments.stream().filter(item -> {
-            if (storeId.equals(item.getStoreId()))
-                return true;
-            return false;
-        }).collect(Collectors.toList());
-        return collect;
+    private int findEquipmentCount(String storeId,List<Equipment> equipments){
+        for (Equipment equipment : equipments) {
+            if (equipment.getStoreId().equals(storeId))
+                return equipment.getState();
+        }
+        return 0;
     }
 
     @Override
-    public StoreBo getStore(String storeId) {
+    public Store getStore(String storeId) {
         Store store = storeMapper.selectById(storeId);
-        StoreBo storeBo = new StoreBo(store);
-
-        QueryWrapper<Equipment> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("store_id",storeId);
-        List<Equipment> equipment = equipmentMapper.selectList(queryWrapper);
-
-        storeBo.setEquipmentList(equipment);
-        return storeBo;
+        return store;
     }
 }