添加推客和设备相关的基础业务接口和实现

src/main/java/com/ycwl/basic/controller/pc/BrokerController.java

@@ -0,0 +1,56 @@
+package com.ycwl.basic.controller.pc;
+
+import com.ycwl.basic.model.pc.broker.entity.BrokerEntity;
+import com.ycwl.basic.model.pc.broker.req.BrokerReqQuery;
+import com.ycwl.basic.service.pc.BrokerService;
+import com.ycwl.basic.utils.ApiResponse;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * @Author：longbinbin
+ * @Date：2024/12/2 15:50
+ */
+@RestController
+@RequestMapping("/api/broker/v1")
+@Api(tags = "推客（推广人）管理")
+public class BrokerController {
+    @Autowired
+    private BrokerService brokerService;
+
+    @ApiOperation("分页查询")
+    @PostMapping("/page")
+    public ApiResponse page(@RequestBody BrokerReqQuery brokerReqQuery){
+        return ApiResponse.buildSuccessResponse(brokerService.pageQuery(brokerReqQuery));
+    }
+
+    @ApiOperation("列表查询")
+    @PostMapping("/list")
+    public ApiResponse list(@RequestBody BrokerReqQuery brokerReqQuery){
+        return ApiResponse.buildSuccessResponse(brokerService.list(brokerReqQuery));
+    }
+
+    @ApiOperation("详情查询")
+    @GetMapping("/getDetails/{id}")
+    public ApiResponse getDetails(@PathVariable("id") Long id){
+        return ApiResponse.buildSuccessResponse(brokerService.getById(id));
+    }
+    @ApiOperation("新增或修改")
+    @PostMapping("/addOrUpdate")
+    public ApiResponse addOrUpdate(@RequestBody BrokerEntity broker){
+        return ApiResponse.buildSuccessResponse(brokerService.addOrUpdate(broker));
+    }
+    @ApiOperation("删除")
+    @DeleteMapping("/delete/{id}")
+    public ApiResponse delete(@PathVariable("id") Long id){
+        return ApiResponse.buildSuccessResponse(brokerService.delete(id));
+    }
+    @ApiOperation("修改状态")
+    @PutMapping("/updateStatus/{id}")
+    public ApiResponse updateStatus(@PathVariable("id") Long id){
+        return ApiResponse.buildSuccessResponse(brokerService.updateStatus(id));
+    }
+
+}

src/main/java/com/ycwl/basic/controller/pc/DeviceController.java

@@ -0,0 +1,55 @@
+package com.ycwl.basic.controller.pc;
+
+import com.github.pagehelper.PageInfo;
+import com.ycwl.basic.model.pc.device.req.DeviceAddOrUpdateReq;
+import com.ycwl.basic.model.pc.device.req.DeviceReqQuery;
+import com.ycwl.basic.model.pc.device.resp.DeviceRespVO;
+import com.ycwl.basic.service.pc.DeviceService;
+import com.ycwl.basic.utils.ApiResponse;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * @Author：longbinbin
+ * @Date：2024/12/2 16:13
+ */
+@RestController
+@RequestMapping("/api/device/v1")
+@Api(tags = "设备管理")
+public class DeviceController {
+    @Autowired
+    private DeviceService deviceService;
+
+    @ApiOperation("分页查询")
+    @PostMapping("/page")
+    public ApiResponse<PageInfo<DeviceRespVO>> pageQuery(@RequestBody DeviceReqQuery deviceReqQuery) {
+        return deviceService.pageQuery(deviceReqQuery);
+    }
+    @ApiOperation("列表查询")
+    @PostMapping("/list")
+    public ApiResponse list(@RequestBody DeviceReqQuery deviceReqQuery) {
+        return deviceService.list(deviceReqQuery);
+    }
+    @ApiOperation("详情查询")
+    @GetMapping("/getDetails/{id}")
+    public ApiResponse<DeviceRespVO> getDetails(@PathVariable("id") Long id) {
+        return deviceService.getById(id);
+    }
+    @ApiOperation("新增或修改")
+    @PostMapping("/addOrUpdate")
+    public ApiResponse addOrUpdate(@RequestBody DeviceAddOrUpdateReq deviceReqQuery) {
+        return deviceService.addOrUpdate(deviceReqQuery);
+    }
+    @ApiOperation("删除")
+    @DeleteMapping("/delete/{id}")
+    public ApiResponse delete(@PathVariable("id") Long id) {
+        return deviceService.deleteById(id);
+    }
+    @ApiOperation("修改状态")
+    @PutMapping("/updateStatus/{id}")
+    public ApiResponse updateStatus(@PathVariable("id") Long id) {
+        return deviceService.updateStatus(id);
+    }
+}

src/main/java/com/ycwl/basic/mapper/pc/DeviceMapper.java

@@ -1,6 +1,7 @@
 package com.ycwl.basic.mapper.pc;
 
 import com.ycwl.basic.model.pc.device.entity.DeviceEntity;
+import com.ycwl.basic.model.pc.device.req.DeviceAddOrUpdateReq;
 import com.ycwl.basic.model.pc.device.req.DeviceReqQuery;
 import com.ycwl.basic.model.pc.device.resp.DeviceRespVO;
 import org.apache.ibatis.annotations.Mapper;
@@ -16,8 +17,8 @@ import java.util.List;
 public interface DeviceMapper {
     List<DeviceRespVO> list(DeviceReqQuery deviceReqQuery);
     DeviceRespVO getById(Long id);
-    int add(DeviceEntity device);
+    int add(DeviceAddOrUpdateReq deviceReqQuery);
     int deleteById(Long id);
-    int update(DeviceEntity device);
+    int update(DeviceAddOrUpdateReq deviceReqQuery);
     int updateStatus(Long id);
 }

src/main/java/com/ycwl/basic/model/common/BaseQueryParameterReq.java

@@ -12,7 +12,7 @@ import lombok.Data;
 public class BaseQueryParameterReq {
 
     @ApiModelProperty(value = "当前页数")
-    private Integer page = 1;
+    private Integer pageNum = 1;
 
     @ApiModelProperty(value = "每页条数")
     private Integer pageSize = 10;

src/main/java/com/ycwl/basic/model/pc/device/req/DeviceAddOrUpdateReq.java

@@ -0,0 +1,28 @@
+package com.ycwl.basic.model.pc.device.req;
+
+import com.ycwl.basic.model.common.BaseQueryParameterReq;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @Author：longbinbin
+ * @Date：2024/11/29 14:53
+ */
+@Data
+@ApiModel("设备新增修改参数")
+public class DeviceAddOrUpdateReq {
+    private Long id;
+    @ApiModelProperty("景区id")
+    private Long scenicId;
+    @ApiModelProperty("设备名称")
+    private String name;
+    @ApiModelProperty("设备编号")
+    private String no;
+    @ApiModelProperty("是否启用，0不启用，1启用")
+    private Integer status;
+    @ApiModelProperty("是否在线，0不在线，1在线")
+    private Integer online;
+}

src/main/java/com/ycwl/basic/model/pc/device/req/DeviceReqQuery.java

@@ -15,6 +15,7 @@ import java.util.Date;
 @Data
 @ApiModel("设备查询参数")
 public class DeviceReqQuery extends BaseQueryParameterReq {
+
     @ApiModelProperty("景区id")
     private Long scenicId;
     @ApiModelProperty("设备名称")

src/main/java/com/ycwl/basic/service/impl/pc/AdminUserServiceImpl.java

@@ -48,7 +48,7 @@ public class AdminUserServiceImpl implements AdminUserService {
 
     @Override
     public ApiResponse list(AdminUserListReqVO adminUserListReqVO) {
-        PageHelper.startPage(adminUserListReqVO.getPage(), adminUserListReqVO.getPageSize());
+        PageHelper.startPage(adminUserListReqVO.getPageNum(), adminUserListReqVO.getPageSize());
         List<AdminUserListRespVO> list = adminUserMapper.list(adminUserListReqVO);
         PageInfo<AdminUserListRespVO> pageInfo = new PageInfo(list);
         return ApiResponse.buildSuccessResponse(pageInfo);

src/main/java/com/ycwl/basic/service/impl/pc/BrokerServiceImpl.java

@@ -0,0 +1,62 @@
+package com.ycwl.basic.service.impl.pc;
+
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import com.ycwl.basic.mapper.pc.BrokerMapper;
+import com.ycwl.basic.model.pc.broker.entity.BrokerEntity;
+import com.ycwl.basic.model.pc.broker.req.BrokerReqQuery;
+import com.ycwl.basic.model.pc.broker.resp.BrokerRespVO;
+import com.ycwl.basic.service.pc.BrokerService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * @Author：longbinbin
+ * @Date：2024/12/2 15:55
+ */
+@Service
+public class BrokerServiceImpl implements BrokerService {
+
+    @Autowired
+    private BrokerMapper brokerMapper;
+
+    @Override
+    public PageInfo<BrokerEntity> pageQuery(BrokerReqQuery brokerReqQuery) {
+        PageHelper.startPage(brokerReqQuery.getPageNum(),brokerReqQuery.getPageSize());
+        List<BrokerEntity> list = brokerMapper.list(brokerReqQuery);
+        PageInfo<BrokerEntity> pageInfo = new PageInfo(list);
+        return pageInfo;
+    }
+
+    @Override
+    public List<BrokerEntity> list(BrokerReqQuery brokerReqQuery) {
+        return brokerMapper.list(brokerReqQuery);
+    }
+
+    @Override
+    public BrokerEntity getById(Long id) {
+        return brokerMapper.getById(id);
+    }
+
+    @Override
+    public int addOrUpdate(BrokerEntity broker) {
+        Long id = broker.getId();
+        if(id==null){
+            return brokerMapper.add(broker);
+        }else {
+            return brokerMapper.update(broker);
+        }
+    }
+
+    @Override
+    public int delete(Long id) {
+        return brokerMapper.deleteById(id);
+    }
+
+    @Override
+    public int updateStatus(Long id) {
+        return brokerMapper.updateStatus(id);
+    }
+}

src/main/java/com/ycwl/basic/service/impl/pc/DeviceServiceImpl.java

@@ -0,0 +1,61 @@
+package com.ycwl.basic.service.impl.pc;
+
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import com.ycwl.basic.mapper.pc.DeviceMapper;
+import com.ycwl.basic.model.pc.device.req.DeviceAddOrUpdateReq;
+import com.ycwl.basic.model.pc.device.req.DeviceReqQuery;
+import com.ycwl.basic.model.pc.device.resp.DeviceRespVO;
+import com.ycwl.basic.service.pc.DeviceService;
+import com.ycwl.basic.utils.ApiResponse;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * @Author：longbinbin
+ * @Date：2024/12/2 16:18
+ */
+@Service
+public class DeviceServiceImpl implements DeviceService {
+    @Autowired
+    private DeviceMapper deviceMapper;
+    @Override
+    public ApiResponse<PageInfo<DeviceRespVO>> pageQuery(DeviceReqQuery deviceReqQuery) {
+        PageHelper.startPage(deviceReqQuery.getPageNum(), deviceReqQuery.getPageSize());
+        List<DeviceRespVO> list = deviceMapper.list(deviceReqQuery);
+        PageInfo<DeviceRespVO> pageInfo = new PageInfo<>(list);
+        return ApiResponse.buildSuccessResponse(pageInfo);
+    }
+
+    @Override
+    public ApiResponse<List<DeviceRespVO>> list(DeviceReqQuery deviceReqQuery) {
+        return ApiResponse.buildSuccessResponse(deviceMapper.list(deviceReqQuery));
+    }
+
+    @Override
+    public ApiResponse<DeviceRespVO> getById(Long id) {
+        return ApiResponse.buildSuccessResponse(deviceMapper.getById(id));
+    }
+
+    @Override
+    public ApiResponse addOrUpdate(DeviceAddOrUpdateReq deviceReqQuery) {
+        Long id = deviceReqQuery.getId();
+        if (id == null) {
+            return ApiResponse.buildSuccessResponse(deviceMapper.add(deviceReqQuery));
+        } else {
+            return ApiResponse.buildSuccessResponse(deviceMapper.update(deviceReqQuery));
+        }
+    }
+
+    @Override
+    public ApiResponse deleteById(Long id) {
+        return ApiResponse.buildSuccessResponse(deviceMapper.deleteById(id));
+    }
+
+    @Override
+    public ApiResponse updateStatus(Long id) {
+        return ApiResponse.buildSuccessResponse(deviceMapper.updateStatus(id));
+    }
+}

src/main/java/com/ycwl/basic/service/impl/pc/RoleServiceImpl.java

@@ -36,7 +36,7 @@ public class RoleServiceImpl implements RoleService {
 
     @Override
     public ApiResponse list(RoleListReqVO roleListReqVO) {
-        PageHelper.startPage(roleListReqVO.getPage(),roleListReqVO.getPageSize());
+        PageHelper.startPage(roleListReqVO.getPageNum(),roleListReqVO.getPageSize());
 //        if(roleListReqVO.getType()==null){
 //            roleListReqVO.setType(0);
 //        }

src/main/java/com/ycwl/basic/service/pc/BrokerService.java

@@ -0,0 +1,21 @@
+package com.ycwl.basic.service.pc;
+
+import com.github.pagehelper.PageInfo;
+import com.ycwl.basic.model.pc.broker.entity.BrokerEntity;
+import com.ycwl.basic.model.pc.broker.req.BrokerReqQuery;
+import com.ycwl.basic.model.pc.broker.resp.BrokerRespVO;
+
+import java.util.List;
+
+/**
+ * @Author：longbinbin
+ * @Date：2024/12/2 15:54
+ */
+public interface BrokerService {
+    PageInfo<BrokerEntity> pageQuery(BrokerReqQuery brokerReqQuery);
+    List<BrokerEntity> list(BrokerReqQuery brokerReqQuery);
+    BrokerEntity getById(Long id);
+    int addOrUpdate(BrokerEntity broker);
+    int delete(Long id);
+    int updateStatus(Long id);
+}

src/main/java/com/ycwl/basic/service/pc/DeviceService.java

@@ -0,0 +1,23 @@
+package com.ycwl.basic.service.pc;
+
+import com.github.pagehelper.PageInfo;
+import com.ycwl.basic.model.pc.device.req.DeviceAddOrUpdateReq;
+import com.ycwl.basic.model.pc.device.req.DeviceReqQuery;
+import com.ycwl.basic.model.pc.device.resp.DeviceRespVO;
+import com.ycwl.basic.utils.ApiResponse;
+
+import java.util.List;
+
+/**
+ * @Author：longbinbin
+ * @Date：2024/12/2 16:14
+ * 设备管理
+ */
+public interface DeviceService {
+    ApiResponse<PageInfo<DeviceRespVO>> pageQuery(DeviceReqQuery deviceReqQuery);
+    ApiResponse<List<DeviceRespVO>> list(DeviceReqQuery deviceReqQuery);
+    ApiResponse<DeviceRespVO> getById(Long id);
+    ApiResponse addOrUpdate(DeviceAddOrUpdateReq deviceReqQuery);
+    ApiResponse deleteById(Long id);
+    ApiResponse updateStatus(Long id);
+}

src/main/java/com/ycwl/basic/service/pc/MerchantService.java

@@ -1,4 +0,0 @@
-package com.ycwl.basic.service.pc;
-
-public interface MerchantService {
-}