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

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 {
-}