From b600d08344b868214c7ff23260c172a9302813eb Mon Sep 17 00:00:00 2001
From: mi9688 <dqwzam0@163.com>
Date: Tue, 17 Dec 2024 11:20:36 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=94=A8=E6=88=B7=E5=85=85?=
 =?UTF-8?q?=E5=80=BC=E5=8D=A1=E7=AE=A1=E7=90=86=E6=A8=A1=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/printer/PrinterController.java |  8 +++++---
 .../fastbee/iot/domain/DeviceReportInfo.java  |  4 ++++
 .../impl/DeviceReportInfoServiceImpl.java     | 12 ++++++++---
 .../mapper/iot/DeviceReportInfoMapper.xml     |  9 +++++++--
 .../fastbee-rechargecard-service/pom.xml      | 20 +++++++++++++++++++
 .../com/fastbee/rechargecard/domain/test.java |  4 ++++
 .../com/fastbee/rechargecard/mapper/test.java |  4 ++++
 .../rechargecard/service/impl/testImpl.java   |  4 ++++
 .../fastbee/rechargecard/service/test.java    |  4 ++++
 fastbee-service/pom.xml                       |  1 +
 10 files changed, 62 insertions(+), 8 deletions(-)
 create mode 100644 fastbee-service/fastbee-rechargecard-service/pom.xml
 create mode 100644 fastbee-service/fastbee-rechargecard-service/src/main/java/com/fastbee/rechargecard/domain/test.java
 create mode 100644 fastbee-service/fastbee-rechargecard-service/src/main/java/com/fastbee/rechargecard/mapper/test.java
 create mode 100644 fastbee-service/fastbee-rechargecard-service/src/main/java/com/fastbee/rechargecard/service/impl/testImpl.java
 create mode 100644 fastbee-service/fastbee-rechargecard-service/src/main/java/com/fastbee/rechargecard/service/test.java

diff --git a/fastbee-open-api/src/main/java/com/fastbee/data/controller/printer/PrinterController.java b/fastbee-open-api/src/main/java/com/fastbee/data/controller/printer/PrinterController.java
index b6a42cc..14b7c47 100644
--- a/fastbee-open-api/src/main/java/com/fastbee/data/controller/printer/PrinterController.java
+++ b/fastbee-open-api/src/main/java/com/fastbee/data/controller/printer/PrinterController.java
@@ -18,6 +18,7 @@ import java.util.Objects;
 @RestController
 @RequestMapping("/printer")
 public class PrinterController extends BaseController {
+
     @Autowired
     private YiLianYunPrintService printerService;
 
@@ -38,13 +39,14 @@ public class PrinterController extends BaseController {
         if(Objects.isNull(printNum)){
             throw new ServiceException("打印次数不能为空!");
         }
-        if(printNum>2){
-            throw new ServiceException("打印次数不能超过2!");
-        }
+//        if(printNum>2){
+//            throw new ServiceException("打印次数不能超过2!");
+//        }
         for (int i = 0; i < printNum; i++) {
             printerService.imagePrint(imageUrl);
             Thread.sleep(200);
         }
+
        return AjaxResult.success();
     }
     /**
diff --git a/fastbee-service/fastbee-iot-service/src/main/java/com/fastbee/iot/domain/DeviceReportInfo.java b/fastbee-service/fastbee-iot-service/src/main/java/com/fastbee/iot/domain/DeviceReportInfo.java
index c5b51ae..b238437 100644
--- a/fastbee-service/fastbee-iot-service/src/main/java/com/fastbee/iot/domain/DeviceReportInfo.java
+++ b/fastbee-service/fastbee-iot-service/src/main/java/com/fastbee/iot/domain/DeviceReportInfo.java
@@ -132,4 +132,8 @@ public class DeviceReportInfo extends BaseEntity
     @ApiModelProperty("对应设备id")
     private Long deviceId;
 
+    /** 状态:0未审核，1已审核，2已打印 */
+    @Excel(name = "状态:0未审核，1已审核，2已打印")
+    @ApiModelProperty("状态:0未审核，1已审核，2已打印")
+    private Integer status;
 }
diff --git a/fastbee-service/fastbee-iot-service/src/main/java/com/fastbee/iot/service/impl/DeviceReportInfoServiceImpl.java b/fastbee-service/fastbee-iot-service/src/main/java/com/fastbee/iot/service/impl/DeviceReportInfoServiceImpl.java
index c3eca2b..28f7c68 100644
--- a/fastbee-service/fastbee-iot-service/src/main/java/com/fastbee/iot/service/impl/DeviceReportInfoServiceImpl.java
+++ b/fastbee-service/fastbee-iot-service/src/main/java/com/fastbee/iot/service/impl/DeviceReportInfoServiceImpl.java
@@ -59,14 +59,20 @@ public class DeviceReportInfoServiceImpl implements IDeviceReportInfoService
     @Override
     public int insertDeviceReportInfo(DeviceReportInfo deviceReportInfo)
     {
-        //查重
+        //设备编码查重
         List<DeviceReportInfo> list = new LambdaQueryChainWrapper<>(deviceReportInfoMapper)
-                .select(DeviceReportInfo::getSerialNumber)
+                .select(DeviceReportInfo::getSerialNumber,DeviceReportInfo::getImei)
                 .eq(DeviceReportInfo::getSerialNumber, deviceReportInfo.getSerialNumber())
+                .or()
+                .eq(DeviceReportInfo::getImei, deviceReportInfo.getImei())
                 .list();
         System.err.println("查重："+list);
         if (!list.isEmpty()) {
-            throw new ServiceException("设备编号重复!");
+            if (list.get(0).getImei().equals(deviceReportInfo.getImei())) {
+                throw new ServiceException("IMEI号重复!");
+            } else if (list.get(0).getSerialNumber().equals(deviceReportInfo.getSerialNumber())) {
+                throw new ServiceException("设备编号重复!");
+            }
         }
         return deviceReportInfoMapper.insertDeviceReportInfo(deviceReportInfo);
     }
diff --git a/fastbee-service/fastbee-iot-service/src/main/resources/mapper/iot/DeviceReportInfoMapper.xml b/fastbee-service/fastbee-iot-service/src/main/resources/mapper/iot/DeviceReportInfoMapper.xml
index 977df16..40f00f2 100644
--- a/fastbee-service/fastbee-iot-service/src/main/resources/mapper/iot/DeviceReportInfoMapper.xml
+++ b/fastbee-service/fastbee-iot-service/src/main/resources/mapper/iot/DeviceReportInfoMapper.xml
@@ -27,10 +27,11 @@
         <result property="voiceManufacturerName"    column="voice_manufacturer_name"    />
         <result property="replaceManufacturerName"    column="replace_manufacturer_name"    />
         <result property="deviceId"    column="device_id"    />
+        <result property="status"    column="status"    />
     </resultMap>
 
     <sql id="selectDeviceReportInfoVo">
-        select id, imei, iccid, mcu_id, bsp_type, lte_type, mcu_type, mcu_fw, lte_fw, lcd_manufacturer, voice_manufacturer, fram_model, replace_manufacturer, test_record, batch_number, serial_number, qr_code, name, lcd_manufacturer_name, voice_manufacturer_name, replace_manufacturer_name, device_id from iot_device_report_info
+        select id, imei, iccid, mcu_id, bsp_type, lte_type, mcu_type, mcu_fw, lte_fw, lcd_manufacturer, voice_manufacturer, fram_model, replace_manufacturer, test_record, batch_number, serial_number, qr_code, name, lcd_manufacturer_name, voice_manufacturer_name, replace_manufacturer_name, device_id, status from iot_device_report_info
     </sql>
 
     <select id="selectDeviceReportInfoList" parameterType="DeviceReportInfo" resultMap="DeviceReportInfoResult">
@@ -49,7 +50,7 @@
             <if test="framModel != null  and framModel != ''"> and fram_model = #{framModel}</if>
             <if test="replaceManufacturer != null "> and replace_manufacturer = #{replaceManufacturer}</if>
             <if test="testRecord != null  and testRecord != ''"> and test_record = #{testRecord}</if>
-            <if test="batchNumber != null "> and batch_number = #{batchNumber}</if>
+            <if test="batchNumber != null  and batchNumber != ''"> and batch_number = #{batchNumber}</if>
             <if test="serialNumber != null  and serialNumber != ''"> and serial_number = #{serialNumber}</if>
             <if test="qrCode != null  and qrCode != ''"> and qr_code = #{qrCode}</if>
             <if test="name != null  and name != ''"> and name like concat('%', #{name}, '%')</if>
@@ -57,6 +58,7 @@
             <if test="voiceManufacturerName != null  and voiceManufacturerName != ''"> and voice_manufacturer_name like concat('%', #{voiceManufacturerName}, '%')</if>
             <if test="replaceManufacturerName != null  and replaceManufacturerName != ''"> and replace_manufacturer_name like concat('%', #{replaceManufacturerName}, '%')</if>
             <if test="deviceId != null "> and device_id = #{deviceId}</if>
+            <if test="status != null "> and status = #{status}</if>
         </where>
     </select>
 
@@ -89,6 +91,7 @@
             <if test="voiceManufacturerName != null">voice_manufacturer_name,</if>
             <if test="replaceManufacturerName != null">replace_manufacturer_name,</if>
             <if test="deviceId != null">device_id,</if>
+            <if test="status != null">status,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="imei != null and imei != ''">#{imei},</if>
@@ -112,6 +115,7 @@
             <if test="voiceManufacturerName != null">#{voiceManufacturerName},</if>
             <if test="replaceManufacturerName != null">#{replaceManufacturerName},</if>
             <if test="deviceId != null">#{deviceId},</if>
+            <if test="status != null">#{status},</if>
         </trim>
     </insert>
 
@@ -139,6 +143,7 @@
             <if test="voiceManufacturerName != null">voice_manufacturer_name = #{voiceManufacturerName},</if>
             <if test="replaceManufacturerName != null">replace_manufacturer_name = #{replaceManufacturerName},</if>
             <if test="deviceId != null">device_id = #{deviceId},</if>
+            <if test="status != null">status = #{status},</if>
         </trim>
         where id = #{id}
     </update>
diff --git a/fastbee-service/fastbee-rechargecard-service/pom.xml b/fastbee-service/fastbee-rechargecard-service/pom.xml
new file mode 100644
index 0000000..2dbbc92
--- /dev/null
+++ b/fastbee-service/fastbee-rechargecard-service/pom.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>com.fastbee</groupId>
+        <artifactId>fastbee-service</artifactId>
+        <version>3.8.5</version>
+    </parent>
+
+    <artifactId>fastbee-rechargecard-service</artifactId>
+
+    <properties>
+        <maven.compiler.source>8</maven.compiler.source>
+        <maven.compiler.target>8</maven.compiler.target>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+
+</project>
\ No newline at end of file
diff --git a/fastbee-service/fastbee-rechargecard-service/src/main/java/com/fastbee/rechargecard/domain/test.java b/fastbee-service/fastbee-rechargecard-service/src/main/java/com/fastbee/rechargecard/domain/test.java
new file mode 100644
index 0000000..2aeb729
--- /dev/null
+++ b/fastbee-service/fastbee-rechargecard-service/src/main/java/com/fastbee/rechargecard/domain/test.java
@@ -0,0 +1,4 @@
+package com.fastbee.rechargecard.domain;
+
+public class test {
+}
diff --git a/fastbee-service/fastbee-rechargecard-service/src/main/java/com/fastbee/rechargecard/mapper/test.java b/fastbee-service/fastbee-rechargecard-service/src/main/java/com/fastbee/rechargecard/mapper/test.java
new file mode 100644
index 0000000..f2aa96e
--- /dev/null
+++ b/fastbee-service/fastbee-rechargecard-service/src/main/java/com/fastbee/rechargecard/mapper/test.java
@@ -0,0 +1,4 @@
+package com.fastbee.rechargecard.mapper;
+
+public interface test {
+}
diff --git a/fastbee-service/fastbee-rechargecard-service/src/main/java/com/fastbee/rechargecard/service/impl/testImpl.java b/fastbee-service/fastbee-rechargecard-service/src/main/java/com/fastbee/rechargecard/service/impl/testImpl.java
new file mode 100644
index 0000000..bf6a279
--- /dev/null
+++ b/fastbee-service/fastbee-rechargecard-service/src/main/java/com/fastbee/rechargecard/service/impl/testImpl.java
@@ -0,0 +1,4 @@
+package com.fastbee.rechargecard.service.impl;
+
+public class testImpl {
+}
diff --git a/fastbee-service/fastbee-rechargecard-service/src/main/java/com/fastbee/rechargecard/service/test.java b/fastbee-service/fastbee-rechargecard-service/src/main/java/com/fastbee/rechargecard/service/test.java
new file mode 100644
index 0000000..b3bff8b
--- /dev/null
+++ b/fastbee-service/fastbee-rechargecard-service/src/main/java/com/fastbee/rechargecard/service/test.java
@@ -0,0 +1,4 @@
+package com.fastbee.rechargecard.service;
+
+public interface test {
+}
diff --git a/fastbee-service/pom.xml b/fastbee-service/pom.xml
index 59ce820..7047738 100644
--- a/fastbee-service/pom.xml
+++ b/fastbee-service/pom.xml
@@ -20,6 +20,7 @@
         <module>fastbee-project-service</module>
         <module>fastbee-ggroup-service</module>
         <module>fastbee-device-service</module>
+        <module>fastbee-rechargecard-service</module>
     </modules>