refactor(controller): 统一API响应格式并迁移打印设备服务

lvqi
1 parent 6ab1d22c
Showing 8 changed files with 37 additions and 24 deletions
mqtt-web/src/main/java/com/diligrp/mqtt/web/dto/PrintDeviceDto.java → mqtt-core/src/main/java/com/diligrp/mqtt/core/dto/PrintDeviceDto.java
mqtt-web/src/main/java/com/diligrp/mqtt/web/service/PrintDeviceService.java → mqtt-core/src/main/java/com/diligrp/mqtt/core/service/PrintDeviceService.java
mqtt-web/src/main/java/com/diligrp/mqtt/web/controller/PlatTenantController.java
mqtt-web/src/main/java/com/diligrp/mqtt/web/controller/PrintDeviceController.java
mqtt-web/src/main/java/com/diligrp/mqtt/web/mapper/PrintDeviceMapper.java
mqtt-web/src/main/java/com/diligrp/mqtt/web/service/impl/PrintDeviceServiceImpl.java
mqtt-web/src/main/java/com/diligrp/mqtt/web/service/impl/PrintServiceImpl.java
mqtt-web/src/main/resources/mapper/PrintDeviceMapper.xml
-package com.diligrp.mqtt.web.dto;
+package com.diligrp.mqtt.core.dto;
 /**
  * @author lvqi
-package com.diligrp.mqtt.web.service;
+package com.diligrp.mqtt.core.service;
-
-import com.diligrp.mqtt.web.dto.PrintDeviceDto;
+import com.diligrp.mqtt.core.dto.PrintDeviceDto;
+import org.springframework.stereotype.Service;
 /**
  * @author lvqi
  */
+@Service
 public interface PrintDeviceService {
     PrintDeviceDto queryBySn(String sn);
+    Boolean isFirmExist(String firm);
+
 }
 package com.diligrp.mqtt.web.controller;
+import com.diligrp.mqtt.web.message.Message;
 import com.diligrp.mqtt.web.model.PlatTenant;
 import com.diligrp.mqtt.web.service.PlatTenantService;
 import jakarta.annotation.Resource;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
-import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
-
 @RestController
 @RequestMapping("platTenant")
 public class PlatTenantController {
@@ -20,13 +19,13 @@ public class PlatTenantController {
     /**
      * 分页查询
      *
-     * @param platTenant 筛选条件
-     * @param pageRequest      分页对象
+     * @param platTenant  筛选条件
+     * @param pageRequest 分页对象
      * @return 查询结果
      */
     @GetMapping
-    public ResponseEntity<Page<PlatTenant>> queryByPage(PlatTenant platTenant, PageRequest pageRequest) {
-        return ResponseEntity.ok(this.platTenantService.queryByPage(platTenant, pageRequest));
+    public Message<Page<PlatTenant>> queryByPage(PlatTenant platTenant, PageRequest pageRequest) {
+        return Message.success(this.platTenantService.queryByPage(platTenant, pageRequest));
     }
     /**
@@ -36,8 +35,8 @@ public class PlatTenantController {
      * @return 单条数据
      */
     @GetMapping("{id}")
-    public ResponseEntity<PlatTenant> queryById(@PathVariable("id") Integer id) {
-        return ResponseEntity.ok(this.platTenantService.queryById(id));
+    public Message<PlatTenant> queryById(@PathVariable Integer id) {
+        return Message.success(this.platTenantService.queryById(id));
     }
     /**
@@ -47,8 +46,8 @@ public class PlatTenantController {
      * @return 新增结果
      */
     @PostMapping
-    public ResponseEntity<PlatTenant> add(PlatTenant platTenant) {
-        return ResponseEntity.ok(this.platTenantService.insert(platTenant));
+    public Message<PlatTenant> add(PlatTenant platTenant) {
+        return Message.success(this.platTenantService.insert(platTenant));
     }
     /**
@@ -58,8 +57,8 @@ public class PlatTenantController {
      * @return 编辑结果
      */
     @PutMapping
-    public ResponseEntity<PlatTenant> edit(PlatTenant platTenant) {
-        return ResponseEntity.ok(this.platTenantService.update(platTenant));
+    public Message<PlatTenant> edit(PlatTenant platTenant) {
+        return Message.success(this.platTenantService.update(platTenant));
     }
     /**
@@ -69,8 +68,8 @@ public class PlatTenantController {
      * @return 删除是否成功
      */
     @DeleteMapping
-    public ResponseEntity<Boolean> deleteById(Integer id) {
-        return ResponseEntity.ok(this.platTenantService.deleteById(id));
+    public Message<Boolean> deleteById(Integer id) {
+        return Message.success(this.platTenantService.deleteById(id));
     }
 }
 package com.diligrp.mqtt.web.controller;
 import com.diligrp.mqtt.web.message.Message;
-import com.diligrp.mqtt.web.service.PrintDeviceService;
+import com.diligrp.mqtt.core.service.PrintDeviceService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 package com.diligrp.mqtt.web.mapper;
-import com.diligrp.mqtt.web.dto.PrintDeviceDto;
+import com.diligrp.mqtt.core.dto.PrintDeviceDto;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -13,6 +13,7 @@ public interface PrintDeviceMapper {
     PrintDeviceDto queryBySn(@Param("sn") String sn);
+    Boolean isFirmExist(@Param("firm") String firm);
 }
 package com.diligrp.mqtt.web.service.impl;
-import com.diligrp.mqtt.web.dto.PrintDeviceDto;
+import com.diligrp.mqtt.core.dto.PrintDeviceDto;
 import com.diligrp.mqtt.web.mapper.PrintDeviceMapper;
-import com.diligrp.mqtt.web.service.PrintDeviceService;
+import com.diligrp.mqtt.core.service.PrintDeviceService;
 import jakarta.annotation.Resource;
 import org.springframework.stereotype.Service;
@@ -17,4 +17,9 @@ public class PrintDeviceServiceImpl implements PrintDeviceService {
         return printDeviceMapper.queryBySn(sn);
     }
+    @Override
+    public Boolean isFirmExist(String firm) {
+        return printDeviceMapper.isFirmExist(firm);
+    }
+
 }
@@ -11,7 +11,7 @@ import com.diligrp.mqtt.core.type.SendEventType;
 import com.diligrp.mqtt.core.util.BuildCloudPrintCommand;
 import com.diligrp.mqtt.core.util.JsonUtils;
 import com.diligrp.mqtt.web.dto.CloudPrinter;
-import com.diligrp.mqtt.web.dto.PrintDeviceDto;
+import com.diligrp.mqtt.core.dto.PrintDeviceDto;
 import com.diligrp.mqtt.web.mapper.PlatTenantMapper;
 import com.diligrp.mqtt.web.mapper.PrintDeviceMapper;
 import com.diligrp.mqtt.web.message.Message;
@@ -3,11 +3,16 @@
 <mapper namespace="com.diligrp.mqtt.web.mapper.PrintDeviceMapper">
-    <select id="queryBySn" resultType="com.diligrp.mqtt.web.dto.PrintDeviceDto"
+    <select id="queryBySn" resultType="com.diligrp.mqtt.core.dto.PrintDeviceDto"
             parameterType="java.lang.String">
         select firm_id, product_id, sn, client_id, username, password, CONCAT(firm_id, product_id, sn,'/notify') as topic
         from print_device
         where sn = #{sn}
     </select>
+    <select id="isFirmExist" resultType="java.lang.Boolean" parameterType="java.lang.String">
+        SELECT CASE WHEN COUNT(1) > 0 THEN true ELSE false END
+        FROM print_device
+        WHERE firm = #{firm}
+    </select>
 </mapper>